From e4f332d5f7b0ddfcceb8b7dece078ae1424d1727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sun, 19 Jul 2026 16:09:35 -0700 Subject: [PATCH 1/2] Simplified, purified filter expressions --- historical/historical.json | 56 +++++----- japanese_scroll/japanese_scroll.json | 28 ++--- railway/railway.json | 160 +++++++++++++-------------- woodblock/woodblock.json | 30 ++--- 4 files changed, 135 insertions(+), 139 deletions(-) diff --git a/historical/historical.json b/historical/historical.json index da940baf..4131c0ee 100644 --- a/historical/historical.json +++ b/historical/historical.json @@ -198,7 +198,7 @@ "source-layer": "landuse_areas", "minzoom": 6, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["nature_reserve"]]], + "filter": ["==", ["get", "type"], "nature_reserve"], "layout": {"visibility": "visible"}, "paint": { "fill-color": [ @@ -579,11 +579,7 @@ "source-layer": "landuse_areas", "minzoom": 11, "maxzoom": 24, - "filter": [ - "in", - ["get", "type"], - ["literal", ["cemetery"]] - ], + "filter": ["==", ["get", "type"], "cemetery"], "layout": {"visibility": "visible"}, "paint": { "fill-pattern": "cross_space_18px", @@ -910,7 +906,7 @@ "filter": [ "all", ["==", ["get", "type"], "stream"], - ["in", ["get", "name"], ["literal", [""]]] + ["!", ["has", "name"]] ], "paint": { "line-color": "#7EDADA", @@ -927,7 +923,7 @@ "filter": [ "all", ["==", ["get", "type"], "stream"], - ["!", ["in", "name", ""]] + ["has", "name"] ], "paint": { "line-color": "#7EDADA", @@ -955,8 +951,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["cliff"]]], - ["!", ["in", "surface", "water"]] + ["==", ["get", "type"], "cliff"], + ["!=", ["get", "surface"], "water"] ], "layout": { "line-cap": "butt", @@ -978,8 +974,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["cliff"]]], - ["!", ["in", "surface", "water"]] + ["==", ["get", "type"], "cliff"], + ["!=", ["get", "surface"], "water"] ], "layout": { "line-cap": "butt", @@ -1003,8 +999,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["cliff"]]], - ["in", ["get", "surface"], ["literal", ["water"]]] + ["==", ["get", "type"], "cliff"], + ["==", ["get", "surface"], "water"] ], "layout": { "line-cap": "butt", @@ -3360,7 +3356,7 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["service"]]], + ["==", ["get", "type"], "service"], ["!=", ["coalesce", ["get", "bridge"], 0], 1] ], "layout": { @@ -3703,8 +3699,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["proposed"]]], - ["!", ["in", ["get", "class"], ["literal", ["railway"]]]] + ["==", ["get", "type"], "proposed"], + ["!=", ["get", "class"], "railway"] ], "layout": { "visibility": "visible", @@ -3732,7 +3728,7 @@ "source-layer": "transport_lines", "minzoom": 12, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["service"]]], + "filter": ["==", ["get", "type"], "service"], "layout": { "visibility": "visible", "line-cap": "round", @@ -4672,7 +4668,7 @@ ["literal", ["light_rail", "preserved", "rail"]] ], ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]], - ["==", ["get", "name"], "usage=main"] + ["==", ["get", "usage"], "main"] ], "layout": {"visibility": "none", "line-cap": "square"}, "paint": { @@ -4720,7 +4716,7 @@ ["literal", ["light_rail", "preserved", "rail"]] ], ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]], - ["!=", ["get", "name"], "usage=main"] + ["!=", ["get", "usage"], "main"] ], "layout": {"visibility": "none", "line-cap": "square"}, "paint": { @@ -5331,7 +5327,7 @@ "source-layer": "land_ohm_lines", "minzoom": 11, "maxzoom": 20, - "filter": ["in", ["get", "admin_level"], ["literal", [9]]], + "filter": ["==", ["get", "admin_level"], 9], "layout": { "visibility": "visible", "line-cap": "round", @@ -5991,7 +5987,7 @@ "maxzoom": 16, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["nature_reserve"]]], + ["==", ["get", "type"], "nature_reserve"], ["<", ["get", "area_m2"], 30000000] ], "layout": { @@ -6014,7 +6010,7 @@ "maxzoom": 14, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["nature_reserve"]]], + ["==", ["get", "type"], "nature_reserve"], [">=", ["get", "area_m2"], 30000000], ["<", ["get", "area_m2"], 100000000] ], @@ -6048,7 +6044,7 @@ "maxzoom": 12, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["nature_reserve"]]], + ["==", ["get", "type"], "nature_reserve"], [">=", ["get", "area_m2"], 100000000] ], "layout": { @@ -6072,7 +6068,7 @@ "filter": [ "in", ["get", "type"], - ["literal", ["", "college", "education", "school", "university"]] + ["literal", ["college", "education", "school", "university"]] ], "layout": { "text-field": ["get", "name"], @@ -6318,7 +6314,7 @@ "source-layer": "other_points_centroids", "minzoom": 15, "maxzoom": 24, - "filter": ["!", ["in", ["get", "type"], ["literal", ["artwork"]]]], + "filter": ["!=", ["get", "type"], "artwork"], "layout": { "text-size": [ "interpolate", @@ -6486,7 +6482,7 @@ "maxzoom": 24, "filter": ["all", ["!", ["in", ["get", "type"], ["literal", ["traffic_signals", "pedestrian", "raceway"]]]], - ["!", ["in", ["get", "class"], ["literal", ["highway"]]]] + ["!=", ["get", "class"], "highway"] ], "layout": { "icon-image": "{type}-18", @@ -6514,7 +6510,7 @@ "source-layer": "transport_points_centroids", "minzoom": 15, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["raceway"]]], + "filter": ["==", ["get", "type"], "raceway"], "layout": { "icon-image": "{type}-18", "visibility": "visible", @@ -6780,7 +6776,7 @@ "source-layer": "land_ohm_centroids", "minzoom": 8, "maxzoom": 20, - "filter": ["in", ["get", "admin_level"], ["literal", [6]]], + "filter": ["==", ["get", "admin_level"], 6], "layout": { "text-field": ["get", "name"], "text-font": ["OpenHistorical"], @@ -6848,7 +6844,7 @@ "source-layer": "place_points_centroids", "minzoom": 15, "maxzoom": 20, - "filter": ["in", ["get", "type"], ["literal", ["locality"]]], + "filter": ["==", ["get", "type"], "locality"], "layout": { "text-field": ["get", "name"], "text-font": ["OpenHistorical"], diff --git a/japanese_scroll/japanese_scroll.json b/japanese_scroll/japanese_scroll.json index 53e89e64..e2fef085 100644 --- a/japanese_scroll/japanese_scroll.json +++ b/japanese_scroll/japanese_scroll.json @@ -275,7 +275,7 @@ "source": "ohm", "source-layer": "transport_lines", "minzoom": 14, - "filter": ["in", ["get", "type"], ["literal", ["subway"]]], + "filter": ["==", ["get", "type"], "subway"], "layout": {"visibility": "none"}, "paint": { "line-color": "rgba(153, 153, 153, 1)", @@ -360,7 +360,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["==", ["get", "tunnel"], 1] ], "layout": { @@ -751,7 +751,7 @@ "filter": [ "all", ["in", ["get", "type"], ["literal", ["construction", "proposed"]]], - ["in", ["get", "class"], ["literal", ["railway"]]] + ["==", ["get", "class"], "railway"] ], "layout": {"visibility": "none"}, "paint": { @@ -781,7 +781,7 @@ "filter": [ "all", ["in", ["get", "type"], ["literal", ["construction", "proposed"]]], - ["in", ["get", "class"], ["literal", ["railway"]]] + ["==", ["get", "class"], "railway"] ], "layout": {"visibility": "none"}, "paint": { @@ -797,7 +797,7 @@ "source-layer": "transport_lines", "minzoom": 12, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["raceway"]]], + "filter": ["==", ["get", "type"], "raceway"], "layout": {"visibility": "none"}, "paint": { "line-color": "rgba(255, 249, 241, 1)", @@ -887,7 +887,7 @@ "source-layer": "transport_lines", "minzoom": 14, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["pedestrian"]]], + "filter": ["==", ["get", "type"], "pedestrian"], "layout": {"visibility": "none"}, "paint": { "line-color": "#ffffff", @@ -958,7 +958,7 @@ "source-layer": "transport_lines", "minzoom": 14, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["steps"]]], + "filter": ["==", ["get", "type"], "steps"], "layout": {"visibility": "none"}, "paint": { "line-color": "#b3b3b3", @@ -1093,7 +1093,7 @@ "minzoom": 10.01, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary_link"]]], + ["==", ["get", "type"], "primary_link"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1] ], "layout": { @@ -1122,7 +1122,7 @@ "minzoom": 10.01, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["get", "ford"], "yes"] ], @@ -1456,7 +1456,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary_link"]]], + ["==", ["get", "type"], "primary_link"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1] ], "layout": { @@ -1671,7 +1671,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["get", "ford"], "yes"] ], @@ -1880,7 +1880,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["==", ["get", "bridge"], 1] ], "layout": {"visibility": "none"}, @@ -1954,7 +1954,7 @@ "source-layer": "transport_lines", "minzoom": 8, "maxzoom": 9, - "filter": ["in", ["get", "type"], ["literal", ["secondary"]]], + "filter": ["==", ["get", "type"], "secondary"], "layout": {"visibility": "visible"}, "paint": { "line-color": [ @@ -2284,4 +2284,4 @@ } ], "id": "io6r61fxt" -} \ No newline at end of file +} diff --git a/railway/railway.json b/railway/railway.json index 0f7f2650..11f58468 100644 --- a/railway/railway.json +++ b/railway/railway.json @@ -679,7 +679,7 @@ "filter": [ "all", ["==", ["get", "type"], "stream"], - ["in", ["get", "name"], ["literal", [""]]] + ["!", ["has", "name"]] ], "paint": { "line-color": "#7EDADA", @@ -696,7 +696,7 @@ "filter": [ "all", ["==", ["get", "type"], "stream"], - ["!", ["in", ["get", "name"], ["literal", [""]]]] + ["has", "name"] ], "paint": { "line-color": "#7EDADA", @@ -724,8 +724,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["cliff"]]], - ["!", ["in", ["get", "surface"], ["literal", ["water"]]]] + ["==", ["get", "type"], "cliff"], + ["!=", ["get", "surface"], "water"] ], "layout": { "line-cap": "butt", @@ -747,8 +747,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["cliff"]]], - ["!", ["in", ["get", "surface"], ["literal", ["water"]]]] + ["==", ["get", "type"], "cliff"], + ["!=", ["get", "surface"], "water"] ], "layout": { "line-cap": "butt", @@ -772,8 +772,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["cliff"]]], - ["in", ["get", "surface"], ["literal", ["water"]]] + ["==", ["get", "type"], "cliff"], + ["==", ["get", "surface"], "water"] ], "layout": { "line-cap": "butt", @@ -1179,7 +1179,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "tunnel"], 1], ["==", ["get", "construction"], "primary"] ], @@ -1211,7 +1211,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "tunnel"], 1], [ "in", @@ -1337,7 +1337,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "tunnel"], 1], [ "in", @@ -1372,7 +1372,7 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "construction"], "raceway"] ], "layout": {"visibility": "visible"}, @@ -1478,8 +1478,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], - ["in", ["get", "construction"], ["literal", ["living_street"]]] + ["==", ["get", "type"], "construction"], + ["==", ["get", "construction"], "living_street"] ], "layout": {"visibility": "visible"}, "paint": { @@ -1504,7 +1504,7 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "construction"], "pedestrian"] ], "layout": {"visibility": "visible"}, @@ -1530,7 +1530,7 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], [ "in", ["get", "construction"], @@ -1591,8 +1591,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], - ["in", ["get", "construction"], ["literal", ["steps"]]] + ["==", ["get", "type"], "construction"], + ["==", ["get", "construction"], "steps"] ], "layout": {"visibility": "visible"}, "paint": { @@ -1618,9 +1618,9 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["!=", ["coalesce", ["get", "bridge"], 0], 1], - ["in", ["get", "construction"], ["literal", ["road"]]] + ["==", ["get", "construction"], "road"] ], "layout": { "visibility": "visible", @@ -1649,7 +1649,7 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["!=", ["coalesce", ["get", "bridge"], 0], 1], [ "in", @@ -1746,7 +1746,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["==", ["get", "construction"], "primary_link"], ["!=", ["coalesce", ["get", "bridge"], 0], 1] @@ -1777,10 +1777,10 @@ "minzoom": 10, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["get", "ford"], "yes"], - ["in", ["get", "construction"], ["literal", ["primary"]]], + ["==", ["get", "construction"], "primary"], ["!=", ["coalesce", ["get", "bridge"], 0], 1] ], "layout": { @@ -1810,7 +1810,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], [ "in", @@ -1846,7 +1846,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["in", ["get", "construction"], ["literal", ["motorway", "trunk"]]], ["!=", ["coalesce", ["get", "bridge"], 0], 1] @@ -1878,8 +1878,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], - ["in", ["get", "construction"], ["literal", ["road"]]] + ["==", ["get", "type"], "construction"], + ["==", ["get", "construction"], "road"] ], "layout": { "visibility": "visible", @@ -1909,7 +1909,7 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], [ "in", ["get", "construction"], @@ -1944,7 +1944,7 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], [ "in", ["get", "construction"], @@ -2018,7 +2018,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["==", ["get", "construction"], "primary_link"], ["!=", ["coalesce", ["get", "bridge"], 0], 1] @@ -2051,7 +2051,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], [ "in", @@ -2168,7 +2168,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["get", "ford"], "yes"], ["==", ["get", "construction"], "primary"], @@ -2202,7 +2202,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["in", ["get", "construction"], ["literal", ["motorway", "trunk"]]], ["!=", ["coalesce", ["get", "bridge"], 0], 1] @@ -2257,7 +2257,7 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "bridge"], 1], [ "in", @@ -2352,7 +2352,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "bridge"], 1], [ "in", @@ -2387,7 +2387,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "bridge"], 1], [ "in", @@ -2422,7 +2422,7 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "bridge"], 1], [ "in", @@ -2536,9 +2536,9 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "bridge"], 1], - ["in", ["get", "construction"], ["literal", ["primary"]]] + ["==", ["get", "construction"], "primary"] ], "layout": { "visibility": "visible", @@ -2568,7 +2568,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], + ["==", ["get", "type"], "construction"], ["==", ["get", "bridge"], 1], [ "in", @@ -2603,7 +2603,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["subway"]]], + ["==", ["get", "type"], "subway"], ["==", ["get", "tunnel"], 1] ], "layout": {"visibility": "visible"}, @@ -2630,7 +2630,7 @@ "minzoom": 10, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["subway"]]], + ["==", ["get", "type"], "subway"], ["==", ["get", "tunnel"], 1] ], "layout": {"visibility": "none"}, @@ -2654,7 +2654,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["subway"]]], + ["==", ["get", "type"], "subway"], ["==", ["get", "tunnel"], 1] ], "layout": {"visibility": "visible"}, @@ -2672,7 +2672,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["light_rail"]]], + ["==", ["get", "type"], "light_rail"], ["==", ["get", "tunnel"], 1], ["!=", ["coalesce", ["get", "bridge"], 0], 1] ], @@ -2700,7 +2700,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["light_rail"]]], + ["==", ["get", "type"], "light_rail"], ["==", ["get", "tunnel"], 1], ["!=", ["coalesce", ["get", "bridge"], 0], 1] ], @@ -2780,7 +2780,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["==", ["get", "tunnel"], 1] ], "layout": { @@ -3075,7 +3075,7 @@ "source-layer": "transport_lines", "minzoom": 12, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["raceway"]]], + "filter": ["==", ["get", "type"], "raceway"], "layout": {"visibility": "visible"}, "paint": { "line-color": "rgba(255, 249, 241, 1)", @@ -3165,7 +3165,7 @@ "source-layer": "transport_lines", "minzoom": 14, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["living_street"]]], + "filter": ["==", ["get", "type"], "living_street"], "layout": {"visibility": "visible"}, "paint": { "line-color": "rgba(255, 255, 255, 1)", @@ -3240,7 +3240,7 @@ "source-layer": "transport_lines", "minzoom": 14, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["steps"]]], + "filter": ["==", ["get", "type"], "steps"], "layout": {"visibility": "visible"}, "paint": { "line-color": "#b3b3b3", @@ -3297,7 +3297,7 @@ "source-layer": "transport_lines", "minzoom": 14, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["pedestrian"]]], + "filter": ["==", ["get", "type"], "pedestrian"], "layout": {"visibility": "visible"}, "paint": { "line-color": "#D2D2D5", @@ -3454,7 +3454,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary_link"]]], + ["==", ["get", "type"], "primary_link"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["coalesce", ["get", "bridge"], 0], 1] ], @@ -3484,7 +3484,7 @@ "minzoom": 8, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["get", "ford"], "yes"], ["!=", ["coalesce", ["get", "bridge"], 0], 1] @@ -3582,8 +3582,8 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["proposed"]]], - ["!", ["in", ["get", "class"], ["literal", ["railway"]]]] + ["==", ["get", "type"], "proposed"], + ["!=", ["get", "class"], "railway"] ], "layout": { "visibility": "visible", @@ -3641,7 +3641,7 @@ "source-layer": "transport_lines", "minzoom": 14, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["pedestrian"]]], + "filter": ["==", ["get", "type"], "pedestrian"], "layout": {"visibility": "visible"}, "paint": { "line-color": "#ffffff", @@ -3694,7 +3694,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["tertiary_link"]]], + ["==", ["get", "type"], "tertiary_link"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["coalesce", ["get", "bridge"], 0], 1] ], @@ -3734,7 +3734,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary_link"]]], + ["==", ["get", "type"], "primary_link"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["coalesce", ["get", "bridge"], 0], 1] ], @@ -3868,7 +3868,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["get", "ford"], "yes"], ["!=", ["coalesce", ["get", "bridge"], 0], 1] @@ -3959,7 +3959,7 @@ "maxzoom": 24, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["subway"]]], + ["==", ["get", "type"], "subway"], ["==", ["get", "bridge"], 1] ], "layout": { @@ -4003,8 +4003,8 @@ "minzoom": 14, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["construction"]]], - ["in", ["get", "construction"], ["literal", ["subway"]]] + ["==", ["get", "type"], "construction"], + ["==", ["get", "construction"], "subway"] ], "layout": {"visibility": "visible"}, "paint": { @@ -4029,7 +4029,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["subway"]]], + ["==", ["get", "type"], "subway"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["==", ["get", "bridge"], 1] ], @@ -4048,7 +4048,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["light_rail"]]], + ["==", ["get", "type"], "light_rail"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["==", ["get", "bridge"], 1] ], @@ -4067,7 +4067,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["light_rail"]]], + ["==", ["get", "type"], "light_rail"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["==", ["get", "bridge"], 1] ], @@ -4351,7 +4351,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["==", ["get", "bridge"], 1] ], "layout": { @@ -4414,7 +4414,7 @@ "minzoom": 10, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["subway"]]], + ["==", ["get", "type"], "subway"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1] ], "layout": {"visibility": "none"}, @@ -4448,7 +4448,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["light_rail"]]], + ["==", ["get", "type"], "light_rail"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["coalesce", ["get", "bridge"], 0], 1] ], @@ -4467,7 +4467,7 @@ "minzoom": 7, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["subway"]]], + ["==", ["get", "type"], "subway"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["coalesce", ["get", "bridge"], 0], 1] ], @@ -5234,7 +5234,7 @@ "filter": [ "all", ["in", ["get", "type"], ["literal", ["construction", "proposed"]]], - ["in", ["get", "class"], ["literal", ["railway"]]] + ["==", ["get", "class"], "railway"] ], "layout": { "visibility": "visible", @@ -5753,7 +5753,7 @@ "type": "symbol", "source": "ohm", "source-layer": "natural_lines", - "filter": ["in", ["get", "type"], ["literal", ["cliff"]]], + "filter": ["==", ["get", "type"], "cliff"], "layout": { "text-field": ["get", "name"], "text-font": ["OpenHistorical Italic"], @@ -5776,7 +5776,7 @@ "type": "symbol", "source": "ohm", "source-layer": "water_lines", - "filter": ["in", ["get", "type"], ["literal", ["dam"]]], + "filter": ["==", ["get", "type"], "dam"], "layout": { "text-field": ["get", "name"], "text-font": ["OpenHistorical Italic"], @@ -5936,7 +5936,7 @@ "filter": [ "in", ["get", "type"], - ["literal", ["", "college", "education", "school", "university"]] + ["literal", ["college", "education", "school", "university"]] ], "layout": { "text-field": ["get", "name"], @@ -6148,7 +6148,7 @@ "source-layer": "other_points_centroids", "minzoom": 15, "maxzoom": 24, - "filter": ["!", ["in", ["get", "type"], ["literal", ["artwork"]]]], + "filter": ["!=", ["get", "type"], "artwork"], "layout": { "icon-image": ["concat", ["get", "type"], "-18"], "visibility": "visible", @@ -6332,7 +6332,7 @@ "filter": [ "all", ["!=", ["get", "class"], "railway"], - ["==", ["get", "name"], ""] + ["!", ["has", "name"]] ], "layout": { "icon-image": ["concat", ["get", "type"], "-18"], @@ -6404,7 +6404,7 @@ "source": "ohm", "source-layer": "landuse_points_centroids", "minzoom": 14, - "filter": ["in", ["get", "type"], ["literal", ["peak"]]], + "filter": ["==", ["get", "type"], "peak"], "layout": { "icon-image": ["concat", ["get", "type"], "-12"], "text-font": ["OpenHistorical"], @@ -6537,7 +6537,7 @@ "source-layer": "place_points_centroids", "minzoom": 9, "maxzoom": 20, - "filter": ["in", ["get", "type"], ["literal", ["county"]]], + "filter": ["==", ["get", "type"], "county"], "layout": { "text-field": ["get", "name"], "text-font": ["OpenHistorical"], @@ -6609,7 +6609,7 @@ "source-layer": "place_points_centroids", "minzoom": 8, "maxzoom": 20, - "filter": ["in", ["get", "type"], ["literal", ["town"]]], + "filter": ["==", ["get", "type"], "town"], "layout": { "text-field": ["get", "name"], "text-font": ["OpenHistorical"], @@ -6640,7 +6640,7 @@ "source-layer": "place_points_centroids", "minzoom": 11, "maxzoom": 20, - "filter": ["in", ["get", "type"], ["literal", ["city"]]], + "filter": ["==", ["get", "type"], "city"], "layout": { "text-field": ["get", "name"], "text-font": ["OpenHistorical"], @@ -6892,4 +6892,4 @@ } ], "id": "io6r61fxt" -} \ No newline at end of file +} diff --git a/woodblock/woodblock.json b/woodblock/woodblock.json index d1ad431d..ce77520d 100644 --- a/woodblock/woodblock.json +++ b/woodblock/woodblock.json @@ -229,7 +229,7 @@ "source-layer": "other_areas", "minzoom": 14, "maxzoom": 24, - "filter": ["==", ["get", "type"], ""], + "filter": ["!", ["has", "type"]], "layout": {"visibility": "none"}, "paint": {"fill-color": "rgba(182, 143, 53, 1)", "fill-opacity": 0.1} }, @@ -276,7 +276,7 @@ "source": "ohm", "source-layer": "transport_lines", "minzoom": 14, - "filter": ["in", ["get", "type"], ["literal", ["subway"]]], + "filter": ["==", ["get", "type"], "subway"], "layout": {"visibility": "none"}, "paint": { "line-color": "rgba(153, 153, 153, 1)", @@ -361,7 +361,7 @@ "maxzoom": 20, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["==", ["get", "tunnel"], 1] ], "layout": { @@ -752,7 +752,7 @@ "filter": [ "all", ["in", ["get", "type"], ["literal", ["construction", "proposed"]]], - ["in", ["get", "class"], ["literal", ["railway"]]] + ["==", ["get", "class"], "railway"] ], "layout": {"visibility": "none"}, "paint": { @@ -782,7 +782,7 @@ "filter": [ "all", ["in", ["get", "type"], ["literal", ["construction", "proposed"]]], - ["in", ["get", "class"], ["literal", ["railway"]]] + ["==", ["get", "class"], "railway"] ], "layout": {"visibility": "none"}, "paint": { @@ -798,7 +798,7 @@ "source-layer": "transport_lines", "minzoom": 12, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["raceway"]]], + "filter": ["==", ["get", "type"], "raceway"], "layout": {"visibility": "none"}, "paint": { "line-color": "rgba(255, 249, 241, 1)", @@ -888,7 +888,7 @@ "source-layer": "transport_lines", "minzoom": 14, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["pedestrian"]]], + "filter": ["==", ["get", "type"], "pedestrian"], "layout": {"visibility": "none"}, "paint": { "line-color": "#ffffff", @@ -959,7 +959,7 @@ "source-layer": "transport_lines", "minzoom": 14, "maxzoom": 24, - "filter": ["in", ["get", "type"], ["literal", ["steps"]]], + "filter": ["==", ["get", "type"], "steps"], "layout": {"visibility": "none"}, "paint": { "line-color": "#b3b3b3", @@ -1094,7 +1094,7 @@ "minzoom": 10.01, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary_link"]]], + ["==", ["get", "type"], "primary_link"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1] ], "layout": { @@ -1123,7 +1123,7 @@ "minzoom": 10.01, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["get", "ford"], "yes"] ], @@ -1457,7 +1457,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary_link"]]], + ["==", ["get", "type"], "primary_link"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1] ], "layout": { @@ -1672,7 +1672,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["!=", ["coalesce", ["get", "tunnel"], 0], 1], ["!=", ["get", "ford"], "yes"] ], @@ -1881,7 +1881,7 @@ "minzoom": 6, "filter": [ "all", - ["in", ["get", "type"], ["literal", ["primary"]]], + ["==", ["get", "type"], "primary"], ["==", ["get", "bridge"], 1] ], "layout": {"visibility": "none"}, @@ -1955,7 +1955,7 @@ "source-layer": "transport_lines", "minzoom": 8, "maxzoom": 9, - "filter": ["in", ["get", "type"], ["literal", ["secondary"]]], + "filter": ["==", ["get", "type"], "secondary"], "layout": {"visibility": "visible"}, "paint": { "line-color": [ @@ -2420,4 +2420,4 @@ } ], "id": "io6r61fxt" -} \ No newline at end of file +} From 92f32236da3268ae3dbb40518e7b0d313b7b3b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sun, 19 Jul 2026 16:10:39 -0700 Subject: [PATCH 2/2] npm run build --- dist/historical/historical.json | 245 ++-- dist/japanese_scroll/japanese_scroll.json | 117 +- dist/ohm.styles.js | 1231 +++++---------------- dist/railway/railway.json | 749 +++---------- dist/woodblock/woodblock.json | 124 +-- 5 files changed, 580 insertions(+), 1886 deletions(-) diff --git a/dist/historical/historical.json b/dist/historical/historical.json index 2473182d..175ae81f 100644 --- a/dist/historical/historical.json +++ b/dist/historical/historical.json @@ -312,17 +312,12 @@ "minzoom": 6, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "nature_reserve" - ] - ] + "nature_reserve" ], "layout": { "visibility": "visible" @@ -919,17 +914,12 @@ "minzoom": 11, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cemetery" - ] - ] + "cemetery" ], "layout": { "visibility": "visible" @@ -1541,16 +1531,10 @@ "stream" ], [ - "in", + "!", [ - "get", + "has", "name" - ], - [ - "literal", - [ - "" - ] ] ] ], @@ -1591,12 +1575,8 @@ "stream" ], [ - "!", - [ - "in", - "name", - "" - ] + "has", + "name" ] ], "paint": { @@ -1630,25 +1610,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "!", + "!=", [ - "in", - "surface", - "water" - ] + "get", + "surface" + ], + "water" ] ], "layout": { @@ -1672,25 +1647,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "!", + "!=", [ - "in", - "surface", - "water" - ] + "get", + "surface" + ], + "water" ] ], "layout": { @@ -1716,30 +1686,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "in", + "==", [ "get", "surface" ], - [ - "literal", - [ - "water" - ] - ] + "water" ] ], "layout": { @@ -6253,17 +6213,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "service" - ] - ] + "service" ], [ "!=", @@ -6958,33 +6913,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "proposed" - ] - ] + "proposed" ], [ - "!", + "!=", [ - "in", - [ - "get", - "class" - ], - [ - "literal", - [ - "railway" - ] - ] - ] + "get", + "class" + ], + "railway" ] ], "layout": { @@ -7022,17 +6964,12 @@ "minzoom": 12, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "service" - ] - ] + "service" ], "layout": { "visibility": "visible", @@ -9093,9 +9030,9 @@ "==", [ "get", - "name" + "usage" ], - "usage=main" + "main" ] ], "layout": { @@ -9207,9 +9144,9 @@ "!=", [ "get", - "name" + "usage" ], - "usage=main" + "main" ] ], "layout": { @@ -10262,17 +10199,12 @@ "minzoom": 11, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "admin_level" ], - [ - "literal", - [ - 9 - ] - ] + 9 ], "layout": { "visibility": "visible", @@ -11477,17 +11409,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "nature_reserve" - ] - ] + "nature_reserve" ], [ "<", @@ -11524,17 +11451,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "nature_reserve" - ] - ] + "nature_reserve" ], [ ">=", @@ -11593,17 +11515,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "nature_reserve" - ] - ] + "nature_reserve" ], [ ">=", @@ -11662,7 +11579,6 @@ [ "literal", [ - "", "college", "education", "school", @@ -12100,20 +12016,12 @@ "minzoom": 15, "maxzoom": 24, "filter": [ - "!", + "!=", [ - "in", - [ - "get", - "type" - ], - [ - "literal", - [ - "artwork" - ] - ] - ] + "get", + "type" + ], + "artwork" ], "layout": { "text-size": [ @@ -12468,20 +12376,12 @@ ] ], [ - "!", + "!=", [ - "in", - [ - "get", - "class" - ], - [ - "literal", - [ - "highway" - ] - ] - ] + "get", + "class" + ], + "highway" ] ], "layout": { @@ -12555,17 +12455,12 @@ "minzoom": 15, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "raceway" - ] - ] + "raceway" ], "layout": { "icon-image": "{type}-18", @@ -13124,17 +13019,12 @@ "minzoom": 8, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "admin_level" ], - [ - "literal", - [ - 6 - ] - ] + 6 ], "layout": { "text-field": [ @@ -13229,17 +13119,12 @@ "minzoom": 15, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "locality" - ] - ] + "locality" ], "layout": { "text-field": [ diff --git a/dist/japanese_scroll/japanese_scroll.json b/dist/japanese_scroll/japanese_scroll.json index feb4b819..2ca5f9d7 100644 --- a/dist/japanese_scroll/japanese_scroll.json +++ b/dist/japanese_scroll/japanese_scroll.json @@ -426,17 +426,12 @@ "source-layer": "transport_lines", "minzoom": 14, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], "layout": { "visibility": "none" @@ -577,17 +572,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -1353,17 +1343,12 @@ ] ], [ - "in", + "==", [ "get", "class" ], - [ - "literal", - [ - "railway" - ] - ] + "railway" ] ], "layout": { @@ -1414,17 +1399,12 @@ ] ], [ - "in", + "==", [ "get", "class" ], - [ - "literal", - [ - "railway" - ] - ] + "railway" ] ], "layout": { @@ -1447,17 +1427,12 @@ "minzoom": 12, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "raceway" - ] - ] + "raceway" ], "layout": { "visibility": "none" @@ -1604,17 +1579,12 @@ "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "pedestrian" - ] - ] + "pedestrian" ], "layout": { "visibility": "none" @@ -1728,17 +1698,12 @@ "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "steps" - ] - ] + "steps" ], "layout": { "visibility": "none" @@ -1981,17 +1946,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -2038,17 +1998,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -2608,17 +2563,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -2957,17 +2907,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -3329,17 +3274,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -3460,17 +3400,12 @@ "minzoom": 8, "maxzoom": 9, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "secondary" - ] - ] + "secondary" ], "layout": { "visibility": "visible" diff --git a/dist/ohm.styles.js b/dist/ohm.styles.js index 140a7411..8b474a51 100644 --- a/dist/ohm.styles.js +++ b/dist/ohm.styles.js @@ -315,17 +315,12 @@ ohmVectorStyles = { "minzoom": 6, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "nature_reserve" - ] - ] + "nature_reserve" ], "layout": { "visibility": "visible" @@ -922,17 +917,12 @@ ohmVectorStyles = { "minzoom": 11, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cemetery" - ] - ] + "cemetery" ], "layout": { "visibility": "visible" @@ -1544,16 +1534,10 @@ ohmVectorStyles = { "stream" ], [ - "in", + "!", [ - "get", + "has", "name" - ], - [ - "literal", - [ - "" - ] ] ] ], @@ -1594,12 +1578,8 @@ ohmVectorStyles = { "stream" ], [ - "!", - [ - "in", - "name", - "" - ] + "has", + "name" ] ], "paint": { @@ -1633,25 +1613,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "!", + "!=", [ - "in", - "surface", - "water" - ] + "get", + "surface" + ], + "water" ] ], "layout": { @@ -1675,25 +1650,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "!", + "!=", [ - "in", - "surface", - "water" - ] + "get", + "surface" + ], + "water" ] ], "layout": { @@ -1719,30 +1689,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "in", + "==", [ "get", "surface" ], - [ - "literal", - [ - "water" - ] - ] + "water" ] ], "layout": { @@ -6256,17 +6216,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "service" - ] - ] + "service" ], [ "!=", @@ -6961,33 +6916,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "proposed" - ] - ] + "proposed" ], [ - "!", + "!=", [ - "in", - [ - "get", - "class" - ], - [ - "literal", - [ - "railway" - ] - ] - ] + "get", + "class" + ], + "railway" ] ], "layout": { @@ -7025,17 +6967,12 @@ ohmVectorStyles = { "minzoom": 12, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "service" - ] - ] + "service" ], "layout": { "visibility": "visible", @@ -9096,9 +9033,9 @@ ohmVectorStyles = { "==", [ "get", - "name" + "usage" ], - "usage=main" + "main" ] ], "layout": { @@ -9210,9 +9147,9 @@ ohmVectorStyles = { "!=", [ "get", - "name" + "usage" ], - "usage=main" + "main" ] ], "layout": { @@ -10265,17 +10202,12 @@ ohmVectorStyles = { "minzoom": 11, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "admin_level" ], - [ - "literal", - [ - 9 - ] - ] + 9 ], "layout": { "visibility": "visible", @@ -11480,17 +11412,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "nature_reserve" - ] - ] + "nature_reserve" ], [ "<", @@ -11527,17 +11454,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "nature_reserve" - ] - ] + "nature_reserve" ], [ ">=", @@ -11596,17 +11518,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "nature_reserve" - ] - ] + "nature_reserve" ], [ ">=", @@ -11665,7 +11582,6 @@ ohmVectorStyles = { [ "literal", [ - "", "college", "education", "school", @@ -12103,20 +12019,12 @@ ohmVectorStyles = { "minzoom": 15, "maxzoom": 24, "filter": [ - "!", + "!=", [ - "in", - [ - "get", - "type" - ], - [ - "literal", - [ - "artwork" - ] - ] - ] + "get", + "type" + ], + "artwork" ], "layout": { "text-size": [ @@ -12471,20 +12379,12 @@ ohmVectorStyles = { ] ], [ - "!", + "!=", [ - "in", - [ - "get", - "class" - ], - [ - "literal", - [ - "highway" - ] - ] - ] + "get", + "class" + ], + "highway" ] ], "layout": { @@ -12558,17 +12458,12 @@ ohmVectorStyles = { "minzoom": 15, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "raceway" - ] - ] + "raceway" ], "layout": { "icon-image": "{type}-18", @@ -13127,17 +13022,12 @@ ohmVectorStyles = { "minzoom": 8, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "admin_level" ], - [ - "literal", - [ - 6 - ] - ] + 6 ], "layout": { "text-field": [ @@ -13232,17 +13122,12 @@ ohmVectorStyles = { "minzoom": 15, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "locality" - ] - ] + "locality" ], "layout": { "text-field": [ @@ -14384,17 +14269,12 @@ ohmVectorStyles = { "source-layer": "transport_lines", "minzoom": 14, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], "layout": { "visibility": "none" @@ -14535,17 +14415,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -15311,17 +15186,12 @@ ohmVectorStyles = { ] ], [ - "in", + "==", [ "get", "class" ], - [ - "literal", - [ - "railway" - ] - ] + "railway" ] ], "layout": { @@ -15372,17 +15242,12 @@ ohmVectorStyles = { ] ], [ - "in", + "==", [ "get", "class" ], - [ - "literal", - [ - "railway" - ] - ] + "railway" ] ], "layout": { @@ -15405,17 +15270,12 @@ ohmVectorStyles = { "minzoom": 12, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "raceway" - ] - ] + "raceway" ], "layout": { "visibility": "none" @@ -15562,17 +15422,12 @@ ohmVectorStyles = { "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "pedestrian" - ] - ] + "pedestrian" ], "layout": { "visibility": "none" @@ -15686,17 +15541,12 @@ ohmVectorStyles = { "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "steps" - ] - ] + "steps" ], "layout": { "visibility": "none" @@ -15939,17 +15789,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -15996,17 +15841,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -16566,17 +16406,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -16915,17 +16750,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -17287,17 +17117,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -17418,17 +17243,12 @@ ohmVectorStyles = { "minzoom": 8, "maxzoom": 9, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "secondary" - ] - ] + "secondary" ], "layout": { "visibility": "visible" @@ -19146,16 +18966,10 @@ ohmVectorStyles = { "stream" ], [ - "in", + "!", [ - "get", + "has", "name" - ], - [ - "literal", - [ - "" - ] ] ] ], @@ -19196,20 +19010,8 @@ ohmVectorStyles = { "stream" ], [ - "!", - [ - "in", - [ - "get", - "name" - ], - [ - "literal", - [ - "" - ] - ] - ] + "has", + "name" ] ], "paint": { @@ -19243,33 +19045,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "!", + "!=", [ - "in", - [ - "get", - "surface" - ], - [ - "literal", - [ - "water" - ] - ] - ] + "get", + "surface" + ], + "water" ] ], "layout": { @@ -19293,33 +19082,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "!", + "!=", [ - "in", - [ - "get", - "surface" - ], - [ - "literal", - [ - "water" - ] - ] - ] + "get", + "surface" + ], + "water" ] ], "layout": { @@ -19345,30 +19121,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "in", + "==", [ "get", "surface" ], - [ - "literal", - [ - "water" - ] - ] + "water" ] ], "layout": { @@ -20154,17 +19920,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -20220,17 +19981,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -20462,17 +20218,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -20532,17 +20283,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -20733,30 +20479,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "living_street" - ] - ] + "living_street" ] ], "layout": { @@ -20790,17 +20526,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -20842,17 +20573,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "in", @@ -20954,30 +20680,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "steps" - ] - ] + "steps" ] ], "layout": { @@ -21015,17 +20731,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -21040,17 +20751,12 @@ ohmVectorStyles = { 1 ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "road" - ] - ] + "road" ] ], "layout": { @@ -21086,17 +20792,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -21303,17 +21004,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -21380,17 +21076,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -21413,17 +21104,12 @@ ohmVectorStyles = { "yes" ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -21471,17 +21157,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -21555,17 +21236,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -21639,30 +21315,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "road" - ] - ] + "road" ] ], "layout": { @@ -21702,17 +21368,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "in", @@ -21767,17 +21428,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "in", @@ -21919,17 +21575,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -22001,17 +21652,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -22265,17 +21911,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -22355,17 +21996,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -22482,17 +22118,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -22663,17 +22294,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -22731,17 +22357,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -22801,17 +22422,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -23018,17 +22634,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -23039,17 +22650,12 @@ ohmVectorStyles = { 1 ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ] ], "layout": { @@ -23089,17 +22695,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -23162,17 +22763,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "==", @@ -23214,17 +22810,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "==", @@ -23285,17 +22876,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "==", @@ -23339,17 +22925,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "light_rail" - ] - ] + "light_rail" ], [ "==", @@ -23403,17 +22984,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "light_rail" - ] - ] + "light_rail" ], [ "==", @@ -23574,17 +23150,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -24107,17 +23678,12 @@ ohmVectorStyles = { "minzoom": 12, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "raceway" - ] - ] + "raceway" ], "layout": { "visibility": "visible" @@ -24264,17 +23830,12 @@ ohmVectorStyles = { "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "living_street" - ] - ] + "living_street" ], "layout": { "visibility": "visible" @@ -24390,17 +23951,12 @@ ohmVectorStyles = { "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "steps" - ] - ] + "steps" ], "layout": { "visibility": "visible" @@ -24495,17 +24051,12 @@ ohmVectorStyles = { "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "pedestrian" - ] - ] + "pedestrian" ], "layout": { "visibility": "visible" @@ -24807,17 +24358,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -24876,17 +24422,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -25100,33 +24641,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "proposed" - ] - ] + "proposed" ], [ - "!", + "!=", [ - "in", - [ - "get", - "class" - ], - [ - "literal", - [ - "railway" - ] - ] - ] + "get", + "class" + ], + "railway" ] ], "layout": { @@ -25209,17 +24737,12 @@ ohmVectorStyles = { "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "pedestrian" - ] - ] + "pedestrian" ], "layout": { "visibility": "visible" @@ -25315,17 +24838,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "tertiary_link" - ] - ] + "tertiary_link" ], [ "!=", @@ -25398,17 +24916,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -25683,17 +25196,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -25877,17 +25385,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "==", @@ -25986,30 +25489,20 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ] ], "layout": { @@ -26046,17 +25539,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "!=", @@ -26112,17 +25600,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "light_rail" - ] - ] + "light_rail" ], [ "!=", @@ -26175,17 +25658,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "light_rail" - ] - ] + "light_rail" ], [ "!=", @@ -26682,17 +26160,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -26792,17 +26265,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "!=", @@ -26869,17 +26337,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "light_rail" - ] - ] + "light_rail" ], [ "!=", @@ -26939,17 +26402,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "!=", @@ -29088,17 +28546,12 @@ ohmVectorStyles = { ] ], [ - "in", + "==", [ "get", "class" ], - [ - "literal", - [ - "railway" - ] - ] + "railway" ] ], "layout": { @@ -30050,17 +29503,12 @@ ohmVectorStyles = { "source": "ohm", "source-layer": "natural_lines", "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], "layout": { "text-field": [ @@ -30102,17 +29550,12 @@ ohmVectorStyles = { "source": "ohm", "source-layer": "water_lines", "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "dam" - ] - ] + "dam" ], "layout": { "text-field": [ @@ -30379,7 +29822,6 @@ ohmVectorStyles = { [ "literal", [ - "", "college", "education", "school", @@ -30796,20 +30238,12 @@ ohmVectorStyles = { "minzoom": 15, "maxzoom": 24, "filter": [ - "!", + "!=", [ - "in", - [ - "get", - "type" - ], - [ - "literal", - [ - "artwork" - ] - ] - ] + "get", + "type" + ], + "artwork" ], "layout": { "icon-image": [ @@ -31204,12 +30638,11 @@ ohmVectorStyles = { "railway" ], [ - "==", + "!", [ - "get", + "has", "name" - ], - "" + ] ] ], "layout": { @@ -31356,17 +30789,12 @@ ohmVectorStyles = { "source-layer": "landuse_points_centroids", "minzoom": 14, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "peak" - ] - ] + "peak" ], "layout": { "icon-image": [ @@ -31614,17 +31042,12 @@ ohmVectorStyles = { "minzoom": 9, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "county" - ] - ] + "county" ], "layout": { "text-field": [ @@ -31726,17 +31149,12 @@ ohmVectorStyles = { "minzoom": 8, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "town" - ] - ] + "town" ], "layout": { "text-field": [ @@ -31778,17 +31196,12 @@ ohmVectorStyles = { "minzoom": 11, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "city" - ] - ] + "city" ], "layout": { "text-field": [ @@ -32580,12 +31993,11 @@ ohmVectorStyles = { "minzoom": 14, "maxzoom": 24, "filter": [ - "==", + "!", [ - "get", + "has", "type" - ], - "" + ] ], "layout": { "visibility": "none" @@ -32657,17 +32069,12 @@ ohmVectorStyles = { "source-layer": "transport_lines", "minzoom": 14, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], "layout": { "visibility": "none" @@ -32808,17 +32215,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -33584,17 +32986,12 @@ ohmVectorStyles = { ] ], [ - "in", + "==", [ "get", "class" ], - [ - "literal", - [ - "railway" - ] - ] + "railway" ] ], "layout": { @@ -33645,17 +33042,12 @@ ohmVectorStyles = { ] ], [ - "in", + "==", [ "get", "class" ], - [ - "literal", - [ - "railway" - ] - ] + "railway" ] ], "layout": { @@ -33678,17 +33070,12 @@ ohmVectorStyles = { "minzoom": 12, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "raceway" - ] - ] + "raceway" ], "layout": { "visibility": "none" @@ -33835,17 +33222,12 @@ ohmVectorStyles = { "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "pedestrian" - ] - ] + "pedestrian" ], "layout": { "visibility": "none" @@ -33959,17 +33341,12 @@ ohmVectorStyles = { "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "steps" - ] - ] + "steps" ], "layout": { "visibility": "none" @@ -34212,17 +33589,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -34269,17 +33641,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -34839,17 +34206,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -35188,17 +34550,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -35560,17 +34917,12 @@ ohmVectorStyles = { "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -35691,17 +35043,12 @@ ohmVectorStyles = { "minzoom": 8, "maxzoom": 9, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "secondary" - ] - ] + "secondary" ], "layout": { "visibility": "visible" diff --git a/dist/railway/railway.json b/dist/railway/railway.json index e3cb76a3..d2ea5c84 100644 --- a/dist/railway/railway.json +++ b/dist/railway/railway.json @@ -1072,16 +1072,10 @@ "stream" ], [ - "in", + "!", [ - "get", + "has", "name" - ], - [ - "literal", - [ - "" - ] ] ] ], @@ -1122,20 +1116,8 @@ "stream" ], [ - "!", - [ - "in", - [ - "get", - "name" - ], - [ - "literal", - [ - "" - ] - ] - ] + "has", + "name" ] ], "paint": { @@ -1169,33 +1151,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "!", + "!=", [ - "in", - [ - "get", - "surface" - ], - [ - "literal", - [ - "water" - ] - ] - ] + "get", + "surface" + ], + "water" ] ], "layout": { @@ -1219,33 +1188,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "!", + "!=", [ - "in", - [ - "get", - "surface" - ], - [ - "literal", - [ - "water" - ] - ] - ] + "get", + "surface" + ], + "water" ] ], "layout": { @@ -1271,30 +1227,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], [ - "in", + "==", [ "get", "surface" ], - [ - "literal", - [ - "water" - ] - ] + "water" ] ], "layout": { @@ -2080,17 +2026,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -2146,17 +2087,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -2388,17 +2324,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -2458,17 +2389,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -2659,30 +2585,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "living_street" - ] - ] + "living_street" ] ], "layout": { @@ -2716,17 +2632,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -2768,17 +2679,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "in", @@ -2880,30 +2786,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "steps" - ] - ] + "steps" ] ], "layout": { @@ -2941,17 +2837,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -2966,17 +2857,12 @@ 1 ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "road" - ] - ] + "road" ] ], "layout": { @@ -3012,17 +2898,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -3229,17 +3110,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -3306,17 +3182,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -3339,17 +3210,12 @@ "yes" ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -3397,17 +3263,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -3481,17 +3342,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -3565,30 +3421,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "road" - ] - ] + "road" ] ], "layout": { @@ -3628,17 +3474,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "in", @@ -3693,17 +3534,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "in", @@ -3845,17 +3681,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -3927,17 +3758,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -4191,17 +4017,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -4281,17 +4102,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "!=", @@ -4408,17 +4224,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -4589,17 +4400,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -4657,17 +4463,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -4727,17 +4528,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -4944,17 +4740,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -4965,17 +4756,12 @@ 1 ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ] ], "layout": { @@ -5015,17 +4801,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ "==", @@ -5088,17 +4869,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "==", @@ -5140,17 +4916,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "==", @@ -5211,17 +4982,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "==", @@ -5265,17 +5031,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "light_rail" - ] - ] + "light_rail" ], [ "==", @@ -5329,17 +5090,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", - "type" - ], - [ - "literal", - [ - "light_rail" - ] - ] + "type" + ], + "light_rail" ], [ "==", @@ -5500,17 +5256,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -6033,17 +5784,12 @@ "minzoom": 12, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "raceway" - ] - ] + "raceway" ], "layout": { "visibility": "visible" @@ -6190,17 +5936,12 @@ "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "living_street" - ] - ] + "living_street" ], "layout": { "visibility": "visible" @@ -6316,17 +6057,12 @@ "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "steps" - ] - ] + "steps" ], "layout": { "visibility": "visible" @@ -6421,17 +6157,12 @@ "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "pedestrian" - ] - ] + "pedestrian" ], "layout": { "visibility": "visible" @@ -6733,17 +6464,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -6802,17 +6528,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -7026,33 +6747,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "proposed" - ] - ] + "proposed" ], [ - "!", + "!=", [ - "in", - [ - "get", - "class" - ], - [ - "literal", - [ - "railway" - ] - ] - ] + "get", + "class" + ], + "railway" ] ], "layout": { @@ -7135,17 +6843,12 @@ "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "pedestrian" - ] - ] + "pedestrian" ], "layout": { "visibility": "visible" @@ -7241,17 +6944,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "tertiary_link" - ] - ] + "tertiary_link" ], [ "!=", @@ -7324,17 +7022,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -7609,17 +7302,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -7803,17 +7491,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "==", @@ -7912,30 +7595,20 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "construction" - ] - ] + "construction" ], [ - "in", + "==", [ "get", "construction" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ] ], "layout": { @@ -7972,17 +7645,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "!=", @@ -8038,17 +7706,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "light_rail" - ] - ] + "light_rail" ], [ "!=", @@ -8101,17 +7764,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "light_rail" - ] - ] + "light_rail" ], [ "!=", @@ -8608,17 +8266,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -8718,17 +8371,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "!=", @@ -8795,17 +8443,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "light_rail" - ] - ] + "light_rail" ], [ "!=", @@ -8865,17 +8508,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], [ "!=", @@ -11014,17 +10652,12 @@ ] ], [ - "in", + "==", [ "get", "class" ], - [ - "literal", - [ - "railway" - ] - ] + "railway" ] ], "layout": { @@ -11976,17 +11609,12 @@ "source": "ohm", "source-layer": "natural_lines", "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "cliff" - ] - ] + "cliff" ], "layout": { "text-field": [ @@ -12028,17 +11656,12 @@ "source": "ohm", "source-layer": "water_lines", "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "dam" - ] - ] + "dam" ], "layout": { "text-field": [ @@ -12305,7 +11928,6 @@ [ "literal", [ - "", "college", "education", "school", @@ -12722,20 +12344,12 @@ "minzoom": 15, "maxzoom": 24, "filter": [ - "!", + "!=", [ - "in", - [ - "get", - "type" - ], - [ - "literal", - [ - "artwork" - ] - ] - ] + "get", + "type" + ], + "artwork" ], "layout": { "icon-image": [ @@ -13130,12 +12744,11 @@ "railway" ], [ - "==", + "!", [ - "get", + "has", "name" - ], - "" + ] ] ], "layout": { @@ -13282,17 +12895,12 @@ "source-layer": "landuse_points_centroids", "minzoom": 14, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "peak" - ] - ] + "peak" ], "layout": { "icon-image": [ @@ -13540,17 +13148,12 @@ "minzoom": 9, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "county" - ] - ] + "county" ], "layout": { "text-field": [ @@ -13652,17 +13255,12 @@ "minzoom": 8, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "town" - ] - ] + "town" ], "layout": { "text-field": [ @@ -13704,17 +13302,12 @@ "minzoom": 11, "maxzoom": 20, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "city" - ] - ] + "city" ], "layout": { "text-field": [ diff --git a/dist/woodblock/woodblock.json b/dist/woodblock/woodblock.json index ad836f03..d0b7e9df 100644 --- a/dist/woodblock/woodblock.json +++ b/dist/woodblock/woodblock.json @@ -337,12 +337,11 @@ "minzoom": 14, "maxzoom": 24, "filter": [ - "==", + "!", [ - "get", + "has", "type" - ], - "" + ] ], "layout": { "visibility": "none" @@ -414,17 +413,12 @@ "source-layer": "transport_lines", "minzoom": 14, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "subway" - ] - ] + "subway" ], "layout": { "visibility": "none" @@ -565,17 +559,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -1341,17 +1330,12 @@ ] ], [ - "in", + "==", [ "get", "class" ], - [ - "literal", - [ - "railway" - ] - ] + "railway" ] ], "layout": { @@ -1402,17 +1386,12 @@ ] ], [ - "in", + "==", [ "get", "class" ], - [ - "literal", - [ - "railway" - ] - ] + "railway" ] ], "layout": { @@ -1435,17 +1414,12 @@ "minzoom": 12, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "raceway" - ] - ] + "raceway" ], "layout": { "visibility": "none" @@ -1592,17 +1566,12 @@ "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "pedestrian" - ] - ] + "pedestrian" ], "layout": { "visibility": "none" @@ -1716,17 +1685,12 @@ "minzoom": 14, "maxzoom": 24, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "steps" - ] - ] + "steps" ], "layout": { "visibility": "none" @@ -1969,17 +1933,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -2026,17 +1985,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -2596,17 +2550,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary_link" - ] - ] + "primary_link" ], [ "!=", @@ -2945,17 +2894,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "!=", @@ -3317,17 +3261,12 @@ "filter": [ "all", [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "primary" - ] - ] + "primary" ], [ "==", @@ -3448,17 +3387,12 @@ "minzoom": 8, "maxzoom": 9, "filter": [ - "in", + "==", [ "get", "type" ], - [ - "literal", - [ - "secondary" - ] - ] + "secondary" ], "layout": { "visibility": "visible"