@openhistoricalmap/map-styles 0.9.10 → 0.9.12

package/historical/historical.json

@@ -192,7 +192,7 @@
       "paint": {"fill-color": "rgba(235, 235, 225, 1)"}
     },
     {
-      "id": "nature_reserve_fill",
+      "id": "nature_reserve_fill_6-24",
       "type": "fill",
       "source": "osm",
       "source-layer": "landuse_areas",
@@ -210,20 +210,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",
         ["get", "type"],
@@ -254,6 +256,11 @@
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["residential", "retail", "industrial"]]
+      ],
       "layout": {"visibility": "visible"},
       "paint": {
         "fill-color": [
@@ -276,13 +283,18 @@
       }
     },
     {
-      "id": "landuse_areas_z12_underlying_land_designation",
+      "id": "landuse_areas_underlying_land_designation",
       "type": "fill",
       "source": "osm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
       "layout": {"visibility": "visible"},
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["park", "pitch", "golf_course"]]
+      ],
       "paint": {
         "fill-color": [
           "interpolate",
@@ -312,6 +324,11 @@
       "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"},
       "paint": {
         "fill-color": [
@@ -348,12 +365,17 @@
       }
     },
     {
-      "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"},
       "paint": {
         "fill-color": [
@@ -408,7 +430,11 @@
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
-      "filter": ["all"],
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["forest", "wood", "scrub"]]
+      ],
       "layout": {"visibility": "visible"},
       "paint": {
         "fill-color": [
@@ -437,6 +463,11 @@
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["farmland", "farmyard", "farm", "orchard", "vineyard", "allotments", "garden"]]
+      ],
       "layout": {"visibility": "visible"},
       "paint": {
         "fill-color": [
@@ -467,13 +498,18 @@
       }
     },
     {
-      "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",
@@ -514,12 +550,17 @@
       }
     },
     {
-      "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"},
       "paint": {
         "fill-color": [
@@ -575,13 +616,15 @@
       }
     },
     {
-      "id": "landuse_naturereserveoutline",
+      "id": "landuse_nature_reserve_outline",
       "type": "line",
       "source": "osm",
       "source-layer": "landuse_areas",
       "minzoom": 6,
       "maxzoom": 24,
-      "filter": ["==", ["get", "type"], "nature_reserve"],
+      "filter": ["all",
+        ["==", ["get", "type"], "nature_reserve"],
+        [">=", ["get", "area"], 100000000]],
       "layout": {"visibility": "visible"},
       "paint": {
         "line-width": ["interpolate", ["linear"], ["zoom"], 10, 2, 20, 3],
@@ -654,6 +697,58 @@
       "layout": {"visibility": "visible"},
       "paint": {"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",
@@ -675,7 +770,7 @@
       }
     },
     {
-      "id": "water_areas-ne",
+      "id": "water_areas_ne",
       "type": "fill",
       "source": "ne",
       "source-layer": "water_areas",
@@ -701,6 +796,11 @@
       "source-layer": "landuse_areas",
       "minzoom": 11,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["salt_pond", "glacier", "reservoir", "swimming_pool", "wetland"]]
+      ],
       "layout": {"visibility": "visible"},
       "paint": {
         "fill-color": [
@@ -727,7 +827,7 @@
       }
     },
     {
-      "id": "wetlands_z11-pattern",
+      "id": "wetlands_z11_pattern",
       "type": "fill",
       "source": "osm",
       "source-layer": "landuse_areas",
@@ -925,58 +1025,6 @@
         "line-width": ["interpolate", ["linear"], ["zoom"], 15, 0.2, 20, 1.5]
       }
     },
-    {
-      "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_lines_aqueduct",
       "type": "line",
@@ -5281,7 +5329,7 @@
       }
     },
     {
-      "id": "city_county_lines_admin7_8",
+      "id": "city_county_lines_admin_7-8",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -5300,7 +5348,7 @@
       }
     },
     {
-      "id": "admin_admin5_6",
+      "id": "admin_admin_5-6",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -5327,7 +5375,7 @@
       }
     },
     {
-      "id": "state_lines_admin4-case",
+      "id": "state_lines_admin_4-case",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -5357,7 +5405,7 @@
       }
     },
     {
-      "id": "state_lines_admin4",
+      "id": "state_lines_admin_4",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -5415,7 +5463,7 @@
       }
     },
     {
-      "id": "admin_countrylines_z10_case",
+      "id": "admin_country_lines_z10_case",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -5443,7 +5491,7 @@
       }
     },
     {
-      "id": "admin_countrylines_z10",
+      "id": "admin_country_lines_z10",
       "type": "line",
       "source": "osm",
       "source-layer": "land_ohm_lines",
@@ -5489,7 +5537,7 @@
       }
     },
     {
-      "id": "roadlabels_z14",
+      "id": "road_labels_z14",
       "type": "symbol",
       "source": "osm",
       "source-layer": "transport_lines",
@@ -5514,7 +5562,7 @@
       }
     },
     {
-      "id": "roadlabels_z11",
+      "id": "road_labels_z11",
       "type": "symbol",
       "source": "osm",
       "source-layer": "transport_lines",
@@ -5539,7 +5587,7 @@
       }
     },
     {
-      "id": "water_areaslabels_z15",
+      "id": "water_areas_labels_z15",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_areas_centroids",
@@ -5560,7 +5608,7 @@
       }
     },
     {
-      "id": "water_areaslabels_z12",
+      "id": "water_areas_labels_z12",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_areas_centroids",
@@ -5582,7 +5630,7 @@
       }
     },
     {
-      "id": "water_pointlabels_ocean_sea",
+      "id": "water_point_labels_ocean_sea",
       "type": "symbol",
       "source": "osm",
       "source-layer": "place_points_centroids",
@@ -5614,7 +5662,7 @@
       }
     },
     {
-      "id": "water_areaslabels_z8",
+      "id": "water_areas_labels_z8",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_areas_centroids",
@@ -5645,7 +5693,7 @@
       }
     },
     {
-      "id": "water_lineslabels-cliff",
+      "id": "water_lines_labels_cliff",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_lines",
@@ -5668,7 +5716,7 @@
       }
     },
     {
-      "id": "water_lineslabels-dam",
+      "id": "water_lines_labels_dam",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_lines",
@@ -5691,7 +5739,7 @@
       }
     },
     {
-      "id": "water_lineslabels",
+      "id": "water_lines_labels",
       "type": "symbol",
       "source": "osm",
       "source-layer": "water_lines",
@@ -5717,11 +5765,27 @@
       }
     },
     {
-      "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",
@@ -5745,7 +5809,7 @@
             ]
           ]
         ],
-        [">", ["get", "area"], 12000]
+        ["<", ["get", "area_m2"], 40000]
       ],
       "layout": {
         "text-field": ["get", "name"],
@@ -5764,7 +5828,94 @@
       }
     },
     {
-      "id": "landuse_areaslabels_farming",
+      "id": "landuse_areas_labels_park_medium",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 15,
+      "maxzoom": 20,
+      "filter": [
+        "all",
+        [
+          "in",
+          ["get", "type"],
+          [
+            "literal",
+            [
+              "park",
+              "camp_site",
+              "recreation_ground",
+              "sports_centre",
+              "stadium",
+              "village_green"
+            ]
+          ]
+        ],
+        [">=", ["get", "area_m2"], 40000],
+        ["<", ["get", "area_m2"], 3000000]
+      ],
+      "layout": {
+        "text-field": ["get", "name"],
+        "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(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_areas_labels_park_large",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 12,
+      "maxzoom": 16,
+      "filter": [
+        "all",
+        [
+          "in",
+          ["get", "type"],
+          [
+            "literal",
+            [
+              "park",
+              "camp_site",
+              "recreation_ground",
+              "sports_centre",
+              "stadium",
+              "village_green"
+            ]
+          ]
+        ],
+        [">=", ["get", "area_m2"], 3000000]
+      ],
+      "layout": {
+        "text-field": ["get", "name"],
+        "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(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",
@@ -5798,7 +5949,7 @@
       }
     },
     {
-      "id": "landuse_areaslabels_forest",
+      "id": "landuse_areas_labels_forest",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
@@ -5817,15 +5968,19 @@
       }
     },
     {
-      "id": "landuse_areaslabels_nature_reserve",
+      "id": "landuse_areas_labels_nature_reserve",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
-      "minzoom": 6,
-      "maxzoom": 12,
-      "filter": ["in", ["get", "type"], ["literal", ["nature_reserve"]]],
+      "minzoom": 12,
+      "maxzoom": 16,
+      "filter": [
+        "all",
+        ["in", ["get", "type"], ["literal", ["nature_reserve"]]],
+        ["<", ["get", "area_m2"], 30000000]
+      ],
       "layout": {
-        "text-size": 24,
+        "text-size": 12,
         "text-field": ["get", "name"],
         "text-font": ["OpenHistorical"]
       },
@@ -5836,15 +5991,72 @@
       }
     },
     {
-      "id": "landuse_areaslabels_school",
+      "id": "landuse_areas_labels_nature_reserve_med_10-14",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
-      "minzoom": 14,
-      "maxzoom": 24,
+      "minzoom": 10,
+      "maxzoom": 14,
       "filter": [
-        "in",
-        ["get", "type"],
+        "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": ["interpolate", ["linear"], ["zoom"], 7, 12, 8, 16, 9, 24, 12, 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_school",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 14,
+      "maxzoom": 24,
+      "filter": [
+        "in",
+        ["get", "type"],
         ["literal", ["", "college", "education", "school", "university"]]
       ],
       "layout": {
@@ -5859,7 +6071,7 @@
       }
     },
     {
-      "id": "other_areaslabels_military",
+      "id": "other_areas_labels_military",
       "type": "symbol",
       "source": "osm",
       "source-layer": "other_points_centroids",
@@ -5878,7 +6090,7 @@
       }
     },
     {
-      "id": "landuse_areaslabels_z8glacier",
+      "id": "landuse_areas_labels_z8glacier",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
@@ -5936,7 +6148,7 @@
       }
     },
     {
-      "id": "points_of_interest_frombuildings",
+      "id": "points_of_interest_buildings",
       "type": "symbol",
       "source": "osm",
       "source-layer": "buildings_points_centroids",
@@ -5946,7 +6158,7 @@
         "icon-image": "{tourism}-18",
         "visibility": "visible",
         "text-field": ["get", "name"],
-        "text-size": ["interpolate", ["linear"], ["zoom"], 16, 10, 20, 12],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 16, 12, 17, 14, 20, 16],
         "text-anchor": "center",
         "text-offset": [0, 0],
         "text-font": ["OpenHistorical"],
@@ -5961,7 +6173,7 @@
       }
     },
     {
-      "id": "points_of_interest_fromareasz14-centroids",
+      "id": "points_of_interest_from_areas_z14_centroids",
       "type": "symbol",
       "source": "osm",
       "source-layer": "amenity_points_centroids",
@@ -6005,7 +6217,7 @@
       }
     },
     {
-      "id": "points_of_interest_fromareasz14",
+      "id": "points_of_interest_from_areas_z14",
       "type": "symbol",
       "source": "osm",
       "source-layer": "amenity_points_centroids",
@@ -6049,7 +6261,7 @@
       }
     },
     {
-      "id": "points_of_interest_fromareas",
+      "id": "points_of_interest_from_areas",
       "type": "symbol",
       "source": "osm",
       "source-layer": "amenity_points_centroids",
@@ -6084,43 +6296,6 @@
         "text-opacity": ["interpolate", ["linear"], ["zoom"], 16.99, 0, 17, 1]
       }
     },
-    {
-      "id": "points_of_interest_amenity-centroids",
-      "type": "symbol",
-      "source": "osm",
-      "source-layer": "amenity_points_centroids",
-      "minzoom": 15,
-      "maxzoom": 24,
-      "filter": ["all"],
-      "layout": {
-        "text-line-height": 1.2,
-        "text-size": [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          15.99,
-          0,
-          16,
-          10,
-          20,
-          12
-        ],
-        "icon-image": "{type}-18",
-        "text-font": ["OpenHistorical"],
-        "visibility": "visible",
-        "text-offset": [0, 1],
-        "icon-size": ["interpolate", ["linear"], ["zoom"], 15, 0.7, 20, 1.4],
-        "text-anchor": "top",
-        "text-field": ["get", "name"]
-      },
-      "paint": {
-        "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": ["interpolate", ["linear"], ["zoom"], 16.9, 0, 17, 1]
-      }
-    },
     {
       "id": "points_of_interest_other",
       "type": "symbol",
@@ -6165,36 +6340,12 @@
         "text-opacity": ["interpolate", ["linear"], ["zoom"], 16.99, 0, 17, 1]
       }
     },
-    {
-      "id": "points_of_interest_amenity_14",
-      "type": "symbol",
-      "source": "osm",
-      "source-layer": "amenity_points_centroids",
-      "minzoom": 14,
-      "maxzoom": 16,
-      "filter": ["all"],
-      "layout": {
-        "icon-image": "{type}-18",
-        "visibility": "visible",
-        "text-field": ["get", "name"],
-        "text-size": 8,
-        "text-anchor": "top",
-        "text-offset": [0, 1],
-        "text-font": ["OpenHistorical"]
-      },
-      "paint": {
-        "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_of_interest_amenity",
       "type": "symbol",
       "source": "osm",
       "source-layer": "amenity_points_centroids",
-      "minzoom": 15,
+      "minzoom": 16,
       "maxzoom": 24,
       "layout": {
         "text-line-height": 1.2,
@@ -6312,32 +6463,49 @@
       }
     },
     {
-      "id": "points_airport",
+      "id": "transport_points_labels",
       "type": "symbol",
       "source": "osm",
       "source-layer": "transport_points_centroids",
-      "minzoom": 10,
-      "maxzoom": 14,
-      "filter": ["==", ["get", "type"], "aerodrome"],
-      "layout": {"icon-image": "airport-18", "text-font": ["OpenHistorical"]}
+      "minzoom": 12,
+      "maxzoom": 24,
+      "filter": ["!", ["in", ["get", "type"], ["literal", ["traffic_signals", "pedestrian", "raceway"]]]],
+      "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"],
+        "icon-size": ["interpolate", ["linear"], ["zoom"], 10, 0.4, 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": 0.5,
+        "text-halo-blur": 1,
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 12.99, 0, 13, 1]
+      }
     },
     {
-      "id": "transport_points_centroids",
+      "id": "transport_points_raceway",
       "type": "symbol",
       "source": "osm",
       "source-layer": "transport_points_centroids",
-      "minzoom": 14,
+      "minzoom": 15,
       "maxzoom": 24,
-      "filter": ["all"],
+      "filter": ["!", ["in", ["get", "type"], ["literal", ["traffic_signals", "pedestrian", "raceway"]]]],
       "layout": {
         "icon-image": "{type}-18",
         "visibility": "visible",
         "text-field": ["get", "name"],
-        "text-size": ["interpolate", ["linear"], ["zoom"], 14, 8, 18, 10],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 10, 14, 18, 14],
         "text-anchor": "top",
         "text-offset": [0, 0.75],
         "text-font": ["OpenHistorical"],
-        "icon-size": ["interpolate", ["linear"], ["zoom"], 14, 0.75, 20, 1.4]
+        "icon-size": ["interpolate", ["linear"], ["zoom"], 10, 0.4, 20, 1.4]
       },
       "paint": {
         "icon-color": "#000000",
@@ -6345,11 +6513,122 @@
         "text-halo-color": "rgba(255, 255, 255, 1)",
         "text-halo-width": 0.5,
         "text-halo-blur": 1,
-        "text-opacity": ["interpolate", ["linear"], ["zoom"], 13.99, 0, 14, 1]
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 12.99, 0, 13, 1]
       }
     },
     {
-      "id": "points_placeofworshipother",
+      "id": "transport_points_labels_traffic_signals",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "transport_points_centroids",
+      "minzoom": 17,
+      "maxzoom": 24,
+      "filter": ["==", ["get", "type"], "traffic_signals"],
+      "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_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",
+      "minzoom": 10,
+      "maxzoom": 14,
+      "filter": ["==", ["get", "type"], "aerodrome"],
+      "layout": {
+        "icon-image": "airport-18",
+        "icon-size": ["interpolate", ["linear"], ["zoom"], 10, 1.2, 14, 1.5],
+        "text-font": ["OpenHistorical"]}
+    },
+    {
+      "id": "transport_points_labels_medium",
+      "type": "symbol",
+      "source": "osm",
+      "source-layer": "transport_points_centroids",
+      "minzoom": 13,
+      "maxzoom": 16,
+      "filter": [">", ["get", "area_m2"], 1000000],
+      "layout": {
+        "icon-image": "{type}-18",
+        "visibility": "visible",
+        "text-field": ["get", "name"],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 13, 20, 18, 14],
+        "text-font": ["OpenHistorical"],
+        "icon-size": ["interpolate", ["linear"], ["zoom"], 14, 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": "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"], ["zoom"], 14, 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_place_of_worship_other",
       "type": "symbol",
       "source": "osm",
       "source-layer": "buildings_points_centroids",
@@ -6384,7 +6663,7 @@
       }
     },
     {
-      "id": "points_fromlanduse-z14",
+      "id": "points_from_landuse_peaks",
       "type": "symbol",
       "source": "osm",
       "source-layer": "landuse_points_centroids",
@@ -6405,54 +6684,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",
@@ -6478,7 +6709,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",
@@ -6512,7 +6743,7 @@
       }
     },
     {
-      "id": "county_labels_z11-admin6-centroids",
+      "id": "county_labels_z11_admin_6_centroids",
       "type": "symbol",
       "source": "osm",
       "source-layer": "land_ohm_centroids",
@@ -6620,7 +6851,7 @@
       "filter": [
         "in",
         ["get", "type"],
-        ["literal", ["hamlet", "islet", "neighborhood", "suburb", "village"]]
+        ["literal", ["hamlet", "neighborhood", "suburb", "village"]]
       ],
       "layout": {
         "text-field": ["get", "name"],
@@ -6886,7 +7117,7 @@
       }
     },
     {
-      "id": "country_points_labels-cen",
+      "id": "country_points_labels_cen",
       "type": "symbol",
       "source": "osm",
       "source-layer": "land_ohm_centroids",