diff --git a/public/assets/sunny.json b/public/assets/sunny.json
index c17ef53e4..3ca95b23b 100644
--- a/public/assets/sunny.json
+++ b/public/assets/sunny.json
@@ -1,13 +1,13 @@
{
"version": 8,
- "name": "style@2.0.0-alpha.0 theme@sunny",
+ "name": "style@4.0.0-alpha.0 theme@sunny",
"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
}
@@ -38,7 +38,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"farmland"
]
],
@@ -55,7 +55,7 @@
"any",
[
"in",
- "pmap:kind",
+ " kind",
"residential"
]
],
@@ -72,7 +72,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"national_park",
"park",
"cemetery",
@@ -107,7 +107,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"allotments",
"village_green",
"playground"
@@ -127,7 +127,7 @@
"any",
[
"==",
- "pmap:kind",
+ "kind",
"hospital"
]
],
@@ -144,7 +144,7 @@
"any",
[
"==",
- "pmap:kind",
+ "kind",
"industrial"
]
],
@@ -161,7 +161,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"school",
"university",
"college"
@@ -180,7 +180,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"beach"
]
],
@@ -197,7 +197,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"zoo"
]
],
@@ -214,14 +214,26 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"military",
"naval_base",
"airfield"
]
],
"paint": {
- "fill-color": "#c6dcdc"
+ "fill-color": [
+ "interpolate",
+ [
+ "linear"
+ ],
+ [
+ "zoom"
+ ],
+ 5,
+ "#f0efdd",
+ 8,
+ "#ecad9366"
+ ]
}
},
{
@@ -233,7 +245,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"wood",
"nature_reserve",
"forest"
@@ -266,7 +278,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"forest"
]
],
@@ -295,7 +307,7 @@
"source-layer": "natural",
"filter": [
"in",
- "pmap:kind",
+ "kind",
"scrub",
"grassland",
"grass"
@@ -323,7 +335,7 @@
"source-layer": "natural",
"filter": [
"==",
- "pmap:kind",
+ "kind",
"glacier"
],
"paint": {
@@ -337,7 +349,7 @@
"source-layer": "natural",
"filter": [
"==",
- "pmap:kind",
+ "kind",
"sand"
],
"paint": {
@@ -353,7 +365,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"national_park",
"park",
"cemetery",
@@ -389,7 +401,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"aerodrome"
]
],
@@ -398,15 +410,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"
]
],
@@ -431,16 +443,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"
]
],
@@ -464,11 +476,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"
}
@@ -483,13 +518,8 @@
"all",
[
"in",
- "pmap:kind",
+ "kind",
"stream"
- ],
- [
- ">=",
- "pmap:level",
- 0
]
],
"paint": {
@@ -504,17 +534,9 @@
"source-layer": "physical_line",
"minzoom": 9,
"filter": [
- "all",
- [
- "in",
- "pmap:kind",
- "river"
- ],
- [
- ">=",
- "pmap:level",
- 0
- ]
+ "in",
+ "kind",
+ "river"
],
"paint": {
"line-color": "#85c2e9",
@@ -546,13 +568,12 @@
"all",
[
"in",
- "pmap:kind",
+ "kind",
"stream"
],
[
- "<",
- "pmap:level",
- 0
+ "has",
+ "is_tunnel"
]
],
"paint": {
@@ -570,12 +591,12 @@
"all",
[
"in",
- "pmap:kind",
+ "kind",
"river"
],
[
"<",
- "pmap:level",
+ "level",
0
]
],
@@ -615,7 +636,7 @@
"any",
[
"==",
- "pmap:kind",
+ "kind",
"pedestrian"
]
],
@@ -632,7 +653,7 @@
"any",
[
"==",
- "pmap:kind",
+ "kind",
"pier"
]
],
@@ -649,12 +670,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
]
@@ -686,12 +707,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
]
],
@@ -744,12 +765,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:link",
+ "link",
1
]
],
@@ -791,62 +812,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",
@@ -856,12 +821,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -912,17 +877,17 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
"!=",
- "pmap:link",
+ "link",
1
]
],
@@ -975,12 +940,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
]
@@ -1016,12 +981,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
]
],
@@ -1056,12 +1021,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:link",
+ "link",
1
]
],
@@ -1085,90 +1050,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",
@@ -1178,12 +1059,12 @@
"all",
[
"<",
- "pmap:level",
+ "level",
0
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -1221,13 +1102,12 @@
"filter": [
"all",
[
- "<",
- "pmap:level",
- 0
+ "has",
+ "is_tunnel"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -1273,18 +1153,17 @@
"filter": [
"all",
[
- "<",
- "pmap:level",
- 0
+ "has",
+ "is_tunnel"
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
"!=",
- "pmap:link",
+ "link",
1
]
],
@@ -1313,21 +1192,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": {
@@ -1369,14 +1247,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",
@@ -1407,18 +1282,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
],
[
"==",
- "pmap:kind_detail",
+ "kind_detail",
"service"
]
],
@@ -1462,18 +1340,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
],
[
"!=",
- "pmap:kind_detail",
+ "kind_detail",
"service"
]
],
@@ -1523,7 +1404,7 @@
"all",
[
"==",
- "pmap:link",
+ "link",
1
]
],
@@ -1561,60 +1442,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",
@@ -1624,13 +1451,16 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -1679,18 +1509,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
"!=",
- "pmap:link",
+ "link",
1
]
],
@@ -1738,19 +1571,22 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
],
[
"==",
- "pmap:kind_detail",
+ "kind_detail",
"footway"
]
],
@@ -1784,19 +1620,22 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
],
[
"==",
- "pmap:kind_detail",
+ "kind_detail",
"cycleway"
]
],
@@ -1830,25 +1669,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": {
@@ -1881,13 +1728,16 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:link",
+ "link",
1
]
],
@@ -1933,18 +1783,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
],
[
"==",
- "pmap:kind_detail",
+ "kind_detail",
"service"
]
],
@@ -1974,18 +1827,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
],
[
"!=",
- "pmap:kind_detail",
+ "kind_detail",
"service"
]
],
@@ -2024,86 +1880,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",
@@ -2113,13 +1889,16 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -2165,13 +1944,16 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -2205,13 +1987,16 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -2258,18 +2043,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
"!=",
- "pmap:link",
+ "link",
1
]
],
@@ -2315,18 +2103,21 @@
"filter": [
"all",
[
- "==",
- "pmap:level",
- 0
+ "!has",
+ "is_tunnel"
+ ],
+ [
+ "!has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
"!=",
- "pmap:link",
+ "link",
1
]
],
@@ -2355,21 +2146,59 @@
}
},
{
- "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": "#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": {
@@ -2395,21 +2224,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": {
@@ -2444,7 +2268,7 @@
"source-layer": "boundaries",
"filter": [
"<=",
- "pmap:min_admin_level",
+ "kind_detail",
2
],
"paint": {
@@ -2463,7 +2287,7 @@
"source-layer": "boundaries",
"filter": [
">",
- "pmap:min_admin_level",
+ "kind_detail",
2
],
"paint": {
@@ -2484,13 +2308,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
]
@@ -2522,14 +2345,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
- "==",
- "pmap:link",
- 1
+ "has",
+ "is_link"
]
],
"paint": {
@@ -2575,13 +2396,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
]
],
@@ -2630,13 +2450,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"medium_road"
]
],
@@ -2685,13 +2504,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -2738,13 +2556,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"medium_road"
]
],
@@ -2778,13 +2595,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -2830,19 +2646,17 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"highway"
],
[
- "!=",
- "pmap:link",
- 1
+ "!has",
+ "is_link"
]
],
"paint": {
@@ -2888,13 +2702,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"minor_road"
]
],
@@ -2929,14 +2742,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
- "==",
- "pmap:link",
- 1
+ "has",
+ "is_link"
]
],
"paint": {
@@ -2982,13 +2793,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"medium_road"
]
],
@@ -3023,13 +2833,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"==",
- "pmap:kind",
+ "kind",
"major_road"
]
],
@@ -3076,19 +2885,18 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
],
[
"==",
- "pmap:kind_detail",
+ "kind_detail",
"cycleway"
]
],
@@ -3123,13 +2931,12 @@
"filter": [
"all",
[
- ">",
- "pmap:level",
- 0
+ "has",
+ "is_bridge"
],
[
"in",
- "pmap:kind",
+ "kind",
"other",
"path"
]
@@ -3156,6 +2963,34 @@
]
}
},
+ {
+ "id": "address_label",
+ "type": "symbol",
+ "source": "protomaps",
+ "source-layer": "buildings",
+ "minzoom": 17,
+ "filter": [
+ "==",
+ "kind",
+ "address"
+ ],
+ "layout": {
+ "symbol-placement": "point",
+ "text-font": [
+ "Noto Sans Italic"
+ ],
+ "text-field": [
+ "get",
+ "addr_housenumber"
+ ],
+ "text-size": 14
+ },
+ "paint": {
+ "text-color": "#555",
+ "text-halo-color": "#ffffff",
+ "text-halo-width": 1
+ }
+ },
{
"id": "physical_line_waterway_label",
"type": "symbol",
@@ -3166,7 +3001,7 @@
"all",
[
"in",
- "pmap:kind",
+ "kind",
"river",
"stream"
]
@@ -3188,15 +3023,15 @@
}
},
{
- "id": "physical_point_peak",
+ "id": "pois_peak",
"type": "symbol",
"source": "protomaps",
- "source-layer": "physical_point",
+ "source-layer": "pois",
"filter": [
"any",
[
"==",
- "pmap:kind",
+ "kind",
"peak"
]
],
@@ -3239,7 +3074,7 @@
"any",
[
"in",
- "pmap:kind",
+ "kind",
"minor_road",
"other",
"path"
@@ -3248,7 +3083,7 @@
"layout": {
"symbol-sort-key": [
"get",
- "pmap:min_zoom"
+ "min_zoom"
],
"symbol-placement": "line",
"text-font": [
@@ -3267,15 +3102,15 @@
}
},
{
- "id": "physical_point_ocean",
+ "id": "pois_ocean",
"type": "symbol",
"source": "protomaps",
- "source-layer": "physical_point",
+ "source-layer": "pois",
"filter": [
"any",
[
"in",
- "pmap:kind",
+ "kind",
"sea",
"ocean",
"lake",
@@ -3315,15 +3150,15 @@
}
},
{
- "id": "physical_point_lakes",
+ "id": "pois_lakes",
"type": "symbol",
"source": "protomaps",
- "source-layer": "physical_point",
+ "source-layer": "water",
"filter": [
"any",
[
"in",
- "pmap:kind",
+ "kind",
"lake",
"water"
]
@@ -3368,8 +3203,7 @@
"any",
[
"in",
- "pmap:kind",
- "highway",
+ "kind",
"major_road",
"medium_road"
]
@@ -3377,7 +3211,7 @@
"layout": {
"symbol-sort-key": [
"get",
- "pmap:min_zoom"
+ "min_zoom"
],
"symbol-placement": "line",
"text-font": [
@@ -3402,13 +3236,13 @@
"source-layer": "places",
"filter": [
"==",
- "pmap:kind",
+ "kind",
"neighbourhood"
],
"layout": {
"symbol-sort-key": [
"get",
- "pmap:min_zoom"
+ "min_zoom"
],
"text-field": "{name}",
"text-font": [
@@ -3468,7 +3302,7 @@
"<",
[
"get",
- "pmap:min_zoom"
+ "min_zoom"
],
13
]
@@ -3476,7 +3310,7 @@
"layout": {
"symbol-sort-key": [
"get",
- "pmap:min_zoom"
+ "min_zoom"
],
"text-font": [
"Noto Sans Regular"
@@ -3520,7 +3354,7 @@
"source-layer": "places",
"filter": [
"==",
- "pmap:kind",
+ "kind",
"locality"
],
"paint": {
@@ -3542,7 +3376,7 @@
"source-layer": "places",
"filter": [
"==",
- "pmap:kind",
+ "kind",
"locality"
],
"layout": {
@@ -3553,7 +3387,7 @@
"<=",
[
"get",
- "pmap:min_zoom"
+ "min_zoom"
],
5
],
@@ -3600,7 +3434,7 @@
"<",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
13
],
@@ -3609,7 +3443,7 @@
">=",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
13
],
@@ -3623,7 +3457,7 @@
"<",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
13
],
@@ -3632,7 +3466,7 @@
">=",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
13
],
@@ -3646,7 +3480,7 @@
"<",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
12
],
@@ -3655,7 +3489,7 @@
">=",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
12
],
@@ -3669,7 +3503,7 @@
"<",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
11
],
@@ -3678,7 +3512,7 @@
">=",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
11
],
@@ -3692,7 +3526,7 @@
"<",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
9
],
@@ -3701,7 +3535,7 @@
">=",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
9
],
@@ -3715,7 +3549,7 @@
"<",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
8
],
@@ -3724,7 +3558,7 @@
">=",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
8
],
@@ -3775,13 +3609,13 @@
"source-layer": "places",
"filter": [
"==",
- "pmap:kind",
+ "kind",
"region"
],
"layout": {
"symbol-sort-key": [
"get",
- "pmap:min_zoom"
+ "min_zoom"
],
"text-field": [
"step",
@@ -3831,13 +3665,13 @@
"source-layer": "places",
"filter": [
"==",
- "pmap:kind",
+ "kind",
"country"
],
"layout": {
"symbol-sort-key": [
"get",
- "pmap:min_zoom"
+ "min_zoom"
],
"text-field": "{name}",
"text-font": [
@@ -3858,7 +3692,7 @@
"<",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
10
],
@@ -3867,7 +3701,7 @@
">=",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
10
],
@@ -3881,7 +3715,7 @@
"<",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
8
],
@@ -3890,7 +3724,7 @@
">=",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
8
],
@@ -3904,7 +3738,7 @@
"<",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
7
],
@@ -3913,7 +3747,7 @@
">=",
[
"get",
- "pmap:population_rank"
+ "population_rank"
],
7
],
diff --git a/src/assets/global-raster-layers.json b/src/assets/global-raster-layers.json
index 76788593c..22d7468b9 100644
--- a/src/assets/global-raster-layers.json
+++ b/src/assets/global-raster-layers.json
@@ -1,7 +1,7 @@
{
"layers": [
{
- "url": "pmtiles://https://api.protomaps.com/tiles/v3.json?key=2af8b969a9e8b692",
+ "url": "pmtiles://https://api.protomaps.com/tiles/v4.json?key=2af8b969a9e8b692",
"style": "assets/sunny.json",
"connect-src": [
"https://protomaps.github.io"
@@ -29,8 +29,8 @@
}
},
{
- "url": "pmtiles://https://api.protomaps.com/tiles/v3.json?key=2af8b969a9e8b692",
- "style": "https://api.protomaps.com/styles/v2/white.json?key=2af8b969a9e8b692",
+ "url": "pmtiles://https://api.protomaps.com/tiles/v4.json?key=2af8b969a9e8b692",
+ "style": "https://api.protomaps.com/styles/v5/white.json?key=2af8b969a9e8b692",
"connect-src": [
"https://protomaps.github.io"
],
@@ -44,8 +44,8 @@
}
},
{
- "url": "pmtiles://https://api.protomaps.com/tiles/v3.json?key=2af8b969a9e8b692",
- "style": "https://api.protomaps.com/styles/v2/light.json?key=2af8b969a9e8b692",
+ "url": "pmtiles://https://api.protomaps.com/tiles/v4.json?key=2af8b969a9e8b692",
+ "style": "https://api.protomaps.com/styles/v5/light/en.json?key=2af8b969a9e8b692",
"connect-src": [
"https://protomaps.github.io"
],
@@ -59,11 +59,11 @@
}
},
{
- "url": "pmtiles://https://api.protomaps.com/tiles/v3.json?key=2af8b969a9e8b692",
+ "url": "pmtiles://https://api.protomaps.com/tiles/v4.json?key=2af8b969a9e8b692",
"connect-src": [
"https://protomaps.github.io"
],
- "style": "https://api.protomaps.com/styles/v2/grayscale.json?key=2af8b969a9e8b692",
+ "style": "https://api.protomaps.com/styles/v5/grayscale.json?key=2af8b969a9e8b692",
"id": "protomaps.grayscale",
"name": "Protomaps Grayscale",
"type": "vector",
@@ -74,11 +74,11 @@
}
},
{
- "url": "pmtiles://https://api.protomaps.com/tiles/v3.json?key=2af8b969a9e8b692",
+ "url": "pmtiles://https://api.protomaps.com/tiles/v4.json?key=2af8b969a9e8b692",
"connect-src": [
"https://protomaps.github.io"
],
- "style": "https://api.protomaps.com/styles/v2/dark.json?key=2af8b969a9e8b692",
+ "style": "https://api.protomaps.com/styles/v5/dark.json?key=2af8b969a9e8b692",
"id": "protomaps.dark",
"name": "Protomaps Dark",
"type": "vector",
@@ -89,8 +89,8 @@
}
},
{
- "url": "pmtiles://https://api.protomaps.com/tiles/v3.json?key=2af8b969a9e8b692",
- "style": "https://api.protomaps.com/styles/v2/black.json?key=2af8b969a9e8b692",
+ "url": "pmtiles://https://api.protomaps.com/tiles/v4.json?key=2af8b969a9e8b692",
+ "style": "https://api.protomaps.com/styles/v5/black.json?key=2af8b969a9e8b692",
"connect-src": [
"https://protomaps.github.io"
],
@@ -104,7 +104,7 @@
}
},
{
- "url": "pmtiles://https://api.protomaps.com/tiles/v3.json?key=2af8b969a9e8b692",
+ "url": "pmtiles://https://api.protomaps.com/tiles/v4.json?key=2af8b969a9e8b692",
"style": "assets/sunny-unlabeled.json",
"connect-src": [
"https://protomaps.github.io"