sync upstream

Andygol · Andygol · commit 6f14b0629728 · 2025-10-03T22:03:07.000+03:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,3 +8,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -0,0 +1,30 @@
+name: container
+
+on:
+  push:
+    branches:
+      - '**'
+      - '!dependabot/**'
+    tags:
+      - 'v*.*.*'
+  pull_request:
+    branches:
+      - 'master'
+      - 'main'
+      - 'gh-pages'
+  schedule:
+    - cron: '25 3 */7 * *'
+  workflow_dispatch:
+  repository_dispatch:
+    types: [trigger-deploy]
+
+concurrency:
+  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  container-build:
+    permissions:
+      contents: read
+      packages: write
+    uses: openstreetmap/github-shared-workflows/.github/workflows/container-build-publish.yml@main
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
diff --git a/.github/workflows/exctarct-en-lang.yml b/.github/workflows/exctarct-en-lang.yml
@@ -14,15 +14,13 @@ jobs:
   update-en-yml:
     name: Process changes in English menu items
     runs-on: ubuntu-latest
-    outputs:
-      has_changes: ${{ steps.check_changes.outputs.has_changes }}
     env:
       MKDOCS_FILE: "mkdocs.yml"
       TARGET_FILE: "./docs/en/en.yml"
 
     steps:
       - name: ⬇️ Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - name: 🧰 Set up yq
         uses: mikefarah/yq@v4
@@ -41,29 +39,22 @@ jobs:
 
           rm "$TMP_FILE"
 
-      - name: Check if something has been changed in en.yaml
-        id: check_changes
+      - name: Commit ${{ env.TARGET_FILE }} if changed
         run: |
-          if git diff-index --quiet HEAD -- "${TARGET_FILE}"; then
-            echo "No changes detected in ${TARGET_FILE}"
-            echo "has_changes=false" >> $GITHUB_OUTPUT
-          else
-            echo "Changes detected in ${TARGET_FILE}"
-            echo "Git diff output:"
-            git diff HEAD -- "${TARGET_FILE}" || true
-            echo "has_changes=true" >> $GITHUB_OUTPUT
-          fi
+          set -euo pipefail
 
-      - name: Commit changes
-        if: steps.check_changes.outputs.has_changes == 'true'
-        run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add "${TARGET_FILE}"
-          git commit -m "Changes in ${TARGET_FILE}"
-          git push
 
-      - name: No changes detected
-        if: steps.check_changes.outputs.has_changes == 'false'
-        run: |
-          echo "No changes to commit."
+          # Stage first, then check what's actually pending
+          [ -f "$TARGET_FILE" ] && git add -- "$TARGET_FILE" || true
+
+          # Nothing staged? clean exit.
+          if [ -z "$(git status --porcelain -- "$TARGET_FILE")" ]; then
+            echo "No changes to commit for $TARGET_FILE"
+            exit 0
+          fi
+
+          git commit -m "Changes in $TARGET_FILE"
+
+          git push origin "$BRANCH"
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -9,8 +9,8 @@ jobs:
   test-pr:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - run: pip install -r requirements.txt
diff --git a/.github/workflows/update-languages-in-mkdocs.yml b/.github/workflows/update-languages-in-mkdocs.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: ⬇️ Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - name: 🧰 Set up yq
         uses: mikefarah/yq@v4
@@ -146,7 +146,7 @@ jobs:
 
       - name: 🚀 Trigger deploy workflow
         if: steps.check_changes.outputs.has_changes == 'true'
-        uses: peter-evans/repository-dispatch@v3
+        uses: peter-evans/repository-dispatch@v4
         with:
           event-type: trigger-deploy
 
diff --git a/docs/assets/using-tiles/build.ts b/docs/assets/using-tiles/build.ts
@@ -0,0 +1,10 @@
+import { colorful } from "@versatiles/style";
+import { writeFileSync } from "node:fs";
+
+const style = colorful({
+    baseUrl: "https://example.com",
+    glyphs: "/fonts/{fontstack}/{range}.pbf",
+    sprite: "/sprites/basics/sprites",
+    tiles: ["https://vector.openstreetmap.org/shortbread_v1/{z}/{x}/{y}.mvt"]
+});
+writeFileSync("release/style.json", JSON.stringify(style));
diff --git a/docs/en/serving-tiles/updating-as-people-edit-pyosmium.md b/docs/en/serving-tiles/updating-as-people-edit-pyosmium.md
@@ -50,7 +50,7 @@ sudo -u _renderd \
     ~/data/greater-london-latest.osm.pbf
 ```
 
-The data to load was obtained from a page such as [this one](http://download.geofabrik.de/europe/great-britain/england/greater-london.html){: target=_blank}, which says something like "... and contains all OSM data up to 2023-07-02T20:21:43Z". We'll use that date when setting up replication below:
+The data to load was obtained from a page such as [this one](http://download.geofabrik.de/europe/united-kingdom/england/greater-london.html){: target=_blank}, which says something like "... and contains all OSM data up to 2023-07-02T20:21:43Z". We'll use that date when setting up replication below:
 
 ```sh
 sudo mkdir /var/cache/renderd/pyosmium
diff --git a/docs/en/serving-tiles/using-a-docker-container.md b/docs/en/serving-tiles/using-a-docker-container.md
@@ -31,10 +31,10 @@ docker volume create osm-data
 
 And install it and import the data:
 
-```sh 
+```sh
 time \
     docker run \
-    -v /home/renderaccount/zambia-latest.osm.pbf:/region.osm.pbf \
+    -v /home/renderaccount/zambia-latest.osm.pbf:/data/region.osm.pbf \
     -v osm-data:/data/database/ \
     overv/openstreetmap-tile-server import
 ```
diff --git a/docs/en/using-tiles/getting-started-with-maplibre.md b/docs/en/using-tiles/getting-started-with-maplibre.md
@@ -0,0 +1,93 @@
+---
+layout: docs
+title: Getting started with MapLibre GL
+---
+
+# {{ title }}
+
+## Introduction
+
+[MapLibre GL JS](https://maplibre.org/maplibre-gl-js/docs/){: target=blank} is a TypeScript library that uses WebGL for embedding maps. It uses a permissive BSD open-source license so can be incorporated into any site without legal worries. Its source code is available on [GitHub](https://github.com/maplibre/maplibre-gl-js/){: target=blank}.
+
+Here, we restrict ourselves to a small, self-contained example and refer to the official [tutorials](https://maplibre.org/maplibre-gl-js/docs/examples/){: target=blank} and [documentation](https://maplibre.org/maplibre-gl-js/docs/API/){: target=blank} for elaborate usages.
+
+## Getting started
+
+Displaying a map requires three things: a data source, map style, and site to host them all. We're going to use the OpenStreetMap Foundation Shortbread tiles, the Versatiles Colorful style, and a website you'll run.
+
+!!! info "Hosting"
+    Some browser features require a page is served from a secure location. This is a website with HTTPS or your local computer. We're assuming you have a web host for "example.com" that lets you serve files from disk and that you know how to copy files to the web host.
+
+## Software Installation
+
+We need Node.js 18 or later. If you have Ubuntu 24.04 or later or Debian 12 or later, you can install these with
+
+```sh
+sudo apt-get install nodejs
+```
+
+For other operating systems consult their documentation. You can check the version of Node.js you have with `node --version`. If it's below 18 you will need to install your own version of Node. One way to do this is with [nvm](https://github.com/nvm-sh/nvm).
+
+## Building the style
+
+We're going to be using the VersaTiles colorful style, a basic style which uses Shortbread tiles. The Shortbread vector tile schema is a general-purpose vector tile schema for OpenStreetMap data. To get the tiles we're going to use the OpenStreetMap Foundation's Shortbread tile service.
+
+!!! info ""
+    Usage of the vector tiles is governed by the [vector tile usage policy](https://operations.osmfoundation.org/policies/vector/). This web page will meet the requirements, but there is no SLA or guarantee with the vector tile service. If you need these you should host them yourself or use a commercial host.
+
+A style requires a style definition, sprite files for any icons, and glyph files for any fonts. We're going to build the style definition to point to our own sprite and glyph files.
+
+Start by making a new directory to store the files you'll be creating. We'll call it "style" in the documentation, but it can be whatever you want. Inside this directory we're going to build all the files we need and place them in a "release" subdirectory
+
+```sh
+mkdir style
+cd style
+mkdir release
+```
+
+Building sprites and glyphs can be a complicated process, but because we don't need to modify them we're going to use pre-built ones
+
+```sh
+curl -OL https://github.com/versatiles-org/versatiles-style/releases/download/v5.7.0/sprites.tar.gz
+mkdir -p release/sprites
+tar -C release/sprites -xzf sprites.tar.gz
+
+curl -OL https://github.com/versatiles-org/versatiles-fonts/releases/download/v2.0.0/fonts.tar.gz
+mkdir -p release/fonts
+tar -C release/fonts -xzf fonts.tar.gz
+```
+
+We now need to build the style so it uses our new copy of the glyphs and sprites.
+
+Copy the following content to a file [build.ts](build.ts){: target=_blank}, but change "example.com" to the URL that you will serve the tiles from, including your domain name
+
+```ts title="build.ts"
+--8<-- "docs/assets/using-tiles/build.ts"
+```
+
+In the same directory install TypeScript and the VersaTiles styles, then run the script above to build your style.
+
+```sh
+npm install tsx @versatiles/style@~5.7.0
+node_modules/.bin/tsx build.ts
+```
+
+Copy the following content to a file [maplibre.html](maplibre.html){: target=_blank} and put it in the release directory
+
+```html title="maplibre.html"
+--8<-- "docs/en/using-tiles/maplibre.html"
+```
+
+## Releasing the style
+
+py the contents of the "release" directory to the location that you chose earlier, that you will serve the files from. Common ways of doing this are with a scp or rsync command, or through a web interface.
+
+## Common problems
+
+### `node_modules/.bin/tsx build.ts` fails to run
+
+If you have an outdated version of node, this command will fail to run. You can fix this by installing an up-to-date version with nvm as described earlier.
+
+### Nothing loads on the web page
+
+Open your browser's Developer Tools and look at the console. The most common cause of nothing displaying is incorrect URLs.
diff --git a/docs/en/using-tiles/index.md b/docs/en/using-tiles/index.md
@@ -16,6 +16,8 @@ Unlike commercial online map providers, OpenStreetMap does not provide an “off
 
 [Getting started with Openlayers – a full feature library for web maps](/using-tiles/getting-started-with-openlayers.md)
 
+[Getting started with Maplibre](/using-tiles/getting-started-with-maplibre.md)
+
 ## Choosing a tile provider
 
 Apart from very limited testing purposes, you should not use the tiles supplied by OpenStreetMap.org itself. OpenStreetMap is a volunteer-run non-profit body and cannot supply tiles for large-scale commercial use. Rather, you should use a third party provider that makes tiles from OSM data, or generate your own.
diff --git a/docs/en/using-tiles/leaflet.html b/docs/en/using-tiles/leaflet.html
@@ -3,8 +3,8 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"></script>
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css" />
+    <script src="https://unpkg.com/leaflet@1.9/dist/leaflet.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9/dist/leaflet.css" />
     <style>
       html, body {
         height: 100%;
@@ -37,4 +37,4 @@
       L.marker({lon: 0, lat: 0}).bindPopup('The center of the world').addTo(map);
     </script>
   </body>
-</html>
+</html>
diff --git a/docs/en/using-tiles/maplibre.html b/docs/en/using-tiles/maplibre.html
diff --git a/docs/uk/using-tiles/leaflet.html b/docs/uk/using-tiles/leaflet.html
diff --git a/mkdocs.yml b/mkdocs.yml
