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

@@ -129,7 +129,7 @@
"village"
]
],
"order": 193
"order": 199
},
{
"id": "place_town",
@@ -177,7 +177,7 @@
"town"
]
],
"order": 194
"order": 200
},
{
"id": "place_state",
@@ -228,7 +228,7 @@
3
]
],
"order": 195
"order": 201
},
{
"id": "place_city",
@@ -311,7 +311,7 @@
1
]
],
"order": 196
"order": 202
},
{
"id": "place_capital",
@@ -396,7 +396,7 @@
2
]
],
"order": 197
"order": 203
},
{
"id": "country_other",
@@ -449,7 +449,7 @@
"iso_a2"
]
],
"order": 198
"order": 204
},
{
"id": "country_3",
@@ -518,7 +518,7 @@
"iso_a2"
]
],
"order": 199
"order": 205
},
{
"id": "country_2",
@@ -587,7 +587,7 @@
"iso_a2"
]
],
"order": 200
"order": 206
},
{
"id": "country_1",
@@ -656,7 +656,7 @@
"iso_a2"
]
],
"order": 201
"order": 207
}
]
}