Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mv develop to main #227

Merged
merged 6 commits into from
Mar 26, 2024
Merged

Mv develop to main #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c27f355
[admin] pump up version to 2.9.0
cvvergara Mar 13, 2023
bbd7404
Fixing typos on docs
cvvergara Mar 22, 2024
56f2fe8
(pot) updating the pot files
cvvergara Mar 22, 2024
60317bf
(sp) adding spanish translation
cvvergara Mar 22, 2024
abebec8
Removing obsolete entries
cvvergara Mar 22, 2024
858423f
(build) fix conflict
cvvergara Mar 26, 2024
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
8 changes: 4 additions & 4 deletions docs/basic/data.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pgRouting is installed as extension. This requires:
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.
Information about installing OSGeoLive can be found on :doc:`../general-intro/osgeolive`.

.. note:: If OSGeoLive is not being used, please refer to the chapter's appendix to set up the user "user".
.. note:: If OSGeoLive is not being used, please refer to the chapter's appendix to set up the user ``user``.

Create a pgRouting compatible database
-------------------------------------------------------------------------------
Expand All @@ -51,7 +51,7 @@ Get the Workshop Data
.. TODO get date

The pgRouting workshop will make use of OpenStreetMap data, which is already
available on `OSGeoLive <http://live.osgeo.org>`_. This workshop will use the
available on `OSGeoLive <https://live.osgeo.org>`_. This workshop will use the
``@PGR_WORKSHOP_CITY@`` city data and is a snapshot of @DATE_OF_DATA@.

Getting the data
Expand Down Expand Up @@ -95,7 +95,7 @@ More information about how to download OpenStreetMap data can be found in
https://wiki.openstreetmap.org/wiki/Downloading_data

An alternative for very large areas is to use the download services of
`Geofabrik <http://download.geofabrik.de>`_.
`Geofabrik <https://download.geofabrik.de>`_.


Upload data to the database
Expand Down Expand Up @@ -148,7 +148,7 @@ Chapter: Appendix
===============================================================================


OSGeoLive's account name on the database is ``"user"``. To easily use the workshop when not using
OSGeoLive's account name on the database is ``user``. To easily use the workshop when not using
OSGeoLive this extra steps are needed:

.. code-block:: bash
Expand Down
12 changes: 6 additions & 6 deletions docs/basic/pedestrian.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pgr_dijkstra
-------------------------------------------------------------------------------

Dijkstra algorithm was the first algorithm implemented in pgRouting. It doesn't
require other attributes than ``id``, ``source`` and ``target`` ID and ``cost``
require other attributes than the identifiers ``id``, ``source`` and ``target`` and the weights ``cost``
and ``reverse_cost``.

You can specify when to consider the graph as `directed
Expand Down Expand Up @@ -90,11 +90,11 @@ Get the vertex identifiers
.. literalinclude:: ../scripts/basic/chapter_5/exercise_5_0.txt
:linenos:

* |osmid_1| |place_1| (|id_1|)
* |osmid_2| |place_2| (|id_2|)
* |osmid_3| |place_3| (|id_3|)
* |osmid_4| |place_4| (|id_4|)
* |osmid_5| |place_5| (|id_5|)
* |osmid_1| |place_1| (|id_1|)
* |osmid_2| |place_2| (|id_2|)
* |osmid_3| |place_3| (|id_3|)
* |osmid_4| |place_4| (|id_4|)
* |osmid_5| |place_5| (|id_5|)


The corresponding :code:`id` are shown in the following image, and a sample route from
Expand Down
16 changes: 8 additions & 8 deletions docs/basic/plpgsql_function.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ The detailed description:
Column type Description
============ ========== ===
edges_subset REGCLASS Edge table name identifier.
lat1 NUMERIC The latitude of the `departure` point.
lon1 NUMERIC The longitude of the `departure` point.
lat2 NUMERIC The latitude of the `destination` point.
lon2 NUMERIC The longitude of the `destination` point.
lat1 NUMERIC The latitude of the `departure` point.
lon1 NUMERIC The longitude of the `departure` point.
lat2 NUMERIC The latitude of the `destination` point.
lon2 NUMERIC The longitude of the `destination` point.
do_debug BOOLEAN Flag to create a ``WARNING`` with the query that is been executed
============ ========== ===

Expand Down Expand Up @@ -246,7 +246,7 @@ Exercise 3: Nearest Vertex

* Calculate the OSM identifier of the nearest vertex to a point.

In particular use the following (lat,lon) value: ``(@POINT1_LAT@, @POINT1_LON@)``.
In particular use the following (lat,lon) value: ``(@POINT1_LAT@, @POINT1_LON@)``.

* calculate the nearest OSM identifier of the vertex to:

Expand Down Expand Up @@ -387,7 +387,7 @@ Exercise 5: Test nearest vertex function

* Test the ``wrk_NearestOSM`` function.

In particular use the following (lat,lon) values: ``(@POINT1_LAT@, @POINT1_LON@)``.
In particular use the following (lat,lon) values: ``(@POINT1_LAT@, @POINT1_LON@)``.

* The point is the same as in `Exercise 3: Nearest Vertex`_ problem.

Expand Down Expand Up @@ -566,8 +566,8 @@ Use ``wrk_fromAtoB``
* For ``vehicle_net``:

* The first parameter is the table name. (line **2**)
* The next two parameters are the latitude and longitude of the departure point. (line **3**)
* The next two parameters are the latitude and longitude of the destination point. (line **4**)
* The next two parameters are the latitude and longitude of the departure point. (line **3**)
* The next two parameters are the latitude and longitude of the destination point. (line **4**)

.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql
:language: sql
Expand Down
8 changes: 4 additions & 4 deletions docs/interactions/chapter-10.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ WMS server with GeoServer
===============================================================================

Now that we have a pl/pgsql wrapper, we will make it available as a WMS layer
using `GeoServer <http://geoserver.org/>`_.
using `GeoServer <https://geoserver.org/>`_.

The installation of GeoServer is out of the scope of this workshop, but if
you're using the `OSGeo Live <http://live.osgeo.org>`_ for this workshop then
you're using the `OSGeoLive <https://live.osgeo.org>`_ for this workshop then
you have GeoServer installed already.

Connect to the administration page
-------------------------------------------------------------------------------

In order to create the WMS layer, we need to connect to the administration
interface of GeoServer. On `OSGeo LiveDVD <http://live.osgeo.org>`_ Desktop,
interface of GeoServer. On `OSGeoLive <https://live.osgeo.org>`_ Desktop,
open the *Applications* menu on the desktop and then *Geospatial* > *Web Services* > *GeoServer* > *Start GeoServer*.

Once the server is up and running, open the `administration page
Expand All @@ -48,7 +48,7 @@ left menu of the page, inside the *Data* section, click *Workspaces* and then
Fill the form with:

:Name: ``pgrouting``
:Namespace URI: ``http://pgrouting.org``
:Namespace URI: ``https://pgrouting.org``

And press the ``submit`` button.

Expand Down
2 changes: 1 addition & 1 deletion docs/interactions/chapter-11.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ open it with a web browser.
:language: html

.. note::
This workshop assumes, that you use OSGeo Live, which includes the OpenLayers
This workshop assumes, that you use OSGeoLive, which includes the OpenLayers
Javascript library accessible under the following URL: http://localhost/openlayers/dist/
If you don't use OSGeo Live for this workshop, you need to adjust the URL to
OpenLayers Javascript and CSS file.
Expand Down
17 changes: 6 additions & 11 deletions docs/interactions/chapter-9.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,12 @@ locate the nearest vertex to a lat/lon location.
:height: 100pt
:align: Left

**Name** city_routing

**Host** localhost

**Port** 5432

**Database** city_routing

**User name** user

**Password** user
:Name: ``city_routing``
:Host: ``localhost``
:Port: ``5432``
:Database: ``city_routing``
:User name: ``user``
:Password: ``user``

#. Allow qgis to remember login and password

Expand Down
4 changes: 2 additions & 2 deletions docs/un_sdg/data.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pgRouting is pre-installed as an extension which requires:

These requirements are met on OSGeoLive. When the required software is
installed, open a terminal window by pressing ``ctrl-alt-t`` and follow the
instructions. Information about installing OSGeoLive can be found in
instructions. Information about installing OSGeoLive can be found in
:doc:`../general-intro/osgeolive` of this workshop.

.. note:: If you don't have pgRouting installed. You can find the installation
Expand Down Expand Up @@ -232,7 +232,7 @@ Bangladesh.
:language: bash
:linenos:

See :ref:`basic/data:Option 3) Download using Overpass XAPI`
See :ref:`basic/data:Option 3) Download using Overpass XAPI`

Upload Bangladesh data to the database
-------------------------------------------------------------------------------
Expand Down
16 changes: 8 additions & 8 deletions locale/en/LC_MESSAGES/basic/data.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-29 15:35+0000\n"
"POT-Creation-Date: 2024-03-22 11:12-0600\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.12.1\n"
"Generated-By: Babel 2.14.0\n"

#: ../../build/docs/basic/data.rst:12
msgid "Prepare Data"
Expand Down Expand Up @@ -59,7 +59,7 @@ msgstr ""
#: ../../build/docs/basic/data.rst:33
msgid ""
"If OSGeoLive is not being used, please refer to the chapter's appendix to"
" set up the user \"user\"."
" set up the user ``user``."
msgstr ""

#: ../../build/docs/basic/data.rst:36
Expand All @@ -83,8 +83,8 @@ msgstr ""
#: ../../build/docs/basic/data.rst:53
msgid ""
"The pgRouting workshop will make use of OpenStreetMap data, which is "
"already available on `OSGeoLive <http://live.osgeo.org>`_. This workshop "
"will use the ``Prizren`` city data and is a snapshot of March 2023."
"already available on `OSGeoLive <https://live.osgeo.org>`_. This workshop"
" will use the ``Prizren`` city data and is a snapshot of March 2023."
msgstr ""

#: ../../build/docs/basic/data.rst:58
Expand Down Expand Up @@ -127,7 +127,7 @@ msgstr ""
#: ../../build/docs/basic/data.rst:97
msgid ""
"An alternative for very large areas is to use the download services of "
"`Geofabrik <http://download.geofabrik.de>`_."
"`Geofabrik <https://download.geofabrik.de>`_."
msgstr ""

#: ../../build/docs/basic/data.rst:102
Expand Down Expand Up @@ -188,7 +188,7 @@ msgstr ""

#: ../../build/docs/basic/data.rst:151
msgid ""
"OSGeoLive's account name on the database is ``\"user\"``. To easily use "
"the workshop when not using OSGeoLive this extra steps are needed:"
"OSGeoLive's account name on the database is ``user``. To easily use the "
"workshop when not using OSGeoLive this extra steps are needed:"
msgstr ""

18 changes: 9 additions & 9 deletions locale/en/LC_MESSAGES/basic/pedestrian.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-29 15:35+0000\n"
"POT-Creation-Date: 2024-03-22 11:12-0600\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.12.1\n"
"Generated-By: Babel 2.14.0\n"

#: ../../build/docs/basic/pedestrian.rst:11
msgid "Pedestrian Routing"
Expand All @@ -42,8 +42,8 @@ msgstr ""
#: ../../build/docs/basic/pedestrian.rst:27
msgid ""
"Dijkstra algorithm was the first algorithm implemented in pgRouting. It "
"doesn't require other attributes than ``id``, ``source`` and ``target`` "
"ID and ``cost`` and ``reverse_cost``."
"doesn't require other attributes than the identifiers ``id``, ``source`` "
"and ``target`` and the weights ``cost`` and ``reverse_cost``."
msgstr ""

#: ../../build/docs/basic/pedestrian.rst:31
Expand Down Expand Up @@ -125,23 +125,23 @@ msgid "Get the vertex identifiers"
msgstr ""

#: ../../build/docs/basic/pedestrian.rst:93
msgid "|osmid_1| |place_1| (|id_1|)"
msgid "|osmid_1| |place_1| (|id_1|)"
msgstr ""

#: ../../build/docs/basic/pedestrian.rst:94
msgid "|osmid_2| |place_2| (|id_2|)"
msgid "|osmid_2| |place_2| (|id_2|)"
msgstr ""

#: ../../build/docs/basic/pedestrian.rst:95
msgid "|osmid_3| |place_3| (|id_3|)"
msgid "|osmid_3| |place_3| (|id_3|)"
msgstr ""

#: ../../build/docs/basic/pedestrian.rst:96
msgid "|osmid_4| |place_4| (|id_4|)"
msgid "|osmid_4| |place_4| (|id_4|)"
msgstr ""

#: ../../build/docs/basic/pedestrian.rst:97
msgid "|osmid_5| |place_5| (|id_5|)"
msgid "|osmid_5| |place_5| (|id_5|)"
msgstr ""

#: ../../build/docs/basic/pedestrian.rst:100
Expand Down
24 changes: 11 additions & 13 deletions locale/en/LC_MESSAGES/basic/plpgsql_function.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-20 15:49-0600\n"
"POT-Creation-Date: 2024-03-22 11:12-0600\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.12.1\n"
"Generated-By: Babel 2.14.0\n"

#: ../../build/docs/basic/plpgsql_function.rst:11
msgid "pl/pgsql function"
Expand Down Expand Up @@ -118,31 +118,31 @@ msgid "NUMERIC"
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:41
msgid "The latitude of the `departure` point."
msgid "The latitude of the `departure` point."
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:42
msgid "lon1"
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:42
msgid "The longitude of the `departure` point."
msgid "The longitude of the `departure` point."
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:43
msgid "lat2"
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:43
msgid "The latitude of the `destination` point."
msgid "The latitude of the `destination` point."
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:44
msgid "lon2"
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:44
msgid "The longitude of the `destination` point."
msgid "The longitude of the `destination` point."
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:45
Expand Down Expand Up @@ -502,9 +502,7 @@ msgid "Calculate the OSM identifier of the nearest vertex to a point."
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:249
msgid ""
"In particular use the following (lat,lon) value: ``(42.2151, "
"20.729354)``."
msgid "In particular use the following (lat,lon) value: ``(42.2151, 20.729354)``."
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:251
Expand Down Expand Up @@ -727,7 +725,7 @@ msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:390
msgid ""
"In particular use the following (lat,lon) values: ``(42.2151, "
"In particular use the following (lat,lon) values: ``(42.2151, "
"20.729354)``."
msgstr ""

Expand Down Expand Up @@ -982,14 +980,14 @@ msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:569
msgid ""
"The next two parameters are the latitude and longitude of the departure "
"The next two parameters are the latitude and longitude of the departure "
"point. (line **3**)"
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:570
msgid ""
"The next two parameters are the latitude and longitude of the "
"destination point. (line **4**)"
"The next two parameters are the latitude and longitude of the destination"
" point. (line **4**)"
msgstr ""

#: ../../build/docs/basic/plpgsql_function.rst:581
Expand Down
Loading
Loading