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

--amend

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-04-16 13:06:22 +02:00
parent 42ded4c1b1
commit 85c2b4c364
3 changed files with 260 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

13
package-lock.json generated
View file

@ -7,6 +7,7 @@
"": { "": {
"name": "mapcomplete", "name": "mapcomplete",
"version": "0.51.0", "version": "0.51.0",
"hasInstallScript": true,
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"@capacitor/android": "^6.1.2", "@capacitor/android": "^6.1.2",
@ -12758,9 +12759,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001705", "version": "1.0.30001713",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001705.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz",
"integrity": "sha512-S0uyMMiYvA7CxNgomYBwwwPUnWzFD83f3B1ce5jHUfHTH//QL6hHsreI8RVC5606R4ssqravelYO5TU6t8sEyg==", "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -39214,9 +39215,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001705", "version": "1.0.30001713",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001705.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz",
"integrity": "sha512-S0uyMMiYvA7CxNgomYBwwwPUnWzFD83f3B1ce5jHUfHTH//QL6hHsreI8RVC5606R4ssqravelYO5TU6t8sEyg==", "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
"dev": true "dev": true
}, },
"canonicalize": { "canonicalize": {

283
public/assets/sunny-unlabeled.json
View file

@ -600,9 +600,8 @@
"river" "river"
], ],
[ [
"<", "has",
"level", "is_tunnel"
0
] ]
], ],
"layout": { "layout": {
@ -674,9 +673,8 @@
"filter": [ "filter": [
"all", "all",
[ [
"<", "has",
"level", "is_tunnel"
0
], ],
[ [
"in", "in",
@ -703,6 +701,98 @@
] ]
} }
}, },
{
"id": "roads_tunnels_footway_casing_outer",
"type": "line",
"source": "protomaps",
"source-layer": "roads",
"filter": [
"all",
[
"has",
"is_tunnel"
],
[
"!has",
"is_bridge"
],
[
"in",
"kind",
"other",
"path"
],
[
"in",
"kind_detail",
"footway",
"cycleway"
]
],
"paint": {
"line-color": "#888888",
"line-width": [
"interpolate",
[
"exponential",
1.6
],
[
"zoom"
],
14,
0,
20,
9
]
}
},
{
"id": "roads_tunnels_footway_casing_inner",
"type": "line",
"source": "protomaps",
"source-layer": "roads",
"filter": [
"all",
[
"has",
"is_tunnel"
],
[
"!has",
"is_bridge"
],
[
"in",
"kind",
"other",
"path"
],
[
"in",
"kind_detail",
"footway",
"cycleway"
]
],
"paint": {
"line-color": "#ffffff",
"line-width": [
"interpolate",
[
"exponential",
1.6
],
[
"zoom"
],
14,
0,
20,
8
]
}
},
{ {
"id": "roads_tunnels_minor_casing", "id": "roads_tunnels_minor_casing",
"type": "line", "type": "line",
@ -711,9 +801,8 @@
"filter": [ "filter": [
"all", "all",
[ [
"<", "has",
"level", "is_tunnel"
0
], ],
[ [
"==", "==",
@ -769,9 +858,8 @@
"filter": [ "filter": [
"all", "all",
[ [
"<", "has",
"level", "is_tunnel"
0
], ],
[ [
"==", "==",
@ -825,9 +913,8 @@
"filter": [ "filter": [
"all", "all",
[ [
"<", "has",
"level", "is_tunnel"
0
], ],
[ [
"==", "==",
@ -881,9 +968,8 @@
"filter": [ "filter": [
"all", "all",
[ [
"<", "has",
"level", "is_tunnel"
0
], ],
[ [
"==", "==",
@ -944,15 +1030,24 @@
"filter": [ "filter": [
"all", "all",
[ [
"<", "has",
"level", "is_tunnel"
0
], ],
[ [
"in", "in",
"kind", "kind",
"other", "other",
"path" "path"
],
[
"!=",
"kind_detail",
"footway"
],
[
"!=",
"kind_detail",
"cycleway"
] ]
], ],
"paint": { "paint": {
@ -977,6 +1072,96 @@
] ]
} }
}, },
{
"id": "roads_tunnels_footway",
"type": "line",
"source": "protomaps",
"source-layer": "roads",
"filter": [
"all",
[
"has",
"is_tunnel"
],
[
"in",
"kind",
"other",
"path"
],
[
"==",
"kind_detail",
"footway"
]
],
"paint": {
"line-color": "#d46710",
"line-dasharray": [
4,
1
],
"line-width": [
"interpolate",
[
"exponential",
1.6
],
[
"zoom"
],
14,
0,
20,
5
]
}
},
{
"id": "roads_tunnels_cycleway",
"type": "line",
"source": "protomaps",
"source-layer": "roads",
"filter": [
"all",
[
"has",
"is_tunnel"
],
[
"in",
"kind",
"other",
"path"
],
[
"==",
"kind_detail",
"cycleway"
]
],
"paint": {
"line-color": "#6099c9",
"line-dasharray": [
4,
1
],
"line-width": [
"interpolate",
[
"exponential",
1.6
],
[
"zoom"
],
14,
0,
20,
5
]
}
},
{ {
"id": "roads_tunnels_minor", "id": "roads_tunnels_minor",
"type": "line", "type": "line",
@ -985,9 +1170,8 @@
"filter": [ "filter": [
"all", "all",
[ [
"<", "has",
"level", "is_tunnel"
0
], ],
[ [
"==", "==",
@ -1025,9 +1209,8 @@
"filter": [ "filter": [
"all", "all",
[ [
"<", "has",
"level", "is_tunnel"
0
], ],
[ [
"==", "==",
@ -1063,9 +1246,8 @@
"filter": [ "filter": [
"all", "all",
[ [
"<", "has",
"level", "is_tunnel"
0
], ],
[ [
"==", "==",
@ -1245,7 +1427,20 @@
"source-layer": "buildings", "source-layer": "buildings",
"paint": { "paint": {
"fill-color": "#cccccc", "fill-color": "#cccccc",
"fill-opacity": 0.5 "fill-opacity": 0.7,
"fill-outline-color": [
"interpolate",
[
"linear"
],
[
"zoom"
],
15,
"#cccccc",
18,
"#aaaaaa"
]
} }
}, },
{ {
@ -1364,7 +1559,21 @@
] ]
], ],
"paint": { "paint": {
"line-color": "#e0e0e0", "line-color": [
"interpolate",
[
"linear"
],
[
"zoom"
],
12,
"#dddddd",
14,
"#aaaaaa",
18,
"#888888"
],
"line-gap-width": [ "line-gap-width": [
"interpolate", "interpolate",
[ [
@ -2957,6 +3166,16 @@
"kind", "kind",
"other", "other",
"path" "path"
],
[
"!=",
"kind_detail",
"cycleway"
],
[
"!=",
"kind_detail",
"footway"
] ]
], ],
"paint": { "paint": {

6
test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts
View file

@ -10,9 +10,7 @@ import { Tag } from "../../../../src/Logic/Tags/Tag"
import { DesugaringContext } from "../../../../src/Models/ThemeConfig/Conversion/Conversion" import { DesugaringContext } from "../../../../src/Models/ThemeConfig/Conversion/Conversion"
import { And } from "../../../../src/Logic/Tags/And" import { And } from "../../../../src/Logic/Tags/And"
import { describe, expect, it } from "vitest" import { describe, expect, it } from "vitest"
import { import { QuestionableTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson"
QuestionableTagRenderingConfigJson
} from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson"
import Constants from "../../../../src/Models/Constants" import Constants from "../../../../src/Models/Constants"
import { ConversionContext } from "../../../../src/Models/ThemeConfig/Conversion/ConversionContext" import { ConversionContext } from "../../../../src/Models/ThemeConfig/Conversion/ConversionContext"
import { MinimalTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/TagRenderingConfigJson" import { MinimalTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/TagRenderingConfigJson"
@ -55,7 +53,7 @@ function constructSharedLayers(): Map<string, LayerConfigJson> {
tagRenderings: null, tagRenderings: null,
lineRendering: null, lineRendering: null,
title: null, title: null,
source: "special" source: "special",
}) })
for (const defaultLayer of Constants.added_by_default) { for (const defaultLayer of Constants.added_by_default) {
sharedLayers.set(defaultLayer, <LayerConfigJson>{ sharedLayers.set(defaultLayer, <LayerConfigJson>{