Merge pull request #454 from cevi/dev

Fix bug #453
cevi · Aug 3, 2024 · 6b98879 · 6b98879
2 parents 08da580 + f3d9b14
commit 6b98879
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml
@@ -30,7 +30,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: 🏗️ Build the stack
-        run: docker-compose -f docker-compose.yml -f docker-compose.prod-dev.yml build
+        run: docker compose -f docker-compose.yml -f docker-compose.prod-dev.yml build
 
       - name: 🚀 Push containers to registry
-        run: docker-compose -f docker-compose.yml -f docker-compose.prod-dev.yml push
+        run: docker compose -f docker-compose.yml -f docker-compose.prod-dev.yml push
diff --git a/.github/workflows/prod_build.yml b/.github/workflows/prod_build.yml
@@ -30,7 +30,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: 🏗️ Build the stack
-        run: docker-compose -f docker-compose.yml -f docker-compose.prod-latest.yml build
+        run: docker compose -f docker-compose.yml -f docker-compose.prod-latest.yml build
 
       - name: 🚀 Push containers to registry
-        run: docker-compose -f docker-compose.yml -f docker-compose.prod-latest.yml push
+        run: docker compose -f docker-compose.yml -f docker-compose.prod-latest.yml push
diff --git a/backend/app.py b/backend/app.py
@@ -124,7 +124,7 @@ def create_walk_time_table():
                 mimetype="application/json",
             )
 
-        # Decode options['route'] form polyline
+        # Decode options['route'] for polyline
         if "encoding" in options and options["encoding"] == "polyline":
             start = time.time()
 
@@ -295,7 +295,8 @@ def create_export(options, uuid):
         options["output_directory"] = output_directory
 
         options["settings"]["create_elevation_profile"] = True
-        options["settings"]["name_points_in_export"] = True
+        if "name_points_in_export" not in options["settings"]:
+            options["settings"]["name_points_in_export"] = True
 
         logger.info("OPTIONS:" + str(options))
 

diff --git a/backend/automatic_walk_time_tables/generator.py b/backend/automatic_walk_time_tables/generator.py
@@ -49,6 +49,9 @@ def __init__(
         if manual_mode:
             return
 
+        # TODO: drop the next few lines, as we are only supporting calling this Generator from within the backend app.
+        # and there, we hardcoded manual_mode = True
+
         if "file_type" not in options or options["file_type"] is None:
             raise Exception("No file ending provided.")
 

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "automatic-walk-time-tables",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "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/swiss_TLM_api/swiss_TML_api/map_numbers/map_numbers_fetcher.py b/swiss_TLM_api/swiss_TML_api/map_numbers/map_numbers_fetcher.py
@@ -29,9 +29,15 @@ def __init__(self, force_rebuild=False):
             return
 
         # try to load the index
-        if not os.path.isfile(self.index_file_path + ".dat"):
+        try:
+            if not os.path.isfile(self.index_file_path + ".dat"):
+                self.__download_map_numbers()
+            self.index = RTreeIndex(self.index_file_path)
+        except:
+            # if anything crashes somehow, redownload and recreate the index
+            logger.info("Map numbers index was corrupt - rebuilding.")
             self.__download_map_numbers()
-        self.index = RTreeIndex(self.index_file_path)
+            self.index = RTreeIndex(self.index_file_path)
 
         end = time.time()
         logger.info("Map numbers index loaded (after {}s)".format(str(end - start)))