Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/locale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
59 changes: 28 additions & 31 deletions CMakeLists.txt
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 "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")
Expand All @@ -45,50 +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
# Example reference point (e.g., near Emily Place Reserve)
set(CH7_PLACE_1 ${PLACE_5})
set(CH7_PLACE_2 ${PLACE_1})
set(CH7_OSMID_1 ${OSMID_5})
set(POINT1_LAT "-36.8471438")
set(POINT1_LON "174.7710042")

# Example reference point (e.g., near Auckland University of Technology)
set(POINT2_LAT "-36.8524328")
set(POINT2_LON "174.766749")
set(CH7_PLACE_2 ${PLACE_1})
set(CH7_OSMID_2 ${OSMID_1})


Expand Down
7 changes: 3 additions & 4 deletions docs/basic/graphs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ The description of the graphs:
pgr_extractVertices
================================================================================

``pgr_extractVertices`` compute the connected components of an undirected
graph using a Depth First Search approach. A connected component of an
undirected graph is a set of vertices that are all reachable from each other.
``pgr_extractVertices`` extracts the vertices (nodes) from an edge table and
reports per-vertex attributes such as degree

.. rubric:: Signature summary

Expand All @@ -73,7 +72,7 @@ undirected graph is a set of vertices that are all reachable from each other.
OR EMTPY SET

Description of the function can be found in `pgr_extractVertices
<https://docs.pgrouting.org/latest/en/pgr_connectedComponents.html>`__
<https://docs.pgrouting.org/latest/en/pgr_extractVertices.html>`__

Exercise 1: Create a vertices table
-------------------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion docs/scripts/basic/data/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ endforeach()
add_custom_command(
OUTPUT data.txt
COMMAND bash data.sh > data.txt
DEPENDS data.sh
)

add_custom_target(basic_data_scripts
Expand Down
1 change: 0 additions & 1 deletion docs/scripts/basic/graphs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,4 @@ add_custom_command(

COMMAND psql -d city_routing -f graphs.sql
COMMENT "running graphs scripts"
DEPENDS graphs.sql
)
3 changes: 1 addition & 2 deletions docs/scripts/basic/pedestrian/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@ add_custom_command(
COMMAND psql -d city_routing -f pedestrian.sql
COMMAND psql -d city_routing -f images.sql
COMMENT "running pedestrian scripts"
DEPENDS pedestrian.sql
)
)

1 change: 0 additions & 1 deletion docs/scripts/basic/plpgsql_function/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ add_custom_command(
warnings.txt
COMMAND psql -d city_routing -f plpgsql_function.sql 2> warnings.txt
COMMENT "running plpgsql_function scripts"
DEPENDS plpgsql_function.sql
)
1 change: 0 additions & 1 deletion docs/scripts/basic/sql_function/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,4 @@ add_custom_command(
COMMAND psql -d city_routing -f sql_function.sql
COMMAND psql -d city_routing -f images.sql
COMMENT "running sql function scripts"
DEPENDS sql_function.sql
)
8 changes: 4 additions & 4 deletions docs/scripts/basic/vehicles/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ add_custom_command(
section-6.2.2-2.txt
section-6.6.txt

COMMAND psql -d city_routing -f vehicles.sql
COMMAND psql -d city_routing -f images.sql
COMMENT "running vehicles scripts"
DEPENDS vehicles.sql)
COMMAND psql -d city_routing -f vehicles.sql
COMMAND psql -d city_routing -f images.sql
COMMENT "running vehicles scripts"
)
3 changes: 1 addition & 2 deletions docs/scripts/un_sdg/sdg11/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,4 @@ add_custom_command(
exercise_10.txt
COMMAND psql -d bangladesh -f all_exercises_sdg11.sql
COMMENT "running sdg11 scripts"
DEPENDS all_exercises_sdg11.sql
)
)
3 changes: 1 addition & 2 deletions docs/scripts/un_sdg/sdg3/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,4 @@ add_custom_command(
exercise_20.txt
COMMAND psql -d mumbai -f all_exercises_sdg3.sql
COMMENT "running chapter sdg3 scripts"
DEPENDS all_exercises_sdg3.sql
)
)
3 changes: 1 addition & 2 deletions docs/scripts/un_sdg/sdg7/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,4 @@ add_custom_command(
exercise_12.txt
COMMAND psql -d mumbai -f all_exercises_sdg7.sql
COMMENT "running chapter sdg7 scripts"
DEPENDS all_exercises_sdg7.sql
)
)
45 changes: 22 additions & 23 deletions locale/en/LC_MESSAGES/basic/data.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-12-16 17:44+0000\n"
"POT-Creation-Date: 2025-09-30 17:36+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand All @@ -18,7 +18,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.16.0\n"
"Generated-By: Babel 2.17.0\n"

#: ../../build/docs/basic/data.rst:12
msgid "Prepare Data"
Expand Down Expand Up @@ -51,8 +51,8 @@ msgstr ""
#: ../../build/docs/basic/data.rst:30
msgid ""
"These requirements are met on OSGeoLive. When the required software is "
"installed, open a terminal window by pressing :code:`ctrl-alt-t` and "
"follow the instructions."
"installed, open a terminal window by pressing :code:`ctrl-alt-t` and follow "
"the instructions."
msgstr ""

#: ../../build/docs/basic/data.rst:34
Expand All @@ -63,8 +63,8 @@ msgstr ""

#: ../../build/docs/basic/data.rst:37
msgid ""
"If OSGeoLive is not being used, please refer to the chapter's appendix to"
" set up the user ``user``."
"If OSGeoLive is not being used, please refer to the chapter's appendix to "
"set up the user ``user``."
msgstr ""

#: ../../build/docs/basic/data.rst:41
Expand All @@ -73,8 +73,8 @@ msgstr ""

#: ../../build/docs/basic/data.rst:43
msgid ""
"Depending on the postgres configuration :code:`-U <user>` is needed on "
":code:`psql` commands"
"Depending on the postgres configuration :code:`-U <user>` is needed on :code:"
"`psql` commands"
msgstr ""

#: ../../build/docs/basic/data.rst:51
Expand All @@ -87,9 +87,9 @@ msgstr ""

#: ../../build/docs/basic/data.rst:58
msgid ""
"The pgRouting workshop will make use of OpenStreetMap data, which is "
"already available on `OSGeoLive <https://live.osgeo.org>`_. This workshop"
" will use the ``Belém`` city data and is a snapshot of Sep 2024."
"The pgRouting workshop will make use of OpenStreetMap data, which is already "
"available on `OSGeoLive <https://live.osgeo.org>`_. This workshop will use "
"the ``Auckland`` city data and is a snapshot of Jun 2025."
msgstr ""

#: ../../build/docs/basic/data.rst:63
Expand All @@ -101,7 +101,7 @@ msgid "Option 1) When using OSGeoLive"
msgstr ""

#: ../../build/docs/basic/data.rst:68
msgid "OSGeoLive comes with OSM data from the city of Belém."
msgid "OSGeoLive comes with OSM data from the city of Auckland."
msgstr ""

#: ../../build/docs/basic/data.rst:76
Expand All @@ -118,15 +118,15 @@ msgstr ""

#: ../../build/docs/basic/data.rst:88
msgid ""
"The following downloads the latest OSM data on using the same area. Using"
" this data in the workshop can generate variations in the results, due to"
" changes since Sep 2024."
"The following downloads the latest OSM data on using the same area. Using "
"this data in the workshop can generate variations in the results, due to "
"changes since Jun 2025."
msgstr ""

#: ../../build/docs/basic/data.rst:98
msgid ""
"More information about how to download OpenStreetMap data can be found in"
" https://wiki.openstreetmap.org/wiki/Downloading_data"
"More information about how to download OpenStreetMap data can be found in "
"https://wiki.openstreetmap.org/wiki/Downloading_data"
msgstr ""

#: ../../build/docs/basic/data.rst:101
Expand All @@ -141,10 +141,10 @@ msgstr ""

#: ../../build/docs/basic/data.rst:108
msgid ""
"The next step is to run ``osm2pgrouting`` converter, which is a command "
"line tool that inserts the data in the database, \"ready\" to be used "
"with pgRouting. Additional information about ``osm2pgrouting`` can be "
"found at the :doc:`../appendix/appendix-3`"
"The next step is to run ``osm2pgrouting`` converter, which is a command line "
"tool that inserts the data in the database, \"ready\" to be used with "
"pgRouting. Additional information about ``osm2pgrouting`` can be found at "
"the :doc:`../appendix/appendix-3`"
msgstr ""

#: ../../build/docs/basic/data.rst:112
Expand All @@ -156,7 +156,7 @@ msgid "the osm2pgrouting default ``mapconfig.xml`` configuration file is used"
msgstr ""

#: ../../build/docs/basic/data.rst:115
msgid "and the ``~/Desktop/workshop/BELEM_BR.osm`` data"
msgid "and the ``~/Desktop/workshop/auckland_NZ.osm`` data"
msgstr ""

#: ../../build/docs/basic/data.rst:116
Expand Down Expand Up @@ -196,4 +196,3 @@ msgid ""
"OSGeoLive's account name on the database is ``user``. To easily use the "
"workshop when not using OSGeoLive this extra steps are needed:"
msgstr ""

Loading