Commit Graph

145 Commits

Author SHA1 Message Date
Nicki Dlugash
aa85c54b2d dont have font stack yet with arial unicode bold as fallback to Open Sans Semibold, so changed them back 2014-05-29 15:42:04 -04:00
Nicki Dlugash
189436919d updated font for poi labels, and made arial unicode bold fallback for open sans semibold 2014-05-29 15:31:48 -04:00
Eden Halperin
f5f187fb91 use updated fontstack 2014-05-29 11:45:34 -07:00
Eden Halperin
7e0d439938 fix country labels 2014-05-29 11:16:59 -07:00
Young Hahn
96c96e894c Merge pull request #264 from mapbox/glyphrange
Add glyph range PBF loading support
2014-05-29 13:24:36 -04:00
Nicki Dlugash
16c43d30bd moved contour lines above hillshade 2014-05-29 13:05:48 -04:00
Young Hahn
bdb16b9ae7 Merge branch 'master' into glyphrange-master
Conflicts:
	bin/style.js
	src/text/placement.cpp
2014-05-29 11:59:12 -04:00
Young Hahn
8ba1acaa83 Add second fontstack for testing. 2014-05-29 06:09:54 -04:00
Eden Halperin
bbae29206b countour lines, then buildings, then hillshades 2014-05-28 17:44:29 -07:00
Nicki Dlugash
46f7b3dd32 Merge pull request #267 from mapbox/even-more-label-styles
Even more label styles
2014-05-28 20:18:18 -04:00
Nicki Dlugash
9698ac02cf fixed all stop functions, and updated waterway and water label colors 2014-05-28 20:03:49 -04:00
Nicki Dlugash
e2a55e440c divided road labels into 3 buckets. Made road labels and neighborhood/suburb/hamlet labels larger - same size as in original carto version. 2014-05-28 19:28:22 -04:00
Eden Halperin
984c1dd8d5 use 1024 hillshade blur sizes for now 2014-05-28 14:15:15 -07:00
Nicki Dlugash
7dadaa8d22 fixed duplicate size property in country label 2014-05-28 16:37:50 -04:00
Nicki Dlugash
f3f4e0441b Merge branch 'master' into even-more-label-styles
Conflicts:
	bin/style.js
2014-05-28 16:30:41 -04:00
Nicki Dlugash
3c00a71a7b removed city dot styles, updated strokeWidth and strokeBlur properties for place labels, fixed night style admin marine cover color 2014-05-28 16:18:06 -04:00
edenh
5d7da9427d Merge pull request #265 from mapbox/more-label-styles
More label styles
2014-05-28 12:13:14 -07:00
Eden Halperin
c6c978f822 fix country label size discrepancy 2014-05-28 11:48:51 -07:00
Eden Halperin
bb825363e0 formatting cleanup 2014-05-28 10:41:51 -07:00
Konstantin Käfer
eb377aced7 add font names 2014-05-28 15:50:54 +02:00
Konstantin Käfer
90d02ae673 increase render buffer size to 512 for hillshades 2014-05-28 06:34:51 +02:00
Nicki Dlugash
f8e69c58cc updated poi label bucket textSize to be consistent with sizes in the classes 2014-05-27 20:14:57 -04:00
Eden Halperin
2381fedd37 remove style comments 2014-05-27 17:08:08 -07:00
Nicki Dlugash
64d313beea more poi labels and icons 2014-05-27 20:06:06 -04:00
Eden Halperin
acd6b9cb09 transition street casing opacity 2014-05-27 11:54:47 -07:00
Konstantin Käfer
4ad3a1ee76 Merge branch 'master' into blur
Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp
2014-05-26 17:30:31 +02:00
Konstantin Käfer
8b63d19198 prerender/blur terrain 2014-05-26 16:14:09 +02:00
Dane Springmeyer
7f592ac2e7 Address #151 at the same time 2014-05-23 17:14:19 -07:00
Nicki Dlugash
da6658d286 changed country_label text_field back to name 2014-05-23 18:43:28 -04:00
Nicki Dlugash
0cf3495053 updated night poi label stroke, strokeWidth, and strokeBlur 2014-05-23 18:41:10 -04:00
Nicki Dlugash
f2354ea6f2 Merge branch 'master' into road-poi-labels 2014-05-23 15:12:46 -04:00
Nicki Dlugash
2ecf410504 playing around with road and poi label strokes, to match updated icons 2014-05-22 18:50:05 -04:00
Eden Halperin
cb039d9b9e include noveg in wetland bucket 2014-05-22 14:39:56 -07:00
Eden Halperin
cbe84299ed slight adjustments to landcover colors for contrast discrepencies 2014-05-22 12:01:34 -07:00
Eden Halperin
5bb1d151d4 transition bigger airport poi 2014-05-22 11:50:38 -07:00
Eden Halperin
7012d686fc landuse_snow structure 2014-05-22 11:09:59 -07:00
Eden Halperin
3efbe29199 add landuse_snow bucket 2014-05-22 11:05:49 -07:00
Konstantin Käfer
dffbb673ea read style filename from gyp file 2014-05-22 15:10:10 +02:00
Eden Halperin
1cfa10753a remove transition properties, fix poi label size descrepancy 2014-05-21 16:01:23 -07:00
Eden Halperin
4f44337ae4 lighter waterway labels 2014-05-21 14:57:52 -07:00
Eden Halperin
9626f3057b night style updates 2014-05-21 14:36:50 -07:00
Eden Halperin
3d7906e590 lighten night admin color 2014-05-21 12:04:26 -07:00
Eden Halperin
61dc88bfec add barrier_line styles 2014-05-21 11:25:01 -07:00
Eden Halperin
05f309ac22 more constants 2014-05-21 10:38:26 -07:00
Eden Halperin
e855c7734d Merge branch 'master' of https://github.com/mapbox/llmr-native 2014-05-21 10:23:18 -07:00
Eden Halperin
429850866a width functions as constants 2014-05-21 10:23:09 -07:00
Nicki Dlugash
cc4af71d44 updated night hillshade colors and opacity 2014-05-21 13:22:05 -04:00
Konstantin Käfer
752661ae6e allow functions to be referenced from constants
fixes #224
2014-05-21 10:29:36 +02:00
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