Merge pull request #273 from pgRouting/develop

Updating workshop to New Zeland 2025

Author: cvvergara

.github/scripts/update_locale.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# ------------------------------------------------------------------------------
 # /*PGR-GNU*****************************************************************
 # File: update_locale.sh
 # Copyright (c) 2021 pgRouting developers
@@ -17,32 +16,34 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 # ********************************************************************PGR-GNU*/
-# ------------------------------------------------------------------------------
 
 DIR=$(git rev-parse --show-toplevel)
 
 pushd "${DIR}" > /dev/null || exit 1
 
 mkdir -p build
 pushd build > /dev/null || exit 1
-cmake -DLOCALE=ON ..
+cmake -DBUILD_HTML=OFF -DBUILD_LOCALE=ON ..
 
 make locale
 popd > /dev/null || exit 1
 
 # List all the files that needs to be committed in build/docs/locale_changes.txt
 awk '/^Update|^Create/{print $2}' build/docs/locale_changes.txt > build/docs/locale_changes_po.txt # .po files
 cp build/docs/locale_changes_po.txt build/docs/locale_changes_po_pot.txt
-perl -ne '/\/en\// && print' build/docs/locale_changes_po.txt | \
+
+if [ -s build/docs/locale_changes_po.txt ]; then
+
+  perl -ne '/\/en\// && print' build/docs/locale_changes_po.txt | \
     perl -pe 's/(.*)en\/LC_MESSAGES(.*)/$1pot$2t/' >> build/docs/locale_changes_po_pot.txt  # .pot files
 
-# Do not create empty translation files
-git status locale/es --porcelain | awk 'match($1, "?"){print $2}' | xargs -r rm -rf
-git status locale/ja --porcelain | awk 'match($1, "?"){print $2}' | xargs -r rm -rf
+fi
 
 # Remove obsolete entries #~ from .po files
-bash .github/scripts/remove_obsolete_entries.sh
+find locale -type f -name '*.po' -exec sh -c '
+    msgattrib --no-obsolete -o "$1" "$1"
+  ' sh {} \;
 
-cat build/docs/locale_changes_po_pot.txt | xargs -I {} sh -c "(ls {}  >> /dev/null 2>&1 && git add {} )"
+while read -r f; do git add "$f"; done < build/docs/locale_changes_po_pot.txt
 
 popd > /dev/null || exit 1

.github/workflows/locale.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -55,6 +55,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y osm2pgrouting \
+            gettext \
             postgresql-${PGVER}-postgis-${PGIS} \
             postgresql-${PGVER}-postgis-${PGIS}-scripts \
             postgresql-${PGVER}-pgrouting
@@ -74,8 +75,6 @@ jobs:
           sudo -u postgres psql -c 'CREATE ROLE "user" SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN PASSWORD $$user$$;' -d setup
           echo :5432:*:user:user >> .pgpass
           mkdir build
-          cd build
-          cmake -DLOCALE=ON ..
         env:
           POSTGRES_HOST: localhost
           POSTGRES_PORT: 5432

.github/workflows/ubuntu.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get postgres version
         run: |

.github/workflows/website.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -83,7 +83,7 @@ jobs:
       - name: Build
         run: |
           cd build
-          make -j 4
+          make doc
 
       - name: Initialize mandatory git config
         run: |
@@ -95,7 +95,7 @@ jobs:
           if [[ "${{ env.BRANCH }}" == "develop" ]]; then
             FOLDER_NAME="dev"
           elif [[ "${{ env.BRANCH }}" == "main" ]]; then
-            FOLDER_NAME="3.0"
+            FOLDER_NAME="3.1"
           fi
           git checkout -f origin/gh-pages
           git checkout -b gh-pages

.tx/config

@@ -16,13 +16,13 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 #---------------------------------------------
 # Setting the version number
 #---------------------------------------------
-set(PGR_WORKSHOP_CITY "Belém")
+set(PGR_WORKSHOP_CITY "Auckland")
 set(WORKSHOP_AREA "FOSS4G ${PGR_WORKSHOP_CITY}")
-set(COPYRIGHT "2010-2024 pgRouting Developers")
+set(COPYRIGHT "2010-2025 pgRouting Developers")
 set(PGR_WORKSHOP_VERSION_MAJOR "3")
-set(PGR_WORKSHOP_VERSION_MINOR "0")
-set(PGR_WORKSHOP_VERSION_PATCH "1")
-set(PGR_WORKSHOP_VERSION_DEV "")
+set(PGR_WORKSHOP_VERSION_MINOR "1")
+set(PGR_WORKSHOP_VERSION_PATCH "0")
+set(PGR_WORKSHOP_VERSION_DEV "-dev")
 set(PGR_WORKSHOP_VERSION "${PGR_WORKSHOP_VERSION_MAJOR}.${PGR_WORKSHOP_VERSION_MINOR}")
 set(PGR_WORKSHOP_RELEASE "${PGR_WORKSHOP_VERSION_MAJOR}.${PGR_WORKSHOP_VERSION_MINOR}.${PGR_WORKSHOP_VERSION_PATCH}${PGR_WORKSHOP_VERSION_DEV}")
 set(PGR_WORKSHOP_NAME "pgRouting workshop")
@@ -45,53 +45,47 @@ option(PGR_WORKSHOP_VERBOSE_DEBUG
 #---------------------------------------------
 # CONFIGURATION
 #---------------------------------------------
-set(PGR_WORKSHOP_CITY_FILE "BELEM_BR")
+set(PGR_WORKSHOP_CITY_FILE "AUCKLAND_NZ")
 
 # https://github.com/OSGeo/OSGeoLive/blob/master/bin/install_osm.sh
 # around line 117
-set(PGR_WORKSHOP_CITY_BBOX "-48.52,-1.49,-48.4,-1.36")
+set(PGR_WORKSHOP_CITY_BBOX "-36.8798,174.8,-36.8344,174.72")
 
 # Make it smaller
-set(PGR_WORKSHOP_LITTLE_NET_BBOX "-48.52,-1.46,-48.45,-1.41")
+set(PGR_WORKSHOP_LITTLE_NET_BBOX "174.775,-36.855,174.76,-36.84")
 
 # Use git blame to get the date when the line was changed
-set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2024")
-set(DATE_OF_DATA "Sep 2024")
+set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2025")
+set(DATE_OF_DATA "Jun 2025")
 
 if (WORKSHOP_DEBUG)
   message(STATUS "WORKSHOP_CITY_FILE=${WORKSHOP_CITY_FILE}")
 endif()
 
-set(OSMID_1 "10982869752")
-set(OSMID_2 "11818739588")
-set(OSMID_3 "491465035")
-set(OSMID_4 "1069202329")
-set(OSMID_5 "5661895682")
-
-set(LAT1 "-1.422066")
-set(LON1 "-48.45665")
-
+set(OSMID_1 "9451619540")
+set(OSMID_2 "60662678")
+set(OSMID_3 "11045827672")
+set(OSMID_4 "9452115611")
+set(OSMID_5 "11045833969")
 
 # 3->1: routes for vehicles with penalty & no penalty must be different
-set(PLACE_1 "Hangar Convention Center")
-set(PLACE_2 "Instituto Federal do Pará, Campus Belém")
-set(PLACE_3 "Palacete Bolonha")
-set(PLACE_4 "Forte do Castelo")
-set(PLACE_5 "Estação das Docas")
-
+set(PLACE_1 "Auckland University of Technology")
+set(PLACE_2 "The Band Rotunda")
+set(PLACE_3 "Four Points by Sheraton")
+set(PLACE_4 "Sky tower")
+set(PLACE_5 "Emily Place Reserve")
 
-set(POINT1_LAT "-1.455829")
-set(POINT1_LON "-48.446044")
-set(POINT2_LAT "-1.453448")
-set(POINT2_LON "-48.447142")
 
-# by chapters
 set(CH7_PLACE_1 ${PLACE_5})
+set(CH7_ID_1 ${OSMID_5})
 set(CH7_PLACE_2 ${PLACE_1})
-set(CH7_OSMID_1 ${OSMID_5})
-set(CH7_OSMID_2 ${OSMID_1})
+set(CH7_ID_2 ${OSMID_1})
 
+set(POINT1_LAT "-36.850329")
+set(POINT1_LON "174.763094")
 
+set(POINT2_LAT "-36.853675")
+set(POINT2_LON "174.764448")
 
 #---------------------------------------------
 # minimum versions

CMakeLists.txt

@@ -2,3 +2,4 @@ Sphinx>4.0.0
 sphinx_bootstrap_theme>=0.4
 sphinx-intl
 sphinx-collapse
+sphinx-copybutton