[FIX]

README.md

@@ -40,4 +40,6 @@ Pajares, E.; Muñoz Nieto, R.; Meng, L.; Wulfhorst, G. Population Disaggregation
 
 Pajares, E., Jehle, U., 2021. GOAT: Ein interaktives Erreichbarkeitsinstrument zur Planung der 15-Minuten-Stadt, in: Flächennutzungsmonitoring XIII: Flächenpolitik - Konzepte - Analysen - Tools, IÖR Schriften. Rhombos-Verlag, Berlin, pp. 265–273. https://doi.org/10.26084/13dfns-p024
 
+Pajares, E., Jehle, U., Hall, J., Miramontes, M., Wulfhorst, G., 2022. Assessment of the usefulness of the accessibility instrument GOAT for the planning practice. Journal of Urban Mobility 2, 100033. https://doi.org/10.1016/j.urbmob.2022.100033
+
 Jehle, U., Pajares, E., Analyse der Fußwegequalitäten zu Schulen – Entwicklung von Indikatoren auf Basis von OpenData. In: Meinel, G.; Krüger, T.; Behnisch, M.; Ehrhardt, D. (Hrsg.): Flächennutzungsmonitoring XIII: Flächenpolitik - Konzepte - Analysen - Tools. Berlin: Rhombos-Verlag, 2021, (IÖR-Schriften Band 79), S.221-232, https://doi.org/10.26084/13dfns-p020

app/api/src/endpoints/v1/api.py

@@ -18,13 +18,15 @@
     static_layers,
     static_layers_extra,
     study_area,
+    system,
     upload,
     users,
     utils,
 )
 
 api_router = APIRouter()
 api_router.include_router(login.router, tags=["Login"])
+api_router.include_router(system.router, prefix="", tags=["Health Check"])
 
 api_router.include_router(organizations.router, prefix="/organizations", tags=["Organizations"])
 api_router.include_router(roles.router, prefix="/roles", tags=["Roles"])

app/api/src/endpoints/v1/system.py

@@ -0,0 +1,25 @@
+from typing import Any, List
+
+from fastapi import APIRouter, Depends, HTTPException
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from src import crud
+from src.db import models
+from src.endpoints import deps
+from src.schemas.system import SystemStatusModel
+
+router = APIRouter()
+
+
+@router.put("/status", response_model=SystemStatusModel)
+async def status_check(
+    status_in: SystemStatusModel,
+    db: AsyncSession = Depends(deps.get_db),
+    current_user: models.User = Depends(deps.get_current_active_superuser),
+):
+    results = await crud.system.get_by_key(db, key="type", value="status")
+    system = results[0]
+    system.setting = status_in.dict()
+    system = await crud.system.update(db, db_obj=system, obj_in=system)
+
+    return system.setting

app/api/src/main.py

@@ -65,7 +65,7 @@ async def startup_event():
     async with async_session() as db:
         table_index = await crud.layer.table_index(db)
         app.state.table_catalog = table_index
-        
+
     if not os.environ.get("DISABLE_NUMBA_STARTUP_CALL") == "True":
         await run_time_method_calls.call_isochrones_startup(app=app)
 
@@ -99,7 +99,7 @@ async def status_check(db: AsyncSession = Depends(deps.get_db)):
     except Exception as e:
         return JSONResponse(status_code=503, content={"message": "Service Unavailable"})
 
-    if results.setting["status"] == "maintenance":
+    if results.setting.get("status") == "maintenance":
         return JSONResponse(status_code=503, content={"message": "Service Unavailable"})
     else:
         return {"status": "ok"}

app/api/src/resources/enums.py

@@ -181,3 +181,8 @@ class LayerGroupsEnum(str, Enum):
 class GeostoreType(str, Enum):
     geoadmin = "geoadmin"
     other = "other"
+
+
+class SystemStatus(str, Enum):
+    maintenance = "maintenance"
+    running = "running"

app/api/src/schemas/system.py

@@ -0,0 +1,7 @@
+from lib2to3.pytree import Base
+from pydantic import BaseModel
+from src.resources.enums import SystemStatus
+
+
+class SystemStatusModel(BaseModel):
+    status: SystemStatus

app/client/src/components/isochrones/IsochroneThematicData.vue

@@ -69,7 +69,12 @@
                       };`
                     "
                   ></div>
-                  <span>Isochrone {{ selectedCalculations[0].id }}</span>
+                  <span
+                    >Isochrone
+                    {{
+                      getCurrentIsochroneNumber(selectedCalculations[0])
+                    }}</span
+                  >
                   <div
                     class="ml-6 mr-2 colorPalettePicker"
                     :style="
@@ -78,7 +83,12 @@
                       };`
                     "
                   ></div>
-                  <span>Isochrone {{ selectedCalculations[1].id }}</span>
+                  <span
+                    >Isochrone
+                    {{
+                      getCurrentIsochroneNumber(selectedCalculations[1])
+                    }}</span
+                  >
                 </template>
                 <v-spacer></v-spacer>
                 <v-btn-toggle
@@ -235,6 +245,10 @@ import { saveAs } from "file-saver";
 import { debounce, numberSeparator } from "../../utils/Helpers";
 import ApiService from "../../services/api.service";
 import JSZip from "jszip";
+import {
+  calculateCalculationsLength,
+  calculateCurrentIndex
+} from "../../utils/Helpers";
 export default {
   components: {
     IsochroneAmenitiesLineChart,
@@ -394,6 +408,9 @@ export default {
             timeout: 10000
           });
         });
+    },
+    getCurrentIsochroneNumber(calc) {
+      return calculateCalculationsLength() - calculateCurrentIndex(calc);
     }
   },
   computed: {

app/client/src/components/isochrones/Isochrones.vue

@@ -758,10 +758,7 @@
                         style="font-size: 12px"
                         class="white--text fa-stack-1x mb-1"
                       >
-                        {{
-                          calculateCalculationsLength() -
-                            calculateCurrentIndex(calculation)
-                        }}
+                        {{ getCurrentIsochroneNumber(calculation) }}
                       </strong>
                     </span>
                     <v-tooltip
@@ -815,7 +812,11 @@ import { mapGetters, mapMutations } from "vuex";
 import { mapFields } from "vuex-map-fields";
 
 //Helpers
-import { secondsToHoursAndMins } from "../../utils/Helpers";
+import {
+  secondsToHoursAndMins,
+  calculateCalculationsLength,
+  calculateCurrentIndex
+} from "../../utils/Helpers";
 
 //Ol imports
 import VectorSource from "ol/source/Vector";
@@ -1714,9 +1715,9 @@ export default {
               time = [calculation.rawData.get(x, y, depthIndex)];
             }
             if (time) {
-              overlayerInnerHtml += `<div>#${calculationId} ${this.$t(
-                "isochrones.options.time"
-              )}: ${time} min</div>`;
+              overlayerInnerHtml += `<div>#${this.getCurrentIsochroneNumber(
+                calculation
+              )} ${this.$t("isochrones.options.time")}: ${time} min</div>`;
             }
             if (features.length === 2 && index == 0) {
               overlayerInnerHtml += `<br>`;
@@ -2003,17 +2004,8 @@ export default {
       this.clear();
     },
     //! Clculate the real length of the calculations array
-    calculateCalculationsLength() {
-      let realArr = this.calculations.filter(
-        calculation => calculation !== "deleted"
-      );
-      return realArr.length;
-    },
-    calculateCurrentIndex(calc) {
-      let realArr = this.calculations.filter(
-        calculation => calculation !== "deleted"
-      );
-      return realArr.indexOf(calc);
+    getCurrentIsochroneNumber(calc) {
+      return calculateCalculationsLength() - calculateCurrentIndex(calc);
     }
   },
   watch: {

app/client/src/utils/Helpers.js

@@ -273,3 +273,9 @@ export function calculateRealCalculations() {
   );
   return realArr;
 }
+export function calculateCurrentIndex(calc) {
+  let realArr = store.state.isochrones.calculations.filter(
+    calculation => calculation !== "deleted"
+  );
+  return realArr.indexOf(calc);
+}