eflips-depot 4.6.4__tar.gz → 4.6.5__tar.gz

{eflips_depot-4.6.4 → eflips_depot-4.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.6.4
+Version: 4.6.5
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 Author: Enrico Lauth

{eflips_depot-4.6.4 → eflips_depot-4.6.5}/eflips/depot/api/__init__.py

@@ -794,6 +794,10 @@ def init_simulation(
         if "None" in vehicle_types_for_depot:
             vehicle_types_for_depot.remove("None")
 
+        # In this case, all types are allowed
+        if len(vehicle_types_for_depot) == 0:
+            vehicle_types_for_depot = set([str(vt.id) for vt in scenario.vehicle_types])
+
         # If we have a vehicle count dictionary, we validate and use ir
         if vehicle_count_dict is not None and depot_id in vehicle_count_dict.keys():
             if set(vehicle_count_dict[depot_id].keys()) < vehicle_types_for_depot:
@@ -809,8 +813,11 @@ def init_simulation(
             for vehicle_type in vehicle_types_for_depot:
                 vehicle_count = 0
                 for area in depot.areas:
-                    if area.vehicle_type_id == int(vehicle_type):
-                        # TODO potential edit if we make vehicle type of an area a list
+                    if (
+                        area.vehicle_type_id == int(vehicle_type)
+                        or area.vehicle_type_id is None
+                    ):
+                        # The areas allow either one type, or all vehicle types
                         for p in area.processes:
                             if p.electric_power is not None and p.duration is None:
                                 vehicle_count += area.capacity

{eflips_depot-4.6.4 → eflips_depot-4.6.5}/eflips/depot/api/private/depot.py

@@ -111,7 +111,13 @@ def depot_to_template(depot: Depot) -> Dict[str, str | Dict[str, str | int]]:
             }
         else:
             # If the vehicle type id is not set, the area is for all vehicle types
-            template["areas"][area_name]["entry_filter"] = dict()
+            scenario = depot.scenario
+            all_vehicle_type_ids = [str(vt.id) for vt in scenario.vehicle_types]
+
+            template["areas"][area_name]["entry_filter"] = {
+                "filter_names": ["vehicle_type"],
+                "vehicle_types": all_vehicle_type_ids,
+            }
 
         for process in area.processes:
             # Add process into process list

{eflips_depot-4.6.4 → eflips_depot-4.6.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eflips-depot"
-version = "4.6.4"
+version = "4.6.5"
 description = "Depot Simulation for eFLIPS"
 authors = ["Enrico Lauth <enrico.lauth@tu-berlin.de>",
     "Ludger Heide <ludger.heide@tu-berlin.de",