From 0ee91ce9d68c38b11e471b7be59c590f5420fda6 Mon Sep 17 00:00:00 2001
From: Kai Martins-Turner <martins-turner@vsp.tu-berlin.de>
Date: Mon, 4 Mar 2024 10:36:41 +0100
Subject: [PATCH] Fix (wrong) usage of technology and EmConcept

---
 .../contrib/emissions/EmissionUtils.java      | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/contribs/emissions/src/main/java/org/matsim/contrib/emissions/EmissionUtils.java b/contribs/emissions/src/main/java/org/matsim/contrib/emissions/EmissionUtils.java
index a24186833db..2c5e6ddcc31 100644
--- a/contribs/emissions/src/main/java/org/matsim/contrib/emissions/EmissionUtils.java
+++ b/contribs/emissions/src/main/java/org/matsim/contrib/emissions/EmissionUtils.java
@@ -97,7 +97,7 @@ public static Map<Id<Person>, SortedMap<Pollutant, Double>> setNonCalculatedEmis
 				for (Pollutant pollutant : pollutants) {
 					emissionType2Value.put(pollutant, 0.0);
 				}
-			} else { // person in map, but some emissions are not set; setting these to 0.0 
+			} else { // person in map, but some emissions are not set; setting these to 0.0
 				emissionType2Value = totalEmissions.get(personId);
 				for (Pollutant pollutant : emissionType2Value.keySet()) {
 					// else do nothing
@@ -395,48 +395,48 @@ static HbefaVehicleAttributes tryRewriteHbefa3toHbefa4(Tuple<HbefaVehicleCategor
 		HbefaVehicleAttributes attribs2 = new HbefaVehicleAttributes();
 
 		// technology is copied:
-		attribs2.setHbefaTechnology(vehicleInformationTuple.getSecond().getHbefaTechnology());
+		attribs2.setHbefaEmConcept(vehicleInformationTuple.getSecond().getHbefaEmConcept());
 
 		// size class is "not specified":
 		attribs2.setHbefaSizeClass("not specified");
 
-		// em concept is re-written with different dashes:
-		switch (vehicleInformationTuple.getSecond().getHbefaEmConcept()) {
+		// technology is re-written with different dashes:
+		switch (vehicleInformationTuple.getSecond().getHbefaTechnology()) {
 			case "PC-P-Euro-1":
-				attribs2.setHbefaEmConcept("PC P Euro-1");
+				attribs2.setHbefaTechnology("PC P Euro-1");
 				break;
 			case "PC-P-Euro-2":
-				attribs2.setHbefaEmConcept("PC P Euro-2");
+				attribs2.setHbefaTechnology("PC P Euro-2");
 				break;
 			case "PC-P-Euro-3":
-				attribs2.setHbefaEmConcept("PC P Euro-3");
+				attribs2.setHbefaTechnology("PC P Euro-3");
 				break;
 			case "PC-P-Euro-4":
-				attribs2.setHbefaEmConcept("PC P Euro-4");
+				attribs2.setHbefaTechnology("PC P Euro-4");
 				break;
 			case "PC-P-Euro-5":
-				attribs2.setHbefaEmConcept("PC P Euro-5");
+				attribs2.setHbefaTechnology("PC P Euro-5");
 				break;
 			case "PC-P-Euro-6":
-				attribs2.setHbefaEmConcept("PC P Euro-6");
+				attribs2.setHbefaTechnology("PC P Euro-6");
 				break;
 			case "PC-D-Euro-1":
-				attribs2.setHbefaEmConcept("PC D Euro-1");
+				attribs2.setHbefaTechnology("PC D Euro-1");
 				break;
 			case "PC-D-Euro-2":
-				attribs2.setHbefaEmConcept("PC D Euro-2");
+				attribs2.setHbefaTechnology("PC D Euro-2");
 				break;
 			case "PC-D-Euro-3":
-				attribs2.setHbefaEmConcept("PC D Euro-3");
+				attribs2.setHbefaTechnology("PC D Euro-3");
 				break;
 			case "PC-D-Euro-4":
-				attribs2.setHbefaEmConcept("PC D Euro-4");
+				attribs2.setHbefaTechnology("PC D Euro-4");
 				break;
 			case "PC-D-Euro-5":
-				attribs2.setHbefaEmConcept("PC D Euro-5");
+				attribs2.setHbefaTechnology("PC D Euro-5");
 				break;
 			case "PC-D-Euro-6":
-				attribs2.setHbefaEmConcept("PC D Euro-6");
+				attribs2.setHbefaTechnology("PC D Euro-6");
 				break;
 		}
 		return attribs2;