Merge branch 'master' into junit5

matsim-org · Apr 23, 2024 · 4f70d66 · 4f70d66
2 parents 7259325 + 22f9bae
commit 4f70d66
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,10 +29,10 @@
     </repositories>
 
     <properties>
-        <geotools.version>29.0</geotools.version>
-        <jackson.version>2.14.2</jackson.version>
+        <geotools.version>29.5</geotools.version>
+        <jackson.version>2.17.0</jackson.version>
         <jts.version>1.19.0</jts.version>
-        <log4j.version>2.20.0</log4j.version>
+        <log4j.version>2.23.1</log4j.version>
         <junit.version>5.10.2</junit.version>
     </properties>
 
@@ -51,27 +51,27 @@
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
-            <version>5.7.1</version>
+            <version>5.9</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.16.1</version>
         </dependency>
         <dependency>
             <groupId>de.grundid.opendatalab</groupId>
             <artifactId>geojson-jackson</artifactId>
-            <version>1.5</version>
+            <version>1.14</version>
         </dependency>
         <dependency>
             <groupId>net.lingala.zip4j</groupId>
             <artifactId>zip4j</artifactId>
-            <version>2.11.3</version>
+            <version>2.11.5</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.0.0-jre</version>
+            <version>33.1.0-jre</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -86,7 +86,11 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <!-- required for tests with geojson-jackson -->
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
         </dependency>
         <dependency>
             <groupId>org.locationtech.jts</groupId>
@@ -100,21 +104,33 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>com.fasterxml.jackson</groupId>
+            <artifactId>jackson-bom</artifactId>
+            <version>${jackson.version}</version>
+            <scope>import</scope>
+            <type>pom</type>
+          </dependency>   
+        </dependencies>
+      </dependencyManagement>
+
     <build>
         <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <release>17</release>
                     <showWarnings>true</showWarnings>
@@ -133,14 +149,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.5.2</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>shade</goal>
                         </goals>
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <transformers>
                                 <transformer implementation=
                                                      "org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -166,7 +183,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>

diff --git a/src/main/java/org/matsim/pt2matsim/hafas/HafasConverter.java b/src/main/java/org/matsim/pt2matsim/hafas/HafasConverter.java
@@ -33,6 +33,7 @@
 import org.matsim.pt2matsim.tools.debug.ScheduleCleaner;
 import org.matsim.vehicles.VehicleCapacity;
 import org.matsim.vehicles.VehicleType;
+import org.matsim.vehicles.VehicleUtils;
 import org.matsim.vehicles.Vehicles;
 import org.matsim.vehicles.VehiclesFactory;
 
@@ -182,9 +183,9 @@ private static void createTransitRoutesFromFPLAN(List<FPLANRoute> routes, Transi
 					// using default values for vehicle type
 					vehicleType.setLength(defaultVehicleType.length);
 					vehicleType.setWidth(defaultVehicleType.width);
-					vehicleType.setAccessTime(defaultVehicleType.accessTime);
-					vehicleType.setEgressTime(defaultVehicleType.egressTime);
-					vehicleType.setDoorOperationMode(defaultVehicleType.doorOperation);
+					VehicleUtils.setAccessTime(vehicleType, defaultVehicleType.accessTime);
+					VehicleUtils.setEgressTime(vehicleType, defaultVehicleType.egressTime);
+					VehicleUtils.setDoorOperationMode(vehicleType, defaultVehicleType.doorOperation);
 					vehicleType.setPcuEquivalents(defaultVehicleType.pcuEquivalents);
 
 					VehicleCapacity vehicleCapacity = vehicleType.getCapacity();

diff --git a/src/main/java/org/matsim/pt2matsim/osm/OsmTransitScheduleConverter.java b/src/main/java/org/matsim/pt2matsim/osm/OsmTransitScheduleConverter.java
@@ -236,7 +236,7 @@ protected TransitRoute createTransitRoute(Osm.Relation relation) {
 			}
 		}
 
-		NetworkRoute networkRoute = (linkSequenceForward.size() == 0 ? null : RouteUtils.createNetworkRoute(linkSequenceForward, null));
+		NetworkRoute networkRoute = (linkSequenceForward.size() == 0 ? null : RouteUtils.createNetworkRoute(linkSequenceForward));
 
 		if(stopSequenceForward.size() == 0) {
 			return null;

diff --git a/src/main/java/org/matsim/pt2matsim/run/gis/Network2ShapeFile.java b/src/main/java/org/matsim/pt2matsim/run/gis/Network2ShapeFile.java
@@ -24,9 +24,9 @@
 import org.matsim.api.core.v01.network.Node;
 import org.matsim.core.utils.collections.CollectionUtils;
 import org.matsim.core.utils.geometry.geotools.MGC;
+import org.matsim.core.utils.gis.GeoFileWriter;
 import org.matsim.core.utils.gis.PointFeatureFactory;
 import org.matsim.core.utils.gis.PolylineFeatureFactory;
-import org.matsim.core.utils.gis.ShapeFileWriter;
 import org.matsim.pt2matsim.tools.NetworkTools;
 import org.opengis.feature.simple.SimpleFeature;
 
@@ -94,7 +94,7 @@ public void convertNodes(String nodesOutputFile) {
 			nodeFeatures.add(f);
 		}
 
-		ShapeFileWriter.writeGeometries(nodeFeatures, nodesOutputFile);
+		GeoFileWriter.writeGeometries(nodeFeatures, nodesOutputFile);
 	}
 
 	public void convertLinks(String linksOutputFile) {
@@ -125,7 +125,7 @@ public void convertLinks(String linksOutputFile) {
 			linkFeatures.add(f);
 		}
 
-		ShapeFileWriter.writeGeometries(linkFeatures, linksOutputFile);
+		GeoFileWriter.writeGeometries(linkFeatures, linksOutputFile);
 	}
 
 	private Coordinate[] getCoordinates(Link link) {

diff --git a/src/main/java/org/matsim/pt2matsim/run/gis/Schedule2ShapeFile.java b/src/main/java/org/matsim/pt2matsim/run/gis/Schedule2ShapeFile.java
@@ -27,9 +27,9 @@
 import org.matsim.core.utils.collections.CollectionUtils;
 import org.matsim.core.utils.collections.MapUtils;
 import org.matsim.core.utils.geometry.geotools.MGC;
+import org.matsim.core.utils.gis.GeoFileWriter;
 import org.matsim.core.utils.gis.PointFeatureFactory;
 import org.matsim.core.utils.gis.PolylineFeatureFactory;
-import org.matsim.core.utils.gis.ShapeFileWriter;
 import org.matsim.pt.transitSchedule.api.*;
 import org.matsim.pt2matsim.tools.NetworkTools;
 import org.matsim.pt2matsim.tools.ScheduleTools;
@@ -144,7 +144,7 @@ public void stopRefLinks2Polylines(String outputFile) {
 			}
 		}
 
-		ShapeFileWriter.writeGeometries(lineFeatures, outputFile);
+		GeoFileWriter.writeGeometries(lineFeatures, outputFile);
 	}
 
 
@@ -181,7 +181,7 @@ public void stopFacilities2Points(String pointOutputFile) {
 			pointFeatures.add(pf);
 		}
 
-		ShapeFileWriter.writeGeometries(pointFeatures, pointOutputFile);
+		GeoFileWriter.writeGeometries(pointFeatures, pointOutputFile);
 	}
 
 	/**
@@ -229,7 +229,7 @@ public void routes2Polylines(String outputFile, boolean useNetworkLinks) {
 			}
 		}
 
-		ShapeFileWriter.writeGeometries(features, outputFile);
+		GeoFileWriter.writeGeometries(features, outputFile);
 	}
 
 	/**

diff --git a/src/main/java/org/matsim/pt2matsim/tools/CoordTools.java b/src/main/java/org/matsim/pt2matsim/tools/CoordTools.java
@@ -269,6 +269,7 @@ public static Map<TransitStopFacility, Boolean> getStopsInAreaBool(TransitSchedu
 	 *
 	 * @deprecated not used anywhere
 	 */
+	@Deprecated
 	public static int getBorderCrossType(Coord SWcut, Coord NEcut, Coord fromCoord, Coord toCoord) {
 		int fromSector = getAreaOfInterestSector(SWcut, NEcut, fromCoord);
 		int toSector = getAreaOfInterestSector(SWcut, NEcut, toCoord);

diff --git a/src/main/java/org/matsim/pt2matsim/tools/NetworkTools.java b/src/main/java/org/matsim/pt2matsim/tools/NetworkTools.java
@@ -182,7 +182,10 @@ public static Map<Double, Set<Link>> findClosestLinks(Network network, Coord coo
 	 * For opposite links, the link which has the coordinate on its right side is sorted "closer" to the coordinate.
 	 * If more than two links have the exact same distance, links are sorted by distance to their respective closest node.
 	 * After that, behaviour is undefined.
+	 * 
+	 * @deprecated See https://github.com/matsim-org/pt2matsim/issues/199
 	 */
+	@Deprecated(since = "23.10-SNAPSHOT")
 	public static List<Link> findClosestLinksSorted(Network network, Coord coord, double nodeSearchRadius, Set<String> allowedTransportModes) {
 		List<Link> links = new ArrayList<>();
 		Map<Double, Set<Link>> sortedLinks = findClosestLinks(network, coord, nodeSearchRadius, allowedTransportModes);
@@ -203,7 +206,7 @@ public static List<Link> findClosestLinksSorted(Network network, Coord coord, do
 				Map<Double, Link> tmp = new HashMap<>();
 				for(Link l : list) {
 					double fromNodeDist = CoordUtils.calcEuclideanDistance(l.getFromNode().getCoord(), coord);
-					double toNodeDist = CoordUtils.calcEuclideanDistance(l.getFromNode().getCoord(), coord);
+					double toNodeDist = CoordUtils.calcEuclideanDistance(l.getToNode().getCoord(), coord);
 					double nodeDist = fromNodeDist < toNodeDist ? fromNodeDist : toNodeDist;
 
 					double d = nodeDist + (coordIsOnRightSideOfLink(coord, l) ? 1 : 100);

diff --git a/src/main/java/org/matsim/pt2matsim/tools/ScheduleTools.java b/src/main/java/org/matsim/pt2matsim/tools/ScheduleTools.java
@@ -205,9 +205,9 @@ public static VehicleType createDefaultVehicleType(String id, String defaultVehi
 		VehicleType vehicleType = vf.createVehicleType(vTypeId);
 		vehicleType.setLength(defaultValues.length);
 		vehicleType.setWidth(defaultValues.width);
-		vehicleType.setAccessTime(defaultValues.accessTime);
-		vehicleType.setEgressTime(defaultValues.egressTime);
-		vehicleType.setDoorOperationMode(defaultValues.doorOperation);
+		VehicleUtils.setAccessTime(vehicleType, defaultValues.accessTime);
+		VehicleUtils.setEgressTime(vehicleType, defaultValues.egressTime);
+		VehicleUtils.setDoorOperationMode(vehicleType, defaultValues.doorOperation);
 		vehicleType.setPcuEquivalents(defaultValues.pcuEquivalents);
 		vehicleType.setNetworkMode(defaultValues.transportMode.name);
 
@@ -317,7 +317,7 @@ public static void routeSchedule(TransitSchedule schedule, Network network, Sche
 
 					// add link sequence to schedule
 					if(linkIdSequence != null) {
-						transitRoute.setRoute(RouteUtils.createNetworkRoute(linkIdSequence, network));
+						transitRoute.setRoute(RouteUtils.createNetworkRoute(linkIdSequence));
 					}
 				} else {
 					log.warn("Route " + transitRoute.getId() + " on line " + transitLine.getId() + " has no stop sequence");

diff --git a/src/main/java/org/matsim/pt2matsim/tools/ShapeTools.java b/src/main/java/org/matsim/pt2matsim/tools/ShapeTools.java
@@ -32,8 +32,8 @@
 import org.matsim.core.utils.geometry.CoordinateTransformation;
 import org.matsim.core.utils.geometry.geotools.MGC;
 import org.matsim.core.utils.geometry.transformations.TransformationFactory;
+import org.matsim.core.utils.gis.GeoFileWriter;
 import org.matsim.core.utils.gis.PolylineFeatureFactory;
-import org.matsim.core.utils.gis.ShapeFileWriter;
 import org.matsim.pt2matsim.gtfs.GtfsFeed;
 import org.matsim.pt2matsim.gtfs.GtfsFeedImpl;
 import org.matsim.pt2matsim.gtfs.lib.GtfsDefinitions;
@@ -228,7 +228,7 @@ public static void writeGtfsTripsToFile(GtfsFeed gtfsFeed, Set<String> serviceId
 				}
 			}
 		}
-		ShapeFileWriter.writeGeometries(features, outFile);
+		GeoFileWriter.writeGeometries(features, outFile);
 	}
 
 	/**
@@ -257,7 +257,7 @@ public static void writeESRIShapeFile(Collection<? extends RouteShape> shapes, S
 				features.add(f);
 			}
 		}
-		ShapeFileWriter.writeGeometries(features, filename);
+		GeoFileWriter.writeGeometries(features, filename);
 
 	}