Commit Graph

797 Commits

Author SHA1 Message Date
Eden Halperin
7f00a63fd0 fix waterways 2014-05-20 20:40:50 -07:00
Eden Halperin
d1e9fc9503 night style adjustments 2014-05-20 18:00:02 -07:00
Eden Halperin
6709ed25bc no constants for transitions 2014-05-20 17:29:55 -07:00
Eden Halperin
b0baeb246e Merge branch 'master' of https://github.com/mapbox/llmr-native 2014-05-20 17:18:32 -07:00
Eden Halperin
11da04667e add transition properties 2014-05-20 17:17:02 -07:00
Ansis Brammanis
f1e1dd112f Merge branch 'master' of github.com:mapbox/llmr-native 2014-05-20 20:15:48 -04:00
Ansis Brammanis
2c1d4c4678 fix "bumped" zoom for label fading
fixes #138
2014-05-20 20:14:47 -04:00
Ansis Brammanis
362c055aa6 remove line causing flickering 2014-05-20 20:08:32 -04:00
Eden Halperin
e93dd3a933 update structure to fix landcover and landuse 2014-05-20 16:39:15 -07:00
Eden Halperin
9e49dedc28 night styles first pass 2014-05-20 15:52:57 -07:00
Ansis Brammanis
4a0015c5ab shift dblclick zooms out 2014-05-20 16:26:14 -04:00
Eden Halperin
e1f5042343 add missing landcover, start night style 2014-05-20 12:43:26 -07:00
Justin R. Miller
550e381e70 name text halo properties like others 2014-05-20 11:26:52 -07:00
edenh
2f7b038608 Merge pull request #217 from mapbox/outdoors-style
Outdoors style
2014-05-20 11:11:00 -07:00
Eden Halperin
34ce8e6d79 fix all stops 2014-05-20 11:05:21 -07:00
Eden Halperin
ad126d8c64 contour line adjustments 2014-05-20 10:25:08 -07:00
Eden Halperin
121ccd7c1c bump road widths 2014-05-20 10:11:30 -07:00
Konstantin Käfer
fde4f2cd70 Merge branch 'master' into outdoors-style 2014-05-20 12:21:59 +02:00
Konstantin Käfer
1420848314 accomodate function values for tile size difference 2014-05-20 12:21:32 +02:00
Konstantin Käfer
a81f41f41f Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
2014-05-20 12:12:40 +02:00
Konstantin Käfer
f86fd2f610 add function tests 2014-05-20 12:05:25 +02:00
Konstantin Käfer
e0381a782c use smallest/largest value in undefined regions
refs #217
2014-05-20 11:52:17 +02:00
Konstantin Käfer
6bffa49309 don't account for tile size in the function; the value is tile source dependent 2014-05-20 11:51:49 +02:00
Konstantin Käfer
3be068f8da make sure they never throw. asserts are compiled out in production! 2014-05-20 11:23:33 +02:00
Konstantin Käfer
a6cb3d8402 fix label display
refs #217
2014-05-20 11:10:27 +02:00
Eden Halperin
88cfc79a45 fix water and waterway labels 2014-05-19 16:39:17 -07:00
Eden Halperin
5e11787f6a transparent wetland pattern 2014-05-19 16:00:01 -07:00
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
Ansis Brammanis
7547beadd3 add includes 2014-05-19 17:39:51 -04:00
Ansis Brammanis
2b348ccfd4 Merge branch 'master' of github.com:mapbox/llmr-native 2014-05-19 17:36:50 -04:00
Ansis Brammanis
4d38e4eb15 fix rotation range check in text shader
fixes #215
2014-05-19 17:35:55 -04: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
3391b27591 Merge branch 'outdoors-style' of https://github.com/mapbox/llmr-native into outdoors-style 2014-05-19 17:37:42 +02:00
Eden Halperin
84ebbcd851 use mapbox streets v5 2014-05-19 07:27:09 -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
ee82986717 disable debug image 2014-05-19 14:21:57 +02:00
Konstantin Käfer
92706445d9 init glfw for debug images + actually copy images over 2014-05-19 14:21:15 +02:00
Konstantin Käfer
f848868c16 fix texture binding 2014-05-19 14:18:29 +02:00
Konstantin Käfer
898c6d6714 fix for retina screens 2014-05-19 11:13:22 +02:00
Konstantin Käfer
13575330f7 use sprite atlas 2014-05-19 10:48:36 +02:00