Minor Update: Circular Paths & updates (#204)

maede97 · dependabot[bot] · wp99cp · web-flow · commit 70ba73b40326 · 2023-11-05T13:20:38.000+01:00
* Update index.html (#197) Translate the english title to german (short variant instead of "Automatisierte Marschzeittabellen") * Bump socket.io-parser from 4.2.2 to 4.2.4 in /frontend (#195) Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.2.2 to 4.2.4. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](socketio/socket.io-parser@4.2.2...4.2.4) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Cyrill Püntener <34008738+wp99cp@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump vite from 3.2.4 to 3.2.7 in /docs (#194) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 3.2.4 to 3.2.7. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v3.2.7/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v3.2.7/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Cyrill Püntener <34008738+wp99cp@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update Readme.md (#198) Add german dev notes to readme Co-authored-by: Cyrill Püntener <34008738+wp99cp@users.noreply.github.com> * Fix Issue 138 & Cypress ENV (#199) * Fix issue 138 * fix cypress env var * Bump pillow from 9.3.0 to 10.0.1 in /swiss_TLM_api (#203) * add parser for circular kml files (#200) * bump version * Bump postcss from 8.4.19 to 8.4.31 in /docs (#208) Bumps [postcss](https://github.com/postcss/postcss) from 8.4.19 to 8.4.31. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.4.19...8.4.31) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Cyrill Püntener <34008738+wp99cp@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pillow from 9.3.0 to 10.0.1 in /swiss_TLM_api (#205) Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.3.0 to 10.0.1. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](python-pillow/Pillow@9.3.0...10.0.1) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Cyrill Püntener <34008738+wp99cp@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix bugs in name_index creator * fix naming in bodenbedeckungen * update changelog --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cyrill Püntener <34008738+wp99cp@users.noreply.github.com>
diff --git a/.env.ci-testing b/.env.ci-testing
@@ -3,6 +3,8 @@ ANGULAR_BUILD_MODE=dev
 BACKEND_DOMAIN=http://awt-backend:5000
 DOCS_DOMAIN=http://awt-docs:4000
 FRONTEND_DOMAIN=http://awt-frontend
+PRINT_API_BASE_URL=awt-mapfish-print-server
+CYPRESS_BASE_URL=http://awt-frontend
 
 # Configures the logging level for the backend
 # valid values are DEBUG, INFO, WARNING, ERROR or CRITICAL
diff --git a/.env.local-dev b/.env.local-dev
@@ -3,6 +3,7 @@ ANGULAR_BUILD_MODE=dev
 BACKEND_DOMAIN=http://localhost:5000
 DOCS_DOMAIN=http://localhost:4000
 FRONTEND_DOMAIN=http://localhost
+PRINT_API_BASE_URL=awt-mapfish-print-server
 
 # Configures the logging level for the backend
 # valid values are DEBUG, INFO, WARNING, ERROR or CRITICAL
diff --git a/.env.prod-dev b/.env.prod-dev
@@ -3,6 +3,7 @@ ANGULAR_BUILD_MODE=dev
 BACKEND_DOMAIN=https://backend.dev.map.cevi.tools/
 DOCS_DOMAIN=http://docs.dev.map.cevi.tools
 FRONTEND_DOMAIN=https://dev.map.cevi.tools
+PRINT_API_BASE_URL=awt-mapfish-print-server
 
 # Configures the logging level for the backend
 # valid values are DEBUG, INFO, WARNING, ERROR or CRITICAL
diff --git a/.env.prod-latest b/.env.prod-latest
@@ -3,6 +3,7 @@ ANGULAR_BUILD_MODE=production
 BACKEND_DOMAIN=https://backend.map.cevi.tools
 DOCS_DOMAIN=http://docs.map.cevi.tools
 FRONTEND_DOMAIN=https://map.cevi.tools
+PRINT_API_BASE_URL=awt-mapfish-print-server
 
 # Configures the logging level for the backend
 # valid values are DEBUG, INFO, WARNING, ERROR or CRITICAL
diff --git a/Readme.md b/Readme.md
@@ -53,6 +53,15 @@ Aktivität in keinerlei Hinsicht ersetzt!
 | Marschzeittabelle | Tabelle zum Abschätzen der Marschzeit einer Wanderung. Enthält oft auch Angaben zu Pausen und ein Höhenprofil. J+S empfehlt für jede Wanderung eine Marschzeittabelle zu erstellen. |
 | SchweizMobil      | Ermöglicht das Planen von Wanderungen und Velo-Touren der digitalen Landeskarte. Die magnetischen Wege beschleunigen den Prozess des Einzeichnens einer Route.                      |
 
+## Lokal ausführen und entwickeln
+Das Projekt ist Docker-basiert. Aus diesem Grund ist es ganz einfach, die Container zu builden:
+```
+docker-compose up [--build]
+```
+*Notiz:* `--build` ist optional und führt dazu, dass die Container neu gebuildet werden.
+
+Durchsuche auch die Dokumentation unter [Getting Started](https://docs.map.cevi.tools/) (momentan nur auf Englisch verfügbar). Die Dokumentation kann auch bei einer lokal laufenden Instanz unter folgender URL abgerufen werden: `localhost:4000` (bei laufenden Containern).
+
 # Generating J+S-Walk-Time-Tables
 
 The aim of this project is to automate and speed up the process of creating a J+S walk-time table for a hike or bike
@@ -81,4 +90,4 @@ docker-compose up [--build]
 *Note:* `--build` is optional and forces docker to rebuild the containers.
 
 Simply take a look at the documentation [Getting Started](https://docs.map.cevi.tools/). The docs can also be accessed
-from your local build by visiting `localhost:4000` (once the containers are running).
+from your local build by visiting `localhost:4000` (once the containers are running).
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -15,7 +15,5 @@ COPY . /app
 
 EXPOSE 5000
 
-ENV PRINT_API_BASE_URL=awt-mapfish-print-server
-
 # Entrypoint
 CMD gunicorn --bind :5000 --workers 1 --threads 2 --timeout 60 app:app
diff --git a/backend/automatic_walk_time_tables/path_transformers/pois_transfomer.py b/backend/automatic_walk_time_tables/path_transformers/pois_transfomer.py
@@ -39,8 +39,7 @@ def pois_from_distance_string(self, path: Path):
 
         index = 0
         for i, point in enumerate(path.way_points):
-
-            if point.accumulated_distance - int(poi_distances[index]) >= 0:
+            if point.accumulated_distance - int(float(poi_distances[index])) >= 0: # fix bug where poi_distances contained a non-int value
                 pois.append(point)
                 index += 1
 
diff --git a/backend/automatic_walk_time_tables/utils/file_parser.py b/backend/automatic_walk_time_tables/utils/file_parser.py
@@ -110,12 +110,25 @@ def parse_kml_file__(self, raw_data: str) -> path.Path:
         start_index = raw_data.find('<LineString>')
         end_index = raw_data.find('</LineString>')
 
+        is_circular = False
+
         # check if <LineString> and </LineString> are found
         if start_index == -1 or end_index == -1:
-            raise Exception('No <LineString> or </LineString> found')
-
-        # remove <LineString> and </LineString>
-        raw_data = raw_data[start_index + len('<LineString>'):end_index]
+            self.__logger.info('No <LineString> or </LineString> found --> circular path')
+            is_circular = True
+
+            # check for circular path
+            start_index = raw_data.find('<LinearRing>')
+            end_index = raw_data.find('</LinearRing>')
+
+            if start_index == -1 or end_index == -1:
+                raise Exception('No <LinearRing> or </LinearRing> found')
+            
+            # remove <LinearRing> and </LinearRing>
+            raw_data = raw_data[start_index + len('<LinearRing>'):end_index]
+        else:
+            # remove <LineString> and </LineString>
+            raw_data = raw_data[start_index + len('<LineString>'):end_index]
 
         # carve out contents of <coordinates>...</coordinates>
         start_index = raw_data.find('<coordinates>')
@@ -132,6 +145,10 @@ def parse_kml_file__(self, raw_data: str) -> path.Path:
         coordinates = [c.split(',') for c in coordinates]
         has_elevation = len(coordinates[0]) == 3
 
+        if is_circular:
+            # if circular, add the first point again in the end (close circuit)
+            coordinates.append(coordinates[0])
+
         self.__logger.debug("Loaded KML file with " + str(len(coordinates)) + " coordinates.")
 
         if not has_elevation:
diff --git a/backend/local-dev.Dockerfile b/backend/local-dev.Dockerfile
@@ -11,9 +11,9 @@ RUN pip install --no-cache-dir -r automatic_walk_time_tables/requirements.txt
 COPY ./requirements.txt /app
 RUN pip install --no-cache-dir -r requirements.txt
 
-EXPOSE 5000
+# no need to copy "." to /app (it is mounted by the docker-compose.yml file in the project root)
 
-ENV PRINT_API_BASE_URL=awt-mapfish-print-server
+EXPOSE 5000
 
 # Entrypoint
 CMD gunicorn --bind :5000 --workers 1 --threads 2 --timeout 60 --reload app:app
diff --git a/docker-compose.ci-testing.yml b/docker-compose.ci-testing.yml
@@ -10,9 +10,6 @@ services:
       awt-frontend:
         condition: service_healthy
 
-    environment:
-      - CYPRESS_baseUrl=http://awt-frontend
-
     entrypoint: cypress run --browser chrome
 
     # share the current folder as volume to avoid copying
diff --git a/docs/changelog/changelog.md b/docs/changelog/changelog.md
@@ -3,6 +3,7 @@
 A complete, technical changelog is available at [GitHub](https://github.com/cevi/automatic_walk-time_tables/releases).
 
 ## Version 3 - Interactive Exports
+- Circular Paths are now supported (3.3.2)
 - Interactive exports: modify the selected waypoints using points of interest (POI) (3.0.0)
 - Improved Documentation and Changelog (on this page) (3.0.0)
 - combine all maps in a single PDF file (3.0.0)
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/e2e/cypress/fixtures/circular_path.kml b/e2e/cypress/fixtures/circular_path.kml
@@ -0,0 +1 @@
+﻿<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:gx="http://www.google.com/kml/ext/2.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/kml/2.2 https://developers.google.com/kml/schema/kml22gx.xsd"><Document><name>Drawing</name><Placemark id="linepolygon_1696357404010"><ExtendedData><Data name="type"><value>linepolygon</value></Data></ExtendedData><description></description><Style><LineStyle><color>ff0000ff</color><width>3</width></LineStyle><PolyStyle><color>660000ff</color></PolyStyle></Style><Polygon><outerBoundaryIs><LinearRing><coordinates>8.519334366216832,47.2482035254704 8.525268069357907,47.24766197173129 8.526590179930674,47.25160749127756 8.517217003909689,47.251947469057576 8.519334366216832,47.2482035254704</coordinates></LinearRing></outerBoundaryIs></Polygon></Placemark></Document></kml>
diff --git a/e2e/cypress/fixtures/unsupported/map_loop.kml b/e2e/cypress/fixtures/unsupported/map_loop.kml
diff --git a/e2e/package.json b/e2e/package.json
@@ -1,7 +1,7 @@
 {
   "name": "e2e",
   "scripts": {
-    "cypress:open": "CYPRESS_baseUrl=http://localhost:80 npx cypress open"
+    "cypress:open": "CYPRESS_BASE_URL=http://localhost:80 npx cypress open"
   },
   "devDependencies": {
     "cypress-file-upload": "^5.0.8",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "automatic-walk-time-tables",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "scripts": {
     "ng": "ng",
     "start": "tsc set-env.ts && BACKEND_DOMAIN=http://localhost:5000 node set-env.js && angular-build-info && ng serve",
diff --git a/frontend/src/index.html b/frontend/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>AutomaticWalkTimeTables</title>
+  <title>Marschzeittabellen</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
diff --git a/swiss_TLM_api/app.py b/swiss_TLM_api/app.py
diff --git a/swiss_TLM_api/requirements.txt b/swiss_TLM_api/requirements.txt
diff --git a/swiss_TLM_api/swiss_TML_api/name_finding/index_builder/forest_borders.py b/swiss_TLM_api/swiss_TML_api/name_finding/index_builder/forest_borders.py
diff --git a/swiss_TLM_api/swiss_TML_api/name_finding/name_index.py b/swiss_TLM_api/swiss_TML_api/name_finding/name_index.py
