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
12 changes: 6 additions & 6 deletions .tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -122,37 +122,37 @@ source_lang = en
type = PO

[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-un-sdg-appendix-po--develop]
file_filter = locale/<lang>/LC_MESSAGES/un-sdg/appendix.po
file_filter = locale/<lang>/LC_MESSAGES/un_sdg/appendix.po
source_file = locale/pot/un-sdg/appendix.pot
source_lang = en
type = PO

[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-un-sdg-data-po--develop]
file_filter = locale/<lang>/LC_MESSAGES/un-sdg/data.po
file_filter = locale/<lang>/LC_MESSAGES/un_sdg/data.po
source_file = locale/pot/un-sdg/data.pot
source_lang = en
type = PO

[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-un-sdg-introduction-po--develop]
file_filter = locale/<lang>/LC_MESSAGES/un-sdg/introduction.po
file_filter = locale/<lang>/LC_MESSAGES/un_sdg/introduction.po
source_file = locale/pot/un-sdg/introduction.pot
source_lang = en
type = PO

[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-un-sdg-sdg11-cities-po--develop]
file_filter = locale/<lang>/LC_MESSAGES/un-sdg/sdg11-cities.po
file_filter = locale/<lang>/LC_MESSAGES/un_sdg/sdg11-cities.po
source_file = locale/pot/un-sdg/sdg11-cities.pot
source_lang = en
type = PO

[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-un-sdg-sdg3-health-po--develop]
file_filter = locale/<lang>/LC_MESSAGES/un-sdg/sdg3-health.po
file_filter = locale/<lang>/LC_MESSAGES/un_sdg/sdg3-health.po
source_file = locale/pot/un-sdg/sdg3-health.pot
source_lang = en
type = PO

[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-un-sdg-sdg7-energy-po--develop]
file_filter = locale/<lang>/LC_MESSAGES/un-sdg/sdg7-energy.po
file_filter = locale/<lang>/LC_MESSAGES/un_sdg/sdg7-energy.po
source_file = locale/pot/un-sdg/sdg7-energy.pot
source_lang = en
type = PO
Expand Down
2 changes: 0 additions & 2 deletions REQUIREMENTS.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Sphinx>4.0.0
sphinx_bootstrap_theme>=0.4
wheel>=0.33.6
sphinx-intl
sphinx-intl[transifex]
4 changes: 2 additions & 2 deletions docs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ if (LOCALE)

COMMENT "Generating POT & PO files ..."
)
add_dependencies(locale examples general-intro advanced appendix basic scripts)
add_dependencies(locale examples general-intro advanced appendix basic un_sdg scripts interactions)
add_dependencies(doc locale)
endif()

Expand Down Expand Up @@ -115,7 +115,7 @@ foreach (target ${PGR_WORKSHOP_DOC_TARGETS})

DEPENDS "conf.py"
)
add_dependencies("${target}-${lang}" scripts)
add_dependencies("${target}-${lang}" examples general-intro advanced appendix basic un_sdg scripts interactions)
add_dependencies("${target}" "${target}-${lang}")
endforeach()
add_dependencies(doc "${target}")
Expand Down
2 changes: 1 addition & 1 deletion docs/advanced/chapter-12.rst
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Also a new table containing the vertices information was created:
* Additional columns are for analyzing the topology.

Now we are ready for our first routing query with
:ref:`pgr_dijkstra`
:ref:`basic/pedestrian:pgr_dijkstra`


Analyze and Adjust the Routing Network Topology
Expand Down
68 changes: 34 additions & 34 deletions docs/basic/appendix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,135 +7,135 @@
Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
****************************************************************************

Appendix: Basic workshop solutions
Appendix: Basic workshop solutions
===============================================================================

Solutions to :ref:`Pedestrian routing`
Solutions to :doc:`pedestrian`
-------------------------------------------------------------------------------

**Exercise**: 1 (**Chapter:** Pedestrian)
...............................................................................

:ref:`Exercise 1: Single pedestrian routing`
:ref:`basic/pedestrian:Exercise 1: Single pedestrian routing`

.. literalinclude:: ../scripts/basic/chapter_5/exercise_5_1.txt


**Exercise**: 2 (**Chapter:** Pedestrian)
...............................................................................

:ref:`Exercise 2: Many Pedestrians going to the same destination`
:ref:`basic/pedestrian:Exercise 2: Many Pedestrians going to the same destination`

.. literalinclude:: ../scripts/basic/chapter_5/exercise_5_2.txt


**Exercise**: 3 (**Chapter:** Pedestrian)
...............................................................................

:ref:`Exercise 3: Many Pedestrians departing from the same location`
:ref:`basic/pedestrian:Exercise 3: Many Pedestrians departing from the same location`

.. literalinclude:: ../scripts/basic/chapter_5/exercise_5_3.txt


**Exercise**: 4 (**Chapter:** Pedestrian)
...............................................................................

:ref:`Exercise 4: Many Pedestrians going to different destinations`
:ref:`basic/pedestrian:Exercise 4: Many Pedestrians going to different destinations`

.. literalinclude:: ../scripts/basic/chapter_5/exercise_5_4.txt


**Exercise**: 5 (**Chapter:** Pedestrian)
...............................................................................

:ref:`Exercise 5: Many Pedestrians going to different destinations returning aggregate costs`
:ref:`basic/pedestrian:Exercise 5: Many Pedestrians going to different destinations returning aggregate costs`

.. literalinclude:: ../scripts/basic/chapter_5/exercise_5_5.txt


**Exercise**: 6 (**Chapter:** Pedestrian)
...............................................................................

:ref:`Exercise 6: Many Pedestrians going to different destinations summarizing the total costs per departure`
:ref:`basic/pedestrian:Exercise 6: Many Pedestrians going to different destinations summarizing the total costs per departure`

.. literalinclude:: ../scripts/basic/chapter_5/exercise_5_6.txt


Solutions to :ref:`Vehicle routing`
Solutions to :doc:`vehicle`
-------------------------------------------------------------------------------

**Exercise**: 1 (**Chapter:** Vehicle)
...............................................................................

:ref:`Exercise 1: Vehicle routing - going`
:ref:`basic/vehicle:Exercise 1: Vehicle routing - going`

.. literalinclude:: ../scripts/basic/chapter_6/section-6.1.1.txt


**Exercise**: 2 (**Chapter:** Vehicle)
...............................................................................

:ref:`Exercise 2: Vehicle routing - returning`
:ref:`basic/vehicle:Exercise 2: Vehicle routing - returning`

.. literalinclude:: ../scripts/basic/chapter_6/section-6.1.2.txt


**Exercise**: 3 (**Chapter:** Vehicle)
...............................................................................

:ref:`Exercise 3: Vehicle routing when time is money`
:ref:`basic/vehicle:Exercise 3: Vehicle routing when time is money`

.. literalinclude:: ../scripts/basic/chapter_6/section-6.1.3.txt


**Exercise**: 4 (**Chapter:** Vehicle)
...............................................................................

:ref:`Exercise 4: Vehicle routing without penalization`
:ref:`basic/vehicle:Exercise 4: Vehicle routing without penalization`

.. literalinclude:: ../scripts/basic/chapter_6/section-6.2.1.txt


**Exercise**: 5 (**Chapter:** Vehicle)
...............................................................................

:ref:`Exercise 5: Vehicle routing with penalization`
:ref:`basic/vehicle:Exercise 5: Vehicle routing with penalization`

.. literalinclude:: ../scripts/basic/chapter_6/section-6.2.2-2.txt



Solutions to :ref:`SQL function`
Solutions to :doc:`sql_function`
-------------------------------------------------------------------------------


**Exercise**: 1 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 1: Creating a view for routing`
:ref:`basic/sql_function:Exercise 1: Creating a view for routing`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_1.txt


**Exercise**: 2 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 2: Limiting the road network within an area`
:ref:`basic/sql_function:Exercise 2: Limiting the road network within an area`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_2.txt

**Exercise**: 3 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 3: Creating a materialized view for routing pedestrians`
:ref:`basic/sql_function:Exercise 3: Creating a materialized view for routing pedestrians`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_3.txt


**Exercise**: 4 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 4: Testing the views for routing`
:ref:`basic/sql_function:Exercise 4: Testing the views for routing`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_4.txt

Expand All @@ -144,65 +144,65 @@ Solutions to :ref:`SQL function`
**Exercise**: 5 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 5: Get additional information`
:ref:`basic/sql_function:Exercise 5: Get additional information`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_5.txt


**Exercise**: 6 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 6: Route geometry (human readable)`
:ref:`basic/sql_function:Exercise 6: Route geometry (human readable)`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_6.txt


**Exercise**: 7 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 7: Route geometry (binary format)`
:ref:`basic/sql_function:Exercise 7: Route geometry (binary format)`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_7.txt


**Exercise**: 8 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 8: Route geometry directionality`
:ref:`basic/sql_function:Exercise 8: Route geometry directionality`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_8.txt


**Exercise**: 9 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 9: Using the geometry`
:ref:`basic/sql_function:Exercise 9: Using the geometry`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_9.txt


**Exercise**: 10 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 10: Function for an application`
:ref:`basic/sql_function:Exercise 10: Function for an application`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_10.txt

**Exercise**: 11 (**Chapter:** SQL)
...............................................................................

:ref:`Exercise 11: Using the function`
:ref:`basic/sql_function:Exercise 11: Using the function`

.. literalinclude:: ../scripts/basic/chapter_7/exercise_7_11.txt


Solutions to :ref:`pl/pgsql function`
Solutions to :doc:`plpgsql_function`
-------------------------------------------------------------------------------

**Exercise**: 1 (**Chapter:** pl/pgsql)
...............................................................................

:ref:`Exercise 1: Number of Vertices`
:ref:`basic/plpgsql_function:Exercise 1: Number of Vertices`

For ``ways_vertices_pgr``:

Expand All @@ -223,7 +223,7 @@ For ``walk_net``:
**Exercise**: 2 (**Chapter:** pl/pgsql)
...............................................................................

:ref:`Exercise 2: Vertices on a table`
:ref:`basic/plpgsql_function:Exercise 2: Vertices on a table`

For ``vehicle_net``:

Expand All @@ -241,7 +241,7 @@ For ``walk_net``:
**Exercise**: 3 (**Chapter:** pl/pgsql)
...............................................................................

:ref:`Exercise 3: Nearest Vertex`
:ref:`basic/plpgsql_function:Exercise 3: Nearest Vertex`

For ``ways_vertices_pgr``:

Expand All @@ -263,14 +263,14 @@ For ``walk_net_vertices_pgr``:
**Exercise**: 4 (**Chapter:** pl/pgsql)
...............................................................................

:ref:`Exercise 4: Nearest vertex function`
:ref:`basic/plpgsql_function:Exercise 4: Nearest vertex function`

.. literalinclude:: ../scripts/basic/chapter_8/exercise_8_4.txt

**Exercise**: 5 (**Chapter:** pl/pgsql)
...............................................................................

:ref:`Exercise 5: Test nearest vertex function`
:ref:`basic/plpgsql_function:Exercise 5: Test nearest vertex function`

For ``ways_vertices_pgr``:

Expand All @@ -292,14 +292,14 @@ For ``walk_net_vertices_pgr``:
**Exercise**: 6 (**Chapter:** pl/pgsql)
...............................................................................

:ref:`Exercise 6: Creating the main function`
:ref:`basic/plpgsql_function:Exercise 6: Creating the main function`

.. literalinclude:: ../scripts/basic/chapter_8/exercise_8_6.txt

**Exercise**: 7 (**Chapter:** pl/pgsql)
...............................................................................

:ref:`Exercise 7: Using the main function`
:ref:`basic/plpgsql_function:Exercise 7: Using the main function`

For ``vehicle_net``

Expand Down
Loading