npm - @openhistoricalmap/map-styles - Versions diffs - 0.9.11 → 0.9.13 - Mend

@openhistoricalmap/map-styles 0.9.11 → 0.9.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/README.md +3 -3
package/dist/historical/historical.json +1384 -751
package/dist/japanese_scroll/japanese_scroll.json +88 -106
package/dist/ohm.styles.js +1806 -1318
package/dist/railway/railway.json +365 -474
package/dist/woodblock/woodblock.json +93 -111
package/historical/historical.json +721 -518
package/index.css +53 -0
package/index.html +103 -5
package/japanese_scroll/japanese_scroll.json +82 -82
package/package.json +6 -6
package/railway/railway.json +316 -311
package/woodblock/woodblock.json +89 -91

package/historical/historical.json CHANGED Viewed

@@ -3,9 +3,9 @@
   "name": "ohm-historical",
   "metadata": {"maputnik:renderer": "mbgljs"},
   "sources": {
-    "osm": {
+    "ohm": {
       "type": "vector",
-      "tiles": ["https://vtiles.openhistoricalmap.org/maps/osm/{z}/{x}/{y}.pbf"]
+      "tiles": ["https://vtiles.openhistoricalmap.org/maps/ohm/{z}/{x}/{y}.pbf"]
     },
     "ohm_landcover_hillshade": {
       "type": "raster",
@@ -65,7 +65,7 @@
     {
       "id": "landuse_areas_earth",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 0,
       "maxzoom": 24,
@@ -96,7 +96,7 @@
     {
       "id": "landuse_areas_military_overlay",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 10,
       "maxzoom": 24,
@@ -111,7 +111,7 @@
     {
       "id": "military_landuselow",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 4,
       "maxzoom": 10,
@@ -122,7 +122,7 @@
     {
       "id": "military-landusehigh",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 10,
       "maxzoom": 24,
@@ -133,7 +133,7 @@
     {
       "id": "military",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "filter": ["==", ["get", "class"], "military"],
       "layout": {"visibility": "visible"},
@@ -144,7 +144,7 @@
     {
       "id": "military-pattern",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "filter": ["==", ["get", "class"], "military"],
       "layout": {"visibility": "visible"},
@@ -155,7 +155,7 @@
     {
       "id": "aero_aerodrome_area",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 10,
       "maxzoom": 24,
@@ -169,7 +169,7 @@
     {
       "id": "aero_heliport_area",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 12,
       "maxzoom": 24,
@@ -183,7 +183,7 @@
     {
       "id": "airports",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 11,
       "maxzoom": 24,
@@ -192,9 +192,9 @@
       "paint": {"fill-color": "rgba(235, 235, 225, 1)"}
     },
     {
-      "id": "nature_reserve_fill",
+      "id": "nature_reserve_fill_6-24",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 6,
       "maxzoom": 24,
@@ -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": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 6,
-      "maxzoom": 24,
+      "maxzoom": 12,
       "filter": [
         "in",
         ["get", "type"],
@@ -250,10 +252,15 @@
     {
       "id": "landuse_areas_z12_generalized_land_use",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["residential", "retail", "industrial"]]
+      ],
       "layout": {"visibility": "visible"},
       "paint": {
         "fill-color": [
@@ -276,42 +283,17 @@
       }
     },
     {
-      "id": "landuse_areas_z12_underlying_land_designation",
-      "type": "fill",
-      "source": "osm",
-      "source-layer": "landuse_areas",
-      "minzoom": 12,
-      "maxzoom": 24,
-      "layout": {"visibility": "visible"},
-      "paint": {
-        "fill-color": [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          0,
-          [
-            "match",
-            ["get", "type"],
-            "park",
-            "rgba(208, 220, 174, 1)",
-            "pitch",
-            "rgba(69, 150, 7, 0.39)",
-            "nature_reserve",
-            "rgba(212, 225, 211, 0.3)",
-            "golf_course",
-            "rgba(236, 240, 198, 1)",
-            "transparent"
-          ]
-        ]
-      }
-    },
-    {
-      "id": "landuse_areas_z12_localized_land_use",
+      "id": "landuse_areas_localized_land_use",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "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 +330,17 @@
       }
     },
     {
-      "id": "landuse_areas_z12_landcover_short",
+      "id": "landuse_areas_landcover_short",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "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": [
@@ -390,7 +377,7 @@
     {
       "id": "landuse_areas_z12_park_outlines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
@@ -404,11 +391,15 @@
     {
       "id": "landuse_areas_z12_landcover_tall",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
-      "filter": ["all"],
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["forest", "wood", "scrub"]]
+      ],
       "layout": {"visibility": "visible"},
       "paint": {
         "fill-color": [
@@ -431,12 +422,17 @@
       }
     },
     {
-      "id": "landuse_areas_z12_food_and_farming",
+      "id": "landuse_areas_ood_and_farming",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
-      "minzoom": 12,
+      "minzoom": 6,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["farmland", "farmyard", "farm", "orchard", "vineyard", "allotments", "garden"]]
+      ],
       "layout": {"visibility": "visible"},
       "paint": {
         "fill-color": [
@@ -467,13 +463,18 @@
       }
     },
     {
-      "id": "landuse_areas_z12_developed_open_space_larger",
+      "id": "landuse_areas_developed_open_space_larger_types",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
-      "minzoom": 12,
+      "minzoom": 6,
       "maxzoom": 24,
       "layout": {"visibility": "visible"},
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["park", "golf_course", "village_green", "cemetery", "sports_centre", "stadium", "recreation_ground"]]
+      ],
       "paint": {
         "fill-color": [
           "interpolate",
@@ -483,6 +484,10 @@
           [
             "match",
             ["get", "type"],
+            "park",
+            "rgba(208, 220, 174, 1)",
+            "golf_course",
+            "rgba(236, 240, 198, 1)",
             "village_green",
             "rgba(208, 220, 174, 1)",
             "cemetery",
@@ -514,12 +519,17 @@
       }
     },
     {
-      "id": "landuse_areas_z12_developed_open_space_smaller",
+      "id": "landuse_areas_developed_open_space_smaller_types",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["grave_yard", "picnic_site", "camp_site", "playground", "pitch", "track", "bleachers"]]
+      ],
       "layout": {"visibility": "visible"},
       "paint": {
         "fill-color": [
@@ -567,7 +577,7 @@
     {
       "id": "parking_lots",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_areas",
       "paint": {
         "fill-color": "rgba(236, 231, 231, 1)",
@@ -575,13 +585,15 @@
       }
     },
     {
-      "id": "landuse_naturereserveoutline",
+      "id": "landuse_nature_reserve_outline",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "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],
@@ -592,7 +604,7 @@
     {
       "id": "landuse_areas_z12_natural",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
@@ -607,7 +619,7 @@
     {
       "id": "place_areas_plot",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_areas",
       "filter": ["==", ["get", "type"], "plot"],
       "layout": {"visibility": "visible"},
@@ -619,7 +631,7 @@
     {
       "id": "place_areas_square",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_areas",
       "filter": ["==", ["get", "type"], "square"],
       "layout": {"visibility": "visible"},
@@ -631,7 +643,7 @@
     {
       "id": "pedestrian_area",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 14,
       "maxzoom": 24,
@@ -648,16 +660,68 @@
     {
       "id": "amenity_areas",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_areas",
       "filter": ["in", ["get", "type"], ["literal", ["school", "university"]]],
       "layout": {"visibility": "visible"},
       "paint": {"fill-color": "rgba(226, 214, 205, 1)"}
     },
+    {
+      "id": "water_lines_canal-casing",
+      "type": "line",
+      "source": "ohm",
+      "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": "ohm",
+      "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",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_areas",
       "minzoom": 0,
       "maxzoom": 24,
@@ -675,7 +739,7 @@
       }
     },
     {
-      "id": "water_areas-ne",
+      "id": "water_areas_ne",
       "type": "fill",
       "source": "ne",
       "source-layer": "water_areas",
@@ -697,10 +761,15 @@
     {
       "id": "landuse_areas_z12_watercover",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "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,9 +796,9 @@
       }
     },
     {
-      "id": "wetlands_z11-pattern",
+      "id": "wetlands_z11_pattern",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 11,
       "maxzoom": 24,
@@ -745,7 +814,7 @@
     {
       "id": "landuse_areas_z12_glacier-outline",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 9,
       "maxzoom": 24,
@@ -760,7 +829,7 @@
     {
       "id": "ferry_lines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "filter": ["==", ["get", "type"], "ferry"],
       "paint": {
@@ -784,7 +853,7 @@
     {
       "id": "place_areas_islet",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_areas",
       "filter": ["==", ["get", "type"], "islet"],
       "layout": {"visibility": "visible"},
@@ -796,7 +865,7 @@
     {
       "id": "water_lines_stream_no_name",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -813,7 +882,7 @@
     {
       "id": "water_lines_stream_name",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -842,7 +911,7 @@
     {
       "id": "water_lines_cliff_line",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 15,
       "maxzoom": 24,
@@ -865,7 +934,7 @@
     {
       "id": "water_lines_cliff_line_triangles",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 15,
       "maxzoom": 24,
@@ -890,7 +959,7 @@
     {
       "id": "water_lines_waterfall_triangle",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 15,
       "maxzoom": 24,
@@ -915,7 +984,7 @@
     {
       "id": "water_lines_ditch",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 15,
       "maxzoom": 24,
@@ -925,62 +994,10 @@
         "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",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 8,
       "maxzoom": 24,
@@ -1010,7 +1027,7 @@
     {
       "id": "water_lines_river",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 8,
       "maxzoom": 24,
@@ -1043,7 +1060,7 @@
     {
       "id": "water_lines_breakwater",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "minzoom": 10,
       "maxzoom": 24,
@@ -1056,7 +1073,7 @@
     {
       "id": "water_lines_dam",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -1079,7 +1096,7 @@
     {
       "id": "pier",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "filter": ["==", ["get", "type"], "pier"],
       "layout": {"visibility": "visible"},
@@ -1088,7 +1105,7 @@
     {
       "id": "pier_line",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "minzoom": 12,
       "filter": ["==", ["get", "type"], "pier"],
@@ -1101,7 +1118,7 @@
     {
       "id": "buildings_flat",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "buildings",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1115,7 +1132,7 @@
     {
       "id": "buildings_flat_ruins",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1130,7 +1147,7 @@
     {
       "id": "buildings_ruins_outlines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "filter": ["==", ["get", "type"], "ruins"],
       "layout": {"visibility": "visible"},
@@ -1150,7 +1167,7 @@
     {
       "id": "historic_fort",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1168,7 +1185,7 @@
     {
       "id": "transport_traverser",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1183,7 +1200,7 @@
     {
       "id": "transport_turntable",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 14,
       "filter": ["==", ["get", "type"], "turntable"],
@@ -1197,7 +1214,7 @@
     {
       "id": "transport_passenger_platform",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 14,
       "filter": ["==", ["get", "type"], "platform"],
@@ -1211,7 +1228,7 @@
     {
       "id": "transport_freight_platform",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 14,
       "filter": ["==", ["get", "type"], "loading_ramp"],
@@ -1225,7 +1242,7 @@
     {
       "id": "terminals",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 11,
       "maxzoom": 24,
@@ -1239,7 +1256,7 @@
     {
       "id": "aero_taxiway_lines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 11,
       "maxzoom": 24,
@@ -1263,7 +1280,7 @@
     {
       "id": "aero_runway_lines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "maxzoom": 24,
@@ -1277,7 +1294,7 @@
     {
       "id": "man_made_bridge_area",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "filter": [
         "all",
@@ -1289,7 +1306,7 @@
     {
       "id": "man_made_bridge_line",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "filter": [
         "all",
@@ -1301,7 +1318,7 @@
     {
       "id": "roads_subways_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "filter": [
@@ -1327,7 +1344,7 @@
     {
       "id": "roads_tertiarytunnel_case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -1358,7 +1375,7 @@
     {
       "id": "roads_secondarytunnel_case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -1389,7 +1406,7 @@
     {
       "id": "roads_primarytunnel_case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 20,
@@ -1421,7 +1438,7 @@
     {
       "id": "roads_motorwaytunnel_case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 5,
       "maxzoom": 20,
@@ -1457,7 +1474,7 @@
     {
       "id": "roads_tertiarytunnel_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -1487,7 +1504,7 @@
     {
       "id": "roads_secondarytunnel_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -1517,7 +1534,7 @@
     {
       "id": "roads_primarytunnel_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -1547,7 +1564,7 @@
     {
       "id": "roads_motorwaytunnel_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 5,
       "maxzoom": 20,
@@ -1582,7 +1599,7 @@
     {
       "id": "roads_raceways_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -1609,7 +1626,7 @@
     {
       "id": "roads_trackfillcase_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1635,7 +1652,7 @@
     {
       "id": "roads_trackfill_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1661,7 +1678,7 @@
     {
       "id": "roads_track_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1688,7 +1705,7 @@
     {
       "id": "roads_living_street_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1714,7 +1731,7 @@
     {
       "id": "roads_pedestrian_street_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1740,7 +1757,7 @@
     {
       "id": "roads_footway_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1775,7 +1792,7 @@
     {
       "id": "roads_pier_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1801,7 +1818,7 @@
     {
       "id": "roads_steps_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1828,7 +1845,7 @@
     {
       "id": "roads_roadscase_z13_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -1859,7 +1876,7 @@
     {
       "id": "roads_residentialcase_z13_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -1894,7 +1911,7 @@
     {
       "id": "roads_tertiary-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10.01,
       "maxzoom": 24,
@@ -1926,7 +1943,7 @@
     {
       "id": "roads_secondary-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "filter": [
@@ -1957,7 +1974,7 @@
     {
       "id": "roads_primarylink-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "filter": [
@@ -1988,7 +2005,7 @@
     {
       "id": "roads_primary-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "filter": [
@@ -2020,7 +2037,7 @@
     {
       "id": "roads_motorwaylink-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 20,
@@ -2056,7 +2073,7 @@
     {
       "id": "roads_motorway-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 20,
@@ -2088,7 +2105,7 @@
     {
       "id": "roads_roads_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -2119,7 +2136,7 @@
     {
       "id": "roads_residential_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -2154,7 +2171,7 @@
     {
       "id": "roads_secondarylink_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -2194,7 +2211,7 @@
     {
       "id": "roads_primarylink_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -2226,7 +2243,7 @@
     {
       "id": "roads_motorwaylink_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 5,
       "maxzoom": 20,
@@ -2263,7 +2280,7 @@
     {
       "id": "roads_tertiary_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 24,
@@ -2304,7 +2321,7 @@
     {
       "id": "roads_secondary_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -2344,7 +2361,7 @@
     {
       "id": "roads_primary_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -2385,7 +2402,7 @@
     {
       "id": "roads_motorway_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 20,
@@ -2424,7 +2441,7 @@
     {
       "id": "roads_ford_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": ["==", ["get", "ford"], "yes"],
@@ -2446,7 +2463,7 @@
     {
       "id": "roads_residential_bridge_z13-copy_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -2481,7 +2498,7 @@
     {
       "id": "roads_tertiarybridge_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -2511,7 +2528,7 @@
     {
       "id": "roads_secondarybridge_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -2541,7 +2558,7 @@
     {
       "id": "roads_primarybridge_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "maxzoom": 20,
@@ -2576,7 +2593,7 @@
     {
       "id": "roads_motorwaybridge_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 20,
@@ -2611,7 +2628,7 @@
     {
       "id": "roads_residential_bridgetop_z13_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -2647,7 +2664,7 @@
     {
       "id": "roads_tertiarybridgetop_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 24,
@@ -2687,7 +2704,7 @@
     {
       "id": "roads_secondarybridgetop_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -2726,7 +2743,7 @@
     {
       "id": "roads_primarybridgetop_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -2765,7 +2782,7 @@
     {
       "id": "roads_motorwaybridgetop_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 20,
@@ -2807,7 +2824,7 @@
     {
       "id": "roads_rail_tram_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 11,
       "maxzoom": 24,
@@ -2838,7 +2855,7 @@
     {
       "id": "roads_subways",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "filter": ["==", ["get", "type"], "subway"],
@@ -2864,7 +2881,7 @@
     {
       "id": "roads_tertiarytunnel_case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -2894,7 +2911,7 @@
     {
       "id": "roads_secondarytunnel_case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -2924,7 +2941,7 @@
     {
       "id": "roads_primarytunnel_case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 20,
@@ -2955,7 +2972,7 @@
     {
       "id": "roads_motorwaytunnel_case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 20,
@@ -2990,7 +3007,7 @@
     {
       "id": "roads_tertiarytunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -3019,7 +3036,7 @@
     {
       "id": "roads_secondarytunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -3048,7 +3065,7 @@
     {
       "id": "roads_primarytunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -3077,7 +3094,7 @@
     {
       "id": "roads_motorwaytunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 5,
       "maxzoom": 20,
@@ -3111,7 +3128,7 @@
     {
       "id": "roads_raceways",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -3134,7 +3151,7 @@
     {
       "id": "roads_trackfillcase",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3156,7 +3173,7 @@
     {
       "id": "roads_trackfill",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3178,7 +3195,7 @@
     {
       "id": "roads_track",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3201,7 +3218,7 @@
     {
       "id": "roads_living_street",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3223,7 +3240,7 @@
     {
       "id": "roads_footway",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3254,7 +3271,7 @@
     {
       "id": "roads_pier",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3276,7 +3293,7 @@
     {
       "id": "roads_steps",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3299,7 +3316,7 @@
     {
       "id": "roads_servicecase_z13",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -3329,7 +3346,7 @@
     {
       "id": "roads_residentialcase_z13",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -3359,7 +3376,7 @@
     {
       "id": "roads_pedestrian_street-casing",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3381,7 +3398,7 @@
     {
       "id": "roads_tertiarylink-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10.01,
       "maxzoom": 24,
@@ -3416,7 +3433,7 @@
     {
       "id": "roads_tertiary-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10.01,
       "maxzoom": 24,
@@ -3451,7 +3468,7 @@
     {
       "id": "roads_secondary-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "filter": [
@@ -3483,7 +3500,7 @@
     {
       "id": "roads_secondarylink-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -3515,7 +3532,7 @@
     {
       "id": "roads_primarylink-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "filter": [
@@ -3545,7 +3562,7 @@
     {
       "id": "roads_primary-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -3580,7 +3597,7 @@
     {
       "id": "roads_motorwaylink-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 20,
@@ -3611,7 +3628,7 @@
     {
       "id": "roads_motorway-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 24,
@@ -3642,7 +3659,7 @@
     {
       "id": "roads_proposed",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -3673,7 +3690,7 @@
     {
       "id": "roads_service",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -3699,7 +3716,7 @@
     {
       "id": "roads_residential",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -3729,7 +3746,7 @@
     {
       "id": "roads_pedestrian_street",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3751,7 +3768,7 @@
     {
       "id": "roads_secondarylink",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -3781,7 +3798,7 @@
     {
       "id": "roads_tertiarylink",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -3821,7 +3838,7 @@
     {
       "id": "roads_primarylink",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -3851,7 +3868,7 @@
     {
       "id": "roads_motorwaylink",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 20,
@@ -3892,7 +3909,7 @@
     {
       "id": "roads_tertiary",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 24,
@@ -3933,7 +3950,7 @@
     {
       "id": "roads_secondary",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -3963,7 +3980,7 @@
     {
       "id": "roads_primary",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -4004,7 +4021,7 @@
     {
       "id": "roads_motorway",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 24,
@@ -4045,7 +4062,7 @@
     {
       "id": "roads_ford",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": ["==", ["get", "ford"], "yes"],
@@ -4067,7 +4084,7 @@
     {
       "id": "roads_rail_mini",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4085,7 +4102,7 @@
     {
       "id": "roads_rail_mini-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4121,7 +4138,7 @@
     {
       "id": "roads_rail_mini_cross",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -4156,7 +4173,7 @@
     {
       "id": "roads_rail_old",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4190,7 +4207,7 @@
     {
       "id": "roads_rail_old-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4226,7 +4243,7 @@
     {
       "id": "roads_rail_old_cross",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -4273,7 +4290,7 @@
     {
       "id": "roads_rail-main",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4301,7 +4318,7 @@
     {
       "id": "roads_rail-tunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4327,7 +4344,7 @@
     {
       "id": "roads_rail-bridge",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4353,7 +4370,7 @@
     {
       "id": "roads_rail-yard-siding",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4371,7 +4388,7 @@
     {
       "id": "roads_rail-yard-siding-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4406,7 +4423,7 @@
     {
       "id": "roads_rail",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4442,7 +4459,7 @@
     {
       "id": "roads_rail-main-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4497,7 +4514,7 @@
     {
       "id": "roads_rail-dash-tunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4550,7 +4567,7 @@
     {
       "id": "roads_rail-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4597,7 +4614,7 @@
     {
       "id": "roads_rail_cross-main",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4645,7 +4662,7 @@
     {
       "id": "roads_rail_cross",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -4693,7 +4710,7 @@
     {
       "id": "roads_rail_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4727,7 +4744,7 @@
     {
       "id": "roads_rail_construction-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4762,7 +4779,7 @@
     {
       "id": "roads_rail_construction_cross",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -4805,7 +4822,7 @@
     {
       "id": "roads_residential_bridge_z13-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -4839,7 +4856,7 @@
     {
       "id": "roads_tertiarybridge",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -4868,7 +4885,7 @@
     {
       "id": "roads_secondarybridge",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "filter": [
@@ -4897,7 +4914,7 @@
     {
       "id": "roads_primarybridge",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "maxzoom": 20,
@@ -4927,7 +4944,7 @@
     {
       "id": "roads_motorwaybridge",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 20,
@@ -4961,7 +4978,7 @@
     {
       "id": "roads_residential_bridgetop_z13",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -4995,7 +5012,7 @@
     {
       "id": "roads_tertiarybridgetop",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 24,
@@ -5033,7 +5050,7 @@
     {
       "id": "roads_secondarybridgetop",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -5070,7 +5087,7 @@
     {
       "id": "roads_primarybridgetop",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -5107,7 +5124,7 @@
     {
       "id": "roads_motorwaybridgetop",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 20,
@@ -5147,7 +5164,7 @@
     {
       "id": "roads_rail_tram",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 11,
       "maxzoom": 24,
@@ -5181,7 +5198,7 @@
     {
       "id": "barriers-dotted",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "filter": ["==", ["get", "type"], "bollard"],
       "paint": {
@@ -5193,7 +5210,7 @@
     {
       "id": "landuse_lines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_lines",
       "filter": ["all"],
       "paint": {
@@ -5216,7 +5233,7 @@
     {
       "id": "barriers",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "filter": ["all"],
       "paint": {
@@ -5251,7 +5268,7 @@
     {
       "id": "power_lines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "filter": [
         "all",
@@ -5264,7 +5281,7 @@
     {
       "id": "city_county_lines_admin_9",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 11,
       "maxzoom": 20,
@@ -5281,9 +5298,9 @@
       }
     },
     {
-      "id": "city_county_lines_admin7_8",
+      "id": "city_county_lines_admin_7-8",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 10,
       "maxzoom": 20,
@@ -5300,9 +5317,9 @@
       }
     },
     {
-      "id": "admin_admin5_6",
+      "id": "admin_admin_5-6",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 8,
       "maxzoom": 20,
@@ -5327,9 +5344,9 @@
       }
     },
     {
-      "id": "state_lines_admin4-case",
+      "id": "state_lines_admin_4-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 3,
       "maxzoom": 20,
@@ -5357,9 +5374,9 @@
       }
     },
     {
-      "id": "state_lines_admin4",
+      "id": "state_lines_admin_4",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 3,
       "maxzoom": 20,
@@ -5399,7 +5416,7 @@
     {
       "id": "admin_admin3",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 5,
       "maxzoom": 20,
@@ -5415,9 +5432,9 @@
       }
     },
     {
-      "id": "admin_countrylines_z10_case",
+      "id": "admin_country_lines_z10_case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 0,
       "maxzoom": 20,
@@ -5443,9 +5460,9 @@
       }
     },
     {
-      "id": "admin_countrylines_z10",
+      "id": "admin_country_lines_z10",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 0,
       "maxzoom": 20,
@@ -5489,9 +5506,9 @@
       }
     },
     {
-      "id": "roadlabels_z14",
+      "id": "road_labels_z14",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "filter": ["all"],
@@ -5514,9 +5531,9 @@
       }
     },
     {
-      "id": "roadlabels_z11",
+      "id": "road_labels_z11",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 11,
       "filter": ["in", ["get", "type"], ["literal", ["motorway", "trunk"]]],
@@ -5539,9 +5556,9 @@
       }
     },
     {
-      "id": "water_areaslabels_z15",
+      "id": "water_areas_labels_z15",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_areas_centroids",
       "minzoom": 15,
       "maxzoom": 24,
@@ -5560,9 +5577,9 @@
       }
     },
     {
-      "id": "water_areaslabels_z12",
+      "id": "water_areas_labels_z12",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_areas_centroids",
       "minzoom": 12,
       "maxzoom": 15,
@@ -5582,9 +5599,9 @@
       }
     },
     {
-      "id": "water_pointlabels_ocean_sea",
+      "id": "water_point_labels_ocean_sea",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 0,
       "maxzoom": 24,
@@ -5614,9 +5631,9 @@
       }
     },
     {
-      "id": "water_areaslabels_z8",
+      "id": "water_areas_labels_z8",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_areas_centroids",
       "minzoom": 8,
       "maxzoom": 12,
@@ -5645,9 +5662,9 @@
       }
     },
     {
-      "id": "water_lineslabels-cliff",
+      "id": "water_lines_labels_cliff",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "filter": ["==", ["get", "type"], "cliff"],
       "layout": {
@@ -5668,9 +5685,9 @@
       }
     },
     {
-      "id": "water_lineslabels-dam",
+      "id": "water_lines_labels_dam",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "filter": ["==", ["get", "type"], "dam"],
       "layout": {
@@ -5691,9 +5708,9 @@
       }
     },
     {
-      "id": "water_lineslabels",
+      "id": "water_lines_labels",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -5717,11 +5734,27 @@
       }
     },
     {
-      "id": "landuse_areaslabels_park",
+      "id": "points_from_landuse_areas",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "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": "ohm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 16,
       "maxzoom": 24,
       "filter": [
         "all",
@@ -5745,7 +5778,7 @@
             ]
           ]
         ],
-        [">", ["get", "area"], 12000]
+        ["<", ["get", "area_m2"], 40000]
       ],
       "layout": {
         "text-field": ["get", "name"],
@@ -5764,68 +5797,216 @@
       }
     },
     {
-      "id": "landuse_areaslabels_farming",
+      "id": "landuse_areas_labels_park_medium",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
-      "minzoom": 14,
-      "maxzoom": 24,
+      "minzoom": 15,
+      "maxzoom": 20,
       "filter": [
-        "in",
-        ["get", "type"],
+        "all",
         [
-          "literal",
+          "in",
+          ["get", "type"],
           [
-            "allotmets",
-            "farm",
-            "farmland",
-            "farmyard",
-            "garden",
-            "orchard",
-            "vineyard"
+            "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": 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": "ohm",
       "source-layer": "landuse_points_centroids",
-      "minzoom": 14,
-      "maxzoom": 24,
-      "filter": ["in", ["get", "type"], ["literal", ["forest", "wood"]]],
+      "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": 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-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": "ohm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 14,
+      "maxzoom": 24,
+      "filter": [
+        "in",
+        ["get", "type"],
+        [
+          "literal",
+          [
+            "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_areaslabels_nature_reserve",
+      "id": "landuse_areas_labels_forest",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
-      "minzoom": 6,
+      "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": "ohm",
+      "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": "ohm",
+      "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": "ohm",
+      "source-layer": "landuse_points_centroids",
+      "minzoom": 7,
       "maxzoom": 12,
-      "filter": ["in", ["get", "type"], ["literal", ["nature_reserve"]]],
+      "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"],
         "text-font": ["OpenHistorical"]
       },
@@ -5836,9 +6017,9 @@
       }
     },
     {
-      "id": "landuse_areaslabels_school",
+      "id": "landuse_areas_labels_school",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 14,
       "maxzoom": 24,
@@ -5859,9 +6040,9 @@
       }
     },
     {
-      "id": "other_areaslabels_military",
+      "id": "other_areas_labels_military",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_points_centroids",
       "minzoom": 12,
       "maxzoom": 24,
@@ -5878,9 +6059,9 @@
       }
     },
     {
-      "id": "landuse_areaslabels_z8glacier",
+      "id": "landuse_areas_labels_z8glacier",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 10,
       "maxzoom": 22,
@@ -5911,7 +6092,7 @@
     {
       "id": "placearea_label",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 14,
       "maxzoom": 24,
@@ -5936,9 +6117,9 @@
       }
     },
     {
-      "id": "points_of_interest_frombuildings",
+      "id": "points_of_interest_buildings",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "buildings_points_centroids",
       "minzoom": 16,
       "filter": ["!=", ["get", "type"], "parking"],
@@ -5946,7 +6127,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,9 +6142,9 @@
       }
     },
     {
-      "id": "points_of_interest_fromareasz14-centroids",
+      "id": "points_of_interest_from_areas_z14_centroids",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_points_centroids",
       "minzoom": 14,
       "maxzoom": 16,
@@ -6005,9 +6186,9 @@
       }
     },
     {
-      "id": "points_of_interest_fromareasz14",
+      "id": "points_of_interest_from_areas_z14",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_points_centroids",
       "minzoom": 14,
       "maxzoom": 16,
@@ -6049,9 +6230,9 @@
       }
     },
     {
-      "id": "points_of_interest_fromareas",
+      "id": "points_of_interest_from_areas",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_points_centroids",
       "minzoom": 16,
       "maxzoom": 24,
@@ -6084,47 +6265,10 @@
         "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",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_points_centroids",
       "minzoom": 15,
       "maxzoom": 24,
@@ -6165,36 +6309,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": "ohm",
       "source-layer": "amenity_points_centroids",
-      "minzoom": 15,
+      "minzoom": 16,
       "maxzoom": 24,
       "layout": {
         "text-line-height": 1.2,
@@ -6228,7 +6348,7 @@
     {
       "id": "points_of_interest_other_archaeology",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_points_centroids",
       "minzoom": 14,
       "maxzoom": 24,
@@ -6264,7 +6384,7 @@
     {
       "id": "points_of_interest_other_artwork",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_points_centroids",
       "minzoom": 15,
       "maxzoom": 24,
@@ -6300,7 +6420,7 @@
     {
       "id": "points_powertower",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_points_centroids",
       "minzoom": 15,
       "maxzoom": 24,
@@ -6312,32 +6432,52 @@
       }
     },
     {
-      "id": "points_airport",
+      "id": "transport_points_labels",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "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": ["all",
+        ["!", ["in", ["get", "type"], ["literal", ["traffic_signals", "pedestrian", "raceway"]]]],
+        ["!", ["in", ["get", "class"], ["literal", ["highway"]]]]
+      ],
+      "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": "ohm",
       "source-layer": "transport_points_centroids",
-      "minzoom": 14,
+      "minzoom": 15,
       "maxzoom": 24,
-      "filter": ["all"],
+      "filter": ["in", ["get", "type"], ["literal", ["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,13 +6485,124 @@
         "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": "ohm",
+      "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": "ohm",
+      "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": "ohm",
+      "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": "ohm",
+      "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": "ohm",
+      "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": "ohm",
       "source-layer": "buildings_points_centroids",
       "filter": [
         "all",
@@ -6374,7 +6625,7 @@
     {
       "id": "points_religion",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "buildings_points_centroids",
       "filter": ["all"],
       "layout": {
@@ -6384,9 +6635,9 @@
       }
     },
     {
-      "id": "points_fromlanduse-z14",
+      "id": "points_from_landuse_peaks",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 14,
       "filter": ["==", ["get", "type"], "peak"],
@@ -6405,58 +6656,10 @@
         "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",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "buildings_points_centroids",
       "minzoom": 16,
       "maxzoom": 24,
@@ -6478,9 +6681,9 @@
       }
     },
     {
-      "id": "county_labels_z11-admin7_8-centroids",
+      "id": "county_labels_z11_admin_7-8_centroids",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_centroids",
       "minzoom": 10,
       "maxzoom": 20,
@@ -6512,9 +6715,9 @@
       }
     },
     {
-      "id": "county_labels_z11-admin6-centroids",
+      "id": "county_labels_z11_admin_6_centroids",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_centroids",
       "minzoom": 8,
       "maxzoom": 20,
@@ -6548,7 +6751,7 @@
     {
       "id": "county_labels_z11",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 8,
       "maxzoom": 20,
@@ -6582,7 +6785,7 @@
     {
       "id": "city_locality_labels_other_z11",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 15,
       "maxzoom": 20,
@@ -6613,14 +6816,14 @@
     {
       "id": "city_labels_other_z11",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 11,
       "maxzoom": 20,
       "filter": [
         "in",
         ["get", "type"],
-        ["literal", ["hamlet", "islet", "neighborhood", "suburb", "village"]]
+        ["literal", ["hamlet", "neighborhood", "suburb", "village"]]
       ],
       "layout": {
         "text-field": ["get", "name"],
@@ -6648,7 +6851,7 @@
     {
       "id": "city_labels_town_z8",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 8,
       "maxzoom": 20,
@@ -6679,7 +6882,7 @@
     {
       "id": "city_labels_z11",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 11,
       "maxzoom": 20,
@@ -6710,7 +6913,7 @@
     {
       "id": "city_labels_z6",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 6,
       "maxzoom": 11,
@@ -6740,7 +6943,7 @@
     {
       "id": "city_capital_labels_z6",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 6,
       "maxzoom": 11,
@@ -6770,7 +6973,7 @@
     {
       "id": "state_points_labels_centroids",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_centroids",
       "minzoom": 5,
       "maxzoom": 20,
@@ -6820,7 +7023,7 @@
     {
       "id": "state_points_labels",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 5,
       "maxzoom": 20,
@@ -6866,7 +7069,7 @@
     {
       "id": "statecapital_labels_z10",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "populated_places",
       "minzoom": 10,
       "maxzoom": 20,
@@ -6886,9 +7089,9 @@
       }
     },
     {
-      "id": "country_points_labels-cen",
+      "id": "country_points_labels_cen",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_centroids",
       "maxzoom": 12,
       "filter": [
@@ -6952,7 +7155,7 @@
     {
       "id": "country_points_labels",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 0,
       "maxzoom": 12,