diff --git a/pom.xml b/pom.xml
index c40d26c..434d34e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
org.matsim
matsim
- 15.0
+ 2024.0
junit
diff --git a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersGtfsShapes.java b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersGtfsShapes.java
index a8cf956..4a3403c 100755
--- a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersGtfsShapes.java
+++ b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersGtfsShapes.java
@@ -7,7 +7,7 @@
import org.matsim.api.core.v01.network.Network;
import org.matsim.api.core.v01.network.Node;
import org.matsim.api.core.v01.population.Person;
-import org.matsim.core.router.FastAStarEuclideanFactory;
+import org.matsim.core.router.speedy.SpeedyALTFactory;
import org.matsim.core.router.util.LeastCostPathCalculator;
import org.matsim.core.router.util.TravelDisutility;
import org.matsim.core.router.util.TravelTime;
@@ -106,7 +106,8 @@ private void load() {
NetworkTools.cutNetwork(cutNetwork, nodesWithinBuffer);
ShapeRouter r = new ShapeRouter(shape);
- pathCalculator = new PathCalculator(new FastAStarEuclideanFactory().createPathCalculator(cutNetwork, r, r));
+ pathCalculator = new PathCalculator(
+ new SpeedyALTFactory().createPathCalculator(cutNetwork, r, r));
pathCalculatorsByShape.put(shapeId, pathCalculator);
networksByShape.put(shapeId, cutNetwork);
diff --git a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersOsmAttributes.java b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersOsmAttributes.java
index 6ed7922..45e5102 100755
--- a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersOsmAttributes.java
+++ b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersOsmAttributes.java
@@ -25,7 +25,7 @@
import org.matsim.api.core.v01.network.Network;
import org.matsim.api.core.v01.network.Node;
import org.matsim.api.core.v01.population.Person;
-import org.matsim.core.router.FastAStarLandmarksFactory;
+import org.matsim.core.router.speedy.SpeedyALTFactory;
import org.matsim.core.router.util.LeastCostPathCalculator;
import org.matsim.core.router.util.LeastCostPathCalculatorFactory;
import org.matsim.core.router.util.TravelDisutility;
@@ -100,7 +100,7 @@ public ScheduleRoutersOsmAttributes(TransitSchedule schedule, Network network, M
*/
private void load() {
log.info("Initiating network and router for transit routes...");
- LeastCostPathCalculatorFactory factory = new FastAStarLandmarksFactory(nThreads);
+ LeastCostPathCalculatorFactory factory = new SpeedyALTFactory();
for (TransitLine transitLine : schedule.getTransitLines().values()) {
for (TransitRoute transitRoute : transitLine.getRoutes().values()) {
String scheduleMode = transitRoute.getTransportMode();
diff --git a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersStandard.java b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersStandard.java
index e34efdf..0352c45 100755
--- a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersStandard.java
+++ b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersStandard.java
@@ -7,7 +7,7 @@
import org.matsim.api.core.v01.network.Network;
import org.matsim.api.core.v01.network.Node;
import org.matsim.api.core.v01.population.Person;
-import org.matsim.core.router.FastAStarLandmarksFactory;
+import org.matsim.core.router.speedy.SpeedyALTFactory;
import org.matsim.core.router.util.LeastCostPathCalculator;
import org.matsim.core.router.util.LeastCostPathCalculatorFactory;
import org.matsim.core.router.util.TravelDisutility;
@@ -79,7 +79,7 @@ private void load() {
log.info("==============================================");
log.info("Creating network routers for transit routes...");
log.info("Initiating network and router for transit routes...");
- LeastCostPathCalculatorFactory factory = new FastAStarLandmarksFactory(nThreads);
+ LeastCostPathCalculatorFactory factory = new SpeedyALTFactory();
for(TransitLine transitLine : schedule.getTransitLines().values()) {
for(TransitRoute transitRoute : transitLine.getRoutes().values()) {
String scheduleMode = transitRoute.getTransportMode();
diff --git a/src/main/java/org/matsim/pt2matsim/osm/lib/OsmFileReader.java b/src/main/java/org/matsim/pt2matsim/osm/lib/OsmFileReader.java
index 5810375..b2d8436 100644
--- a/src/main/java/org/matsim/pt2matsim/osm/lib/OsmFileReader.java
+++ b/src/main/java/org/matsim/pt2matsim/osm/lib/OsmFileReader.java
@@ -40,7 +40,7 @@ public class OsmFileReader extends MatsimXmlParser {
private ParsedRelation currentRelation = null;
public OsmFileReader(OsmData osmData) {
- super();
+ super(ValidationType.DTD_OR_XSD);
this.osmData = osmData;
this.setValidating(false);
}