Use SimulationObserver to close connection to SUMO

src/de/tud/kom/p2psim/impl/topology/movement/vehicular/sumo/simulation/controller/traci/TraciSimulationController.java

@@ -14,6 +14,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import de.tud.kom.p2psim.api.simengine.SimulatorObserver;
 import de.tud.kom.p2psim.impl.simengine.Simulator;
 import de.tudarmstadt.maki.simonstrator.api.Event;
 import de.tudarmstadt.maki.simonstrator.api.EventHandler;
@@ -46,7 +47,7 @@ import de.tudresden.ws.container.SumoPosition2D;
 import de.tudresden.ws.container.SumoStringList;
 import it.polito.appeal.traci.SumoTraciConnection;
 
-public class TraciSimulationController implements VehicleController, SimulationSetupExtractor, EdgeController {
+public class TraciSimulationController implements VehicleController, SimulationSetupExtractor, EdgeController, SimulatorObserver {
 	private static final File TEMP_FILE = new File(new File(System.getProperty("java.io.tmpdir")), "road_network.tmp");
 
 	private List<RoadNetworkEdge> modifiedEdges = new ArrayList<>();
@@ -129,14 +130,17 @@ public class TraciSimulationController implements VehicleController, SimulationS
 			Runtime.getRuntime().addShutdownHook(new Thread(shutdownHook));
 
 			_initalized = true;
-			
-			Event.scheduleWithDelay(Simulator.getEndTime()-Simulator.getCurrentTime(), new EventHandler() {
-				
-				@Override
-				public void eventOccurred(Object content, int type) {
-					_connection.close();
-				}
-			}, null, 0);
+		}
+	}
+	
+	@Override
+	public void simulationFinished() {
+		/*
+		 * This is called by the simulation scheduler once the simulation is
+		 * finished - it should be used to terminate the connection to SUMO.
+		 */
+		if (_connection != null && !_connection.isClosed()) {
+			_connection.close();
 		}
 	}