Skip to content

Commit 1a7e1d6

Browse files
authored
Merge pull request #248 from cvvergara/adding-sv-to-the-build
Adding sv to the build
2 parents 2b2c8f4 + b8875e0 commit 1a7e1d6

28 files changed

+7552
-5
lines changed

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
mkdir -p ~/Desktop/workshop-2019
6060
mkdir build
6161
cd build
62-
cmake -DPGR_WORKSHOP_DEBUG=ON ..
62+
cmake -DPGR_WORKSHOP_DEBUG=ON -DES=ON -DSV=ON ..
6363
psql -l
6464
env:
6565
POSTGRES_HOST: localhost

.github/workflows/website.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
echo :5432:*:user:user >> .pgpass
7373
mkdir build
7474
cd build
75-
cmake -DES=ON ..
75+
cmake -DES=ON -DSV=ON ..
7676
env:
7777
POSTGRES_HOST: localhost
7878
POSTGRES_PORT: 5432
@@ -95,7 +95,7 @@ jobs:
9595
if [[ "${{ env.BRANCH }}" == "develop" ]]; then
9696
FOLDER_NAME="dev"
9797
elif [[ "${{ env.BRANCH }}" == "main" ]]; then
98-
FOLDER_NAME="2.9"
98+
FOLDER_NAME="3.0"
9999
fi
100100
git checkout -f origin/gh-pages
101101
git checkout -b gh-pages

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ set(COPYRIGHT "2010-2024 pgRouting Developers")
2626
set(PGR_WORKSHOP_VERSION_MAJOR "3")
2727
set(PGR_WORKSHOP_VERSION_MINOR "0")
2828
set(PGR_WORKSHOP_VERSION_PATCH "0")
29-
set(PGR_WORKSHOP_VERSION_DEV "-dev")
29+
set(PGR_WORKSHOP_VERSION_DEV "")
3030
set(PGR_WORKSHOP_VERSION "${PGR_WORKSHOP_VERSION_MAJOR}.${PGR_WORKSHOP_VERSION_MINOR}")
3131
set(PGR_WORKSHOP_RELEASE "${PGR_WORKSHOP_VERSION_MAJOR}.${PGR_WORKSHOP_VERSION_MINOR}.${PGR_WORKSHOP_VERSION_PATCH}${PGR_WORKSHOP_VERSION_DEV}")
3232
set(PGR_WORKSHOP_NAME "pgRouting workshop")
@@ -221,7 +221,7 @@ message(STATUS "PGR_WORKSHOP_DOC_TARGETS = ${PGR_WORKSHOP_DOC_TARGETS}")
221221
# TODO: figure out how to support this
222222
# "el" "hu" "id" "zh")
223223
#---------------------------------------------
224-
set(PGR_WORKSHOP_SUPPORTED_LANGUAGES "es" "ja")
224+
set(PGR_WORKSHOP_SUPPORTED_LANGUAGES "es" "ja" "sv")
225225
set(PGR_WORKSHOP_ENGLISH "en")
226226

227227
#---------------------------------------------
@@ -286,6 +286,7 @@ INSERT_INTO_MAP("ko" "한국어")
286286
INSERT_INTO_MAP("pl" "Polski")
287287
INSERT_INTO_MAP("pt" "Portugus")
288288
INSERT_INTO_MAP("ru" "Русский")
289+
INSERT_INTO_MAP("sv" "Svenska")
289290
INSERT_INTO_MAP("zh" "中文")
290291

291292

Lines changed: 294 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,294 @@
1+
# SOME DESCRIPTIVE TITLE.
2+
# Copyright (C) 2010-2024 pgRouting Developers
3+
# This file is distributed under the same license as the Workshop FOSS4G Belém package.
4+
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5+
#
6+
msgid ""
7+
msgstr ""
8+
"Project-Id-Version: Workshop FOSS4G Belém 3.0\n"
9+
"Report-Msgid-Bugs-To: \n"
10+
"POT-Creation-Date: 2024-12-16 17:44+0000\n"
11+
"PO-Revision-Date: 2025-07-03 07:34+0000\n"
12+
"Last-Translator: Daniel Nylander <[email protected]>\n"
13+
"Language-Team: Swedish <https://weblate.osgeo.org/projects/"
14+
"pgrouting-workshop/advanced-chapter-12/sv/>\n"
15+
"Language: sv\n"
16+
"MIME-Version: 1.0\n"
17+
"Content-Type: text/plain; charset=UTF-8\n"
18+
"Content-Transfer-Encoding: 8bit\n"
19+
"Plural-Forms: nplurals=2; plural=n != 1;\n"
20+
"X-Generator: Weblate 5.4.3\n"
21+
22+
#: ../../build/docs/advanced/chapter-12.rst:11
23+
msgid "Create a Network Topology"
24+
msgstr "Skapa en nätverkstopologi"
25+
26+
#: ../../build/docs/advanced/chapter-12.rst:17
27+
msgid ":doc:`osm2pgrouting <../appendix/appendix-3>` is a convenient tool, and its focus to work on OpenStreetMap data. There are several cases where :doc:`osm2pgrouting <../appendix/appendix-3>` can't be used. Some network data already comes with a network topology that can be used with pgRouting out-of-the-box. Often network data is stored in Shape file format (``.shp``) and we can use PostGIS' ``shp2pgsql`` converter to import the data into a PostgreSQL database."
28+
msgstr ""
29+
":doc:`osm2pgrouting <../appendix/appendix-3>` är ett bekvämt verktyg, och "
30+
"dess fokus är att arbeta med OpenStreetMap-data. Det finns flera fall där "
31+
":doc:`osm2pgrouting <../appendix/appendix-3>` inte kan användas. Vissa "
32+
"nätverksdata levereras redan med en nätverkstopologi som kan användas med "
33+
"pgRouting out-of-the-box. Ofta lagras nätverksdata i Shape-filformat (``."
34+
"shp``) och vi kan använda PostGIS '``shp2pgsql``-omvandlare för att "
35+
"importera data till en PostgreSQL-databas."
36+
37+
#: ../../build/docs/advanced/chapter-12.rst:24
38+
msgid "But what to do then?"
39+
msgstr "Men vad ska man göra då?"
40+
41+
#: ../../build/docs/advanced/chapter-12.rst:26
42+
msgid "In this chapter you will learn how to create a basic `Routing Network Topology` from a network data that does not have a routing Topology create the minimum attributes needed the `Routing Network Topology`."
43+
msgstr ""
44+
"I det här kapitlet lär du dig att skapa en grundläggande `Routing Network "
45+
"Topology` från nätverksdata som inte har någon routing Topology skapa de "
46+
"minimiattribut som behövs för `Routing Network Topology`."
47+
48+
#: ../../build/docs/advanced/chapter-12.rst:31
49+
msgid "Chapter contents"
50+
msgstr "Kapitelinnehåll"
51+
52+
#: ../../build/docs/advanced/chapter-12.rst:34
53+
msgid "Load network data"
54+
msgstr "Ladda nätverksdata"
55+
56+
#: ../../build/docs/advanced/chapter-12.rst:36
57+
msgid "At first we will load OpenStreetMap sample data with osm2pgsql."
58+
msgstr "Först laddar vi OpenStreetMap exempeldata med osm2pgsql."
59+
60+
#: ../../build/docs/advanced/chapter-12.rst:49
61+
msgid "Let's see which tables have been created:"
62+
msgstr "Låt oss se vilka tabeller som har skapats:"
63+
64+
#: ../../build/docs/advanced/chapter-12.rst:52
65+
msgid "Run: ``psql -U user -d osm_data -c \"\\d\"``"
66+
msgstr "Kör: ``psql -U user -d osm_data -c \"\\d\"``"
67+
68+
#: ../../build/docs/advanced/chapter-12.rst:53
69+
msgid "The table containing the road network data has the name ``planet_osm_roads``. It consists of large amount of attributes."
70+
msgstr ""
71+
"Tabellen som innehåller uppgifter om vägnätet har namnet ``planet_osm_roads``"
72+
". Den består av en stor mängd attribut."
73+
74+
#: ../../build/docs/advanced/chapter-12.rst:57
75+
msgid "Run: ``psql -U user -d osm_data -c \"\\d planet_osm_roads\"``"
76+
msgstr "Kör: ``psql -U user -d osm_data -c \"\\d planet_osm_roads\"``"
77+
78+
#: ../../build/docs/advanced/chapter-12.rst:58
79+
msgid "It is common that road network data provides at least the following information:"
80+
msgstr ""
81+
"Det är vanligt att uppgifter om vägnätet innehåller åtminstone följande "
82+
"information:"
83+
84+
#: ../../build/docs/advanced/chapter-12.rst:60
85+
msgid "Road link ID (gid)"
86+
msgstr "ID för väglänk (gid)"
87+
88+
#: ../../build/docs/advanced/chapter-12.rst:61
89+
msgid "Road class (class_id)"
90+
msgstr "Vägklass (klass_id)"
91+
92+
#: ../../build/docs/advanced/chapter-12.rst:62
93+
msgid "Road link length (length)"
94+
msgstr "Längd på väglänk (längd)"
95+
96+
#: ../../build/docs/advanced/chapter-12.rst:63
97+
msgid "Road name (name)"
98+
msgstr "Vägens namn (namn)"
99+
100+
#: ../../build/docs/advanced/chapter-12.rst:64
101+
msgid "Road geometry (the_geom)"
102+
msgstr "Väggeometri (the_geom)"
103+
104+
#: ../../build/docs/advanced/chapter-12.rst:66
105+
msgid "This allows to display the road network as a PostGIS layer in GIS software, for example in QGIS. Though it is not sufficient for routing, because it doesn't contain network topology information."
106+
msgstr ""
107+
"Detta gör det möjligt att visa vägnätet som ett PostGIS-lager i GIS-program, "
108+
"till exempel i QGIS. Det är dock inte tillräckligt för routing, eftersom det "
109+
"inte innehåller information om nätverkstopologin."
110+
111+
#: ../../build/docs/advanced/chapter-12.rst:70
112+
msgid "The next steps will use the PostgreSQL command line tool."
113+
msgstr "Nästa steg kommer att använda kommandoradsverktyget PostgreSQL."
114+
115+
#: ../../build/docs/advanced/chapter-12.rst:79
116+
msgid "Create a Routing Network Topology"
117+
msgstr "Skapa en topologi för ett routningsnätverk"
118+
119+
#: ../../build/docs/advanced/chapter-12.rst:81
120+
msgid "Having your data imported into a PostgreSQL database might require one more step for pgRouting."
121+
msgstr ""
122+
"Att ha dina data importerade till en PostgreSQL-databas kan kräva "
123+
"ytterligare ett steg för pgRouting."
124+
125+
#: ../../build/docs/advanced/chapter-12.rst:84
126+
msgid "Make sure that your data provides a correct `Routing Network Topology`, which consists of information about source and target identifiers for each road link. The results above, show that the network topology does not have any source and target information."
127+
msgstr ""
128+
"Se till att dina data ger en korrekt `Routing Network Topology`, som består "
129+
"av information om käll- och målidentifierare för varje väglänk. Resultaten "
130+
"ovan visar att nätverkstopologin inte har någon information om källa och mål."
131+
132+
#: ../../build/docs/advanced/chapter-12.rst:89
133+
msgid "Creation of the `Routing Network Topology` is necessary."
134+
msgstr "Skapande av `Routing Network Topology` är nödvändigt."
135+
136+
#: ../../build/docs/advanced/chapter-12.rst:92
137+
msgid "PostGIS topology is not suitable for Routing."
138+
msgstr "PostGIS-topologin är inte lämplig för Routing."
139+
140+
#: ../../build/docs/advanced/chapter-12.rst:94
141+
msgid "pgRouting provides a general way for creating the `Routing Network Topology` with the ``pgr_createTopology`` function."
142+
msgstr ""
143+
"pgRouting tillhandahåller ett allmänt sätt att skapa `Routing Network "
144+
"Topology` med funktionen ``pgr_createTopology``."
145+
146+
#: ../../build/docs/advanced/chapter-12.rst:97
147+
msgid "This function:"
148+
msgstr "Denna funktion:"
149+
150+
#: ../../build/docs/advanced/chapter-12.rst:99
151+
msgid "Assigns a ``source`` and a ``target`` identifiers to each road link"
152+
msgstr "Tilldelar en ``käll`` och en ``mål`` identifiering till varje väglänk"
153+
154+
#: ../../build/docs/advanced/chapter-12.rst:100
155+
msgid "It can logically \"snap\" nearby vertices within a certain tolerance by assigning the same identifier."
156+
msgstr ""
157+
"Den kan logiskt \"fästa\" närliggande hörn inom en viss tolerans genom att "
158+
"tilldela dem samma identifierare."
159+
160+
#: ../../build/docs/advanced/chapter-12.rst:102
161+
msgid "Creates a vertices table related to it."
162+
msgstr "Skapar en vertices-tabell som är relaterad till den."
163+
164+
#: ../../build/docs/advanced/chapter-12.rst:103
165+
msgid "Creates the basic indices."
166+
msgstr "Skapar de grundläggande indexen."
167+
168+
#: ../../build/docs/advanced/chapter-12.rst:109
169+
msgid "For additional information see `pgr_createTopology <https://docs.pgrouting.org/latest/en/pgr_createTopology.html>`_."
170+
msgstr ""
171+
"För ytterligare information se `pgr_createTopology <https://docs.pgrouting."
172+
"org/latest/en/pgr_createTopology.html>`_."
173+
174+
#: ../../build/docs/advanced/chapter-12.rst:112
175+
msgid "First add source and target column, then run the ``pgr_createTopology`` function ... and wait."
176+
msgstr ""
177+
"Lägg först till käll- och målkolumn, kör sedan funktionen "
178+
"``pgr_createTopology`` ... och vänta."
179+
180+
#: ../../build/docs/advanced/chapter-12.rst:115
181+
msgid "Depending on the network size this process may take from minutes to hours."
182+
msgstr ""
183+
"Beroende på nätverkets storlek kan denna process ta från några minuter till "
184+
"flera timmar."
185+
186+
#: ../../build/docs/advanced/chapter-12.rst:116
187+
msgid "Progress indicator can be read with PostgreSQL NOTICE"
188+
msgstr "Framstegsindikator kan läsas med PostgreSQL NOTICE"
189+
190+
#: ../../build/docs/advanced/chapter-12.rst:117
191+
msgid "It will also require enough memory (RAM or SWAP partition) to store temporary data."
192+
msgstr ""
193+
"Det krävs också tillräckligt med minne (RAM eller SWAP-partition) för att "
194+
"lagra tillfälliga data."
195+
196+
#: ../../build/docs/advanced/chapter-12.rst:120
197+
msgid "The dimension of the tolerance parameter depends on your data projection. Usually it's either \"degrees\" or \"meters\". In our example the geometry data projection to determine the tolerance:"
198+
msgstr ""
199+
"Toleransparameterns dimension beror på din dataprojektion. Vanligtvis är det "
200+
"antingen \"grader\" eller \"meter\". I vårt exempel används "
201+
"geometridataprojektionen för att bestämma toleransen:"
202+
203+
#: ../../build/docs/advanced/chapter-12.rst:132
204+
msgid "Based on this result the tolerance will be 0.00001"
205+
msgstr "Baserat på detta resultat kommer toleransen att vara 0,00001"
206+
207+
#: ../../build/docs/advanced/chapter-12.rst:145
208+
msgid "Verify the Routing Network Topology"
209+
msgstr "Verifiera topologin för routningsnätverket"
210+
211+
#: ../../build/docs/advanced/chapter-12.rst:147
212+
msgid "To verify that there is a basic `Routing Network Topology`:"
213+
msgstr ""
214+
"För att verifiera att det finns en grundläggande `Routing Network Topology`:"
215+
216+
#: ../../build/docs/advanced/chapter-12.rst:153
217+
msgid "Also a new table containing the vertices information was created:"
218+
msgstr "Dessutom skapades en ny tabell som innehåller information om topparna:"
219+
220+
#: ../../build/docs/advanced/chapter-12.rst:159
221+
msgid "``id`` is the vertex identifier"
222+
msgstr "``id`` är vertexidentifieraren"
223+
224+
#: ../../build/docs/advanced/chapter-12.rst:160
225+
msgid "``the_geom`` is the geometry considered for that particular vertex identifier."
226+
msgstr ""
227+
"``the_geom`` är den geometri som beaktas för den specifika "
228+
"vertexidentifieraren."
229+
230+
#: ../../build/docs/advanced/chapter-12.rst:161
231+
msgid "``source`` and ``target`` from the ``planet_osm_roads`` correspond to an ``id`` in ``planet_osm_roads_vertices_pgr`` table"
232+
msgstr ""
233+
"``källa`` och ``mål`` från ``planet_osm_roads`` motsvarar ett ``id`` i "
234+
"``planet_osm_roads_vertices_pgr``-tabellen"
235+
236+
#: ../../build/docs/advanced/chapter-12.rst:163
237+
msgid "Additional columns are for analyzing the topology."
238+
msgstr "Ytterligare kolumner är till för att analysera topologin."
239+
240+
#: ../../build/docs/advanced/chapter-12.rst:165
241+
msgid "Now we are ready for our first routing query with `pgr_dijkstra <https://docs.pgrouting.org/latest/en/pgr_dijkstra.html>`__ or any other pgRouting query."
242+
msgstr ""
243+
"Nu är vi redo för vår första routingfråga med `pgr_dijkstra <https://docs."
244+
"pgrouting.org/latest/en/pgr_dijkstra.html>`__ eller någon annan pgRouting-"
245+
"fråga."
246+
247+
#: ../../build/docs/advanced/chapter-12.rst:172
248+
msgid "Analyze and Adjust the Routing Network Topology"
249+
msgstr "Analysera och justera topologin för routningsnätverket"
250+
251+
#: ../../build/docs/advanced/chapter-12.rst:174
252+
msgid "Analyzing the topology with `pgr_analyzeGraph <https://docs.pgrouting.org/latest/en/pgr_analyzeGraph.html>`_:"
253+
msgstr ""
254+
"Analysera topologin med `pgr_analyzeGraph <https://docs.pgrouting.org/latest/"
255+
"en/pgr_analyzeGraph.html>`_:"
256+
257+
#: ../../build/docs/advanced/chapter-12.rst:181
258+
msgid "Adjusting the topology is not an easy task:"
259+
msgstr "Att justera topologin är inte en lätt uppgift:"
260+
261+
#: ../../build/docs/advanced/chapter-12.rst:183
262+
msgid "Is an isolated segment an error in the data?"
263+
msgstr "Är ett isolerat segment ett fel i datan?"
264+
265+
#: ../../build/docs/advanced/chapter-12.rst:184
266+
msgid "Is an isolated segment because its on the edge of the bounding box?"
267+
msgstr ""
268+
"Är det ett isolerat segment eftersom det ligger på kanten av den avgränsande "
269+
"rutan?"
270+
271+
#: ../../build/docs/advanced/chapter-12.rst:185
272+
msgid "Do the potential gaps found near dead ends because the tolerance was too small?"
273+
msgstr ""
274+
"Beror de potentiella luckor som finns nära återvändsgränder på att "
275+
"toleransen var för liten?"
276+
277+
#: ../../build/docs/advanced/chapter-12.rst:187
278+
msgid "Are the intersections real intersections and need to be nodded?"
279+
msgstr "Är korsningarna riktiga korsningar och behöver de nickas till?"
280+
281+
#: ../../build/docs/advanced/chapter-12.rst:188
282+
msgid "Are the intersections bridges or tunnels and do not need to be nodded?"
283+
msgstr "Är korsningarna broar eller tunnlar och behöver inte nickas?"
284+
285+
#: ../../build/docs/advanced/chapter-12.rst:190
286+
msgid "Depending on the application some adjustments need to be made."
287+
msgstr "Beroende på tillämpning måste vissa justeringar göras."
288+
289+
#: ../../build/docs/advanced/chapter-12.rst:192
290+
msgid "Some `topology manipulation <https://docs.pgrouting.org/latest/en/topology-functions.html>`_ functions help to detect and fix some of the topological errors in the data."
291+
msgstr ""
292+
"Vissa funktioner för topologimanipulation <https://docs.pgrouting.org/latest/"
293+
"en/topology-functions.html>`_ hjälper till att upptäcka och åtgärda vissa "
294+
"topologiska fel i data."

0 commit comments

Comments
 (0)