Only send charge and id. Re-create EVs on receive

Signed-off-by: Janek Laudan <laudan@simunto.com>

Author: Janekdererste

contribs/ev/src/main/java/org/matsim/contrib/ev/fleet/DistributedElectricFleet.java

@@ -89,7 +89,7 @@ public boolean hasVehicle(Id<Vehicle> vehicleId) {
 	public void onVehicleLeavesPartition(DistributedMobsimVehicle vehicle, int toPartition) {
 		if (electricVehicles.containsKey(vehicle.getId())) {
 			var ev = electricVehicles.remove(vehicle.getId());
-			partitionTransfer.collect(new ElectricVehicleMessage(ev.getVehicleSpecification(), ev.getBattery()), toPartition);
+			partitionTransfer.collect(new ElectricVehicleMessage(ev.getId(), ev.getBattery().getCharge()), toPartition);
 		}
 	}
 
@@ -107,16 +107,19 @@ private void handleMessages(List<Message> messages, double now) {
 		for (var m : messages) {
 			// SAFETY: we have only registered ElectricVehicleMessage.class as the message type to receive.
 			ElectricVehicleMessage evMessage = (ElectricVehicleMessage) m;
-			var id = evMessage.spec.getMatsimVehicle().getId();
+			var id = evMessage.vehicleId;
 
 			if (electricVehicles.containsKey(id)) {
 				throw new IllegalStateException("Received ElectricVehicleMessage for vehicle " + id + ". We already have" +
 					" this vehicle in the fleet. This indicates, that some component has queried the fleet for this vehicle, even though no corresponding" +
 					" MobsimVehicle is present on this partition. This is most probably a programming bug.");
 			}
-			// TODO When recreating the vehicle some attributes from the engine information are looked up. I guess we can send those in the message
-			// directly.
-			var ev = ElectricFleetUtils.create(evMessage.spec(), driveEnergyConsumptionFactory, auxEnergyConsumptionFactory, chargingPowerFactory);
+
+			var vehicle = scenarioVehicles.getVehicles().get(id);
+			var spec = new ElectricVehicleSpecificationDefaultImpl(vehicle);
+			var ev = ElectricFleetUtils.create(spec, driveEnergyConsumptionFactory, auxEnergyConsumptionFactory, chargingPowerFactory);
+			ev.getBattery().setCharge(evMessage.charge);
+
 			electricVehicles.put(ev.getId(), ev);
 		}
 	}
@@ -134,5 +137,5 @@ private boolean isElectricVehicle(String hbefaTechnology) {
 	/**
 	 * The state of the ev actually is the specification and the battery, which contains the charging state.
 	 */
-	public record ElectricVehicleMessage(ElectricVehicleSpecification spec, Battery battery) implements Message {}
+	public record ElectricVehicleMessage(Id<Vehicle> vehicleId, double charge) implements Message {}
 }