Skip to content

Commit 2bb50cb

Browse files
cvvergaracvvergara
authored
Merge pull request #280 from cvvergara/hiroshima-introduction
Hiroshima up to basic vehicles
2 parents 55f670e + 69fd9ad commit 2bb50cb

103 files changed

Lines changed: 3242 additions & 3470 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/scripts/update_locale.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# /*PGR-GNU*****************************************************************
33
# File: update_locale.sh
4-
# Copyright (c) 2021 pgRouting developers
4+
# Copyright (c) 2024-2026 pgRouting developers
55
# Mail: project@pgrouting.org
66
# ------
77
# This program is free software; you can redistribute it and/or modify

‎.github/workflows/ubuntu.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ jobs:
3535
- name: Install dependencies
3636
run: |
3737
sudo apt-get update
38-
sudo apt-get install -y osm2pgrouting \
38+
sudo apt-get install -y build-essential cmake libpq-dev libpqxx-dev libexpat1-dev \
39+
libboost-program-options-dev \
3940
postgresql-${PGVER}-postgis-${PGIS} \
4041
postgresql-${PGVER}-postgis-${PGIS}-scripts \
4142
postgresql-${PGVER}-pgrouting
@@ -44,6 +45,16 @@ jobs:
4445
pip install -r REQUIREMENTS.txt
4546
pip list
4647
48+
- name: Build osm2pgrouting from source
49+
run: |
50+
wget -q https://github.com/pgRouting/osm2pgrouting/archive/refs/tags/v3.0.0.tar.gz
51+
tar xzf v3.0.0.tar.gz
52+
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)"
53+
cmake -S osm2pgrouting-3.0.0 -B osm2pgrouting-3.0.0/build \
54+
-DCMAKE_BUILD_TYPE=Release
55+
sudo cmake --build osm2pgrouting-3.0.0/build --target install
56+
sudo ldconfig
57+
4758
- name: Configure
4859
run: |
4960
sudo service postgresql start

‎.github/workflows/website.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ jobs:
5151
- name: Install dependencies
5252
run: |
5353
sudo apt-get update
54-
sudo apt-get install -y osm2pgrouting \
54+
sudo apt-get install -y build-essential cmake libpq-dev libpqxx-dev libexpat1-dev \
55+
libboost-program-options-dev \
5556
postgresql-${PGVER}-postgis-${PGIS} \
5657
postgresql-${PGVER}-postgis-${PGIS}-scripts \
5758
postgresql-${PGVER}-pgrouting
@@ -60,6 +61,16 @@ jobs:
6061
pip install -r REQUIREMENTS.txt
6162
pip list
6263
64+
- name: Build osm2pgrouting from source
65+
run: |
66+
wget -q https://github.com/pgRouting/osm2pgrouting/archive/refs/tags/v3.0.0.tar.gz
67+
tar xzf v3.0.0.tar.gz
68+
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)"
69+
cmake -S osm2pgrouting-3.0.0 -B osm2pgrouting-3.0.0/build \
70+
-DCMAKE_BUILD_TYPE=Release
71+
sudo cmake --build osm2pgrouting-3.0.0/build --target install
72+
sudo ldconfig
73+
6374
- name: Configure
6475
run: |
6576
service postgresql status
@@ -95,7 +106,7 @@ jobs:
95106
if [[ "${{ env.BRANCH }}" == "develop" ]]; then
96107
FOLDER_NAME="dev"
97108
elif [[ "${{ env.BRANCH }}" == "main" ]]; then
98-
FOLDER_NAME="3.1"
109+
FOLDER_NAME="3.2"
99110
fi
100111
git checkout -f origin/gh-pages
101112
git checkout -b gh-pages

‎CMakeLists.txt‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
1616
#---------------------------------------------
1717
# Setting the version number
1818
#---------------------------------------------
19-
set(PGR_WORKSHOP_CITY "Auckland")
19+
set(PGR_WORKSHOP_CITY "Hiroshima")
2020
set(WORKSHOP_AREA "FOSS4G ${PGR_WORKSHOP_CITY}")
2121
set(COPYRIGHT "2010-2025 pgRouting Developers")
2222
set(PGR_WORKSHOP_VERSION_MAJOR "3")
23-
set(PGR_WORKSHOP_VERSION_MINOR "1")
23+
set(PGR_WORKSHOP_VERSION_MINOR "2")
2424
set(PGR_WORKSHOP_VERSION_PATCH "0")
25-
set(PGR_WORKSHOP_VERSION_DEV "-dev")
25+
set(PGR_WORKSHOP_VERSION_DEV "")
2626
set(PGR_WORKSHOP_VERSION "${PGR_WORKSHOP_VERSION_MAJOR}.${PGR_WORKSHOP_VERSION_MINOR}")
2727
set(PGR_WORKSHOP_RELEASE "${PGR_WORKSHOP_VERSION_MAJOR}.${PGR_WORKSHOP_VERSION_MINOR}.${PGR_WORKSHOP_VERSION_PATCH}${PGR_WORKSHOP_VERSION_DEV}")
2828
set(PGR_WORKSHOP_NAME "pgRouting workshop")
@@ -45,35 +45,42 @@ option(PGR_WORKSHOP_VERBOSE_DEBUG
4545
#---------------------------------------------
4646
# CONFIGURATION
4747
#---------------------------------------------
48-
set(PGR_WORKSHOP_CITY_FILE "AUCKLAND_NZ")
48+
set(PGR_WORKSHOP_CITY_FILE "HIROSHIMA_JP")
4949

5050
# https://github.com/OSGeo/OSGeoLive/blob/master/bin/install_osm.sh
5151
# around line 117
52-
set(PGR_WORKSHOP_CITY_BBOX "-36.8798,174.8,-36.8344,174.72")
52+
# For Hiroshima this is the BBOX as OsgeoLive does not have one yet
53+
# BBOX="132.439,34.33,132.4782,34.412"
54+
55+
set(PGR_WORKSHOP_CITY_BBOX "132.439,34.33,132.4782,34.412")
56+
57+
# TODO Calculate the centroid and use
58+
set(OSM_BBOX_CENTROID "-36.8520950/174.7631803")
5359

5460
# Make it smaller
55-
set(PGR_WORKSHOP_LITTLE_NET_BBOX "174.775,-36.855,174.76,-36.84")
61+
set(PGR_WORKSHOP_LITTLE_NET_BBOX "132.439,34.38, 132.46,34.40")
5662

57-
# Use git blame to get the date when the line was changed
58-
set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2025")
59-
set(DATE_OF_DATA "Jun 2025")
63+
# Use git blame (on install_osm.sh) to get the date when the line was changed
64+
# The file I set up is from June
65+
set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2026")
66+
set(DATE_OF_DATA "Jun 2026")
6067

6168
if (WORKSHOP_DEBUG)
6269
message(STATUS "WORKSHOP_CITY_FILE=${WORKSHOP_CITY_FILE}")
6370
endif()
6471

65-
set(OSMID_1 "9451619540")
66-
set(OSMID_2 "60662678")
67-
set(OSMID_3 "11045827672")
68-
set(OSMID_4 "9452115611")
69-
set(OSMID_5 "11045833969")
72+
set(OSMID_1 "1395938201")
73+
set(OSMID_2 "1221117996")
74+
set(OSMID_3 "1370740519")
75+
set(OSMID_4 "560635941")
76+
set(OSMID_5 "344096830")
7077

7178
# 3->1: routes for vehicles with penalty & no penalty must be different
72-
set(PLACE_1 "Auckland University of Technology")
73-
set(PLACE_2 "The Band Rotunda")
74-
set(PLACE_3 "Four Points by Sheraton")
75-
set(PLACE_4 "Sky tower")
76-
set(PLACE_5 "Emily Place Reserve")
79+
set(PLACE_1 "International Conference Center Hiroshima")
80+
set(PLACE_2 "Hiroshima Gate park")
81+
set(PLACE_3 "Aster Plaza")
82+
set(PLACE_4 "Grand Prince Hotel Hiroshima")
83+
set(PLACE_5 "RCC Bunka Center")
7784

7885

7986
set(CH7_PLACE_1 ${PLACE_5})
@@ -91,7 +98,7 @@ set(POINT2_LON "174.764448")
9198
# minimum versions
9299
#---------------------------------------------
93100
set(SPHINX_MINIMUM_VERSION "4.0.0")
94-
set(Osm2pgrouting_FIND_VERSION "2.3")
101+
set(Osm2pgrouting_FIND_VERSION "3.0.0")
95102

96103

97104
#---------------------------------------------

‎docs/advanced/chapter-12.rst‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
..
2-
****************************************************************************
3-
pgRouting Workshop Manual
4-
Copyright(c) pgRouting Contributors
5-
6-
This documentation is licensed under a Creative Commons Attribution-Share
7-
Alike 3.0 License: https://creativecommons.org/licenses/by-sa/3.0/
8-
****************************************************************************
1+
:file: This file is part of the pgRouting project.
2+
:copyright: Copyright (c) 2016-2026 pgRouting developers
3+
:license: Creative Commons Attribution-Share Alike 3.0 https://creativecommons.org/licenses/by-sa/3.0
94

105
Create a Network Topology
116
===============================================================================

‎docs/appendix/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ add_custom_target(appendix ALL)
55
# Files
66
#---------------------
77
set(PGR_WORKSHOP_FILES
8+
osgeolive.rst
89
appendix-2.rst
910
appendix-3.rst
1011
appendix-4.rst

‎docs/appendix/appendix-2.rst‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
..
2-
****************************************************************************
3-
pgRouting Workshop Manual
4-
Copyright(c) pgRouting Contributors
5-
6-
This documentation is licensed under a Creative Commons Attribution-Share
7-
Alike 3.0 License: https://creativecommons.org/licenses/by-sa/3.0/
8-
****************************************************************************
1+
:file: This file is part of the pgRouting project.
2+
:copyright: Copyright (c) 2010-2026 pgRouting developers
3+
:license: Creative Commons Attribution-Share Alike 3.0 https://creativecommons.org/licenses/by-sa/3.0
94

105
Appendix: Installation
116
===============================================================================

‎docs/appendix/appendix-3.rst‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
..
2-
****************************************************************************
3-
pgRouting Workshop Manual
4-
Copyright(c) pgRouting Contributors
5-
6-
This documentation is licensed under a Creative Commons Attribution-Share
7-
Alike 3.0 License: https://creativecommons.org/licenses/by-sa/3.0/
8-
****************************************************************************
1+
:file: This file is part of the pgRouting project.
2+
:copyright: Copyright (c) 2010-2026 pgRouting developers
3+
:license: Creative Commons Attribution-Share Alike 3.0 https://creativecommons.org/licenses/by-sa/3.0
94

105
.. _osm2pgrouting:
116

‎docs/appendix/appendix-4.rst‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
..
2-
****************************************************************************
3-
pgRouting Workshop Manual
4-
Copyright(c) pgRouting Contributors
5-
6-
This documentation is licensed under a Creative Commons Attribution-Share
7-
Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
8-
****************************************************************************
1+
:file: This file is part of the pgRouting project.
2+
:copyright: Copyright (c) 2019-2026 pgRouting developers
3+
:license: Creative Commons Attribution-Share Alike 3.0 https://creativecommons.org/licenses/by-sa/3.0
94

105
Video Tutorials for Workshop
116
###############################################################################

docs/general-intro/osgeolive.rst renamed to docs/appendix/osgeolive.rst

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
..
2-
****************************************************************************
3-
pgRouting Workshop Manual
4-
Copyright(c) pgRouting Contributors
5-
6-
This documentation is licensed under a Creative Commons Attribution-Share
7-
Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
8-
****************************************************************************
1+
:file: This file is part of the pgRouting project.
2+
:copyright: Copyright (c) 2010-2026 pgRouting developers
3+
:license: Creative Commons Attribution-Share Alike 3.0 https://creativecommons.org/licenses/by-sa/3.0
94

105
OSGeoLive Installation
116
===============================================================================

0 commit comments

Comments
 (0)