Konstantin Käfer
b3a1e35f44
add translate-anchor property
2014-05-13 18:41:22 +02:00
Konstantin Käfer
5135c59b71
Merge branch 'master' into outdoors-style
...
Conflicts:
bin/style.js
src/map/map.cpp
2014-05-13 16:18:52 +02:00
Eden Halperin
9dc164f064
update contour lines
2014-05-12 16:35:32 -07:00
Eden Halperin
ec90ccd358
update sprite pointer and fix marine_label
2014-05-12 15:42:18 -07:00
Eden Halperin
66dbcce4fd
fix landuse industrial layer
2014-05-12 12:17:43 -07:00
Eden Halperin
8f2c211ff0
remove hillshade antialiasing
2014-05-12 10:56:36 -07:00
Eden Halperin
1dfd2fcd59
transparent stroke on hillshade fills
2014-05-12 10:25:11 -07:00
Konstantin Käfer
6136ab6d21
draw by layer, not by tile
...
This is needed for correctly compositing raster imagery into the map
fixes #122
fixes #157
2014-05-12 17:13:26 +02:00
Nicki Dlugash
4a2e75a33d
fixed road label and place_label_other style to make them appear
2014-05-09 19:19:43 -07:00
Eden Halperin
db013095e9
update style with labels
2014-05-09 16:51:09 -07:00
Konstantin Käfer
0bfd7b0f43
Calculate clip IDs with a huffman prefix tree
...
This changes the clip IDs from sequential to a huffman prefix tree, meaning that
parent tiles share the same prefix with child tiles (but are shorter). This allows
us to use the same checkerboard pattern to draw all tiles.
TODO:
- make sure we're not overflowing the 8 bit limit of the stencil buffer
- draw all checkerboard fields at the same time, with one draw call
- fix raster drawing (fading, clipping)
refs #132
2014-05-09 18:10:28 +02:00
Eden Halperin
11c8be6f94
start of outdoors style
2014-05-08 16:55:00 -07:00
Justin R. Miller
2b9fbb0731
squashed stylequest merge
...
* uses OSM Bright style
* adds dot shader
* adds layer translation
* adds dashed line support
* adds style array parsing
* improves background layer parsing
* improves style constant parsing
* fixes sprite JSON pixel ratio parsing
2014-05-07 10:37:25 -07:00
Konstantin Käfer
78c10c0701
Merge remote-tracking branch 'remotes/origin/pr/127'
...
Conflicts:
include/llmr/map/map.hpp
src/map/map.cpp
src/platform/platform.cpp
2014-04-15 12:46:19 -04:00
Konstantin Käfer
8c9f980271
correctly build shaders if the optimizer is not present
2014-04-11 16:23:06 -04:00
Konstantin Käfer
ebc9a0a0d7
add xcode project builds
2014-04-11 15:13:55 -04:00
Konstantin Käfer
ed657c42d5
remove ds_store file
...
[skip ci]
2014-04-11 14:30:46 -04:00
Konstantin Käfer
0768600a70
clean up build system and reuse previously built libraries in other targets
2014-04-11 11:29:18 -07:00
Konstantin Käfer
ee2f17d2b4
fix build on travis
2014-04-11 08:50:43 -07:00
Konstantin Käfer
662562d9fe
use mapnik-packaging to build all dependencies
2014-04-09 15:57:21 -04:00
Justin R. Miller
1215f6f1fe
refs #101 : data sources with styling
...
* add second, satellite class to stylesheet
* get rid of tile clipping masks for now
* flesh out raster styling properties
2014-04-04 13:24:11 -07:00
Justin R. Miller
d2491939e9
move to naming like on web
2014-04-02 15:12:42 -07:00
Justin R. Miller
9b487f2e00
refs #83 : move all POIs to min-based enabling
2014-03-26 14:25:59 -07:00
Konstantin Käfer
0c6f993695
add min/max functions and refactor FunctionProperty
...
fixes #83
2014-03-26 12:21:33 +01:00
Konstantin Käfer
4b6b5b3b22
fail hard if the shader optimizer is unavailable
2014-03-26 11:51:15 +01:00
Konstantin Käfer
249b42a29d
move node modules to bin/ folder to fix build
2014-03-26 11:51:05 +01:00
Konstantin Käfer
77f58960c4
build shaders for either desktop gl or gles2
2014-03-25 13:16:48 +01:00
Konstantin Käfer
d5b4c1162d
add shader optimizer and reorder components
2014-03-25 12:10:19 +01:00
Konstantin Käfer
9621038d8a
implement alwaysVisible
2014-03-24 17:38:10 +01:00
Konstantin Käfer
76d3d7badb
explicitly specify font size in class
2014-03-24 17:21:14 +01:00
Konstantin Käfer
31912731d4
update style
2014-03-24 14:43:23 +01:00
Konstantin Käfer
d9589573bc
extract label shaping
2014-03-14 11:36:10 +01:00
Konstantin Käfer
29e4ecb977
add text styling
2014-03-14 11:36:10 +01:00
Konstantin Käfer
277bc1586d
add constants and move style parser to its own class
2014-03-12 13:26:24 +01:00
Konstantin Käfer
207358b598
change datasource => source for compliance with js
2014-03-12 12:46:28 +01:00
Konstantin Käfer
26a91d29f5
remove unneeded file
2014-03-12 11:24:58 +01:00
Konstantin Käfer
91d42911fb
parse the json stylesheet
2014-03-12 11:23:01 +01:00
Justin R. Miller
7a48e8ddce
move to linear properties for POI opacity
2014-02-21 16:22:45 -08:00
Justin R. Miller
495d47ab42
refs #60 : add some more point styles
2014-02-21 16:00:01 -08:00
Justin R. Miller
828d8ba26f
refs #60 : first cut of POI rendering
...
* add basic marker style to stylesheet
* pass through marker style to PBF conversion
* marker/point tile parsing, bucket, buffer, shaders, etc.
* new sprite hosting for 1x/2x variants
* sprite load accepts screen scale argument
2014-02-14 18:13:12 -08:00
Justin R. Miller
4ff01fb07f
allow for easier editing of style in Xcode
...
* write protobuf directly to file instead of stdout (for Gyp)
* add style.js to editable sources
* add build phases for pbf conversion & resources updates
* update README style directions
2014-02-13 16:24:00 -08:00
Konstantin Käfer
bec0ad10c4
drawing lines with triangles
2014-02-11 15:51:54 +01:00
Konstantin Käfer
e3db9b1ef1
add textured water
2014-02-04 11:40:28 +01:00
Konstantin Käfer
82c79b7bda
remove c99 features
...
fixes #26
2014-02-03 23:21:50 +01:00
Konstantin Käfer
9ab9eeec13
textured fills
...
fixes #15
2014-02-03 22:51:21 +01:00
Konstantin Käfer
202e0270f7
add rapidjson for parsing sprite json files
2014-02-03 11:36:34 +01:00
Konstantin Käfer
a8b1df403c
fix errors from rename of style.hpp to resources.hpp
2014-01-30 11:24:39 +01:00
Konstantin Käfer
29f0214eea
linear fades
2014-01-29 14:49:11 +01:00
Konstantin Käfer
74dc256799
let roads show up till z30
2014-01-29 12:28:00 +01:00
Konstantin Käfer
1538ebaf22
cascade styles
2014-01-27 17:21:48 +01:00
