Merge remote-tracking branch 'github/master' into merge-gh-2025

# Conflicts:
#	layers/boundary/mapping.yaml
#	layers/mountain_peak/style.json
#	layers/place/style.json
#	layers/poi/poi.yaml
This commit is contained in:
2025-06-10 21:05:25 +02:00
84 changed files with 1714 additions and 874 deletions

View File

@@ -4529,37 +4529,21 @@
"all",
[
"==",
[
"geometry-type"
],
"$type",
"LineString"
],
[
"all",
[
"match",
[
"get",
"brunnel"
],
[
"bridge",
"tunnel"
],
false,
true
"!in",
"brunnel",
"bridge",
"tunnel"
],
[
"match",
[
"get",
"class"
],
[
"minor"
],
true,
false
"in",
"class",
"minor"
]
]
],
@@ -4633,37 +4617,21 @@
"all",
[
"==",
[
"geometry-type"
],
"$type",
"LineString"
],
[
"all",
[
"match",
[
"get",
"brunnel"
],
[
"bridge",
"tunnel"
],
false,
true
"!in",
"brunnel",
"bridge",
"tunnel"
],
[
"match",
[
"get",
"class"
],
[
"minor_construction"
],
true,
false
"in",
"class",
"minor_construction"
]
]
],
@@ -5607,7 +5575,7 @@
"stops": [
[
8,
" #787878"
"#787878"
],
[
14,
@@ -7834,4 +7802,4 @@
"order": 178
}
]
}
}