npm - @openhistoricalmap/map-styles - Versions diffs - 0.9.12 → 0.9.14 - Mend

@openhistoricalmap/map-styles 0.9.12 → 0.9.14

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 (11) hide show

package/README.md +2 -2
package/dist/historical/historical.json +656 -450
package/dist/japanese_scroll/japanese_scroll.json +154 -102
package/dist/ohm.styles.js +1824 -1211
package/dist/railway/railway.json +723 -420
package/dist/woodblock/woodblock.json +159 -107
package/historical/historical.json +324 -352
package/japanese_scroll/japanese_scroll.json +89 -89
package/package.json +5 -5
package/railway/railway.json +349 -344
package/woodblock/woodblock.json +96 -98

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,
@@ -194,7 +194,7 @@
     {
       "id": "nature_reserve_fill_6-24",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 6,
       "maxzoom": 24,
@@ -222,7 +222,7 @@
     {
       "id": "landuse_areas_all_z6-12",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 6,
       "maxzoom": 12,
@@ -252,7 +252,7 @@
     {
       "id": "landuse_areas_z12_generalized_land_use",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
@@ -283,44 +283,9 @@
       }
     },
     {
-      "id": "landuse_areas_underlying_land_designation",
+      "id": "landuse_areas_localized_land_use",
       "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",
-          ["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",
-      "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
@@ -367,7 +332,7 @@
     {
       "id": "landuse_areas_landcover_short",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 6,
       "maxzoom": 24,
@@ -412,7 +377,7 @@
     {
       "id": "landuse_areas_z12_park_outlines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
@@ -426,7 +391,7 @@
     {
       "id": "landuse_areas_z12_landcover_tall",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
@@ -457,11 +422,11 @@
       }
     },
     {
-      "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",
@@ -498,9 +463,9 @@
       }
     },
     {
-      "id": "landuse_areas_developed_open_space_larger",
+      "id": "landuse_areas_developed_open_space_larger_types",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 6,
       "maxzoom": 24,
@@ -508,7 +473,7 @@
       "filter": [
         "in",
         ["get", "type"],
-        ["literal", ["village_green", "cemetary", "sports_centre", "stadium", "recreation_ground"]]
+        ["literal", ["park", "golf_course", "village_green", "cemetery", "sports_centre", "stadium", "recreation_ground"]]
       ],
       "paint": {
         "fill-color": [
@@ -519,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",
@@ -550,16 +519,16 @@
       }
     },
     {
-      "id": "landuse_areas_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", "paitch", "track", "bleachers"]]
+        ["literal", ["grave_yard", "picnic_site", "camp_site", "playground", "pitch", "track", "bleachers"]]
       ],
       "layout": {"visibility": "visible"},
       "paint": {
@@ -608,7 +577,7 @@
     {
       "id": "parking_lots",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_areas",
       "paint": {
         "fill-color": "rgba(236, 231, 231, 1)",
@@ -618,7 +587,7 @@
     {
       "id": "landuse_nature_reserve_outline",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 6,
       "maxzoom": 24,
@@ -635,7 +604,7 @@
     {
       "id": "landuse_areas_z12_natural",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 12,
       "maxzoom": 24,
@@ -650,7 +619,7 @@
     {
       "id": "place_areas_plot",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_areas",
       "filter": ["==", ["get", "type"], "plot"],
       "layout": {"visibility": "visible"},
@@ -662,7 +631,7 @@
     {
       "id": "place_areas_square",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_areas",
       "filter": ["==", ["get", "type"], "square"],
       "layout": {"visibility": "visible"},
@@ -674,7 +643,7 @@
     {
       "id": "pedestrian_area",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 14,
       "maxzoom": 24,
@@ -691,7 +660,7 @@
     {
       "id": "amenity_areas",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_areas",
       "filter": ["in", ["get", "type"], ["literal", ["school", "university"]]],
       "layout": {"visibility": "visible"},
@@ -700,7 +669,7 @@
     {
       "id": "water_lines_canal-casing",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -726,7 +695,7 @@
     {
       "id": "water_lines_canal",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 8,
       "maxzoom": 24,
@@ -752,7 +721,7 @@
     {
       "id": "water_areas",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_areas",
       "minzoom": 0,
       "maxzoom": 24,
@@ -792,7 +761,7 @@
     {
       "id": "landuse_areas_z12_watercover",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 11,
       "maxzoom": 24,
@@ -829,7 +798,7 @@
     {
       "id": "wetlands_z11_pattern",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 11,
       "maxzoom": 24,
@@ -845,7 +814,7 @@
     {
       "id": "landuse_areas_z12_glacier-outline",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_areas",
       "minzoom": 9,
       "maxzoom": 24,
@@ -860,7 +829,7 @@
     {
       "id": "ferry_lines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "filter": ["==", ["get", "type"], "ferry"],
       "paint": {
@@ -884,7 +853,7 @@
     {
       "id": "place_areas_islet",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_areas",
       "filter": ["==", ["get", "type"], "islet"],
       "layout": {"visibility": "visible"},
@@ -896,7 +865,7 @@
     {
       "id": "water_lines_stream_no_name",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -913,7 +882,7 @@
     {
       "id": "water_lines_stream_name",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -942,7 +911,7 @@
     {
       "id": "water_lines_cliff_line",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 15,
       "maxzoom": 24,
@@ -965,7 +934,7 @@
     {
       "id": "water_lines_cliff_line_triangles",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 15,
       "maxzoom": 24,
@@ -990,7 +959,7 @@
     {
       "id": "water_lines_waterfall_triangle",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 15,
       "maxzoom": 24,
@@ -1015,7 +984,7 @@
     {
       "id": "water_lines_ditch",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 15,
       "maxzoom": 24,
@@ -1028,7 +997,7 @@
     {
       "id": "water_lines_aqueduct",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 8,
       "maxzoom": 24,
@@ -1058,7 +1027,7 @@
     {
       "id": "water_lines_river",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 8,
       "maxzoom": 24,
@@ -1091,7 +1060,7 @@
     {
       "id": "water_lines_breakwater",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "minzoom": 10,
       "maxzoom": 24,
@@ -1104,7 +1073,7 @@
     {
       "id": "water_lines_dam",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -1127,7 +1096,7 @@
     {
       "id": "pier",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "filter": ["==", ["get", "type"], "pier"],
       "layout": {"visibility": "visible"},
@@ -1136,7 +1105,7 @@
     {
       "id": "pier_line",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "minzoom": 12,
       "filter": ["==", ["get", "type"], "pier"],
@@ -1149,7 +1118,7 @@
     {
       "id": "buildings_flat",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "buildings",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1163,7 +1132,7 @@
     {
       "id": "buildings_flat_ruins",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1178,7 +1147,7 @@
     {
       "id": "buildings_ruins_outlines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "filter": ["==", ["get", "type"], "ruins"],
       "layout": {"visibility": "visible"},
@@ -1198,7 +1167,7 @@
     {
       "id": "historic_fort",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1216,7 +1185,7 @@
     {
       "id": "transport_traverser",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1231,7 +1200,7 @@
     {
       "id": "transport_turntable",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 14,
       "filter": ["==", ["get", "type"], "turntable"],
@@ -1245,7 +1214,7 @@
     {
       "id": "transport_passenger_platform",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 14,
       "filter": ["==", ["get", "type"], "platform"],
@@ -1259,7 +1228,7 @@
     {
       "id": "transport_freight_platform",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 14,
       "filter": ["==", ["get", "type"], "loading_ramp"],
@@ -1273,7 +1242,7 @@
     {
       "id": "terminals",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_areas",
       "minzoom": 11,
       "maxzoom": 24,
@@ -1287,7 +1256,7 @@
     {
       "id": "aero_taxiway_lines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 11,
       "maxzoom": 24,
@@ -1311,7 +1280,7 @@
     {
       "id": "aero_runway_lines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "maxzoom": 24,
@@ -1325,7 +1294,7 @@
     {
       "id": "man_made_bridge_area",
       "type": "fill",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_areas",
       "filter": [
         "all",
@@ -1337,7 +1306,7 @@
     {
       "id": "man_made_bridge_line",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "filter": [
         "all",
@@ -1349,7 +1318,7 @@
     {
       "id": "roads_subways_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "filter": [
@@ -1375,7 +1344,7 @@
     {
       "id": "roads_tertiarytunnel_case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -1406,7 +1375,7 @@
     {
       "id": "roads_secondarytunnel_case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -1437,7 +1406,7 @@
     {
       "id": "roads_primarytunnel_case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 20,
@@ -1469,7 +1438,7 @@
     {
       "id": "roads_motorwaytunnel_case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 5,
       "maxzoom": 20,
@@ -1505,7 +1474,7 @@
     {
       "id": "roads_tertiarytunnel_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -1535,7 +1504,7 @@
     {
       "id": "roads_secondarytunnel_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -1565,7 +1534,7 @@
     {
       "id": "roads_primarytunnel_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -1595,7 +1564,7 @@
     {
       "id": "roads_motorwaytunnel_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 5,
       "maxzoom": 20,
@@ -1630,7 +1599,7 @@
     {
       "id": "roads_raceways_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -1657,7 +1626,7 @@
     {
       "id": "roads_trackfillcase_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1683,7 +1652,7 @@
     {
       "id": "roads_trackfill_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1709,7 +1678,7 @@
     {
       "id": "roads_track_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1736,7 +1705,7 @@
     {
       "id": "roads_living_street_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1762,7 +1731,7 @@
     {
       "id": "roads_pedestrian_street_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1788,7 +1757,7 @@
     {
       "id": "roads_footway_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1823,7 +1792,7 @@
     {
       "id": "roads_pier_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1849,7 +1818,7 @@
     {
       "id": "roads_steps_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -1876,7 +1845,7 @@
     {
       "id": "roads_roadscase_z13_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -1907,7 +1876,7 @@
     {
       "id": "roads_residentialcase_z13_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -1942,16 +1911,16 @@
     {
       "id": "roads_tertiary-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10.01,
       "maxzoom": 24,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["==", ["get", "construction"], "tertiary"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -1974,15 +1943,15 @@
     {
       "id": "roads_secondary-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["==", ["get", "construction"], "secondary"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2005,15 +1974,15 @@
     {
       "id": "roads_primarylink-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["==", ["get", "construction"], "primary_link"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2036,16 +2005,16 @@
     {
       "id": "roads_primary-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["!=", ["get", "ford"], "yes"],
         ["==", ["get", "construction"], "primary"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2068,20 +2037,20 @@
     {
       "id": "roads_motorwaylink-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         [
           "in",
           ["get", "construction"],
           ["literal", ["motorway_link", "trunk_link"]]
         ],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2104,16 +2073,16 @@
     {
       "id": "roads_motorway-case_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 20,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["in", ["get", "construction"], ["literal", ["motorway", "trunk"]]],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2136,7 +2105,7 @@
     {
       "id": "roads_roads_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -2167,7 +2136,7 @@
     {
       "id": "roads_residential_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -2202,15 +2171,15 @@
     {
       "id": "roads_secondarylink_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["==", ["get", "construction"], "secondary_link"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2242,15 +2211,15 @@
     {
       "id": "roads_primarylink_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["==", ["get", "construction"], "primary_link"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2274,20 +2243,20 @@
     {
       "id": "roads_motorwaylink_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 5,
       "maxzoom": 20,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         [
           "in",
           ["get", "construction"],
           ["literal", ["motorway_link", "trunk_link"]]
         ],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2311,16 +2280,16 @@
     {
       "id": "roads_tertiary_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 24,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["==", ["get", "construction"], "tertiary"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2352,15 +2321,15 @@
     {
       "id": "roads_secondary_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["==", ["get", "construction"], "secondary"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2392,16 +2361,16 @@
     {
       "id": "roads_primary_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["!=", ["get", "ford"], "yes"],
         ["==", ["get", "construction"], "primary"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2433,16 +2402,16 @@
     {
       "id": "roads_motorway_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["in", ["get", "construction"], ["literal", ["motorway", "trunk"]]],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -2472,7 +2441,7 @@
     {
       "id": "roads_ford_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": ["==", ["get", "ford"], "yes"],
@@ -2494,7 +2463,7 @@
     {
       "id": "roads_residential_bridge_z13-copy_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -2529,7 +2498,7 @@
     {
       "id": "roads_tertiarybridge_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -2559,7 +2528,7 @@
     {
       "id": "roads_secondarybridge_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -2589,7 +2558,7 @@
     {
       "id": "roads_primarybridge_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "maxzoom": 20,
@@ -2624,7 +2593,7 @@
     {
       "id": "roads_motorwaybridge_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 20,
@@ -2659,7 +2628,7 @@
     {
       "id": "roads_residential_bridgetop_z13_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -2695,7 +2664,7 @@
     {
       "id": "roads_tertiarybridgetop_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 24,
@@ -2735,7 +2704,7 @@
     {
       "id": "roads_secondarybridgetop_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -2774,7 +2743,7 @@
     {
       "id": "roads_primarybridgetop_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -2813,7 +2782,7 @@
     {
       "id": "roads_motorwaybridgetop_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 20,
@@ -2855,7 +2824,7 @@
     {
       "id": "roads_rail_tram_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 11,
       "maxzoom": 24,
@@ -2886,7 +2855,7 @@
     {
       "id": "roads_subways",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "filter": ["==", ["get", "type"], "subway"],
@@ -2912,7 +2881,7 @@
     {
       "id": "roads_tertiarytunnel_case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -2942,7 +2911,7 @@
     {
       "id": "roads_secondarytunnel_case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -2972,7 +2941,7 @@
     {
       "id": "roads_primarytunnel_case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 20,
@@ -3003,7 +2972,7 @@
     {
       "id": "roads_motorwaytunnel_case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 20,
@@ -3038,7 +3007,7 @@
     {
       "id": "roads_tertiarytunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -3067,7 +3036,7 @@
     {
       "id": "roads_secondarytunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -3096,7 +3065,7 @@
     {
       "id": "roads_primarytunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -3125,7 +3094,7 @@
     {
       "id": "roads_motorwaytunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 5,
       "maxzoom": 20,
@@ -3159,7 +3128,7 @@
     {
       "id": "roads_raceways",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -3182,7 +3151,7 @@
     {
       "id": "roads_trackfillcase",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3204,7 +3173,7 @@
     {
       "id": "roads_trackfill",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3226,7 +3195,7 @@
     {
       "id": "roads_track",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3249,7 +3218,7 @@
     {
       "id": "roads_living_street",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3271,7 +3240,7 @@
     {
       "id": "roads_footway",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3302,7 +3271,7 @@
     {
       "id": "roads_pier",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3324,7 +3293,7 @@
     {
       "id": "roads_steps",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3347,14 +3316,14 @@
     {
       "id": "roads_servicecase_z13",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
       "filter": [
         "all",
         ["in", ["get", "type"], ["literal", ["service"]]],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3377,14 +3346,14 @@
     {
       "id": "roads_residentialcase_z13",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
       "filter": [
         "all",
         ["in", ["get", "type"], ["literal", ["residential", "unclassified"]]],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3407,7 +3376,7 @@
     {
       "id": "roads_pedestrian_street-casing",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3429,15 +3398,15 @@
     {
       "id": "roads_tertiarylink-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10.01,
       "maxzoom": 24,
       "filter": [
         "all",
         ["==", ["get", "type"], "tertiary_link"],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3464,15 +3433,15 @@
     {
       "id": "roads_tertiary-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10.01,
       "maxzoom": 24,
       "filter": [
         "all",
         ["==", ["get", "type"], "tertiary"],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3499,14 +3468,14 @@
     {
       "id": "roads_secondary-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "filter": [
         "all",
         ["==", ["get", "type"], "secondary"],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3531,14 +3500,14 @@
     {
       "id": "roads_secondarylink-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
         "all",
         ["==", ["get", "type"], "secondary_link"],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3563,14 +3532,14 @@
     {
       "id": "roads_primarylink-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "filter": [
         "all",
         ["==", ["get", "type"], "primary_link"],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3593,15 +3562,15 @@
     {
       "id": "roads_primary-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
         "all",
         ["==", ["get", "type"], "primary"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["!=", ["get", "ford"], "yes"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3628,15 +3597,15 @@
     {
       "id": "roads_motorwaylink-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 20,
       "filter": [
         "all",
         ["in", ["get", "type"], ["literal", ["motorway_link", "trunk_link"]]],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3659,15 +3628,15 @@
     {
       "id": "roads_motorway-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 24,
       "filter": [
         "all",
         ["in", ["get", "type"], ["literal", ["motorway", "trunk"]]],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3690,7 +3659,7 @@
     {
       "id": "roads_proposed",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -3721,7 +3690,7 @@
     {
       "id": "roads_service",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -3747,7 +3716,7 @@
     {
       "id": "roads_residential",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -3777,7 +3746,7 @@
     {
       "id": "roads_pedestrian_street",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "maxzoom": 24,
@@ -3799,14 +3768,14 @@
     {
       "id": "roads_secondarylink",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
         "all",
         ["==", ["get", "type"], "secondary_link"],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3829,14 +3798,14 @@
     {
       "id": "roads_tertiarylink",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
         "all",
         ["==", ["get", "type"], "tertiary_link"],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3869,14 +3838,14 @@
     {
       "id": "roads_primarylink",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
         "all",
         ["==", ["get", "type"], "primary_link"],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3899,15 +3868,15 @@
     {
       "id": "roads_motorwaylink",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
         ["in", ["get", "type"], ["literal", ["motorway_link", "trunk_link"]]],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3940,15 +3909,15 @@
     {
       "id": "roads_tertiary",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 24,
       "filter": [
         "all",
         ["==", ["get", "type"], "tertiary"],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -3981,14 +3950,14 @@
     {
       "id": "roads_secondary",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
         "all",
         ["==", ["get", "type"], "secondary"],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -4011,15 +3980,15 @@
     {
       "id": "roads_primary",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
         "all",
         ["==", ["get", "type"], "primary"],
-        ["!=", ["get", "tunnel"], 1],
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
         ["!=", ["get", "ford"], "yes"],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -4052,15 +4021,15 @@
     {
       "id": "roads_motorway",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 24,
       "filter": [
         "all",
         ["in", ["get", "type"], ["literal", ["motorway", "trunk"]]],
-        ["!=", ["get", "tunnel"], 1],
-        ["!=", ["get", "bridge"], 1]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -4093,7 +4062,7 @@
     {
       "id": "roads_ford",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": ["==", ["get", "ford"], "yes"],
@@ -4115,7 +4084,7 @@
     {
       "id": "roads_rail_mini",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4133,7 +4102,7 @@
     {
       "id": "roads_rail_mini-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4169,7 +4138,7 @@
     {
       "id": "roads_rail_mini_cross",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -4204,7 +4173,7 @@
     {
       "id": "roads_rail_old",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4238,7 +4207,7 @@
     {
       "id": "roads_rail_old-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4274,7 +4243,7 @@
     {
       "id": "roads_rail_old_cross",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -4321,7 +4290,7 @@
     {
       "id": "roads_rail-main",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4349,7 +4318,7 @@
     {
       "id": "roads_rail-tunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4375,7 +4344,7 @@
     {
       "id": "roads_rail-bridge",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4401,7 +4370,7 @@
     {
       "id": "roads_rail-yard-siding",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4419,7 +4388,7 @@
     {
       "id": "roads_rail-yard-siding-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4454,7 +4423,7 @@
     {
       "id": "roads_rail",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4490,7 +4459,7 @@
     {
       "id": "roads_rail-main-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4545,7 +4514,7 @@
     {
       "id": "roads_rail-dash-tunnel",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4598,7 +4567,7 @@
     {
       "id": "roads_rail-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4645,7 +4614,7 @@
     {
       "id": "roads_rail_cross-main",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4693,7 +4662,7 @@
     {
       "id": "roads_rail_cross",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -4741,7 +4710,7 @@
     {
       "id": "roads_rail_construction",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4775,7 +4744,7 @@
     {
       "id": "roads_rail_construction-dash",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 7,
       "maxzoom": 24,
@@ -4810,7 +4779,7 @@
     {
       "id": "roads_rail_construction_cross",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -4853,7 +4822,7 @@
     {
       "id": "roads_residential_bridge_z13-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 13,
       "maxzoom": 24,
@@ -4887,7 +4856,7 @@
     {
       "id": "roads_tertiarybridge",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "filter": [
@@ -4916,7 +4885,7 @@
     {
       "id": "roads_secondarybridge",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "filter": [
@@ -4945,7 +4914,7 @@
     {
       "id": "roads_primarybridge",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 10,
       "maxzoom": 20,
@@ -4975,7 +4944,7 @@
     {
       "id": "roads_motorwaybridge",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 9,
       "maxzoom": 20,
@@ -5009,7 +4978,7 @@
     {
       "id": "roads_residential_bridgetop_z13",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -5043,7 +5012,7 @@
     {
       "id": "roads_tertiarybridgetop",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 24,
@@ -5081,7 +5050,7 @@
     {
       "id": "roads_secondarybridgetop",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 8,
       "filter": [
@@ -5118,7 +5087,7 @@
     {
       "id": "roads_primarybridgetop",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "filter": [
@@ -5155,7 +5124,7 @@
     {
       "id": "roads_motorwaybridgetop",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 6,
       "maxzoom": 20,
@@ -5195,7 +5164,7 @@
     {
       "id": "roads_rail_tram",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 11,
       "maxzoom": 24,
@@ -5229,7 +5198,7 @@
     {
       "id": "barriers-dotted",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "filter": ["==", ["get", "type"], "bollard"],
       "paint": {
@@ -5241,7 +5210,7 @@
     {
       "id": "landuse_lines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_lines",
       "filter": ["all"],
       "paint": {
@@ -5264,7 +5233,7 @@
     {
       "id": "barriers",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "filter": ["all"],
       "paint": {
@@ -5299,7 +5268,7 @@
     {
       "id": "power_lines",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_lines",
       "filter": [
         "all",
@@ -5312,7 +5281,7 @@
     {
       "id": "city_county_lines_admin_9",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 11,
       "maxzoom": 20,
@@ -5331,7 +5300,7 @@
     {
       "id": "city_county_lines_admin_7-8",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 10,
       "maxzoom": 20,
@@ -5350,7 +5319,7 @@
     {
       "id": "admin_admin_5-6",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 8,
       "maxzoom": 20,
@@ -5377,7 +5346,7 @@
     {
       "id": "state_lines_admin_4-case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 3,
       "maxzoom": 20,
@@ -5407,7 +5376,7 @@
     {
       "id": "state_lines_admin_4",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 3,
       "maxzoom": 20,
@@ -5447,7 +5416,7 @@
     {
       "id": "admin_admin3",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 5,
       "maxzoom": 20,
@@ -5465,7 +5434,7 @@
     {
       "id": "admin_country_lines_z10_case",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 0,
       "maxzoom": 20,
@@ -5493,7 +5462,7 @@
     {
       "id": "admin_country_lines_z10",
       "type": "line",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_lines",
       "minzoom": 0,
       "maxzoom": 20,
@@ -5539,7 +5508,7 @@
     {
       "id": "road_labels_z14",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 14,
       "filter": ["all"],
@@ -5564,7 +5533,7 @@
     {
       "id": "road_labels_z11",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_lines",
       "minzoom": 11,
       "filter": ["in", ["get", "type"], ["literal", ["motorway", "trunk"]]],
@@ -5589,7 +5558,7 @@
     {
       "id": "water_areas_labels_z15",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_areas_centroids",
       "minzoom": 15,
       "maxzoom": 24,
@@ -5610,7 +5579,7 @@
     {
       "id": "water_areas_labels_z12",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_areas_centroids",
       "minzoom": 12,
       "maxzoom": 15,
@@ -5632,7 +5601,7 @@
     {
       "id": "water_point_labels_ocean_sea",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 0,
       "maxzoom": 24,
@@ -5664,7 +5633,7 @@
     {
       "id": "water_areas_labels_z8",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_areas_centroids",
       "minzoom": 8,
       "maxzoom": 12,
@@ -5695,7 +5664,7 @@
     {
       "id": "water_lines_labels_cliff",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "filter": ["==", ["get", "type"], "cliff"],
       "layout": {
@@ -5718,7 +5687,7 @@
     {
       "id": "water_lines_labels_dam",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "filter": ["==", ["get", "type"], "dam"],
       "layout": {
@@ -5741,7 +5710,7 @@
     {
       "id": "water_lines_labels",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "water_lines",
       "minzoom": 12,
       "maxzoom": 24,
@@ -5767,7 +5736,7 @@
     {
       "id": "points_from_landuse_areas",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 16,
       "filter": [
@@ -5783,7 +5752,7 @@
     {
       "id": "landuse_areas_labels_park_small",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 16,
       "maxzoom": 24,
@@ -5830,7 +5799,7 @@
     {
       "id": "landuse_areas_labels_park_medium",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 15,
       "maxzoom": 20,
@@ -5874,7 +5843,7 @@
     {
       "id": "landuse_areas_labels_park_large",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 12,
       "maxzoom": 16,
@@ -5917,7 +5886,7 @@
     {
       "id": "landuse_areas_labels_farming",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 14,
       "maxzoom": 24,
@@ -5951,7 +5920,7 @@
     {
       "id": "landuse_areas_labels_forest",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 14,
       "maxzoom": 24,
@@ -5970,7 +5939,7 @@
     {
       "id": "landuse_areas_labels_nature_reserve",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 12,
       "maxzoom": 16,
@@ -5993,7 +5962,7 @@
     {
       "id": "landuse_areas_labels_nature_reserve_med_10-14",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 10,
       "maxzoom": 14,
@@ -6027,7 +5996,7 @@
     {
       "id": "landuse_areas_labels_nature_reserve_xl",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 7,
       "maxzoom": 12,
@@ -6050,7 +6019,7 @@
     {
       "id": "landuse_areas_labels_school",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 14,
       "maxzoom": 24,
@@ -6073,7 +6042,7 @@
     {
       "id": "other_areas_labels_military",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_points_centroids",
       "minzoom": 12,
       "maxzoom": 24,
@@ -6092,7 +6061,7 @@
     {
       "id": "landuse_areas_labels_z8glacier",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 10,
       "maxzoom": 22,
@@ -6123,7 +6092,7 @@
     {
       "id": "placearea_label",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 14,
       "maxzoom": 24,
@@ -6150,7 +6119,7 @@
     {
       "id": "points_of_interest_buildings",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "buildings_points_centroids",
       "minzoom": 16,
       "filter": ["!=", ["get", "type"], "parking"],
@@ -6175,7 +6144,7 @@
     {
       "id": "points_of_interest_from_areas_z14_centroids",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_points_centroids",
       "minzoom": 14,
       "maxzoom": 16,
@@ -6219,7 +6188,7 @@
     {
       "id": "points_of_interest_from_areas_z14",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_points_centroids",
       "minzoom": 14,
       "maxzoom": 16,
@@ -6263,7 +6232,7 @@
     {
       "id": "points_of_interest_from_areas",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_points_centroids",
       "minzoom": 16,
       "maxzoom": 24,
@@ -6299,7 +6268,7 @@
     {
       "id": "points_of_interest_other",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_points_centroids",
       "minzoom": 15,
       "maxzoom": 24,
@@ -6343,7 +6312,7 @@
     {
       "id": "points_of_interest_amenity",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "amenity_points_centroids",
       "minzoom": 16,
       "maxzoom": 24,
@@ -6379,7 +6348,7 @@
     {
       "id": "points_of_interest_other_archaeology",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_points_centroids",
       "minzoom": 14,
       "maxzoom": 24,
@@ -6415,7 +6384,7 @@
     {
       "id": "points_of_interest_other_artwork",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_points_centroids",
       "minzoom": 15,
       "maxzoom": 24,
@@ -6451,7 +6420,7 @@
     {
       "id": "points_powertower",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "other_points_centroids",
       "minzoom": 15,
       "maxzoom": 24,
@@ -6465,11 +6434,14 @@
     {
       "id": "transport_points_labels",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_points_centroids",
       "minzoom": 12,
       "maxzoom": 24,
-      "filter": ["!", ["in", ["get", "type"], ["literal", ["traffic_signals", "pedestrian", "raceway"]]]],
+      "filter": ["all",
+        ["!", ["in", ["get", "type"], ["literal", ["traffic_signals", "pedestrian", "raceway"]]]],
+        ["!", ["in", ["get", "class"], ["literal", ["highway"]]]]
+      ],
       "layout": {
         "icon-image": "{type}-18",
         "visibility": "visible",
@@ -6492,11 +6464,11 @@
     {
       "id": "transport_points_raceway",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_points_centroids",
       "minzoom": 15,
       "maxzoom": 24,
-      "filter": ["!", ["in", ["get", "type"], ["literal", ["traffic_signals", "pedestrian", "raceway"]]]],
+      "filter": ["in", ["get", "type"], ["literal", ["raceway"]]],
       "layout": {
         "icon-image": "{type}-18",
         "visibility": "visible",
@@ -6519,7 +6491,7 @@
     {
       "id": "transport_points_labels_traffic_signals",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_points_centroids",
       "minzoom": 17,
       "maxzoom": 24,
@@ -6544,7 +6516,7 @@
     {
       "id": "transport_points_labels_pedestrian",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_points_centroids",
       "minzoom": 17,
       "maxzoom": 24,
@@ -6569,7 +6541,7 @@
     {
       "id": "transport_points_labels_airports",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_points_centroids",
       "minzoom": 10,
       "maxzoom": 14,
@@ -6582,7 +6554,7 @@
     {
       "id": "transport_points_labels_medium",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_points_centroids",
       "minzoom": 13,
       "maxzoom": 16,
@@ -6606,7 +6578,7 @@
     {
       "id": "transport_area_labels_large",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "transport_points_centroids",
       "minzoom": 13,
       "maxzoom": 16,
@@ -6630,7 +6602,7 @@
     {
       "id": "points_place_of_worship_other",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "buildings_points_centroids",
       "filter": [
         "all",
@@ -6653,7 +6625,7 @@
     {
       "id": "points_religion",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "buildings_points_centroids",
       "filter": ["all"],
       "layout": {
@@ -6665,7 +6637,7 @@
     {
       "id": "points_from_landuse_peaks",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "landuse_points_centroids",
       "minzoom": 14,
       "filter": ["==", ["get", "type"], "peak"],
@@ -6687,7 +6659,7 @@
     {
       "id": "points_of_interest_shop",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "buildings_points_centroids",
       "minzoom": 16,
       "maxzoom": 24,
@@ -6711,7 +6683,7 @@
     {
       "id": "county_labels_z11_admin_7-8_centroids",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_centroids",
       "minzoom": 10,
       "maxzoom": 20,
@@ -6745,7 +6717,7 @@
     {
       "id": "county_labels_z11_admin_6_centroids",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_centroids",
       "minzoom": 8,
       "maxzoom": 20,
@@ -6779,7 +6751,7 @@
     {
       "id": "county_labels_z11",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 8,
       "maxzoom": 20,
@@ -6813,7 +6785,7 @@
     {
       "id": "city_locality_labels_other_z11",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 15,
       "maxzoom": 20,
@@ -6844,7 +6816,7 @@
     {
       "id": "city_labels_other_z11",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 11,
       "maxzoom": 20,
@@ -6879,7 +6851,7 @@
     {
       "id": "city_labels_town_z8",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 8,
       "maxzoom": 20,
@@ -6910,7 +6882,7 @@
     {
       "id": "city_labels_z11",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 11,
       "maxzoom": 20,
@@ -6941,7 +6913,7 @@
     {
       "id": "city_labels_z6",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 6,
       "maxzoom": 11,
@@ -6971,7 +6943,7 @@
     {
       "id": "city_capital_labels_z6",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 6,
       "maxzoom": 11,
@@ -7001,7 +6973,7 @@
     {
       "id": "state_points_labels_centroids",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_centroids",
       "minzoom": 5,
       "maxzoom": 20,
@@ -7051,7 +7023,7 @@
     {
       "id": "state_points_labels",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 5,
       "maxzoom": 20,
@@ -7097,7 +7069,7 @@
     {
       "id": "statecapital_labels_z10",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "populated_places",
       "minzoom": 10,
       "maxzoom": 20,
@@ -7119,7 +7091,7 @@
     {
       "id": "country_points_labels_cen",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "land_ohm_centroids",
       "maxzoom": 12,
       "filter": [
@@ -7183,7 +7155,7 @@
     {
       "id": "country_points_labels",
       "type": "symbol",
-      "source": "osm",
+      "source": "ohm",
       "source-layer": "place_points_centroids",
       "minzoom": 0,
       "maxzoom": 12,