From 3ba2002c49b3faddadc8419ccf1bab6ee235ec43 Mon Sep 17 00:00:00 2001 From: Nicki Dlugash Date: Fri, 30 May 2014 14:13:13 -0400 Subject: [PATCH 1/9] poi label size refinement --- bin/style.js | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/bin/style.js b/bin/style.js index c831fd414..6a899e1d0 100644 --- a/bin/style.js +++ b/bin/style.js @@ -879,7 +879,7 @@ module.exports = { "path": "horizontal", "padding": 2, "font": "Open Sans Semibold, Arial Unicode MS Bold", - "fontSize": 11, + "fontSize": 12, "feature_type": "point", "type": "text" }, @@ -892,7 +892,7 @@ module.exports = { "path": "horizontal", "padding": 2, "font": "Open Sans Semibold, Arial Unicode MS Bold", - "fontSize": 10, + "fontSize": 11, "feature_type": "point", "type": "text" }, @@ -1704,6 +1704,17 @@ module.exports = { "stops", {"z": 1, "val": 14}, {"z": 12, "val": 24} + ], + "poi_label_1-2_size": [ + "stops", + {"z": 15, "val": 10}, + {"z": 16, "val": 11}, + {"z": 17, "val": 12} + ], + "poi_label_3_size": [ + "stops", + {"z": 16, "val": 10}, + {"z": 17, "val": 11} ] }, "classes": [ @@ -2411,7 +2422,7 @@ module.exports = { }, "poi_label_1-2": { "color": "#444", - "size": 11, + "size": "poi_label_1-2_size", "stroke": "land", "strokeWidth": 0.3, "strokeBlur": 1, @@ -2419,7 +2430,7 @@ module.exports = { }, "poi_label_3": { "color": "#444", - "size": 10, + "size": "poi_label_3_size", "stroke": "land", "strokeWidth": 0.3, "strokeBlur": 1, @@ -3163,7 +3174,7 @@ module.exports = { }, "poi_label_1-2": { "color": "#fff", - "size": 11, + "size": "poi_label_1-2_size", "stroke": "text2_stroke_night", "strokeWidth": 0.3, "strokeBlur": 1, @@ -3171,7 +3182,7 @@ module.exports = { }, "poi_label_3": { "color": "#fff", - "size": 10, + "size": "poi_label_3_size", "stroke": "text2_stroke_night", "strokeWidth": 0.3, "strokeBlur": 1, From afc72ee055057b0513f1cc2b8a1bff393108dbdf Mon Sep 17 00:00:00 2001 From: Nicki Dlugash Date: Fri, 30 May 2014 14:19:45 -0400 Subject: [PATCH 2/9] removed translate property from poi label classes, added to bucket --- bin/style.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/bin/style.js b/bin/style.js index 6a899e1d0..11dc33806 100644 --- a/bin/style.js +++ b/bin/style.js @@ -881,7 +881,8 @@ module.exports = { "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 12, "feature_type": "point", - "type": "text" + "type": "text", + "translate": [0, 1], // em }, "poi_label_3": { "source": "outdoors", @@ -894,7 +895,8 @@ module.exports = { "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 11, "feature_type": "point", - "type": "text" + "type": "text", + "translate": [0, 1], // em }, "poi_label_4": { "source": "outdoors", @@ -907,7 +909,8 @@ module.exports = { "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 10, "feature_type": "point", - "type": "text" + "type": "text", + "translate": [0, 1], // em } }, "structure": [ @@ -2426,7 +2429,7 @@ module.exports = { "stroke": "land", "strokeWidth": 0.3, "strokeBlur": 1, - "translate": [0, 14] + //"translate": [0, 14] }, "poi_label_3": { "color": "#444", @@ -2434,7 +2437,7 @@ module.exports = { "stroke": "land", "strokeWidth": 0.3, "strokeBlur": 1, - "translate": [0, 14], + //"translate": [0, 14], "opacity": [ "stops", {"z": 16.5, "val": 0}, @@ -2452,7 +2455,7 @@ module.exports = { "stroke": "land", "strokeWidth": 0.3, "strokeBlur": 1, - "translate": [0, 14] + //"translate": [0, 14] }, "poi_aerodrome": { "opacity": ["stops", @@ -3178,7 +3181,7 @@ module.exports = { "stroke": "text2_stroke_night", "strokeWidth": 0.3, "strokeBlur": 1, - "translate": [0, 14] + //"translate": [0, 14] }, "poi_label_3": { "color": "#fff", @@ -3186,7 +3189,7 @@ module.exports = { "stroke": "text2_stroke_night", "strokeWidth": 0.3, "strokeBlur": 1, - "translate": [0, 14], + //"translate": [0, 14], "opacity": [ "stops", {"z": 16.5, "val": 0}, @@ -3204,7 +3207,7 @@ module.exports = { "stroke": "text2_stroke_night", "strokeWidth": 0.3, "strokeBlur": 1, - "translate": [0, 14] + //"translate": [0, 14] }, "poi_aerodrome": { "opacity": ["stops", From aedb8dbb900015209d5d558489a02267d5707514 Mon Sep 17 00:00:00 2001 From: Nicki Dlugash Date: Fri, 30 May 2014 14:36:33 -0400 Subject: [PATCH 3/9] fixed poi translate --- bin/style.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/bin/style.js b/bin/style.js index 367ae1f2b..94d3aa0d2 100644 --- a/bin/style.js +++ b/bin/style.js @@ -886,7 +886,6 @@ module.exports = { "fontSize": 12, "feature_type": "point", "type": "text", - "translate": [0, 1], // em }, "poi_label_3": { "source": "outdoors", @@ -903,7 +902,6 @@ module.exports = { "fontSize": 11, "feature_type": "point", "type": "text", - "translate": [0, 1], // em }, "poi_label_4": { "source": "outdoors", @@ -920,7 +918,6 @@ module.exports = { "fontSize": 10, "feature_type": "point", "type": "text", - "translate": [0, 1], // em } }, "structure": [ @@ -3187,7 +3184,7 @@ module.exports = { "size": "poi_label_1-2_size", "stroke": "text2_stroke_night", "strokeWidth": 0.3, - "strokeBlur": 1, + "strokeBlur": 1 }, "poi_label_3": { "color": "#fff", @@ -3211,7 +3208,7 @@ module.exports = { ], "stroke": "text2_stroke_night", "strokeWidth": 0.3, - "strokeBlur": 1, + "strokeBlur": 1 }, "poi_aerodrome": { "opacity": ["stops", From 4f6e2fcd2a1537f1a381868caf7b4d9562ddee38 Mon Sep 17 00:00:00 2001 From: Nicki Dlugash Date: Fri, 30 May 2014 16:19:04 -0400 Subject: [PATCH 4/9] contour labels and waterway label style updates --- bin/style.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/style.js b/bin/style.js index b99e41023..998918421 100644 --- a/bin/style.js +++ b/bin/style.js @@ -270,7 +270,8 @@ module.exports = { "font": "Open Sans Regular, Arial Unicode MS Regular", "fontSize": 10, "feature_type": "line", - "type": "text" + "type": "text", + "maxAngleDelta": 0.5 }, "building": { "source": "outdoors", @@ -828,9 +829,9 @@ module.exports = { "path": "curve", "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", "fontSize": 12, - "textMinDistance": 15, "feature_type": "line", - "type": "text" + "type": "text", + "maxAngleDelta": 0.5 }, "poi": { "source": "outdoors", @@ -1945,6 +1946,13 @@ module.exports = { {"z": 13, "val": 0.11} ] }, + "contour_label": { + "color": "text", + "stroke": "land", + "strokeWidth": 0.3, + "strokeBlur": 3, + "size": 10 + }, "water": { "color": "water", "stroke": "#a2bdc0" From 7257bbe8adf70b49bacfddfecc8674a6480367ab Mon Sep 17 00:00:00 2001 From: Nicki Dlugash Date: Thu, 29 May 2014 16:40:57 -0400 Subject: [PATCH 5/9] reduce to three font stacks and updates to compensate --- bin/style.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/style.js b/bin/style.js index 998918421..95a6618df 100644 --- a/bin/style.js +++ b/bin/style.js @@ -650,7 +650,7 @@ module.exports = { "layer": "country_label", "text_field": "{{name}}", "path": "horizontal", - "font": "Open Sans Bold, Arial Unicode MS Bold", + "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 24, "feature_type": "point", "type": "text" @@ -667,7 +667,7 @@ module.exports = { "type": "text", "text_field": "{{name}}", "path": "curve", - "font": "Open Sans Italic, Arial Unicode MS Regular", + "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", "fontSize": 16 }, "marine_label_point_1": { @@ -679,7 +679,7 @@ module.exports = { "path": "horizontal", "field": "labelrank", "value": 1, - "font": "Open Sans Italic, Arial Unicode MS Regular", + "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", "fontSize": 30 }, "marine_label_point_2": { @@ -691,7 +691,7 @@ module.exports = { "path": "horizontal", "field": "labelrank", "value": 2, - "font": "Open Sans Italic, Arial Unicode MS Regular", + "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", "fontSize": 24 }, "marine_label_point_other": { @@ -703,7 +703,7 @@ module.exports = { "path": "horizontal", "field": "labelrank", "value": [3,4,5,6], - "font": "Open Sans Italic, Arial Unicode MS Regular", + "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", "fontSize": 18 }, "state_label": { @@ -1463,7 +1463,7 @@ module.exports = { "street": "#fff", "text": "#666", "text_stroke": "rgba(255,255,255,0.8)", - "country_text": "#333", + "country_text": "#222", "marine_text": "#a0bdc0", "water_text": "#185869", @@ -3026,7 +3026,8 @@ module.exports = { "country_label": { "color": "text_night", "stroke": "text2_stroke_night", - "strokeWidth": 0.5, + "strokeWidth": 0.4, + "strokeBlur": 2, "size": "country_label_size" }, "country_label_line": { @@ -3060,7 +3061,7 @@ module.exports = { "stroke": "water_night" }, "marine_label_point_other": { - "color": "#a9c4c7", + "color": "water_dark_night", "size": ["stops", {"z": 3, "val": 12}, {"z": 4, "val": 13}, From 62c7eab83d199a8c6393038a8ecd093d54f9c305 Mon Sep 17 00:00:00 2001 From: Nicki Dlugash Date: Fri, 30 May 2014 17:04:59 -0400 Subject: [PATCH 6/9] tweaked hillshade opacities --- bin/style.js | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/bin/style.js b/bin/style.js index 95a6618df..4b44d56ba 100644 --- a/bin/style.js +++ b/bin/style.js @@ -264,9 +264,9 @@ module.exports = { "source": "outdoors", "layer": "contour", "field": "index", - "value": 10, + "value": [5, 10], "path": "curve", - "text_field": "{{ele}}m", + "text_field": "{{ele}} m", "font": "Open Sans Regular, Arial Unicode MS Regular", "fontSize": 10, "feature_type": "line", @@ -1884,9 +1884,11 @@ module.exports = { "prerender-blur": 1, "opacity": [ "stops", - {"z": 15, "val": 0.075}, + {"z": 15, "val": 0.08}, + {"z": 16, "val": 0.075}, {"z": 17, "val": 0.05}, - {"z": 18, "val": 0.025} + {"z": 18, "val": 0.05}, + {"z": 19, "val": 0.025} ] }, "hillshade_medium_shadow": { @@ -1897,9 +1899,11 @@ module.exports = { "prerender-blur": 1, "opacity": [ "stops", - {"z": 15, "val": 0.075}, + {"z": 15, "val": 0.08}, + {"z": 16, "val": 0.075}, {"z": 17, "val": 0.05}, - {"z": 18, "val": 0.025} + {"z": 18, "val": 0.05}, + {"z": 19, "val": 0.025} ] }, "hillshade_full_highlight": { @@ -1911,8 +1915,10 @@ module.exports = { "opacity": [ "stops", {"z": 15, "val": 0.3}, + {"z": 16, "val": 0.3}, {"z": 17, "val": 0.2}, - {"z": 18, "val": 0.1} + {"z": 18, "val": 0.2}, + {"z": 19, "val": 0.1} ] }, "hillshade_medium_highlight": { @@ -1924,8 +1930,10 @@ module.exports = { "opacity": [ "stops", {"z": 15, "val": 0.3}, + {"z": 16, "val": 0.3}, {"z": 17, "val": 0.2}, - {"z": 18, "val": 0.1} + {"z": 18, "val": 0.2}, + {"z": 19, "val": 0.1} ] }, "contour_line_loud": { @@ -2642,7 +2650,8 @@ module.exports = { "stops", {"z": 16, "val": 0.3}, {"z": 17, "val": 0.2}, - {"z": 18, "val": 0.1} + {"z": 18, "val": 0.1}, + {"z": 19, "val": 0.05} ] }, "hillshade_medium_shadow": { @@ -2655,7 +2664,8 @@ module.exports = { "stops", {"z": 16, "val": 0.3}, {"z": 17, "val": 0.2}, - {"z": 18, "val": 0.1} + {"z": 18, "val": 0.1}, + {"z": 19, "val": 0.05} ] }, "hillshade_full_highlight": { @@ -2669,7 +2679,8 @@ module.exports = { {"z": 14, "val": 0.4}, {"z": 15, "val": 0.3}, {"z": 17, "val": 0.2}, - {"z": 18, "val": 0.1} + {"z": 18, "val": 0.1}, + {"z": 19, "val": 0.05} ] }, "hillshade_medium_highlight": { @@ -2682,7 +2693,8 @@ module.exports = { "stops", {"z": 15, "val": 0.3}, {"z": 17, "val": 0.2}, - {"z": 18, "val": 0.15} + {"z": 18, "val": 0.15}, + {"z": 19, "val": 0.05} ] }, "contour_line_loud": { @@ -2703,6 +2715,13 @@ module.exports = { {"z": 13, "val": 0.4} ] }, + "contour_label": { + "color": "contour_night", + "stroke": "land_night", + "strokeWidth": 0.3, + "strokeBlur": 3, + "size": 10 + }, "water": { "color": "water_night", "stroke": "water_dark_night" From 49dac9bfbad0c7f46c70e033d198190a7fa654b2 Mon Sep 17 00:00:00 2001 From: Nicki Dlugash Date: Fri, 30 May 2014 17:46:42 -0400 Subject: [PATCH 7/9] added new style properties to largest marine labels --- bin/style.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/style.js b/bin/style.js index 4b44d56ba..733cb0c02 100644 --- a/bin/style.js +++ b/bin/style.js @@ -680,7 +680,10 @@ module.exports = { "field": "labelrank", "value": 1, "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", - "fontSize": 30 + "fontSize": 30, + "maxWidth": 8, + "letterSpacing": 0.4, + "lineHeight": 2, }, "marine_label_point_2": { "source": "outdoors", @@ -692,7 +695,10 @@ module.exports = { "field": "labelrank", "value": 2, "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", - "fontSize": 24 + "fontSize": 24, + "maxWidth": 8, + "letterSpacing": 0.4, + "lineHeight": 1.5, }, "marine_label_point_other": { "source": "outdoors", From 600acd89ac803a8d46ea773fb5d3e5d0e6778e45 Mon Sep 17 00:00:00 2001 From: Nicki Dlugash Date: Fri, 30 May 2014 17:52:07 -0400 Subject: [PATCH 8/9] changed all labels to name_en --- bin/style.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/bin/style.js b/bin/style.js index 733cb0c02..1782aff33 100644 --- a/bin/style.js +++ b/bin/style.js @@ -648,7 +648,7 @@ module.exports = { "country_label": { "source": "outdoors", "layer": "country_label", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 24, @@ -665,7 +665,7 @@ module.exports = { "layer": "marine_label", "feature_type": "line", "type": "text", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "curve", "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", "fontSize": 16 @@ -675,7 +675,7 @@ module.exports = { "layer": "marine_label", "feature_type": "point", "type": "text", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "field": "labelrank", "value": 1, @@ -690,7 +690,7 @@ module.exports = { "layer": "marine_label", "feature_type": "point", "type": "text", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "field": "labelrank", "value": 2, @@ -705,7 +705,7 @@ module.exports = { "layer": "marine_label", "feature_type": "point", "type": "text", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "field": "labelrank", "value": [3,4,5,6], @@ -715,7 +715,7 @@ module.exports = { "state_label": { "source": "outdoors", "layer": "state_label", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "font": "Open Sans Regular, Arial Unicode MS Regular", "fontSize": 16, @@ -728,7 +728,7 @@ module.exports = { "layer": "place_label", "field": "type", "value": "city", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 20, @@ -740,7 +740,7 @@ module.exports = { "layer": "place_label", "field": "type", "value": "town", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 24, @@ -752,7 +752,7 @@ module.exports = { "layer": "place_label", "field": "type", "value": "village", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 22, @@ -768,7 +768,7 @@ module.exports = { "suburb", "neighbourhood" ], - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 18, @@ -781,7 +781,7 @@ module.exports = { "layer": "road_label", "field": "class", "value": ["motorway","main"], - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "curve", "padding": 2, "font": "Open Sans Regular, Arial Unicode MS Regular", @@ -795,7 +795,7 @@ module.exports = { "layer": "road_label", "field": "class", "value": ["street","street_limited"], - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "curve", "padding": 2, "font": "Open Sans Regular, Arial Unicode MS Regular", @@ -809,7 +809,7 @@ module.exports = { "layer": "road_label", "field": "class", "value": ["service","driveway","path"], - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "curve", "padding": 2, "font": "Open Sans Regular, Arial Unicode MS Regular", @@ -821,7 +821,7 @@ module.exports = { "water_label": { "source": "outdoors", "layer": "water_label", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", "fontSize": 12, @@ -831,7 +831,7 @@ module.exports = { "waterway_label": { "source": "outdoors", "layer": "waterway_label", - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "curve", "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", "fontSize": 12, @@ -883,7 +883,7 @@ module.exports = { 1, 2 ], - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "padding": 2, "maxWidth": 8, @@ -899,7 +899,7 @@ module.exports = { "layer": "poi_label", "field": "scalerank", "value": 3, - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "padding": 2, "maxWidth": 8, @@ -915,7 +915,7 @@ module.exports = { "layer": "poi_label", "field": "scalerank", "value": 4, - "text_field": "{{name}}", + "text_field": "{{name_en}}", "path": "horizontal", "padding": 2, "maxWidth": 8, From 1d8c40870f69669a7e4c3dc72565bd34b5e40aa5 Mon Sep 17 00:00:00 2001 From: Nicki Dlugash Date: Fri, 30 May 2014 18:54:43 -0400 Subject: [PATCH 9/9] maxWidth for country, place, and water labels --- bin/style.js | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/bin/style.js b/bin/style.js index 1782aff33..0a389f6be 100644 --- a/bin/style.js +++ b/bin/style.js @@ -653,7 +653,8 @@ module.exports = { "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 24, "feature_type": "point", - "type": "text" + "type": "text", + "maxWidth": 5, }, "country_label_line": { "source": "outdoors", @@ -721,7 +722,8 @@ module.exports = { "fontSize": 16, "feature_type": "point", "type": "text", - "enabled": 4 + "enabled": 4, + "maxWidth": 8 }, "place_label_city": { "source": "outdoors", @@ -733,7 +735,8 @@ module.exports = { "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 20, "feature_type": "point", - "type": "text" + "type": "text", + "maxWidth": 8 }, "place_label_town": { "source": "outdoors", @@ -745,7 +748,8 @@ module.exports = { "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 24, "feature_type": "point", - "type": "text" + "type": "text", + "maxWidth": 8 }, "place_label_village": { "source": "outdoors", @@ -757,7 +761,8 @@ module.exports = { "font": "Open Sans Semibold, Arial Unicode MS Bold", "fontSize": 22, "feature_type": "point", - "type": "text" + "type": "text", + "maxWidth": 8 }, "place_label_other": { "source": "outdoors", @@ -774,7 +779,7 @@ module.exports = { "fontSize": 18, "maxWidth": 6, "feature_type": "point", - "type": "text" + "type": "text", }, "road_label_1": { "source": "outdoors", @@ -826,7 +831,8 @@ module.exports = { "font": "Open Sans Semibold Italic, Arial Unicode MS Bold", "fontSize": 12, "feature_type": "point", - "type": "text" + "type": "text", + "maxWidth": 8 }, "waterway_label": { "source": "outdoors", @@ -886,7 +892,7 @@ module.exports = { "text_field": "{{name_en}}", "path": "horizontal", "padding": 2, - "maxWidth": 8, + "maxWidth": 10, "verticalAlignment": "top", "translate": [0, -1], "font": "Open Sans Semibold, Arial Unicode MS Bold", @@ -902,7 +908,7 @@ module.exports = { "text_field": "{{name_en}}", "path": "horizontal", "padding": 2, - "maxWidth": 8, + "maxWidth": 10, "verticalAlignment": "top", "translate": [0, -1], "font": "Open Sans Semibold, Arial Unicode MS Bold", @@ -918,7 +924,7 @@ module.exports = { "text_field": "{{name_en}}", "path": "horizontal", "padding": 2, - "maxWidth": 8, + "maxWidth": 10, "verticalAlignment": "top", "translate": [0, -1], "font": "Open Sans Semibold, Arial Unicode MS Bold", @@ -1492,6 +1498,7 @@ module.exports = { "admin_night": "#ffb680", "text_night": "#fff", + "text_water_night": "#2a5b8a", "text_stroke_night": "#103", "text2_stroke_night": "rgba(1,69,89,0.8)", @@ -3184,14 +3191,12 @@ module.exports = { "size": "road_label_3_size" }, "water_label": { - "color": "water_dark_night", - "strokeWidth": 0.8, - "stroke": "text2_stroke_night" + "color": "text_water_night", + "stroke": "water_night", }, "waterway_label": { - "color": "water_dark_night", - "strokeWidth": 0.8, - "stroke": "text2_stroke_night" + "color": "text_water_night", + "stroke": "water_night", }, "poi": { "color": "white",