Merge pull request #44 from nihar1024/main

Minor bug fix
goat-community · Sep 4, 2024 · fb4d276 · fb4d276
2 parents 897df4f + a5ca5a0
commit fb4d276
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/src/crud/crud_catchment_area.py b/src/crud/crud_catchment_area.py
@@ -308,8 +308,8 @@ async def catchment_area(
             ),
             "layer_id": str(layer_id),
             "scenario_id": str(params.scenario_id) if params.scenario_id else None,
-            "street_network_edge_layer_project_id": params.street_network_edge_layer_project_id,
-            "street_network_node_layer_project_id": params.street_network_node_layer_project_id,
+            "street_network_edge_layer_project_id": params.layer_project_id_street_network_edge,
+            "street_network_node_layer_project_id": params.layer_project_id_street_network_node,
         }
 
         await call_routing_endpoint(
@@ -660,8 +660,8 @@ async def catchment_area(
             ),
             "layer_id": str(layer_id),
             "scenario_id": str(params.scenario_id) if params.scenario_id else None,
-            "street_network_edge_layer_project_id": params.street_network_edge_layer_project_id,
-            "street_network_node_layer_project_id": params.street_network_node_layer_project_id,
+            "street_network_edge_layer_project_id": params.layer_project_id_street_network_edge,
+            "street_network_node_layer_project_id": params.layer_project_id_street_network_node,
         }
 
         await call_routing_endpoint(

diff --git a/src/crud/crud_nearby_station_access.py b/src/crud/crud_nearby_station_access.py
@@ -78,6 +78,8 @@ async def nearby_station_access(self, params: INearbyStationAccess):
             catchment_area_type=CatchmentAreaTypeActiveMobility.polygon,
             polygon_difference=True,
             scenario_id=params.scenario_id,
+            layer_project_id_street_network_edge=params.layer_project_id_street_network_edge,
+            layer_project_id_street_network_node=params.layer_project_id_street_network_node,
         )
 
         # Compute catchment area

diff --git a/src/schemas/catchment_area.py b/src/schemas/catchment_area.py
@@ -279,12 +279,12 @@ class ICatchmentAreaActiveMobility(BaseModel):
         title="Scenario ID",
         description="The ID of the scenario that is to be applied on the input layer or base network.",
     )
-    street_network_edge_layer_project_id: Optional[int] = Field(
+    layer_project_id_street_network_edge: Optional[int] = Field(
         default=settings.STREET_NETWORK_EDGE_DEFAULT_LAYER_PROJECT_ID,
         title="Street Network Edge Layer Project ID",
         description="The layer project ID of the street network edge layer.",
     )
-    street_network_node_layer_project_id: Optional[int] = Field(
+    layer_project_id_street_network_node: Optional[int] = Field(
         default=settings.STREET_NETWORK_NODE_DEFAULT_LAYER_PROJECT_ID,
         title="Street Network Node Layer Project ID",
         description="The layer project ID of the street network node layer.",
@@ -481,12 +481,12 @@ class ICatchmentAreaCar(BaseModel):
         title="Scenario ID",
         description="The ID of the scenario that is to be applied on the input layer or base network.",
     )
-    street_network_edge_layer_project_id: Optional[int] = Field(
+    layer_project_id_street_network_edge: Optional[int] = Field(
         default=settings.STREET_NETWORK_EDGE_DEFAULT_LAYER_PROJECT_ID,
         title="Street Network Edge Layer Project ID",
         description="The layer project ID of the street network edge layer.",
     )
-    street_network_node_layer_project_id: Optional[int] = Field(
+    layer_project_id_street_network_node: Optional[int] = Field(
         default=settings.STREET_NETWORK_NODE_DEFAULT_LAYER_PROJECT_ID,
         title="Street Network Node Layer Project ID",
         description="The layer project ID of the street network node layer.",
@@ -578,6 +578,16 @@ class CatchmentAreaNearbyStationAccess(BaseModel):
         title="Scenario ID",
         description="The ID of the scenario that is to be applied on the input layer or base network.",
     )
+    layer_project_id_street_network_edge: int = Field(
+        ...,
+        title="Street Network Edge Layer Project ID",
+        description="The layer project ID of the street network edge layer.",
+    )
+    layer_project_id_street_network_node: int = Field(
+        ...,
+        title="Street Network Node Layer Project ID",
+        description="The layer project ID of the street network node layer.",
+    )
     catchment_area_type: CatchmentAreaTypeActiveMobility = Field(
         ...,
         title="Return Type",

diff --git a/src/schemas/nearby_station_access.py b/src/schemas/nearby_station_access.py
@@ -1,8 +1,9 @@
-from typing import List
+from typing import List, Optional
 from uuid import UUID
 
 from pydantic import BaseModel, Field
 
+from src.core.config import settings
 from src.schemas.catchment_area import (
     CatchmentAreaRoutingModeActiveMobility,
     CatchmentAreaRoutingModePT,
@@ -64,6 +65,16 @@ class INearbyStationAccess(BaseModel):
         title="Scenario ID",
         description="The ID of the scenario that is to be applied on the input layer or base network.",
     )
+    layer_project_id_street_network_edge: Optional[int] = Field(
+        default=settings.STREET_NETWORK_EDGE_DEFAULT_LAYER_PROJECT_ID,
+        title="Street Network Edge Layer Project ID",
+        description="The layer project ID of the street network edge layer.",
+    )
+    layer_project_id_street_network_node: Optional[int] = Field(
+        default=settings.STREET_NETWORK_NODE_DEFAULT_LAYER_PROJECT_ID,
+        title="Street Network Node Layer Project ID",
+        description="The layer project ID of the street network node layer.",
+    )
 
     @property
     def tool_type(self):