diff options
| author | Nicki Dlugash <nicki@mapbox.com> | 2014-05-30 14:22:16 -0400 |
|---|---|---|
| committer | Nicki Dlugash <nicki@mapbox.com> | 2014-05-30 14:22:16 -0400 |
| commit | eb394de325837f249e106f033c899e32d04e7c2e (patch) | |
| tree | 903a8a1fea1e06d3ea8e8448c072bee36c46d1cf /bin | |
| parent | afc72ee055057b0513f1cc2b8a1bff393108dbdf (diff) | |
| parent | 59774f7e93e207c49364c8cb0908038606f5dd8c (diff) | |
| download | qtlocation-mapboxgl-eb394de325837f249e106f033c899e32d04e7c2e.tar.gz | |
Merge branch 'master' into label-styles-line-break
Conflicts:
bin/style.js
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/style.js | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/bin/style.js b/bin/style.js index 11dc338066..367ae1f2b4 100644 --- a/bin/style.js +++ b/bin/style.js @@ -765,6 +765,7 @@ module.exports = { "path": "horizontal", "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 18, + "maxWidth": 6, "feature_type": "point", "type": "text" }, @@ -878,6 +879,9 @@ module.exports = { "text_field": "name", "path": "horizontal", "padding": 2, + "maxWidth": 8, + "verticalAlignment": "top", + "translate": [0, -1], "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 12, "feature_type": "point", @@ -892,6 +896,9 @@ module.exports = { "text_field": "name", "path": "horizontal", "padding": 2, + "maxWidth": 8, + "verticalAlignment": "top", + "translate": [0, -1], "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 11, "feature_type": "point", @@ -906,6 +913,9 @@ module.exports = { "text_field": "name", "path": "horizontal", "padding": 2, + "maxWidth": 8, + "verticalAlignment": "top", + "translate": [0, -1], "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 10, "feature_type": "point", @@ -2429,7 +2439,6 @@ module.exports = { "stroke": "land", "strokeWidth": 0.3, "strokeBlur": 1, - //"translate": [0, 14] }, "poi_label_3": { "color": "#444", @@ -2437,7 +2446,6 @@ module.exports = { "stroke": "land", "strokeWidth": 0.3, "strokeBlur": 1, - //"translate": [0, 14], "opacity": [ "stops", {"z": 16.5, "val": 0}, @@ -2455,7 +2463,6 @@ module.exports = { "stroke": "land", "strokeWidth": 0.3, "strokeBlur": 1, - //"translate": [0, 14] }, "poi_aerodrome": { "opacity": ["stops", @@ -3181,7 +3188,6 @@ module.exports = { "stroke": "text2_stroke_night", "strokeWidth": 0.3, "strokeBlur": 1, - //"translate": [0, 14] }, "poi_label_3": { "color": "#fff", @@ -3189,7 +3195,6 @@ module.exports = { "stroke": "text2_stroke_night", "strokeWidth": 0.3, "strokeBlur": 1, - //"translate": [0, 14], "opacity": [ "stops", {"z": 16.5, "val": 0}, @@ -3207,7 +3212,6 @@ module.exports = { "stroke": "text2_stroke_night", "strokeWidth": 0.3, "strokeBlur": 1, - //"translate": [0, 14] }, "poi_aerodrome": { "opacity": ["stops", |