Up to sdg3

.github/workflows/ubuntu.yml

@@ -9,6 +9,8 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        osm2pgrouting: [apt, source]
 
     steps:
       - uses: actions/checkout@v6
@@ -35,17 +37,28 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential cmake libpq-dev libpqxx-dev libexpat1-dev \
-            libboost-program-options-dev \
+          sudo apt-get install -y \
             postgresql-${PGVER}-postgis-${PGIS} \
             postgresql-${PGVER}-postgis-${PGIS}-scripts \
             postgresql-${PGVER}-pgrouting
 
+          if [ "${{ matrix.osm2pgrouting }}" = "apt" ]; then
+            sudo apt-get install -y osm2pgrouting
+          fi
+
           python -m pip install --upgrade pip
           pip install -r REQUIREMENTS.txt
           pip list
 
+      - name: Install build dependencies
+        if: matrix.osm2pgrouting == 'source'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential cmake libpq-dev libpqxx-dev libexpat1-dev \
+            libboost-program-options-dev
+
       - name: Build osm2pgrouting from source
+        if: matrix.osm2pgrouting == 'source'
         run: |
           wget -q https://github.com/pgRouting/osm2pgrouting/archive/refs/tags/v3.0.0.tar.gz
           tar xzf v3.0.0.tar.gz

.github/workflows/website.yml

@@ -51,8 +51,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential cmake libpq-dev libpqxx-dev libexpat1-dev \
-            libboost-program-options-dev \
+          sudo apt-get install -y osm2pgrouting \
             postgresql-${PGVER}-postgis-${PGIS} \
             postgresql-${PGVER}-postgis-${PGIS}-scripts \
             postgresql-${PGVER}-pgrouting
@@ -61,16 +60,6 @@ jobs:
           pip install -r REQUIREMENTS.txt
           pip list
 
-      - name: Build osm2pgrouting from source
-        run: |
-          wget -q https://github.com/pgRouting/osm2pgrouting/archive/refs/tags/v3.0.0.tar.gz
-          tar xzf v3.0.0.tar.gz
-          python3 -c "import re; c=open('osm2pgrouting-3.0.0/CMakeLists.txt').read(); c=c.replace('if (PQXX_VERSION VERSION_GREATER_EQUAL \"7.0.0\")','if (PQXX_VERSION VERSION_GREATER_EQUAL \"8.0.0\")'); c=c.replace('  set(CMAKE_CXX_STANDARD 17)','  set(CMAKE_CXX_STANDARD 20)\nelseif (PQXX_VERSION VERSION_GREATER_EQUAL \"7.0.0\")\n  set(CMAKE_CXX_STANDARD 17)',1); open('osm2pgrouting-3.0.0/CMakeLists.txt','w').write(c)"
-          cmake -S osm2pgrouting-3.0.0 -B osm2pgrouting-3.0.0/build \
-            -DCMAKE_BUILD_TYPE=Release
-          sudo cmake --build osm2pgrouting-3.0.0/build --target install
-          sudo ldconfig
-
       - name: Configure
         run: |
           service postgresql status

CMakeLists.txt

@@ -83,22 +83,22 @@ set(PLACE_4 "Grand Prince Hotel Hiroshima")
 set(PLACE_5 "RCC Bunka Center")
 
 
-set(CH7_PLACE_1 ${PLACE_5})
-set(CH7_ID_1 ${OSMID_5})
+set(CH7_PLACE_1 ${PLACE_2})
+set(CH7_ID_1 ${OSMID_2})
 set(CH7_PLACE_2 ${PLACE_1})
 set(CH7_ID_2 ${OSMID_1})
 
-set(POINT1_LAT "-36.850329")
-set(POINT1_LON "174.763094")
+set(POINT1_LAT "34.399086")
+set(POINT1_LON "132.453875")
 
-set(POINT2_LAT "-36.853675")
-set(POINT2_LON "174.764448")
+set(POINT2_LAT "34.391111")
+set(POINT2_LON "132.451490")
 
 #---------------------------------------------
 # minimum versions
 #---------------------------------------------
 set(SPHINX_MINIMUM_VERSION "4.0.0")
-set(Osm2pgrouting_FIND_VERSION "3.0.0")
+set(Osm2pgrouting_FIND_VERSION "2.3.1")
 
 
 #---------------------------------------------

cmake/FindOsm2pgrouting.cmake

@@ -41,14 +41,12 @@ execute_process(
 string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" Osm2pgrouting_V ${Osm2pgrouting_V})
 set(Osm2pgrouting_VERSION ${Osm2pgrouting_V} CACHE STRING "Osm2pgrouting VERSION")
 
-if (false)
 if (Osm2pgrouting_FIND_VERSION)
   # Check if version found is >= required version
   if ("${Osm2pgrouting_VERSION}" VERSION_LESS "${Osm2pgrouting_FIND_VERSION}")
     message(FATAL_ERROR  "Found osm2pgrouting version ${Osm2pgrouting_VERSION} which is less than requested version ${Osm2pgrouting_FIND_VERSION}")
   endif()
 endif()
-endif()
 
 if(Osm2pgrouting_FIND_COMPONENTS)
   foreach(comp ${Osm2pgrouting_FIND_COMPONENTS})

docs/basic/data.rst

@@ -34,7 +34,7 @@ Create a pgRouting compatible database
 
 Create ``city_routing`` database that will be used on the workshop.
 
-.. literalinclude:: ../scripts/get_data/process_osgeolive_data.sh
+.. literalinclude:: ../scripts/get_data/setup_city_routing.sh
    :start-after: create city_routing
    :end-before: connect city_routing
    :language: bash
@@ -48,7 +48,7 @@ Connect to the database
 Install pgRouting and its requirements. (otpionally check the version that is
 being used)
 
-.. literalinclude:: ../scripts/get_data/process_osgeolive_data.sh
+.. literalinclude:: ../scripts/get_data/setup_city_routing.sh
    :start-after: << EOF
    :end-before: EOF
    :language: bash
@@ -115,7 +115,7 @@ From a terminal window :code:`ctrl-alt-t`.
 Run the osm2pgrouting converter
 -------------------------------------------------------------------------------
 
-.. literalinclude:: ../scripts/get_data/process_osgeolive_data.sh
+.. literalinclude:: ../scripts/get_data/setup_city_routing.sh
    :start-after: import city from-here
    :end-before:  import city to-here
    :language: bash
@@ -124,10 +124,32 @@ Run the osm2pgrouting converter
 
 .. collapse:: Output:
 
-  .. literalinclude:: ../scripts/get_data/process_osgeolive_data.txt
+  .. literalinclude:: ../scripts/get_data/setup_city_routing.txt
      :start-after: import city from-here
      :end-before:  import city to-here
 
+Compatibility with older osm2pgrouting versions
+-------------------------------------------------------------------------------
+
+Check the installed version:
+
+.. code-block:: bash
+
+   osm2pgrouting --version
+
+If you are using version 2.x, the column names differ from those used in this
+workshop:
+
+- ``gid`` instead of ``id``
+- ``the_geom`` instead of ``geom``
+
+Run the following script to rename them:
+
+.. collapse:: Script
+
+   .. literalinclude:: ../scripts/get_data/osm2pgrouting_compat.sql
+      :language: postgresql
+
 Tables on the database
 -------------------------------------------------------------------------------
 

docs/basic/images/sql_function/CMakeLists.txt

@@ -3,14 +3,14 @@
 # Files
 #---------------------
 set(PGR_WORKSHOP_IMG_FILES
-  sql_azimuth_fixed.png
-  sql_route_geom.png
-  sql_route_names.png
-  sql_route_readable.png
-  sql_route_geom_detail.png
+  route_azimuth.png
+  route_names.png
+  route_readable.png
+  route_final.png
+  good_directionality.png
+  wrong_directionality.png
 )
 
-
 foreach (f ${PGR_WORKSHOP_IMG_FILES})
   if (PGR_WORKSHOP_VERBOSE_DEBUG)
     message(STATUS "      -> ${f}")