@openhistoricalmap/map-styles 0.9.14 → 0.9.16

package/dist/railway/railway.json

@@ -1163,7 +1163,7 @@
       "id": "water_lines_cliff_line",
       "type": "line",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
@@ -1213,7 +1213,7 @@
       "id": "water_lines_cliff_line_triangles",
       "type": "line",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
@@ -1265,7 +1265,7 @@
       "id": "water_lines_waterfall_triangle",
       "type": "line",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
@@ -2141,7 +2141,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 5,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -2383,7 +2383,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 5,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -2954,12 +2954,16 @@
           ]
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "bridge"
+            "coalesce",
+            [
+              "get",
+              "bridge"
+            ],
+            0
           ],
-          0
+          1
         ],
         [
           "in",
@@ -3021,12 +3025,16 @@
           ]
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "bridge"
+            "coalesce",
+            [
+              "get",
+              "bridge"
+            ],
+            0
           ],
-          0
+          1
         ],
         [
           "in",
@@ -5545,7 +5553,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 9,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -5798,7 +5806,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 5,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -9264,12 +9272,16 @@
           ]
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -9314,12 +9326,16 @@
           "main"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ],
         [
           "in",
@@ -9652,12 +9668,16 @@
           "spur"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -9765,12 +9785,16 @@
           "tourism"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -9847,12 +9871,16 @@
           "tourism"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -9958,12 +9986,16 @@
           "military"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -10040,12 +10072,16 @@
           "military"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -10151,12 +10187,16 @@
           "branch"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -10233,12 +10273,16 @@
           "branch"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -10344,12 +10388,16 @@
           "industrial"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -10426,12 +10474,16 @@
           "industrial"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -11922,7 +11974,7 @@
       "id": "water_lineslabels-cliff",
       "type": "symbol",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "filter": [
         "in",
         [
@@ -13554,7 +13606,7 @@
             "hamlet",
             "islet",
             "locality",
-            "neighborhood",
+            "neighbourhood",
             "suburb",
             "village"
           ]

package/dist/woodblock/woodblock.json

@@ -1820,12 +1820,16 @@
           ]
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "bridge"
+            "coalesce",
+            [
+              "get",
+              "bridge"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {

package/historical/historical.json

@@ -528,7 +528,7 @@
       "filter": [
         "in",
         ["get", "type"],
-        ["literal", ["grave_yard", "picnic_site", "camp_site", "playground", "pitch", "track", "bleachers"]]
+        ["literal", ["picnic_site", "camp_site", "playground", "pitch", "track", "bleachers"]]
       ],
       "layout": {"visibility": "visible"},
       "paint": {
@@ -540,8 +540,6 @@
           [
             "match",
             ["get", "type"],
-            "grave_yard",
-            "rgba(214, 222, 210, 1)",
             "picnic_site",
             "rgba(208, 220, 174, 1)",
             "camp_site",
@@ -574,6 +572,24 @@
         ]
       }
     },
+    {
+      "id": "landuse_areas_cemetery_pattern",
+      "type": "fill",
+      "source": "ohm",
+      "source-layer": "landuse_areas",
+      "minzoom": 11,
+      "maxzoom": 24,
+      "filter": [
+        "in",
+        ["get", "type"],
+        ["literal", ["cemetery"]]
+      ],
+      "layout": {"visibility": "visible"},
+      "paint": {
+        "fill-pattern": "cross_space_18px",
+        "fill-opacity": 0.3
+      }
+    },
     {
       "id": "parking_lots",
       "type": "fill",
@@ -662,9 +678,31 @@
       "type": "fill",
       "source": "ohm",
       "source-layer": "amenity_areas",
-      "filter": ["in", ["get", "type"], ["literal", ["school", "university"]]],
+      "filter": ["in", ["get", "type"], ["literal", ["school", "university", "grave_yard"]]],
       "layout": {"visibility": "visible"},
-      "paint": {"fill-color": "rgba(226, 214, 205, 1)"}
+      "paint": {
+        "fill-color": [
+          "match",
+          ["get", "type"],
+          "grave_yard",
+          "rgba(214, 222, 210, 1)",
+          "rgba(226, 214, 205, 1)"
+        ]
+      }
+    },
+    {
+      "id": "amenity_areas_grave_yard_pattern",
+      "type": "fill",
+      "source": "ohm",
+      "source-layer": "amenity_areas",
+      "minzoom": 11,
+      "maxzoom": 24,
+      "filter": ["==", ["get", "type"], "grave_yard"],
+      "layout": {"visibility": "visible"},
+      "paint": {
+        "fill-pattern": "grave_yard_space_18px",
+        "fill-opacity": 0.3
+      }
     },
     {
       "id": "water_lines_canal-casing",
@@ -912,7 +950,7 @@
       "id": "water_lines_cliff_line",
       "type": "line",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
@@ -935,7 +973,7 @@
       "id": "water_lines_cliff_line_triangles",
       "type": "line",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
@@ -960,7 +998,7 @@
       "id": "water_lines_waterfall_triangle",
       "type": "line",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
@@ -1440,7 +1478,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 5,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -1566,7 +1604,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 5,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -1852,7 +1890,7 @@
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["==", ["get", "bridge"], 0],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1],
         ["==", ["get", "construction"], "road"]
       ],
       "layout": {
@@ -1883,7 +1921,7 @@
       "filter": [
         "all",
         ["==", ["get", "type"], "construction"],
-        ["==", ["get", "bridge"], 0],
+        ["!=", ["coalesce", ["get", "bridge"], 0], 1],
         [
           "in",
           ["get", "construction"],
@@ -2974,7 +3012,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 9,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -3096,7 +3134,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 5,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -3965,7 +4003,15 @@
         "line-join": "round"
       },
       "paint": {
-        "line-color": "#ffffff",
+        "line-color": [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          10,
+          "rgba(240, 240, 240, 1)",
+          12,
+          "#ffffff"
+        ],
         "line-width": [
           "interpolate",
           ["exponential", 1.5],
@@ -4110,7 +4156,7 @@
         "all",
         ["in", ["get", "type"], ["literal", ["miniature", "narrow_gauge"]]],
         ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]],
-        ["==", ["get", "tunnel"], 0]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1]
       ],
       "layout": {"visibility": "visible"},
       "paint": {
@@ -4219,7 +4265,7 @@
           ["literal", ["abandoned", "dismantled", "disused", "razed"]]
         ],
         ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]],
-        ["==", ["get", "tunnel"], 0]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1]
       ],
       "layout": {"visibility": "visible"},
       "paint": {
@@ -4303,7 +4349,7 @@
         ],
         ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]],
         ["==", ["get", "usage"], "main"],
-        ["==", ["get", "tunnel"], 0]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -4436,7 +4482,7 @@
         ],
         ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]],
         ["!=", ["get", "usage"], "main"],
-        ["==", ["get", "tunnel"], 0]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -4472,7 +4518,7 @@
         ],
         ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]],
         ["==", ["get", "usage"], "main"],
-        ["==", ["get", "tunnel"], 0]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -4580,7 +4626,7 @@
         ],
         ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]],
         ["!=", ["get", "usage"], "main"],
-        ["==", ["get", "tunnel"], 0]
+        ["!=", ["coalesce", ["get", "tunnel"], 0], 1]
       ],
       "layout": {
         "visibility": "visible",
@@ -5665,7 +5711,7 @@
       "id": "water_lines_labels_cliff",
       "type": "symbol",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "filter": ["==", ["get", "type"], "cliff"],
       "layout": {
         "text-size": ["interpolate", ["linear"], ["zoom"], 11, 9, 13, 11],
@@ -6548,8 +6594,21 @@
       "filter": ["==", ["get", "type"], "aerodrome"],
       "layout": {
         "icon-image": "airport-18",
-        "icon-size": ["interpolate", ["linear"], ["zoom"], 10, 1.2, 14, 1.5],
-        "text-font": ["OpenHistorical"]}
+        "icon-offset": [-1.0, 0],
+        "text-font": ["OpenHistorical"],
+        "text-field": ["get", "ref"],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 11.99, 12, 13, 14, 14, 14, 14.01, 0],
+        "text-anchor": "left",
+        "text-offset": [1, 0],
+        "visibility": "visible"
+      },
+      "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"], 11.99, 0, 12, 0.8, 14, 0.8, 14.01, 0]
+      }
     },
     {
       "id": "transport_points_labels_medium",
@@ -6823,7 +6882,7 @@
       "filter": [
         "in",
         ["get", "type"],
-        ["literal", ["hamlet", "neighborhood", "suburb", "village"]]
+        ["literal", ["hamlet", "neighbourhood", "suburb", "village"]]
       ],
       "layout": {
         "text-field": ["get", "name"],
@@ -7215,4 +7274,4 @@
   ],
   "attribution": "<a href=\"https://www.openhistoricalmap.org/\">OpenHistoricalMap</a>",
   "id": "ab271ed3-6fe4-403a-b5ae-07113f8c57ab"
-}
+}

package/historical/historical_spritesheet.json

@@ -377,6 +377,13 @@
     "x": 48,
     "y": 166
   },
+  "cross_space_18px": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 18,
+    "x": 0,
+    "y": 256
+  },
   "dentist-18": {
     "height": 17,
     "pixelRatio": 1,
@@ -559,6 +566,13 @@
     "x": 33,
     "y": 130
   },
+  "grave_yard_space_18px": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 18,
+    "x": 18,
+    "y": 256
+  },
   "grocery-18": {
     "height": 15,
     "pixelRatio": 1,

package/historical/historical_spritesheet@2x.json

@@ -377,6 +377,13 @@
     "x": 48,
     "y": 166
   },
+  "cross_space_18px": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 18,
+    "x": 0,
+    "y": 256
+  },
   "dentist-18": {
     "height": 17,
     "pixelRatio": 1,
@@ -559,6 +566,13 @@
     "x": 33,
     "y": 130
   },
+  "grave_yard_space_18px": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 18,
+    "x": 18,
+    "y": 256
+  },
   "grocery-18": {
     "height": 15,
     "pixelRatio": 1,