Florence work1

.github/workflows/locale-and-website.yml

@@ -114,7 +114,7 @@ jobs:
           if [[ "${{ env.BRANCH }}" == "develop" ]]; then
             FOLDER_NAME="dev"
           elif [[ "${{ env.BRANCH }}" == "main" ]]; then
-            FOLDER_NAME="2.7"
+            FOLDER_NAME="2.8"
           fi
           git checkout -f origin/gh-pages
           git checkout -b gh-pages

CMakeLists.txt

@@ -20,18 +20,18 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 #---------------------------------------------
 # Setting the version number
 #---------------------------------------------
-set(WORKSHOP_AREA "FOSS4G Italy")
-set(COPYRIGHT "2010-2021 Daniel Kastl, Vicky Vergara, Rajat Shinde")
+set(WORKSHOP_AREA "FOSS4G Firenze")
+set(COPYRIGHT "2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde")
 set(PGR_WORKSHOP_VERSION_MAJOR "2")
-set(PGR_WORKSHOP_VERSION_MINOR "7")
+set(PGR_WORKSHOP_VERSION_MINOR "8")
 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")
-set(PGR_HTML_TITLE "Workshop - FOSS4G 2021 Argentina - Routing with pgRouting")
-set(PGR_HTML_SHORT_TITLE "Workshop - Argentina")
-set(OSGeoLive_VERSION "14.0")
+set(PGR_HTML_TITLE "Workshop - FOSS4G 2022 Firenze - Routing with pgRouting")
+set(PGR_HTML_SHORT_TITLE "Workshop - Firenze")
+set(OSGeoLive_VERSION "15.0")
 
 
 #---------------------------------------------
@@ -52,30 +52,28 @@ option(PGR_WORKSHOP_VERBOSE_DEBUG
 set(PGR_WORKSHOP_CITY "Firenze")
 set(PGR_WORKSHOP_CITY_FILE "Firenze_IT")
 set(PGR_WORKSHOP_CITY_BBOX "11.20,43.76,11.27,43.79")
-# TODO define little net BBOX
-set(PGR_WORKSHOP_LITTLE_NET_BBOX "11.20,43.76,11.27,43.79")
+set(PGR_WORKSHOP_LITTLE_NET_BBOX "11.24,43.77,11.27,43.79")
 set(PGR_WORKSHOP_DOWNLOAD_DIR "workshop-2022")
 set(DATE_OF_DATA "July 2021")
 
-set(OSMID_1 "5020458299")
-set(OSMID_2 "1798374718")
-set(OSMID_3 "266939565")
-set(OSMID_4 "2531656518")
-set(OSMID_5 "6483155124")
+set(OSMID_1 "266939565")
+set(OSMID_2 "2531656518")
+set(OSMID_3 "5020458299")
+set(OSMID_4 "6483155124")
+set(OSMID_5 "1798374718")
 
 
-set(PLACE_1 "Palazzo dei Congressi")
-set(PLACE_2 "Cattedrale di Santa Maria del Fiore")
-set(PLACE_3 "Mercato Centrale")
-set(PLACE_4 "Stazione di Santa Maria Novella")
-set(PLACE_5 "Hotel Albani")
+set(PLACE_1 "Mercato Centrale")
+set(PLACE_2 "Stazione di Santa Maria Novella")
+set(PLACE_3 "Palazzo dei Congressi")
+set(PLACE_4 "Hotel Albani")
+set(PLACE_5 "Cattedrale di Santa Maria del Fiore")
 
 
-#TODO set points that are routable on chapter 8
-set(POINT1_LON "-58.4112")
-set(POINT1_LAT "-34.59")
-set(POINT2_LON "-58.4077")
-set(POINT2_LAT "-34.5850")
+set(POINT1_LON "11.2384")
+set(POINT1_LAT "43.784")
+set(POINT2_LON "11.2492")
+set(POINT2_LAT "43.778")
 
 #---------------------------------------------
 # minimum versions

docs/basic/pedestrian.rst

@@ -61,7 +61,7 @@ Description of the parameters can be found in `pgr_dijkstra
 
 The assignment of the vertices identifiers on the source and target columns may
 be different, the following exercises will use the results of this query.
-For the workshop, some locations near of the FOSS4G Argentina event are going to be used.
+For the workshop, some locations near of the FOSS4G event are going to be used.
 These locations are within this area https://www.openstreetmap.org#map=15/-34.5847/-58.3970
 
 * |osmid_1| |place_1|
@@ -179,7 +179,6 @@ Exercise 3: Many Pedestrians departing from the same location
 
 .. image:: images/chapter5/pedestrian-route2.png
   :scale: 25%
-  :alt: From the hotels to/from the venue
 
 .. rubric:: Solution:
 
@@ -202,11 +201,10 @@ Exercise 4: Many Pedestrians going to different destinations
 
 .. rubric:: Problem:
 
-* Walking from the hotels to the "|place_4|" and "|place_5|" (in minutes).
+* Walking from |place_1| and |place_2| to the "|place_4|" and "|place_5|" (in minutes).
 
 .. image:: images/chapter5/pedestrian-route4.png
   :scale: 25%
-  :alt: From the hotels to the |place_4| and |place_5|
 
 .. rubric:: Solution:
 

docs/basic/sql_function.rst

@@ -203,7 +203,7 @@ Exercise 2: Limiting the road network within an area
 Exercise 3: Creating a materialized view for routing pedestrians
 -------------------------------------------------------------------------------
 
-.. image:: images/chapter7/ch7-e1.png
+.. image:: images/chapter7/walk-net.png
   :scale: 25%
   :alt: View of roads for vehicles
 

docs/basic/vehicle.rst

@@ -89,15 +89,15 @@ Exercise 1: Vehicle routing - going
 
 .. rubric:: Problem:
 
-* From the "|place_3|" to the "|place_1|" by car.
+* From the "|place_1|" to the "|place_3|" by car.
 
 .. image:: images/chapter6/ad7.png
   :scale: 25%
-  :alt: From |place_3| to the |place_1| by car.
+  :alt: From |place_1| to the |place_3| by car.
 
 .. rubric:: Solution:
 
-* The vehicle is going from vertex |id_3| (line **10**) to |id_1| (line **11**).
+* The vehicle is going from vertex |id_1| (line **10**) to |id_3| (line **11**).
 * Use ``cost`` (line **6**) and ``reverse_cost`` (line **7**) columns, which are in unit ``degrees``.
 
 .. literalinclude:: ../scripts/basic/chapter_6/section-6.1.sql
@@ -117,15 +117,15 @@ Exercise 2: Vehicle routing - returning
 
 .. rubric:: Problem:
 
-* From "|place_1|" to the "|place_3|" by car.
+* From "|place_3|" to the "|place_1|" by car.
 
 .. image:: images/chapter6/ad8.png
   :scale: 25%
-  :alt: From |place_1| to the |place_3| by car.
+  :alt: From |place_3| to the |place_1| by car.
 
 .. rubric:: Solution:
 
-* The vehicle is going from vertex |id_1| (line **10**) to |id_3| (line **11**).
+* The vehicle is going from vertex |id_3| (line **10**) to |id_1| (line **11**).
 * Use ``cost`` (line **6**) and ``reverse_cost`` (line **7**) columns, which are in unit ``degrees``.
 
 .. literalinclude:: ../scripts/basic/chapter_6/section-6.1.sql

docs/general-intro/chapter-1.rst

@@ -53,6 +53,10 @@ Please see the :doc:`contents <../index>` for full content of this workshop.
         Steve: presents on Boston 2017
         Steve: presents on Germany 2017
         Vicky: presents on Argentina 2017
+        Vicky: presents on Bucharest 2019
+        Vicky: presents on Argentina 2021
+        Vicky & Rajat: presents on Firenze 2022
+
 
 Alphabetical Order:
 

docs/general-intro/chapter-3.rst

@@ -14,8 +14,10 @@ Installation
 
 All required tools are available on `OSGeoLive <http://live.osgeo.org>`__.
 
-* `OSGeoLive Quickstart for Running in a Virtual Machine <https://live.osgeo.org/en/quickstart/virtualization_quickstart.html>`__
-* `Creating an OSGeoLive Bootable USB flash drive <https://live.osgeo.org/en/quickstart/usb_quickstart.html>`__
+* `OSGeoLive Quickstart for Running in a Virtual Machine
+  <https://live.osgeo.org/en/quickstart/virtualization_quickstart.html>`__
+* `Creating an OSGeoLive Bootable USB flash drive
+  <https://live.osgeo.org/en/quickstart/usb_quickstart.html>`__
 
 .. important:: Before attending a workshop event, make sure your you can use
   `OSGeoLive` with either method or
@@ -63,64 +65,64 @@ Install Virtual box using:
   sudo apt-get update
   sudo apt-get install virtualbox-6.1
 
-More detailed and up to date information can be found `here <https://www.virtualbox.org/wiki/Linux_Downloads>`__
+More detailed and up to date information can be found `here
+<https://www.virtualbox.org/wiki/Linux_Downloads>`__
 
 
-Download OSGeoLive 14.0
+Download OSGeoLive 15.0
 ...............................................................................
 
-.. note:: The images on this section might not correspond to the VirtualBox version
-  you installed. But the workflow is similar.
+This installation corresponds for the ``iso`` distribution of OSGeoLive.
+For other installations visit `OSgeoLive <https://live.osgeo.org/en/index.html>`__
 
-.. todo update this image issue 131
+.. note::
+   The images on this section might not correspond to the VirtualBox
+   version installed on your system. The workflow is similar.
 
-* Go to https://sourceforge.net/projects/osgeo-live/files/14.0/ and download
-  *osgeolive-14.0-vmdk.7z*
+* download *osgeolive-15.0-amd64.iso*
 
+  From https://sourceforge.net/projects/osgeo-live/files/15.0/
 
   .. image:: images/chapter3/downloadOSGeoLive.png
        :width: 150px
 
-
 * Open VirtualBox and click :menuselection:`New`
 
   .. image:: images/chapter3/install-vm.png
        :width: 150px
 
-.. todo update this image issue 131
+* Fill required info
 
-* Fill *name* and *operating system*
+  :name: osgeolive 15
+  :Machine Folder: choose the appropriate location
+  :Type: choose the appropriate operating system
+  :Version: choose the 64 bit appropiate version
 
-  .. image:: images/chapter3/install-name.png
+  .. image:: images/chapter3/install-1.png
       :width: 150px
 
-.. todo update this image issue 131 (has 1024)
-
-* Fill *memory size*: Use 2048
+* Create a dynamically allocated storage hard disk
 
-  .. image:: images/chapter3/install-memory.png
+  .. image:: images/chapter3/install-2.png
       :width: 150px
 
-.. todo update this image issue 131
-
-* Fill *hard disk* & create
+* Choose storage from the virtual box traits
 
-  .. image:: images/chapter3/install-disk.png
+  .. image:: images/chapter3/install-3.png
       :width: 150px
 
-* Fill *General* & Choose *bidirectional* (to be able o use the clipboard between your computer and the virtual machine.)
+* Choose the empty disk and click on the Optical drive
 
-  .. image:: images/chapter3/install-general.png
-      :width: 150px
-
-* Double-click on *OSGeoLive14* & Read *Welcome message*
+  Select the `iso` file
 
-  .. image:: images/chapter3/install-welcome.png
+  .. image:: images/chapter3/install-4.png
       :width: 150px
 
-* Ready to use
+.. TODO update image to show the correct iso name
+
+* The virtual drive should look like this
 
-  .. image:: images/chapter3/install-final.png
+  .. image:: images/chapter3/install-5.png
       :width: 150px
 
 .. note:: OSGeoLive's account is ``user`` and password is ``user``

docs/general-intro/images/chapter3/CMakeLists.txt

@@ -4,14 +4,12 @@
 #---------------------
 set(PGR_WORKSHOP_IMG_FILES
   downloadOSGeoLive.png
-  install-disk.png
-  install-display.png
-  install-final.png
-  install-general.png
-  install-memory.png
-  install-name.png
+  install-1.png
+  install-2.png
+  install-3.png
+  install-4.png
+  install-4.png
   install-vm.png
-  install-welcome.png
   )
 
 

docs/scripts/basic/chapter_6/section-6.1.sql

@@ -23,8 +23,8 @@ SELECT * FROM pgr_dijkstra(
     reverse_cost
   FROM ways
   ',
-@ID_3@,
 @ID_1@,
+@ID_3@,
 directed := true);
 
 \o section-6.1.2.txt
@@ -38,8 +38,8 @@ SELECT * FROM pgr_dijkstra(
       reverse_cost
     FROM ways
   ',
-@ID_1@,
 @ID_3@,
+@ID_1@,
 directed := true);
 
 \o section-6.1.3.txt
@@ -97,7 +97,7 @@ FROM pgr_dijkstra(
 UPDATE configuration SET penalty=-1.0 WHERE tag_value IN ('steps','footway','pedestrian');
 
 -- Penalizing with 5 times the costs
-UPDATE configuration SET penalty=5 WHERE tag_value IN ('residential');
+UPDATE configuration SET penalty=5 WHERE tag_value IN ('unclassified');
 
 -- Encuraging the use of "fast" roads
 UPDATE configuration SET penalty=0.5 WHERE tag_value IN ('tertiary');

docs/scripts/basic/chapter_7/all_sections.sql

@@ -51,7 +51,7 @@ CREATE MATERIALIZED VIEW walk_net AS
     name, length_m, the_geom
   FROM ways JOIN configuration AS c
   USING (tag_id)
-  WHERE  c.tag_value NOT IN ('motorway','primary');
+  WHERE  c.tag_value NOT IN ('motorway','primary','unclassified');
 
 -- Verification3
 SELECT count(*) FROM walk_net;

locale/en/LC_MESSAGES/advanced/chapter-12.po

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara
+# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde
 # This file is distributed under the same license as the Workshop FOSS4G
-# Argentina package.
+# Firenze package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n"
+"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-04 09:41-0600\n"
+"POT-Creation-Date: 2022-07-14 13:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/en/LC_MESSAGES/appendix/appendix-2.po

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara
+# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde
 # This file is distributed under the same license as the Workshop FOSS4G
-# Argentina package.
+# Firenze package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n"
+"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-03 11:07-0600\n"
+"POT-Creation-Date: 2022-07-14 13:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/en/LC_MESSAGES/appendix/appendix-3.po

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara
+# Copyright (C) 2010-2022 Daniel Kastl, Vicky Vergara, Rajat Shinde
 # This file is distributed under the same license as the Workshop FOSS4G
-# Argentina package.
+# Firenze package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Workshop FOSS4G Argentina 2.7\n"
+"Project-Id-Version: Workshop FOSS4G Firenze 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-03 11:07-0600\n"
+"POT-Creation-Date: 2022-07-14 13:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"