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

openmaptiles.yaml

@@ -19,7 +19,7 @@ tileset:
     - layers/landmarks/landmark.yaml
     - layers/aerodrome_label/aerodrome_label.yaml
   name: OpenMapTiles
-  version: 3.14.0
+  version: 3.15.0
   id: openmaptiles
   description: "A tileset showcasing all layers in OpenMapTiles. https://openmaptiles.org"
   attribution: '<a href="https://www.openmaptiles.org/" target="_blank">&copy; OpenMapTiles</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap contributors</a>'
@@ -100,6 +100,7 @@ tileset:
     - ta # Tamil
     - te # Telugu
     - th # Thai
+    - tok # Toki Pona
     - tr # Turkish, Latin
     - uk # Ukrainian
     - ur # Urdu