diff --git a/.github/scripts/update_locale.sh b/.github/scripts/update_locale.sh index 119704a59..c9788b868 100755 --- a/.github/scripts/update_locale.sh +++ b/.github/scripts/update_locale.sh @@ -1,5 +1,4 @@ #!/bin/bash -# ------------------------------------------------------------------------------ # /*PGR-GNU***************************************************************** # File: update_locale.sh # Copyright (c) 2021 pgRouting developers @@ -17,7 +16,6 @@ # 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) @@ -25,7 +23,7 @@ pushd "${DIR}" > /dev/null || exit 1 mkdir -p build pushd build > /dev/null || exit 1 -cmake -DLOCALE=ON .. +cmake -DBUILD_HTML=OFF -DBUILD_LOCALE=ON .. make locale popd > /dev/null || exit 1 @@ -33,16 +31,19 @@ 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 | \ + +if [ -s build/docs/locale_changes_po.txt ]; then + + 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 -# Do not create empty translation files -git status locale/es --porcelain | awk 'match($1, "?"){print $2}' | xargs -r rm -rf -git status locale/ja --porcelain | awk 'match($1, "?"){print $2}' | xargs -r rm -rf +fi # Remove obsolete entries #~ from .po files -bash .github/scripts/remove_obsolete_entries.sh +find locale -type f -name '*.po' -exec sh -c ' + msgattrib --no-obsolete -o "$1" "$1" + ' sh {} \; -cat build/docs/locale_changes_po_pot.txt | xargs -I {} sh -c "(ls {} >> /dev/null 2>&1 && git add {} )" +while read -r f; do git add "$f"; done < build/docs/locale_changes_po_pot.txt popd > /dev/null || exit 1 diff --git a/.github/workflows/locale.yml b/.github/workflows/locale.yml index bf317eb29..899999249 100644 --- a/.github/workflows/locale.yml +++ b/.github/workflows/locale.yml @@ -74,8 +74,6 @@ jobs: 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 diff --git a/.tx/config b/.tx/config deleted file mode 100644 index a0e259dff..000000000 --- a/.tx/config +++ /dev/null @@ -1,159 +0,0 @@ -[main] -host = https://www.transifex.com - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-advanced-chapter-12-po--develop] -file_filter = locale//LC_MESSAGES/advanced/chapter-12.po -source_file = locale/pot/advanced/chapter-12.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-appendix-appendix-2-po--develop] -file_filter = locale//LC_MESSAGES/appendix/appendix-2.po -source_file = locale/pot/appendix/appendix-2.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-appendix-appendix-3-po--develop] -file_filter = locale//LC_MESSAGES/appendix/appendix-3.po -source_file = locale/pot/appendix/appendix-3.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-appendix-appendix-4-po--develop] -file_filter = locale//LC_MESSAGES/appendix/appendix-4.po -source_file = locale/pot/appendix/appendix-4.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-basic-appendix-po--develop] -file_filter = locale//LC_MESSAGES/basic/appendix.po -source_file = locale/pot/basic/appendix.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-basic-data-po--develop] -file_filter = locale//LC_MESSAGES/basic/data.po -source_file = locale/pot/basic/data.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-basic-pedestrian-po--develop] -file_filter = locale//LC_MESSAGES/basic/pedestrian.po -source_file = locale/pot/basic/pedestrian.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-basic-plpgsql-function-po--develop] -file_filter = locale//LC_MESSAGES/basic/plpgsql_function.po -source_file = locale/pot/basic/plpgsql_function.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-basic-sql-function-po--develop] -file_filter = locale//LC_MESSAGES/basic/sql_function.po -source_file = locale/pot/basic/sql_function.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-basic-vehicle-po--develop] -file_filter = locale//LC_MESSAGES/basic/vehicle.po -source_file = locale/pot/basic/vehicle.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-examples-boost-dijkstra-po--develop] -file_filter = locale//LC_MESSAGES/examples/boost_dijkstra.po -source_file = locale/pot/examples/boost_dijkstra.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-examples-hanoslav-po--develop] -file_filter = locale//LC_MESSAGES/examples/hanoslav.po -source_file = locale/pot/examples/hanoslav.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-examples-wiki-example-po--develop] -file_filter = locale//LC_MESSAGES/examples/wiki_example.po -source_file = locale/pot/examples/wiki_example.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-general-intro-chapter-1-po--develop] -file_filter = locale//LC_MESSAGES/general-intro/chapter-1.po -source_file = locale/pot/general-intro/chapter-1.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-general-intro-chapter-2-po--develop] -file_filter = locale//LC_MESSAGES/general-intro/chapter-2.po -source_file = locale/pot/general-intro/chapter-2.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-general-intro-chapter-3-po--develop] -file_filter = locale//LC_MESSAGES/general-intro/chapter-3.po -source_file = locale/pot/general-intro/chapter-3.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-index-po--develop] -file_filter = locale//LC_MESSAGES/index.po -source_file = locale/pot/index.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-interactions-chapter-10-po--develop] -file_filter = locale//LC_MESSAGES/interactions/chapter-10.po -source_file = locale/pot/interactions/chapter-10.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-interactions-chapter-11-po--develop] -file_filter = locale//LC_MESSAGES/interactions/chapter-11.po -source_file = locale/pot/interactions/chapter-11.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-interactions-chapter-9-po--develop] -file_filter = locale//LC_MESSAGES/interactions/chapter-9.po -source_file = locale/pot/interactions/chapter-9.pot -source_lang = en -type = PO - -[o:pgrouting:p:pgrouting-workshop:r:locale-en-lc-messages-un-sdg-appendix-po--develop] -file_filter = locale//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//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//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//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//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//LC_MESSAGES/un_sdg/sdg7-energy.po -source_file = locale/pot/un-sdg/sdg7-energy.pot -source_lang = en -type = PO - diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index afd25b383..ec52e2550 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -43,68 +43,73 @@ add_subdirectory(_themes) set(SPHINX_DOCUMENTATION_DIR "${CMAKE_CURRENT_BINARY_DIR}") set(SPHINX_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/_build") +foreach (format ${PGR_WORKSHOP_DOC_TARGETS}) -# build the locale files -if (LOCALE) - add_custom_target(locale ALL - COMMAND ${SPHINX_EXECUTABLE} + message(STATUS "format=${format}") + if ("${format}" STREQUAL "locale") - -b gettext + find_program(SPHINX_INTL_EXECUTABLE + NAMES sphinx-intl + DOC "Sphinx Documentation Builder (sphinx-doc.org)" + ) - # the location of the documentation to be build - "${CMAKE_CURRENT_BINARY_DIR}" - "${CMAKE_SOURCE_DIR}/locale/pot" + if (SPHINX_INTL_EXECUTABLE) - COMMAND sphinx-intl update -d ${CMAKE_SOURCE_DIR}/locale -l ${SPHINXINTL_LANGUAGE} > locale_changes.txt - DEPENDS "conf.py" + add_custom_target(locale + COMMAND ${SPHINX_EXECUTABLE} + -b gettext + -c "${SPHINX_DOCUMENTATION_DIR}" + "${SPHINX_DOCUMENTATION_DIR}" + "${CMAKE_SOURCE_DIR}/locale/pot" - COMMENT "Generating POT & PO files ..." - ) - add_dependencies(locale examples general-intro advanced appendix basic un_sdg scripts interactions) - add_dependencies(doc locale) -endif() + COMMAND ${SPHINX_INTL_EXECUTABLE} update + -d ${CMAKE_SOURCE_DIR}/locale + -l en > locale_changes.txt + COMMENT "Generating POT and PO files" + SOURCES ${PROJECT_DOC_FILES}) + add_dependencies("${format}" examples general-intro advanced appendix basic un_sdg scripts interactions) + add_dependencies(doc "${format}") -foreach (target ${PGR_WORKSHOP_DOC_TARGETS}) - add_custom_target(${target} ALL - COMMENT "Building documentation with Sphinx") + else() - configure_file("forward.html" "${SPHINX_BUILD_DIR}/${target}/index.html") + message(WARNING "sphinx-intl not found. + Not building the pot and po locale files") - foreach (lang ${PGR_WORKSHOP_BUILD_LANGUAGES}) - if (lang STREQUAL "en") - set(WARNINGS_TO_ERRORS "") - else() - set(WARNINGS_TO_ERRORS "") endif() - message(STATUS "lang ${lang}") - message(STATUS "WARNINGS_TO_ERRORS ${WARNINGS_TO_ERRORS}") + else() - add_custom_target( - "${target}-${lang}" - COMMAND ${SPHINX_EXECUTABLE} + add_custom_target("${format}" + COMMENT "Building ${format} documentation with Sphinx") - -b ${target} - -c "${CMAKE_CURRENT_BINARY_DIR}" - -D language='${lang}' + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/forward.html" + "${SPHINX_BUILD_DIR}/${format}/index.html") - # Convert warnings to errors - ${WARNINGS_TO_ERRORS} + foreach (lang ${PGR_WORKSHOP_BUILD_LANGUAGES}) - # the location of the documentation to be build - "${CMAKE_CURRENT_BINARY_DIR}" + add_custom_target( + "${format}-${lang}" + COMMAND ${SPHINX_EXECUTABLE} + -c ${CMAKE_CURRENT_BINARY_DIR} + -d ${CMAKE_CURRENT_BINARY_DIR}/doctrees + -b ${format} + -D language='${lang}' + ${sphinx_flags} + "${CMAKE_CURRENT_BINARY_DIR}" + "${SPHINX_BUILD_DIR}/${format}/${lang}" - #where the documentations is written - "${SPHINX_BUILD_DIR}/${target}/${lang}" + COMMENT "Generating ${format}/${lang} documentation" + DEPENDS "conf.py" + ) + add_dependencies("${format}-${lang}" examples general-intro advanced appendix basic un_sdg scripts interactions) + add_dependencies("${format}" "${format}-${lang}") + endforeach() - COMMENT "Generating ${target}/${lang} documentation ${WARNINGS_TO_ERRORS}..." + add_dependencies(doc "${format}") + + endif() - DEPENDS "conf.py" - ) - add_dependencies("${target}-${lang}" examples general-intro advanced appendix basic un_sdg scripts interactions) - add_dependencies("${target}" "${target}-${lang}") - endforeach() - add_dependencies(doc "${target}") endforeach() diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index 312cf8330..000000000 --- a/docs/Makefile +++ /dev/null @@ -1,158 +0,0 @@ -# Makefile for Sphinx documentation -# - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = _build -POTFILESDIR = ../locale/pot - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source - -.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext - -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - -rm -rf $(BUILDDIR)/* - -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -server: - @echo "Running dev. server on port 4001." - cd build/html && python -m SimpleHTTPServer 4001 - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SDPlanning.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SDPlanning.qhc" - -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/SDPlanning" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SDPlanning" - @echo "# devhelp" - -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(POTFILESDIR) - @echo - @echo "Build finished. The message catalogs are in $(POTFILESDIR)" - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." diff --git a/docs/basic/CMakeLists.txt b/docs/basic/CMakeLists.txt index 973895bbc..6c733c363 100644 --- a/docs/basic/CMakeLists.txt +++ b/docs/basic/CMakeLists.txt @@ -9,7 +9,7 @@ set(PGR_WORKSHOP_FILES data.rst pedestrian.rst vehicle.rst - graph_views.rst + graphs.rst sql_function.rst plpgsql_function.rst ) diff --git a/docs/basic/data.rst b/docs/basic/data.rst index cbc1c4520..54a90e859 100644 --- a/docs/basic/data.rst +++ b/docs/basic/data.rst @@ -11,7 +11,7 @@ Prepare Data ############################################################################### -.. image:: images/chapter4/prepareData.png +.. image:: images/data/prepareData.png :align: center To be able to use pgRouting, data has to be imported into a database. @@ -147,13 +147,13 @@ Run the osm2pgrouting converter Tables on the database ------------------------------------------------------------------------------- -.. literalinclude:: ../scripts/basic/chapter_4/section-4.3.2.sh +.. literalinclude:: ../scripts/basic/data/data.sh :start-after: 4.3.2 from-here :end-before: 4.3.2 to-here If everything went well the result should look like this: -.. literalinclude:: ../scripts/basic/chapter_4/section-4.3.2.txt +.. literalinclude:: ../scripts/basic/data/data.txt Chapter: Appendix diff --git a/docs/basic/graph_views.rst b/docs/basic/graphs.rst similarity index 78% rename from docs/basic/graph_views.rst rename to docs/basic/graphs.rst index 9417aa80a..f7d37c389 100644 --- a/docs/basic/graph_views.rst +++ b/docs/basic/graphs.rst @@ -11,7 +11,7 @@ Graph views ############################################################################### -.. image:: images/chapter5/route.png +.. image:: images/pedestrian/route.png :scale: 25% :align: center @@ -91,7 +91,7 @@ Create the vertices table corresponding to the edges in ``ways``. - From the requirements, the graph is going to be based on OSM identifiers. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :emphasize-lines: 3 :start-after: create_vertices.txt @@ -99,28 +99,28 @@ Create the vertices table corresponding to the edges in ``ways``. .. collapse:: Number of inserted records - .. literalinclude:: ../scripts/basic/chapter_7/create_vertices.txt + .. literalinclude:: ../scripts/basic/graphs/create_vertices.txt Reviewing the description of the vertices table -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :start-after: vertices_description.txt :end-before: selected_rows.txt .. collapse:: Description - .. literalinclude:: ../scripts/basic/chapter_7/vertices_description.txt + .. literalinclude:: ../scripts/basic/graphs/vertices_description.txt Inspecting the information on the vertices table -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: selected_rows.txt :end-before: fill_columns_1.txt .. collapse:: Data on table - .. literalinclude:: ../scripts/basic/chapter_7/selected_rows.txt + .. literalinclude:: ../scripts/basic/graphs/selected_rows.txt Exercise 2: Fill up other columns in the vertices table @@ -134,73 +134,73 @@ Fill up geometry information on the vertices table. Count the number of rows that need to be filled up. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :start-after: fill_columns_1.txt :end-before: fill_columns_2.txt .. collapse:: Number of rows with empty geometry - .. literalinclude:: ../scripts/basic/chapter_7/fill_columns_1.txt + .. literalinclude:: ../scripts/basic/graphs/fill_columns_1.txt * Update the ``geom`` columns based on the ``source_osm`` column from ``ways`` table. * Use the start point of the geometry. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: fill_columns_2.txt :end-before: fill_columns_3.txt .. collapse:: Number of updated records - .. literalinclude:: ../scripts/basic/chapter_7/fill_columns_2.txt + .. literalinclude:: ../scripts/basic/graphs/fill_columns_2.txt Not expecting to be done due to the fact that some vertices are only dead ends. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: fill_columns_3.txt :end-before: fill_columns_4.txt .. collapse:: Numbers of records that need update - .. literalinclude:: ../scripts/basic/chapter_7/fill_columns_3.txt + .. literalinclude:: ../scripts/basic/graphs/fill_columns_3.txt * Update the ``geom`` columns based on the ``target_osm`` column from ``ways`` table. * Use the end point of the geometry. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: fill_columns_4.txt :end-before: fill_columns_5.txt .. collapse:: Number of updated records - .. literalinclude:: ../scripts/basic/chapter_7/fill_columns_4.txt + .. literalinclude:: ../scripts/basic/graphs/fill_columns_4.txt Expecting to be done, that is the geometry column should not have a ``NULL`` value. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: fill_columns_5.txt :end-before: fill_columns_6.txt .. collapse:: Count should be 0 - .. literalinclude:: ../scripts/basic/chapter_7/fill_columns_5.txt + .. literalinclude:: ../scripts/basic/graphs/fill_columns_5.txt Update the ``x`` and ``y`` columns based on the ``geom`` column. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: fill_columns_6.txt :end-before: set_components1.txt .. collapse:: Number of updated records - .. literalinclude:: ../scripts/basic/chapter_7/fill_columns_6.txt + .. literalinclude:: ../scripts/basic/graphs/fill_columns_6.txt pgr_connectedComponents @@ -234,14 +234,14 @@ Get the information about the graph components. Create additional columns on the edges and vertices tables. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: set_components1.txt :end-before: set_components2.txt .. collapse:: Message about creation of columns - .. literalinclude:: ../scripts/basic/chapter_7/set_components1.txt + .. literalinclude:: ../scripts/basic/graphs/set_components1.txt - Use the ``pgr_connectedComponents`` to fill up the vertices table. @@ -249,7 +249,7 @@ Create additional columns on the edges and vertices tables. (**line 1**) - Use the OSM identifiers of the vertices. (**lines 4-5**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :emphasize-lines: 1, 4-5 :start-after: set_components2.txt @@ -257,18 +257,18 @@ Create additional columns on the edges and vertices tables. .. collapse:: Number of updated records - .. literalinclude:: ../scripts/basic/chapter_7/set_components2.txt + .. literalinclude:: ../scripts/basic/graphs/set_components2.txt - Update the edges table with based on the component number of the vertex -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: set_components3.txt :end-before: see_components1.txt .. collapse:: Number of updated records - .. literalinclude:: ../scripts/basic/chapter_7/set_components3.txt + .. literalinclude:: ../scripts/basic/graphs/set_components3.txt Exercise 4: Inspect the components @@ -289,55 +289,55 @@ Answer the following questions: Count the distinct components. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: see_components1.txt :end-before: see_components2.txt .. collapse:: Number of components on vertex table - .. literalinclude:: ../scripts/basic/chapter_7/see_components1.txt + .. literalinclude:: ../scripts/basic/graphs/see_components1.txt 2. How many components are in the edges table? Count the distinct components. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: see_components2.txt :end-before: see_components3.txt .. collapse:: Number of components on edge table - .. literalinclude:: ../scripts/basic/chapter_7/see_components2.txt + .. literalinclude:: ../scripts/basic/graphs/see_components2.txt 3. List the 10 components with more edges. * Count number of rows grouped by component. (**line 1**) * Inverse order to display the top 10. (**line 2**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: see_components3.txt :end-before: see_components4.txt .. collapse:: Top 10 components - .. literalinclude:: ../scripts/basic/chapter_7/see_components3.txt + .. literalinclude:: ../scripts/basic/graphs/see_components3.txt 4. Get the component with the maximum number of edges. * Use the query from last question to get the maximum count * Get the component that matches the maximum value. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: see_components4.txt :end-before: create_vehicle_net1.txt .. collapse:: Component with maxmum edge count - .. literalinclude:: ../scripts/basic/chapter_7/see_components4.txt + .. literalinclude:: ../scripts/basic/graphs/see_components4.txt @@ -347,7 +347,7 @@ Preparing the graphs Exercise 5: Creating a view for routing ------------------------------------------------------------------------------- -.. image:: images/chapter7/vehicle_net.png +.. image:: images/graphs/vehicle_net.png :scale: 25% :alt: View of roads for vehicles @@ -382,7 +382,7 @@ Creating the view: - Exclude `steps`, `footway`, `path`, `cycleway`. (line **18**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :emphasize-lines: 6-10,14-16,18 :start-after: create_vehicle_net1.txt @@ -390,35 +390,35 @@ Creating the view: .. collapse:: Response of command - .. literalinclude:: ../scripts/basic/chapter_7/create_vehicle_net1.txt + .. literalinclude:: ../scripts/basic/graphs/create_vehicle_net1.txt Verification: Count the rows on the original ``ways`` and on ``vehicle_net``. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :start-after: create_vehicle_net2.txt :end-before: create_vehicle_net3.txt .. collapse:: Row count results - .. literalinclude:: ../scripts/basic/chapter_7/create_vehicle_net2.txt + .. literalinclude:: ../scripts/basic/graphs/create_vehicle_net2.txt Get the description of the view -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :start-after: create_vehicle_net3.txt :end-before: create_taxi_net1.txt .. collapse:: The view description - .. literalinclude:: ../scripts/basic/chapter_7/create_vehicle_net3.txt + .. literalinclude:: ../scripts/basic/graphs/create_vehicle_net3.txt Exercise 6: Limiting the road network within an area ------------------------------------------------------------------------------- -.. image:: images/chapter7/taxi_net.png +.. image:: images/graphs/taxi_net.png :scale: 25% :alt: View of smaller set of roads for vehicles @@ -441,7 +441,7 @@ Creating the view: * Can only circulate inside the bounding box: ``(@PGR_WORKSHOP_LITTLE_NET_BBOX@)``. (line **10**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :emphasize-lines: 7,9,10 :start-after: create_taxi_net1.txt @@ -449,34 +449,34 @@ Creating the view: .. collapse:: Response of command - .. literalinclude:: ../scripts/basic/chapter_7/create_taxi_net1.txt + .. literalinclude:: ../scripts/basic/graphs/create_taxi_net1.txt Count the rows on ``taxi_net``. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: create_taxi_net2.txt :end-before: create_taxi_net3.txt .. collapse:: Row count results - .. literalinclude:: ../scripts/basic/chapter_7/create_taxi_net2.txt + .. literalinclude:: ../scripts/basic/graphs/create_taxi_net2.txt Get the description. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :start-after: create_taxi_net3.txt :end-before: create_walk_net1.txt .. collapse:: The view description - .. literalinclude:: ../scripts/basic/chapter_7/create_taxi_net3.txt + .. literalinclude:: ../scripts/basic/graphs/create_taxi_net3.txt Exercise 7: Creating a materialized view for routing pedestrians ------------------------------------------------------------------------------- -.. image:: images/chapter7/walk_net.png +.. image:: images/graphs/walk_net.png :scale: 25% :alt: View of roads for pedestrians @@ -504,7 +504,7 @@ Exercise 7: Creating a materialized view for routing pedestrians - The ``cost`` and ``reverse_cost`` are in terms of seconds with speed of ``2 mts/sec``. (line **7**) - Exclude `motorway`, `primary` and `secondary` . (line **11**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :emphasize-lines: 7, 11 :start-after: create_walk_net1.txt @@ -512,35 +512,35 @@ Exercise 7: Creating a materialized view for routing pedestrians .. collapse:: Response of command - .. literalinclude:: ../scripts/basic/chapter_7/create_walk_net1.txt + .. literalinclude:: ../scripts/basic/graphs/create_walk_net1.txt Count the rows on the view ``walk_net``. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :start-after: create_walk_net2.txt :end-before: create_walk_net3.txt .. collapse:: Row count results - .. literalinclude:: ../scripts/basic/chapter_7/create_walk_net2.txt + .. literalinclude:: ../scripts/basic/graphs/create_walk_net2.txt Get the description. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :start-after: create_walk_net3.txt :end-before: test_view1.txt .. collapse:: The view description - .. literalinclude:: ../scripts/basic/chapter_7/create_walk_net3.txt + .. literalinclude:: ../scripts/basic/graphs/create_walk_net3.txt Exercise 8: Testing the views for routing ------------------------------------------------------------------------------- -.. image:: images/chapter7/ch7-e3.png +.. image:: images/graphs/ch7-e3.png :scale: 25% :alt: From the |ch7_place_1| to the |ch7_place_2| @@ -580,7 +580,7 @@ For ``vehicle_net``: * The OSM identifiers of the departure and destination are used. (line **4**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :linenos: :emphasize-lines: 1,3,4 @@ -589,7 +589,7 @@ For ``vehicle_net``: .. collapse:: Query resultes - .. literalinclude:: ../scripts/basic/chapter_7/test_view1.txt + .. literalinclude:: ../scripts/basic/graphs/test_view1.txt For ``taxi_net``: @@ -597,7 +597,7 @@ For ``taxi_net``: * The results give the same route as with ``vehicle_net`` but ``cost`` is higher. -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :emphasize-lines: 3 :start-after: test_view2.txt @@ -605,19 +605,19 @@ For ``taxi_net``: .. collapse:: Query resultes - .. literalinclude:: ../scripts/basic/chapter_7/test_view2.txt + .. literalinclude:: ../scripts/basic/graphs/test_view2.txt For ``walk_net``: * Similar as the previous one but with ``walk_net``. (line **3**) * The results give a different route than of the vehicles. - .. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql + .. literalinclude:: ../scripts/basic/graphs/graphs.sql :language: sql :emphasize-lines: 3 :start-after: test_view3.txt - :end-before: exercise_7_5.txt + :end-before: graphs_end.txt .. collapse:: Query resultes - .. literalinclude:: ../scripts/basic/chapter_7/test_view3.txt + .. literalinclude:: ../scripts/basic/graphs/test_view3.txt diff --git a/docs/basic/images/CMakeLists.txt b/docs/basic/images/CMakeLists.txt index 9ec4025f0..da805497d 100644 --- a/docs/basic/images/CMakeLists.txt +++ b/docs/basic/images/CMakeLists.txt @@ -3,15 +3,14 @@ # Directories #--------------------- set(PGR_WORKSHOP_IMG_SUBDIRS - chapter4 - chapter5 - chapter6 - chapter7 - chapter8 + data + pedestrian + vehicle + graphs + sql_function + plpgsql_function ) - - #--------------------------------------------- # Adding the documentation subdirectories & files #--------------------------------------------- diff --git a/docs/basic/images/chapter4/CMakeLists.txt b/docs/basic/images/data/CMakeLists.txt similarity index 100% rename from docs/basic/images/chapter4/CMakeLists.txt rename to docs/basic/images/data/CMakeLists.txt diff --git a/docs/basic/images/chapter4/prepareData.png b/docs/basic/images/data/prepareData.png similarity index 100% rename from docs/basic/images/chapter4/prepareData.png rename to docs/basic/images/data/prepareData.png diff --git a/docs/basic/images/graphs/CMakeLists.txt b/docs/basic/images/graphs/CMakeLists.txt new file mode 100644 index 000000000..8edf731ba --- /dev/null +++ b/docs/basic/images/graphs/CMakeLists.txt @@ -0,0 +1,19 @@ + +#--------------------- +# Files +#--------------------- +set(PGR_WORKSHOP_IMG_FILES + ch7-e3.png + vehicle_net.png + walk_net.png + taxi_net.png + ) + + +foreach (f ${PGR_WORKSHOP_IMG_FILES}) + if (PGR_WORKSHOP_VERBOSE_DEBUG) + message(STATUS " Adding file ${f}") + endif() + FILE(COPY ${f} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") +endforeach() + diff --git a/docs/basic/images/chapter7/ch7-e3.png b/docs/basic/images/graphs/ch7-e3.png similarity index 100% rename from docs/basic/images/chapter7/ch7-e3.png rename to docs/basic/images/graphs/ch7-e3.png diff --git a/docs/basic/images/chapter7/taxi_net.png b/docs/basic/images/graphs/taxi_net.png similarity index 100% rename from docs/basic/images/chapter7/taxi_net.png rename to docs/basic/images/graphs/taxi_net.png diff --git a/docs/basic/images/chapter7/vehicle_net.png b/docs/basic/images/graphs/vehicle_net.png similarity index 100% rename from docs/basic/images/chapter7/vehicle_net.png rename to docs/basic/images/graphs/vehicle_net.png diff --git a/docs/basic/images/chapter7/walk_net.png b/docs/basic/images/graphs/walk_net.png similarity index 100% rename from docs/basic/images/chapter7/walk_net.png rename to docs/basic/images/graphs/walk_net.png diff --git a/docs/basic/images/chapter5/CMakeLists.txt b/docs/basic/images/pedestrian/CMakeLists.txt similarity index 100% rename from docs/basic/images/chapter5/CMakeLists.txt rename to docs/basic/images/pedestrian/CMakeLists.txt diff --git a/docs/basic/images/chapter5/pedestrian_combinations.png b/docs/basic/images/pedestrian/pedestrian_combinations.png similarity index 100% rename from docs/basic/images/chapter5/pedestrian_combinations.png rename to docs/basic/images/pedestrian/pedestrian_combinations.png diff --git a/docs/basic/images/chapter5/pedestrian_route1.png b/docs/basic/images/pedestrian/pedestrian_route1.png similarity index 100% rename from docs/basic/images/chapter5/pedestrian_route1.png rename to docs/basic/images/pedestrian/pedestrian_route1.png diff --git a/docs/basic/images/chapter5/pedestrian_route2.png b/docs/basic/images/pedestrian/pedestrian_route2.png similarity index 100% rename from docs/basic/images/chapter5/pedestrian_route2.png rename to docs/basic/images/pedestrian/pedestrian_route2.png diff --git a/docs/basic/images/chapter5/pedestrian_route4.png b/docs/basic/images/pedestrian/pedestrian_route4.png similarity index 100% rename from docs/basic/images/chapter5/pedestrian_route4.png rename to docs/basic/images/pedestrian/pedestrian_route4.png diff --git a/docs/basic/images/chapter5/pedestrian_route5.png b/docs/basic/images/pedestrian/pedestrian_route5.png similarity index 100% rename from docs/basic/images/chapter5/pedestrian_route5.png rename to docs/basic/images/pedestrian/pedestrian_route5.png diff --git a/docs/basic/images/chapter5/route.png b/docs/basic/images/pedestrian/route.png similarity index 100% rename from docs/basic/images/chapter5/route.png rename to docs/basic/images/pedestrian/route.png diff --git a/docs/basic/images/chapter8/CMakeLists.txt b/docs/basic/images/plpgsql_function/CMakeLists.txt similarity index 100% rename from docs/basic/images/chapter8/CMakeLists.txt rename to docs/basic/images/plpgsql_function/CMakeLists.txt diff --git a/docs/basic/images/chapter8/ch8-e7.png b/docs/basic/images/plpgsql_function/ch8-e7.png similarity index 100% rename from docs/basic/images/chapter8/ch8-e7.png rename to docs/basic/images/plpgsql_function/ch8-e7.png diff --git a/docs/basic/images/chapter8/ch8-taxinet.png b/docs/basic/images/plpgsql_function/ch8-taxinet.png similarity index 100% rename from docs/basic/images/chapter8/ch8-taxinet.png rename to docs/basic/images/plpgsql_function/ch8-taxinet.png diff --git a/docs/basic/images/chapter8/ch8-vehiclenet.png b/docs/basic/images/plpgsql_function/ch8-vehiclenet.png similarity index 100% rename from docs/basic/images/chapter8/ch8-vehiclenet.png rename to docs/basic/images/plpgsql_function/ch8-vehiclenet.png diff --git a/docs/basic/images/chapter8/ch8-walknet.png b/docs/basic/images/plpgsql_function/ch8-walknet.png similarity index 100% rename from docs/basic/images/chapter8/ch8-walknet.png rename to docs/basic/images/plpgsql_function/ch8-walknet.png diff --git a/docs/basic/images/chapter8/closest_vertex.png b/docs/basic/images/plpgsql_function/closest_vertex.png similarity index 100% rename from docs/basic/images/chapter8/closest_vertex.png rename to docs/basic/images/plpgsql_function/closest_vertex.png diff --git a/docs/basic/images/chapter7/CMakeLists.txt b/docs/basic/images/sql_function/CMakeLists.txt similarity index 85% rename from docs/basic/images/chapter7/CMakeLists.txt rename to docs/basic/images/sql_function/CMakeLists.txt index 3069ae2a3..6baa04cde 100644 --- a/docs/basic/images/chapter7/CMakeLists.txt +++ b/docs/basic/images/sql_function/CMakeLists.txt @@ -3,16 +3,12 @@ # Files #--------------------- set(PGR_WORKSHOP_IMG_FILES - ch7-e3.png ch7-e4.png ch7-e5.png ch7-e6.png ch7-e7.png ch7-e8-1.png ch7-e8.png - vehicle_net.png - walk_net.png - taxi_net.png ) diff --git a/docs/basic/images/chapter7/ch7-e4.png b/docs/basic/images/sql_function/ch7-e4.png similarity index 100% rename from docs/basic/images/chapter7/ch7-e4.png rename to docs/basic/images/sql_function/ch7-e4.png diff --git a/docs/basic/images/chapter7/ch7-e5.png b/docs/basic/images/sql_function/ch7-e5.png similarity index 100% rename from docs/basic/images/chapter7/ch7-e5.png rename to docs/basic/images/sql_function/ch7-e5.png diff --git a/docs/basic/images/chapter7/ch7-e6.png b/docs/basic/images/sql_function/ch7-e6.png similarity index 100% rename from docs/basic/images/chapter7/ch7-e6.png rename to docs/basic/images/sql_function/ch7-e6.png diff --git a/docs/basic/images/chapter7/ch7-e7.png b/docs/basic/images/sql_function/ch7-e7.png similarity index 100% rename from docs/basic/images/chapter7/ch7-e7.png rename to docs/basic/images/sql_function/ch7-e7.png diff --git a/docs/basic/images/chapter7/ch7-e8-1.png b/docs/basic/images/sql_function/ch7-e8-1.png similarity index 100% rename from docs/basic/images/chapter7/ch7-e8-1.png rename to docs/basic/images/sql_function/ch7-e8-1.png diff --git a/docs/basic/images/chapter7/ch7-e8.png b/docs/basic/images/sql_function/ch7-e8.png similarity index 100% rename from docs/basic/images/chapter7/ch7-e8.png rename to docs/basic/images/sql_function/ch7-e8.png diff --git a/docs/basic/images/chapter6/CMakeLists.txt b/docs/basic/images/vehicle/CMakeLists.txt similarity index 100% rename from docs/basic/images/chapter6/CMakeLists.txt rename to docs/basic/images/vehicle/CMakeLists.txt diff --git a/docs/basic/images/chapter6/ad11.png b/docs/basic/images/vehicle/ad11.png similarity index 100% rename from docs/basic/images/chapter6/ad11.png rename to docs/basic/images/vehicle/ad11.png diff --git a/docs/basic/images/chapter6/ad7.png b/docs/basic/images/vehicle/ad7.png similarity index 100% rename from docs/basic/images/chapter6/ad7.png rename to docs/basic/images/vehicle/ad7.png diff --git a/docs/basic/images/chapter6/ad8.png b/docs/basic/images/vehicle/ad8.png similarity index 100% rename from docs/basic/images/chapter6/ad8.png rename to docs/basic/images/vehicle/ad8.png diff --git a/docs/basic/images/chapter6/pedestrian_only_roads.png b/docs/basic/images/vehicle/pedestrian_only_roads.png similarity index 100% rename from docs/basic/images/chapter6/pedestrian_only_roads.png rename to docs/basic/images/vehicle/pedestrian_only_roads.png diff --git a/docs/basic/images/chapter6/route_using_pedestrian.png b/docs/basic/images/vehicle/route_using_pedestrian.png similarity index 100% rename from docs/basic/images/chapter6/route_using_pedestrian.png rename to docs/basic/images/vehicle/route_using_pedestrian.png diff --git a/docs/basic/pedestrian.rst b/docs/basic/pedestrian.rst index b17b49eca..6ecaeb0b6 100644 --- a/docs/basic/pedestrian.rst +++ b/docs/basic/pedestrian.rst @@ -10,7 +10,7 @@ Pedestrian Routing =============================================================================== -.. image:: images/chapter5/route.png +.. image:: images/pedestrian/route.png :scale: 25% :align: center @@ -79,14 +79,14 @@ Connect to the database, if not connected: Get the vertex identifiers -.. literalinclude:: ../scripts/basic/chapter_5/all_exercises_5.sql +.. literalinclude:: ../scripts/basic/pedestrian/pedestrian.sql :language: sql :start-after: exercise_5_0.txt :end-before: exercise_5_1.txt | -.. literalinclude:: ../scripts/basic/chapter_5/exercise_5_0.txt +.. literalinclude:: ../scripts/basic/pedestrian/exercise_5_0.txt * |osmid_1| |place_1| (|id_1|) * |osmid_2| |place_2| (|id_2|) @@ -98,7 +98,7 @@ Get the vertex identifiers The corresponding :code:`id` are shown in the following image, and a sample route from "|place_3|" to "|place_5|". -.. image:: images/chapter5/route.png +.. image:: images/pedestrian/route.png :scale: 25% Exercise 1: Single pedestrian routing @@ -113,7 +113,7 @@ Exercise 1: Single pedestrian routing * Calculate routes with costs in *osm2pgRouting* ``length`` default units. -.. image:: images/chapter5/pedestrian_route1.png +.. image:: images/pedestrian/pedestrian_route1.png :scale: 25% :alt: From the |place_1| to the |place_3| @@ -125,7 +125,7 @@ Exercise 1: Single pedestrian routing * From a pedestrian perspective the graph is ``undirected`` (line **11**), that is, the pedestrian can move in both directions on all segments. -.. literalinclude:: ../scripts/basic/chapter_5/all_exercises_5.sql +.. literalinclude:: ../scripts/basic/pedestrian/pedestrian.sql :language: sql :start-after: exercise_5_1.txt :end-before: exercise_5_2.txt @@ -133,7 +133,7 @@ Exercise 1: Single pedestrian routing .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_5/exercise_5_1.txt + .. literalinclude:: ../scripts/basic/pedestrian/exercise_5_1.txt .. note:: * The returned cost attribute represents the cost specified in the @@ -155,7 +155,7 @@ Exercise 2: Many Pedestrians going to the same destination * Calculate routes with costs in *osm2pgRouting* ``length_m`` which is in meters. -.. image:: images/chapter5/pedestrian_route2.png +.. image:: images/pedestrian/pedestrian_route2.png :scale: 25% :alt: From |place_1| and |place_2| to |place_3| @@ -165,7 +165,7 @@ Exercise 2: Many Pedestrians going to the same destination * All pedestrians want to go to vertex |id_3| (line **10**). * The cost to be in meters using attribute ``length_m`` (line **6**). -.. literalinclude:: ../scripts/basic/chapter_5/all_exercises_5.sql +.. literalinclude:: ../scripts/basic/pedestrian/pedestrian.sql :language: sql :start-after: exercise_5_2.txt :end-before: exercise_5_3.txt @@ -173,7 +173,7 @@ Exercise 2: Many Pedestrians going to the same destination .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_5/exercise_5_2.txt + .. literalinclude:: ../scripts/basic/pedestrian/exercise_5_2.txt Exercise 3: Many Pedestrians departing from the same location ............................................................................... @@ -187,7 +187,7 @@ Exercise 3: Many Pedestrians departing from the same location * Calculate routes with costs in seconds. -.. image:: images/chapter5/pedestrian_route2.png +.. image:: images/pedestrian/pedestrian_route2.png :scale: 25% .. rubric:: Solution: @@ -196,7 +196,7 @@ Exercise 3: Many Pedestrians departing from the same location * Pedestrians want to go to locations |id_1| and |id_2| (line **10**). * The cost to be in seconds, with a walking speed ``s = 1.3 m/s`` and ``t = d/s`` (line **6**). -.. literalinclude:: ../scripts/basic/chapter_5/all_exercises_5.sql +.. literalinclude:: ../scripts/basic/pedestrian/pedestrian.sql :language: sql :start-after: exercise_5_3.txt :end-before: exercise_5_4.txt @@ -204,7 +204,7 @@ Exercise 3: Many Pedestrians departing from the same location .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_5/exercise_5_3.txt + .. literalinclude:: ../scripts/basic/pedestrian/exercise_5_3.txt Exercise 4: Many Pedestrians going to different destinations @@ -219,7 +219,7 @@ Exercise 4: Many Pedestrians going to different destinations * Calculate routes with costs in minutes. -.. image:: images/chapter5/pedestrian_route4.png +.. image:: images/pedestrian/pedestrian_route4.png :scale: 25% .. rubric:: Solution: @@ -229,7 +229,7 @@ Exercise 4: Many Pedestrians going to different destinations * The cost to be in minutes, with a walking speed ``s = 1.3 m/s`` and ``t = d/s`` (line **6**). * Result adds the costs per destination. -.. literalinclude:: ../scripts/basic/chapter_5/all_exercises_5.sql +.. literalinclude:: ../scripts/basic/pedestrian/pedestrian.sql :language: sql :start-after: exercise_5_4.txt :end-before: exercise_5_5.txt @@ -237,9 +237,9 @@ Exercise 4: Many Pedestrians going to different destinations .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_5/exercise_5_4.txt + .. literalinclude:: ../scripts/basic/pedestrian/exercise_5_4.txt -.. note:: .. include:: ../scripts/basic/chapter_5/note_1.txt +.. note:: .. include:: ../scripts/basic/pedestrian/note_1.txt Exercise 5: Combination of routes ............................................................................... @@ -253,7 +253,7 @@ Exercise 5: Combination of routes * Calculate routes with costs in minutes. -.. image:: images/chapter5/pedestrian_combinations.png +.. image:: images/pedestrian/pedestrian_combinations.png :scale: 25% .. rubric:: Solution: @@ -262,7 +262,7 @@ Exercise 5: Combination of routes * Second pedestrian departs from |id_2| and the destination is |id_5| (line **12**). * The cost to be in minutes, with a walking speed ``s = 1.3 m/s`` and ``t = d/s`` -.. literalinclude:: ../scripts/basic/chapter_5/all_exercises_5.sql +.. literalinclude:: ../scripts/basic/pedestrian/pedestrian.sql :language: sql :start-after: exercise_5_5.txt :end-before: exercise_5_6.txt @@ -270,7 +270,7 @@ Exercise 5: Combination of routes .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_5/exercise_5_5.txt + .. literalinclude:: ../scripts/basic/pedestrian/exercise_5_5.txt pgr_dijkstraCost ------------------------------------------------------------------------------- @@ -307,7 +307,7 @@ Exercise 6: Time for many Pedestrians going to different destinations * Get only the cost in minutes. -.. image:: images/chapter5/pedestrian_route5.png +.. image:: images/pedestrian/pedestrian_route5.png :scale: 25% :alt: From the hotels to the |place_4| and |place_5| @@ -318,7 +318,7 @@ Exercise 6: Time for many Pedestrians going to different destinations * The cost to be in minutes, with a walking speed ``s = 1.3 m/s`` and ``t = d/s`` (line **6**). * Result as aggregated costs. -.. literalinclude:: ../scripts/basic/chapter_5/all_exercises_5.sql +.. literalinclude:: ../scripts/basic/pedestrian/pedestrian.sql :language: sql :start-after: exercise_5_6.txt :end-before: exercise_5_7.txt @@ -326,7 +326,7 @@ Exercise 6: Time for many Pedestrians going to different destinations .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_5/exercise_5_6.txt + .. literalinclude:: ../scripts/basic/pedestrian/exercise_5_6.txt Compare with `Exercise 4: Many Pedestrians going to different destinations`_ 's note. @@ -350,7 +350,7 @@ Exercise 7: Many Pedestrians going to different destinations summarizing the tot * The cost to be in minutes, with a walking speed s = 1.3 m/s and t = d/s (line **6**). * Result adds the costs per destination. -.. literalinclude:: ../scripts/basic/chapter_5/all_exercises_5.sql +.. literalinclude:: ../scripts/basic/pedestrian/pedestrian.sql :language: sql :start-after: exercise_5_7.txt :end-before: note_1.txt @@ -358,6 +358,6 @@ Exercise 7: Many Pedestrians going to different destinations summarizing the tot .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_5/exercise_5_7.txt + .. literalinclude:: ../scripts/basic/pedestrian/exercise_5_7.txt -.. note:: .. include:: ../scripts/basic/chapter_5/note_2.txt +.. note:: .. include:: ../scripts/basic/pedestrian/note_2.txt diff --git a/docs/basic/plpgsql_function.rst b/docs/basic/plpgsql_function.rst index 0156716dd..48c574f91 100644 --- a/docs/basic/plpgsql_function.rst +++ b/docs/basic/plpgsql_function.rst @@ -10,7 +10,7 @@ pl/pgsql function ############################################################################### -.. image:: images/chapter5/route.png +.. image:: images/pedestrian/route.png :width: 250pt :align: center @@ -88,14 +88,14 @@ Exercise 1: Create vertices table .. rubric:: Solution -* Use ``pgr_extractVertices`` (explained in :doc:`graph_views`) to create the +* Use ``pgr_extractVertices`` (explained in :doc:`graphs`) to create the vertices table * ``JOIN`` the vertices table with ``ways_vertices`` (created in - :doc:`graph_views`) to get the ``x``, ``y``, ``geom`` information. + :doc:`graphs`) to get the ``x``, ``y``, ``geom`` information. For ``vehicle_net``: -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :emphasize-lines: 1,6 :start-after: views_vertices1.txt @@ -103,7 +103,7 @@ For ``vehicle_net``: For ``taxi_net``: -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :start-after: views_vertices2.txt :end-before: views_vertices3.txt @@ -113,13 +113,13 @@ Modify the above queries to create the ``walk_net_vertices`` table. .. collapse:: Answer - .. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql + .. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :start-after: views_vertices3.txt :end-before: exercise_8_3_1.txt .. note:: It is left to the reader to remove disconected components on the views. - See :doc:`graph_views` + See :doc:`graphs` Exercise 3: Nearest Vertex ------------------------------------------------------------------------------- @@ -145,20 +145,20 @@ In particular use the following (lat, lon) value: ``(@POINT1_LAT@, @POINT1_LON@) For ``ways_vertices``: -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :start-after: exercise_8_3_1.txt :end-before: exercise_8_3_2.txt .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_3_1.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_3_1.txt For ``vehicle_net_vertices``: Modify the previous query. -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :linenos: :emphasize-lines: 1,2 @@ -167,7 +167,7 @@ Modify the previous query. .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_3_2.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_3_2.txt For ``taxi_net_vertices``: @@ -175,7 +175,7 @@ Modify the previous query. .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_3_3.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_3_3.txt For ``walk_net_vertices``: @@ -183,7 +183,7 @@ Modify the previous query. .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_3_4.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_3_4.txt Exercise 4: Nearest vertex function @@ -230,7 +230,7 @@ BIGINT the OSM identifier that is nearest to (lat,lon). * The point is formed with (lon/lat) ``(%3$s, %2$s)``. -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :force: :start-after: exercise_8_4.txt @@ -240,15 +240,15 @@ BIGINT the OSM identifier that is nearest to (lat,lon). Exercise 5: Test nearest vertex function ------------------------------------------------------------------------------- -.. image:: images/chapter8/ch8-vehiclenet.png +.. image:: images/plpgsql_function/ch8-vehiclenet.png :scale: 15% :alt: Nearest Vertex in vehicle network -.. image:: images/chapter8/ch8-taxinet.png +.. image:: images/plpgsql_function/ch8-taxinet.png :scale: 15% :alt: Nearest Vertex in taxi network -.. image:: images/chapter8/ch8-walknet.png +.. image:: images/plpgsql_function/ch8-walknet.png :scale: 15% :alt: Nearest Vertex in walk network @@ -279,27 +279,27 @@ For ``ways_vertices``: The value stored in ``id`` column is not the OSM identifier. -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :start-after: exercise_8_5_1.txt :end-before: exercise_8_5_2.txt .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_5_1.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_5_1.txt For ``vehicles_net_vertices``: * Modify the previous query. -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :start-after: exercise_8_5_2.txt :end-before: exercise_8_5_3.txt .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_5_2.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_5_2.txt For ``taxi_net_vertices``: @@ -307,13 +307,13 @@ For ``taxi_net_vertices``: .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_5_3.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_5_3.txt For ``walk_net_vertices``: .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_5_4.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_5_4.txt wrk_fromAtoB function @@ -346,7 +346,7 @@ The function's signature: * The output columns are not highlighted. * The function returns a set of values. -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :emphasize-lines: 2-5 :start-after: exercise_8_6.txt @@ -379,7 +379,7 @@ Call to the function ``wrk_dijkstra`` * The ``WARNING`` will be issued only when ``do_debug`` is true. * No output will be generated. -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :force: :emphasize-lines: 9-13, 16-18, 20-22 @@ -388,7 +388,7 @@ Call to the function ``wrk_dijkstra`` .. collapse:: The complete function - .. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql + .. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :force: :start-after: exercise_8_6.txt @@ -397,7 +397,7 @@ Call to the function ``wrk_dijkstra`` Exercise 7: Using the main function ------------------------------------------------------------------------------- -.. image:: images/chapter8/ch8-e7.png +.. image:: images/plpgsql_function/ch8-e7.png :scale: 25% :alt: View of roads for taxis along with source and destination @@ -432,35 +432,35 @@ For ``vehicle_net``: * The next two parameters are the latitude and longitude of the departure point. * The next two parameters are the latitude and longitude of the destination point. -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :start-after: exercise_8_7_1.txt :end-before: exercise_8_7_2.txt .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_7_1.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_7_1.txt For ``taxi_net``: * Do a dry run by adding ``true`` to get the query that is executed. -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :start-after: exercise_8_7_2.txt :end-before: exercise_8_7_3.txt .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_7_2.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_7_2.txt For ``walk_net``: -.. literalinclude:: ../scripts/basic/chapter_8/all-sections-8.sql +.. literalinclude:: ../scripts/basic/plpgsql_function/plpgsql_function.sql :language: sql :start-after: exercise_8_7_3.txt :end-before: \o .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_8/exercise_8_7_3.txt + .. literalinclude:: ../scripts/basic/plpgsql_function/exercise_8_7_3.txt diff --git a/docs/basic/sql_function.rst b/docs/basic/sql_function.rst index 0754b8eba..8c223417c 100644 --- a/docs/basic/sql_function.rst +++ b/docs/basic/sql_function.rst @@ -11,7 +11,7 @@ SQL function ############################################################################### -.. image:: images/chapter5/route.png +.. image:: images/pedestrian/route.png :scale: 25% :align: center @@ -82,7 +82,7 @@ When the application needs additional information, like the name of the street, Exercise 1: Get additional information ------------------------------------------------------------------------------- -.. image:: images/chapter7/ch7-e4.png +.. image:: images/sql_function/ch7-e4.png :width: 300pt :alt: Route showing names @@ -106,7 +106,7 @@ Exercise 1: Get additional information * ``LEFT`` to include the row with ``id = -1`` because it does not exist on ``vehicle_net`` -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :language: sql :linenos: :emphasize-lines: 2, 4,9 @@ -115,7 +115,7 @@ Exercise 1: Get additional information .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_7/exercise_7_5.txt + .. literalinclude:: ../scripts/basic/sql_function/exercise_7_5.txt Geometry handling @@ -129,7 +129,7 @@ with PostGIS functions. Exercise 2: Route geometry (human readable) ------------------------------------------------------------------------------- -.. image:: images/chapter7/ch7-e4.png +.. image:: images/sql_function/ch7-e4.png :width: 300pt :alt: From |ch7_place_1| to |ch7_place_2| @@ -162,7 +162,7 @@ Route from the |ch7_place_1| to |ch7_place_2| * The ``LEFT JOIN`` with ``vehicle_net``. (line **14**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :language: sql :linenos: :emphasize-lines: 2-5,8-9,12,14 @@ -173,14 +173,14 @@ Route from the |ch7_place_1| to |ch7_place_2| .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_7/exercise_7_6.txt + .. literalinclude:: ../scripts/basic/sql_function/exercise_7_6.txt Exercise 3: Route geometry (binary format) ------------------------------------------------------------------------------- -.. image:: images/chapter7/ch7-e6.png +.. image:: images/sql_function/ch7-e6.png :width: 300pt :alt: From |ch7_place_1| to |ch7_place_2| showing arrows. @@ -200,7 +200,7 @@ Route from the |ch7_place_1| to |ch7_place_2| * The ``geom`` including the renaming (line **9**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :language: sql :emphasize-lines: 10 :linenos: @@ -209,13 +209,13 @@ Route from the |ch7_place_1| to |ch7_place_2| .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_7/exercise_7_7.txt + .. literalinclude:: ../scripts/basic/sql_function/exercise_7_7.txt Exercise 4: Route geometry directionality ------------------------------------------------------------------------------- -.. image:: images/chapter7/ch7-e8.png +.. image:: images/sql_function/ch7-e8.png :width: 300pt :alt: From |ch7_place_1| to |ch7_place_2| @@ -232,12 +232,12 @@ starting point of the next geometry .. collapse:: Query: Rows where criteria is not met - .. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql + .. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :language: sql :start-after: wrong_directionality.txt :end-before: exercise_7_8.txt -.. literalinclude:: ../scripts/basic/chapter_7/wrong_directionality.txt +.. literalinclude:: ../scripts/basic/sql_function/wrong_directionality.txt :language: sql .. rubric:: Problem @@ -268,7 +268,7 @@ To get the correct direction some geometries need to be reversed: * The geometry when ``node`` is the ``source`` column. (line **17**) * The reversed geometry when ``node`` is not the ``source`` column. (line **16**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :language: sql :linenos: :emphasize-lines: 3,9,11,12,16,17 @@ -277,24 +277,24 @@ To get the correct direction some geometries need to be reversed: .. collapse:: results - .. literalinclude:: ../scripts/basic/chapter_7/exercise_7_8.txt + .. literalinclude:: ../scripts/basic/sql_function/exercise_7_8.txt Inspecting some the problematic rows, the directionality has been fixed. .. collapse:: Query: Rows where criteria is not met - .. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql + .. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :language: sql :start-after: good_directionality.txt :end-before: exercise_7_9.txt -.. literalinclude:: ../scripts/basic/chapter_7/good_directionality.txt +.. literalinclude:: ../scripts/basic/sql_function/good_directionality.txt Exercise 5: Using the geometry ------------------------------------------------------------------------------- -.. image:: images/chapter7/ch7-e7.png +.. image:: images/sql_function/ch7-e7.png :width: 300pt :alt: From |ch7_place_1| to the |ch7_place_2| show azimuth @@ -323,7 +323,7 @@ Modify the query from the previous exercise * Calculates the azimuth of ``route_geom``. (line **27**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :language: sql :emphasize-lines: 6,27 :start-after: exercise_7_9.txt @@ -331,7 +331,7 @@ Modify the query from the previous exercise .. collapse:: results - .. literalinclude:: ../scripts/basic/chapter_7/exercise_7_9.txt + .. literalinclude:: ../scripts/basic/sql_function/exercise_7_9.txt Creating the Function =============================================================================== @@ -370,7 +370,7 @@ Putting all together in a SQL function * The output columns are from line **7** to **14** (not highlighted). * The function returns a set. (line **16**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :emphasize-lines: 4-6,16 :language: sql :start-after: exercise_7_10.txt @@ -383,7 +383,7 @@ Putting all together in a SQL function * The ``JOIN`` with ``ways`` is necessary, as the views are subset of ``ways`` (line **25**) -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :emphasize-lines: 7,8,25 :language: sql :force: @@ -392,7 +392,7 @@ Putting all together in a SQL function .. collapse:: Response of command - .. literalinclude:: ../scripts/basic/chapter_7/exercise_7_10.txt + .. literalinclude:: ../scripts/basic/sql_function/exercise_7_10.txt .. _exercise-ch7-e10: @@ -411,35 +411,35 @@ Exercise 7: Using the function Names of the streets in the route -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :language: sql :start-after: using_fn1.txt :end-before: using_fn2.txt .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_7/using_fn1.txt + .. literalinclude:: ../scripts/basic/sql_function/using_fn1.txt Total seconds spent in each street -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :language: sql :start-after: using_fn2.txt :end-before: using_fn3.txt .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_7/using_fn2.txt + .. literalinclude:: ../scripts/basic/sql_function/using_fn2.txt Get all the information of the route -.. literalinclude:: ../scripts/basic/chapter_7/all_sections.sql +.. literalinclude:: ../scripts/basic/sql_function/sql_function.sql :language: sql :start-after: using_fn3.txt .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_7/using_fn3.txt + .. literalinclude:: ../scripts/basic/sql_function/using_fn3.txt Try the function with a combination of the interesting places: diff --git a/docs/basic/vehicle.rst b/docs/basic/vehicle.rst index c9f0875bf..9e9196f6b 100644 --- a/docs/basic/vehicle.rst +++ b/docs/basic/vehicle.rst @@ -11,7 +11,7 @@ Vehicle Routing =============================================================================== -.. image:: images/chapter6/ad7.png +.. image:: images/vehicle/ad7.png :scale: 25% :align: center @@ -61,23 +61,23 @@ be a combination of multiple parameters. #. Number of (``source, target``) segments with ``cost < 0`` (line **3**). - .. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql + .. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: section-6.1-1 :end-before: section-6.1-2 :language: sql :emphasize-lines: 3 - .. literalinclude:: ../scripts/basic/chapter_6/section-6.1-1.txt + .. literalinclude:: ../scripts/basic/vehicles/section-6.1-1.txt #. Number of (``target, source``) segments with ``reverse_cost < 0`` (line **3**). - .. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql + .. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: section-6.1-2 :end-before: section-6.1.1 :language: sql :emphasize-lines: 3 - .. literalinclude:: ../scripts/basic/chapter_6/section-6.1-2.txt + .. literalinclude:: ../scripts/basic/vehicles/section-6.1-2.txt Exercise 1: Vehicle routing - going @@ -87,7 +87,7 @@ Exercise 1: Vehicle routing - going * From the "|place_1|" to the "|place_3|" by car. -.. image:: images/chapter6/ad7.png +.. image:: images/vehicle/ad7.png :scale: 25% :alt: From |place_1| to the |place_3| by car. @@ -96,7 +96,7 @@ Exercise 1: Vehicle routing - going * Use ``cost`` (line **6**) and ``reverse_cost`` (line **7**) columns, which are in unit ``degrees``. * The vehicle is going from vertex |id_1| (line **10**) to |id_3| (line **11**). -.. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql +.. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: section-6.1.1 :end-before: section-6.1.2 :language: sql @@ -105,7 +105,7 @@ Exercise 1: Vehicle routing - going .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_6/section-6.1.1.txt + .. literalinclude:: ../scripts/basic/vehicles/section-6.1.1.txt Exercise 2: Vehicle routing - returning @@ -115,7 +115,7 @@ Exercise 2: Vehicle routing - returning * From "|place_3|" to the "|place_1|" by car. -.. image:: images/chapter6/ad8.png +.. image:: images/vehicle/ad8.png :scale: 25% :alt: From |place_3| to the |place_1| by car. @@ -125,7 +125,7 @@ Exercise 2: Vehicle routing - returning units seconds. * The vehicle is going from vertex |id_3| (line **10**) to |id_1| (line **11**). -.. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql +.. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: section-6.1.2 :end-before: section-6.1.3 :language: sql @@ -133,7 +133,7 @@ Exercise 2: Vehicle routing - returning .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_6/section-6.1.2.txt + .. literalinclude:: ../scripts/basic/vehicles/section-6.1.2.txt .. note:: On a directed graph, going and coming back routes, most of the time are different. @@ -145,7 +145,7 @@ Exercise 3: Vehicle routing when time is money * From "|place_3|" to the "|place_1|" by taxi. -.. image:: images/chapter6/ad8.png +.. image:: images/vehicle/ad8.png :width: 300pt :alt: From |place_3| to |place_1| by taxi. @@ -160,7 +160,7 @@ Exercise 3: Vehicle routing when time is money * The vehicle is going from vertex |id_3| (line **10**) to |id_1| (line **11**). -.. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql +.. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: section-6.1.3 :end-before: section-6.2-1 :language: sql @@ -168,7 +168,7 @@ Exercise 3: Vehicle routing when time is money .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_6/section-6.1.3.txt + .. literalinclude:: ../scripts/basic/vehicles/section-6.1.3.txt .. note:: Comparing with `Exercise 2: Vehicle routing - returning`_: @@ -186,7 +186,7 @@ When dealing with data, being aware of what kind of data is being used can impro * Vehicles can not circulate on pedestrian ways -.. image:: images/chapter6/pedestrian_only_roads.png +.. image:: images/vehicle/pedestrian_only_roads.png :scale: 25% :alt: @@ -199,15 +199,15 @@ additional table: ``configuration``. .. rubric:: The ``configuration`` table structure can be obtained with the following command. -.. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql +.. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: section-6.2-1 :end-before: section-6.2-2 -.. literalinclude:: ../scripts/basic/chapter_6/section-6.2-1.txt +.. literalinclude:: ../scripts/basic/vehicles/section-6.2-1.txt -.. image:: images/chapter6/route_using_pedestrian.png +.. image:: images/vehicle/route_using_pedestrian.png :scale: 25% :alt: tag_id values @@ -217,23 +217,23 @@ In the image above there is a detail of the ``tag_id`` of the roads. .. rubric:: The ``OSM way`` types: -.. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql +.. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: section-6.2-2 :end-before: section-6.2-3 :language: sql -.. literalinclude:: ../scripts/basic/chapter_6/section-6.2-2.txt +.. literalinclude:: ../scripts/basic/vehicles/section-6.2-2.txt Also, on the ``ways`` table there is a column that can be used to ``JOIN`` with the ``configuration`` table. .. rubric:: The ``ways`` types: -.. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql +.. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: section-6.2-3 :end-before: section-6.2.1 :language: sql -.. literalinclude:: ../scripts/basic/chapter_6/section-6.2-3.txt +.. literalinclude:: ../scripts/basic/vehicles/section-6.2-3.txt In this workshop, costs are going to be manipulated using the ``configuration`` table. @@ -246,7 +246,7 @@ Exercise 4: Vehicle routing without penalization * From the "|place_3|" to "|place_1|" -.. image:: images/chapter6/ad7.png +.. image:: images/vehicle/ad7.png :scale: 25% :alt: From |place_3| to |place_1| @@ -267,7 +267,7 @@ Exercise 4: Vehicle routing without penalization :code:`tag_id` field using a ``JOIN`` (lines **14** and **15**). * The vehicle is going from vertex |id_3| (line **17**) to vertex |id_1| (line **18**). -.. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql +.. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: section-6.2.1 :end-before: section-6.2.2-1 :language: sql @@ -275,7 +275,7 @@ Exercise 4: Vehicle routing without penalization .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_6/section-6.2.1.txt + .. literalinclude:: ../scripts/basic/vehicles/section-6.2.1.txt Exercise 5: Vehicle routing with penalization @@ -301,7 +301,7 @@ The ``penalty`` values can be changed with ``UPDATE`` queries. .. note:: These values are an exaggeration. -.. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql +.. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: section-6.2.2-1 :end-before: section-6.2.2-2 :language: sql @@ -310,7 +310,7 @@ The ``penalty`` values can be changed with ``UPDATE`` queries. * From the "|place_3|" to "|place_1|" with penalization. -.. image:: images/chapter6/ad11.png +.. image:: images/vehicle/ad11.png :scale: 25% :alt: From |place_3| to |place_1| @@ -324,14 +324,14 @@ The ``penalty`` values can be changed with ``UPDATE`` queries. :code:`tag_id` field using a ``JOIN`` (lines **8** and **9**). * The vehicle is going from vertex |id_3| (line **11**) to vertex |id_1| (line **12**). -.. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql +.. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: 6.2.2-2 :end-before: 6.6 :language: sql .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_6/section-6.2.2-2.txt + .. literalinclude:: ../scripts/basic/vehicles/section-6.2.2-2.txt .. note:: Comparing with `Exercise 3: Vehicle routing when time is money`_: @@ -360,14 +360,14 @@ Get the times in seconds of a penalized route * Join using ``gid`` (line **18**) -.. literalinclude:: ../scripts/basic/chapter_6/all_exercises.sql +.. literalinclude:: ../scripts/basic/vehicles/vehicles.sql :start-after: 6.6 :language: sql :force: .. collapse:: Query results - .. literalinclude:: ../scripts/basic/chapter_6/section-6.6.txt + .. literalinclude:: ../scripts/basic/vehicles/section-6.6.txt .. note:: Comparing with `Exercise 5: Vehicle routing with penalization`_: diff --git a/docs/images/_dsZWQsq b/docs/images/_dsZWQsq deleted file mode 100644 index 9d897a701..000000000 --- a/docs/images/_dsZWQsq +++ /dev/null @@ -1,83 +0,0 @@ - - - - OSGeo - - https://www.osgeo.org/ - Your Open Source Compass - Tue, 19 Dec 2023 17:20:33 +0000 - en-US - - hourly - - 1 - - - - https://www.osgeo.org/wp-content/uploads/cropped-osgeo-emblem-rgb-1-32x32.png - OSGeo - https://www.osgeo.org/ - 32 - 32 - - - ETF - https://www.osgeo.org/etf/ - - - Wed, 06 Jul 2022 00:26:21 +0000 - - - https://www.osgeo.org/?p=18896 - - ETF is an open source testing framework for validating data and APIs in Spatial Data Infrastructures (SDIs). It is used by software solutions and data providers to validate the conformity of geospatial data sets, metadata and APIs. Goals in designing … Continued

-

Het bericht ETF verscheen eerst op OSGeo.

-]]> - ETF is an open source testing framework for validating data and APIs in Spatial Data Infrastructures (SDIs). It is used by software solutions and data providers to validate the conformity of geospatial data sets, metadata and APIs.

-

Goals in designing the ETF software were to create test reports that are user-friendly and self-explanatory as well as to be able to validate large amounts of data, which can be several hundred GB in size. In order to cover different validation tasks and present them in a unified report, the architecture is modular and different test engines can be used. Currently the following test engines are supported: SoapUI for testing web services, BaseX database for testing XML data, TEAM Engine to validate WFS and OGC Web APIs using the OGC CITE tests, NeoTL Engine for testing WFS, OGC Web APIs and datasets.

-

ETF is the underlying framework used by the INSPIRE Reference Validator to validate metadata, datasets and services against the INSPIRE requirements. ETF is also used extensively in Germany by the Surveying Authorities of the Laender to validate their datasets. Other European Union (EU) Member States are also reusing the ETF to allow their data providers to test resources against national requirements. Finally, some software tools include validation based on the ETF API in their workflow.

-

Core Features
- Testable resources
- datasets (up to multiple hundreds GB): GML
- metadata: XML
- view services: WMS/WMTS
- download services: Atom, WFS, WCS, SOS
- catalogue services: CSW

-

Access
-web-based user interface

-

REST API

-

OpenAPI Specification

-

Java client library

-

Supported test engines
-SoapUI for testing web services

-

BaseX for testing sets of XML documents

-

TEAM Engine to support CITE tests developed using TestNG

-

NeoTL for testing OGC WFS and OGC APIs (in development)

-

Test reports
-user-friendly and self-explanatory

-

downloadable in HTML, XML and JSON

-

Implemented Standards
-Catalogue Service for the Web (CSW)

-

ISO 19105

-

Sensor Observation Service (SOS)

-

Web Feature Service (WFS)

-

OpenGIS Web Map Tile Service (WMTS)

-

Geography Markup Language (GML)

-

OGC API – Features

-

Web Coverage Service (WCS)

-

Web Map Service (WMS)

-

Het bericht ETF verscheen eerst op OSGeo.

-]]> - - - - - - diff --git a/docs/images/ch7-e1.png b/docs/images/ch7-e1.png deleted file mode 100644 index 5a5249760..000000000 Binary files a/docs/images/ch7-e1.png and /dev/null differ diff --git a/docs/images/chapter7/ch7-e2-1.png b/docs/images/chapter7/ch7-e2-1.png deleted file mode 100644 index c3315e302..000000000 Binary files a/docs/images/chapter7/ch7-e2-1.png and /dev/null differ diff --git a/docs/index.rst b/docs/index.rst index 6d384e52b..c1ca00e09 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -33,7 +33,7 @@ Basic basic/data.rst basic/pedestrian.rst basic/vehicle.rst - basic/graph_views.rst + basic/graphs.rst basic/sql_function.rst basic/plpgsql_function.rst diff --git a/docs/interactions/chapter-9.rst b/docs/interactions/chapter-9.rst index 499e4333f..a479803ad 100644 --- a/docs/interactions/chapter-9.rst +++ b/docs/interactions/chapter-9.rst @@ -11,7 +11,7 @@ Using Qgis ############################################################################### -.. image:: ../basic/images/chapter5/route.png +.. image:: ../basic/images/pedestrian/route.png :width: 250pt :align: center diff --git a/docs/scripts/basic/CMakeLists.txt b/docs/scripts/basic/CMakeLists.txt index 1ceb124db..5e15e38c9 100644 --- a/docs/scripts/basic/CMakeLists.txt +++ b/docs/scripts/basic/CMakeLists.txt @@ -3,12 +3,13 @@ add_custom_target(basic_scripts ALL) #--------------------- # Directories #--------------------- -SET(PGR_WORKSHOP_DIR - chapter_4 - chapter_5 - chapter_6 - chapter_7 - chapter_8 +SET(PGR_WORKSHOP_DIR + data + pedestrian + vehicles + graphs + sql_function + plpgsql_function ) foreach (d ${PGR_WORKSHOP_DIR}) @@ -19,7 +20,8 @@ foreach (d ${PGR_WORKSHOP_DIR}) add_dependencies(basic_scripts basic_${d}_scripts) endforeach() -add_dependencies(basic_chapter_5_scripts basic_chapter_4_scripts) -add_dependencies(basic_chapter_6_scripts basic_chapter_5_scripts) -add_dependencies(basic_chapter_7_scripts basic_chapter_6_scripts) -add_dependencies(basic_chapter_8_scripts basic_chapter_7_scripts) +add_dependencies(basic_pedestrian_scripts basic_data_scripts) +add_dependencies(basic_vehicles_scripts basic_pedestrian_scripts) +add_dependencies(basic_sql_function_scripts basic_vehicles_scripts) +add_dependencies(basic_sql_function_scripts basic_graphs_scripts) +add_dependencies(basic_plpgsql_function_scripts basic_sql_function_scripts) diff --git a/docs/scripts/basic/chapter_5/example.svg b/docs/scripts/basic/chapter_5/example.svg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docs/scripts/basic/chapter_5/map_5.1.json b/docs/scripts/basic/chapter_5/map_5.1.json deleted file mode 100644 index e8909c857..000000000 --- a/docs/scripts/basic/chapter_5/map_5.1.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "LineString", - "coordinates": [ - [ - 26.0738841, - 44.4223446 - ], - [ - 26.0733967, - 44.422098 - ] - ] -} -{ - "type": "LineString", - "coordinates": [ - [ - 26.0866602, - 44.4247989 - ], - [ - 26.0866554, - 44.4247436 - ] - ] -} diff --git a/docs/scripts/basic/chapter_4/CMakeLists.txt b/docs/scripts/basic/data/CMakeLists.txt similarity index 58% rename from docs/scripts/basic/chapter_4/CMakeLists.txt rename to docs/scripts/basic/data/CMakeLists.txt index 892445380..f6ad2bebf 100644 --- a/docs/scripts/basic/chapter_4/CMakeLists.txt +++ b/docs/scripts/basic/data/CMakeLists.txt @@ -2,7 +2,7 @@ # Files #--------------------- set(PGR_WORKSHOP_FILES - "section-4.3.2.sh" + "data.sh" ) foreach (f ${PGR_WORKSHOP_FILES}) @@ -13,11 +13,11 @@ foreach (f ${PGR_WORKSHOP_FILES}) endforeach() add_custom_command( - OUTPUT section-4.3.2.txt - COMMAND bash section-4.3.2.sh > section-4.3.2.txt - DEPENDS section-4.3.2.sh + OUTPUT data.txt + COMMAND bash data.sh > data.txt + DEPENDS data.sh ) -add_custom_target(basic_chapter_4_scripts - DEPENDS "section-4.3.2.txt" +add_custom_target(basic_data_scripts + DEPENDS "data.txt" ) diff --git a/docs/scripts/basic/chapter_4/section-4.3.2.sh b/docs/scripts/basic/data/data.sh similarity index 100% rename from docs/scripts/basic/chapter_4/section-4.3.2.sh rename to docs/scripts/basic/data/data.sh diff --git a/docs/scripts/basic/graphs/CMakeLists.txt b/docs/scripts/basic/graphs/CMakeLists.txt new file mode 100644 index 000000000..3d73b6780 --- /dev/null +++ b/docs/scripts/basic/graphs/CMakeLists.txt @@ -0,0 +1,49 @@ +add_custom_target(basic_graphs_scripts) + +#--------------------- +# Files +#--------------------- +configure_file(graphs.sql graphs.sql) + +#---------------------------------------------- +# Generating the results files +#--------------------------------------------- + +add_custom_command( + TARGET basic_graphs_scripts + PRE_BUILD + BYPRODUCTS + + create_vertices.txt + vertices_description.txt + selected_rows.txt + fill_columns_1.txt + fill_columns_2.txt + fill_columns_3.txt + fill_columns_4.txt + fill_columns_5.txt + fill_columns_6.txt + set_components1.txt + set_components2.txt + set_components3.txt + see_components1.txt + see_components2.txt + see_components3.txt + see_components4.txt + create_vehicle_net1.txt + create_vehicle_net2.txt + create_vehicle_net3.txt + create_taxi_net1.txt + create_taxi_net2.txt + create_taxi_net3.txt + create_walk_net1.txt + create_walk_net2.txt + create_walk_net3.txt + test_view1.txt + test_view2.txt + test_view3.txt + + COMMAND psql -d city_routing -f graphs.sql + COMMENT "running graphs scripts" + DEPENDS graphs.sql +) diff --git a/docs/scripts/basic/graphs/graphs.sql b/docs/scripts/basic/graphs/graphs.sql new file mode 100644 index 000000000..ba12ce574 --- /dev/null +++ b/docs/scripts/basic/graphs/graphs.sql @@ -0,0 +1,153 @@ + +DROP VIEW IF EXISTS vehicle_net CASCADE; +DROP VIEW IF EXISTS taxi_net CASCADE; +DROP MATERIALIZED VIEW IF EXISTS walk_net CASCADE; + +\o create_vertices.txt + +SELECT * INTO ways_vertices +FROM pgr_extractVertices( + 'SELECT gid AS id, source_osm AS source, target_osm AS target + FROM ways ORDER BY id'); + +\o vertices_description.txt +\dS+ ways_vertices +\o selected_rows.txt +SELECT * FROM ways_vertices Limit 10; + +\o fill_columns_1.txt +SELECT count(*) FROM ways_vertices WHERE geom IS NULL; +\o fill_columns_2.txt +UPDATE ways_vertices SET geom = ST_startPoint(the_geom) FROM ways WHERE source_osm = id; +\o fill_columns_3.txt +SELECT count(*) FROM ways_vertices WHERE geom IS NULL; +\o fill_columns_4.txt +UPDATE ways_vertices SET geom = ST_endPoint(the_geom) FROM ways WHERE geom IS NULL AND target_osm = id; +\o fill_columns_5.txt +SELECT count(*) FROM ways_vertices WHERE geom IS NULL; +\o fill_columns_6.txt +UPDATE ways_vertices set (x,y) = (ST_X(geom), ST_Y(geom)); + + +\o set_components1.txt +ALTER TABLE ways ADD COLUMN component BIGINT; +ALTER TABLE ways_vertices ADD COLUMN component BIGINT; + +\o set_components2.txt +UPDATE ways_vertices SET component = c.component +FROM (SELECT * FROM pgr_connectedComponents( + 'SELECT gid as id, + source_osm AS source, + target_osm AS target, + cost, reverse_cost FROM ways' +)) AS c +WHERE id = node; +\o set_components3.txt + +UPDATE ways SET component = v.component +FROM (SELECT id, component FROM ways_vertices) AS v +WHERE source_osm = v.id; + +\o see_components1.txt +SELECT count(DISTINCT component) FROM ways_vertices; +\o see_components2.txt +SELECT count(DISTINCT component) FROM ways; +\o see_components3.txt +SELECT component, count(*) FROM ways GROUP BY component +ORDER BY count DESC LIMIT 10; +\o see_components4.txt +WITH +all_components AS (SELECT component, count(*) FROM ways GROUP BY component), +max_component AS (SELECT max(count) from all_components) +SELECT component FROM all_components WHERE count = (SELECT max FROM max_component); + +\o create_vehicle_net1.txt +-- DROP VIEW vehicle_net CASCADE; + +CREATE VIEW vehicle_net AS + +WITH +all_components AS (SELECT component, count(*) FROM ways GROUP BY component), -- line 6 +max_component AS (SELECT max(count) from all_components), +the_component AS ( + SELECT component FROM all_components + WHERE count = (SELECT max FROM max_component)) + +SELECT + gid AS id, + source_osm AS source, target_osm AS target, -- line 14 + cost_s AS cost, reverse_cost_s AS reverse_cost, + name, length_m AS length, the_geom AS geom +FROM ways JOIN the_component USING (component) JOIN configuration USING (tag_id) +WHERE tag_value NOT IN ('steps','footway','path','cycleway'); -- line 18 + +\o create_vehicle_net2.txt +SELECT count(*) FROM ways; +SELECT count(*) FROM vehicle_net; +\o create_vehicle_net3.txt +\dS+ vehicle_net +\o create_taxi_net1.txt + +-- DROP VIEW taxi_net; + +CREATE VIEW taxi_net AS + SELECT + id, + source, target, + cost * 1.10 AS cost, reverse_cost * 1.10 AS reverse_cost, + name, length, geom + FROM vehicle_net + WHERE vehicle_net.geom && ST_MakeEnvelope(@PGR_WORKSHOP_LITTLE_NET_BBOX@); + +\o create_taxi_net2.txt +SELECT count(*) FROM taxi_net; +\o create_taxi_net3.txt +\dS+ taxi_net +\o create_walk_net1.txt + +-- DROP MATERIALIZED VIEW walk_net CASCADE; + +CREATE MATERIALIZED VIEW walk_net AS + +WITH +allc AS (SELECT component, count(*) FROM ways GROUP BY component), +maxcount AS (SELECT max(count) from allc), +the_component AS (SELECT component FROM allc WHERE count = (SELECT max FROM maxcount)) + +SELECT + gid AS id, + source_osm AS source, target_osm AS target, + cost_s AS cost, reverse_cost_s AS reverse_cost, + name, length_m AS length, the_geom AS geom +FROM ways JOIN the_component USING (component) JOIN configuration USING (tag_id) +WHERE tag_value NOT IN ('motorway','primary','secondary'); + +\o create_walk_net2.txt + +SELECT count(*) FROM walk_net; + +\o create_walk_net3.txt +\dS+ walk_net +\o test_view1.txt + +SELECT start_vid, end_vid, agg_cost AS seconds +FROM pgr_dijkstraCost( + 'SELECT * FROM vehicle_net', + @CH7_OSMID_1@, @CH7_OSMID_2@); + +\o test_view2.txt + +SELECT start_vid, end_vid, agg_cost AS seconds +FROM pgr_dijkstraCost( + 'SELECT * FROM taxi_net', + @CH7_OSMID_1@, @CH7_OSMID_2@); + +\o test_view3.txt + +SELECT start_vid, end_vid, agg_cost AS seconds +FROM pgr_dijkstraCost( + 'SELECT * FROM walk_net', + @CH7_OSMID_1@, @CH7_OSMID_2@); + +\o graphs_end.txt +\o diff --git a/docs/scripts/basic/chapter_5/CMakeLists.txt b/docs/scripts/basic/pedestrian/CMakeLists.txt similarity index 68% rename from docs/scripts/basic/chapter_5/CMakeLists.txt rename to docs/scripts/basic/pedestrian/CMakeLists.txt index 83b205140..91111d2cb 100644 --- a/docs/scripts/basic/chapter_5/CMakeLists.txt +++ b/docs/scripts/basic/pedestrian/CMakeLists.txt @@ -1,10 +1,10 @@ -add_custom_target(basic_chapter_5_scripts) +add_custom_target(basic_pedestrian_scripts) #--------------------- # Files #--------------------- set(PGR_WORKSHOP_FILES - "all_exercises_5.sql" + "pedestrian.sql" "images.sql" ) @@ -16,7 +16,7 @@ foreach (f ${PGR_WORKSHOP_FILES}) endforeach() add_custom_command( - TARGET basic_chapter_5_scripts + TARGET basic_pedestrian_scripts PRE_BUILD BYPRODUCTS exercise_5_1.txt @@ -25,9 +25,9 @@ add_custom_command( exercise_5_4.txt exercise_5_5.txt exercise_5_6.txt - COMMAND psql -d city_routing -f all_exercises_5.sql + COMMAND psql -d city_routing -f pedestrian.sql COMMAND psql -d city_routing -f images.sql - COMMENT "running chapter 5 scripts" - DEPENDS all_exercises_5.sql + COMMENT "running pedestrian scripts" + DEPENDS pedestrian.sql ) diff --git a/docs/scripts/basic/chapter_5/images.sql b/docs/scripts/basic/pedestrian/images.sql similarity index 100% rename from docs/scripts/basic/chapter_5/images.sql rename to docs/scripts/basic/pedestrian/images.sql diff --git a/docs/scripts/basic/chapter_5/all_exercises_5.sql b/docs/scripts/basic/pedestrian/pedestrian.sql similarity index 100% rename from docs/scripts/basic/chapter_5/all_exercises_5.sql rename to docs/scripts/basic/pedestrian/pedestrian.sql diff --git a/docs/scripts/basic/chapter_8/CMakeLists.txt b/docs/scripts/basic/plpgsql_function/CMakeLists.txt similarity index 71% rename from docs/scripts/basic/chapter_8/CMakeLists.txt rename to docs/scripts/basic/plpgsql_function/CMakeLists.txt index 851d3b32b..496d0de8e 100644 --- a/docs/scripts/basic/chapter_8/CMakeLists.txt +++ b/docs/scripts/basic/plpgsql_function/CMakeLists.txt @@ -1,16 +1,16 @@ -add_custom_target(basic_chapter_8_scripts) +add_custom_target(basic_plpgsql_function_scripts) #--------------------- # Files #--------------------- -configure_file(all-sections-8.sql all-sections-8.sql) +configure_file(plpgsql_function.sql plpgsql_function.sql) #--------------------------------------------- # Generating the results files #--------------------------------------------- add_custom_command( - TARGET basic_chapter_8_scripts + TARGET basic_plpgsql_function_scripts PRE_BUILD BYPRODUCTS excercise-8_1_1.txt @@ -41,7 +41,7 @@ add_custom_command( excercise-8_7_3.txt warnings.txt - COMMAND psql -d city_routing -f all-sections-8.sql 2> warnings.txt - COMMENT "running chapter 8 scripts" - DEPENDS all-sections-8.sql + COMMAND psql -d city_routing -f plpgsql_function.sql 2> warnings.txt + COMMENT "running plpgsql_function scripts" + DEPENDS plpgsql_function.sql ) diff --git a/docs/scripts/basic/chapter_8/all-sections-8.sql b/docs/scripts/basic/plpgsql_function/plpgsql_function.sql similarity index 100% rename from docs/scripts/basic/chapter_8/all-sections-8.sql rename to docs/scripts/basic/plpgsql_function/plpgsql_function.sql diff --git a/docs/scripts/basic/chapter_7/CMakeLists.txt b/docs/scripts/basic/sql_function/CMakeLists.txt similarity index 68% rename from docs/scripts/basic/chapter_7/CMakeLists.txt rename to docs/scripts/basic/sql_function/CMakeLists.txt index 0ab1ceabb..2c8eba3ff 100644 --- a/docs/scripts/basic/chapter_7/CMakeLists.txt +++ b/docs/scripts/basic/sql_function/CMakeLists.txt @@ -1,9 +1,9 @@ -add_custom_target(basic_chapter_7_scripts) +add_custom_target(basic_sql_function_scripts) #--------------------- # Files #--------------------- -configure_file(all_sections.sql all_sections.sql) +configure_file(sql_function.sql sql_function.sql) configure_file(images.sql images.sql) #---------------------------------------------- @@ -11,7 +11,7 @@ configure_file(images.sql images.sql) #--------------------------------------------- add_custom_command( - TARGET basic_chapter_7_scripts + TARGET basic_sql_function_scripts PRE_BUILD BYPRODUCTS exercise_7_1.txt @@ -25,8 +25,8 @@ add_custom_command( exercise_7_9.txt exercise_7_10.txt exercise_7_11.txt - COMMAND psql -d city_routing -f all_sections.sql + COMMAND psql -d city_routing -f sql_function.sql COMMAND psql -d city_routing -f images.sql - COMMENT "running chapter 7 scripts" - DEPENDS all_sections.sql + COMMENT "running sql function scripts" + DEPENDS sql_function.sql ) diff --git a/docs/scripts/basic/chapter_7/images.sql b/docs/scripts/basic/sql_function/images.sql similarity index 100% rename from docs/scripts/basic/chapter_7/images.sql rename to docs/scripts/basic/sql_function/images.sql diff --git a/docs/scripts/basic/chapter_7/all_sections.sql b/docs/scripts/basic/sql_function/sql_function.sql similarity index 53% rename from docs/scripts/basic/chapter_7/all_sections.sql rename to docs/scripts/basic/sql_function/sql_function.sql index 231a5cb3b..672b94ce0 100644 --- a/docs/scripts/basic/chapter_7/all_sections.sql +++ b/docs/scripts/basic/sql_function/sql_function.sql @@ -1,154 +1,6 @@ -DROP VIEW IF EXISTS vehicle_net CASCADE; -DROP VIEW IF EXISTS taxi_net CASCADE; -DROP MATERIALIZED VIEW IF EXISTS walk_net CASCADE; DROP FUNCTION IF EXISTS wrk_dijkstra(regclass, bigint, bigint); -\o create_vertices.txt - -SELECT * INTO ways_vertices -FROM pgr_extractVertices( - 'SELECT gid AS id, source_osm AS source, target_osm AS target - FROM ways ORDER BY id'); - -\o vertices_description.txt -\dS+ ways_vertices -\o selected_rows.txt -SELECT * FROM ways_vertices Limit 10; - -\o fill_columns_1.txt -SELECT count(*) FROM ways_vertices WHERE geom IS NULL; -\o fill_columns_2.txt -UPDATE ways_vertices SET geom = ST_startPoint(the_geom) FROM ways WHERE source_osm = id; -\o fill_columns_3.txt -SELECT count(*) FROM ways_vertices WHERE geom IS NULL; -\o fill_columns_4.txt -UPDATE ways_vertices SET geom = ST_endPoint(the_geom) FROM ways WHERE geom IS NULL AND target_osm = id; -\o fill_columns_5.txt -SELECT count(*) FROM ways_vertices WHERE geom IS NULL; -\o fill_columns_6.txt -UPDATE ways_vertices set (x,y) = (ST_X(geom), ST_Y(geom)); - - -\o set_components1.txt -ALTER TABLE ways ADD COLUMN component BIGINT; -ALTER TABLE ways_vertices ADD COLUMN component BIGINT; - -\o set_components2.txt -UPDATE ways_vertices SET component = c.component -FROM (SELECT * FROM pgr_connectedComponents( - 'SELECT gid as id, - source_osm AS source, - target_osm AS target, - cost, reverse_cost FROM ways' -)) AS c -WHERE id = node; -\o set_components3.txt - -UPDATE ways SET component = v.component -FROM (SELECT id, component FROM ways_vertices) AS v -WHERE source_osm = v.id; - -\o see_components1.txt -SELECT count(DISTINCT component) FROM ways_vertices; -\o see_components2.txt -SELECT count(DISTINCT component) FROM ways; -\o see_components3.txt -SELECT component, count(*) FROM ways GROUP BY component -ORDER BY count DESC LIMIT 10; -\o see_components4.txt -WITH -all_components AS (SELECT component, count(*) FROM ways GROUP BY component), -max_component AS (SELECT max(count) from all_components) -SELECT component FROM all_components WHERE count = (SELECT max FROM max_component); - -\o create_vehicle_net1.txt --- DROP VIEW vehicle_net CASCADE; - -CREATE VIEW vehicle_net AS - -WITH -all_components AS (SELECT component, count(*) FROM ways GROUP BY component), -- line 6 -max_component AS (SELECT max(count) from all_components), -the_component AS ( - SELECT component FROM all_components - WHERE count = (SELECT max FROM max_component)) - -SELECT - gid AS id, - source_osm AS source, target_osm AS target, -- line 14 - cost_s AS cost, reverse_cost_s AS reverse_cost, - name, length_m AS length, the_geom AS geom -FROM ways JOIN the_component USING (component) JOIN configuration USING (tag_id) -WHERE tag_value NOT IN ('steps','footway','path','cycleway'); -- line 18 - -\o create_vehicle_net2.txt -SELECT count(*) FROM ways; -SELECT count(*) FROM vehicle_net; -\o create_vehicle_net3.txt -\dS+ vehicle_net -\o create_taxi_net1.txt - --- DROP VIEW taxi_net; - -CREATE VIEW taxi_net AS - SELECT - id, - source, target, - cost * 1.10 AS cost, reverse_cost * 1.10 AS reverse_cost, - name, length, geom - FROM vehicle_net - WHERE vehicle_net.geom && ST_MakeEnvelope(@PGR_WORKSHOP_LITTLE_NET_BBOX@); - -\o create_taxi_net2.txt -SELECT count(*) FROM taxi_net; -\o create_taxi_net3.txt -\dS+ taxi_net -\o create_walk_net1.txt - --- DROP MATERIALIZED VIEW walk_net CASCADE; - -CREATE MATERIALIZED VIEW walk_net AS - -WITH -allc AS (SELECT component, count(*) FROM ways GROUP BY component), -maxcount AS (SELECT max(count) from allc), -the_component AS (SELECT component FROM allc WHERE count = (SELECT max FROM maxcount)) - -SELECT - gid AS id, - source_osm AS source, target_osm AS target, - cost_s AS cost, reverse_cost_s AS reverse_cost, - name, length_m AS length, the_geom AS geom -FROM ways JOIN the_component USING (component) JOIN configuration USING (tag_id) -WHERE tag_value NOT IN ('motorway','primary','secondary'); - -\o create_walk_net2.txt - -SELECT count(*) FROM walk_net; - -\o create_walk_net3.txt -\dS+ walk_net -\o test_view1.txt - -SELECT start_vid, end_vid, agg_cost AS seconds -FROM pgr_dijkstraCost( - 'SELECT * FROM vehicle_net', - @CH7_OSMID_1@, @CH7_OSMID_2@); - -\o test_view2.txt - -SELECT start_vid, end_vid, agg_cost AS seconds -FROM pgr_dijkstraCost( - 'SELECT * FROM taxi_net', - @CH7_OSMID_1@, @CH7_OSMID_2@); - -\o test_view3.txt - -SELECT start_vid, end_vid, agg_cost AS seconds -FROM pgr_dijkstraCost( - 'SELECT * FROM walk_net', - @CH7_OSMID_1@, @CH7_OSMID_2@); \o exercise_7_5.txt diff --git a/docs/scripts/basic/chapter_6/CMakeLists.txt b/docs/scripts/basic/vehicles/CMakeLists.txt similarity index 70% rename from docs/scripts/basic/chapter_6/CMakeLists.txt rename to docs/scripts/basic/vehicles/CMakeLists.txt index bac31a6d2..a105361a7 100644 --- a/docs/scripts/basic/chapter_6/CMakeLists.txt +++ b/docs/scripts/basic/vehicles/CMakeLists.txt @@ -1,9 +1,9 @@ -add_custom_target(basic_chapter_6_scripts) +add_custom_target(basic_vehicles_scripts) #--------------------- # Files #--------------------- -configure_file(all_exercises.sql all_exercises.sql) +configure_file(vehicles.sql vehicles.sql) configure_file(images.sql images.sql) #---------------------------------------------- @@ -11,7 +11,7 @@ configure_file(images.sql images.sql) #--------------------------------------------- add_custom_command( - TARGET basic_chapter_6_scripts + TARGET basic_vehicles_scripts PRE_BUILD BYPRODUCTS section-6.1-1.txt @@ -27,7 +27,7 @@ add_custom_command( section-6.2.2-2.txt section-6.6.txt - COMMAND psql -d city_routing -f all_exercises.sql + COMMAND psql -d city_routing -f vehicles.sql COMMAND psql -d city_routing -f images.sql - COMMENT "running chapter 6 scripts" - DEPENDS section-6.1.sql) + COMMENT "running vehicles scripts" + DEPENDS vehicles.sql) diff --git a/docs/scripts/basic/chapter_6/images.sql b/docs/scripts/basic/vehicles/images.sql similarity index 100% rename from docs/scripts/basic/chapter_6/images.sql rename to docs/scripts/basic/vehicles/images.sql diff --git a/docs/scripts/basic/chapter_6/all_exercises.sql b/docs/scripts/basic/vehicles/vehicles.sql similarity index 100% rename from docs/scripts/basic/chapter_6/all_exercises.sql rename to docs/scripts/basic/vehicles/vehicles.sql diff --git a/docs/source/_themes/bootstrap b/docs/source/_themes/bootstrap deleted file mode 120000 index 57a1195e2..000000000 --- a/docs/source/_themes/bootstrap +++ /dev/null @@ -1 +0,0 @@ -../../../bootstrap \ No newline at end of file diff --git a/docs/source/latex.rst b/docs/source/latex.rst deleted file mode 100644 index 810f23409..000000000 --- a/docs/source/latex.rst +++ /dev/null @@ -1,34 +0,0 @@ -.. - **************************************************************************** - pgRouting Workshop Manual - Copyright(c) pgRouting Contributors - - This documentation is licensed under a Creative Commons Attribution-Share - Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/ - **************************************************************************** - -.. _index_latex: - -pgRouting Workshop - Latex generation (doesn't include this page) -=============================================================================== - -.. toctree:: - :numbered: - :maxdepth: 3 - - chapters/introduction.rst - chapters/about.rst - chapters/installation.rst - chapters/prepare_data.rst - chapters/shortest_path.rst - chapters/advanced.rst - chapters/wrapper.rst - chapters/function.rst - chapters/geoserver.rst - chapters/ol_client.rst - chapters/topology.rst - chapters/the_solutions.rst - chapters/additional_installation.rst - chapters/osm2pgrouting - - diff --git a/docs/un_sdg/data.rst b/docs/un_sdg/data.rst index 997eca186..07601db18 100644 --- a/docs/un_sdg/data.rst +++ b/docs/un_sdg/data.rst @@ -10,7 +10,7 @@ Data for Sustainable Development Goals ############################################################################### -.. image:: ../basic/images/chapter4/prepareData.png +.. image:: ../basic/images/data/prepareData.png :align: center To be able to use pgRouting, data has to be imported into a database. This chapter diff --git a/docs/un_sdg/sdg11-cities.rst b/docs/un_sdg/sdg11-cities.rst index 8e04b1538..ae9634597 100644 --- a/docs/un_sdg/sdg11-cities.rst +++ b/docs/un_sdg/sdg11-cities.rst @@ -239,7 +239,7 @@ a river. First, the connected components are found and then stored in a new colu named ``component``. The pgRouting function ``pgr_connectedComponents`` is used to complete this task -and its explaind with more detail in :doc:`../basic/graph_views`. +and its explaind with more detail in :doc:`../basic/graphs`. A sub-query is created to find out all the connected components. After that, the ``component`` column is updated using the results obtained from the sub-query. diff --git a/docs/un_sdg/sdg3-health.rst b/docs/un_sdg/sdg3-health.rst index 29b2ddc54..bbe2fdd64 100644 --- a/docs/un_sdg/sdg3-health.rst +++ b/docs/un_sdg/sdg3-health.rst @@ -421,7 +421,7 @@ Exercise 12: Remove disconnected components ............................................................................... To remove the disconnected components on the road network, the following -pgRouting functions, discussed on :doc:`../basic/graph_views`, will be used: +pgRouting functions, discussed on :doc:`../basic/graphs`, will be used: * ``pgr_extractVertices`` * ``pgr_connectedComponents`` diff --git a/docs/un_sdg/sdg7-energy.rst b/docs/un_sdg/sdg7-energy.rst index 52959976a..79aca4942 100644 --- a/docs/un_sdg/sdg7-energy.rst +++ b/docs/un_sdg/sdg7-energy.rst @@ -97,7 +97,7 @@ Exercise 2: Remove disconnected components ............................................................................... To remove the disconnected components on the road network, the following -pgRouting functions, discussed on :doc:`../basic/graph_views`, will be used: +pgRouting functions, discussed on :doc:`../basic/graphs`, will be used: * ``pgr_extractVertices`` * ``pgr_connectedComponents`` diff --git a/locale/en/LC_MESSAGES/basic/graph_views.po b/locale/en/LC_MESSAGES/basic/graphs.po similarity index 59% rename from locale/en/LC_MESSAGES/basic/graph_views.po rename to locale/en/LC_MESSAGES/basic/graphs.po index 1576c9f5e..54c5b563a 100644 --- a/locale/en/LC_MESSAGES/basic/graph_views.po +++ b/locale/en/LC_MESSAGES/basic/graphs.po @@ -20,26 +20,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.16.0\n" -#: ../../build/docs/basic/graph_views.rst:12 +#: ../../build/docs/basic/graphs.rst:12 msgid "Graph views" msgstr "" -#: ../../build/docs/basic/graph_views.rst:18 +#: ../../build/docs/basic/graphs.rst:18 msgid "Chapter Contents" msgstr "" -#: ../../build/docs/basic/graph_views.rst:20 +#: ../../build/docs/basic/graphs.rst:20 msgid "" "Different application require different graphs. This chapter covers how " "to discard disconnected segments and different approaches to create " "graphs." msgstr "" -#: ../../build/docs/basic/graph_views.rst:24 +#: ../../build/docs/basic/graphs.rst:24 msgid "The graph requirements" msgstr "" -#: ../../build/docs/basic/graph_views.rst:26 +#: ../../build/docs/basic/graphs.rst:26 msgid "" "In this chapter there are three graph requirements. It consists on three " "graphs based on a **fully connected** graph derived from ``ways``: two " @@ -48,70 +48,70 @@ msgid "" "``target_osm``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:31 +#: ../../build/docs/basic/graphs.rst:31 msgid "The description of the graphs:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:33 +#: ../../build/docs/basic/graphs.rst:33 msgid "Particular vehicle:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:35 +#: ../../build/docs/basic/graphs.rst:35 msgid "Circulate on the whole Belém area." msgstr "" -#: ../../build/docs/basic/graph_views.rst:37 -#: ../../build/docs/basic/graph_views.rst:46 +#: ../../build/docs/basic/graphs.rst:37 +#: ../../build/docs/basic/graphs.rst:46 msgid "Do not use `steps`, `footway`, `path`, `cycleway`." msgstr "" -#: ../../build/docs/basic/graph_views.rst:39 +#: ../../build/docs/basic/graphs.rst:39 msgid "Speed is the default speed from OSM information." msgstr "" -#: ../../build/docs/basic/graph_views.rst:41 +#: ../../build/docs/basic/graphs.rst:41 msgid "Taxi vehicle:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:43 +#: ../../build/docs/basic/graphs.rst:43 msgid "Circulate on a smaller area:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:45 +#: ../../build/docs/basic/graphs.rst:45 msgid "Bounding box: ``(-48.52,-1.46,-48.45,-1.41)``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:48 +#: ../../build/docs/basic/graphs.rst:48 #, python-format msgid "Speed is 10% slower than that of the particular vehicles." msgstr "" -#: ../../build/docs/basic/graph_views.rst:50 +#: ../../build/docs/basic/graphs.rst:50 msgid "Pedestrians:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:52 +#: ../../build/docs/basic/graphs.rst:52 msgid "Walk on the whole Belém area." msgstr "" -#: ../../build/docs/basic/graph_views.rst:53 +#: ../../build/docs/basic/graphs.rst:53 msgid "Can not walk on exclusive vehicle ways" msgstr "" -#: ../../build/docs/basic/graph_views.rst:55 +#: ../../build/docs/basic/graphs.rst:55 msgid "`motorways` and on `primary` segments." msgstr "" -#: ../../build/docs/basic/graph_views.rst:57 -#: ../../build/docs/basic/graph_views.rst:488 +#: ../../build/docs/basic/graphs.rst:57 +#: ../../build/docs/basic/graphs.rst:488 msgid "The speed is ``2 mts/sec``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:60 +#: ../../build/docs/basic/graphs.rst:60 msgid "pgr_extractVertices" msgstr "" -#: ../../build/docs/basic/graph_views.rst:62 +#: ../../build/docs/basic/graphs.rst:62 msgid "" "``pgr_extractVertices`` compute the connected components of an undirected" " graph using a Depth First Search approach. A connected component of an " @@ -119,126 +119,126 @@ msgid "" "other." msgstr "" -#: ../../build/docs/basic/graph_views.rst:67 -#: ../../build/docs/basic/graph_views.rst:214 +#: ../../build/docs/basic/graphs.rst:67 +#: ../../build/docs/basic/graphs.rst:214 msgid "Signature summary" msgstr "" -#: ../../build/docs/basic/graph_views.rst:75 +#: ../../build/docs/basic/graphs.rst:75 msgid "" "Description of the function can be found in `pgr_extractVertices " "`__" msgstr "" -#: ../../build/docs/basic/graph_views.rst:79 +#: ../../build/docs/basic/graphs.rst:79 msgid "Exercise 1: Create a vertices table" msgstr "" -#: ../../build/docs/basic/graph_views.rst:82 -#: ../../build/docs/basic/graph_views.rst:130 -#: ../../build/docs/basic/graph_views.rst:230 -#: ../../build/docs/basic/graph_views.rst:278 -#: ../../build/docs/basic/graph_views.rst:355 -#: ../../build/docs/basic/graph_views.rst:426 -#: ../../build/docs/basic/graph_views.rst:484 -#: ../../build/docs/basic/graph_views.rst:548 +#: ../../build/docs/basic/graphs.rst:82 +#: ../../build/docs/basic/graphs.rst:130 +#: ../../build/docs/basic/graphs.rst:230 +#: ../../build/docs/basic/graphs.rst:278 +#: ../../build/docs/basic/graphs.rst:355 +#: ../../build/docs/basic/graphs.rst:426 +#: ../../build/docs/basic/graphs.rst:484 +#: ../../build/docs/basic/graphs.rst:548 msgid "Problem" msgstr "" -#: ../../build/docs/basic/graph_views.rst:83 +#: ../../build/docs/basic/graphs.rst:83 msgid "Create the vertices table corresponding to the edges in ``ways``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:86 -#: ../../build/docs/basic/graph_views.rst:134 -#: ../../build/docs/basic/graph_views.rst:234 -#: ../../build/docs/basic/graph_views.rst:287 -#: ../../build/docs/basic/graph_views.rst:369 -#: ../../build/docs/basic/graph_views.rst:435 -#: ../../build/docs/basic/graph_views.rst:499 -#: ../../build/docs/basic/graph_views.rst:567 +#: ../../build/docs/basic/graphs.rst:86 +#: ../../build/docs/basic/graphs.rst:134 +#: ../../build/docs/basic/graphs.rst:234 +#: ../../build/docs/basic/graphs.rst:287 +#: ../../build/docs/basic/graphs.rst:369 +#: ../../build/docs/basic/graphs.rst:435 +#: ../../build/docs/basic/graphs.rst:499 +#: ../../build/docs/basic/graphs.rst:567 msgid "Solution" msgstr "" -#: ../../build/docs/basic/graph_views.rst:87 +#: ../../build/docs/basic/graphs.rst:87 msgid "A graph consists of a set of vertices and a set of edges." msgstr "" -#: ../../build/docs/basic/graph_views.rst:88 +#: ../../build/docs/basic/graphs.rst:88 msgid "In this case, the ``ways`` table is a set of edges." msgstr "" -#: ../../build/docs/basic/graph_views.rst:89 +#: ../../build/docs/basic/graphs.rst:89 msgid "" "In order to make use of all the graph functions from pgRouting, it is " "required have the set of vertices defined." msgstr "" -#: ../../build/docs/basic/graph_views.rst:91 +#: ../../build/docs/basic/graphs.rst:91 msgid "From the requirements, the graph is going to be based on OSM identifiers." msgstr "" -#: ../../build/docs/basic/graph_views.rst:104 +#: ../../build/docs/basic/graphs.rst:104 msgid "Reviewing the description of the vertices table" msgstr "" -#: ../../build/docs/basic/graph_views.rst:114 +#: ../../build/docs/basic/graphs.rst:114 msgid "Inspecting the information on the vertices table" msgstr "" -#: ../../build/docs/basic/graph_views.rst:127 +#: ../../build/docs/basic/graphs.rst:127 msgid "Exercise 2: Fill up other columns in the vertices table" msgstr "" -#: ../../build/docs/basic/graph_views.rst:131 +#: ../../build/docs/basic/graphs.rst:131 msgid "Fill up geometry information on the vertices table." msgstr "" -#: ../../build/docs/basic/graph_views.rst:135 +#: ../../build/docs/basic/graphs.rst:135 msgid "Count the number of rows that need to be filled up." msgstr "" -#: ../../build/docs/basic/graph_views.rst:145 +#: ../../build/docs/basic/graphs.rst:145 msgid "" "Update the ``geom`` columns based on the ``source_osm`` column from " "``ways`` table." msgstr "" -#: ../../build/docs/basic/graph_views.rst:147 +#: ../../build/docs/basic/graphs.rst:147 msgid "Use the start point of the geometry." msgstr "" -#: ../../build/docs/basic/graph_views.rst:158 +#: ../../build/docs/basic/graphs.rst:158 msgid "" "Not expecting to be done due to the fact that some vertices are only dead" " ends." msgstr "" -#: ../../build/docs/basic/graph_views.rst:169 +#: ../../build/docs/basic/graphs.rst:169 msgid "" "Update the ``geom`` columns based on the ``target_osm`` column from " "``ways`` table." msgstr "" -#: ../../build/docs/basic/graph_views.rst:171 +#: ../../build/docs/basic/graphs.rst:171 msgid "Use the end point of the geometry." msgstr "" -#: ../../build/docs/basic/graph_views.rst:182 +#: ../../build/docs/basic/graphs.rst:182 msgid "" "Expecting to be done, that is the geometry column should not have a " "``NULL`` value." msgstr "" -#: ../../build/docs/basic/graph_views.rst:194 +#: ../../build/docs/basic/graphs.rst:194 msgid "Update the ``x`` and ``y`` columns based on the ``geom`` column." msgstr "" -#: ../../build/docs/basic/graph_views.rst:207 +#: ../../build/docs/basic/graphs.rst:207 msgid "pgr_connectedComponents" msgstr "" -#: ../../build/docs/basic/graph_views.rst:209 +#: ../../build/docs/basic/graphs.rst:209 msgid "" "``pgr_connectedComponents`` compute the connected components of an " "undirected graph using a Depth First Search approach. A connected " @@ -246,417 +246,417 @@ msgid "" "reachable from each other." msgstr "" -#: ../../build/docs/basic/graph_views.rst:222 +#: ../../build/docs/basic/graphs.rst:222 msgid "" "Description of the function can be found in `pgr_connectedComponents " "`__" msgstr "" -#: ../../build/docs/basic/graph_views.rst:227 +#: ../../build/docs/basic/graphs.rst:227 msgid "Exercise 3: Set components on edges and vertices tables" msgstr "" -#: ../../build/docs/basic/graph_views.rst:231 +#: ../../build/docs/basic/graphs.rst:231 msgid "Get the information about the graph components." msgstr "" -#: ../../build/docs/basic/graph_views.rst:235 +#: ../../build/docs/basic/graphs.rst:235 msgid "Create additional columns on the edges and vertices tables." msgstr "" -#: ../../build/docs/basic/graph_views.rst:246 +#: ../../build/docs/basic/graphs.rst:246 msgid "Use the ``pgr_connectedComponents`` to fill up the vertices table." msgstr "" -#: ../../build/docs/basic/graph_views.rst:248 +#: ../../build/docs/basic/graphs.rst:248 msgid "" "Use the results to store the component numbers on the vertices table. " "(**line 1**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:250 +#: ../../build/docs/basic/graphs.rst:250 msgid "Use the OSM identifiers of the vertices. (**lines 4-5**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:262 +#: ../../build/docs/basic/graphs.rst:262 msgid "Update the edges table with based on the component number of the vertex" msgstr "" -#: ../../build/docs/basic/graph_views.rst:275 +#: ../../build/docs/basic/graphs.rst:275 msgid "Exercise 4: Inspect the components" msgstr "" -#: ../../build/docs/basic/graph_views.rst:279 +#: ../../build/docs/basic/graphs.rst:279 msgid "Answer the following questions:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:281 -#: ../../build/docs/basic/graph_views.rst:288 +#: ../../build/docs/basic/graphs.rst:281 +#: ../../build/docs/basic/graphs.rst:288 msgid "How many components are in the vertices table?" msgstr "" -#: ../../build/docs/basic/graph_views.rst:282 -#: ../../build/docs/basic/graph_views.rst:301 +#: ../../build/docs/basic/graphs.rst:282 +#: ../../build/docs/basic/graphs.rst:301 msgid "How many components are in the edges table?" msgstr "" -#: ../../build/docs/basic/graph_views.rst:283 -#: ../../build/docs/basic/graph_views.rst:314 +#: ../../build/docs/basic/graphs.rst:283 +#: ../../build/docs/basic/graphs.rst:314 msgid "List the 10 components with more edges." msgstr "" -#: ../../build/docs/basic/graph_views.rst:284 -#: ../../build/docs/basic/graph_views.rst:328 +#: ../../build/docs/basic/graphs.rst:284 +#: ../../build/docs/basic/graphs.rst:328 msgid "Get the component with the maximum number of edges." msgstr "" -#: ../../build/docs/basic/graph_views.rst:290 -#: ../../build/docs/basic/graph_views.rst:303 +#: ../../build/docs/basic/graphs.rst:290 +#: ../../build/docs/basic/graphs.rst:303 msgid "Count the distinct components." msgstr "" -#: ../../build/docs/basic/graph_views.rst:316 +#: ../../build/docs/basic/graphs.rst:316 msgid "Count number of rows grouped by component. (**line 1**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:317 +#: ../../build/docs/basic/graphs.rst:317 msgid "Inverse order to display the top 10. (**line 2**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:330 +#: ../../build/docs/basic/graphs.rst:330 msgid "Use the query from last question to get the maximum count" msgstr "" -#: ../../build/docs/basic/graph_views.rst:331 +#: ../../build/docs/basic/graphs.rst:331 msgid "Get the component that matches the maximum value." msgstr "" -#: ../../build/docs/basic/graph_views.rst:345 +#: ../../build/docs/basic/graphs.rst:345 msgid "Preparing the graphs" msgstr "" -#: ../../build/docs/basic/graph_views.rst:348 +#: ../../build/docs/basic/graphs.rst:348 msgid "Exercise 5: Creating a view for routing" msgstr "" -#: ../../build/docs/basic/graph_views.rst:350 +#: ../../build/docs/basic/graphs.rst:350 msgid "View of roads for vehicles" msgstr "" -#: ../../build/docs/basic/graph_views.rst:356 +#: ../../build/docs/basic/graphs.rst:356 msgid "" "Create a view with minimal amount of information for processing the " "particular vehicles." msgstr "" -#: ../../build/docs/basic/graph_views.rst:357 +#: ../../build/docs/basic/graphs.rst:357 msgid "Use the OSM identifiers on the vertices." msgstr "" -#: ../../build/docs/basic/graph_views.rst:358 +#: ../../build/docs/basic/graphs.rst:358 msgid "" "Routing `cost` and `reverse_cost` in terms of seconds for routing " "calculations." msgstr "" -#: ../../build/docs/basic/graph_views.rst:359 +#: ../../build/docs/basic/graphs.rst:359 msgid "Exclude `steps`, `footway`, `path`, `cycleway` segments." msgstr "" -#: ../../build/docs/basic/graph_views.rst:360 -#: ../../build/docs/basic/graph_views.rst:491 +#: ../../build/docs/basic/graphs.rst:360 +#: ../../build/docs/basic/graphs.rst:491 msgid "Data needed in the view for further processing." msgstr "" -#: ../../build/docs/basic/graph_views.rst:362 +#: ../../build/docs/basic/graphs.rst:362 msgid "`name` The name of the segment." msgstr "" -#: ../../build/docs/basic/graph_views.rst:363 +#: ../../build/docs/basic/graphs.rst:363 msgid "`length_m` The length in meters rename to ``length``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:364 +#: ../../build/docs/basic/graphs.rst:364 msgid "`the_geom` The geometry rename to ``geom``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:366 -#: ../../build/docs/basic/graph_views.rst:496 +#: ../../build/docs/basic/graphs.rst:366 +#: ../../build/docs/basic/graphs.rst:496 msgid "Verify the number of edges was reduced." msgstr "" -#: ../../build/docs/basic/graph_views.rst:370 -#: ../../build/docs/basic/graph_views.rst:436 -#: ../../build/docs/basic/graph_views.rst:500 +#: ../../build/docs/basic/graphs.rst:370 +#: ../../build/docs/basic/graphs.rst:436 +#: ../../build/docs/basic/graphs.rst:500 msgid "Creating the view:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:372 +#: ../../build/docs/basic/graphs.rst:372 msgid "" "If you need to reconstruct the view, first drop it using the command on " "**line 1**." msgstr "" -#: ../../build/docs/basic/graph_views.rst:374 +#: ../../build/docs/basic/graphs.rst:374 msgid "Get the component with maximum number of edges (**lines 6-10**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:375 +#: ../../build/docs/basic/graphs.rst:375 msgid "" "The `source` and `target` requirements for the function are to be with " "OSM identifiers. (line **14**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:377 +#: ../../build/docs/basic/graphs.rst:377 msgid "The ``cost`` and ``reverse_cost`` are in terms of seconds. (line **15**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:378 +#: ../../build/docs/basic/graphs.rst:378 msgid "" "The additional parameters ``length_m`` and ``the_geom`` are renamed, " "``name`` is also included. (line **16**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:380 +#: ../../build/docs/basic/graphs.rst:380 msgid "``JOIN`` with the `configuration`:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:382 +#: ../../build/docs/basic/graphs.rst:382 msgid "Exclude `steps`, `footway`, `path`, `cycleway`. (line **18**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:395 +#: ../../build/docs/basic/graphs.rst:395 msgid "Verification:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:397 +#: ../../build/docs/basic/graphs.rst:397 msgid "Count the rows on the original ``ways`` and on ``vehicle_net``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:407 +#: ../../build/docs/basic/graphs.rst:407 msgid "Get the description of the view" msgstr "" -#: ../../build/docs/basic/graph_views.rst:419 +#: ../../build/docs/basic/graphs.rst:419 msgid "Exercise 6: Limiting the road network within an area" msgstr "" -#: ../../build/docs/basic/graph_views.rst:421 +#: ../../build/docs/basic/graphs.rst:421 msgid "View of smaller set of roads for vehicles" msgstr "" -#: ../../build/docs/basic/graph_views.rst:427 +#: ../../build/docs/basic/graphs.rst:427 msgid "Create a view ``taxi_net`` for the `taxi`:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:429 +#: ../../build/docs/basic/graphs.rst:429 msgid "" "The taxi can only circulate inside this Bounding Box: " "``(-48.52,-1.46,-48.45,-1.41)``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:430 +#: ../../build/docs/basic/graphs.rst:430 #, python-format msgid "The taxi speed is 10% slower than the particular vehicle." msgstr "" -#: ../../build/docs/basic/graph_views.rst:432 +#: ../../build/docs/basic/graphs.rst:432 msgid "Verify the reduced number of road segments." msgstr "" -#: ../../build/docs/basic/graph_views.rst:438 +#: ../../build/docs/basic/graphs.rst:438 #, python-format msgid "" "Adjust the taxi's ``cost`` and ``reverse_cost`` to be 10% slower than of " "the particular vehicle. (line **7**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:440 +#: ../../build/docs/basic/graphs.rst:440 msgid "" "The graph for the taxi is a subset of the ``vehicle_net`` graph. (line " "**9**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:441 +#: ../../build/docs/basic/graphs.rst:441 msgid "" "Can only circulate inside the bounding box: " "``(-48.52,-1.46,-48.45,-1.41)``. (line **10**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:455 +#: ../../build/docs/basic/graphs.rst:455 msgid "Count the rows on ``taxi_net``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:466 -#: ../../build/docs/basic/graph_views.rst:529 +#: ../../build/docs/basic/graphs.rst:466 +#: ../../build/docs/basic/graphs.rst:529 msgid "Get the description." msgstr "" -#: ../../build/docs/basic/graph_views.rst:477 +#: ../../build/docs/basic/graphs.rst:477 msgid "Exercise 7: Creating a materialized view for routing pedestrians" msgstr "" -#: ../../build/docs/basic/graph_views.rst:479 +#: ../../build/docs/basic/graphs.rst:479 msgid "View of roads for pedestrians" msgstr "" -#: ../../build/docs/basic/graph_views.rst:485 +#: ../../build/docs/basic/graphs.rst:485 msgid "" "Create a materialized view with minimal amount of information for " "processing pedestrians." msgstr "" -#: ../../build/docs/basic/graph_views.rst:486 +#: ../../build/docs/basic/graphs.rst:486 msgid "" "Routing `cost` and `reverse_cost` will be on seconds for routing " "calculations." msgstr "" -#: ../../build/docs/basic/graph_views.rst:490 +#: ../../build/docs/basic/graphs.rst:490 msgid "Exclude `motorway` , `primary` and `secondary` segments." msgstr "" -#: ../../build/docs/basic/graph_views.rst:493 +#: ../../build/docs/basic/graphs.rst:493 msgid "`length_m` The length in meters." msgstr "" -#: ../../build/docs/basic/graph_views.rst:494 +#: ../../build/docs/basic/graphs.rst:494 msgid "`the_geom` The geometry." msgstr "" -#: ../../build/docs/basic/graph_views.rst:502 +#: ../../build/docs/basic/graphs.rst:502 msgid "Similar to `Exercise 5: Creating a view for routing`_:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:504 +#: ../../build/docs/basic/graphs.rst:504 msgid "" "The ``cost`` and ``reverse_cost`` are in terms of seconds with speed of " "``2 mts/sec``. (line **7**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:505 +#: ../../build/docs/basic/graphs.rst:505 msgid "Exclude `motorway`, `primary` and `secondary` . (line **11**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:518 +#: ../../build/docs/basic/graphs.rst:518 msgid "Count the rows on the view ``walk_net``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:541 +#: ../../build/docs/basic/graphs.rst:541 msgid "Exercise 8: Testing the views for routing" msgstr "" -#: ../../build/docs/basic/graph_views.rst:543 +#: ../../build/docs/basic/graphs.rst:543 msgid "From the |ch7_place_1| to the |ch7_place_2|" msgstr "" -#: ../../build/docs/basic/graph_views.rst:549 +#: ../../build/docs/basic/graphs.rst:549 msgid "Test the created views" msgstr "" -#: ../../build/docs/basic/graph_views.rst:551 +#: ../../build/docs/basic/graphs.rst:551 msgid "In particular:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:553 +#: ../../build/docs/basic/graphs.rst:553 msgid "From the |ch7_place_1| to the \"|ch7_place_2| using the OSM identifier" msgstr "" -#: ../../build/docs/basic/graph_views.rst:554 +#: ../../build/docs/basic/graphs.rst:554 msgid "the views to be tested are:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:556 +#: ../../build/docs/basic/graphs.rst:556 msgid "``vehicle_net``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:557 +#: ../../build/docs/basic/graphs.rst:557 msgid "``taxi_net``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:558 +#: ../../build/docs/basic/graphs.rst:558 msgid "``walk_net``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:560 +#: ../../build/docs/basic/graphs.rst:560 msgid "" "Only show the following results, as the other columns are to be ignored " "on the function." msgstr "" -#: ../../build/docs/basic/graph_views.rst:562 +#: ../../build/docs/basic/graphs.rst:562 msgid "``seq``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:563 +#: ../../build/docs/basic/graphs.rst:563 msgid "``edge`` with the name ``id``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:564 +#: ../../build/docs/basic/graphs.rst:564 msgid "``cost`` with the name: ``seconds``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:568 +#: ../../build/docs/basic/graphs.rst:568 msgid "In general" msgstr "" -#: ../../build/docs/basic/graph_views.rst:570 +#: ../../build/docs/basic/graphs.rst:570 msgid "The departure is |ch7_place_1| with OSM identifier |ch7_osmid_1|." msgstr "" -#: ../../build/docs/basic/graph_views.rst:571 +#: ../../build/docs/basic/graphs.rst:571 msgid "The destination is |ch7_place_2| with OSM identifier |ch7_osmid_2|." msgstr "" -#: ../../build/docs/basic/graph_views.rst:573 +#: ../../build/docs/basic/graphs.rst:573 msgid "For ``vehicle_net``:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:575 +#: ../../build/docs/basic/graphs.rst:575 msgid "``vehicle_net`` is used." msgstr "" -#: ../../build/docs/basic/graph_views.rst:576 +#: ../../build/docs/basic/graphs.rst:576 msgid "Selection of the columns with the corresponding names are on line **1**." msgstr "" -#: ../../build/docs/basic/graph_views.rst:577 +#: ../../build/docs/basic/graphs.rst:577 msgid "The view is prepared with the column names that pgRouting use." msgstr "" -#: ../../build/docs/basic/graph_views.rst:579 +#: ../../build/docs/basic/graphs.rst:579 msgid "There is no need to rename columns. (line **3**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:581 +#: ../../build/docs/basic/graphs.rst:581 msgid "" "The OSM identifiers of the departure and destination are used. (line " "**4**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:594 +#: ../../build/docs/basic/graphs.rst:594 msgid "For ``taxi_net``:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:596 +#: ../../build/docs/basic/graphs.rst:596 msgid "Similar as the previous one but with ``taxi_net``. (line **3**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:597 +#: ../../build/docs/basic/graphs.rst:597 msgid "" "The results give the same route as with ``vehicle_net`` but ``cost`` is " "higher." msgstr "" -#: ../../build/docs/basic/graph_views.rst:610 +#: ../../build/docs/basic/graphs.rst:610 msgid "For ``walk_net``:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:612 +#: ../../build/docs/basic/graphs.rst:612 msgid "Similar as the previous one but with ``walk_net``. (line **3**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:613 +#: ../../build/docs/basic/graphs.rst:613 msgid "The results give a different route than of the vehicles." msgstr "" diff --git a/locale/en/LC_MESSAGES/basic/pedestrian.po b/locale/en/LC_MESSAGES/basic/pedestrian.po index 02913656d..3de72d004 100644 --- a/locale/en/LC_MESSAGES/basic/pedestrian.po +++ b/locale/en/LC_MESSAGES/basic/pedestrian.po @@ -336,23 +336,23 @@ msgstr "" msgid "Result adds the costs per destination." msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:1 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:1 msgid "Inspecting the results, looking for totals (edge = -1):" msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:3 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:3 msgid "From 20297 to vertex 6548 takes 92.58 minutes (seq = 147)" msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:5 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:5 msgid "From 20297 to vertex 12712 takes 83.18 minutes (seq = 267)" msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:7 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:7 msgid "From 23872 to vertex 6548 takes 76.26 minutes (seq = 385)" msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:9 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:9 msgid "From 23872 to vertex 12712 takes 67.76 minutes (seq = 495)" msgstr "" @@ -452,7 +452,7 @@ msgid "" "(line **6**)." msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_2.txt:1 +#: ../../build/docs/scripts/basic/pedestrian/note_2.txt:1 msgid "" "An interpretation of the result can be: In general, it is faster to " "depart from \"Instituto Federal do Pará, Campus Belém\" than from " diff --git a/locale/en/LC_MESSAGES/basic/plpgsql_function.po b/locale/en/LC_MESSAGES/basic/plpgsql_function.po index 35c4674ae..9e1f9cb49 100644 --- a/locale/en/LC_MESSAGES/basic/plpgsql_function.po +++ b/locale/en/LC_MESSAGES/basic/plpgsql_function.po @@ -282,14 +282,14 @@ msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:91 msgid "" -"Use ``pgr_extractVertices`` (explained in :doc:`graph_views`) to create " +"Use ``pgr_extractVertices`` (explained in :doc:`graphs`) to create " "the vertices table" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:93 msgid "" "``JOIN`` the vertices table with ``ways_vertices`` (created in " -":doc:`graph_views`) to get the ``x``, ``y``, ``geom`` information." +":doc:`graphs`) to get the ``x``, ``y``, ``geom`` information." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:96 @@ -319,7 +319,7 @@ msgid "It is left to the reader to remove disconected components on the views." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:122 -msgid "See :doc:`graph_views`" +msgid "See :doc:`graphs`" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:125 diff --git a/locale/en/LC_MESSAGES/un_sdg/sdg11-cities.po b/locale/en/LC_MESSAGES/un_sdg/sdg11-cities.po index 3f01bb402..43486ded4 100644 --- a/locale/en/LC_MESSAGES/un_sdg/sdg11-cities.po +++ b/locale/en/LC_MESSAGES/un_sdg/sdg11-cities.po @@ -254,7 +254,7 @@ msgstr "" msgid "" "The pgRouting function ``pgr_connectedComponents`` is used to complete " "this task and its explaind with more detail in " -":doc:`../basic/graph_views`." +":doc:`../basic/graphs`." msgstr "" #: ../../build/docs/un_sdg/sdg11-cities.rst:244 diff --git a/locale/en/LC_MESSAGES/un_sdg/sdg3-health.po b/locale/en/LC_MESSAGES/un_sdg/sdg3-health.po index 7dc10b029..883ff6272 100644 --- a/locale/en/LC_MESSAGES/un_sdg/sdg3-health.po +++ b/locale/en/LC_MESSAGES/un_sdg/sdg3-health.po @@ -477,7 +477,7 @@ msgstr "" #: ../../build/docs/un_sdg/sdg3-health.rst:423 msgid "" "To remove the disconnected components on the road network, the following " -"pgRouting functions, discussed on :doc:`../basic/graph_views`, will be " +"pgRouting functions, discussed on :doc:`../basic/graphs`, will be " "used:" msgstr "" diff --git a/locale/en/LC_MESSAGES/un_sdg/sdg7-energy.po b/locale/en/LC_MESSAGES/un_sdg/sdg7-energy.po index 367346062..15fa510f3 100644 --- a/locale/en/LC_MESSAGES/un_sdg/sdg7-energy.po +++ b/locale/en/LC_MESSAGES/un_sdg/sdg7-energy.po @@ -139,7 +139,7 @@ msgstr "" #: ../../build/docs/un_sdg/sdg7-energy.rst:99 msgid "" "To remove the disconnected components on the road network, the following " -"pgRouting functions, discussed on :doc:`../basic/graph_views`, will be " +"pgRouting functions, discussed on :doc:`../basic/graphs`, will be " "used:" msgstr "" diff --git a/locale/es/LC_MESSAGES/basic/graph_views.po b/locale/es/LC_MESSAGES/basic/graphs.po similarity index 72% rename from locale/es/LC_MESSAGES/basic/graph_views.po rename to locale/es/LC_MESSAGES/basic/graphs.po index 902f51833..4bb9aafe7 100644 --- a/locale/es/LC_MESSAGES/basic/graph_views.po +++ b/locale/es/LC_MESSAGES/basic/graphs.po @@ -12,7 +12,7 @@ msgstr "" "PO-Revision-Date: 2024-12-16 19:42+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" +"pgrouting-workshop/basic-graphs/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -21,15 +21,15 @@ msgstr "" "X-Generator: Weblate 5.4.3\n" "Generated-By: Babel 2.16.0\n" -#: ../../build/docs/basic/graph_views.rst:12 +#: ../../build/docs/basic/graphs.rst:12 msgid "Graph views" msgstr "Vistas de grafos" -#: ../../build/docs/basic/graph_views.rst:18 +#: ../../build/docs/basic/graphs.rst:18 msgid "Chapter Contents" msgstr "Contenido del Capítulo" -#: ../../build/docs/basic/graph_views.rst:20 +#: ../../build/docs/basic/graphs.rst:20 msgid "" "Different application require different graphs. This chapter covers how " "to discard disconnected segments and different approaches to create " @@ -39,11 +39,11 @@ msgstr "" "se explica cómo descartar segmentos desconectados y los distintos métodos" " para crear gráficos." -#: ../../build/docs/basic/graph_views.rst:24 +#: ../../build/docs/basic/graphs.rst:24 msgid "The graph requirements" msgstr "Requisitos del grafo" -#: ../../build/docs/basic/graph_views.rst:26 +#: ../../build/docs/basic/graphs.rst:26 msgid "" "In this chapter there are three graph requirements. It consists on three " "graphs based on a **fully connected** graph derived from ``ways``: two " @@ -56,70 +56,70 @@ msgstr "" "para distintos tipos de vehículos y uno para peatones. En todos ellos, el " "origen y el destino se basan en ``source_osm`` y el ``target_osm``." -#: ../../build/docs/basic/graph_views.rst:31 +#: ../../build/docs/basic/graphs.rst:31 msgid "The description of the graphs:" msgstr "La descripción de los grafos:" -#: ../../build/docs/basic/graph_views.rst:33 +#: ../../build/docs/basic/graphs.rst:33 msgid "Particular vehicle:" msgstr "Vehículo particular:" -#: ../../build/docs/basic/graph_views.rst:35 +#: ../../build/docs/basic/graphs.rst:35 msgid "Circulate on the whole Belém area." msgstr "Circular por toda la zona de Belém." -#: ../../build/docs/basic/graph_views.rst:37 -#: ../../build/docs/basic/graph_views.rst:46 +#: ../../build/docs/basic/graphs.rst:37 +#: ../../build/docs/basic/graphs.rst:46 msgid "Do not use `steps`, `footway`, `path`, `cycleway`." msgstr "No usar `steps`, `footway`, `path`, `cycleway`." -#: ../../build/docs/basic/graph_views.rst:39 +#: ../../build/docs/basic/graphs.rst:39 msgid "Speed is the default speed from OSM information." msgstr "La velocidad es la velocidad predeterminada de la información de OSM." -#: ../../build/docs/basic/graph_views.rst:41 +#: ../../build/docs/basic/graphs.rst:41 msgid "Taxi vehicle:" msgstr "Vehículo Taxi:" -#: ../../build/docs/basic/graph_views.rst:43 +#: ../../build/docs/basic/graphs.rst:43 msgid "Circulate on a smaller area:" msgstr "Circula en un área más pequeña:" -#: ../../build/docs/basic/graph_views.rst:45 +#: ../../build/docs/basic/graphs.rst:45 msgid "Bounding box: ``(-48.52,-1.46,-48.45,-1.41)``" msgstr "Caja delimitadora: ``(-48.52,-1.46,-48.45,-1.41)``" -#: ../../build/docs/basic/graph_views.rst:48 +#: ../../build/docs/basic/graphs.rst:48 #, python-format msgid "Speed is 10% slower than that of the particular vehicles." msgstr "La velocidad es 10% inferior a la de los vehículos particulares." -#: ../../build/docs/basic/graph_views.rst:50 +#: ../../build/docs/basic/graphs.rst:50 msgid "Pedestrians:" msgstr "Peatones:" -#: ../../build/docs/basic/graph_views.rst:52 +#: ../../build/docs/basic/graphs.rst:52 msgid "Walk on the whole Belém area." msgstr "Caminar por toda la zona de Belém." -#: ../../build/docs/basic/graph_views.rst:53 +#: ../../build/docs/basic/graphs.rst:53 msgid "Can not walk on exclusive vehicle ways" msgstr "No se puede caminar por vías exclusivas para vehículos" -#: ../../build/docs/basic/graph_views.rst:55 +#: ../../build/docs/basic/graphs.rst:55 msgid "`motorways` and on `primary` segments." msgstr "En segmentos `motorways` y `primary`." -#: ../../build/docs/basic/graph_views.rst:57 -#: ../../build/docs/basic/graph_views.rst:488 +#: ../../build/docs/basic/graphs.rst:57 +#: ../../build/docs/basic/graphs.rst:488 msgid "The speed is ``2 mts/sec``." msgstr "La velocidad es de ``2 mts/sec``." -#: ../../build/docs/basic/graph_views.rst:60 +#: ../../build/docs/basic/graphs.rst:60 msgid "pgr_extractVertices" msgstr "pgr_extractVertices" -#: ../../build/docs/basic/graph_views.rst:62 +#: ../../build/docs/basic/graphs.rst:62 msgid "" "``pgr_extractVertices`` compute the connected components of an undirected" " graph using a Depth First Search approach. A connected component of an " @@ -131,12 +131,12 @@ msgstr "" "conectado de un grafo no dirigido es un conjunto de vértices que son " "todos alcanzables entre sí." -#: ../../build/docs/basic/graph_views.rst:67 -#: ../../build/docs/basic/graph_views.rst:214 +#: ../../build/docs/basic/graphs.rst:67 +#: ../../build/docs/basic/graphs.rst:214 msgid "Signature summary" msgstr "Resumen de la firma" -#: ../../build/docs/basic/graph_views.rst:75 +#: ../../build/docs/basic/graphs.rst:75 msgid "" "Description of the function can be found in `pgr_extractVertices " "`__" @@ -144,47 +144,47 @@ msgstr "" "La descripción de la función se encuentra en `pgr_extractVertices " "`__" -#: ../../build/docs/basic/graph_views.rst:79 +#: ../../build/docs/basic/graphs.rst:79 msgid "Exercise 1: Create a vertices table" msgstr "Ejercicio 1: Crear una tabla de vértices" -#: ../../build/docs/basic/graph_views.rst:82 -#: ../../build/docs/basic/graph_views.rst:130 -#: ../../build/docs/basic/graph_views.rst:230 -#: ../../build/docs/basic/graph_views.rst:278 -#: ../../build/docs/basic/graph_views.rst:355 -#: ../../build/docs/basic/graph_views.rst:426 -#: ../../build/docs/basic/graph_views.rst:484 -#: ../../build/docs/basic/graph_views.rst:548 +#: ../../build/docs/basic/graphs.rst:82 +#: ../../build/docs/basic/graphs.rst:130 +#: ../../build/docs/basic/graphs.rst:230 +#: ../../build/docs/basic/graphs.rst:278 +#: ../../build/docs/basic/graphs.rst:355 +#: ../../build/docs/basic/graphs.rst:426 +#: ../../build/docs/basic/graphs.rst:484 +#: ../../build/docs/basic/graphs.rst:548 msgid "Problem" msgstr "Problema" -#: ../../build/docs/basic/graph_views.rst:83 +#: ../../build/docs/basic/graphs.rst:83 msgid "Create the vertices table corresponding to the edges in ``ways``." msgstr "Crea la tabla de vértices correspondiente a las aristas en ``ways``." -#: ../../build/docs/basic/graph_views.rst:86 -#: ../../build/docs/basic/graph_views.rst:134 -#: ../../build/docs/basic/graph_views.rst:234 -#: ../../build/docs/basic/graph_views.rst:287 -#: ../../build/docs/basic/graph_views.rst:369 -#: ../../build/docs/basic/graph_views.rst:435 -#: ../../build/docs/basic/graph_views.rst:499 -#: ../../build/docs/basic/graph_views.rst:567 +#: ../../build/docs/basic/graphs.rst:86 +#: ../../build/docs/basic/graphs.rst:134 +#: ../../build/docs/basic/graphs.rst:234 +#: ../../build/docs/basic/graphs.rst:287 +#: ../../build/docs/basic/graphs.rst:369 +#: ../../build/docs/basic/graphs.rst:435 +#: ../../build/docs/basic/graphs.rst:499 +#: ../../build/docs/basic/graphs.rst:567 msgid "Solution" msgstr "Solución" -#: ../../build/docs/basic/graph_views.rst:87 +#: ../../build/docs/basic/graphs.rst:87 msgid "A graph consists of a set of vertices and a set of edges." msgstr "" "Un grafo está formado por un conjunto de vértices y un conjunto de " "aristas." -#: ../../build/docs/basic/graph_views.rst:88 +#: ../../build/docs/basic/graphs.rst:88 msgid "In this case, the ``ways`` table is a set of edges." msgstr "En este caso, la tabla ``ways`` es un conjunto de aristas." -#: ../../build/docs/basic/graph_views.rst:89 +#: ../../build/docs/basic/graphs.rst:89 msgid "" "In order to make use of all the graph functions from pgRouting, it is " "required have the set of vertices defined." @@ -192,31 +192,31 @@ msgstr "" "Para poder hacer uso de todas las funciones sobre grafos de pgRouting, es" " necesario tener definido el conjunto de vértices." -#: ../../build/docs/basic/graph_views.rst:91 +#: ../../build/docs/basic/graphs.rst:91 msgid "From the requirements, the graph is going to be based on OSM identifiers." msgstr "Según los requisitos, el grafo se basará en identificadores OSM." -#: ../../build/docs/basic/graph_views.rst:104 +#: ../../build/docs/basic/graphs.rst:104 msgid "Reviewing the description of the vertices table" msgstr "Revisando de la descripción de la tabla de vértices" -#: ../../build/docs/basic/graph_views.rst:114 +#: ../../build/docs/basic/graphs.rst:114 msgid "Inspecting the information on the vertices table" msgstr "Inspeccionando la información de la tabla de vértices" -#: ../../build/docs/basic/graph_views.rst:127 +#: ../../build/docs/basic/graphs.rst:127 msgid "Exercise 2: Fill up other columns in the vertices table" msgstr "Ejercicio 2: Llenar las otras columnas de la tabla de vértices" -#: ../../build/docs/basic/graph_views.rst:131 +#: ../../build/docs/basic/graphs.rst:131 msgid "Fill up geometry information on the vertices table." msgstr "Llena la información de geometría en la tabla de vértices." -#: ../../build/docs/basic/graph_views.rst:135 +#: ../../build/docs/basic/graphs.rst:135 msgid "Count the number of rows that need to be filled up." msgstr "Contar el número de filas que hay que rellenar." -#: ../../build/docs/basic/graph_views.rst:145 +#: ../../build/docs/basic/graphs.rst:145 msgid "" "Update the ``geom`` columns based on the ``source_osm`` column from " "``ways`` table." @@ -224,11 +224,11 @@ msgstr "" "Actualizar la columna ``geom`` basándose en la columna ``source_osm`` de " "la tabla ``ways``." -#: ../../build/docs/basic/graph_views.rst:147 +#: ../../build/docs/basic/graphs.rst:147 msgid "Use the start point of the geometry." msgstr "Utilizar el punto inicial de la geometría." -#: ../../build/docs/basic/graph_views.rst:158 +#: ../../build/docs/basic/graphs.rst:158 msgid "" "Not expecting to be done due to the fact that some vertices are only dead" " ends." @@ -236,7 +236,7 @@ msgstr "" "No se espera haber terminado debido a que algunos vértices son sólo " "callejones sin salida." -#: ../../build/docs/basic/graph_views.rst:169 +#: ../../build/docs/basic/graphs.rst:169 msgid "" "Update the ``geom`` columns based on the ``target_osm`` column from " "``ways`` table." @@ -244,11 +244,11 @@ msgstr "" "Actualizar las columnas ``geom`` basándose en la columna ``target_osm`` " "de la tabla ``ways``." -#: ../../build/docs/basic/graph_views.rst:171 +#: ../../build/docs/basic/graphs.rst:171 msgid "Use the end point of the geometry." msgstr "Utilizar el punto final de la geometría." -#: ../../build/docs/basic/graph_views.rst:182 +#: ../../build/docs/basic/graphs.rst:182 msgid "" "Expecting to be done, that is the geometry column should not have a " "``NULL`` value." @@ -256,15 +256,15 @@ msgstr "" "Se espera haber terminado, es decir la columna geometría no debe tener un" " valor ``NULL``." -#: ../../build/docs/basic/graph_views.rst:194 +#: ../../build/docs/basic/graphs.rst:194 msgid "Update the ``x`` and ``y`` columns based on the ``geom`` column." msgstr "Actualizar las columnas ``x`` e ``y`` en función de la columna ``geom``." -#: ../../build/docs/basic/graph_views.rst:207 +#: ../../build/docs/basic/graphs.rst:207 msgid "pgr_connectedComponents" msgstr "pgr_connectedComponents" -#: ../../build/docs/basic/graph_views.rst:209 +#: ../../build/docs/basic/graphs.rst:209 msgid "" "``pgr_connectedComponents`` compute the connected components of an " "undirected graph using a Depth First Search approach. A connected " @@ -276,7 +276,7 @@ msgstr "" "componente conectado de un grafo no dirigido es un conjunto de vértices " "que son todos alcanzables entre sí." -#: ../../build/docs/basic/graph_views.rst:222 +#: ../../build/docs/basic/graphs.rst:222 msgid "" "Description of the function can be found in `pgr_connectedComponents " "`__" @@ -284,23 +284,23 @@ msgstr "" "La descripción de la función se encuentra en `pgr_connectedComponents " "`__" -#: ../../build/docs/basic/graph_views.rst:227 +#: ../../build/docs/basic/graphs.rst:227 msgid "Exercise 3: Set components on edges and vertices tables" msgstr "Ejercicio 3: Establecer componentes en tablas de aristas y vértices" -#: ../../build/docs/basic/graph_views.rst:231 +#: ../../build/docs/basic/graphs.rst:231 msgid "Get the information about the graph components." msgstr "Obtener la información sobre los componentes del grafo." -#: ../../build/docs/basic/graph_views.rst:235 +#: ../../build/docs/basic/graphs.rst:235 msgid "Create additional columns on the edges and vertices tables." msgstr "Crear columnas adicionales en las tablas de aristas y vértices." -#: ../../build/docs/basic/graph_views.rst:246 +#: ../../build/docs/basic/graphs.rst:246 msgid "Use the ``pgr_connectedComponents`` to fill up the vertices table." msgstr "Utilizar ``pgr_connectedComponents`` para llenar la tabla de vértices." -#: ../../build/docs/basic/graph_views.rst:248 +#: ../../build/docs/basic/graphs.rst:248 msgid "" "Use the results to store the component numbers on the vertices table. " "(**line 1**)" @@ -308,78 +308,78 @@ msgstr "" "Utilizar los resultados para almacenar los números de los componentes en " "la tabla de vértices. (**línea 1**)" -#: ../../build/docs/basic/graph_views.rst:250 +#: ../../build/docs/basic/graphs.rst:250 msgid "Use the OSM identifiers of the vertices. (**lines 4-5**)" msgstr "Utilizar los identificadores OSM de los vértices. (**líneas 4-5**)" -#: ../../build/docs/basic/graph_views.rst:262 +#: ../../build/docs/basic/graphs.rst:262 msgid "Update the edges table with based on the component number of the vertex" msgstr "" "Actualizar la tabla de aristas con en función del número de componente " "del vértice" -#: ../../build/docs/basic/graph_views.rst:275 +#: ../../build/docs/basic/graphs.rst:275 msgid "Exercise 4: Inspect the components" msgstr "Ejercicio 4: Inspeccionar los componentes" -#: ../../build/docs/basic/graph_views.rst:279 +#: ../../build/docs/basic/graphs.rst:279 msgid "Answer the following questions:" msgstr "Responder a las siguientes preguntas:" -#: ../../build/docs/basic/graph_views.rst:281 -#: ../../build/docs/basic/graph_views.rst:288 +#: ../../build/docs/basic/graphs.rst:281 +#: ../../build/docs/basic/graphs.rst:288 msgid "How many components are in the vertices table?" msgstr "¿Cuántos componentes hay en la tabla de vértices?" -#: ../../build/docs/basic/graph_views.rst:282 -#: ../../build/docs/basic/graph_views.rst:301 +#: ../../build/docs/basic/graphs.rst:282 +#: ../../build/docs/basic/graphs.rst:301 msgid "How many components are in the edges table?" msgstr "¿Cuántos componentes hay en la tabla de bordes?" -#: ../../build/docs/basic/graph_views.rst:283 -#: ../../build/docs/basic/graph_views.rst:314 +#: ../../build/docs/basic/graphs.rst:283 +#: ../../build/docs/basic/graphs.rst:314 msgid "List the 10 components with more edges." msgstr "Enumerar los 10 componentes con más aristas." -#: ../../build/docs/basic/graph_views.rst:284 -#: ../../build/docs/basic/graph_views.rst:328 +#: ../../build/docs/basic/graphs.rst:284 +#: ../../build/docs/basic/graphs.rst:328 msgid "Get the component with the maximum number of edges." msgstr "Obtiener el componente con el máximo número de aristas." -#: ../../build/docs/basic/graph_views.rst:290 -#: ../../build/docs/basic/graph_views.rst:303 +#: ../../build/docs/basic/graphs.rst:290 +#: ../../build/docs/basic/graphs.rst:303 msgid "Count the distinct components." msgstr "Contar los componentes distintos." -#: ../../build/docs/basic/graph_views.rst:316 +#: ../../build/docs/basic/graphs.rst:316 msgid "Count number of rows grouped by component. (**line 1**)" msgstr "Número de filas agrupadas por componente. (**línea 1**)" -#: ../../build/docs/basic/graph_views.rst:317 +#: ../../build/docs/basic/graphs.rst:317 msgid "Inverse order to display the top 10. (**line 2**)" msgstr "Orden inverso para mostrar los 10 primeros. (**línea 2**)" -#: ../../build/docs/basic/graph_views.rst:330 +#: ../../build/docs/basic/graphs.rst:330 msgid "Use the query from last question to get the maximum count" msgstr "Utilizar la consulta de la última pregunta para obtener el recuento máximo" -#: ../../build/docs/basic/graph_views.rst:331 +#: ../../build/docs/basic/graphs.rst:331 msgid "Get the component that matches the maximum value." msgstr "Obtiene el componente que coincide con el valor máximo." -#: ../../build/docs/basic/graph_views.rst:345 +#: ../../build/docs/basic/graphs.rst:345 msgid "Preparing the graphs" msgstr "Preparación de los grafos" -#: ../../build/docs/basic/graph_views.rst:348 +#: ../../build/docs/basic/graphs.rst:348 msgid "Exercise 5: Creating a view for routing" msgstr "Ejercicio 5: Creación de una vista para el ruteo" -#: ../../build/docs/basic/graph_views.rst:350 +#: ../../build/docs/basic/graphs.rst:350 msgid "View of roads for vehicles" msgstr "Vista de carreteras para vehículos" -#: ../../build/docs/basic/graph_views.rst:356 +#: ../../build/docs/basic/graphs.rst:356 msgid "" "Create a view with minimal amount of information for processing the " "particular vehicles." @@ -387,11 +387,11 @@ msgstr "" "Crear una vista con una cantidad mínima de información para procesar los " "vehículos particulares." -#: ../../build/docs/basic/graph_views.rst:357 +#: ../../build/docs/basic/graphs.rst:357 msgid "Use the OSM identifiers on the vertices." msgstr "Utilizar los identificadores OSM en los vértices." -#: ../../build/docs/basic/graph_views.rst:358 +#: ../../build/docs/basic/graphs.rst:358 msgid "" "Routing `cost` and `reverse_cost` in terms of seconds for routing " "calculations." @@ -399,39 +399,39 @@ msgstr "" "El `cost` y `reverse_cost` del ruteo en términos de segundos para los " "cálculos de ruteo." -#: ../../build/docs/basic/graph_views.rst:359 +#: ../../build/docs/basic/graphs.rst:359 msgid "Exclude `steps`, `footway`, `path`, `cycleway` segments." msgstr "Excluye los segmentos `steps`, `footway`, `path`, `cycleway`." -#: ../../build/docs/basic/graph_views.rst:360 -#: ../../build/docs/basic/graph_views.rst:491 +#: ../../build/docs/basic/graphs.rst:360 +#: ../../build/docs/basic/graphs.rst:491 msgid "Data needed in the view for further processing." msgstr "Datos necesarios en la vista para su posterior procesamiento." -#: ../../build/docs/basic/graph_views.rst:362 +#: ../../build/docs/basic/graphs.rst:362 msgid "`name` The name of the segment." msgstr "`name` El nombre del segmento." -#: ../../build/docs/basic/graph_views.rst:363 +#: ../../build/docs/basic/graphs.rst:363 msgid "`length_m` The length in meters rename to ``length``." msgstr "`length_m` La longitud en metros renombrar a ``length``." -#: ../../build/docs/basic/graph_views.rst:364 +#: ../../build/docs/basic/graphs.rst:364 msgid "`the_geom` The geometry rename to ``geom``." msgstr "`the_geom` El cambio de nombre de la geometría a ``geom``." -#: ../../build/docs/basic/graph_views.rst:366 -#: ../../build/docs/basic/graph_views.rst:496 +#: ../../build/docs/basic/graphs.rst:366 +#: ../../build/docs/basic/graphs.rst:496 msgid "Verify the number of edges was reduced." msgstr "Comprobar que se ha reducido el número de aristas." -#: ../../build/docs/basic/graph_views.rst:370 -#: ../../build/docs/basic/graph_views.rst:436 -#: ../../build/docs/basic/graph_views.rst:500 +#: ../../build/docs/basic/graphs.rst:370 +#: ../../build/docs/basic/graphs.rst:436 +#: ../../build/docs/basic/graphs.rst:500 msgid "Creating the view:" msgstr "Creación de la vista:" -#: ../../build/docs/basic/graph_views.rst:372 +#: ../../build/docs/basic/graphs.rst:372 msgid "" "If you need to reconstruct the view, first drop it using the command on " "**line 1**." @@ -439,11 +439,11 @@ msgstr "" "Si necesita reconstruir la vista, primero borrarla usando el comando en " "línea **1**." -#: ../../build/docs/basic/graph_views.rst:374 +#: ../../build/docs/basic/graphs.rst:374 msgid "Get the component with maximum number of edges (**lines 6-10**)" msgstr "Obtener el componente con el máximo número de aristas (**líneas 6-10**)" -#: ../../build/docs/basic/graph_views.rst:375 +#: ../../build/docs/basic/graphs.rst:375 msgid "" "The `source` and `target` requirements for the function are to be with " "OSM identifiers. (line **14**)" @@ -451,11 +451,11 @@ msgstr "" "Los requisitos `source` y `target` para la función deben ser con " "identificadores OSM. (línea **14**)" -#: ../../build/docs/basic/graph_views.rst:377 +#: ../../build/docs/basic/graphs.rst:377 msgid "The ``cost`` and ``reverse_cost`` are in terms of seconds. (line **15**)" msgstr "El ``coste`` y el ``reverse_cost`` se expresan en segundos. (línea **15**)" -#: ../../build/docs/basic/graph_views.rst:378 +#: ../../build/docs/basic/graphs.rst:378 msgid "" "The additional parameters ``length_m`` and ``the_geom`` are renamed, " "``name`` is also included. (line **16**)" @@ -463,39 +463,39 @@ msgstr "" "Los parámetros adicionales ``length_m`` y ``the_geom`` se renombran, " "también se incluye ``name``. (línea **16**)" -#: ../../build/docs/basic/graph_views.rst:380 +#: ../../build/docs/basic/graphs.rst:380 msgid "``JOIN`` with the `configuration`:" msgstr "``JOIN`` con `configuration`:" -#: ../../build/docs/basic/graph_views.rst:382 +#: ../../build/docs/basic/graphs.rst:382 msgid "Exclude `steps`, `footway`, `path`, `cycleway`. (line **18**)" msgstr "Excluir `steps`, `footway`, `path`, `cycleway`. (línea **18**)" -#: ../../build/docs/basic/graph_views.rst:395 +#: ../../build/docs/basic/graphs.rst:395 msgid "Verification:" msgstr "Verificación:" -#: ../../build/docs/basic/graph_views.rst:397 +#: ../../build/docs/basic/graphs.rst:397 msgid "Count the rows on the original ``ways`` and on ``vehicle_net``." msgstr "Contar las filas en ``ways`` original y en ``vehicle_net``." -#: ../../build/docs/basic/graph_views.rst:407 +#: ../../build/docs/basic/graphs.rst:407 msgid "Get the description of the view" msgstr "Obtener la descripción de la vista" -#: ../../build/docs/basic/graph_views.rst:419 +#: ../../build/docs/basic/graphs.rst:419 msgid "Exercise 6: Limiting the road network within an area" msgstr "Ejercicio 6: Limitar la red de carreteras de una zona" -#: ../../build/docs/basic/graph_views.rst:421 +#: ../../build/docs/basic/graphs.rst:421 msgid "View of smaller set of roads for vehicles" msgstr "Vista de un conjunto más pequeño de carreteras para vehículos" -#: ../../build/docs/basic/graph_views.rst:427 +#: ../../build/docs/basic/graphs.rst:427 msgid "Create a view ``taxi_net`` for the `taxi`:" msgstr "Crar una vista ``taxi_net`` para el `taxi`:" -#: ../../build/docs/basic/graph_views.rst:429 +#: ../../build/docs/basic/graphs.rst:429 msgid "" "The taxi can only circulate inside this Bounding Box: " "``(-48.52,-1.46,-48.45,-1.41)``" @@ -503,16 +503,16 @@ msgstr "" "El taxi sólo puede circular dentro de este recuadro: " "``(-48.52,-1.46,-48.45,-1.41)``" -#: ../../build/docs/basic/graph_views.rst:430 +#: ../../build/docs/basic/graphs.rst:430 #, python-format msgid "The taxi speed is 10% slower than the particular vehicle." msgstr "La velocidad de taxi es 10% inferior a la del vehículo particular." -#: ../../build/docs/basic/graph_views.rst:432 +#: ../../build/docs/basic/graphs.rst:432 msgid "Verify the reduced number of road segments." msgstr "Verificar el número reducido de segmentos de carretera." -#: ../../build/docs/basic/graph_views.rst:438 +#: ../../build/docs/basic/graphs.rst:438 #, python-format msgid "" "Adjust the taxi's ``cost`` and ``reverse_cost`` to be 10% slower than of " @@ -521,7 +521,7 @@ msgstr "" "Ajustar el ``cost`` y el ``reverse_cost`` del taxi para que sean 10% más " "bajos que los del vehículo particular. (línea **7**)" -#: ../../build/docs/basic/graph_views.rst:440 +#: ../../build/docs/basic/graphs.rst:440 msgid "" "The graph for the taxi is a subset of the ``vehicle_net`` graph. (line " "**9**)" @@ -529,7 +529,7 @@ msgstr "" "El grafo del taxi es un subconjunto del grafo ``vehicle_net``. (línea " "**9**)" -#: ../../build/docs/basic/graph_views.rst:441 +#: ../../build/docs/basic/graphs.rst:441 msgid "" "Can only circulate inside the bounding box: " "``(-48.52,-1.46,-48.45,-1.41)``. (line **10**)" @@ -537,24 +537,24 @@ msgstr "" "Sólo puede circular dentro de la caja delimitadora: " "``(-48.52,-1.46,-48.45,-1.41)``. (línea **10**)" -#: ../../build/docs/basic/graph_views.rst:455 +#: ../../build/docs/basic/graphs.rst:455 msgid "Count the rows on ``taxi_net``." msgstr "Contar las filas en ``taxi_net``." -#: ../../build/docs/basic/graph_views.rst:466 -#: ../../build/docs/basic/graph_views.rst:529 +#: ../../build/docs/basic/graphs.rst:466 +#: ../../build/docs/basic/graphs.rst:529 msgid "Get the description." msgstr "Obtener la descripción." -#: ../../build/docs/basic/graph_views.rst:477 +#: ../../build/docs/basic/graphs.rst:477 msgid "Exercise 7: Creating a materialized view for routing pedestrians" msgstr "Ejercicio 7: Creación de una vista materializada para el ruteo de peatones" -#: ../../build/docs/basic/graph_views.rst:479 +#: ../../build/docs/basic/graphs.rst:479 msgid "View of roads for pedestrians" msgstr "Vista de las carreteras para peatones" -#: ../../build/docs/basic/graph_views.rst:485 +#: ../../build/docs/basic/graphs.rst:485 msgid "" "Create a materialized view with minimal amount of information for " "processing pedestrians." @@ -562,7 +562,7 @@ msgstr "" "Crear una vista materializada con una cantidad mínima de información para" " procesar peatones." -#: ../../build/docs/basic/graph_views.rst:486 +#: ../../build/docs/basic/graphs.rst:486 msgid "" "Routing `cost` and `reverse_cost` will be on seconds for routing " "calculations." @@ -570,23 +570,23 @@ msgstr "" "El costo de ruteo en `cost` y `reverse_cost` será en segundos para los " "cálculos de ruteo." -#: ../../build/docs/basic/graph_views.rst:490 +#: ../../build/docs/basic/graphs.rst:490 msgid "Exclude `motorway` , `primary` and `secondary` segments." msgstr "Excluir segmentos `motorway` , `primary` y `secondary`." -#: ../../build/docs/basic/graph_views.rst:493 +#: ../../build/docs/basic/graphs.rst:493 msgid "`length_m` The length in meters." msgstr "`length_m` La longitud en metros." -#: ../../build/docs/basic/graph_views.rst:494 +#: ../../build/docs/basic/graphs.rst:494 msgid "`the_geom` The geometry." msgstr "`the_geom` La geometría." -#: ../../build/docs/basic/graph_views.rst:502 +#: ../../build/docs/basic/graphs.rst:502 msgid "Similar to `Exercise 5: Creating a view for routing`_:" msgstr "Similar al `Ejercicio 5: Creación de una vista para el enrutamiento`_:" -#: ../../build/docs/basic/graph_views.rst:504 +#: ../../build/docs/basic/graphs.rst:504 msgid "" "The ``cost`` and ``reverse_cost`` are in terms of seconds with speed of " "``2 mts/sec``. (line **7**)" @@ -594,52 +594,52 @@ msgstr "" "``cost`` y ``reverse_cost`` se expresan en términos de segundos con " "velocidad de ``2 mts/sec``. (línea **7**)" -#: ../../build/docs/basic/graph_views.rst:505 +#: ../../build/docs/basic/graphs.rst:505 msgid "Exclude `motorway`, `primary` and `secondary` . (line **11**)" msgstr "Excluir `motorway`, `primary` y `secondary`. (línea **11**)" -#: ../../build/docs/basic/graph_views.rst:518 +#: ../../build/docs/basic/graphs.rst:518 msgid "Count the rows on the view ``walk_net``." msgstr "Contar las filas de la vista ``walk_net``." -#: ../../build/docs/basic/graph_views.rst:541 +#: ../../build/docs/basic/graphs.rst:541 msgid "Exercise 8: Testing the views for routing" msgstr "Ejercicio 8: Comprobación de las vistas para el ruteo" -#: ../../build/docs/basic/graph_views.rst:543 +#: ../../build/docs/basic/graphs.rst:543 msgid "From the |ch7_place_1| to the |ch7_place_2|" msgstr "Desde |ch7_place_1| hacia |ch7_place_2|" -#: ../../build/docs/basic/graph_views.rst:549 +#: ../../build/docs/basic/graphs.rst:549 msgid "Test the created views" msgstr "Probar las vistas creadas" -#: ../../build/docs/basic/graph_views.rst:551 +#: ../../build/docs/basic/graphs.rst:551 msgid "In particular:" msgstr "En particular:" -#: ../../build/docs/basic/graph_views.rst:553 +#: ../../build/docs/basic/graphs.rst:553 msgid "From the |ch7_place_1| to the \"|ch7_place_2| using the OSM identifier" msgstr "" "Desde \"|ch7_place_1|\" hacia \"|ch7_place_2|\" usando el identificador OSM" -#: ../../build/docs/basic/graph_views.rst:554 +#: ../../build/docs/basic/graphs.rst:554 msgid "the views to be tested are:" msgstr "las vistas a probar son:" -#: ../../build/docs/basic/graph_views.rst:556 +#: ../../build/docs/basic/graphs.rst:556 msgid "``vehicle_net``" msgstr "``vehicle_net``" -#: ../../build/docs/basic/graph_views.rst:557 +#: ../../build/docs/basic/graphs.rst:557 msgid "``taxi_net``" msgstr "``taxi_net``" -#: ../../build/docs/basic/graph_views.rst:558 +#: ../../build/docs/basic/graphs.rst:558 msgid "``walk_net``" msgstr "``walk_net``" -#: ../../build/docs/basic/graph_views.rst:560 +#: ../../build/docs/basic/graphs.rst:560 msgid "" "Only show the following results, as the other columns are to be ignored " "on the function." @@ -647,55 +647,55 @@ msgstr "" "Mostrar únicamente los siguientes resultados, ya que las demás columnas " "deben omitirse en la función." -#: ../../build/docs/basic/graph_views.rst:562 +#: ../../build/docs/basic/graphs.rst:562 msgid "``seq``" msgstr "``seq``" -#: ../../build/docs/basic/graph_views.rst:563 +#: ../../build/docs/basic/graphs.rst:563 msgid "``edge`` with the name ``id``" msgstr "``edge`` con el nombre ``id``" -#: ../../build/docs/basic/graph_views.rst:564 +#: ../../build/docs/basic/graphs.rst:564 msgid "``cost`` with the name: ``seconds``" msgstr "``cost`` con el nombre: ``seconds``" -#: ../../build/docs/basic/graph_views.rst:568 +#: ../../build/docs/basic/graphs.rst:568 msgid "In general" msgstr "En general" -#: ../../build/docs/basic/graph_views.rst:570 +#: ../../build/docs/basic/graphs.rst:570 msgid "The departure is |ch7_place_1| with OSM identifier |ch7_osmid_1|." msgstr "" "El punto de partida es |ch7_place_1| con el identificador OSM " "|ch7_osmid_1|." -#: ../../build/docs/basic/graph_views.rst:571 +#: ../../build/docs/basic/graphs.rst:571 msgid "The destination is |ch7_place_2| with OSM identifier |ch7_osmid_2|." msgstr "El destino es |ch7_place_2| con el identificador OSM |ch7_osmid_2|." -#: ../../build/docs/basic/graph_views.rst:573 +#: ../../build/docs/basic/graphs.rst:573 msgid "For ``vehicle_net``:" msgstr "Para ``vehicle_net``:" -#: ../../build/docs/basic/graph_views.rst:575 +#: ../../build/docs/basic/graphs.rst:575 msgid "``vehicle_net`` is used." msgstr "Se utiliza ``vehicle_net``." -#: ../../build/docs/basic/graph_views.rst:576 +#: ../../build/docs/basic/graphs.rst:576 msgid "Selection of the columns with the corresponding names are on line **1**." msgstr "" "La selección de las columnas con los nombres correspondientes está en " "línea **1**." -#: ../../build/docs/basic/graph_views.rst:577 +#: ../../build/docs/basic/graphs.rst:577 msgid "The view is prepared with the column names that pgRouting use." msgstr "La vista se prepara con los nombres de columna que pgRouting utiliza." -#: ../../build/docs/basic/graph_views.rst:579 +#: ../../build/docs/basic/graphs.rst:579 msgid "There is no need to rename columns. (line **3**)" msgstr "No es necesario cambiar el nombre de las columnas. (línea **3**)" -#: ../../build/docs/basic/graph_views.rst:581 +#: ../../build/docs/basic/graphs.rst:581 msgid "" "The OSM identifiers of the departure and destination are used. (line " "**4**)" @@ -703,15 +703,15 @@ msgstr "" "Se utilizan los identificadores OSM del punto de partida y del destino. " "(línea **4**)" -#: ../../build/docs/basic/graph_views.rst:594 +#: ../../build/docs/basic/graphs.rst:594 msgid "For ``taxi_net``:" msgstr "Para ``taxi_net``:" -#: ../../build/docs/basic/graph_views.rst:596 +#: ../../build/docs/basic/graphs.rst:596 msgid "Similar as the previous one but with ``taxi_net``. (line **3**)" msgstr "Similar al anterior pero con ``taxi_net`` (línea **3**)" -#: ../../build/docs/basic/graph_views.rst:597 +#: ../../build/docs/basic/graphs.rst:597 msgid "" "The results give the same route as with ``vehicle_net`` but ``cost`` is " "higher." @@ -719,14 +719,14 @@ msgstr "" "Los resultados dan la misma ruta que con ``vehicle_net`` pero ``cost`` es " "mayor." -#: ../../build/docs/basic/graph_views.rst:610 +#: ../../build/docs/basic/graphs.rst:610 msgid "For ``walk_net``:" msgstr "Para ``walk_net``:" -#: ../../build/docs/basic/graph_views.rst:612 +#: ../../build/docs/basic/graphs.rst:612 msgid "Similar as the previous one but with ``walk_net``. (line **3**)" msgstr "Similar al anterior pero con ``walk_net``. (línea **3**)" -#: ../../build/docs/basic/graph_views.rst:613 +#: ../../build/docs/basic/graphs.rst:613 msgid "The results give a different route than of the vehicles." msgstr "Los resultados dan una ruta diferente a la de los vehículos." diff --git a/locale/es/LC_MESSAGES/basic/pedestrian.po b/locale/es/LC_MESSAGES/basic/pedestrian.po index 428b24429..6a807be4d 100644 --- a/locale/es/LC_MESSAGES/basic/pedestrian.po +++ b/locale/es/LC_MESSAGES/basic/pedestrian.po @@ -392,23 +392,23 @@ msgstr "" msgid "Result adds the costs per destination." msgstr "El resultado suma los costes por destino." -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:1 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:1 msgid "Inspecting the results, looking for totals (edge = -1):" msgstr "Inspección de los resultados, buscando totales (`edge = -1`):" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:3 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:3 msgid "From 20297 to vertex 6548 takes 92.58 minutes (seq = 147)" msgstr "Desde 20297 al vértice 6548 toma 92.58 minutos (seq = 147)" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:5 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:5 msgid "From 20297 to vertex 12712 takes 83.18 minutes (seq = 267)" msgstr "Desde 20297 al vértice 12712 toma 83.18 minutos (seq = 267)" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:7 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:7 msgid "From 23872 to vertex 6548 takes 76.26 minutes (seq = 385)" msgstr "Desde 23872 al vértice 6548 toma 76.26 minutos (seq = 385)" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:9 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:9 msgid "From 23872 to vertex 12712 takes 67.76 minutes (seq = 495)" msgstr "Desde 23872 al vértice 12712 toma 67.76 minutos (seq = 495)" @@ -522,7 +522,7 @@ msgstr "" "El costo a ser en minutos, con una velocidad de caminata s = 1.3 m/s y t " "= d/s (línea **6**)." -#: ../../build/docs/scripts/basic/chapter_5/note_2.txt:1 +#: ../../build/docs/scripts/basic/pedestrian/note_2.txt:1 msgid "" "An interpretation of the result can be: In general, it is faster to " "depart from \"Instituto Federal do Pará, Campus Belém\" than from " diff --git a/locale/es/LC_MESSAGES/basic/plpgsql_function.po b/locale/es/LC_MESSAGES/basic/plpgsql_function.po index 51d78d793..f56162578 100644 --- a/locale/es/LC_MESSAGES/basic/plpgsql_function.po +++ b/locale/es/LC_MESSAGES/basic/plpgsql_function.po @@ -298,19 +298,19 @@ msgstr "Solución" #: ../../build/docs/basic/plpgsql_function.rst:91 msgid "" -"Use ``pgr_extractVertices`` (explained in :doc:`graph_views`) to create " +"Use ``pgr_extractVertices`` (explained in :doc:`graphs`) to create " "the vertices table" msgstr "" -"Utilizar ``pgr_extractVertices`` (explicado en :doc:`graph_views`) para " +"Utilizar ``pgr_extractVertices`` (explicado en :doc:`graphs`) para " "crear la tabla de vértices" #: ../../build/docs/basic/plpgsql_function.rst:93 msgid "" "``JOIN`` the vertices table with ``ways_vertices`` (created in " -":doc:`graph_views`) to get the ``x``, ``y``, ``geom`` information." +":doc:`graphs`) to get the ``x``, ``y``, ``geom`` information." msgstr "" "``JOIN`` la tabla de vértices con ``ways_vertices`` (creada en " -":doc:`graph_views`) para obtener la información de ``x``, ``y``, " +":doc:`graphs`) para obtener la información de ``x``, ``y``, " "``geom``." #: ../../build/docs/basic/plpgsql_function.rst:96 @@ -344,8 +344,8 @@ msgstr "" "las vistas." #: ../../build/docs/basic/plpgsql_function.rst:122 -msgid "See :doc:`graph_views`" -msgstr "Ver :doc:`graph_views`" +msgid "See :doc:`graphs`" +msgstr "Ver :doc:`graphs`" #: ../../build/docs/basic/plpgsql_function.rst:125 msgid "Exercise 3: Nearest Vertex" diff --git a/locale/es/LC_MESSAGES/un_sdg/sdg11-cities.po b/locale/es/LC_MESSAGES/un_sdg/sdg11-cities.po index 51fdf1864..0295aced2 100644 --- a/locale/es/LC_MESSAGES/un_sdg/sdg11-cities.po +++ b/locale/es/LC_MESSAGES/un_sdg/sdg11-cities.po @@ -314,7 +314,7 @@ msgstr "" msgid "" "The pgRouting function ``pgr_connectedComponents`` is used to complete " "this task and its explaind with more detail in " -":doc:`../basic/graph_views`." +":doc:`../basic/graphs`." msgstr "" #: ../../build/docs/un_sdg/sdg11-cities.rst:244 diff --git a/locale/es/LC_MESSAGES/un_sdg/sdg3-health.po b/locale/es/LC_MESSAGES/un_sdg/sdg3-health.po index 1ad566bbf..ac9c9a27c 100644 --- a/locale/es/LC_MESSAGES/un_sdg/sdg3-health.po +++ b/locale/es/LC_MESSAGES/un_sdg/sdg3-health.po @@ -588,12 +588,12 @@ msgstr "pgr_connectedComponents" #: ../../build/docs/un_sdg/sdg3-health.rst:423 msgid "" "To remove the disconnected components on the road network, the following " -"pgRouting functions, discussed on :doc:`../basic/graph_views`, will be " +"pgRouting functions, discussed on :doc:`../basic/graphs`, will be " "used:" msgstr "" "Para eliminar los componentes desconectados en la red de carreteras, se " "utilizarán las siguientes funciones de pgRouting, discutidas en " -":doc:`../basic/graph_views`:" +":doc:`../basic/graphs`:" #: ../../build/docs/un_sdg/sdg3-health.rst:426 msgid "``pgr_extractVertices``" diff --git a/locale/es/LC_MESSAGES/un_sdg/sdg7-energy.po b/locale/es/LC_MESSAGES/un_sdg/sdg7-energy.po index 9112f2bec..60ccd5301 100644 --- a/locale/es/LC_MESSAGES/un_sdg/sdg7-energy.po +++ b/locale/es/LC_MESSAGES/un_sdg/sdg7-energy.po @@ -181,12 +181,12 @@ msgstr "Extraer componentes conectados de carreteras" #: ../../build/docs/un_sdg/sdg7-energy.rst:99 msgid "" "To remove the disconnected components on the road network, the following " -"pgRouting functions, discussed on :doc:`../basic/graph_views`, will be " +"pgRouting functions, discussed on :doc:`../basic/graphs`, will be " "used:" msgstr "" "Para eliminar los componentes desconectados en la red de carreteras, se " "utilizarán las siguientes funciones de pgRouting, discutidas en " -":doc:`../basic/graph_views`:" +":doc:`../basic/graphs`:" #: ../../build/docs/un_sdg/sdg7-energy.rst:102 msgid "``pgr_extractVertices``" diff --git a/locale/pot/basic/graph_views.pot b/locale/pot/basic/graphs.pot similarity index 58% rename from locale/pot/basic/graph_views.pot rename to locale/pot/basic/graphs.pot index e9d731e1f..089c4e704 100644 --- a/locale/pot/basic/graph_views.pot +++ b/locale/pot/basic/graphs.pot @@ -16,577 +16,577 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../build/docs/basic/graph_views.rst:12 +#: ../../build/docs/basic/graphs.rst:12 msgid "Graph views" msgstr "" -#: ../../build/docs/basic/graph_views.rst:18 +#: ../../build/docs/basic/graphs.rst:18 msgid "Chapter Contents" msgstr "" -#: ../../build/docs/basic/graph_views.rst:20 +#: ../../build/docs/basic/graphs.rst:20 msgid "Different application require different graphs. This chapter covers how to discard disconnected segments and different approaches to create graphs." msgstr "" -#: ../../build/docs/basic/graph_views.rst:24 +#: ../../build/docs/basic/graphs.rst:24 msgid "The graph requirements" msgstr "" -#: ../../build/docs/basic/graph_views.rst:26 +#: ../../build/docs/basic/graphs.rst:26 msgid "In this chapter there are three graph requirements. It consists on three graphs based on a **fully connected** graph derived from ``ways``: two for different types of vehicles and one for pedestrian, the source and the target in all of them are based on the ``source_osm`` and ``target_osm``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:31 +#: ../../build/docs/basic/graphs.rst:31 msgid "The description of the graphs:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:33 +#: ../../build/docs/basic/graphs.rst:33 msgid "Particular vehicle:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:35 +#: ../../build/docs/basic/graphs.rst:35 msgid "Circulate on the whole Belém area." msgstr "" -#: ../../build/docs/basic/graph_views.rst:37 -#: ../../build/docs/basic/graph_views.rst:46 +#: ../../build/docs/basic/graphs.rst:37 +#: ../../build/docs/basic/graphs.rst:46 msgid "Do not use `steps`, `footway`, `path`, `cycleway`." msgstr "" -#: ../../build/docs/basic/graph_views.rst:39 +#: ../../build/docs/basic/graphs.rst:39 msgid "Speed is the default speed from OSM information." msgstr "" -#: ../../build/docs/basic/graph_views.rst:41 +#: ../../build/docs/basic/graphs.rst:41 msgid "Taxi vehicle:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:43 +#: ../../build/docs/basic/graphs.rst:43 msgid "Circulate on a smaller area:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:45 +#: ../../build/docs/basic/graphs.rst:45 msgid "Bounding box: ``(-48.52,-1.46,-48.45,-1.41)``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:48 +#: ../../build/docs/basic/graphs.rst:48 msgid "Speed is 10% slower than that of the particular vehicles." msgstr "" -#: ../../build/docs/basic/graph_views.rst:50 +#: ../../build/docs/basic/graphs.rst:50 msgid "Pedestrians:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:52 +#: ../../build/docs/basic/graphs.rst:52 msgid "Walk on the whole Belém area." msgstr "" -#: ../../build/docs/basic/graph_views.rst:53 +#: ../../build/docs/basic/graphs.rst:53 msgid "Can not walk on exclusive vehicle ways" msgstr "" -#: ../../build/docs/basic/graph_views.rst:55 +#: ../../build/docs/basic/graphs.rst:55 msgid "`motorways` and on `primary` segments." msgstr "" -#: ../../build/docs/basic/graph_views.rst:57 -#: ../../build/docs/basic/graph_views.rst:488 +#: ../../build/docs/basic/graphs.rst:57 +#: ../../build/docs/basic/graphs.rst:488 msgid "The speed is ``2 mts/sec``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:60 +#: ../../build/docs/basic/graphs.rst:60 msgid "pgr_extractVertices" msgstr "" -#: ../../build/docs/basic/graph_views.rst:62 +#: ../../build/docs/basic/graphs.rst:62 msgid "``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." msgstr "" -#: ../../build/docs/basic/graph_views.rst:67 -#: ../../build/docs/basic/graph_views.rst:214 +#: ../../build/docs/basic/graphs.rst:67 +#: ../../build/docs/basic/graphs.rst:214 msgid "Signature summary" msgstr "" -#: ../../build/docs/basic/graph_views.rst:75 +#: ../../build/docs/basic/graphs.rst:75 msgid "Description of the function can be found in `pgr_extractVertices `__" msgstr "" -#: ../../build/docs/basic/graph_views.rst:79 +#: ../../build/docs/basic/graphs.rst:79 msgid "Exercise 1: Create a vertices table" msgstr "" -#: ../../build/docs/basic/graph_views.rst:82 -#: ../../build/docs/basic/graph_views.rst:130 -#: ../../build/docs/basic/graph_views.rst:230 -#: ../../build/docs/basic/graph_views.rst:278 -#: ../../build/docs/basic/graph_views.rst:355 -#: ../../build/docs/basic/graph_views.rst:426 -#: ../../build/docs/basic/graph_views.rst:484 -#: ../../build/docs/basic/graph_views.rst:548 +#: ../../build/docs/basic/graphs.rst:82 +#: ../../build/docs/basic/graphs.rst:130 +#: ../../build/docs/basic/graphs.rst:230 +#: ../../build/docs/basic/graphs.rst:278 +#: ../../build/docs/basic/graphs.rst:355 +#: ../../build/docs/basic/graphs.rst:426 +#: ../../build/docs/basic/graphs.rst:484 +#: ../../build/docs/basic/graphs.rst:548 msgid "Problem" msgstr "" -#: ../../build/docs/basic/graph_views.rst:83 +#: ../../build/docs/basic/graphs.rst:83 msgid "Create the vertices table corresponding to the edges in ``ways``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:86 -#: ../../build/docs/basic/graph_views.rst:134 -#: ../../build/docs/basic/graph_views.rst:234 -#: ../../build/docs/basic/graph_views.rst:287 -#: ../../build/docs/basic/graph_views.rst:369 -#: ../../build/docs/basic/graph_views.rst:435 -#: ../../build/docs/basic/graph_views.rst:499 -#: ../../build/docs/basic/graph_views.rst:567 +#: ../../build/docs/basic/graphs.rst:86 +#: ../../build/docs/basic/graphs.rst:134 +#: ../../build/docs/basic/graphs.rst:234 +#: ../../build/docs/basic/graphs.rst:287 +#: ../../build/docs/basic/graphs.rst:369 +#: ../../build/docs/basic/graphs.rst:435 +#: ../../build/docs/basic/graphs.rst:499 +#: ../../build/docs/basic/graphs.rst:567 msgid "Solution" msgstr "" -#: ../../build/docs/basic/graph_views.rst:87 +#: ../../build/docs/basic/graphs.rst:87 msgid "A graph consists of a set of vertices and a set of edges." msgstr "" -#: ../../build/docs/basic/graph_views.rst:88 +#: ../../build/docs/basic/graphs.rst:88 msgid "In this case, the ``ways`` table is a set of edges." msgstr "" -#: ../../build/docs/basic/graph_views.rst:89 +#: ../../build/docs/basic/graphs.rst:89 msgid "In order to make use of all the graph functions from pgRouting, it is required have the set of vertices defined." msgstr "" -#: ../../build/docs/basic/graph_views.rst:91 +#: ../../build/docs/basic/graphs.rst:91 msgid "From the requirements, the graph is going to be based on OSM identifiers." msgstr "" -#: ../../build/docs/basic/graph_views.rst:104 +#: ../../build/docs/basic/graphs.rst:104 msgid "Reviewing the description of the vertices table" msgstr "" -#: ../../build/docs/basic/graph_views.rst:114 +#: ../../build/docs/basic/graphs.rst:114 msgid "Inspecting the information on the vertices table" msgstr "" -#: ../../build/docs/basic/graph_views.rst:127 +#: ../../build/docs/basic/graphs.rst:127 msgid "Exercise 2: Fill up other columns in the vertices table" msgstr "" -#: ../../build/docs/basic/graph_views.rst:131 +#: ../../build/docs/basic/graphs.rst:131 msgid "Fill up geometry information on the vertices table." msgstr "" -#: ../../build/docs/basic/graph_views.rst:135 +#: ../../build/docs/basic/graphs.rst:135 msgid "Count the number of rows that need to be filled up." msgstr "" -#: ../../build/docs/basic/graph_views.rst:145 +#: ../../build/docs/basic/graphs.rst:145 msgid "Update the ``geom`` columns based on the ``source_osm`` column from ``ways`` table." msgstr "" -#: ../../build/docs/basic/graph_views.rst:147 +#: ../../build/docs/basic/graphs.rst:147 msgid "Use the start point of the geometry." msgstr "" -#: ../../build/docs/basic/graph_views.rst:158 +#: ../../build/docs/basic/graphs.rst:158 msgid "Not expecting to be done due to the fact that some vertices are only dead ends." msgstr "" -#: ../../build/docs/basic/graph_views.rst:169 +#: ../../build/docs/basic/graphs.rst:169 msgid "Update the ``geom`` columns based on the ``target_osm`` column from ``ways`` table." msgstr "" -#: ../../build/docs/basic/graph_views.rst:171 +#: ../../build/docs/basic/graphs.rst:171 msgid "Use the end point of the geometry." msgstr "" -#: ../../build/docs/basic/graph_views.rst:182 +#: ../../build/docs/basic/graphs.rst:182 msgid "Expecting to be done, that is the geometry column should not have a ``NULL`` value." msgstr "" -#: ../../build/docs/basic/graph_views.rst:194 +#: ../../build/docs/basic/graphs.rst:194 msgid "Update the ``x`` and ``y`` columns based on the ``geom`` column." msgstr "" -#: ../../build/docs/basic/graph_views.rst:207 +#: ../../build/docs/basic/graphs.rst:207 msgid "pgr_connectedComponents" msgstr "" -#: ../../build/docs/basic/graph_views.rst:209 +#: ../../build/docs/basic/graphs.rst:209 msgid "``pgr_connectedComponents`` 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." msgstr "" -#: ../../build/docs/basic/graph_views.rst:222 +#: ../../build/docs/basic/graphs.rst:222 msgid "Description of the function can be found in `pgr_connectedComponents `__" msgstr "" -#: ../../build/docs/basic/graph_views.rst:227 +#: ../../build/docs/basic/graphs.rst:227 msgid "Exercise 3: Set components on edges and vertices tables" msgstr "" -#: ../../build/docs/basic/graph_views.rst:231 +#: ../../build/docs/basic/graphs.rst:231 msgid "Get the information about the graph components." msgstr "" -#: ../../build/docs/basic/graph_views.rst:235 +#: ../../build/docs/basic/graphs.rst:235 msgid "Create additional columns on the edges and vertices tables." msgstr "" -#: ../../build/docs/basic/graph_views.rst:246 +#: ../../build/docs/basic/graphs.rst:246 msgid "Use the ``pgr_connectedComponents`` to fill up the vertices table." msgstr "" -#: ../../build/docs/basic/graph_views.rst:248 +#: ../../build/docs/basic/graphs.rst:248 msgid "Use the results to store the component numbers on the vertices table. (**line 1**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:250 +#: ../../build/docs/basic/graphs.rst:250 msgid "Use the OSM identifiers of the vertices. (**lines 4-5**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:262 +#: ../../build/docs/basic/graphs.rst:262 msgid "Update the edges table with based on the component number of the vertex" msgstr "" -#: ../../build/docs/basic/graph_views.rst:275 +#: ../../build/docs/basic/graphs.rst:275 msgid "Exercise 4: Inspect the components" msgstr "" -#: ../../build/docs/basic/graph_views.rst:279 +#: ../../build/docs/basic/graphs.rst:279 msgid "Answer the following questions:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:281 -#: ../../build/docs/basic/graph_views.rst:288 +#: ../../build/docs/basic/graphs.rst:281 +#: ../../build/docs/basic/graphs.rst:288 msgid "How many components are in the vertices table?" msgstr "" -#: ../../build/docs/basic/graph_views.rst:282 -#: ../../build/docs/basic/graph_views.rst:301 +#: ../../build/docs/basic/graphs.rst:282 +#: ../../build/docs/basic/graphs.rst:301 msgid "How many components are in the edges table?" msgstr "" -#: ../../build/docs/basic/graph_views.rst:283 -#: ../../build/docs/basic/graph_views.rst:314 +#: ../../build/docs/basic/graphs.rst:283 +#: ../../build/docs/basic/graphs.rst:314 msgid "List the 10 components with more edges." msgstr "" -#: ../../build/docs/basic/graph_views.rst:284 -#: ../../build/docs/basic/graph_views.rst:328 +#: ../../build/docs/basic/graphs.rst:284 +#: ../../build/docs/basic/graphs.rst:328 msgid "Get the component with the maximum number of edges." msgstr "" -#: ../../build/docs/basic/graph_views.rst:290 -#: ../../build/docs/basic/graph_views.rst:303 +#: ../../build/docs/basic/graphs.rst:290 +#: ../../build/docs/basic/graphs.rst:303 msgid "Count the distinct components." msgstr "" -#: ../../build/docs/basic/graph_views.rst:316 +#: ../../build/docs/basic/graphs.rst:316 msgid "Count number of rows grouped by component. (**line 1**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:317 +#: ../../build/docs/basic/graphs.rst:317 msgid "Inverse order to display the top 10. (**line 2**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:330 +#: ../../build/docs/basic/graphs.rst:330 msgid "Use the query from last question to get the maximum count" msgstr "" -#: ../../build/docs/basic/graph_views.rst:331 +#: ../../build/docs/basic/graphs.rst:331 msgid "Get the component that matches the maximum value." msgstr "" -#: ../../build/docs/basic/graph_views.rst:345 +#: ../../build/docs/basic/graphs.rst:345 msgid "Preparing the graphs" msgstr "" -#: ../../build/docs/basic/graph_views.rst:348 +#: ../../build/docs/basic/graphs.rst:348 msgid "Exercise 5: Creating a view for routing" msgstr "" -#: ../../build/docs/basic/graph_views.rst:350 +#: ../../build/docs/basic/graphs.rst:350 msgid "View of roads for vehicles" msgstr "" -#: ../../build/docs/basic/graph_views.rst:356 +#: ../../build/docs/basic/graphs.rst:356 msgid "Create a view with minimal amount of information for processing the particular vehicles." msgstr "" -#: ../../build/docs/basic/graph_views.rst:357 +#: ../../build/docs/basic/graphs.rst:357 msgid "Use the OSM identifiers on the vertices." msgstr "" -#: ../../build/docs/basic/graph_views.rst:358 +#: ../../build/docs/basic/graphs.rst:358 msgid "Routing `cost` and `reverse_cost` in terms of seconds for routing calculations." msgstr "" -#: ../../build/docs/basic/graph_views.rst:359 +#: ../../build/docs/basic/graphs.rst:359 msgid "Exclude `steps`, `footway`, `path`, `cycleway` segments." msgstr "" -#: ../../build/docs/basic/graph_views.rst:360 -#: ../../build/docs/basic/graph_views.rst:491 +#: ../../build/docs/basic/graphs.rst:360 +#: ../../build/docs/basic/graphs.rst:491 msgid "Data needed in the view for further processing." msgstr "" -#: ../../build/docs/basic/graph_views.rst:362 +#: ../../build/docs/basic/graphs.rst:362 msgid "`name` The name of the segment." msgstr "" -#: ../../build/docs/basic/graph_views.rst:363 +#: ../../build/docs/basic/graphs.rst:363 msgid "`length_m` The length in meters rename to ``length``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:364 +#: ../../build/docs/basic/graphs.rst:364 msgid "`the_geom` The geometry rename to ``geom``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:366 -#: ../../build/docs/basic/graph_views.rst:496 +#: ../../build/docs/basic/graphs.rst:366 +#: ../../build/docs/basic/graphs.rst:496 msgid "Verify the number of edges was reduced." msgstr "" -#: ../../build/docs/basic/graph_views.rst:370 -#: ../../build/docs/basic/graph_views.rst:436 -#: ../../build/docs/basic/graph_views.rst:500 +#: ../../build/docs/basic/graphs.rst:370 +#: ../../build/docs/basic/graphs.rst:436 +#: ../../build/docs/basic/graphs.rst:500 msgid "Creating the view:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:372 +#: ../../build/docs/basic/graphs.rst:372 msgid "If you need to reconstruct the view, first drop it using the command on **line 1**." msgstr "" -#: ../../build/docs/basic/graph_views.rst:374 +#: ../../build/docs/basic/graphs.rst:374 msgid "Get the component with maximum number of edges (**lines 6-10**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:375 +#: ../../build/docs/basic/graphs.rst:375 msgid "The `source` and `target` requirements for the function are to be with OSM identifiers. (line **14**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:377 +#: ../../build/docs/basic/graphs.rst:377 msgid "The ``cost`` and ``reverse_cost`` are in terms of seconds. (line **15**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:378 +#: ../../build/docs/basic/graphs.rst:378 msgid "The additional parameters ``length_m`` and ``the_geom`` are renamed, ``name`` is also included. (line **16**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:380 +#: ../../build/docs/basic/graphs.rst:380 msgid "``JOIN`` with the `configuration`:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:382 +#: ../../build/docs/basic/graphs.rst:382 msgid "Exclude `steps`, `footway`, `path`, `cycleway`. (line **18**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:395 +#: ../../build/docs/basic/graphs.rst:395 msgid "Verification:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:397 +#: ../../build/docs/basic/graphs.rst:397 msgid "Count the rows on the original ``ways`` and on ``vehicle_net``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:407 +#: ../../build/docs/basic/graphs.rst:407 msgid "Get the description of the view" msgstr "" -#: ../../build/docs/basic/graph_views.rst:419 +#: ../../build/docs/basic/graphs.rst:419 msgid "Exercise 6: Limiting the road network within an area" msgstr "" -#: ../../build/docs/basic/graph_views.rst:421 +#: ../../build/docs/basic/graphs.rst:421 msgid "View of smaller set of roads for vehicles" msgstr "" -#: ../../build/docs/basic/graph_views.rst:427 +#: ../../build/docs/basic/graphs.rst:427 msgid "Create a view ``taxi_net`` for the `taxi`:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:429 +#: ../../build/docs/basic/graphs.rst:429 msgid "The taxi can only circulate inside this Bounding Box: ``(-48.52,-1.46,-48.45,-1.41)``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:430 +#: ../../build/docs/basic/graphs.rst:430 msgid "The taxi speed is 10% slower than the particular vehicle." msgstr "" -#: ../../build/docs/basic/graph_views.rst:432 +#: ../../build/docs/basic/graphs.rst:432 msgid "Verify the reduced number of road segments." msgstr "" -#: ../../build/docs/basic/graph_views.rst:438 +#: ../../build/docs/basic/graphs.rst:438 msgid "Adjust the taxi's ``cost`` and ``reverse_cost`` to be 10% slower than of the particular vehicle. (line **7**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:440 +#: ../../build/docs/basic/graphs.rst:440 msgid "The graph for the taxi is a subset of the ``vehicle_net`` graph. (line **9**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:441 +#: ../../build/docs/basic/graphs.rst:441 msgid "Can only circulate inside the bounding box: ``(-48.52,-1.46,-48.45,-1.41)``. (line **10**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:455 +#: ../../build/docs/basic/graphs.rst:455 msgid "Count the rows on ``taxi_net``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:466 -#: ../../build/docs/basic/graph_views.rst:529 +#: ../../build/docs/basic/graphs.rst:466 +#: ../../build/docs/basic/graphs.rst:529 msgid "Get the description." msgstr "" -#: ../../build/docs/basic/graph_views.rst:477 +#: ../../build/docs/basic/graphs.rst:477 msgid "Exercise 7: Creating a materialized view for routing pedestrians" msgstr "" -#: ../../build/docs/basic/graph_views.rst:479 +#: ../../build/docs/basic/graphs.rst:479 msgid "View of roads for pedestrians" msgstr "" -#: ../../build/docs/basic/graph_views.rst:485 +#: ../../build/docs/basic/graphs.rst:485 msgid "Create a materialized view with minimal amount of information for processing pedestrians." msgstr "" -#: ../../build/docs/basic/graph_views.rst:486 +#: ../../build/docs/basic/graphs.rst:486 msgid "Routing `cost` and `reverse_cost` will be on seconds for routing calculations." msgstr "" -#: ../../build/docs/basic/graph_views.rst:490 +#: ../../build/docs/basic/graphs.rst:490 msgid "Exclude `motorway` , `primary` and `secondary` segments." msgstr "" -#: ../../build/docs/basic/graph_views.rst:493 +#: ../../build/docs/basic/graphs.rst:493 msgid "`length_m` The length in meters." msgstr "" -#: ../../build/docs/basic/graph_views.rst:494 +#: ../../build/docs/basic/graphs.rst:494 msgid "`the_geom` The geometry." msgstr "" -#: ../../build/docs/basic/graph_views.rst:502 +#: ../../build/docs/basic/graphs.rst:502 msgid "Similar to `Exercise 5: Creating a view for routing`_:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:504 +#: ../../build/docs/basic/graphs.rst:504 msgid "The ``cost`` and ``reverse_cost`` are in terms of seconds with speed of ``2 mts/sec``. (line **7**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:505 +#: ../../build/docs/basic/graphs.rst:505 msgid "Exclude `motorway`, `primary` and `secondary` . (line **11**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:518 +#: ../../build/docs/basic/graphs.rst:518 msgid "Count the rows on the view ``walk_net``." msgstr "" -#: ../../build/docs/basic/graph_views.rst:541 +#: ../../build/docs/basic/graphs.rst:541 msgid "Exercise 8: Testing the views for routing" msgstr "" -#: ../../build/docs/basic/graph_views.rst:543 +#: ../../build/docs/basic/graphs.rst:543 msgid "From the |ch7_place_1| to the |ch7_place_2|" msgstr "" -#: ../../build/docs/basic/graph_views.rst:549 +#: ../../build/docs/basic/graphs.rst:549 msgid "Test the created views" msgstr "" -#: ../../build/docs/basic/graph_views.rst:551 +#: ../../build/docs/basic/graphs.rst:551 msgid "In particular:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:553 +#: ../../build/docs/basic/graphs.rst:553 msgid "From the |ch7_place_1| to the \"|ch7_place_2| using the OSM identifier" msgstr "" -#: ../../build/docs/basic/graph_views.rst:554 +#: ../../build/docs/basic/graphs.rst:554 msgid "the views to be tested are:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:556 +#: ../../build/docs/basic/graphs.rst:556 msgid "``vehicle_net``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:557 +#: ../../build/docs/basic/graphs.rst:557 msgid "``taxi_net``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:558 +#: ../../build/docs/basic/graphs.rst:558 msgid "``walk_net``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:560 +#: ../../build/docs/basic/graphs.rst:560 msgid "Only show the following results, as the other columns are to be ignored on the function." msgstr "" -#: ../../build/docs/basic/graph_views.rst:562 +#: ../../build/docs/basic/graphs.rst:562 msgid "``seq``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:563 +#: ../../build/docs/basic/graphs.rst:563 msgid "``edge`` with the name ``id``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:564 +#: ../../build/docs/basic/graphs.rst:564 msgid "``cost`` with the name: ``seconds``" msgstr "" -#: ../../build/docs/basic/graph_views.rst:568 +#: ../../build/docs/basic/graphs.rst:568 msgid "In general" msgstr "" -#: ../../build/docs/basic/graph_views.rst:570 +#: ../../build/docs/basic/graphs.rst:570 msgid "The departure is |ch7_place_1| with OSM identifier |ch7_osmid_1|." msgstr "" -#: ../../build/docs/basic/graph_views.rst:571 +#: ../../build/docs/basic/graphs.rst:571 msgid "The destination is |ch7_place_2| with OSM identifier |ch7_osmid_2|." msgstr "" -#: ../../build/docs/basic/graph_views.rst:573 +#: ../../build/docs/basic/graphs.rst:573 msgid "For ``vehicle_net``:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:575 +#: ../../build/docs/basic/graphs.rst:575 msgid "``vehicle_net`` is used." msgstr "" -#: ../../build/docs/basic/graph_views.rst:576 +#: ../../build/docs/basic/graphs.rst:576 msgid "Selection of the columns with the corresponding names are on line **1**." msgstr "" -#: ../../build/docs/basic/graph_views.rst:577 +#: ../../build/docs/basic/graphs.rst:577 msgid "The view is prepared with the column names that pgRouting use." msgstr "" -#: ../../build/docs/basic/graph_views.rst:579 +#: ../../build/docs/basic/graphs.rst:579 msgid "There is no need to rename columns. (line **3**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:581 +#: ../../build/docs/basic/graphs.rst:581 msgid "The OSM identifiers of the departure and destination are used. (line **4**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:594 +#: ../../build/docs/basic/graphs.rst:594 msgid "For ``taxi_net``:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:596 +#: ../../build/docs/basic/graphs.rst:596 msgid "Similar as the previous one but with ``taxi_net``. (line **3**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:597 +#: ../../build/docs/basic/graphs.rst:597 msgid "The results give the same route as with ``vehicle_net`` but ``cost`` is higher." msgstr "" -#: ../../build/docs/basic/graph_views.rst:610 +#: ../../build/docs/basic/graphs.rst:610 msgid "For ``walk_net``:" msgstr "" -#: ../../build/docs/basic/graph_views.rst:612 +#: ../../build/docs/basic/graphs.rst:612 msgid "Similar as the previous one but with ``walk_net``. (line **3**)" msgstr "" -#: ../../build/docs/basic/graph_views.rst:613 +#: ../../build/docs/basic/graphs.rst:613 msgid "The results give a different route than of the vehicles." msgstr "" diff --git a/locale/pot/basic/pedestrian.pot b/locale/pot/basic/pedestrian.pot index 36b7ac5f6..4b5068bcb 100644 --- a/locale/pot/basic/pedestrian.pot +++ b/locale/pot/basic/pedestrian.pot @@ -287,23 +287,23 @@ msgstr "" msgid "Result adds the costs per destination." msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:1 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:1 msgid "Inspecting the results, looking for totals (edge = -1):" msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:3 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:3 msgid "From 20297 to vertex 6548 takes 92.58 minutes (seq = 147)" msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:5 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:5 msgid "From 20297 to vertex 12712 takes 83.18 minutes (seq = 267)" msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:7 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:7 msgid "From 23872 to vertex 6548 takes 76.26 minutes (seq = 385)" msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:9 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:9 msgid "From 23872 to vertex 12712 takes 67.76 minutes (seq = 495)" msgstr "" @@ -385,6 +385,6 @@ msgstr "" msgid "The cost to be in minutes, with a walking speed s = 1.3 m/s and t = d/s (line **6**)." msgstr "" -#: ../../build/docs/scripts/basic/chapter_5/note_2.txt:1 +#: ../../build/docs/scripts/basic/pedestrian/note_2.txt:1 msgid "An interpretation of the result can be: In general, it is faster to depart from \"Instituto Federal do Pará, Campus Belém\" than from \"Hangar Convention Center\"" msgstr "" diff --git a/locale/pot/basic/plpgsql_function.pot b/locale/pot/basic/plpgsql_function.pot index 2d0f13b4a..64751ed43 100644 --- a/locale/pot/basic/plpgsql_function.pot +++ b/locale/pot/basic/plpgsql_function.pot @@ -267,11 +267,11 @@ msgid "Solution" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:91 -msgid "Use ``pgr_extractVertices`` (explained in :doc:`graph_views`) to create the vertices table" +msgid "Use ``pgr_extractVertices`` (explained in :doc:`graphs`) to create the vertices table" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:93 -msgid "``JOIN`` the vertices table with ``ways_vertices`` (created in :doc:`graph_views`) to get the ``x``, ``y``, ``geom`` information." +msgid "``JOIN`` the vertices table with ``ways_vertices`` (created in :doc:`graphs`) to get the ``x``, ``y``, ``geom`` information." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:96 @@ -301,7 +301,7 @@ msgid "It is left to the reader to remove disconected components on the views." msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:122 -msgid "See :doc:`graph_views`" +msgid "See :doc:`graphs`" msgstr "" #: ../../build/docs/basic/plpgsql_function.rst:125 diff --git a/locale/pot/un_sdg/sdg11-cities.pot b/locale/pot/un_sdg/sdg11-cities.pot index b562aa85c..c655f8b67 100644 --- a/locale/pot/un_sdg/sdg11-cities.pot +++ b/locale/pot/un_sdg/sdg11-cities.pot @@ -202,7 +202,7 @@ msgid "As the rivers in the data are not having single edge, i.e, multiple edges msgstr "" #: ../../build/docs/un_sdg/sdg11-cities.rst:241 -msgid "The pgRouting function ``pgr_connectedComponents`` is used to complete this task and its explaind with more detail in :doc:`../basic/graph_views`." +msgid "The pgRouting function ``pgr_connectedComponents`` is used to complete this task and its explaind with more detail in :doc:`../basic/graphs`." msgstr "" #: ../../build/docs/un_sdg/sdg11-cities.rst:244 diff --git a/locale/pot/un_sdg/sdg3-health.pot b/locale/pot/un_sdg/sdg3-health.pot index c2e1d84fc..f8dde3ab1 100644 --- a/locale/pot/un_sdg/sdg3-health.pot +++ b/locale/pot/un_sdg/sdg3-health.pot @@ -388,7 +388,7 @@ msgid "Exercise 12: Remove disconnected components" msgstr "" #: ../../build/docs/un_sdg/sdg3-health.rst:423 -msgid "To remove the disconnected components on the road network, the following pgRouting functions, discussed on :doc:`../basic/graph_views`, will be used:" +msgid "To remove the disconnected components on the road network, the following pgRouting functions, discussed on :doc:`../basic/graphs`, will be used:" msgstr "" #: ../../build/docs/un_sdg/sdg3-health.rst:426 diff --git a/locale/pot/un_sdg/sdg7-energy.pot b/locale/pot/un_sdg/sdg7-energy.pot index 09085db79..365d8c677 100644 --- a/locale/pot/un_sdg/sdg7-energy.pot +++ b/locale/pot/un_sdg/sdg7-energy.pot @@ -105,7 +105,7 @@ msgid "Exercise 2: Remove disconnected components" msgstr "" #: ../../build/docs/un_sdg/sdg7-energy.rst:99 -msgid "To remove the disconnected components on the road network, the following pgRouting functions, discussed on :doc:`../basic/graph_views`, will be used:" +msgid "To remove the disconnected components on the road network, the following pgRouting functions, discussed on :doc:`../basic/graphs`, will be used:" msgstr "" #: ../../build/docs/un_sdg/sdg7-energy.rst:102 diff --git a/locale/sv/LC_MESSAGES/basic/graph_views.po b/locale/sv/LC_MESSAGES/basic/graphs.po similarity index 70% rename from locale/sv/LC_MESSAGES/basic/graph_views.po rename to locale/sv/LC_MESSAGES/basic/graphs.po index ad2e194c1..e1fc3484a 100644 --- a/locale/sv/LC_MESSAGES/basic/graph_views.po +++ b/locale/sv/LC_MESSAGES/basic/graphs.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2025-07-03 07:34+0000\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" +"pgrouting-workshop/basic-graphs/sv/>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,25 +19,25 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 5.4.3\n" -#: ../../build/docs/basic/graph_views.rst:12 +#: ../../build/docs/basic/graphs.rst:12 msgid "Graph views" msgstr "Diagramvyer" -#: ../../build/docs/basic/graph_views.rst:18 +#: ../../build/docs/basic/graphs.rst:18 msgid "Chapter Contents" msgstr "Kapitelinnehåll" -#: ../../build/docs/basic/graph_views.rst:20 +#: ../../build/docs/basic/graphs.rst:20 msgid "Different application require different graphs. This chapter covers how to discard disconnected segments and different approaches to create graphs." msgstr "" "Olika applikationer kräver olika grafer. I det här kapitlet beskrivs hur man " "tar bort segment som inte är sammankopplade och olika sätt att skapa grafer." -#: ../../build/docs/basic/graph_views.rst:24 +#: ../../build/docs/basic/graphs.rst:24 msgid "The graph requirements" msgstr "Kraven för grafen" -#: ../../build/docs/basic/graph_views.rst:26 +#: ../../build/docs/basic/graphs.rst:26 msgid "In this chapter there are three graph requirements. It consists on three graphs based on a **fully connected** graph derived from ``ways``: two for different types of vehicles and one for pedestrian, the source and the target in all of them are based on the ``source_osm`` and ``target_osm``." msgstr "" "I det här kapitlet finns det tre grafkrav. Det består av tre grafer baserade " @@ -45,605 +45,605 @@ msgstr "" "för olika typer av fordon och en för fotgängare, källan och målet i dem alla " "är baserade på ``källans_osm`` och ``målets_osm``." -#: ../../build/docs/basic/graph_views.rst:31 +#: ../../build/docs/basic/graphs.rst:31 msgid "The description of the graphs:" msgstr "Beskrivning av graferna:" -#: ../../build/docs/basic/graph_views.rst:33 +#: ../../build/docs/basic/graphs.rst:33 msgid "Particular vehicle:" msgstr "Särskilt fordon:" -#: ../../build/docs/basic/graph_views.rst:35 +#: ../../build/docs/basic/graphs.rst:35 msgid "Circulate on the whole Belém area." msgstr "Cirkulera i hela Belém-området." -#: ../../build/docs/basic/graph_views.rst:37 -#: ../../build/docs/basic/graph_views.rst:46 +#: ../../build/docs/basic/graphs.rst:37 +#: ../../build/docs/basic/graphs.rst:46 msgid "Do not use `steps`, `footway`, `path`, `cycleway`." msgstr "Använd inte `steps`, `footway`, `path`, `cycleway`." -#: ../../build/docs/basic/graph_views.rst:39 +#: ../../build/docs/basic/graphs.rst:39 msgid "Speed is the default speed from OSM information." msgstr "Speed är standardhastigheten från OSM-informationen." -#: ../../build/docs/basic/graph_views.rst:41 +#: ../../build/docs/basic/graphs.rst:41 msgid "Taxi vehicle:" msgstr "Taxifordon:" -#: ../../build/docs/basic/graph_views.rst:43 +#: ../../build/docs/basic/graphs.rst:43 msgid "Circulate on a smaller area:" msgstr "Cirkulera på en mindre yta:" -#: ../../build/docs/basic/graph_views.rst:45 +#: ../../build/docs/basic/graphs.rst:45 msgid "Bounding box: ``(-48.52,-1.46,-48.45,-1.41)``" msgstr "Avgränsningsruta: ``(-48.52,-1.46,-48.45,-1.41)``" -#: ../../build/docs/basic/graph_views.rst:48 +#: ../../build/docs/basic/graphs.rst:48 msgid "Speed is 10% slower than that of the particular vehicles." msgstr "Hastigheten är 10% långsammare än för de aktuella fordonen." -#: ../../build/docs/basic/graph_views.rst:50 +#: ../../build/docs/basic/graphs.rst:50 msgid "Pedestrians:" msgstr "Fotgängare:" -#: ../../build/docs/basic/graph_views.rst:52 +#: ../../build/docs/basic/graphs.rst:52 msgid "Walk on the whole Belém area." msgstr "Promenad i hela Belém-området." -#: ../../build/docs/basic/graph_views.rst:53 +#: ../../build/docs/basic/graphs.rst:53 msgid "Can not walk on exclusive vehicle ways" msgstr "Kan inte gå på exklusiva fordonsvägar" -#: ../../build/docs/basic/graph_views.rst:55 +#: ../../build/docs/basic/graphs.rst:55 msgid "`motorways` and on `primary` segments." msgstr "\"motorways\" och på \"primary\" segment." -#: ../../build/docs/basic/graph_views.rst:57 -#: ../../build/docs/basic/graph_views.rst:488 +#: ../../build/docs/basic/graphs.rst:57 +#: ../../build/docs/basic/graphs.rst:488 msgid "The speed is ``2 mts/sec``." msgstr "Hastigheten är ``2 mts/sek``." -#: ../../build/docs/basic/graph_views.rst:60 +#: ../../build/docs/basic/graphs.rst:60 msgid "pgr_extractVertices" msgstr "pgr_extractVertices" -#: ../../build/docs/basic/graph_views.rst:62 +#: ../../build/docs/basic/graphs.rst:62 msgid "``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." msgstr "" "``pgr_extractVertices`` beräknar de anslutna komponenterna i en odelad graf " "med hjälp av en djup första sökning. En ansluten komponent i en odelad graf " "är en uppsättning hörn som alla är nåbara från varandra." -#: ../../build/docs/basic/graph_views.rst:67 -#: ../../build/docs/basic/graph_views.rst:214 +#: ../../build/docs/basic/graphs.rst:67 +#: ../../build/docs/basic/graphs.rst:214 msgid "Signature summary" msgstr "Sammanfattning av signatur" -#: ../../build/docs/basic/graph_views.rst:75 +#: ../../build/docs/basic/graphs.rst:75 msgid "Description of the function can be found in `pgr_extractVertices `__" msgstr "" "Beskrivning av funktionen finns i `pgr_extractVertices `__" -#: ../../build/docs/basic/graph_views.rst:79 +#: ../../build/docs/basic/graphs.rst:79 msgid "Exercise 1: Create a vertices table" msgstr "Övning 1: Skapa en vertices-tabell" -#: ../../build/docs/basic/graph_views.rst:82 -#: ../../build/docs/basic/graph_views.rst:130 -#: ../../build/docs/basic/graph_views.rst:230 -#: ../../build/docs/basic/graph_views.rst:278 -#: ../../build/docs/basic/graph_views.rst:355 -#: ../../build/docs/basic/graph_views.rst:426 -#: ../../build/docs/basic/graph_views.rst:484 -#: ../../build/docs/basic/graph_views.rst:548 +#: ../../build/docs/basic/graphs.rst:82 +#: ../../build/docs/basic/graphs.rst:130 +#: ../../build/docs/basic/graphs.rst:230 +#: ../../build/docs/basic/graphs.rst:278 +#: ../../build/docs/basic/graphs.rst:355 +#: ../../build/docs/basic/graphs.rst:426 +#: ../../build/docs/basic/graphs.rst:484 +#: ../../build/docs/basic/graphs.rst:548 msgid "Problem" msgstr "Problem" -#: ../../build/docs/basic/graph_views.rst:83 +#: ../../build/docs/basic/graphs.rst:83 msgid "Create the vertices table corresponding to the edges in ``ways``." msgstr "Skapa en tabell med toppar som motsvarar kanterna i ``ways``." -#: ../../build/docs/basic/graph_views.rst:86 -#: ../../build/docs/basic/graph_views.rst:134 -#: ../../build/docs/basic/graph_views.rst:234 -#: ../../build/docs/basic/graph_views.rst:287 -#: ../../build/docs/basic/graph_views.rst:369 -#: ../../build/docs/basic/graph_views.rst:435 -#: ../../build/docs/basic/graph_views.rst:499 -#: ../../build/docs/basic/graph_views.rst:567 +#: ../../build/docs/basic/graphs.rst:86 +#: ../../build/docs/basic/graphs.rst:134 +#: ../../build/docs/basic/graphs.rst:234 +#: ../../build/docs/basic/graphs.rst:287 +#: ../../build/docs/basic/graphs.rst:369 +#: ../../build/docs/basic/graphs.rst:435 +#: ../../build/docs/basic/graphs.rst:499 +#: ../../build/docs/basic/graphs.rst:567 msgid "Solution" msgstr "Lösning" -#: ../../build/docs/basic/graph_views.rst:87 +#: ../../build/docs/basic/graphs.rst:87 msgid "A graph consists of a set of vertices and a set of edges." msgstr "En graf består av en uppsättning hörn och en uppsättning kanter." -#: ../../build/docs/basic/graph_views.rst:88 +#: ../../build/docs/basic/graphs.rst:88 msgid "In this case, the ``ways`` table is a set of edges." msgstr "I detta fall är tabellen ``ways`` en uppsättning kanter." -#: ../../build/docs/basic/graph_views.rst:89 +#: ../../build/docs/basic/graphs.rst:89 msgid "In order to make use of all the graph functions from pgRouting, it is required have the set of vertices defined." msgstr "" "För att kunna använda alla graffunktioner i pgRouting krävs det att " "uppsättningen av hörnpunkter är definierad." -#: ../../build/docs/basic/graph_views.rst:91 +#: ../../build/docs/basic/graphs.rst:91 msgid "From the requirements, the graph is going to be based on OSM identifiers." msgstr "Enligt kraven kommer grafen att baseras på OSM-identifierare." -#: ../../build/docs/basic/graph_views.rst:104 +#: ../../build/docs/basic/graphs.rst:104 msgid "Reviewing the description of the vertices table" msgstr "Granskning av beskrivningen av vertices-tabellen" -#: ../../build/docs/basic/graph_views.rst:114 +#: ../../build/docs/basic/graphs.rst:114 msgid "Inspecting the information on the vertices table" msgstr "Inspektera informationen i tabellen vertices" -#: ../../build/docs/basic/graph_views.rst:127 +#: ../../build/docs/basic/graphs.rst:127 msgid "Exercise 2: Fill up other columns in the vertices table" msgstr "Övning 2: Fyll i andra kolumner i vertikaltabellen" -#: ../../build/docs/basic/graph_views.rst:131 +#: ../../build/docs/basic/graphs.rst:131 msgid "Fill up geometry information on the vertices table." msgstr "Fyll i geometriinformation i tabellen Vertices." -#: ../../build/docs/basic/graph_views.rst:135 +#: ../../build/docs/basic/graphs.rst:135 msgid "Count the number of rows that need to be filled up." msgstr "Räkna antalet rader som måste fyllas på." -#: ../../build/docs/basic/graph_views.rst:145 +#: ../../build/docs/basic/graphs.rst:145 msgid "Update the ``geom`` columns based on the ``source_osm`` column from ``ways`` table." msgstr "" "Uppdatera kolumnerna ``geom`` baserat på kolumnen ``ource_osm`` från " "tabellen ``ways``." -#: ../../build/docs/basic/graph_views.rst:147 +#: ../../build/docs/basic/graphs.rst:147 msgid "Use the start point of the geometry." msgstr "Använd geometrins startpunkt." -#: ../../build/docs/basic/graph_views.rst:158 +#: ../../build/docs/basic/graphs.rst:158 msgid "Not expecting to be done due to the fact that some vertices are only dead ends." msgstr "" "Förväntas inte bli gjort på grund av att vissa hörn bara är återvändsgränder." -#: ../../build/docs/basic/graph_views.rst:169 +#: ../../build/docs/basic/graphs.rst:169 msgid "Update the ``geom`` columns based on the ``target_osm`` column from ``ways`` table." msgstr "" "Uppdatera kolumnerna ``geom`` baserat på kolumnen ``target_osm`` från " "tabellen ``ways``." -#: ../../build/docs/basic/graph_views.rst:171 +#: ../../build/docs/basic/graphs.rst:171 msgid "Use the end point of the geometry." msgstr "Använd geometrins slutpunkt." -#: ../../build/docs/basic/graph_views.rst:182 +#: ../../build/docs/basic/graphs.rst:182 msgid "Expecting to be done, that is the geometry column should not have a ``NULL`` value." msgstr "" "Förväntar sig att det ska göras, det vill säga att geometrikolumnen inte ska " "ha ett ``NULL``-värde." -#: ../../build/docs/basic/graph_views.rst:194 +#: ../../build/docs/basic/graphs.rst:194 msgid "Update the ``x`` and ``y`` columns based on the ``geom`` column." msgstr "Uppdatera kolumnerna ``x`` och ``y`` baserat på kolumnen ``geom``." -#: ../../build/docs/basic/graph_views.rst:207 +#: ../../build/docs/basic/graphs.rst:207 msgid "pgr_connectedComponents" msgstr "pgr_connectedComponents" -#: ../../build/docs/basic/graph_views.rst:209 +#: ../../build/docs/basic/graphs.rst:209 msgid "``pgr_connectedComponents`` 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." msgstr "" "``pgr_connectedComponents`` beräknar de anslutna komponenterna i en odelad " "graf med hjälp av Depth First Search. En ansluten komponent i en odelad graf " "är en uppsättning hörn som alla är nåbara från varandra." -#: ../../build/docs/basic/graph_views.rst:222 +#: ../../build/docs/basic/graphs.rst:222 msgid "Description of the function can be found in `pgr_connectedComponents `__" msgstr "" "Beskrivning av funktionen finns i `pgr_connectedComponents `__" -#: ../../build/docs/basic/graph_views.rst:227 +#: ../../build/docs/basic/graphs.rst:227 msgid "Exercise 3: Set components on edges and vertices tables" msgstr "Övning 3: Setkomponenter på kanter och hörntabeller" -#: ../../build/docs/basic/graph_views.rst:231 +#: ../../build/docs/basic/graphs.rst:231 msgid "Get the information about the graph components." msgstr "Hämta information om grafens komponenter." -#: ../../build/docs/basic/graph_views.rst:235 +#: ../../build/docs/basic/graphs.rst:235 msgid "Create additional columns on the edges and vertices tables." msgstr "Skapa ytterligare kolumner i tabellerna för kanter och hörn." -#: ../../build/docs/basic/graph_views.rst:246 +#: ../../build/docs/basic/graphs.rst:246 msgid "Use the ``pgr_connectedComponents`` to fill up the vertices table." msgstr "" "Använd ``pgr_connectedComponents`` för att fylla i tabellen med hörnpunkter." -#: ../../build/docs/basic/graph_views.rst:248 +#: ../../build/docs/basic/graphs.rst:248 msgid "Use the results to store the component numbers on the vertices table. (**line 1**)" msgstr "" "Använd resultatet för att lagra komponentnumren i vertikaltabellen. (**rad " "1**)" -#: ../../build/docs/basic/graph_views.rst:250 +#: ../../build/docs/basic/graphs.rst:250 msgid "Use the OSM identifiers of the vertices. (**lines 4-5**)" msgstr "Använd OSM-identifierarna för topparna. (**rader 4-5**)" -#: ../../build/docs/basic/graph_views.rst:262 +#: ../../build/docs/basic/graphs.rst:262 msgid "Update the edges table with based on the component number of the vertex" msgstr "Uppdatera tabellen med kanter baserat på toppunktens komponentnummer" -#: ../../build/docs/basic/graph_views.rst:275 +#: ../../build/docs/basic/graphs.rst:275 msgid "Exercise 4: Inspect the components" msgstr "Övning 4: Inspektera komponenterna" -#: ../../build/docs/basic/graph_views.rst:279 +#: ../../build/docs/basic/graphs.rst:279 msgid "Answer the following questions:" msgstr "Svara på följande frågor:" -#: ../../build/docs/basic/graph_views.rst:281 -#: ../../build/docs/basic/graph_views.rst:288 +#: ../../build/docs/basic/graphs.rst:281 +#: ../../build/docs/basic/graphs.rst:288 msgid "How many components are in the vertices table?" msgstr "Hur många komponenter finns det i vertices-tabellen?" -#: ../../build/docs/basic/graph_views.rst:282 -#: ../../build/docs/basic/graph_views.rst:301 +#: ../../build/docs/basic/graphs.rst:282 +#: ../../build/docs/basic/graphs.rst:301 msgid "How many components are in the edges table?" msgstr "Hur många komponenter finns det i kantbordet?" -#: ../../build/docs/basic/graph_views.rst:283 -#: ../../build/docs/basic/graph_views.rst:314 +#: ../../build/docs/basic/graphs.rst:283 +#: ../../build/docs/basic/graphs.rst:314 msgid "List the 10 components with more edges." msgstr "Lista de 10 komponenter som har flest kanter." -#: ../../build/docs/basic/graph_views.rst:284 -#: ../../build/docs/basic/graph_views.rst:328 +#: ../../build/docs/basic/graphs.rst:284 +#: ../../build/docs/basic/graphs.rst:328 msgid "Get the component with the maximum number of edges." msgstr "Hämta komponenten med det maximala antalet kanter." -#: ../../build/docs/basic/graph_views.rst:290 -#: ../../build/docs/basic/graph_views.rst:303 +#: ../../build/docs/basic/graphs.rst:290 +#: ../../build/docs/basic/graphs.rst:303 msgid "Count the distinct components." msgstr "Räkna de olika komponenterna." -#: ../../build/docs/basic/graph_views.rst:316 +#: ../../build/docs/basic/graphs.rst:316 msgid "Count number of rows grouped by component. (**line 1**)" msgstr "Räkna antal rader grupperade efter komponent. (**rad 1**)" -#: ../../build/docs/basic/graph_views.rst:317 +#: ../../build/docs/basic/graphs.rst:317 msgid "Inverse order to display the top 10. (**line 2**)" msgstr "Omvänd ordning för att visa topp 10. (**rad 2**)" -#: ../../build/docs/basic/graph_views.rst:330 +#: ../../build/docs/basic/graphs.rst:330 msgid "Use the query from last question to get the maximum count" msgstr "Använd frågan från förra frågan för att få det maximala antalet" -#: ../../build/docs/basic/graph_views.rst:331 +#: ../../build/docs/basic/graphs.rst:331 msgid "Get the component that matches the maximum value." msgstr "Hämta den komponent som matchar det högsta värdet." -#: ../../build/docs/basic/graph_views.rst:345 +#: ../../build/docs/basic/graphs.rst:345 msgid "Preparing the graphs" msgstr "Förberedelse av graferna" -#: ../../build/docs/basic/graph_views.rst:348 +#: ../../build/docs/basic/graphs.rst:348 msgid "Exercise 5: Creating a view for routing" msgstr "Övning 5: Skapa en vy för routing" -#: ../../build/docs/basic/graph_views.rst:350 +#: ../../build/docs/basic/graphs.rst:350 msgid "View of roads for vehicles" msgstr "Utsikt över vägar för fordon" -#: ../../build/docs/basic/graph_views.rst:356 +#: ../../build/docs/basic/graphs.rst:356 msgid "Create a view with minimal amount of information for processing the particular vehicles." msgstr "" "Skapa en vy med minimal mängd information för att bearbeta de specifika " "fordonen." -#: ../../build/docs/basic/graph_views.rst:357 +#: ../../build/docs/basic/graphs.rst:357 msgid "Use the OSM identifiers on the vertices." msgstr "Använd OSM-identifierarna på topparna." -#: ../../build/docs/basic/graph_views.rst:358 +#: ../../build/docs/basic/graphs.rst:358 msgid "Routing `cost` and `reverse_cost` in terms of seconds for routing calculations." msgstr "" "Routing `cost` och `reverse_cost` i sekunder för beräkningar av routing." -#: ../../build/docs/basic/graph_views.rst:359 +#: ../../build/docs/basic/graphs.rst:359 msgid "Exclude `steps`, `footway`, `path`, `cycleway` segments." msgstr "Utesluta segmenten `steps`, `footway`, `path`, `cycleway`." -#: ../../build/docs/basic/graph_views.rst:360 -#: ../../build/docs/basic/graph_views.rst:491 +#: ../../build/docs/basic/graphs.rst:360 +#: ../../build/docs/basic/graphs.rst:491 msgid "Data needed in the view for further processing." msgstr "Data som behövs i vyn för vidare bearbetning." -#: ../../build/docs/basic/graph_views.rst:362 +#: ../../build/docs/basic/graphs.rst:362 msgid "`name` The name of the segment." msgstr "`name` Namnet på segmentet." -#: ../../build/docs/basic/graph_views.rst:363 +#: ../../build/docs/basic/graphs.rst:363 msgid "`length_m` The length in meters rename to ``length``." msgstr "`length_m` Längden i meter byter namn till ``length``." -#: ../../build/docs/basic/graph_views.rst:364 +#: ../../build/docs/basic/graphs.rst:364 msgid "`the_geom` The geometry rename to ``geom``." msgstr "`the_geom` Geometrin byter namn till ``geom``." -#: ../../build/docs/basic/graph_views.rst:366 -#: ../../build/docs/basic/graph_views.rst:496 +#: ../../build/docs/basic/graphs.rst:366 +#: ../../build/docs/basic/graphs.rst:496 msgid "Verify the number of edges was reduced." msgstr "Kontrollera att antalet kanter har minskats." -#: ../../build/docs/basic/graph_views.rst:370 -#: ../../build/docs/basic/graph_views.rst:436 -#: ../../build/docs/basic/graph_views.rst:500 +#: ../../build/docs/basic/graphs.rst:370 +#: ../../build/docs/basic/graphs.rst:436 +#: ../../build/docs/basic/graphs.rst:500 msgid "Creating the view:" msgstr "Skapa en vy:" -#: ../../build/docs/basic/graph_views.rst:372 +#: ../../build/docs/basic/graphs.rst:372 msgid "If you need to reconstruct the view, first drop it using the command on **line 1**." msgstr "" "Om du behöver rekonstruera vyn, släpp den först med hjälp av kommandot på **" "rad 1**." -#: ../../build/docs/basic/graph_views.rst:374 +#: ../../build/docs/basic/graphs.rst:374 msgid "Get the component with maximum number of edges (**lines 6-10**)" msgstr "Hämta komponenten med maximalt antal kanter (**raderna 6-10**)" -#: ../../build/docs/basic/graph_views.rst:375 +#: ../../build/docs/basic/graphs.rst:375 msgid "The `source` and `target` requirements for the function are to be with OSM identifiers. (line **14**)" msgstr "" "Kraven på `source` och `target` för funktionen ska vara med OSM-" "identifierare. (rad **14**)" -#: ../../build/docs/basic/graph_views.rst:377 +#: ../../build/docs/basic/graphs.rst:377 msgid "The ``cost`` and ``reverse_cost`` are in terms of seconds. (line **15**)" msgstr "Kostnaden och den omvända kostnaden anges i sekunder. (rad **15**)" -#: ../../build/docs/basic/graph_views.rst:378 +#: ../../build/docs/basic/graphs.rst:378 msgid "The additional parameters ``length_m`` and ``the_geom`` are renamed, ``name`` is also included. (line **16**)" msgstr "" "De ytterligare parametrarna ``length_m`` och ``the_geom`` har bytt namn, " "``name`` ingår också. (rad **16**)" -#: ../../build/docs/basic/graph_views.rst:380 +#: ../../build/docs/basic/graphs.rst:380 msgid "``JOIN`` with the `configuration`:" msgstr "``JOIN`` med `konfigurationen`:" -#: ../../build/docs/basic/graph_views.rst:382 +#: ../../build/docs/basic/graphs.rst:382 msgid "Exclude `steps`, `footway`, `path`, `cycleway`. (line **18**)" msgstr "Exkludera `steps`, `footway`, `path`, `cycleway`. (rad **18**)" -#: ../../build/docs/basic/graph_views.rst:395 +#: ../../build/docs/basic/graphs.rst:395 msgid "Verification:" msgstr "Verifiering:" -#: ../../build/docs/basic/graph_views.rst:397 +#: ../../build/docs/basic/graphs.rst:397 msgid "Count the rows on the original ``ways`` and on ``vehicle_net``." msgstr "Räkna raderna på de ursprungliga ``ways`` och på ``vehicle_net``." -#: ../../build/docs/basic/graph_views.rst:407 +#: ../../build/docs/basic/graphs.rst:407 msgid "Get the description of the view" msgstr "Hämta beskrivningen av vyn" -#: ../../build/docs/basic/graph_views.rst:419 +#: ../../build/docs/basic/graphs.rst:419 msgid "Exercise 6: Limiting the road network within an area" msgstr "Övning 6: Begränsa vägnätet inom ett område" -#: ../../build/docs/basic/graph_views.rst:421 +#: ../../build/docs/basic/graphs.rst:421 msgid "View of smaller set of roads for vehicles" msgstr "Vy över mindre uppsättning vägar för fordon" -#: ../../build/docs/basic/graph_views.rst:427 +#: ../../build/docs/basic/graphs.rst:427 msgid "Create a view ``taxi_net`` for the `taxi`:" msgstr "Skapa en vy ``taxi_net`` för `taxi`:" -#: ../../build/docs/basic/graph_views.rst:429 +#: ../../build/docs/basic/graphs.rst:429 msgid "The taxi can only circulate inside this Bounding Box: ``(-48.52,-1.46,-48.45,-1.41)``" msgstr "" "Taxin kan bara cirkulera inom denna avgränsningsruta: ``(-48.52,-1.46,-48." "45,-1.41)``" -#: ../../build/docs/basic/graph_views.rst:430 +#: ../../build/docs/basic/graphs.rst:430 msgid "The taxi speed is 10% slower than the particular vehicle." msgstr "Taxihastigheten är 10% slägre än för det aktuella fordonet." -#: ../../build/docs/basic/graph_views.rst:432 +#: ../../build/docs/basic/graphs.rst:432 msgid "Verify the reduced number of road segments." msgstr "Verifiera det minskade antalet vägsegment." -#: ../../build/docs/basic/graph_views.rst:438 +#: ../../build/docs/basic/graphs.rst:438 msgid "Adjust the taxi's ``cost`` and ``reverse_cost`` to be 10% slower than of the particular vehicle. (line **7**)" msgstr "" "Justera taxins ``cost`` och ``reverse_cost`` så att de är 10% långsammare än " "för det aktuella fordonet. (rad **7**)" -#: ../../build/docs/basic/graph_views.rst:440 +#: ../../build/docs/basic/graphs.rst:440 msgid "The graph for the taxi is a subset of the ``vehicle_net`` graph. (line **9**)" msgstr "" "Grafen för taxin är en delmängd av grafen för ``vehicle_net``. (rad **9**)" -#: ../../build/docs/basic/graph_views.rst:441 +#: ../../build/docs/basic/graphs.rst:441 msgid "Can only circulate inside the bounding box: ``(-48.52,-1.46,-48.45,-1.41)``. (line **10**)" msgstr "" "Kan bara cirkulera inom den avgränsande rutan: ``(-48.52,-1.46,-48.45,-1." "41)``. (rad **10**)" -#: ../../build/docs/basic/graph_views.rst:455 +#: ../../build/docs/basic/graphs.rst:455 msgid "Count the rows on ``taxi_net``." msgstr "Räkna raderna på ``taxi_net``." -#: ../../build/docs/basic/graph_views.rst:466 -#: ../../build/docs/basic/graph_views.rst:529 +#: ../../build/docs/basic/graphs.rst:466 +#: ../../build/docs/basic/graphs.rst:529 msgid "Get the description." msgstr "Hämta beskrivningen." -#: ../../build/docs/basic/graph_views.rst:477 +#: ../../build/docs/basic/graphs.rst:477 msgid "Exercise 7: Creating a materialized view for routing pedestrians" msgstr "Övning 7: Skapa en materialiserad vy för att dirigera fotgängare" -#: ../../build/docs/basic/graph_views.rst:479 +#: ../../build/docs/basic/graphs.rst:479 msgid "View of roads for pedestrians" msgstr "Vy över vägar för fotgängare" -#: ../../build/docs/basic/graph_views.rst:485 +#: ../../build/docs/basic/graphs.rst:485 msgid "Create a materialized view with minimal amount of information for processing pedestrians." msgstr "" "Skapa en materialiserad vy med minimal mängd information för bearbetning av " "fotgängare." -#: ../../build/docs/basic/graph_views.rst:486 +#: ../../build/docs/basic/graphs.rst:486 msgid "Routing `cost` and `reverse_cost` will be on seconds for routing calculations." msgstr "" "Routing `cost` och `reverse_cost` kommer att vara på sekunder för " "routingsberäkningar." -#: ../../build/docs/basic/graph_views.rst:490 +#: ../../build/docs/basic/graphs.rst:490 msgid "Exclude `motorway` , `primary` and `secondary` segments." msgstr "Exkludera segmenten `motorway`, `primary` och `secondary`." -#: ../../build/docs/basic/graph_views.rst:493 +#: ../../build/docs/basic/graphs.rst:493 msgid "`length_m` The length in meters." msgstr "`length_m` Längden i meter." -#: ../../build/docs/basic/graph_views.rst:494 +#: ../../build/docs/basic/graphs.rst:494 msgid "`the_geom` The geometry." msgstr "`the_geom` Geometrin." -#: ../../build/docs/basic/graph_views.rst:502 +#: ../../build/docs/basic/graphs.rst:502 msgid "Similar to `Exercise 5: Creating a view for routing`_:" msgstr "Liknar `Övning 5: Skapa en vy för routing`_:" -#: ../../build/docs/basic/graph_views.rst:504 +#: ../../build/docs/basic/graphs.rst:504 msgid "The ``cost`` and ``reverse_cost`` are in terms of seconds with speed of ``2 mts/sec``. (line **7**)" msgstr "" "Kostnaden och den omvända kostnaden anges i sekunder med en hastighet av 2 " "mts/sek. (rad **7**)" -#: ../../build/docs/basic/graph_views.rst:505 +#: ../../build/docs/basic/graphs.rst:505 msgid "Exclude `motorway`, `primary` and `secondary` . (line **11**)" msgstr "Uteslut \"motorway\", \"primary\" och \"secondary\" (rad **11**)" -#: ../../build/docs/basic/graph_views.rst:518 +#: ../../build/docs/basic/graphs.rst:518 msgid "Count the rows on the view ``walk_net``." msgstr "Räkna raderna på vyn ``walk_net``." -#: ../../build/docs/basic/graph_views.rst:541 +#: ../../build/docs/basic/graphs.rst:541 msgid "Exercise 8: Testing the views for routing" msgstr "Övning 8: Testa vyerna för routing" -#: ../../build/docs/basic/graph_views.rst:543 +#: ../../build/docs/basic/graphs.rst:543 msgid "From the |ch7_place_1| to the |ch7_place_2|" msgstr "Från |ch7_place_1| till |ch7_place_2|" -#: ../../build/docs/basic/graph_views.rst:549 +#: ../../build/docs/basic/graphs.rst:549 msgid "Test the created views" msgstr "Testa de skapade vyerna" -#: ../../build/docs/basic/graph_views.rst:551 +#: ../../build/docs/basic/graphs.rst:551 msgid "In particular:" msgstr "I synnerhet:" -#: ../../build/docs/basic/graph_views.rst:553 +#: ../../build/docs/basic/graphs.rst:553 msgid "From the |ch7_place_1| to the \"|ch7_place_2| using the OSM identifier" msgstr "" "Från \"|ch7_place_1|\" till \"|ch7_place_2|\" med hjälp av OSM-identifieraren" -#: ../../build/docs/basic/graph_views.rst:554 +#: ../../build/docs/basic/graphs.rst:554 msgid "the views to be tested are:" msgstr "de åsikter som ska testas är:" -#: ../../build/docs/basic/graph_views.rst:556 +#: ../../build/docs/basic/graphs.rst:556 msgid "``vehicle_net``" msgstr "``vehicle_net``" -#: ../../build/docs/basic/graph_views.rst:557 +#: ../../build/docs/basic/graphs.rst:557 msgid "``taxi_net``" msgstr "``taxi_net``" -#: ../../build/docs/basic/graph_views.rst:558 +#: ../../build/docs/basic/graphs.rst:558 msgid "``walk_net``" msgstr "``walk_net``" -#: ../../build/docs/basic/graph_views.rst:560 +#: ../../build/docs/basic/graphs.rst:560 msgid "Only show the following results, as the other columns are to be ignored on the function." msgstr "" "Visa endast följande resultat, eftersom de andra kolumnerna ska ignoreras i " "funktionen." -#: ../../build/docs/basic/graph_views.rst:562 +#: ../../build/docs/basic/graphs.rst:562 msgid "``seq``" msgstr "``seq``" -#: ../../build/docs/basic/graph_views.rst:563 +#: ../../build/docs/basic/graphs.rst:563 msgid "``edge`` with the name ``id``" msgstr "``edge`` med namnet ``id``" -#: ../../build/docs/basic/graph_views.rst:564 +#: ../../build/docs/basic/graphs.rst:564 msgid "``cost`` with the name: ``seconds``" msgstr "``cost`` med namnet: ``seconds``" -#: ../../build/docs/basic/graph_views.rst:568 +#: ../../build/docs/basic/graphs.rst:568 msgid "In general" msgstr "I allmänhet" -#: ../../build/docs/basic/graph_views.rst:570 +#: ../../build/docs/basic/graphs.rst:570 msgid "The departure is |ch7_place_1| with OSM identifier |ch7_osmid_1|." msgstr "Avgången är |ch7_place_1| med OSM-identifierare |ch7_osmid_1|." -#: ../../build/docs/basic/graph_views.rst:571 +#: ../../build/docs/basic/graphs.rst:571 msgid "The destination is |ch7_place_2| with OSM identifier |ch7_osmid_2|." msgstr "Destinationen är |ch7_place_2| med OSM-identifieraren |ch7_osmid_2|." -#: ../../build/docs/basic/graph_views.rst:573 +#: ../../build/docs/basic/graphs.rst:573 msgid "For ``vehicle_net``:" msgstr "För ``vehicle_net``:" -#: ../../build/docs/basic/graph_views.rst:575 +#: ../../build/docs/basic/graphs.rst:575 msgid "``vehicle_net`` is used." msgstr "``vehicle_net`` används." -#: ../../build/docs/basic/graph_views.rst:576 +#: ../../build/docs/basic/graphs.rst:576 msgid "Selection of the columns with the corresponding names are on line **1**." msgstr "Val av kolumner med motsvarande namn finns på rad **1**." -#: ../../build/docs/basic/graph_views.rst:577 +#: ../../build/docs/basic/graphs.rst:577 msgid "The view is prepared with the column names that pgRouting use." msgstr "Vyn är förberedd med de kolumnnamn som pgRouting använder." -#: ../../build/docs/basic/graph_views.rst:579 +#: ../../build/docs/basic/graphs.rst:579 msgid "There is no need to rename columns. (line **3**)" msgstr "Det finns inget behov av att byta namn på kolumner. (rad **3**)" -#: ../../build/docs/basic/graph_views.rst:581 +#: ../../build/docs/basic/graphs.rst:581 msgid "The OSM identifiers of the departure and destination are used. (line **4**)" msgstr "OSM-identifierarna för avgång och destination används. (rad **4**)" -#: ../../build/docs/basic/graph_views.rst:594 +#: ../../build/docs/basic/graphs.rst:594 msgid "For ``taxi_net``:" msgstr "För ``taxi_net``:" -#: ../../build/docs/basic/graph_views.rst:596 +#: ../../build/docs/basic/graphs.rst:596 msgid "Similar as the previous one but with ``taxi_net``. (line **3**)" msgstr "Liknande som den föregående men med ``taxi_net``. (rad **3**)" -#: ../../build/docs/basic/graph_views.rst:597 +#: ../../build/docs/basic/graphs.rst:597 msgid "The results give the same route as with ``vehicle_net`` but ``cost`` is higher." msgstr "" "Resultatet ger samma rutt som med ``vehicle_net`` men ``cost`` är högre." -#: ../../build/docs/basic/graph_views.rst:610 +#: ../../build/docs/basic/graphs.rst:610 msgid "For ``walk_net``:" msgstr "För ``walk_net``:" -#: ../../build/docs/basic/graph_views.rst:612 +#: ../../build/docs/basic/graphs.rst:612 msgid "Similar as the previous one but with ``walk_net``. (line **3**)" msgstr "Liknande som den föregående men med ``walk_net``. (rad **3**)" -#: ../../build/docs/basic/graph_views.rst:613 +#: ../../build/docs/basic/graphs.rst:613 msgid "The results give a different route than of the vehicles." msgstr "Resultaten ger en annan rutt än fordonens." diff --git a/locale/sv/LC_MESSAGES/basic/pedestrian.po b/locale/sv/LC_MESSAGES/basic/pedestrian.po index fc6b79de8..4ff8b7e4a 100644 --- a/locale/sv/LC_MESSAGES/basic/pedestrian.po +++ b/locale/sv/LC_MESSAGES/basic/pedestrian.po @@ -335,23 +335,23 @@ msgstr "" msgid "Result adds the costs per destination." msgstr "Resultat lägger till kostnaderna per destination." -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:1 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:1 msgid "Inspecting the results, looking for totals (edge = -1):" msgstr "Kontrollerar resultaten och letar efter totalsummor (edge = -1):" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:3 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:3 msgid "From 20297 to vertex 6548 takes 92.58 minutes (seq = 147)" msgstr "Från 20297 till toppunkt 6548 tar det 92,58 minuter (seq = 147)" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:5 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:5 msgid "From 20297 to vertex 12712 takes 83.18 minutes (seq = 267)" msgstr "Från 20297 till toppunkt 12712 tar det 83,18 minuter (seq = 267)" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:7 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:7 msgid "From 23872 to vertex 6548 takes 76.26 minutes (seq = 385)" msgstr "Från 23872 till toppunkt 6548 tar det 76,26 minuter (seq = 385)" -#: ../../build/docs/scripts/basic/chapter_5/note_1.txt:9 +#: ../../build/docs/scripts/basic/pedestrian/note_1.txt:9 msgid "From 23872 to vertex 12712 takes 67.76 minutes (seq = 495)" msgstr "Från 23872 till toppunkt 12712 tar det 67,76 minuter (seq = 495)" @@ -449,7 +449,7 @@ msgstr "" "Kostnaden ska vara i minuter, med en gånghastighet s = 1,3 m/s och t = d/s (" "rad **6**)." -#: ../../build/docs/scripts/basic/chapter_5/note_2.txt:1 +#: ../../build/docs/scripts/basic/pedestrian/note_2.txt:1 msgid "An interpretation of the result can be: In general, it is faster to depart from \"Instituto Federal do Pará, Campus Belém\" than from \"Hangar Convention Center\"" msgstr "" "En tolkning av resultatet kan vara: I allmänhet är det snabbare att avgå " diff --git a/locale/sv/LC_MESSAGES/basic/plpgsql_function.po b/locale/sv/LC_MESSAGES/basic/plpgsql_function.po index ef9bd4eb8..e55c6ef38 100644 --- a/locale/sv/LC_MESSAGES/basic/plpgsql_function.po +++ b/locale/sv/LC_MESSAGES/basic/plpgsql_function.po @@ -281,16 +281,16 @@ msgid "Solution" msgstr "Lösning" #: ../../build/docs/basic/plpgsql_function.rst:91 -msgid "Use ``pgr_extractVertices`` (explained in :doc:`graph_views`) to create the vertices table" +msgid "Use ``pgr_extractVertices`` (explained in :doc:`graphs`) to create the vertices table" msgstr "" -"Använd ``pgr_extractVertices`` (förklaras i :doc:`graph_views`) för att " +"Använd ``pgr_extractVertices`` (förklaras i :doc:`graphs`) för att " "skapa tabellen med hörnpunkter" #: ../../build/docs/basic/plpgsql_function.rst:93 -msgid "``JOIN`` the vertices table with ``ways_vertices`` (created in :doc:`graph_views`) to get the ``x``, ``y``, ``geom`` information." +msgid "``JOIN`` the vertices table with ``ways_vertices`` (created in :doc:`graphs`) to get the ``x``, ``y``, ``geom`` information." msgstr "" "``JOIN`` vertices tabellen med ``ways_vertices`` (skapad i " -":doc:`graph_views`) för att få ``x``, ``y``, ``geom`` information." +":doc:`graphs`) för att få ``x``, ``y``, ``geom`` information." #: ../../build/docs/basic/plpgsql_function.rst:96 #: ../../build/docs/basic/plpgsql_function.rst:410 @@ -320,8 +320,8 @@ msgid "It is left to the reader to remove disconected components on the views." msgstr "Det är upp till läsaren att ta bort borttagna komponenter på vyerna." #: ../../build/docs/basic/plpgsql_function.rst:122 -msgid "See :doc:`graph_views`" -msgstr "Se :doc:`graph_views`" +msgid "See :doc:`graphs`" +msgstr "Se :doc:`graphs`" #: ../../build/docs/basic/plpgsql_function.rst:125 msgid "Exercise 3: Nearest Vertex" diff --git a/locale/sv/LC_MESSAGES/un_sdg/sdg11-cities.po b/locale/sv/LC_MESSAGES/un_sdg/sdg11-cities.po index 30dc19128..76b2618ff 100644 --- a/locale/sv/LC_MESSAGES/un_sdg/sdg11-cities.po +++ b/locale/sv/LC_MESSAGES/un_sdg/sdg11-cities.po @@ -251,10 +251,10 @@ msgstr "" "komponenterna och lagras sedan i en ny kolumn med namnet ``component``." #: ../../build/docs/un_sdg/sdg11-cities.rst:241 -msgid "The pgRouting function ``pgr_connectedComponents`` is used to complete this task and its explaind with more detail in :doc:`../basic/graph_views`." +msgid "The pgRouting function ``pgr_connectedComponents`` is used to complete this task and its explaind with more detail in :doc:`../basic/graphs`." msgstr "" "PgRouting-funktionen ``pgr_connectedComponents`` används för att slutföra " -"denna uppgift och förklaras mer detaljerat i :doc:`../basic/graph_views`." +"denna uppgift och förklaras mer detaljerat i :doc:`../basic/graphs`." #: ../../build/docs/un_sdg/sdg11-cities.rst:244 msgid "A sub-query is created to find out all the connected components. After that, the ``component`` column is updated using the results obtained from the sub-query. This helps in storing the component id in the ``waterways_ways_vertices_pgr`` table. Next query uses this output and stores the component id in the waterways_ways (edges) table. Follow the steps given below to complete this task." diff --git a/locale/sv/LC_MESSAGES/un_sdg/sdg3-health.po b/locale/sv/LC_MESSAGES/un_sdg/sdg3-health.po index 9afcae989..7d4d1c462 100644 --- a/locale/sv/LC_MESSAGES/un_sdg/sdg3-health.po +++ b/locale/sv/LC_MESSAGES/un_sdg/sdg3-health.po @@ -470,10 +470,10 @@ msgid "Exercise 12: Remove disconnected components" msgstr "Övning 12: Demontera bortkopplade komponenter" #: ../../build/docs/un_sdg/sdg3-health.rst:423 -msgid "To remove the disconnected components on the road network, the following pgRouting functions, discussed on :doc:`../basic/graph_views`, will be used:" +msgid "To remove the disconnected components on the road network, the following pgRouting functions, discussed on :doc:`../basic/graphs`, will be used:" msgstr "" "För att ta bort de frånkopplade komponenterna i vägnätet används följande " -"pgRouting-funktioner, som diskuteras i :doc:`../basic/graph_views`:" +"pgRouting-funktioner, som diskuteras i :doc:`../basic/graphs`:" #: ../../build/docs/un_sdg/sdg3-health.rst:426 msgid "``pgr_extractVertices``" diff --git a/locale/sv/LC_MESSAGES/un_sdg/sdg7-energy.po b/locale/sv/LC_MESSAGES/un_sdg/sdg7-energy.po index fb5b18165..f82237248 100644 --- a/locale/sv/LC_MESSAGES/un_sdg/sdg7-energy.po +++ b/locale/sv/LC_MESSAGES/un_sdg/sdg7-energy.po @@ -134,10 +134,10 @@ msgid "Exercise 2: Remove disconnected components" msgstr "Övning 2: Demontera bortkopplade komponenter" #: ../../build/docs/un_sdg/sdg7-energy.rst:99 -msgid "To remove the disconnected components on the road network, the following pgRouting functions, discussed on :doc:`../basic/graph_views`, will be used:" +msgid "To remove the disconnected components on the road network, the following pgRouting functions, discussed on :doc:`../basic/graphs`, will be used:" msgstr "" "För att ta bort de frånkopplade komponenterna i vägnätet används följande " -"pgRouting-funktioner, som diskuteras i :doc:`../basic/graph_views`:" +"pgRouting-funktioner, som diskuteras i :doc:`../basic/graphs`:" #: ../../build/docs/un_sdg/sdg7-energy.rst:102 msgid "``pgr_extractVertices``"