Merge branch 'master' into drt-estimator

contribs/analysis/src/main/java/org/matsim/contrib/analysis/christoph/ActivitiesAnalyzer.java

@@ -39,11 +39,11 @@
 import org.matsim.core.controler.listener.StartupListener;
 import org.matsim.core.utils.charts.XYLineChart;
 import org.matsim.core.utils.io.IOUtils;
-import org.matsim.core.utils.io.UncheckedIOException;
 
 import java.awt.*;
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.*;
 import java.util.List;
 

contribs/analysis/src/main/java/org/matsim/contrib/analysis/christoph/TripsAnalyzer.java

@@ -22,6 +22,7 @@
 
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -45,7 +46,6 @@
 import org.matsim.core.controler.listener.StartupListener;
 import org.matsim.core.utils.charts.XYLineChart;
 import org.matsim.core.utils.io.IOUtils;
-import org.matsim.core.utils.io.UncheckedIOException;
 
 /**
  * Calculates:

contribs/analysis/src/main/java/org/matsim/contrib/analysis/kai/KNAnalysisEventsHandler.java

@@ -43,13 +43,13 @@
 import org.matsim.core.router.TripStructureUtils.Trip;
 import org.matsim.core.utils.geometry.CoordUtils;
 import org.matsim.core.utils.io.IOUtils;
-import org.matsim.core.utils.io.UncheckedIOException;
 import org.matsim.utils.objectattributes.ObjectAttributes;
 import org.matsim.utils.objectattributes.ObjectAttributesXmlWriter;
 import org.matsim.vehicles.Vehicle;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.*;
 import java.util.Map.Entry;
 
@@ -100,7 +100,7 @@ enum StatType {
 
 	private Vehicle2DriverEventHandler delegate = new Vehicle2DriverEventHandler() ;
 
-	// general trip counter.  Would, in theory, not necessary to do this per StatType, but I find it too brittle 
+	// general trip counter.  Would, in theory, not necessary to do this per StatType, but I find it too brittle
 	// to avoid under- or over-counting with respect to loops.
 	//	private final Map<StatType,Integer> legCount = new TreeMap<StatType,Integer>() ;
 

contribs/application/src/main/java/org/matsim/application/prepare/network/CreateGeoJsonNetwork.java

@@ -45,7 +45,7 @@ public class CreateGeoJsonNetwork implements MATSimAppCommand {
 	@CommandLine.Option(names = "--match-id", description = "Pattern to filter links by id")
 	private String matchId;
 
-	@CommandLine.Option(names = "--mode-filter", split = ",", defaultValue = "car",
+	@CommandLine.Option(names = "--mode-filter", split = ",", defaultValue = "car,freight,drt",
 		description = "Only keep links if they have one of the specified modes. Specify 'none' to disable.")
 	private Set<String> modes;
 

contribs/application/src/main/java/org/matsim/smallScaleCommercialTrafficGeneration/SmallScaleCommercialTrafficUtils.java

@@ -50,8 +50,10 @@
 import org.matsim.core.network.NetworkUtils;
 import org.matsim.core.population.PopulationUtils;
 import org.matsim.core.utils.io.IOUtils;
+import org.matsim.vehicles.Vehicle;
 import org.matsim.vehicles.VehicleType;
 import org.matsim.vehicles.VehicleUtils;
+import org.matsim.vehicles.Vehicles;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -169,7 +171,7 @@ private static void writeCSVWithCategoryHeader(HashMap<String, Object2DoubleMap<
 			writer.close();
 
 		} catch (IOException e) {
-			e.printStackTrace();
+			log.error("Could not write the csv file with the data distribution data.", e);
 		}
 	}
 
@@ -186,6 +188,8 @@ static void createPlansBasedOnCarrierPlans(Scenario scenario, String smallScaleC
 		Map<String, AtomicLong> idCounter = new HashMap<>();
 
 		Population populationFromCarrier = (Population) scenario.getScenarioElement("allpersons");
+		Vehicles allVehicles = VehicleUtils.getOrCreateAllvehicles(scenario);
+
 		for (Person person : populationFromCarrier.getPersons().values()) {
 
 			Plan plan = popFactory.createPlan();
@@ -238,11 +242,12 @@ else if (subpopulation.contains("goodsTraffic"))
 			if (relatedCarrier.getAttributes().getAsMap().containsKey("tourStartArea"))
 				newPerson.getAttributes().putAttribute("tourStartArea",
 					relatedCarrier.getAttributes().getAttribute("tourStartArea"));
-			VehicleUtils.insertVehicleIdsIntoAttributes(newPerson, (new HashMap<>() {
-				{
-					put(mode, (Id.createVehicleId(person.getId().toString())));
-				}
-			}));
+
+			Id<Vehicle> vehicleId = Id.createVehicleId(person.getId().toString());
+
+			VehicleUtils.insertVehicleIdsIntoAttributes(newPerson, Map.of(mode, vehicleId));
+			VehicleUtils.insertVehicleTypesIntoAttributes(newPerson, Map.of(mode, allVehicles.getVehicles().get(vehicleId).getType().getId()));
+
 			population.addPerson(newPerson);
 		}
 

contribs/application/src/main/java/org/matsim/smallScaleCommercialTrafficGeneration/TripDistributionMatrix.java

@@ -35,14 +35,14 @@
 import org.matsim.application.options.ShpOptions;
 import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
 import org.matsim.core.utils.io.IOUtils;
-import org.matsim.core.utils.io.UncheckedIOException;
 import org.matsim.vehicles.VehicleType;
 import org.matsim.vehicles.VehicleUtils;
 import org.opengis.feature.simple.SimpleFeature;
 import org.matsim.smallScaleCommercialTrafficGeneration.TrafficVolumeGeneration.TrafficVolumeKey;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.net.MalformedURLException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;

contribs/common/src/main/java/org/matsim/contrib/common/csv/CompactCSVWriter.java

@@ -21,10 +21,9 @@
 package org.matsim.contrib.common.csv;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 
-import org.matsim.core.utils.io.UncheckedIOException;
-
 import com.opencsv.CSVWriter;
 
 public class CompactCSVWriter extends CSVWriter {