use the updates from matsim 14 emissions contrib

ile_de_france/src/main/java/org/eqasim/ile_de_france/IDFConfigurator.java

@@ -15,6 +15,8 @@
 public class IDFConfigurator extends EqasimConfigurator {
     public void adjustScenario(Scenario scenario) {
         // if there is a vehicles file defined in config, manually assign them to their agents
+        // TODO : since matsim 14 it is now possible to assign vehicles directly in the xml file.
+        //  That should be the preferred way of assigning vehicles.
         Config config = scenario.getConfig();
         if (config.qsim().getVehiclesSource() == QSimConfigGroup.VehiclesSource.fromVehiclesData) {
             for (Person person : scenario.getPopulation().getPersons().values()) {

ile_de_france/src/main/java/org/eqasim/ile_de_france/emissions/EmissionsByPolluant.java

@@ -1,6 +1,6 @@
 package org.eqasim.ile_de_france.emissions;
 // this is a modified copy of a private contribs.emissions class
-// TODO: will need to be updated after the matsim 14 release to profit from https://github.com/matsim-org/matsim-libs/pull/1859
+// TODO: will need to be updated after the matsim 15 release to profit from https://github.com/matsim-org/matsim-libs/pull/2081
 
 import org.matsim.contrib.emissions.Pollutant;
 

ile_de_france/src/main/java/org/eqasim/ile_de_france/emissions/EmissionsOnLinkEventsHandler.java

@@ -1,6 +1,6 @@
 package org.eqasim.ile_de_france.emissions;
 // this is a modified copy of a private contribs.emissions class
-// TODO: will need to be updated after the matsim 14 release to profit from https://github.com/matsim-org/matsim-libs/pull/1859
+// TODO: will need to be updated after the matsim 15 release to profit from https://github.com/matsim-org/matsim-libs/pull/2081
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;

ile_de_france/src/main/java/org/eqasim/ile_de_france/emissions/RunComputeEmissionsEvents.java

@@ -4,8 +4,8 @@
 import org.eqasim.ile_de_france.IDFConfigurator;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.api.core.v01.network.NetworkWriter;
 import org.matsim.contrib.emissions.EmissionModule;
+import org.matsim.contrib.emissions.OsmHbefaMapping;
 import org.matsim.contrib.emissions.utils.EmissionsConfigGroup;
 import org.matsim.core.api.experimental.events.EventsManager;
 import org.matsim.core.config.CommandLine;
@@ -35,9 +35,8 @@ public static void main(String[] args) throws CommandLine.ConfigurationException
         Config config = ConfigUtils.loadConfig(cmd.getOptionStrict("config-path"), configGroups);
         cmd.applyConfiguration(config);
 
-        EmissionsConfigGroup emissionsConfig = (EmissionsConfigGroup) config.getModule("emissions");
+        EmissionsConfigGroup emissionsConfig = (EmissionsConfigGroup) config.getModules().get("emissions");
         emissionsConfig.setHbefaVehicleDescriptionSource(EmissionsConfigGroup.HbefaVehicleDescriptionSource.asEngineInformationAttributes);
-        emissionsConfig.setHbefaRoadTypeSource(EmissionsConfigGroup.HbefaRoadTypeSource.fromLinkAttributes);
         emissionsConfig.setDetailedVsAverageLookupBehavior(
                 EmissionsConfigGroup.DetailedVsAverageLookupBehavior.tryDetailedThenTechnologyAverageThenAverageTable);
         emissionsConfig.setNonScenarioVehicles(EmissionsConfigGroup.NonScenarioVehicles.abort);

ile_de_france/src/main/java/org/eqasim/ile_de_france/emissions/RunComputeEmissionsGrid.java

@@ -15,8 +15,6 @@
 import org.matsim.core.utils.gis.ShapeFileReader;
 import org.opengis.feature.simple.SimpleFeature;
 
-// TODO: will need to be updated after the matsim 14 release to profit from https://github.com/matsim-org/matsim-libs/pull/1859
-
 public class RunComputeEmissionsGrid {
 
     public static void main(String[] args) throws CommandLine.ConfigurationException {

ile_de_france/src/main/java/org/eqasim/ile_de_france/emissions/RunExportEmissionsNetwork.java

@@ -25,7 +25,7 @@
 
 import java.util.*;
 
-// TODO: will need to be updated after the matsim 14 release to profit from https://github.com/matsim-org/matsim-libs/pull/1859
+// TODO: will need to be updated after the matsim 15 release to profit from https://github.com/matsim-org/matsim-libs/pull/2081
 
 public class RunExportEmissionsNetwork {
 
@@ -45,6 +45,7 @@ public static void main(String[] args) throws CommandLine.ConfigurationException
         int timeBinSize = Integer.parseInt(cmd.getOption("time-bin-size").orElse("3600"));
 
         EventsManager eventsManager = EventsUtils.createEventsManager();
+
         EmissionsOnLinkEventHandler handler = new EmissionsOnLinkEventHandler(timeBinSize);
 
         EmissionEventsReader eventsReader = new EmissionEventsReader(eventsManager);