Robin-van-der-Linde/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

More fixes to sunny

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-03-26 14:56:47 +01:00
parent 22ad278acb
commit 62ad2351c9
2 changed files with 165 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

344
public/assets/sunny.json
View file

@ -1667,7 +1667,19 @@
] ]
], ],
"paint": { "paint": {
"line-color": "#ffffff", "line-color": [
"interpolate",
[
"linear"
],
[
"zoom"
],
8,
"#f9d9b5",
18,
"#f9b9a5"
],
"line-width": [ "line-width": [
"interpolate", "interpolate",
[ [
@ -1677,12 +1689,14 @@
[ [
"zoom" "zoom"
], ],
13, 6,
0, 0,
13.5, 12,
1, 1.6,
15,
3,
18, 18,
11 13
] ]
} }
}, },
@ -2481,7 +2495,7 @@
} }
}, },
{ {
"id": "roads_bridges_other", "id": "roads_bridges_medium_outline",
"type": "line", "type": "line",
"source": "protomaps", "source": "protomaps",
"source-layer": "roads", "source-layer": "roads",
@ -2494,17 +2508,64 @@
0 0
], ],
[ [
"in", "==",
"pmap:kind", "pmap:kind",
"other", "medium_road"
"path"
] ]
], ],
"paint": { "paint": {
"line-color": "#ebebeb", "line-color": "#7c6644",
"line-dasharray": [ "line-width": [
2, "interpolate",
1 [
"exponential",
1.6
],
[
"zoom"
],
7,
0,
12,
3.2,
15,
6,
18,
17
]
}
},
{
"id": "roads_bridges_major_outline",
"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",
@ -2515,13 +2576,77 @@
[ [
"zoom" "zoom"
], ],
14, 6,
0, 0,
20, 12,
7 3.6,
15,
6,
18,
18
] ]
} }
}, },
{
"id": "roads_bridges_highway",
"type": "line",
"source": "protomaps",
"source-layer": "roads",
"filter": [
"all",
[
">",
"pmap:level",
0
],
[
"==",
"pmap:kind",
"highway"
],
[
"!=",
"pmap:link",
1
]
],
"paint": {
"line-color": [
"interpolate",
[
"linear"
],
[
"zoom"
],
8,
"#f9d9b5",
18,
"#f9b9a5"
],
"line-width": [
"interpolate",
[
"exponential",
1.6
],
[
"zoom"
],
6,
0,
12,
1.6,
15,
3,
18,
13
]
}
},
{ {
"id": "roads_bridges_minor", "id": "roads_bridges_minor",
"type": "line", "type": "line",
@ -2583,46 +2708,19 @@
] ]
], ],
"paint": { "paint": {
"line-color": "#ffffff", "line-color": [
"line-width": [
"interpolate", "interpolate",
[ [
"exponential", "linear"
1.6
], ],
[ [
"zoom" "zoom"
], ],
13, 8,
0, "#f9d9b5",
13.5,
1,
18, 18,
11 "#f9b9a5"
]
}
},
{
"id": "roads_bridges_medium_outline",
"type": "line",
"source": "protomaps",
"source-layer": "roads",
"minzoom": 12,
"filter": [
"all",
[
">",
"pmap:level",
0
], ],
[
"==",
"pmap:kind",
"medium_road"
]
],
"paint": {
"line-color": "#7c6644",
"line-width": [ "line-width": [
"interpolate", "interpolate",
[ [
@ -2632,17 +2730,18 @@
[ [
"zoom" "zoom"
], ],
7, 6,
0, 0,
12, 12,
3.2, 1.6,
15, 15,
6, 3,
18, 18,
17 13
] ]
} }
}, },
{ {
"id": "roads_bridges_medium", "id": "roads_bridges_medium",
"type": "line", "type": "line",
@ -2684,59 +2783,7 @@
] ]
} }
}, },
{ {
"id": "roads_bridges_major_outline",
"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": [
"interpolate",
[
"exponential",
1.6
],
[
"zoom"
],
6,
0,
12,
3.6,
15,
6,
18,
18
]
}
},
{
"id": "roads_bridges_major", "id": "roads_bridges_major",
"type": "line", "type": "line",
"source": "protomaps", "source": "protomaps",
@ -2789,8 +2836,9 @@
] ]
} }
}, },
{ {
"id": "roads_bridges_highway_casing", "id": "roads_bridges_other",
"type": "line", "type": "line",
"source": "protomaps", "source": "protomaps",
"source-layer": "roads", "source-layer": "roads",
@ -2803,33 +2851,17 @@
0 0
], ],
[ [
"==", "in",
"pmap:kind", "pmap:kind",
"highway" "other",
], "path"
[
"!=",
"pmap:link",
1
] ]
], ],
"paint": { "paint": {
"line-color": "#e0e0e0", "line-color": "#ebebeb",
"line-gap-width": [ "line-dasharray": [
"interpolate", 2,
[ 1
"exponential",
1.6
],
[
"zoom"
],
3,
0,
3.5,
0.5,
18,
15
], ],
"line-width": [ "line-width": [
"interpolate", "interpolate",
@ -2840,62 +2872,14 @@
[ [
"zoom" "zoom"
], ],
7, 14,
0, 0,
7.5,
1,
20, 20,
15 7
]
}
},
{
"id": "roads_bridges_highway",
"type": "line",
"source": "protomaps",
"source-layer": "roads",
"filter": [
"all",
[
">",
"pmap:level",
0
],
[
"==",
"pmap:kind",
"highway"
],
[
"!=",
"pmap:link",
1
]
],
"paint": {
"line-color": "#ffffff",
"line-width": [
"interpolate",
[
"exponential",
1.6
],
[
"zoom"
],
3,
0,
6,
1.1,
12,
1.6,
15,
5,
18,
15
] ]
} }
}, },
{ {
"id": "physical_line_waterway_label", "id": "physical_line_waterway_label",
"type": "symbol", "type": "symbol",

2
src/UI/Test.svelte
View file

@ -9,7 +9,7 @@
const map = new UIEventSource<MlMap>(undefined) const map = new UIEventSource<MlMap>(undefined)
const mla = new MapLibreAdaptor(map, { const mla = new MapLibreAdaptor(map, {
location: new UIEventSource<{ lon: number; lat: number }>({ location: new UIEventSource<{ lon: number; lat: number }>({
lon: 3.1929, lat: 51.2190 lat: 51.0323, lon: 3.7416
}), }),
zoom: UIEventSource.asFloat(QueryParameters.GetQueryParameter("z", 13+"")), zoom: UIEventSource.asFloat(QueryParameters.GetQueryParameter("z", 13+"")),
rasterLayer: new UIEventSource(AvailableRasterLayers.globalLayers.at(5)) rasterLayer: new UIEventSource(AvailableRasterLayers.globalLayers.at(5))