elgaard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix major and medium road bridges rendering

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-03-25 13:27:17 +01:00
parent efb02d3f54
commit 24fd638619
2 changed files with 121 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

137
public/assets/sunny.json
View file

@ -63,7 +63,6 @@
"fill-color": "#f0ead9" "fill-color": "#f0ead9"
} }
}, },
{ {
"id": "landuse_park", "id": "landuse_park",
"type": "fill", "type": "fill",
@ -289,7 +288,6 @@
] ]
} }
}, },
{ {
"id": "natural_scrub", "id": "natural_scrub",
"type": "fill", "type": "fill",
@ -346,7 +344,6 @@
"fill-color": "#e2e0d7" "fill-color": "#e2e0d7"
} }
}, },
{ {
"id": "landuse_park_line", "id": "landuse_park_line",
"type": "line", "type": "line",
@ -383,8 +380,6 @@
] ]
} }
}, },
{ {
"id": "landuse_aerodrome", "id": "landuse_aerodrome",
"type": "fill", "type": "fill",
@ -1147,7 +1142,6 @@
"fill-opacity": 0.5 "fill-opacity": 0.5
} }
}, },
{ {
"id": "transit_pier", "id": "transit_pier",
"type": "line", "type": "line",
@ -1878,14 +1872,19 @@
] ]
], ],
"paint": { "paint": {
"line-color":[ "line-color": [
"interpolate", "interpolate",
["linear"], [
["zoom"], "linear"
],
[
"zoom"
],
8, 8,
"#f9d9b5", "#f9d9b5",
18, 18,
"#f9b9a5"], "#f9b9a5"
],
"line-width": [ "line-width": [
"interpolate", "interpolate",
[ [
@ -2084,7 +2083,6 @@
] ]
} }
}, },
{ {
"id": "boundaries_country", "id": "boundaries_country",
"type": "line", "type": "line",
@ -2499,6 +2497,47 @@
] ]
} }
}, },
{
"id": "roads_bridges_medium_line_around",
"type": "line",
"source": "protomaps",
"source-layer": "roads",
"minzoom": 12,
"filter": [
"all",
[
">",
"pmap:level",
0
],
[
"==",
"pmap:kind",
"medium_road"
]
],
"paint": {
"line-color": "#7c6644",
"line-width": [
"interpolate",
[
"exponential",
1.6
],
[
"zoom"
],
7,
0,
12,
3.2,
15,
6,
18,
17
]
}
},
{ {
"id": "roads_bridges_medium", "id": "roads_bridges_medium",
"type": "line", "type": "line",
@ -2519,7 +2558,59 @@
] ]
], ],
"paint": { "paint": {
"line-color": "#f0eded", "line-color": "#fcd6a4",
"line-width": [
"interpolate",
[
"exponential",
1.6
],
[
"zoom"
],
7,
0,
12,
1.2,
15,
3,
18,
13
]
}
},
{
"id": "roads_bridges_major_line_around",
"type": "line",
"source": "protomaps",
"source-layer": "roads",
"filter": [
"all",
[
">",
"pmap:level",
0
],
[
"==",
"pmap:kind",
"major_road"
]
],
"paint": {
"line-color": [
"interpolate",
[
"linear"
],
[
"zoom"
],
8,
"#a98985",
18,
"#a97975"
],
"line-width": [ "line-width": [
"interpolate", "interpolate",
[ [
@ -2529,14 +2620,14 @@
[ [
"zoom" "zoom"
], ],
7, 6,
0, 0,
12, 12,
1.2, 3.6,
15, 15,
3, 6,
18, 18,
13 18
] ]
} }
}, },
@ -2560,7 +2651,19 @@
] ]
], ],
"paint": { "paint": {
"line-color": "#f5f5f5", "line-color": [
"interpolate",
[
"linear"
],
[
"zoom"
],
8,
"#f9d9b5",
18,
"#f9b9a5"
],
"line-width": [ "line-width": [
"interpolate", "interpolate",
[ [

2
src/UI/Test.svelte
View file

@ -12,7 +12,7 @@
lon: 3.1929, lat: 51.2190 lon: 3.1929, lat: 51.2190
}), }),
zoom: UIEventSource.asFloat(QueryParameters.GetQueryParameter("z", 13+"")), zoom: UIEventSource.asFloat(QueryParameters.GetQueryParameter("z", 13+"")),
rasterLayer: new UIEventSource(AvailableRasterLayers.globalLayers.at(-1)) rasterLayer: new UIEventSource(AvailableRasterLayers.globalLayers.at(5))
}) })
</script> </script>