Merge pull request #237 from cvvergara/refining-sdg11-chapter

Refs/heads/refining sdg11 chapter

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+      interval: "weekly"

.github/scripts/update_locale.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+# ------------------------------------------------------------------------------
+# /*PGR-GNU*****************************************************************
+# File: update_locale.sh
+# Copyright (c) 2021 pgRouting developers
+# Mail: [email protected]
+# ------
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# ********************************************************************PGR-GNU*/
+# ------------------------------------------------------------------------------
+
+DIR=$(git rev-parse --show-toplevel)
+
+pushd "${DIR}" > /dev/null || exit 1
+
+mkdir -p build
+pushd build > /dev/null || exit 1
+cmake -DLOCALE=ON ..
+
+make locale
+popd > /dev/null || exit 1
+
+# List all the files that needs to be committed in build/docs/locale_changes.txt
+awk '/^Update|^Create/{print $2}' build/docs/locale_changes.txt > build/docs/locale_changes_po.txt # .po files
+cp build/docs/locale_changes_po.txt build/docs/locale_changes_po_pot.txt
+perl -ne '/\/en\// && print' build/docs/locale_changes_po.txt | \
+    perl -pe 's/(.*)en\/LC_MESSAGES(.*)/$1pot$2t/' >> build/docs/locale_changes_po_pot.txt  # .pot files
+
+# Remove obsolete entries #~ from .po files
+bash .github/scripts/remove_obsolete_entries.sh
+
+while read -r f; do git add "$f"; done < build/docs/locale_changes_po_pot.txt
+
+popd > /dev/null || exit 1

.github/workflows/locale.yml

@@ -0,0 +1,98 @@
+name: Update Locale
+
+# This action runs:
+# - When this file changes
+# - When changes on documentation (doc)
+# - When is triggered manually
+
+on:
+  workflow_dispatch:
+  push:
+
+permissions:
+  contents: write
+
+jobs:
+  update-locale:
+    name: Update Locale
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get postgres version
+        run: |
+          sudo service postgresql start
+          pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()')
+          echo "PGVER=${pgver}" >> $GITHUB_ENV
+          echo "PGIS=3" >> $GITHUB_ENV
+
+      - name: Extract branch name and commit hash
+        run: |
+          branch=${GITHUB_REF#refs/heads/}
+          git_hash=$(git rev-parse --short "$GITHUB_SHA")
+          echo "GIT_HASH=$git_hash" >> $GITHUB_ENV
+
+      - name: Add PostgreSQL APT repository
+        run: |
+          sudo apt-get install curl ca-certificates gnupg
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \
+            $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+
+      - name: Install python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y osm2pgrouting \
+            postgresql-${PGVER}-postgis-${PGIS} \
+            postgresql-${PGVER}-postgis-${PGIS}-scripts \
+            postgresql-${PGVER}-pgrouting
+
+          python -m pip install --upgrade pip
+          pip install -r REQUIREMENTS.txt
+          pip list
+
+      - name: Configure
+        run: |
+          service postgresql status
+          sudo service postgresql start
+          service postgresql status
+          sudo -u postgres createdb -p ${POSTGRES_PORT}  setup
+          sudo -u postgres psql -c 'CREATE ROLE "runner" SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN PASSWORD $$runner$$;' -d setup
+          echo :5432:*:runner:runner >> .pgpass
+          sudo -u postgres psql -c 'CREATE ROLE "user" SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN PASSWORD $$user$$;' -d setup
+          echo :5432:*:user:user >> .pgpass
+          mkdir build
+          cd build
+          cmake -DLOCALE=ON ..
+        env:
+          POSTGRES_HOST: localhost
+          POSTGRES_PORT: 5432
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: setup
+
+      - name: Initialize mandatory git config
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Update locale
+        run: |
+          bash .github/scripts/update_locale.sh
+
+          # Add the files, commit and push
+          git diff --staged --quiet || git commit -m "Update locale: commit ${{ env.GIT_HASH }}"
+          git restore .  # Remove the unstaged changes before rebasing
+          git push

.github/workflows/ubuntu.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get postgres version
         run: |
@@ -28,7 +28,7 @@ jobs:
             $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 
       - name: Install python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

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

@@ -1,15 +1,15 @@
-name: Update Locale and Website
+name: Update Website
 
 on:
   workflow_dispatch:
   push:
     branches:
       - develop
-      - un-challenge
+      - main
 
 jobs:
   update-documentation:
-    name: Update Locale and Website
+    name: Update Website
     runs-on: ubuntu-latest
 
     strategy:
@@ -44,7 +44,7 @@ jobs:
             $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 
       - name: Install python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -90,25 +90,6 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-      - name: Update locale
-        if: github.ref == 'refs/heads/develop'
-        run: |
-          # List all the files that needs to be committed in build/docs/locale_changes.txt
-          awk '/^Update|^Create/{print $2}' build/docs/locale_changes.txt > tmp && mv tmp build/docs/locale_changes.txt        # .po files
-          cat build/docs/locale_changes.txt | perl -pe 's/(.*)en\/LC_MESSAGES(.*)/$1pot$2t/' >> build/docs/locale_changes.txt  # .pot files
-          cat build/docs/locale_changes.txt
-
-          # Remove obsolete entries #~ from .po files
-          tools/transifex/remove_obsolete_entries.sh
-
-          # Add the files, commit and push
-          for line in `cat build/docs/locale_changes.txt`; do git add "$line"; done
-          git diff --staged --quiet || git commit -m "Update locale: commit ${{ env.GIT_HASH }}"
-          git fetch origin develop
-          git restore .  # Remove the unstaged changes before rebasing
-          git rebase origin/develop
-          git push origin develop
-
       - name: Update Website
         run: |
           if [[ "${{ env.BRANCH }}" == "develop" ]]; then

docs/index.rst

@@ -49,7 +49,6 @@ United Nations Sustainable Development Goals
    un_sdg/sdg3-health.rst
    un_sdg/sdg7-energy.rst
    un_sdg/sdg11-cities.rst
-   un_sdg/appendix.rst
 
 Interaction with other software
 ===============================================================================

docs/scripts/un_sdg/sdg11/all_exercises_sdg11.sql

@@ -1,74 +1,107 @@
--- Enumerate all the schemas
-\dn
+\o create_city1.txt
 
+CREATE TABLE bangladesh (
+  id BIGINT,
+  name TEXT,
+  geom geometry,
+  city_buffer geometry
+);
 
--- Show the current search path
-SHOW search_path;
+\o create_city2.txt
 
--- Set the search path
-SET search_path TO waterways,public;
-SHOW search_path;
+INSERT INTO bangladesh(id, name, geom) VALUES
+(5, 'Munshigang',  ST_SetSRID(ST_Point(89.1967, 22.2675), 4326));
 
+\o create_city3.txt
+
+UPDATE bangladesh
+SET city_buffer = ST_Buffer((geom),0.005)
+WHERE  name = 'Munshigang';
 
--- Enumerate all the tables
+\o create_city4.txt
+\dS+ bangladesh
+\o set_path.txt
+SET search_path TO waterways,public;
+SHOW search_path;
+\o get_extensions.txt
+\dx
+\o get_tables.txt
 \dt
-\o exercise_1.txt
-CREATE TABLE city_vertex (id BIGINT, name TEXT, geom geometry);
-INSERT INTO city_vertex(id, name, geom) VALUES (
-5,'Munshigang', ST_SetSRID(ST_Point(89.1967,22.2675),4326));
 \o exercise_6.txt
+
 SELECT count(*) FROM waterways_ways;
-\o exercise_7.txt
-DELETE FROM waterways_ways 
-WHERE osm_id 
+
+\o delete1.txt
+
+DELETE FROM waterways_ways
+WHERE osm_id
 IN (721133202, 908102930, 749173392, 652172284, 126774195, 720395312);
-\o exercise_8.txt
--- Add a column for storing the component
-ALTER TABLE waterways_ways_vertices_pgr
-ADD COLUMN component INTEGER;
 
-ALTER TABLE waterways_ways
-ADD COLUMN component INTEGER;
--- Get the Connected Components of Waterways
-UPDATE waterways_ways_vertices_pgr SET component = subquery.component
-FROM (SELECT * FROM pgr_connectedComponents(
-'SELECT gid AS id, source, target, cost, reverse_cost FROM waterways_ways')
-) AS subquery
+\o delete2.txt
+
+DELETE FROM waterways_ways WHERE osm_id = 815893446;
+
+\o only_connected1.txt
+
+SELECT * INTO waterways.waterways_vertices
+FROM pgr_extractVertices(
+  'SELECT gid AS id, source, target
+  FROM waterways.waterways_ways ORDER BY id');
+
+\o only_connected2.txt
+
+UPDATE waterways_vertices SET geom = ST_startPoint(the_geom)
+FROM waterways_ways WHERE source = id;
+
+UPDATE waterways_vertices SET geom = ST_endPoint(the_geom)
+FROM waterways_ways WHERE geom IS NULL AND target = id;
+
+UPDATE waterways_vertices set (x,y) = (ST_X(geom), ST_Y(geom));
+
+\o only_connected3.txt
+
+ALTER TABLE waterways_ways ADD COLUMN component BIGINT;
+ALTER TABLE waterways_vertices ADD COLUMN component BIGINT;
+
+\o only_connected4.txt
+
+UPDATE waterways_vertices SET component = c.component
+FROM (
+  SELECT * FROM pgr_connectedComponents(
+  'SELECT gid as id, source, target, cost, reverse_cost FROM waterways_ways')
+) AS c
 WHERE id = node;
 
-UPDATE waterways_ways SET component=a.component FROM (
-SELECT id, component FROM waterways_ways_vertices_pgr
-) AS a  
-WHERE id = source;
-\o exercise_9.txt
--- Adding column to store Buffer geometry
-ALTER TABLE waterways.city_vertex
-ADD COLUMN city_buffer geometry;
--- Storing Buffer geometry
-UPDATE waterways.city_vertex 
-SET city_buffer = ST_Buffer((geom),0.005) 
-WHERE  name = 'Munshigang';
--- Showing results of Buffer operation
-SELECT city_buffer FROM waterways.city_vertex;
+\o only_connected5.txt
+
+UPDATE waterways_ways SET component = v.component
+FROM (SELECT id, component FROM waterways_vertices) AS v
+WHERE source = v.id;
+
 \o exercise_10.txt
+
 CREATE OR REPLACE FUNCTION get_city_buffer(city_id INTEGER)
 RETURNS geometry AS
-$BODY$                                                                         
-SELECT city_buffer FROM city_vertex WHERE id = city_id;
+$BODY$
+  SELECT city_buffer FROM bangladesh WHERE id = city_id;
 $BODY$
 LANGUAGE SQL;
+
 \o exercise_11.txt
--- Intersection of City Buffer and River Components
+
 SELECT DISTINCT component
-FROM waterways.city_vertex, waterways.waterways_ways
-WHERE ST_Intersects(the_geom, get_city_buffer(5));
-\o exercise_12.txt
--- Buffer of River Components
+FROM bangladesh JOIN waterways.waterways_ways
+ON (ST_Intersects(the_geom, get_city_buffer(5)));
+
+\o get_rain_zone1.txt
+
 ALTER TABLE waterways_ways
 ADD COLUMN rain_zone geometry;
--- Storing Buffer geometry (rain_zone)
-UPDATE waterways.waterways_ways 
-SET rain_zone = ST_Buffer((the_geom),0.005) 
+
+\o get_rain_zone2.txt
+
+UPDATE waterways.waterways_ways
+SET rain_zone = ST_Buffer((the_geom),0.005)
 WHERE ST_Intersects(the_geom, get_city_buffer(5));
 \o exercise_13.txt
 -- Combining mutliple rain zones

docs/un_sdg/CMakeLists.txt

@@ -11,7 +11,6 @@ set(PGR_WORKSHOP_FILES
   sdg3-health.rst
   sdg7-energy.rst
   sdg11-cities.rst
-  appendix.rst
   )