Skip to content

Hiroshima up to basic vehicles #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cvvergara merged 29 commits into from
Jun 25, 2026
Merged

Hiroshima up to basic vehicles #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
327ae27
Getting data from downloads/pgrouting as not on OSGeoLive yet
cvvergara Jun 14, 2026
3a51a1d
Adding residential roads to have routes
cvvergara Jun 14, 2026
0eb4854
fix sphinx mistake
cvvergara Jun 14, 2026
e74bd95
Using Hiroshima data and landmarks
cvvergara Jun 14, 2026
01ece30
Fixyng typo
cvvergara Jun 17, 2026
2a24e7f
introduction: updating names and companies
cvvergara Jun 17, 2026
ea64da5
Updating copyright so it shows on github
cvvergara Jun 17, 2026
fe64529
Moved osgelive installation to appendix
cvvergara Jun 17, 2026
bb68d0d
updating overview
cvvergara Jun 17, 2026
82718ad
basic/data rewrite & cleanup
cvvergara Jun 17, 2026
b9ee13b
gid AS id -> id & the_geom -> geom
cvvergara Jun 23, 2026
3a301e6
edge = gid -> edge = id & gid, -> id,
cvvergara Jun 23, 2026
6d65a44
UN scripts run
cvvergara Jun 23, 2026
83e1776
One query for the update of the vertices table
cvvergara Jun 23, 2026
a9f5f08
Chapter graphs is done
cvvergara Jun 24, 2026
8359e7e
Removing locale file not used
cvvergara Jun 24, 2026
7911a19
Adding exercise 10
cvvergara Jun 25, 2026
5f27006
Syncing generated files list with graphs.sql
cvvergara Jun 25, 2026
5bccb45
Updating images of graphs chapter
cvvergara Jun 25, 2026
82d6dc8
Removing unused image
cvvergara Jun 25, 2026
ce2abc4
Pedestrian is basically finished
cvvergara Jun 25, 2026
054ccaf
Convert pedestrian to PRE_BUILD, add missing BYPRODUCTS, remove stale…
cvvergara Jun 25, 2026
6f91976
Vehicles chapter work
cvvergara Jun 25, 2026
8ece679
Updated vehicle.rst
cvvergara Jun 25, 2026
67a02de
Fixing some issues with the locale
cvvergara Jun 25, 2026
ebe38cc
Using osm2pgrouting 3.0.0
cvvergara Jun 25, 2026
2662c70
fixing issue on sql_function
cvvergara Jun 25, 2026
0b4cb53
website.yml: build osm2pgrouting from source instead of apt
cvvergara Jun 25, 2026
69fd9ad
website.yml: fix deploy folder to 3.2
cvvergara Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/update_locale.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
# /*PGR-GNU*****************************************************************
# File: update_locale.sh
# Copyright (c) 2021 pgRouting developers
# Copyright (c) 2024-2026 pgRouting developers
# Mail: project@pgrouting.org
# ------
# This program is free software; you can redistribute it and/or modify
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y osm2pgrouting \
sudo apt-get install -y build-essential cmake libpq-dev libpqxx-dev libexpat1-dev \
libboost-program-options-dev \
postgresql-${PGVER}-postgis-${PGIS} \
postgresql-${PGVER}-postgis-${PGIS}-scripts \
postgresql-${PGVER}-pgrouting
Expand All @@ -44,6 +45,16 @@ 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: |
sudo service postgresql start
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/website.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y osm2pgrouting \
sudo apt-get install -y build-essential cmake libpq-dev libpqxx-dev libexpat1-dev \
libboost-program-options-dev \
postgresql-${PGVER}-postgis-${PGIS} \
postgresql-${PGVER}-postgis-${PGIS}-scripts \
postgresql-${PGVER}-pgrouting
Expand All @@ -60,6 +61,16 @@ 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
Expand Down Expand Up @@ -95,7 +106,7 @@ jobs:
if [[ "${{ env.BRANCH }}" == "develop" ]]; then
FOLDER_NAME="dev"
elif [[ "${{ env.BRANCH }}" == "main" ]]; then
FOLDER_NAME="3.1"
FOLDER_NAME="3.2"
fi
git checkout -f origin/gh-pages
git checkout -b gh-pages
Expand Down
47 changes: 27 additions & 20 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
#---------------------------------------------
# Setting the version number
#---------------------------------------------
set(PGR_WORKSHOP_CITY "Auckland")
set(PGR_WORKSHOP_CITY "Hiroshima")
set(WORKSHOP_AREA "FOSS4G ${PGR_WORKSHOP_CITY}")
set(COPYRIGHT "2010-2025 pgRouting Developers")
set(PGR_WORKSHOP_VERSION_MAJOR "3")
set(PGR_WORKSHOP_VERSION_MINOR "1")
set(PGR_WORKSHOP_VERSION_MINOR "2")
set(PGR_WORKSHOP_VERSION_PATCH "0")
set(PGR_WORKSHOP_VERSION_DEV "-dev")
set(PGR_WORKSHOP_VERSION_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")
Expand All @@ -45,35 +45,42 @@ option(PGR_WORKSHOP_VERBOSE_DEBUG
#---------------------------------------------
# CONFIGURATION
#---------------------------------------------
set(PGR_WORKSHOP_CITY_FILE "AUCKLAND_NZ")
set(PGR_WORKSHOP_CITY_FILE "HIROSHIMA_JP")

# https://github.com/OSGeo/OSGeoLive/blob/master/bin/install_osm.sh
# around line 117
set(PGR_WORKSHOP_CITY_BBOX "-36.8798,174.8,-36.8344,174.72")
# For Hiroshima this is the BBOX as OsgeoLive does not have one yet
# BBOX="132.439,34.33,132.4782,34.412"

set(PGR_WORKSHOP_CITY_BBOX "132.439,34.33,132.4782,34.412")

# TODO Calculate the centroid and use
set(OSM_BBOX_CENTROID "-36.8520950/174.7631803")

# Make it smaller
set(PGR_WORKSHOP_LITTLE_NET_BBOX "174.775,-36.855,174.76,-36.84")
set(PGR_WORKSHOP_LITTLE_NET_BBOX "132.439,34.38, 132.46,34.40")

# Use git blame to get the date when the line was changed
set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2025")
set(DATE_OF_DATA "Jun 2025")
# Use git blame (on install_osm.sh) to get the date when the line was changed
# The file I set up is from June
set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2026")
set(DATE_OF_DATA "Jun 2026")

if (WORKSHOP_DEBUG)
message(STATUS "WORKSHOP_CITY_FILE=${WORKSHOP_CITY_FILE}")
endif()

set(OSMID_1 "9451619540")
set(OSMID_2 "60662678")
set(OSMID_3 "11045827672")
set(OSMID_4 "9452115611")
set(OSMID_5 "11045833969")
set(OSMID_1 "1395938201")
set(OSMID_2 "1221117996")
set(OSMID_3 "1370740519")
set(OSMID_4 "560635941")
set(OSMID_5 "344096830")

# 3->1: routes for vehicles with penalty & no penalty must be different
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(PLACE_1 "International Conference Center Hiroshima")
set(PLACE_2 "Hiroshima Gate park")
set(PLACE_3 "Aster Plaza")
set(PLACE_4 "Grand Prince Hotel Hiroshima")
set(PLACE_5 "RCC Bunka Center")


set(CH7_PLACE_1 ${PLACE_5})
Expand All @@ -91,7 +98,7 @@ set(POINT2_LON "174.764448")
# minimum versions
#---------------------------------------------
set(SPHINX_MINIMUM_VERSION "4.0.0")
set(Osm2pgrouting_FIND_VERSION "2.3")
set(Osm2pgrouting_FIND_VERSION "3.0.0")

@coderabbitai coderabbitai Bot Jun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🩺 Stability & Availability | 🟠 Major | ⚡ Quick win

Re-enable the osm2pgrouting version guard.

set(Osm2pgrouting_FIND_VERSION "3.0.0") does not currently enforce anything: the supplied cmake/FindOsm2pgrouting.cmake still has the version comparison wrapped in if (false). That lets an older osm2pgrouting configure successfully and only surface the incompatibility later. Please restore the check in the find-module, or compare Osm2pgrouting_VERSION explicitly after discovery.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@CMakeLists.txt` at line 101, Re-enable the osm2pgrouting version guard by
updating the FindOsm2pgrouting flow so the version requirement is actually
enforced. The current set(Osm2pgrouting_FIND_VERSION "3.0.0") is ineffective
because the check in cmake/FindOsm2pgrouting.cmake is disabled; restore the
version comparison there or add an explicit post-discovery comparison against
Osm2pgrouting_VERSION so older installs fail during configure. Use the
FindOsm2pgrouting.cmake logic and the
Osm2pgrouting_VERSION/Osm2pgrouting_FIND_VERSION symbols to locate the fix.



#---------------------------------------------
Expand Down
11 changes: 3 additions & 8 deletions docs/advanced/chapter-12.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
..
****************************************************************************
pgRouting Workshop Manual
Copyright(c) pgRouting Contributors

This documentation is licensed under a Creative Commons Attribution-Share
Alike 3.0 License: https://creativecommons.org/licenses/by-sa/3.0/
****************************************************************************
:file: This file is part of the pgRouting project.
:copyright: Copyright (c) 2016-2026 pgRouting developers
:license: Creative Commons Attribution-Share Alike 3.0 https://creativecommons.org/licenses/by-sa/3.0

Create a Network Topology
===============================================================================
Expand Down
1 change: 1 addition & 0 deletions docs/appendix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ add_custom_target(appendix ALL)
# Files
#---------------------
set(PGR_WORKSHOP_FILES
osgeolive.rst
appendix-2.rst
appendix-3.rst
appendix-4.rst
Expand Down
11 changes: 3 additions & 8 deletions docs/appendix/appendix-2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
..
****************************************************************************
pgRouting Workshop Manual
Copyright(c) pgRouting Contributors

This documentation is licensed under a Creative Commons Attribution-Share
Alike 3.0 License: https://creativecommons.org/licenses/by-sa/3.0/
****************************************************************************
:file: This file is part of the pgRouting project.
:copyright: Copyright (c) 2010-2026 pgRouting developers
:license: Creative Commons Attribution-Share Alike 3.0 https://creativecommons.org/licenses/by-sa/3.0

Appendix: Installation
===============================================================================
Expand Down
11 changes: 3 additions & 8 deletions docs/appendix/appendix-3.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
..
****************************************************************************
pgRouting Workshop Manual
Copyright(c) pgRouting Contributors

This documentation is licensed under a Creative Commons Attribution-Share
Alike 3.0 License: https://creativecommons.org/licenses/by-sa/3.0/
****************************************************************************
:file: This file is part of the pgRouting project.
:copyright: Copyright (c) 2010-2026 pgRouting developers
:license: Creative Commons Attribution-Share Alike 3.0 https://creativecommons.org/licenses/by-sa/3.0

.. _osm2pgrouting:

Expand Down
11 changes: 3 additions & 8 deletions docs/appendix/appendix-4.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
..
****************************************************************************
pgRouting Workshop Manual
Copyright(c) pgRouting Contributors

This documentation is licensed under a Creative Commons Attribution-Share
Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
****************************************************************************
:file: This file is part of the pgRouting project.
:copyright: Copyright (c) 2019-2026 pgRouting developers
:license: Creative Commons Attribution-Share Alike 3.0 https://creativecommons.org/licenses/by-sa/3.0

Video Tutorials for Workshop
###############################################################################
Expand Down
11 changes: 3 additions & 8 deletions docs/general-intro/osgeolive.rst → docs/appendix/osgeolive.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
..
****************************************************************************
pgRouting Workshop Manual
Copyright(c) pgRouting Contributors

This documentation is licensed under a Creative Commons Attribution-Share
Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
****************************************************************************
:file: This file is part of the pgRouting project.
:copyright: Copyright (c) 2010-2026 pgRouting developers
:license: Creative Commons Attribution-Share Alike 3.0 https://creativecommons.org/licenses/by-sa/3.0

OSGeoLive Installation
===============================================================================
Expand Down
Loading