Commit Graph

164 Commits

Author SHA1 Message Date
Konstantin Käfer
1be972eb15 Allow property functions for prerender properties, but tie them to the tile's zoom level instead of the map zoom level
fixes #253
2014-06-01 17:43:12 +02:00
Justin R. Miller
a81a336638 programmatic styling API 2014-05-31 11:32:42 -07:00
Nicki Dlugash
1d8c40870f maxWidth for country, place, and water labels 2014-05-30 18:54:43 -04:00
Nicki Dlugash
600acd89ac changed all labels to name_en 2014-05-30 17:52:07 -04:00
Nicki Dlugash
49dac9bfba added new style properties to largest marine labels 2014-05-30 17:46:42 -04:00
Nicki Dlugash
62c7eab83d tweaked hillshade opacities 2014-05-30 17:04:59 -04:00
Nicki Dlugash
7257bbe8ad reduce to three font stacks and updates to compensate 2014-05-30 16:23:33 -04:00
Nicki Dlugash
4f6e2fcd2a contour labels and waterway label style updates 2014-05-30 16:19:04 -04:00
Nicki Dlugash
2af43684b2 Merge branch 'master' into label-styles-line-break 2014-05-30 15:40:40 -04:00
Konstantin Käfer
c5fd7a0cdd add token replacement system
fixes #212
2014-05-30 21:13:55 +02:00
Nicki Dlugash
aedb8dbb90 fixed poi translate 2014-05-30 14:36:33 -04:00
Nicki Dlugash
eb394de325 Merge branch 'master' into label-styles-line-break
Conflicts:
	bin/style.js
2014-05-30 14:22:16 -04:00
Nicki Dlugash
afc72ee055 removed translate property from poi label classes, added to bucket 2014-05-30 14:19:45 -04:00
Nicki Dlugash
3ba2002c49 poi label size refinement 2014-05-30 14:13:13 -04:00
Ansis Brammanis
7c653895c6 translate as a text bucket property
When used, text is translated before being checked for collisions.
2014-05-30 03:50:25 -04:00
Ansis Brammanis
9057c4980d line wrapping 2014-05-30 01:32:15 -04:00
Mike Morris
3442403e67 parse maxWidth, lineHeight and alignment, pass to FontStack::getShaping 2014-05-30 00:07:22 -04:00
Nicki Dlugash
3003085763 new font stack deployed. Made Arial Unicode Bold fallback for Open Sans Semibold 2014-05-29 15:50:04 -04:00
Nicki Dlugash
7b7e8007e3 temporarily changed country label font back to original 2014-05-29 15:44:38 -04:00
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