Merge branch 'stylesource' into fuzz-pipe

Conflicts:
	src/map/source.cpp
	src/style/style_layer.cpp

1 files changed, 119 insertions, 120 deletions

diff --git a/bin/style.json b/bin/style.json
index be5bdc9bd4..dc6eb78dda 100755
--- a/bin/style.json
+++ b/bin/style.json
@@ -6,7 +6,6 @@
     "mapbox": {
       "type": "vector",
       "url": "mapbox://mapbox.mapbox-terrain-v1,mapbox.mapbox-streets-v5",
-      "tileSize": 512,
       "maxZoom": 14
     }
   },
@@ -66,124 +65,124 @@
     "@contour_night": "#ffff80",
     "@river_canal_width": {
       "fn": "stops",
-      "stops": [[11, 0.5], [12, 1], [14, 2], [16, 3]]
+      "stops": [[10, 0.5], [11, 1], [13, 2], [15, 3]]
     },
     "@stream_width": {
       "fn": "stops",
-      "stops": [[13, 0.25], [14, 0.5], [16, 1.5], [18, 2]]
+      "stops": [[12, 0.25], [13, 0.5], [15, 1.5], [17, 2]]
     },
     "@motorway_width": {
       "fn": "stops",
-      "stops": [[5, 0], [6, 0.5], [8, 0.8], [10, 1], [11, 1.2], [12, 2], [13, 3], [14, 4], [15, 6], [16, 9], [17, 12], [18, 14]]
+      "stops": [[4, 0], [5, 0.5], [7, 0.8], [9, 1], [10, 1.2], [11, 2], [12, 3], [13, 4], [14, 6], [15, 9], [16, 12], [17, 14]]
     },
     "@motorway_casing_width": {
       "fn": "stops",
-      "stops": [[7.5, 0.6], [8, 0.8], [10, 2.8], [11, 3], [12, 4], [13, 5], [14, 6.5], [15, 9], [16, 12], [17, 15], [18, 17]]
+      "stops": [[6.5, 0.6], [7, 0.8], [9, 2.8], [10, 3], [11, 4], [12, 5], [13, 6.5], [14, 9], [15, 12], [16, 15], [17, 17]]
     },
     "@motorway_link_width": {
       "fn": "stops",
-      "stops": [[12, 1.2], [14, 2], [16, 3], [18, 4]]
+      "stops": [[11, 1.2], [13, 2], [15, 3], [17, 4]]
     },
     "@motorway_link_casing_width": {
       "fn": "stops",
-      "stops": [[12, 2.8], [14, 3.5], [16, 5], [18, 6]]
+      "stops": [[11, 2.8], [13, 3.5], [15, 5], [17, 6]]
     },
     "@main_width": {
       "fn": "stops",
-      "stops": [[5, 1], [12, 1], [13, 1.5], [14, 2], [15, 3], [16, 6], [17, 10], [18, 12]]
+      "stops": [[4, 1], [11, 1], [12, 1.5], [13, 2], [14, 3], [15, 6], [16, 10], [17, 12]]
     },
     "@main_casing_width": {
       "fn": "stops",
-      "stops": [[9, 2.9], [12, 2.9], [13, 3.5], [14, 4], [15, 5.5], [16, 9], [17, 12], [18, 14]]
+      "stops": [[8, 2.9], [11, 2.9], [12, 3.5], [13, 4], [14, 5.5], [15, 9], [16, 12], [17, 14]]
     },
     "@street_width": {
       "fn": "stops",
-      "stops": [[14.5, 0], [15, 1.5], [16, 3], [17, 8]]
+      "stops": [[13.5, 0], [14, 1.5], [15, 3], [16, 8]]
     },
     "@street_casing_width": {
       "fn": "stops",
-      "stops": [[13, 0.4], [14, 1], [15, 2.5], [16, 4], [17, 10]]
+      "stops": [[12, 0.4], [13, 1], [14, 2.5], [15, 4], [16, 10]]
     },
     "@street_casing_opacity": {
       "fn": "stops",
-      "stops": [[14, 0], [14.5, 1]]
+      "stops": [[13, 0], [13.5, 1]]
     },
     "@service_casing_width": {
       "fn": "stops",
-      "stops": [[14, 0.5], [15, 3], [16, 3.5], [17, 4], [18, 5], [19, 6]]
+      "stops": [[13, 0.5], [14, 3], [15, 3.5], [16, 4], [17, 5], [18, 6]]
     },
     "@runway_width": {
       "fn": "stops",
-      "stops": [[10, 1], [11, 2], [12, 3], [13, 5], [14, 7], [15, 11], [16, 15], [17, 19], [18, 23]]
+      "stops": [[9, 1], [10, 2], [11, 3], [12, 5], [13, 7], [14, 11], [15, 15], [16, 19], [17, 23]]
     },
     "@taxiway_width": {
       "fn": "stops",
-      "stops": [[10, 0.2], [12, 0.2], [13, 1], [14, 1.5], [15, 2], [16, 3], [17, 4], [18, 5]]
+      "stops": [[9, 0.2], [11, 0.2], [12, 1], [13, 1.5], [14, 2], [15, 3], [16, 4], [17, 5]]
     },
     "@aerialway_width": {
       "fn": "stops",
-      "stops": [[13.5, 0.8], [14, 1.4], [15, 1.6], [16, 2], [17, 2.4], [18, 3]]
+      "stops": [[12.5, 0.8], [13, 1.4], [14, 1.6], [15, 2], [16, 2.4], [17, 3]]
     },
     "@aerialway_casing_width": {
       "fn": "stops",
-      "stops": [[13.5, 2], [14, 2.5], [15, 3], [16, 3.5], [17, 4], [22, 5]]
+      "stops": [[12.5, 2], [13, 2.5], [14, 3], [15, 3.5], [16, 4], [21, 5]]
     },
     "@path_width": {
       "fn": "stops",
-      "stops": [[14, 1.2], [15, 1.5], [16, 1.8]]
+      "stops": [[13, 1.2], [14, 1.5], [15, 1.8]]
     },
     "@admin_l2_width": {
       "fn": "stops",
-      "stops": [[2, 0.5], [3, 0.7], [4, 0.7], [5, 0.8], [6, 1], [8, 2], [10, 3]]
+      "stops": [[1, 0.5], [2, 0.7], [3, 0.7], [4, 0.8], [5, 1], [7, 2], [9, 3]]
     },
     "@admin_l3_width": {
       "fn": "stops",
-      "stops": [[6, 0.6], [8, 1], [12, 2]]
+      "stops": [[5, 0.6], [7, 1], [11, 2]]
     },
     "@road_label_1_size": {
       "fn": "stops",
-      "stops": [[13, 11], [14, 12], [15, 13], [16, 14], [17, 16], [18, 18]]
+      "stops": [[12, 11], [13, 12], [14, 13], [15, 14], [16, 16], [17, 18]]
     },
     "@road_label_2_size": {
       "fn": "stops",
-      "stops": [[13, 11], [14, 12], [16, 14], [18, 16]]
+      "stops": [[12, 11], [13, 12], [15, 14], [17, 16]]
     },
     "@road_label_3_size": {
       "fn": "stops",
-      "stops": [[15, 10], [16, 12], [18, 14]]
+      "stops": [[14, 10], [15, 12], [17, 14]]
     },
     "@fence_width": {
       "fn": "stops",
-      "stops": [[17, 0.6], [19, 1]]
+      "stops": [[16, 0.6], [18, 1]]
     },
     "@hedge_width": {
       "fn": "stops",
-      "stops": [[16, 0.6], [17, 1.2], [19, 1.6]]
+      "stops": [[15, 0.6], [16, 1.2], [18, 1.6]]
     },
     "@barrier_line_land_width": {
       "fn": "stops",
-      "stops": [[14, 0.4], [15, 0.75], [16, 1.5], [17, 3], [18, 6], [19, 12], [20, 24], [21, 48]]
+      "stops": [[13, 0.4], [14, 0.75], [15, 1.5], [16, 3], [17, 6], [18, 12], [19, 24], [20, 48]]
     },
     "@country_label_size": {
       "fn": "stops",
-      "stops": [[1, 14], [12, 24]]
+      "stops": [[0, 14], [11, 24]]
     },
     "@poi_label_1-2_size": {
       "fn": "stops",
-      "stops": [[15, 10], [16, 11], [17, 12]]
+      "stops": [[14, 10], [15, 11], [16, 12]]
     },
     "@poi_label_3_size": {
       "fn": "stops",
-      "stops": [[16, 10], [17, 11]]
+      "stops": [[15, 10], [16, 11]]
     },
     "@hillshade_rasterize": {
         "enabled": {
             "fn": "stops",
-            "stops": [[11, false], [12, true]]
+            "stops": [[10, false], [11, true]]
         },
         "size": {
             "fn": "stops",
-            "stops": [[11, 1024], [12, 512], [13, 256]]
+            "stops": [[10, 1024], [11, 512], [12, 256]]
         },
         "blur": 1
     }
@@ -231,14 +230,14 @@
       "fill-color": "@grass",
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[13, 1], [14, 0.8], [17, 0.2]]
+        "stops": [[12, 1], [13, 0.8], [16, 0.2]]
       }
     },
     "style.night": {
       "fill-color": "@grass_night",
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[13, 1], [14, 0.8], [17, 0.2]]
+        "stops": [[12, 1], [13, 0.8], [16, 0.2]]
       }
     }
   }, {
@@ -251,14 +250,14 @@
       "fill-color": "@scrub",
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[13, 1], [14, 0.8], [17, 0.2]]
+        "stops": [[12, 1], [13, 0.8], [16, 0.2]]
       }
     },
     "style.night": {
       "fill-color": "@scrub_night",
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[13, 1], [14, 0.8], [17, 0.2]]
+        "stops": [[12, 1], [13, 0.8], [16, 0.2]]
       }
     }
   }, {
@@ -271,14 +270,14 @@
       "fill-color": "@wood",
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[13, 1], [14, 0.8], [17, 0.2]]
+        "stops": [[12, 1], [13, 0.8], [16, 0.2]]
       }
     },
     "style.night": {
       "fill-color": "@wood_night",
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[13, 1], [14, 0.8], [17, 0.2]]
+        "stops": [[12, 1], [13, 0.8], [16, 0.2]]
       }
     }
   }, {
@@ -516,7 +515,7 @@
       "fill-translate": [1, 1],
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[16.5, 0], [17, 1]]
+        "stops": [[15.5, 0], [16, 1]]
       },
       "fill-outline-color": "#d5d1c6"
     },
@@ -525,7 +524,7 @@
       "fill-translate": [1, 1],
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[16.5, 0], [17, 1]]
+        "stops": [[15.5, 0], [16, 1]]
       },
       "fill-outline-color": "#026688"
     }
@@ -545,7 +544,7 @@
       "fill-color": "#ebe7db",
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[16.5, 0], [17, 0.7]]
+        "stops": [[15.5, 0], [16, 0.7]]
       },
       "fill-outline-color": "#d5d1c6"
     },
@@ -553,7 +552,7 @@
       "fill-color": "#027797",
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[16.5, 0], [17, 0.7]]
+        "stops": [[15.5, 0], [16, 0.7]]
       },
       "fill-outline-color": "#026688"
     }
@@ -569,7 +568,7 @@
       "fill-antialias": false,
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[15, 0.3], [16, 0.3], [17, 0.2], [18, 0.2], [19, 0.1]]
+        "stops": [[14, 0.3], [15, 0.3], [16, 0.2], [17, 0.2], [18, 0.1]]
       }
     },
     "style.night": {
@@ -577,7 +576,7 @@
       "fill-antialias": false,
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[14, 0.4], [15, 0.3], [17, 0.2], [18, 0.1], [19, 0.05]]
+        "stops": [[13, 0.4], [14, 0.3], [16, 0.2], [17, 0.1], [18, 0.05]]
       }
     }
   }, {
@@ -592,7 +591,7 @@
       "fill-antialias": false,
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[15, 0.3], [16, 0.3], [17, 0.2], [18, 0.2], [19, 0.1]]
+        "stops": [[14, 0.3], [15, 0.3], [16, 0.2], [17, 0.2], [18, 0.1]]
       }
     },
     "style.night": {
@@ -600,7 +599,7 @@
       "fill-antialias": false,
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[15, 0.3], [17, 0.2], [18, 0.15], [19, 0.05]]
+        "stops": [[14, 0.3], [16, 0.2], [17, 0.15], [18, 0.05]]
       }
     }
   }, {
@@ -615,7 +614,7 @@
       "fill-antialias": false,
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[15, 0.08], [16, 0.075], [17, 0.05], [18, 0.05], [19, 0.025]]
+        "stops": [[14, 0.08], [15, 0.075], [16, 0.05], [17, 0.05], [18, 0.025]]
       }
     },
     "style.night": {
@@ -623,7 +622,7 @@
       "fill-antialias": false,
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[16, 0.3], [17, 0.2], [18, 0.1], [19, 0.05]]
+        "stops": [[15, 0.3], [16, 0.2], [17, 0.1], [18, 0.05]]
       }
     }
   }, {
@@ -638,7 +637,7 @@
       "fill-antialias": false,
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[15, 0.08], [16, 0.075], [17, 0.05], [18, 0.05], [19, 0.025]]
+        "stops": [[14, 0.08], [15, 0.075], [16, 0.05], [17, 0.05], [18, 0.025]]
       }
     },
     "style.night": {
@@ -646,7 +645,7 @@
       "fill-antialias": false,
       "fill-opacity": {
         "fn": "stops",
-        "stops": [[16, 0.3], [17, 0.2], [18, 0.1], [19, 0.05]]
+        "stops": [[15, 0.3], [16, 0.2], [17, 0.1], [18, 0.05]]
       }
     }
   }, {
@@ -663,7 +662,7 @@
       "line-width": 0.9,
       "line-opacity": {
         "fn": "stops",
-        "stops": [[12, 0.05], [13, 0.11]]
+        "stops": [[11, 0.05], [12, 0.11]]
       }
     },
     "style.night": {
@@ -671,7 +670,7 @@
       "line-width": 0.9,
       "line-opacity": {
         "fn": "stops",
-        "stops": [[12, 0.1], [13, 0.2]]
+        "stops": [[11, 0.1], [12, 0.2]]
       }
     }
   }, {
@@ -687,7 +686,7 @@
       "line-width": 0.5,
       "line-opacity": {
         "fn": "stops",
-        "stops": [[12, 0.05], [13, 0.11]]
+        "stops": [[11, 0.05], [12, 0.11]]
       }
     },
     "style.night": {
@@ -695,7 +694,7 @@
       "line-width": 0.5,
       "line-opacity": {
         "fn": "stops",
-        "stops": [[12, 0.1], [13, 0.4]]
+        "stops": [[11, 0.1], [12, 0.4]]
       }
     }
   }, {
@@ -878,7 +877,7 @@
       "line-width": "@main_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9, 0], [10, 1]]
+        "stops": [[8, 0], [9, 1]]
       }
     },
     "style.night": {
@@ -887,7 +886,7 @@
       "line-width": "@main_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9, 0], [10, 1]]
+        "stops": [[8, 0], [9, 1]]
       }
     }
   }, {
@@ -947,7 +946,7 @@
       "line-width": "@main_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     },
     "style.night": {
@@ -955,7 +954,7 @@
       "line-width": "@main_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     }
   }, {
@@ -970,7 +969,7 @@
       "line-width": "@motorway_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9.5, 0], [10, 1]]
+        "stops": [[8.5, 0], [9, 1]]
       }
     },
     "style.night": {
@@ -979,7 +978,7 @@
       "line-width": "@motorway_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9.5, 0], [10, 1]]
+        "stops": [[8.5, 0], [9, 1]]
       }
     }
   }, {
@@ -990,7 +989,7 @@
       "line-width": "@motorway_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     },
     "style.night": {
@@ -998,7 +997,7 @@
       "line-width": "@motorway_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     }
   }, {
@@ -1012,7 +1011,7 @@
       "line-opacity": 0.4,
       "line-width": {
         "fn": "stops",
-        "stops": [[15, 3], [16, 4]]
+        "stops": [[14, 3], [15, 4]]
       }
     },
     "style.night": {
@@ -1047,7 +1046,7 @@
       "line-opacity": 0.8,
       "line-width": {
         "fn": "stops",
-        "stops": [[14, 0.8], [15, 0.9], [16, 1.2]]
+        "stops": [[13, 0.8], [14, 0.9], [15, 1.2]]
       }
     },
     "style.night": {
@@ -1056,7 +1055,7 @@
       "line-opacity": 0.8,
       "line-width": {
         "fn": "stops",
-        "stops": [[14, 0.8], [15, 0.9], [16, 1.2]]
+        "stops": [[13, 0.8], [14, 0.9], [15, 1.2]]
       }
     }
   }, {
@@ -1191,7 +1190,7 @@
       "line-width": "@main_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9, 0], [10, 1]]
+        "stops": [[8, 0], [9, 1]]
       }
     },
     "style.night": {
@@ -1199,7 +1198,7 @@
       "line-width": "@main_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9, 0], [10, 1]]
+        "stops": [[8, 0], [9, 1]]
       }
     }
   }, {
@@ -1263,7 +1262,7 @@
       "line-width": "@main_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     },
     "style.night": {
@@ -1271,7 +1270,7 @@
       "line-width": "@main_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     }
   }, {
@@ -1289,7 +1288,7 @@
       "line-width": "@motorway_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9.5, 0], [10, 1]]
+        "stops": [[8.5, 0], [9, 1]]
       }
     },
     "style.night": {
@@ -1297,7 +1296,7 @@
       "line-width": "@motorway_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9.5, 0], [10, 1]]
+        "stops": [[8.5, 0], [9, 1]]
       }
     }
   }, {
@@ -1308,7 +1307,7 @@
       "line-width": "@motorway_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     },
     "style.night": {
@@ -1316,7 +1315,7 @@
       "line-width": "@motorway_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     }
   }, {
@@ -1373,7 +1372,7 @@
       "line-width": "@main_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9, 0], [10, 1]]
+        "stops": [[8, 0], [9, 1]]
       }
     },
     "style.night": {
@@ -1381,7 +1380,7 @@
       "line-width": "@main_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9, 0], [10, 1]]
+        "stops": [[8, 0], [9, 1]]
       }
     }
   }, {
@@ -1441,7 +1440,7 @@
       "line-width": "@main_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     },
     "style.night": {
@@ -1449,7 +1448,7 @@
       "line-width": "@main_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     }
   }, {
@@ -1463,7 +1462,7 @@
       "line-width": "@motorway_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9.5, 0], [10, 1]]
+        "stops": [[8.5, 0], [9, 1]]
       }
     },
     "style.night": {
@@ -1471,7 +1470,7 @@
       "line-width": "@motorway_casing_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[9.5, 0], [10, 1]]
+        "stops": [[8.5, 0], [9, 1]]
       }
     }
   }, {
@@ -1482,7 +1481,7 @@
       "line-width": "@motorway_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     },
     "style.night": {
@@ -1490,7 +1489,7 @@
       "line-width": "@motorway_width",
       "line-opacity": {
         "fn": "stops",
-        "stops": [[6.5, 0], [7, 1]]
+        "stops": [[5.5, 0], [6, 1]]
       }
     }
   }, {
@@ -1536,7 +1535,7 @@
       "line-dasharray": [60, 20],
       "line-opacity": {
         "fn": "stops",
-        "stops": [[4, 0], [6, 1]]
+        "stops": [[3, 0], [5, 1]]
       },
       "line-width": "@admin_l3_width"
     },
@@ -1545,7 +1544,7 @@
       "line-dasharray": [60, 20],
       "line-opacity": {
         "fn": "stops",
-        "stops": [[4, 0], [6, 1]]
+        "stops": [[3, 0], [5, 1]]
       },
       "line-width": "@admin_l3_width"
     }
@@ -1592,14 +1591,14 @@
       "line-color": "#c0d6d6",
       "line-width": {
         "fn": "stops",
-        "stops": [[6, 1], [8, 2], [12, 3]]
+        "stops": [[5, 1], [7, 2], [11, 3]]
       }
     },
     "style.night": {
       "line-color": "#0a1347",
       "line-width": {
         "fn": "stops",
-        "stops": [[6, 1], [8, 2], [12, 3]]
+        "stops": [[5, 1], [7, 2], [11, 3]]
       }
     }
   }, {
@@ -1663,7 +1662,7 @@
       "text-color": "@marine_text",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 20], [4, 25], [5, 30], [22, 30]]
+        "stops": [[2, 20], [3, 25], [4, 30], [21, 30]]
       },
       "text-halo-color": "@water"
     },
@@ -1671,7 +1670,7 @@
       "text-color": "@water_dark_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 20], [4, 25], [5, 30], [22, 30]]
+        "stops": [[2, 20], [3, 25], [4, 30], [21, 30]]
       },
       "text-halo-color": "@water_night"
     }
@@ -1692,7 +1691,7 @@
       "text-color": "@marine_text",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 13], [4, 14], [5, 20], [6, 24], [22, 24]]
+        "stops": [[2, 13], [3, 14], [4, 20], [5, 24], [21, 24]]
       },
       "text-halo-color": "@water"
     },
@@ -1700,7 +1699,7 @@
       "text-color": "@water_dark_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 13], [4, 14], [5, 20], [6, 24], [22, 24]]
+        "stops": [[2, 13], [3, 14], [4, 20], [5, 24], [21, 24]]
       },
       "text-halo-color": "@water_night"
     }
@@ -1721,7 +1720,7 @@
       "text-color": "@marine_text",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 12], [4, 13], [5, 15], [6, 18], [22, 18]]
+        "stops": [[2, 12], [3, 13], [4, 15], [5, 18], [21, 18]]
       },
       "text-halo-color": "@water"
     },
@@ -1729,7 +1728,7 @@
       "text-color": "@water_dark_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 12], [4, 13], [5, 15], [6, 18], [22, 18]]
+        "stops": [[2, 12], [3, 13], [4, 15], [5, 18], [21, 18]]
       },
       "text-halo-color": "@water_night"
     }
@@ -1750,7 +1749,7 @@
       "text-color": "@marine_text",
       "text-size": {
         "fn": "stops",
-        "stops": [[4, 12], [5, 14], [6, 16], [22, 16]]
+        "stops": [[3, 12], [4, 14], [5, 16], [21, 16]]
       },
       "text-halo-color": "@water"
     },
@@ -1758,7 +1757,7 @@
       "text-color": "@water_dark_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[4, 12], [5, 14], [6, 16], [22, 16]]
+        "stops": [[3, 12], [4, 14], [5, 16], [21, 16]]
       },
       "text-halo-color": "@water_night"
     }
@@ -1781,7 +1780,7 @@
       "text-color": "@marine_text",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 20], [4, 25], [5, 30], [22, 30]]
+        "stops": [[2, 20], [3, 25], [4, 30], [21, 30]]
       },
       "text-halo-color": "@water"
     },
@@ -1789,7 +1788,7 @@
       "text-color": "@water_dark_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 20], [4, 25], [5, 30], [22, 30]]
+        "stops": [[2, 20], [3, 25], [4, 30], [21, 30]]
       },
       "text-halo-color": "@water_night"
     }
@@ -1812,7 +1811,7 @@
       "text-color": "@marine_text",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 13], [4, 14], [5, 20], [6, 24], [22, 24]]
+        "stops": [[2, 13], [3, 14], [4, 20], [5, 24], [21, 24]]
       },
       "text-halo-color": "@water"
     },
@@ -1820,7 +1819,7 @@
       "text-color": "@water_dark_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 13], [4, 14], [5, 20], [6, 24], [22, 24]]
+        "stops": [[2, 13], [3, 14], [4, 20], [5, 24], [21, 24]]
       },
       "text-halo-color": "@water_night"
     }
@@ -1843,7 +1842,7 @@
       "text-color": "@marine_text",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 12], [4, 13], [5, 15], [6, 18], [22, 18]]
+        "stops": [[2, 12], [3, 13], [4, 15], [5, 18], [21, 18]]
       },
       "text-halo-color": "@water"
     },
@@ -1851,7 +1850,7 @@
       "text-color": "@water_dark_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[3, 12], [4, 13], [5, 15], [6, 18], [22, 18]]
+        "stops": [[2, 12], [3, 13], [4, 15], [5, 18], [21, 18]]
       },
       "text-halo-color": "@water_night"
     }
@@ -1874,7 +1873,7 @@
       "text-color": "@marine_text",
       "text-size": {
         "fn": "stops",
-        "stops": [[4, 12], [5, 14], [6, 16], [22, 16]]
+        "stops": [[3, 12], [4, 14], [5, 16], [21, 16]]
       },
       "text-halo-color": "@water"
     },
@@ -1882,7 +1881,7 @@
       "text-color": "@water_dark_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[4, 12], [5, 14], [6, 16], [22, 16]]
+        "stops": [[3, 12], [4, 14], [5, 16], [21, 16]]
       },
       "text-halo-color": "@water_night"
     }
@@ -1905,7 +1904,7 @@
       "text-halo-color": "rgba(244,239,225,0.8)",
       "text-size": {
         "fn": "stops",
-        "stops": [[3.99, 0], [4, 10], [9.99, 16], [10, 0]]
+        "stops": [[2.99, 0], [3, 10], [8.99, 16], [9, 0]]
       }
     },
     "style.night": {
@@ -1914,7 +1913,7 @@
       "text-halo-color": "@land_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[3.99, 0], [4, 10], [9.99, 16], [10, 0]]
+        "stops": [[2.99, 0], [3, 10], [8.99, 16], [9, 0]]
       }
     }
   }, {
@@ -1936,7 +1935,7 @@
       "text-halo-color": "@text_stroke",
       "text-size": {
         "fn": "stops",
-        "stops": [[3.99, 0], [4, 10], [7, 14], [14.99, 20], [15, 0]]
+        "stops": [[2.99, 0], [3, 10], [6, 14], [13.99, 20], [14, 0]]
       }
     },
     "style.night": {
@@ -1945,7 +1944,7 @@
       "text-halo-color": "@text2_stroke_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[3.99, 0], [4, 10], [7, 14], [14.99, 20], [15, 0]]
+        "stops": [[2.99, 0], [3, 10], [6, 14], [13.99, 20], [14, 0]]
       }
     }
   }, {
@@ -1967,7 +1966,7 @@
       "text-halo-color": "@text_stroke",
       "text-size": {
         "fn": "stops",
-        "stops": [[9, 10], [12, 13], [14, 17], [16, 22]]
+        "stops": [[8, 10], [11, 13], [13, 17], [15, 22]]
       }
     },
     "style.night": {
@@ -1976,7 +1975,7 @@
       "text-halo-color": "@text2_stroke_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[9, 10], [12, 13], [14, 17], [16, 22]]
+        "stops": [[8, 10], [11, 13], [13, 17], [15, 22]]
       }
     }
   }, {
@@ -1998,7 +1997,7 @@
       "text-halo-color": "@text_stroke",
       "text-size": {
         "fn": "stops",
-        "stops": [[9, 8], [12, 10], [14, 14], [16, 16], [17, 20]]
+        "stops": [[8, 8], [11, 10], [13, 14], [15, 16], [16, 20]]
       }
     },
     "style.night": {
@@ -2007,7 +2006,7 @@
       "text-halo-color": "@text2_stroke_night",
       "text-size": {
         "fn": "stops",
-        "stops": [[9, 8], [12, 10], [14, 14], [16, 16], [17, 20]]
+        "stops": [[8, 8], [11, 10], [13, 14], [15, 16], [16, 20]]
       }
     }
   }, {
@@ -2028,7 +2027,7 @@
       "text-halo-color": "@text_stroke",
       "text-size": {
         "fn": "stops",
-        "stops": [[13, 11], [14, 12], [16, 14], [18, 18]]
+        "stops": [[12, 11], [13, 12], [15, 14], [17, 18]]
       }
     },
     "style.night": {
@@ -2037,7 +2036,7 @@
       "text-halo-width": 0.3,
       "text-size": {
         "fn": "stops",
-        "stops": [[13, 11], [14, 12], [16, 14], [18, 18]]
+        "stops": [[12, 11], [13, 12], [15, 14], [17, 18]]
       }
     }
   }, {
@@ -2237,13 +2236,13 @@
     "style": {
       "icon-opacity": {
         "fn": "stops",
-        "stops": [[16.5, 0], [16.75, 1]]
+        "stops": [[15.5, 0], [15.75, 1]]
       }
     },
     "style.night": {
       "icon-opacity": {
         "fn": "stops",
-        "stops": [[16.5, 0], [16.75, 1]]
+        "stops": [[15.5, 0], [15.75, 1]]
       }
     }
   }, {
@@ -2268,7 +2267,7 @@
       "text-halo-width": 0.3,
       "text-opacity": {
         "fn": "stops",
-        "stops": [[16.5, 0], [16.75, 1]]
+        "stops": [[15.5, 0], [15.75, 1]]
       }
     },
     "style.night": {
@@ -2278,7 +2277,7 @@
       "text-halo-width": 0.3,
       "text-opacity": {
         "fn": "stops",
-        "stops": [[16.5, 0], [16.75, 1]]
+        "stops": [[15.5, 0], [15.75, 1]]
       }
     }
   }, {
@@ -2294,13 +2293,13 @@
     "style": {
       "icon-opacity": {
         "fn": "stops",
-        "stops": [[18.5, 0], [18.75, 1]]
+        "stops": [[17.5, 0], [17.75, 1]]
       }
     },
     "style.night": {
       "icon-opacity": {
         "fn": "stops",
-        "stops": [[18.5, 0], [18.75, 1]]
+        "stops": [[17.5, 0], [17.75, 1]]
       }
     }
   }, {
@@ -2323,7 +2322,7 @@
       "text-size": 10,
       "text-opacity": {
         "fn": "stops",
-        "stops": [[18.5, 0], [18.75, 1]]
+        "stops": [[17.5, 0], [17.75, 1]]
       },
       "text-halo-color": "@land",
       "text-halo-width": 0.3
@@ -2333,7 +2332,7 @@
       "text-size": 10,
       "text-opacity": {
         "fn": "stops",
-        "stops": [[18.5, 0], [18.75, 1]]
+        "stops": [[17.5, 0], [17.75, 1]]
       },
       "text-halo-color": "@text2_stroke_night",
       "text-halo-width": 0.3
@@ -2351,13 +2350,13 @@
     "style": {
       "icon-opacity": {
         "fn": "stops",
-        "stops": [[13, 0], [13.25, 1]]
+        "stops": [[12, 0], [12.25, 1]]
       }
     },
     "style.night": {
       "icon-opacity": {
         "fn": "stops",
-        "stops": [[13, 0], [13.25, 1]]
+        "stops": [[12, 0], [12.25, 1]]
       }
     }
   }]