fix: service vehicle depot was fetch at wrong place during input gene…

…ration (#83)

starling_sim/basemodel/agent/vehicles/service_vehicle.py

@@ -65,28 +65,24 @@ def __init__(
         depot=None,
         **kwargs
     ):
-        operator = simulation_model.agentPopulation.get_agent(operator_id)
-        # place service vehicles at depot if provided
-        if depot is not None:
-            depot = operator.depotPoints[depot]
-            origin = depot.position
-
         super().__init__(simulation_model, agent_id, origin, seats, **kwargs)
 
+        # service operator, managing the fleet
+        self.operator = simulation_model.agentPopulation.get_agent(operator_id)
+
         # list of trip ids to be realised by the service vehicle (chronological order)
         self.tripList = None
 
         # id of the trip realised by the service vehicle, used to match user stops
         self.tripId = trip_id
 
-        # vehicle depot
-        self.depot = depot
-
         # halt duration while processing a stop
         self.dwellTime = dwell_time
 
-        # service operator, managing the fleet
-        self.operator = operator
+        # vehicle depot
+        if depot is not None:
+            depot = self.operator.depotPoints[depot]
+        self.depot = depot
 
         # planning of the service vehicle, consists in a list of Stop objects
         self.planning = []

starling_sim/basemodel/input/dynamic_input.py

@@ -632,6 +632,11 @@ def add_key_operator(self, input_dict):
         # get the operator
         operator = self.sim.agentPopulation.get_agent(operator_id)
 
+        # get position from eventual depot
+        if "depot" in input_dict:
+            depot = operator.depotPoints[input_dict["depot"]]
+            input_dict["origin"] = depot.position
+
         populations = [input_dict["agent_type"]]
         if "population" in input_dict:
             populations.append(input_dict["population"])