Merge pull request #1 from switch2osm/main

update from source

Author: Supaplextw

.github/workflows/exctarct-en-lang.yml .github/workflows/exctract-en-lang.yml.github/workflows/exctarct-en-lang.yml renamed to .github/workflows/exctract-en-lang.yml

@@ -14,18 +14,20 @@ 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"
+      # push back to the branch that triggered the workflow (safe default)
+      BRANCH: ${{ github.ref_name }}
 
     steps:
       - name: ⬇️ Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: 🧰 Set up yq
         uses: mikefarah/yq@v4
+        with:
+          cmd: yq
 
       - name: 📝 Update en.yml
         run: |
@@ -41,29 +43,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"

.github/workflows/test-pr.yml

@@ -9,8 +9,8 @@ jobs:
   test-pr:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - run: pip install -r requirements.txt

.github/workflows/update-languages-in-mkdocs.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: ⬇️ Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - 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
 

Dockerfile

@@ -1,5 +1,5 @@
 # ---- Build Stage ----
-FROM docker.io/python:3.13-bookworm AS builder
+FROM docker.io/python:3.14-bookworm AS builder
 
 # Create non-root user and set up environment
 RUN useradd -m builder && \

README.md

@@ -17,7 +17,7 @@ See the issues for things to work on.
 
   Exceptions are
   * planet.openstreetmap.org, for OSM data itself
-  * openstreetmapdata.com, for coastlines and other preprocessed data
+  * osmdata.openstreetmap.de, for coastlines and other preprocessed data
   * Natural Earth and other well-used public data sources
 
 ## Content technical needs ##

docs/assets/serving-tiles/debian13-deps.txt

@@ -0,0 +1,10 @@
+su -
+apt install \
+    sudo screen locate libapache2-mod-tile \
+    renderd git tar unzip wget bzip2 apache2 \
+    lua5.1 mapnik-utils python3-mapnik \
+    python3-psycopg2 python3-yaml gdal-bin \
+    node-carto postgresql postgresql-contrib \
+    postgis postgresql-17-postgis-3 \
+    postgresql-17-postgis-3-scripts osm2pgsql \
+    net-tools curl

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: [{ id: 'basics', url: "/sprites/basics/sprites" }],
+    tiles: ["https://vector.openstreetmap.org/shortbread_v1/{z}/{x}/{y}.mvt"]
+});
+writeFileSync("release/style.json", JSON.stringify(style));

docs/en/en.yml

@@ -33,6 +33,8 @@ en:
               # Menu item name for the side menu
               OpenLayers: Getting started with OpenLayers
               # Menu item name for the side menu
+              MapLibre: Getting started with MapLibre GL
+              # Menu item name for the side menu
               Vector Tiles: Power of Vector Map Tiles
               # Menu item name for the "Serving Tiles" tab
               Serving: Serving Tiles

docs/en/serving-tiles/index.md

@@ -20,7 +20,7 @@ If you are setting up your own tile server, we recommend that you use [Ubuntu Li
 
 ## The options
 
-1. Install locally on [Debian 12](manually-building-a-tile-server-debian-12.md), [Ubuntu 24.04](manually-building-a-tile-server-ubuntu-24-04-lts.md), or [Debian 11](manually-building-a-tile-server-debian-11.md).
+1. Install locally on [Debian 13](manually-building-a-tile-server-debian-13.md), [Debian 12](manually-building-a-tile-server-debian-12.md), [Ubuntu 24.04](manually-building-a-tile-server-ubuntu-24-04-lts.md), or [Debian 11](manually-building-a-tile-server-debian-11.md).
 
 2. Use [docker](using-a-docker-container.md).
 
@@ -31,7 +31,7 @@ Serving your own maps is a fairly intensive task. Depending on the size of the a
 We would recommend that you begin with extracts of OpenStreetMap data – for example, a city, county or small country – rather than spending a week importing the whole world (planet.osm) and then having to restart because of a configuration mistake! You can download extracts from:
 
 * [Geofabrik](https://download.geofabrik.de/){: target=_blank} (countries and provinces)
-* [Protomaps Extracts](https://protomaps.com/extracts){: target=_blank} (minutely-updated cities and small countries)
+* [slice.openstreetmap.us](https://slice.openstreetmap.us){: target=_blank} (minutely-updated cities and small countries)
 * [download.openstreetmap.fr](https://download.openstreetmap.fr/){: target=_blank}
 
 ## The toolchain

docs/en/serving-tiles/manually-building-a-tile-server-debian-11.md

@@ -126,7 +126,7 @@ Now that all of the necessary software is installed, you will need to download a
 
 The style we'll use here is the one that use by the "standard" map on the openstreetmap.org website. It's chosen because it's well documented, and should work anywhere in the world (including in places with non-latin placenames). There are a couple of downsides though - it's very much a compromise designed to work globally, and it's quite complicated to understand and modify, should you need to do that.
 
-The home of "OpenStreetMap Carto" on the web is <https://github.com/gravitystorm/openstreetmap-carto/>{: target=_blank}, and it has it's own installation instructions at <https://github.com/gravitystorm/openstreetmap-carto/blob/master/INSTALL.md>{: target=_blank}, although we'll cover everything that needs to be done here.
+The home of "OpenStreetMap Carto" on the web is <https://github.com/gravitystorm/openstreetmap-carto/>{: target=_blank}, and it has its own installation instructions at <https://github.com/gravitystorm/openstreetmap-carto/blob/master/INSTALL.md>{: target=_blank}, although we'll cover everything that needs to be done here.
 
 Here we're assuming that we're storing the stylesheet details in a directory below `~/src` below the home directory of the whichever non-root account you are using: