@openhistoricalmap/map-styles 0.9.10 → 0.9.12

package/dist/historical/historical.json

@@ -305,7 +305,7 @@
       }
     },
     {
-      "id": "nature_reserve_fill",
+      "id": "nature_reserve_fill_6-24",
       "type": "fill",
       "source": "osm",
       "source-layer": "landuse_areas",
@@ -341,20 +341,22 @@
           4,
           "rgba(168, 213, 159, .3)",
           5,
-          "rgba(183, 234, 163, .3)",
+          "rgba(228, 232, 224, .4)",
           7,
-          "rgba(180, 252, 174, .3)"
+          "rgba(228, 232, 224, .4)",
+          9,
+          "rgba(216, 227, 198, .5)"
         ],
         "fill-opacity": 1
       }
     },
     {
-      "id": "landuse_areas_allz",
+      "id": "landuse_areas_all_z6-12",
       "type": "fill",
       "source": "osm",
       "source-layer": "landuse_areas",
       "minzoom": 6,
-      "maxzoom": 24,
+      "maxzoom": 12,
       "filter": [
         "in",
         [
@@ -401,6 +403,21 @@
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "residential",
+            "retail",
+            "industrial"
+          ]
+        ]
+      ],
       "layout": {
         "visibility": "visible"
       },
@@ -432,7 +449,7 @@
       }
     },
     {
-      "id": "landuse_areas_z12_underlying_land_designation",
+      "id": "landuse_areas_underlying_land_designation",
       "type": "fill",
       "source": "osm",
       "source-layer": "landuse_areas",
@@ -441,6 +458,21 @@
       "layout": {
         "visibility": "visible"
       },
+      "filter": [
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "park",
+            "pitch",
+            "golf_course"
+          ]
+        ]
+      ],
       "paint": {
         "fill-color": [
           "interpolate",
@@ -477,6 +509,28 @@
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "quarry",
+            "landfill",
+            "brownfield",
+            "commercial",
+            "construction",
+            "railway",
+            "college",
+            "school",
+            "education",
+            "university"
+          ]
+        ]
+      ],
       "layout": {
         "visibility": "visible"
       },
@@ -522,12 +576,33 @@
       }
     },
     {
-      "id": "landuse_areas_z12_landcover_short",
+      "id": "landuse_areas_landcover_short",
       "type": "fill",
       "source": "osm",
       "source-layer": "landuse_areas",
-      "minzoom": 10,
+      "minzoom": 6,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "heath",
+            "meadow",
+            "grass",
+            "grassland",
+            "beach",
+            "desert",
+            "basin",
+            "salt_pond",
+            "mud"
+          ]
+        ]
+      ],
       "layout": {
         "visibility": "visible"
       },
@@ -613,7 +688,19 @@
       "minzoom": 12,
       "maxzoom": 24,
       "filter": [
-        "all"
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "forest",
+            "wood",
+            "scrub"
+          ]
+        ]
       ],
       "layout": {
         "visibility": "visible"
@@ -652,6 +739,25 @@
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "farmland",
+            "farmyard",
+            "farm",
+            "orchard",
+            "vineyard",
+            "allotments",
+            "garden"
+          ]
+        ]
+      ],
       "layout": {
         "visibility": "visible"
       },
@@ -691,15 +797,32 @@
       }
     },
     {
-      "id": "landuse_areas_z12_developed_open_space_larger",
+      "id": "landuse_areas_developed_open_space_larger",
       "type": "fill",
       "source": "osm",
       "source-layer": "landuse_areas",
-      "minzoom": 12,
+      "minzoom": 6,
       "maxzoom": 24,
       "layout": {
         "visibility": "visible"
       },
+      "filter": [
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "village_green",
+            "cemetary",
+            "sports_centre",
+            "stadium",
+            "recreation_ground"
+          ]
+        ]
+      ],
       "paint": {
         "fill-color": [
           "interpolate",
@@ -754,12 +877,31 @@
       }
     },
     {
-      "id": "landuse_areas_z12_developed_open_space_smaller",
+      "id": "landuse_areas_developed_open_space_smaller",
       "type": "fill",
       "source": "osm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "grave_yard",
+            "picnic_site",
+            "camp_site",
+            "playground",
+            "paitch",
+            "track",
+            "bleachers"
+          ]
+        ]
+      ],
       "layout": {
         "visibility": "visible"
       },
@@ -831,19 +973,30 @@
       }
     },
     {
-      "id": "landuse_naturereserveoutline",
+      "id": "landuse_nature_reserve_outline",
       "type": "line",
       "source": "osm",
       "source-layer": "landuse_areas",
       "minzoom": 6,
       "maxzoom": 24,
       "filter": [
-        "==",
+        "all",
         [
-          "get",
-          "type"
+          "==",
+          [
+            "get",
+            "type"
+          ],
+          "nature_reserve"
         ],
-        "nature_reserve"
+        [
+          ">=",
+          [
+            "get",
+            "area"
+          ],
+          100000000
+        ]
       ],
       "layout": {
         "visibility": "visible"
@@ -1000,6 +1153,87 @@
         "fill-color": "rgba(226, 214, 205, 1)"
       }
     },
+    {
+      "id": "water_lines_canal-casing",
+      "type": "line",
+      "source": "osm",
+      "source-layer": "water_lines",
+      "minzoom": 12,
+      "maxzoom": 24,
+      "filter": [
+        "==",
+        [
+          "get",
+          "type"
+        ],
+        "canal"
+      ],
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(111, 145, 160, 1)",
+        "line-width": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          13,
+          0.5,
+          14,
+          2,
+          20,
+          3
+        ],
+        "line-gap-width": 4,
+        "line-dasharray": [
+          1,
+          1
+        ]
+      }
+    },
+    {
+      "id": "water_lines_canal",
+      "type": "line",
+      "source": "osm",
+      "source-layer": "water_lines",
+      "minzoom": 8,
+      "maxzoom": 24,
+      "filter": [
+        "==",
+        [
+          "get",
+          "type"
+        ],
+        "canal"
+      ],
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(153, 201, 222, 1)",
+        "line-width": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          8,
+          1,
+          13,
+          2,
+          14,
+          3,
+          20,
+          4
+        ]
+      }
+    },
     {
       "id": "water_areas",
       "type": "fill",
@@ -1027,7 +1261,7 @@
       }
     },
     {
-      "id": "water_areas-ne",
+      "id": "water_areas_ne",
       "type": "fill",
       "source": "ne",
       "source-layer": "water_areas",
@@ -1059,6 +1293,23 @@
       "source-layer": "landuse_areas",
       "minzoom": 11,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "salt_pond",
+            "glacier",
+            "reservoir",
+            "swimming_pool",
+            "wetland"
+          ]
+        ]
+      ],
       "layout": {
         "visibility": "visible"
       },
@@ -1094,7 +1345,7 @@
       }
     },
     {
-      "id": "wetlands_z11-pattern",
+      "id": "wetlands_z11_pattern",
       "type": "fill",
       "source": "osm",
       "source-layer": "landuse_areas",
@@ -1533,92 +1784,11 @@
       }
     },
     {
-      "id": "water_lines_canal-casing",
+      "id": "water_lines_aqueduct",
       "type": "line",
       "source": "osm",
       "source-layer": "water_lines",
-      "minzoom": 12,
-      "maxzoom": 24,
-      "filter": [
-        "==",
-        [
-          "get",
-          "type"
-        ],
-        "canal"
-      ],
-      "layout": {
-        "visibility": "visible"
-      },
-      "paint": {
-        "line-color": "rgba(111, 145, 160, 1)",
-        "line-width": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          13,
-          0.5,
-          14,
-          2,
-          20,
-          3
-        ],
-        "line-gap-width": 4,
-        "line-dasharray": [
-          1,
-          1
-        ]
-      }
-    },
-    {
-      "id": "water_lines_canal",
-      "type": "line",
-      "source": "osm",
-      "source-layer": "water_lines",
-      "minzoom": 8,
-      "maxzoom": 24,
-      "filter": [
-        "==",
-        [
-          "get",
-          "type"
-        ],
-        "canal"
-      ],
-      "layout": {
-        "visibility": "visible"
-      },
-      "paint": {
-        "line-color": "rgba(153, 201, 222, 1)",
-        "line-width": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          8,
-          1,
-          13,
-          2,
-          14,
-          3,
-          20,
-          4
-        ]
-      }
-    },
-    {
-      "id": "water_lines_aqueduct",
-      "type": "line",
-      "source": "osm",
-      "source-layer": "water_lines",
-      "minzoom": 8,
+      "minzoom": 8,
       "maxzoom": 24,
       "filter": [
         "all",
@@ -9834,7 +10004,7 @@
       }
     },
     {
-      "id": "city_county_lines_admin7_8",
+      "id": "city_county_lines_admin_7-8",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -9878,7 +10048,7 @@
       }
     },
     {
-      "id": "admin_admin5_6",
+      "id": "admin_admin_5-6",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -9934,7 +10104,7 @@
       }
     },
     {
-      "id": "state_lines_admin4-case",
+      "id": "state_lines_admin_4-case",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -9996,7 +10166,7 @@
       }
     },
     {
-      "id": "state_lines_admin4",
+      "id": "state_lines_admin_4",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -10095,7 +10265,7 @@
       }
     },
     {
-      "id": "admin_countrylines_z10_case",
+      "id": "admin_country_lines_z10_case",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -10154,7 +10324,7 @@
       }
     },
     {
-      "id": "admin_countrylines_z10",
+      "id": "admin_country_lines_z10",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -10221,7 +10391,7 @@
       }
     },
     {
-      "id": "roadlabels_z14",
+      "id": "road_labels_z14",
       "type": "symbol",
       "source": "osm",
       "source-layer": "transport_lines",
@@ -10253,7 +10423,7 @@
       }
     },
     {
-      "id": "roadlabels_z11",
+      "id": "road_labels_z11",
       "type": "symbol",
       "source": "osm",
       "source-layer": "transport_lines",
@@ -10296,7 +10466,7 @@
       }
     },
     {
-      "id": "water_areaslabels_z15",
+      "id": "water_areas_labels_z15",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_areas_centroids",
@@ -10341,7 +10511,7 @@
       }
     },
     {
-      "id": "water_areaslabels_z12",
+      "id": "water_areas_labels_z12",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_areas_centroids",
@@ -10387,7 +10557,7 @@
       }
     },
     {
-      "id": "water_pointlabels_ocean_sea",
+      "id": "water_point_labels_ocean_sea",
       "type": "symbol",
       "source": "osm",
       "source-layer": "place_points_centroids",
@@ -10441,7 +10611,7 @@
       }
     },
     {
-      "id": "water_areaslabels_z8",
+      "id": "water_areas_labels_z8",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_areas_centroids",
@@ -10488,7 +10658,7 @@
       }
     },
     {
-      "id": "water_lineslabels-cliff",
+      "id": "water_lines_labels_cliff",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_lines",
@@ -10535,7 +10705,7 @@
       }
     },
     {
-      "id": "water_lineslabels-dam",
+      "id": "water_lines_labels_dam",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_lines",
@@ -10582,7 +10752,7 @@
       }
     },
     {
-      "id": "water_lineslabels",
+      "id": "water_lines_labels",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_lines",
@@ -10641,11 +10811,43 @@
       }
     },
     {
-      "id": "landuse_areaslabels_park",
+      "id": "points_from_landuse_areas",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
-      "minzoom": 14,
+      "minzoom": 16,
+      "filter": [
+        "!",
+        [
+          "in",
+          [
+            "get",
+            "type"
+          ],
+          [
+            "literal",
+            [
+              "garden",
+              "peak",
+              "wetland"
+            ]
+          ]
+        ]
+      ],
+      "layout": {
+        "icon-image": "{type}-18",
+        "text-font": [
+          "OpenHistorical"
+        ],
+        "visibility": "visible"
+      }
+    },
+    {
+      "id": "landuse_areas_labels_park_small",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 16,
       "maxzoom": 24,
       "filter": [
         "all",
@@ -10673,12 +10875,12 @@
           ]
         ],
         [
-          ">",
+          "<",
           [
             "get",
-            "area"
+            "area_m2"
           ],
-          12000
+          40000
         ]
       ],
       "layout": {
@@ -10715,29 +10917,47 @@
       }
     },
     {
-      "id": "landuse_areaslabels_farming",
+      "id": "landuse_areas_labels_park_medium",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
-      "minzoom": 14,
-      "maxzoom": 24,
+      "minzoom": 15,
+      "maxzoom": 20,
       "filter": [
-        "in",
+        "all",
         [
-          "get",
-          "type"
+          "in",
+          [
+            "get",
+            "type"
+          ],
+          [
+            "literal",
+            [
+              "park",
+              "camp_site",
+              "recreation_ground",
+              "sports_centre",
+              "stadium",
+              "village_green"
+            ]
+          ]
         ],
         [
-          "literal",
+          ">=",
           [
-            "allotmets",
-            "farm",
-            "farmland",
-            "farmyard",
-            "garden",
-            "orchard",
-            "vineyard"
-          ]
+            "get",
+            "area_m2"
+          ],
+          40000
+        ],
+        [
+          "<",
+          [
+            "get",
+            "area_m2"
+          ],
+          3000000
         ]
       ],
       "layout": {
@@ -10745,36 +10965,87 @@
           "get",
           "name"
         ],
-        "text-size": 11,
+        "text-size": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          12,
+          12,
+          13,
+          14,
+          16,
+          16
+        ],
+        "visibility": "visible",
+        "icon-text-fit": "none",
+        "text-allow-overlap": false,
+        "text-ignore-placement": false,
         "text-font": [
           "OpenHistorical"
         ]
       },
       "paint": {
-        "text-color": "rgba(107, 101, 71, 1)",
-        "text-halo-color": "rgba(255, 254, 249, 1)",
-        "text-halo-width": 1
+        "text-color": "rgba(64, 64, 64, 1)",
+        "text-halo-color": "rgba(228, 235, 209, 1)",
+        "text-opacity": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          14.99,
+          0,
+          15,
+          1,
+          17,
+          1,
+          19,
+          0.1
+        ],
+        "text-halo-width": 2,
+        "icon-translate-anchor": "map"
       }
     },
     {
-      "id": "landuse_areaslabels_forest",
+      "id": "landuse_areas_labels_park_large",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
-      "minzoom": 14,
-      "maxzoom": 24,
+      "minzoom": 12,
+      "maxzoom": 16,
       "filter": [
-        "in",
+        "all",
         [
-          "get",
-          "type"
+          "in",
+          [
+            "get",
+            "type"
+          ],
+          [
+            "literal",
+            [
+              "park",
+              "camp_site",
+              "recreation_ground",
+              "sports_centre",
+              "stadium",
+              "village_green"
+            ]
+          ]
         ],
         [
-          "literal",
+          ">=",
           [
-            "forest",
-            "wood"
-          ]
+            "get",
+            "area_m2"
+          ],
+          3000000
         ]
       ],
       "layout": {
@@ -10782,25 +11053,55 @@
           "get",
           "name"
         ],
-        "text-size": 11,
+        "text-size": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          12,
+          12,
+          16,
+          24
+        ],
+        "visibility": "visible",
+        "icon-text-fit": "none",
+        "text-allow-overlap": false,
+        "text-ignore-placement": false,
         "text-font": [
           "OpenHistorical"
         ]
       },
       "paint": {
-        "text-color": "rgba(95, 107, 71, 1)",
-        "text-halo-color": "rgba(201, 213, 190, 1)",
-        "text-halo-width": 1
-      }
-    },
-    {
-      "id": "landuse_areaslabels_nature_reserve",
-      "type": "symbol",
-      "source": "osm",
-      "source-layer": "landuse_points_centroids",
-      "minzoom": 6,
-      "maxzoom": 12,
-      "filter": [
+        "text-color": "rgba(85, 104, 42, 1)",
+        "text-halo-color": "rgba(228, 235, 209, 1)",
+        "text-opacity": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          15.5,
+          1,
+          15.99,
+          0
+        ],
+        "text-halo-width": 2,
+        "icon-translate-anchor": "map"
+      }
+    },
+    {
+      "id": "landuse_areas_labels_farming",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 14,
+      "maxzoom": 24,
+      "filter": [
         "in",
         [
           "get",
@@ -10809,12 +11110,234 @@
         [
           "literal",
           [
-            "nature_reserve"
+            "allotmets",
+            "farm",
+            "farmland",
+            "farmyard",
+            "garden",
+            "orchard",
+            "vineyard"
+          ]
+        ]
+      ],
+      "layout": {
+        "text-field": [
+          "get",
+          "name"
+        ],
+        "text-size": 11,
+        "text-font": [
+          "OpenHistorical"
+        ]
+      },
+      "paint": {
+        "text-color": "rgba(107, 101, 71, 1)",
+        "text-halo-color": "rgba(255, 254, 249, 1)",
+        "text-halo-width": 1
+      }
+    },
+    {
+      "id": "landuse_areas_labels_forest",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 14,
+      "maxzoom": 24,
+      "filter": [
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "forest",
+            "wood"
+          ]
+        ]
+      ],
+      "layout": {
+        "text-field": [
+          "get",
+          "name"
+        ],
+        "text-size": 11,
+        "text-font": [
+          "OpenHistorical"
+        ]
+      },
+      "paint": {
+        "text-color": "rgba(95, 107, 71, 1)",
+        "text-halo-color": "rgba(201, 213, 190, 1)",
+        "text-halo-width": 1
+      }
+    },
+    {
+      "id": "landuse_areas_labels_nature_reserve",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 12,
+      "maxzoom": 16,
+      "filter": [
+        "all",
+        [
+          "in",
+          [
+            "get",
+            "type"
+          ],
+          [
+            "literal",
+            [
+              "nature_reserve"
+            ]
+          ]
+        ],
+        [
+          "<",
+          [
+            "get",
+            "area_m2"
+          ],
+          30000000
+        ]
+      ],
+      "layout": {
+        "text-size": 12,
+        "text-field": [
+          "get",
+          "name"
+        ],
+        "text-font": [
+          "OpenHistorical"
+        ]
+      },
+      "paint": {
+        "text-color": "rgba(95, 107, 71, 1)",
+        "text-halo-color": "rgba(201, 213, 190, 1)",
+        "text-halo-width": 1
+      }
+    },
+    {
+      "id": "landuse_areas_labels_nature_reserve_med_10-14",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 10,
+      "maxzoom": 14,
+      "filter": [
+        "all",
+        [
+          "in",
+          [
+            "get",
+            "type"
+          ],
+          [
+            "literal",
+            [
+              "nature_reserve"
+            ]
+          ]
+        ],
+        [
+          ">=",
+          [
+            "get",
+            "area_m2"
+          ],
+          30000000
+        ],
+        [
+          "<",
+          [
+            "get",
+            "area_m2"
+          ],
+          100000000
+        ]
+      ],
+      "layout": {
+        "text-size": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          10,
+          10,
+          11,
+          12,
+          13,
+          14
+        ],
+        "text-field": [
+          "get",
+          "name"
+        ],
+        "text-font": [
+          "OpenHistorical"
+        ]
+      },
+      "paint": {
+        "text-color": "rgba(95, 107, 71, 1)",
+        "text-halo-color": "rgba(201, 213, 190, 1)",
+        "text-halo-width": 1
+      }
+    },
+    {
+      "id": "landuse_areas_labels_nature_reserve_xl",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 7,
+      "maxzoom": 12,
+      "filter": [
+        "all",
+        [
+          "in",
+          [
+            "get",
+            "type"
+          ],
+          [
+            "literal",
+            [
+              "nature_reserve"
+            ]
           ]
+        ],
+        [
+          ">=",
+          [
+            "get",
+            "area_m2"
+          ],
+          100000000
         ]
       ],
       "layout": {
-        "text-size": 24,
+        "text-size": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          7,
+          12,
+          8,
+          16,
+          9,
+          24,
+          12,
+          14
+        ],
         "text-field": [
           "get",
           "name"
@@ -10830,7 +11353,7 @@
       }
     },
     {
-      "id": "landuse_areaslabels_school",
+      "id": "landuse_areas_labels_school",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
@@ -10870,7 +11393,7 @@
       }
     },
     {
-      "id": "other_areaslabels_military",
+      "id": "other_areas_labels_military",
       "type": "symbol",
       "source": "osm",
       "source-layer": "other_points_centroids",
@@ -10901,7 +11424,7 @@
       }
     },
     {
-      "id": "landuse_areaslabels_z8glacier",
+      "id": "landuse_areas_labels_z8glacier",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
@@ -11026,7 +11549,7 @@
       }
     },
     {
-      "id": "points_of_interest_frombuildings",
+      "id": "points_of_interest_buildings",
       "type": "symbol",
       "source": "osm",
       "source-layer": "buildings_points_centroids",
@@ -11055,9 +11578,11 @@
             "zoom"
           ],
           16,
-          10,
+          12,
+          17,
+          14,
           20,
-          12
+          16
         ],
         "text-anchor": "center",
         "text-offset": [
@@ -11090,7 +11615,7 @@
       }
     },
     {
-      "id": "points_of_interest_fromareasz14-centroids",
+      "id": "points_of_interest_from_areas_z14_centroids",
       "type": "symbol",
       "source": "osm",
       "source-layer": "amenity_points_centroids",
@@ -11145,7 +11670,7 @@
       }
     },
     {
-      "id": "points_of_interest_fromareasz14",
+      "id": "points_of_interest_from_areas_z14",
       "type": "symbol",
       "source": "osm",
       "source-layer": "amenity_points_centroids",
@@ -11200,7 +11725,7 @@
       }
     },
     {
-      "id": "points_of_interest_fromareas",
+      "id": "points_of_interest_from_areas",
       "type": "symbol",
       "source": "osm",
       "source-layer": "amenity_points_centroids",
@@ -11274,17 +11799,29 @@
       }
     },
     {
-      "id": "points_of_interest_amenity-centroids",
+      "id": "points_of_interest_other",
       "type": "symbol",
       "source": "osm",
-      "source-layer": "amenity_points_centroids",
+      "source-layer": "other_points_centroids",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
-        "all"
+        "!",
+        [
+          "in",
+          [
+            "get",
+            "type"
+          ],
+          [
+            "literal",
+            [
+              "artwork"
+            ]
+          ]
+        ]
       ],
       "layout": {
-        "text-line-height": 1.2,
         "text-size": [
           "interpolate",
           [
@@ -11300,15 +11837,19 @@
           20,
           12
         ],
+        "icon-text-fit": "none",
         "icon-image": "{type}-18",
+        "icon-keep-upright": false,
         "text-font": [
           "OpenHistorical"
         ],
+        "icon-allow-overlap": false,
         "visibility": "visible",
         "text-offset": [
           0,
           1
         ],
+        "icon-optional": false,
         "icon-size": [
           "interpolate",
           [
@@ -11326,13 +11867,17 @@
         "text-field": [
           "get",
           "name"
-        ]
+        ],
+        "text-max-width": 10,
+        "icon-ignore-placement": false
       },
       "paint": {
-        "text-color": "rgba(80, 80, 80, 1)",
+        "text-color": "#505050",
         "text-halo-color": "rgba(255, 255, 255, 1)",
         "text-halo-width": 0.5,
         "text-halo-blur": 1,
+        "text-translate-anchor": "viewport",
+        "icon-translate-anchor": "viewport",
         "text-opacity": [
           "interpolate",
           [
@@ -11341,7 +11886,7 @@
           [
             "zoom"
           ],
-          16.9,
+          16.99,
           0,
           17,
           1
@@ -11349,29 +11894,14 @@
       }
     },
     {
-      "id": "points_of_interest_other",
+      "id": "points_of_interest_amenity",
       "type": "symbol",
       "source": "osm",
-      "source-layer": "other_points_centroids",
-      "minzoom": 15,
+      "source-layer": "amenity_points_centroids",
+      "minzoom": 16,
       "maxzoom": 24,
-      "filter": [
-        "!",
-        [
-          "in",
-          [
-            "get",
-            "type"
-          ],
-          [
-            "literal",
-            [
-              "artwork"
-            ]
-          ]
-        ]
-      ],
       "layout": {
+        "text-line-height": 1.2,
         "text-size": [
           "interpolate",
           [
@@ -11387,19 +11917,15 @@
           20,
           12
         ],
-        "icon-text-fit": "none",
         "icon-image": "{type}-18",
-        "icon-keep-upright": false,
         "text-font": [
           "OpenHistorical"
         ],
-        "icon-allow-overlap": false,
         "visibility": "visible",
         "text-offset": [
           0,
           1
         ],
-        "icon-optional": false,
         "icon-size": [
           "interpolate",
           [
@@ -11417,17 +11943,13 @@
         "text-field": [
           "get",
           "name"
-        ],
-        "text-max-width": 10,
-        "icon-ignore-placement": false
+        ]
       },
       "paint": {
-        "text-color": "#505050",
+        "text-color": "rgba(80, 80, 80, 1)",
         "text-halo-color": "rgba(255, 255, 255, 1)",
         "text-halo-width": 0.5,
         "text-halo-blur": 1,
-        "text-translate-anchor": "viewport",
-        "icon-translate-anchor": "viewport",
         "text-opacity": [
           "interpolate",
           [
@@ -11436,7 +11958,7 @@
           [
             "zoom"
           ],
-          16.99,
+          16.9,
           0,
           17,
           1
@@ -11444,23 +11966,42 @@
       }
     },
     {
-      "id": "points_of_interest_amenity_14",
+      "id": "points_of_interest_other_archaeology",
       "type": "symbol",
       "source": "osm",
-      "source-layer": "amenity_points_centroids",
+      "source-layer": "other_points_centroids",
       "minzoom": 14,
-      "maxzoom": 16,
+      "maxzoom": 24,
       "filter": [
-        "all"
+        "==",
+        [
+          "get",
+          "type"
+        ],
+        "archaeological_site"
       ],
       "layout": {
-        "icon-image": "{type}-18",
+        "icon-image": "{site_type}-18",
         "visibility": "visible",
         "text-field": [
           "get",
           "name"
         ],
-        "text-size": 8,
+        "text-size": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          15.99,
+          0,
+          16,
+          10,
+          20,
+          12
+        ],
         "text-anchor": "top",
         "text-offset": [
           0,
@@ -11468,24 +12009,63 @@
         ],
         "text-font": [
           "OpenHistorical"
+        ],
+        "icon-size": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          15,
+          0.7,
+          20,
+          1.4
         ]
       },
       "paint": {
-        "text-color": "rgba(80, 80, 80, 1)",
+        "text-color": "#505050",
         "text-halo-color": "rgba(255, 255, 255, 1)",
         "text-halo-width": 0.5,
-        "text-halo-blur": 1
+        "text-halo-blur": 1,
+        "text-opacity": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          16.99,
+          0,
+          17,
+          1
+        ]
       }
     },
     {
-      "id": "points_of_interest_amenity",
+      "id": "points_of_interest_other_artwork",
       "type": "symbol",
       "source": "osm",
-      "source-layer": "amenity_points_centroids",
+      "source-layer": "other_points_centroids",
       "minzoom": 15,
       "maxzoom": 24,
+      "filter": [
+        "==",
+        [
+          "get",
+          "type"
+        ],
+        "artwork"
+      ],
       "layout": {
-        "text-line-height": 1.2,
+        "icon-image": "{artwork_type}-18",
+        "visibility": "visible",
+        "text-field": [
+          "get",
+          "name"
+        ],
         "text-size": [
           "interpolate",
           [
@@ -11501,15 +12081,14 @@
           20,
           12
         ],
-        "icon-image": "{type}-18",
-        "text-font": [
-          "OpenHistorical"
-        ],
-        "visibility": "visible",
+        "text-anchor": "top",
         "text-offset": [
           0,
           1
         ],
+        "text-font": [
+          "OpenHistorical"
+        ],
         "icon-size": [
           "interpolate",
           [
@@ -11522,15 +12101,10 @@
           0.7,
           20,
           1.4
-        ],
-        "text-anchor": "top",
-        "text-field": [
-          "get",
-          "name"
         ]
       },
       "paint": {
-        "text-color": "rgba(80, 80, 80, 1)",
+        "text-color": "#505050",
         "text-halo-color": "rgba(255, 255, 255, 1)",
         "text-halo-width": 0.5,
         "text-halo-blur": 1,
@@ -11542,7 +12116,7 @@
           [
             "zoom"
           ],
-          16.9,
+          16.99,
           0,
           17,
           1
@@ -11550,11 +12124,11 @@
       }
     },
     {
-      "id": "points_of_interest_other_archaeology",
+      "id": "points_powertower",
       "type": "symbol",
       "source": "osm",
       "source-layer": "other_points_centroids",
-      "minzoom": 14,
+      "minzoom": 15,
       "maxzoom": 24,
       "filter": [
         "==",
@@ -11562,10 +12136,43 @@
           "get",
           "type"
         ],
-        "archaeological_site"
+        "tower"
       ],
       "layout": {
-        "icon-image": "{site_type}-18",
+        "icon-image": "power_tower-12",
+        "visibility": "visible",
+        "text-font": [
+          "OpenHistorical"
+        ]
+      }
+    },
+    {
+      "id": "transport_points_labels",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "transport_points_centroids",
+      "minzoom": 12,
+      "maxzoom": 24,
+      "filter": [
+        "!",
+        [
+          "in",
+          [
+            "get",
+            "type"
+          ],
+          [
+            "literal",
+            [
+              "traffic_signals",
+              "pedestrian",
+              "raceway"
+            ]
+          ]
+        ]
+      ],
+      "layout": {
+        "icon-image": "{type}-18",
         "visibility": "visible",
         "text-field": [
           "get",
@@ -11579,17 +12186,15 @@
           [
             "zoom"
           ],
-          15.99,
-          0,
-          16,
           10,
-          20,
-          12
+          14,
+          18,
+          14
         ],
         "text-anchor": "top",
         "text-offset": [
           0,
-          1
+          0.75
         ],
         "text-font": [
           "OpenHistorical"
@@ -11602,14 +12207,15 @@
           [
             "zoom"
           ],
-          15,
-          0.7,
+          10,
+          0.4,
           20,
           1.4
         ]
       },
       "paint": {
-        "text-color": "#505050",
+        "icon-color": "#000000",
+        "text-color": "rgba(80, 80, 80, 1)",
         "text-halo-color": "rgba(255, 255, 255, 1)",
         "text-halo-width": 0.5,
         "text-halo-blur": 1,
@@ -11621,30 +12227,40 @@
           [
             "zoom"
           ],
-          16.99,
+          12.99,
           0,
-          17,
+          13,
           1
         ]
       }
     },
     {
-      "id": "points_of_interest_other_artwork",
+      "id": "transport_points_raceway",
       "type": "symbol",
       "source": "osm",
-      "source-layer": "other_points_centroids",
+      "source-layer": "transport_points_centroids",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
-        "==",
+        "!",
         [
-          "get",
-          "type"
-        ],
-        "artwork"
+          "in",
+          [
+            "get",
+            "type"
+          ],
+          [
+            "literal",
+            [
+              "traffic_signals",
+              "pedestrian",
+              "raceway"
+            ]
+          ]
+        ]
       ],
       "layout": {
-        "icon-image": "{artwork_type}-18",
+        "icon-image": "{type}-18",
         "visibility": "visible",
         "text-field": [
           "get",
@@ -11658,17 +12274,15 @@
           [
             "zoom"
           ],
-          15.99,
-          0,
-          16,
           10,
-          20,
-          12
+          14,
+          18,
+          14
         ],
         "text-anchor": "top",
         "text-offset": [
           0,
-          1
+          0.75
         ],
         "text-font": [
           "OpenHistorical"
@@ -11681,14 +12295,15 @@
           [
             "zoom"
           ],
-          15,
-          0.7,
+          10,
+          0.4,
           20,
           1.4
         ]
       },
       "paint": {
-        "text-color": "#505050",
+        "icon-color": "#000000",
+        "text-color": "rgba(80, 80, 80, 1)",
         "text-halo-color": "rgba(255, 255, 255, 1)",
         "text-halo-width": 0.5,
         "text-halo-blur": 1,
@@ -11700,19 +12315,19 @@
           [
             "zoom"
           ],
-          16.99,
+          12.99,
           0,
-          17,
+          13,
           1
         ]
       }
     },
     {
-      "id": "points_powertower",
+      "id": "transport_points_labels_traffic_signals",
       "type": "symbol",
       "source": "osm",
-      "source-layer": "other_points_centroids",
-      "minzoom": 15,
+      "source-layer": "transport_points_centroids",
+      "minzoom": 17,
       "maxzoom": 24,
       "filter": [
         "==",
@@ -11720,18 +12335,99 @@
           "get",
           "type"
         ],
-        "tower"
+        "traffic_signals"
       ],
       "layout": {
-        "icon-image": "power_tower-12",
+        "icon-image": "{type}-18",
         "visibility": "visible",
+        "text-field": [
+          "get",
+          "name"
+        ],
+        "text-size": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          10,
+          14,
+          18,
+          14
+        ],
+        "text-anchor": "top",
+        "text-offset": [
+          0,
+          0.75
+        ],
         "text-font": [
           "OpenHistorical"
         ]
+      },
+      "paint": {
+        "icon-color": "#000000",
+        "text-color": "rgba(80, 80, 80, 1)",
+        "text-halo-color": "rgba(255, 255, 255, 1)",
+        "text-halo-width": 0.5,
+        "text-halo-blur": 1
       }
     },
     {
-      "id": "points_airport",
+      "id": "transport_points_labels_pedestrian",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "transport_points_centroids",
+      "minzoom": 17,
+      "maxzoom": 24,
+      "filter": [
+        "==",
+        [
+          "get",
+          "type"
+        ],
+        "pedestrian"
+      ],
+      "layout": {
+        "icon-image": "{type}-18",
+        "visibility": "visible",
+        "text-field": [
+          "get",
+          "name"
+        ],
+        "text-size": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          10,
+          14,
+          18,
+          14
+        ],
+        "text-anchor": "top",
+        "text-offset": [
+          0,
+          0.75
+        ],
+        "text-font": [
+          "OpenHistorical"
+        ]
+      },
+      "paint": {
+        "icon-color": "#000000",
+        "text-color": "rgba(80, 80, 80, 1)",
+        "text-halo-color": "rgba(255, 255, 255, 1)",
+        "text-halo-width": 0.5,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "transport_points_labels_airports",
       "type": "symbol",
       "source": "osm",
       "source-layer": "transport_points_centroids",
@@ -11747,20 +12443,38 @@
       ],
       "layout": {
         "icon-image": "airport-18",
+        "icon-size": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          10,
+          1.2,
+          14,
+          1.5
+        ],
         "text-font": [
           "OpenHistorical"
         ]
       }
     },
     {
-      "id": "transport_points_centroids",
+      "id": "transport_points_labels_medium",
       "type": "symbol",
       "source": "osm",
       "source-layer": "transport_points_centroids",
-      "minzoom": 14,
-      "maxzoom": 24,
+      "minzoom": 13,
+      "maxzoom": 16,
       "filter": [
-        "all"
+        ">",
+        [
+          "get",
+          "area_m2"
+        ],
+        1000000
       ],
       "layout": {
         "icon-image": "{type}-18",
@@ -11777,15 +12491,10 @@
           [
             "zoom"
           ],
-          14,
-          8,
+          13,
+          20,
           18,
-          10
-        ],
-        "text-anchor": "top",
-        "text-offset": [
-          0,
-          0.75
+          14
         ],
         "text-font": [
           "OpenHistorical"
@@ -11808,9 +12517,49 @@
         "icon-color": "#000000",
         "text-color": "rgba(80, 80, 80, 1)",
         "text-halo-color": "rgba(255, 255, 255, 1)",
-        "text-halo-width": 0.5,
-        "text-halo-blur": 1,
-        "text-opacity": [
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "transport_area_labels_large",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "transport_points_centroids",
+      "minzoom": 13,
+      "maxzoom": 16,
+      "filter": [
+        ">",
+        [
+          "get",
+          "area_m2"
+        ],
+        10000000
+      ],
+      "layout": {
+        "icon-image": "{type}-18",
+        "visibility": "visible",
+        "text-field": [
+          "get",
+          "name"
+        ],
+        "text-size": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          12,
+          24,
+          18,
+          28
+        ],
+        "text-font": [
+          "OpenHistorical"
+        ],
+        "icon-size": [
           "interpolate",
           [
             "linear"
@@ -11818,15 +12567,22 @@
           [
             "zoom"
           ],
-          13.99,
-          0,
           14,
-          1
+          0.75,
+          20,
+          1.4
         ]
+      },
+      "paint": {
+        "icon-color": "#000000",
+        "text-color": "rgba(80, 80, 80, 1)",
+        "text-halo-color": "rgba(255, 255, 255, 1)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
       }
     },
     {
-      "id": "points_placeofworshipother",
+      "id": "points_place_of_worship_other",
       "type": "symbol",
       "source": "osm",
       "source-layer": "buildings_points_centroids",
@@ -11884,7 +12640,7 @@
       }
     },
     {
-      "id": "points_fromlanduse-z14",
+      "id": "points_from_landuse_peaks",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
@@ -11920,94 +12676,6 @@
         "text-opacity": 1
       }
     },
-    {
-      "id": "points_fromlanduse",
-      "type": "symbol",
-      "source": "osm",
-      "source-layer": "landuse_points_centroids",
-      "minzoom": 16,
-      "layout": {
-        "icon-image": "{type}-18",
-        "text-font": [
-          "OpenHistorical"
-        ],
-        "text-field": [
-          "get",
-          "name"
-        ],
-        "text-size": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          6,
-          8,
-          16,
-          10,
-          20,
-          12
-        ],
-        "text-anchor": "top",
-        "text-offset": [
-          0,
-          1
-        ],
-        "visibility": "visible",
-        "icon-size": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          15,
-          0.7,
-          20,
-          1.4
-        ]
-      },
-      "paint": {
-        "text-color": "rgba(80, 80, 80, 1)",
-        "text-halo-color": "rgba(255, 255, 255, 1)",
-        "text-halo-width": 0.5
-      }
-    },
-    {
-      "id": "points_fromlanduseareas",
-      "type": "symbol",
-      "source": "osm",
-      "source-layer": "landuse_points_centroids",
-      "minzoom": 16,
-      "filter": [
-        "!",
-        [
-          "in",
-          [
-            "get",
-            "type"
-          ],
-          [
-            "literal",
-            [
-              "garden",
-              "peak",
-              "wetland"
-            ]
-          ]
-        ]
-      ],
-      "layout": {
-        "icon-image": "{type}-18",
-        "text-font": [
-          "OpenHistorical"
-        ],
-        "visibility": "visible"
-      }
-    },
     {
       "id": "points_of_interest_shop",
       "type": "symbol",
@@ -12044,7 +12712,7 @@
       }
     },
     {
-      "id": "county_labels_z11-admin7_8-centroids",
+      "id": "county_labels_z11_admin_7-8_centroids",
       "type": "symbol",
       "source": "osm",
       "source-layer": "land_ohm_centroids",
@@ -12100,7 +12768,7 @@
       }
     },
     {
-      "id": "county_labels_z11-admin6-centroids",
+      "id": "county_labels_z11_admin_6_centroids",
       "type": "symbol",
       "source": "osm",
       "source-layer": "land_ohm_centroids",
@@ -12273,7 +12941,6 @@
           "literal",
           [
             "hamlet",
-            "islet",
             "neighborhood",
             "suburb",
             "village"
@@ -12752,7 +13419,7 @@
       }
     },
     {
-      "id": "country_points_labels-cen",
+      "id": "country_points_labels_cen",
       "type": "symbol",
       "source": "osm",
       "source-layer": "land_ohm_centroids",