Commit Graph

85 Commits

Author SHA1 Message Date
Eden Halperin
233f3dfb35 fix poi label style 2014-05-19 15:40:52 -07:00
Eden Halperin
d0b885694d fix labels 2014-05-19 15:29:56 -07:00
Eden Halperin
297232e7b1 marine labels by scalerank 2014-05-19 14:58:19 -07:00
Eden Halperin
bafd635b67 label adjustments 2014-05-19 14:30:44 -07:00
Eden Halperin
07e4790107 crisper poi icons 2014-05-19 14:05:12 -07:00
Eden Halperin
971d51ae52 darken motorways a bit 2014-05-19 13:27:40 -07:00
Eden Halperin
0a336d4286 add bigger airport poi 2014-05-19 13:22:24 -07:00
Eden Halperin
73a25bb509 add poi scalerank 2014-05-19 11:48:47 -07:00
Eden Halperin
2824ee0ba5 formatting 2014-05-19 11:23:02 -07:00
Eden Halperin
4669dc012b add marine label points 2014-05-19 10:46:14 -07:00
Konstantin Käfer
a33d334169 incorporate the color and draw circle dots if we don't have an icon
Conflicts:
	bin/style.js
2014-05-19 16:20:51 +02:00
Konstantin Käfer
7d73d158ba incorporate the color and draw circle dots if we don't have an icon 2014-05-19 16:19:51 +02:00
Konstantin Käfer
9bb0146875 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
2014-05-19 15:52:42 +02:00
Konstantin Käfer
27f8ed29e4 encode icon texture coordinate in buffer so we can render all pois with 1 draw call 2014-05-19 10:48:36 +02:00
Eden Halperin
6bf7599be8 transition country labels 2014-05-16 18:19:31 -07:00
Eden Halperin
dbd252040c fix admin boundary widths 2014-05-16 18:06:43 -07:00
Konstantin Käfer
949c10782d remove poi translation 2014-05-15 14:27:04 +02:00
Eden Halperin
10342904ba fix alpha color values and add stroke blurs to labels 2014-05-14 09:54:49 -07:00
Konstantin Käfer
51f523ec14 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
	include/llmr/map/transform.hpp
	src/renderer/painter.cpp
	src/text/placement.cpp
2014-05-14 17:42:10 +02:00
Konstantin Käfer
3d84dd60c9 always cast a building shadow to the bottom 2014-05-14 17:10:34 +02:00
Konstantin Käfer
5e65734630 better text halos for street names
refs #194
2014-05-14 15:36:29 +02:00
Konstantin Käfer
b8d88600b8 cemetary => cemetery 2014-05-14 15:09:13 +02:00
Konstantin Käfer
028ae4f256 make offsets less extreme 2014-05-14 14:53:11 +02:00
Eden Halperin
b2c4a90058 less yellow hillshade highlight 2014-05-13 16:27:24 -07:00
Eden Halperin
017cf45ee2 new tile endpoint, fix landcover 2014-05-13 16:04:47 -07:00
Eden Halperin
471dd484b9 maxAngleDelta for road labels 2014-05-13 15:04:20 -07:00
Eden Halperin
2e419f1de1 darken road label halos, bigger airport poi 2014-05-13 14:25:46 -07:00
Eden Halperin
0df79ddc0c bump motorway width stops by 1 z level 2014-05-13 13:31:19 -07:00
Eden Halperin
7b21de8c51 update street and street casing widths 2014-05-13 12:32:50 -07:00
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