diff --git a/public/assets/sunny-unlabeled.json b/public/assets/sunny-unlabeled.json
index c2b139673c..c941d6fda4 100644
--- a/public/assets/sunny-unlabeled.json
+++ b/public/assets/sunny-unlabeled.json
@@ -1,14 +1,14 @@
{
"#": "AUTOMATICALLY GENERATED! Do not edit.",
"version": 8,
- "name": "style@2.0.0-alpha.0 theme@sunny-unlabeled",
+ "name": "style@4.0.0-alpha.0 theme@sunny-unlabeled",
"glyphs": "https://protomaps.github.io/basemaps-assets/fonts/{fontstack}/{range}.pbf",
"sources": {
"protomaps": {
"attribution": "Protomaps © OpenStreetMap",
"type": "vector",
"tiles": [
- "https://api.protomaps.com/tiles/v3/{z}/{x}/{y}.mvt?key=2af8b969a9e8b692"
+ "https://api.protomaps.com/tiles/v4/{z}/{x}/{y}.mvt?key=2af8b969a9e8b692"
],
"maxzoom": 15
}
@@ -39,7 +39,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"farmland"
]
],
@@ -56,7 +56,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"residential"
]
],
@@ -73,7 +73,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"national_park",
"park",
"cemetery",
@@ -108,7 +108,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"allotments",
"village_green",
"playground"
@@ -128,7 +128,7 @@
"any",
[
"==",
- "pmap:kind",
+ "kind",
"hospital"
]
],
@@ -145,7 +145,7 @@
"any",
[
"==",
- "pmap:kind",
+ "kind",
"industrial"
]
],
@@ -162,7 +162,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"school",
"university",
"college"
@@ -181,7 +181,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"beach"
]
],
@@ -198,7 +198,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"zoo"
]
],
@@ -215,30 +215,38 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"military",
"naval_base",
"airfield"
]
],
"paint": {
- "fill-color": "#c6dcdc"
+ "fill-color": [
+ "interpolate",
+ [
+ "linear"
+ ],
+ [
+ "zoom"
+ ],
+ 5,
+ "#f0efdd",
+ 8,
+ "#ecad9366"
+ ]
}
},
{
"id": "natural_wood",
"type": "fill",
"source": "protomaps",
- "source-layer": "natural",
+ "source-layer": "landuse",
"filter": [
- "any",
- [
- "in",
- "pmap:kind",
- "wood",
- "nature_reserve",
- "forest"
- ]
+ "in",
+ "kind",
+ "wood",
+ "forest"
],
"paint": {
"fill-color": [
@@ -251,39 +259,10 @@
],
2,
"#f0efdd",
- 10,
- "#d0ded0",
- 18,
- "#add19e"
- ]
- }
- },
- {
- "id": "landuse_forest",
- "type": "fill",
- "source": "protomaps",
- "source-layer": "landuse",
- "filter": [
- "any",
- [
- "in",
- "pmap:kind",
- "forest"
- ]
- ],
- "paint": {
- "fill-color": [
- "interpolate",
- [
- "linear"
- ],
- [
- "zoom"
- ],
- 6,
- "#f0efdd",
- 12,
+ 9,
"#d0ded0",
+ 13,
+ "#add19e",
18,
"#add19e"
]
@@ -293,10 +272,10 @@
"id": "natural_scrub",
"type": "fill",
"source": "protomaps",
- "source-layer": "natural",
+ "source-layer": "landuse",
"filter": [
"in",
- "pmap:kind",
+ "kind",
"scrub",
"grassland",
"grass"
@@ -321,10 +300,10 @@
"id": "natural_glacier",
"type": "fill",
"source": "protomaps",
- "source-layer": "natural",
+ "source-layer": "landuse",
"filter": [
"==",
- "pmap:kind",
+ "kind",
"glacier"
],
"paint": {
@@ -335,10 +314,10 @@
"id": "natural_sand",
"type": "fill",
"source": "protomaps",
- "source-layer": "natural",
+ "source-layer": "landuse",
"filter": [
"==",
- "pmap:kind",
+ "kind",
"sand"
],
"paint": {
@@ -354,12 +333,11 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"national_park",
"park",
"cemetery",
"nature_reserve",
- "forest",
"golf_course"
]
],
@@ -390,7 +368,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"aerodrome"
]
],
@@ -399,15 +377,15 @@
}
},
{
- "id": "transit_runway",
+ "id": "roads_runway",
"type": "line",
"source": "protomaps",
- "source-layer": "transit",
+ "source-layer": "roads",
"filter": [
"any",
[
"in",
- "pmap:kind_detail",
+ "kind_detail",
"runway"
]
],
@@ -432,16 +410,16 @@
}
},
{
- "id": "transit_taxiway",
+ "id": "roads_taxiway",
"type": "line",
"source": "protomaps",
- "source-layer": "transit",
+ "source-layer": "roads",
"minzoom": 13,
"filter": [
"any",
[
"in",
- "pmap:kind_detail",
+ "kind_detail",
"taxiway"
]
],
@@ -465,11 +443,34 @@
]
}
},
+ {
+ "id": "landuse_runway",
+ "type": "fill",
+ "source": "protomaps",
+ "source-layer": "landuse",
+ "filter": [
+ "any",
+ [
+ "in",
+ "kind",
+ "runway",
+ "taxiway"
+ ]
+ ],
+ "paint": {
+ "fill-color": "#e9e9ed"
+ }
+ },
{
"id": "water",
"type": "fill",
"source": "protomaps",
"source-layer": "water",
+ "filter": [
+ "==",
+ "$type",
+ "Polygon"
+ ],
"paint": {
"fill-color": "#85c2e9"
}
@@ -484,13 +485,8 @@
"all",
[
"in",
- "pmap:kind",
+ "kind",
"stream"
- ],
- [
- ">=",
- "pmap:level",
- 0
]
],
"paint": {
@@ -505,17 +501,9 @@
"source-layer": "physical_line",
"minzoom": 9,
"filter": [
- "all",
- [
- "in",
- "pmap:kind",
- "river"
- ],
- [
- ">=",
- "pmap:level",
- 0
- ]
+ "in",
+ "kind",
+ "river"
],
"paint": {
"line-color": "#85c2e9",
@@ -547,13 +535,12 @@
"all",
[
"in",
- "pmap:kind",
+ "kind",
"stream"
],
[
- "<",
- "pmap:level",
- 0
+ "has",
+ "is_tunnel"
]
],
"paint": {
@@ -571,12 +558,12 @@
"all",
[
"in",
- "pmap:kind",
+ "kind",
"river"
],
[
"<",
- "pmap:level",
+ "level",
0
]
],
@@ -616,7 +603,7 @@
"any",
[
"==",
- "pmap:kind",
+ "kind",
"pedestrian"
]
],
@@ -633,7 +620,7 @@
"any",
[
"==",
- "pmap:kind",
+ "kind",
"pier"
]
],
@@ -650,12 +637,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
]
@@ -687,12 +674,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
]
],
@@ -745,12 +732,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:link",
+ "link",
1
]
],
@@ -792,62 +779,6 @@
]
}
},
- {
- "id": "roads_tunnels_medium_casing",
- "type": "line",
- "source": "protomaps",
- "source-layer": "roads",
- "filter": [
- "all",
- [
- "<",
- "pmap:level",
- 0
- ],
- [
- "==",
- "pmap:kind",
- "medium_road"
- ]
- ],
- "paint": {
- "line-color": "#e0e0e0",
- "line-dasharray": [
- 3,
- 2
- ],
- "line-gap-width": [
- "interpolate",
- [
- "exponential",
- 1.6
- ],
- [
- "zoom"
- ],
- 7,
- 0,
- 7.5,
- 0.5,
- 18,
- 13
- ],
- "line-width": [
- "interpolate",
- [
- "exponential",
- 1.6
- ],
- [
- "zoom"
- ],
- 10,
- 0,
- 10.5,
- 1
- ]
- }
- },
{
"id": "roads_tunnels_major_casing",
"type": "line",
@@ -857,12 +788,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -913,17 +844,17 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
"!=",
- "pmap:link",
+ "link",
1
]
],
@@ -976,12 +907,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
]
@@ -1017,12 +948,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
]
],
@@ -1057,12 +988,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:link",
+ "link",
1
]
],
@@ -1086,90 +1017,6 @@
]
}
},
- {
- "id": "roads_tunnels_medium_outline",
- "type": "line",
- "source": "protomaps",
- "source-layer": "roads",
- "filter": [
- "all",
- [
- "<",
- "pmap:level",
- 0
- ],
- [
- "==",
- "pmap:kind",
- "medium_road"
- ]
- ],
- "paint": {
- "line-dasharray": [
- 0.4,
- 0.1
- ],
- "line-color": "#bca664",
- "line-width": [
- "interpolate",
- [
- "exponential",
- 1.6
- ],
- [
- "zoom"
- ],
- 7,
- 0,
- 12,
- 3.2,
- 15,
- 6,
- 18,
- 17
- ]
- }
- },
- {
- "id": "roads_tunnels_medium",
- "type": "line",
- "source": "protomaps",
- "source-layer": "roads",
- "filter": [
- "all",
- [
- "<",
- "pmap:level",
- 0
- ],
- [
- "==",
- "pmap:kind",
- "medium_road"
- ]
- ],
- "paint": {
- "line-color": "#fcd6a4",
- "line-width": [
- "interpolate",
- [
- "exponential",
- 1.6
- ],
- [
- "zoom"
- ],
- 7,
- 0,
- 12,
- 1.2,
- 15,
- 3,
- 18,
- 13
- ]
- }
- },
{
"id": "roads_tunnels_major_outline",
"type": "line",
@@ -1179,12 +1026,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -1222,13 +1069,12 @@
"filter": [
"all",
[
- "<",
- "pmap:level",
- 0
+ "has",
+ "is_tunnel"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -1274,18 +1120,17 @@
"filter": [
"all",
[
- "<",
- "pmap:level",
- 0
+ "has",
+ "is_tunnel"
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
"!=",
- "pmap:link",
+ "link",
1
]
],
@@ -1314,21 +1159,20 @@
}
},
{
- "id": "transit_railway_tunnel",
+ "id": "roads_railway_tunnel",
"type": "line",
"source": "protomaps",
- "source-layer": "transit",
+ "source-layer": "roads",
"filter": [
"all",
[
"==",
- "pmap:kind",
+ "kind",
"rail"
],
[
- "<",
- "pmap:level",
- 0
+ "has",
+ "is_tunnel"
]
],
"paint": {
@@ -1370,14 +1214,11 @@
"id": "transit_pier",
"type": "line",
"source": "protomaps",
- "source-layer": "transit",
+ "source-layer": "roads",
"filter": [
- "any",
- [
- "==",
- "pmap:kind",
- "pier"
- ]
+ "==",
+ "kind_detail",
+ "pier"
],
"paint": {
"line-color": "#e0e0e0",
@@ -1408,18 +1249,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
],
[
"==",
- "pmap:kind_detail",
+ "kind_detail",
"service"
]
],
@@ -1463,18 +1307,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
],
[
"!=",
- "pmap:kind_detail",
+ "kind_detail",
"service"
]
],
@@ -1524,7 +1371,7 @@
"all",
[
"==",
- "pmap:link",
+ "link",
1
]
],
@@ -1562,60 +1409,6 @@
]
}
},
- {
- "id": "roads_medium_casing",
- "type": "line",
- "source": "protomaps",
- "source-layer": "roads",
- "filter": [
- "all",
- [
- "==",
- "pmap:level",
- 0
- ],
- [
- "==",
- "pmap:kind",
- "medium_road"
- ]
- ],
- "paint": {
- "line-color": "#e0e0e0",
- "line-gap-width": [
- "interpolate",
- [
- "exponential",
- 1.6
- ],
- [
- "zoom"
- ],
- 7,
- 0,
- 12,
- 1.2,
- 15,
- 3,
- 18,
- 13
- ],
- "line-width": [
- "interpolate",
- [
- "exponential",
- 1.6
- ],
- [
- "zoom"
- ],
- 10,
- 0,
- 10.5,
- 1.5
- ]
- }
- },
{
"id": "roads_major_casing_late",
"type": "line",
@@ -1625,13 +1418,16 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -1680,18 +1476,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
"!=",
- "pmap:link",
+ "link",
1
]
],
@@ -1739,19 +1538,22 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
],
[
"==",
- "pmap:kind_detail",
+ "kind_detail",
"footway"
]
],
@@ -1785,19 +1587,22 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
],
[
"==",
- "pmap:kind_detail",
+ "kind_detail",
"cycleway"
]
],
@@ -1831,25 +1636,33 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
],
[
"!=",
- "pmap:kind_detail",
+ "kind_detail",
"cycleway"
],
[
"!=",
- "pmap:kind_detail",
+ "kind_detail",
"footway"
+ ],
+ [
+ "!=",
+ "kind_detail",
+ "pier"
]
],
"paint": {
@@ -1882,13 +1695,16 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:link",
+ "link",
1
]
],
@@ -1934,18 +1750,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
],
[
"==",
- "pmap:kind_detail",
+ "kind_detail",
"service"
]
],
@@ -1975,18 +1794,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
],
[
"!=",
- "pmap:kind_detail",
+ "kind_detail",
"service"
]
],
@@ -2025,86 +1847,6 @@
]
}
},
- {
- "id": "roads_medium_outline",
- "type": "line",
- "source": "protomaps",
- "source-layer": "roads",
- "filter": [
- "all",
- [
- "==",
- "pmap:level",
- 0
- ],
- [
- "==",
- "pmap:kind",
- "medium_road"
- ]
- ],
- "paint": {
- "line-color": "#bca664",
- "line-width": [
- "interpolate",
- [
- "exponential",
- 1.6
- ],
- [
- "zoom"
- ],
- 7,
- 0,
- 12,
- 3.2,
- 15,
- 6,
- 18,
- 17
- ]
- }
- },
- {
- "id": "roads_medium",
- "type": "line",
- "source": "protomaps",
- "source-layer": "roads",
- "filter": [
- "all",
- [
- "==",
- "pmap:level",
- 0
- ],
- [
- "==",
- "pmap:kind",
- "medium_road"
- ]
- ],
- "paint": {
- "line-color": "#fcd6a4",
- "line-width": [
- "interpolate",
- [
- "exponential",
- 1.6
- ],
- [
- "zoom"
- ],
- 7,
- 0,
- 12,
- 1.2,
- 15,
- 3,
- 18,
- 13
- ]
- }
- },
{
"id": "roads_major_casing_early",
"type": "line",
@@ -2114,13 +1856,16 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -2166,13 +1911,16 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -2206,13 +1954,16 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -2259,18 +2010,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
"!=",
- "pmap:link",
+ "link",
1
]
],
@@ -2316,18 +2070,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
"!=",
- "pmap:link",
+ "link",
1
]
],
@@ -2356,26 +2113,77 @@
}
},
{
- "id": "transit_railway_centerline",
+ "id": "roads_railway_bridge_centerline",
"type": "line",
"source": "protomaps",
- "source-layer": "transit",
+ "source-layer": "roads",
"filter": [
"all",
[
"==",
- "pmap:kind",
+ "kind",
"rail"
],
[
- ">=",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
]
],
"paint": {
"line-opacity": 1,
- "line-color": "#666",
+ "line-color": "#ccc",
+ "line-width": [
+ "interpolate",
+ [
+ "linear"
+ ],
+ [
+ "zoom"
+ ],
+ 11,
+ 0,
+ 11.5,
+ 2,
+ 13,
+ 8,
+ 18,
+ 14
+ ]
+ }
+ },
+ {
+ "id": "roads_railway_centerline",
+ "type": "line",
+ "source": "protomaps",
+ "source-layer": "roads",
+ "filter": [
+ "all",
+ [
+ "==",
+ "kind",
+ "rail"
+ ],
+ [
+ "!has",
+ "is_tunnel"
+ ]
+ ],
+ "paint": {
+ "line-opacity": 1,
+ "line-color": [
+ "match",
+ [
+ "get",
+ "kind_detail"
+ ],
+ "disused",
+ "#666666aa",
+ "tram",
+ "#999",
+ "subway",
+ "#999",
+ "#666"
+ ],
"line-width": [
"interpolate",
[
@@ -2396,21 +2204,16 @@
}
},
{
- "id": "transit_railway",
+ "id": "roads_railway",
"type": "line",
"source": "protomaps",
- "source-layer": "transit",
+ "source-layer": "roads",
"filter": [
"all",
[
"==",
- "pmap:kind",
+ "kind",
"rail"
- ],
- [
- ">=",
- "pmap:level",
- 0
]
],
"paint": {
@@ -2445,7 +2248,7 @@
"source-layer": "boundaries",
"filter": [
"<=",
- "pmap:min_admin_level",
+ "kind_detail",
2
],
"paint": {
@@ -2464,7 +2267,7 @@
"source-layer": "boundaries",
"filter": [
">",
- "pmap:min_admin_level",
+ "kind_detail",
2
],
"paint": {
@@ -2485,13 +2288,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
]
@@ -2523,14 +2325,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
- "==",
- "pmap:link",
- 1
+ "has",
+ "is_link"
]
],
"paint": {
@@ -2576,13 +2376,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
]
],
@@ -2631,13 +2430,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"medium_road"
]
],
@@ -2686,13 +2484,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -2739,13 +2536,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"medium_road"
]
],
@@ -2779,13 +2575,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -2831,19 +2626,17 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
- "!=",
- "pmap:link",
- 1
+ "!has",
+ "is_link"
]
],
"paint": {
@@ -2889,13 +2682,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
]
],
@@ -2930,14 +2722,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
- "==",
- "pmap:link",
- 1
+ "has",
+ "is_link"
]
],
"paint": {
@@ -2983,13 +2773,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"medium_road"
]
],
@@ -3024,13 +2813,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -3077,19 +2865,18 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
],
[
"==",
- "pmap:kind_detail",
+ "kind_detail",
"cycleway"
]
],
@@ -3124,13 +2911,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
]
@@ -3164,7 +2950,7 @@
"source-layer": "places",
"filter": [
"==",
- "pmap:kind",
+ "kind",
"locality"
],
"paint": {
diff --git a/public/assets/sunny.json b/public/assets/sunny.json
index 73b92ba763..081bd6a6ca 100644
--- a/public/assets/sunny.json
+++ b/public/assets/sunny.json
@@ -55,7 +55,7 @@
"any",
[
"in",
- " kind",
+ "kind",
"residential"
]
],
@@ -240,16 +240,12 @@
"id": "natural_wood",
"type": "fill",
"source": "protomaps",
- "source-layer": "natural",
+ "source-layer": "landuse",
"filter": [
- "any",
- [
- "in",
- "kind",
- "wood",
- "nature_reserve",
- "forest"
- ]
+ "in",
+ "kind",
+ "wood",
+ "forest"
],
"paint": {
"fill-color": [
@@ -262,39 +258,10 @@
],
2,
"#f0efdd",
- 10,
- "#d0ded0",
- 18,
- "#add19e"
- ]
- }
- },
- {
- "id": "landuse_forest",
- "type": "fill",
- "source": "protomaps",
- "source-layer": "landuse",
- "filter": [
- "any",
- [
- "in",
- "kind",
- "forest"
- ]
- ],
- "paint": {
- "fill-color": [
- "interpolate",
- [
- "linear"
- ],
- [
- "zoom"
- ],
- 6,
- "#f0efdd",
- 12,
+ 9,
"#d0ded0",
+ 13,
+ "#add19e",
18,
"#add19e"
]
@@ -304,7 +271,7 @@
"id": "natural_scrub",
"type": "fill",
"source": "protomaps",
- "source-layer": "natural",
+ "source-layer": "landuse",
"filter": [
"in",
"kind",
@@ -332,7 +299,7 @@
"id": "natural_glacier",
"type": "fill",
"source": "protomaps",
- "source-layer": "natural",
+ "source-layer": "landuse",
"filter": [
"==",
"kind",
@@ -346,7 +313,7 @@
"id": "natural_sand",
"type": "fill",
"source": "protomaps",
- "source-layer": "natural",
+ "source-layer": "landuse",
"filter": [
"==",
"kind",
@@ -370,7 +337,6 @@
"park",
"cemetery",
"nature_reserve",
- "forest",
"golf_course"
]
],