From c49d991c8b2decd2e8aaff16ee0ab2f0bede05bc Mon Sep 17 00:00:00 2001 From: ikaddoura Date: Mon, 25 Mar 2024 12:20:02 +0100 Subject: [PATCH 1/8] simplify activities in kelheim test and remove SnzActivities class --- .../integration/RailsimIntegrationTest.java | 27 +++++- .../railsim/integration/SnzActivities.java | 91 ------------------- 2 files changed, 25 insertions(+), 93 deletions(-) delete mode 100644 contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/SnzActivities.java diff --git a/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/RailsimIntegrationTest.java b/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/RailsimIntegrationTest.java index b139bfd423b..7adbb41fc31 100644 --- a/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/RailsimIntegrationTest.java +++ b/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/RailsimIntegrationTest.java @@ -30,9 +30,14 @@ import org.matsim.api.core.v01.TransportMode; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.network.Link; +import org.matsim.api.core.v01.population.Activity; +import org.matsim.api.core.v01.population.Person; +import org.matsim.api.core.v01.population.Plan; +import org.matsim.api.core.v01.population.PlanElement; import org.matsim.core.api.experimental.events.VehicleArrivesAtFacilityEvent; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; +import org.matsim.core.config.groups.ScoringConfigGroup; import org.matsim.core.controler.AbstractModule; import org.matsim.core.controler.Controler; import org.matsim.core.scenario.ScenarioUtils; @@ -51,6 +56,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.function.Consumer; @@ -367,8 +373,25 @@ void testScenarioKelheim() { type.setMaximumVelocity(30); type.setLength(100); } - - SnzActivities.addScoringParams(config); + + // simplify the activity types, e.g. home_3600 -> home + Set activityTypes = new HashSet<>(); + for (Person person : scenario.getPopulation().getPersons().values()) { + for (Plan plan : person.getPlans()) { + for (PlanElement pE : plan.getPlanElements()) { + if(pE instanceof Activity) { + Activity act = (Activity) pE; + String baseType = act.getType().split("_")[0]; + act.setType(baseType); + activityTypes.add(baseType); + } + } + } + } + + for (String type : activityTypes) { + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams(type).setTypicalDuration(1234.)); + } Controler controler = new Controler(scenario); controler.addOverridingModule(new RailsimModule()); diff --git a/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/SnzActivities.java b/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/SnzActivities.java deleted file mode 100644 index ac3a039f5a5..00000000000 --- a/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/SnzActivities.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Avoid dependency on vsp contrib, copy from: - * https://github.com/matsim-org/matsim-libs/blob/b2305e5e0f744b357486c8bbab253bb7c38aaad4/contribs/vsp/src/main/java/org/matsim/contrib/vsp/scenario/SnzActivities.java - */ -package ch.sbb.matsim.contrib.railsim.integration; - -import org.matsim.core.config.Config; -import org.matsim.core.config.groups.ScoringConfigGroup; - -/** - * Defines available activities and open- and closing times in Snz scenarios at vsp. - */ -public enum SnzActivities { - - home, - other, - visit, - accomp_children, - accomp_other, - - educ_kiga(7, 17), - educ_primary(7, 16), - educ_secondary(7, 17), - educ_tertiary(7, 22), - educ_higher(7, 19), - educ_other(7, 22), - - work(6, 20), - business(8, 20), - errands(8, 20), - - leisure(9, 27), - restaurant(8, 27), - shop_daily(8, 20), - shop_other(8, 20); - - /** - * Start time of an activity in hours, can be -1 if not defined. - */ - private final double start; - - /** - * End time of an activity in hours, can be -1 if not defined. - */ - private final double end; - - SnzActivities(double start, double end) { - this.start = start; - this.end = end; - } - - SnzActivities() { - this.start = -1; - this.end = -1; - } - - - /** - * Apply start and end time to params. - */ - public ScoringConfigGroup.ActivityParams apply(ScoringConfigGroup.ActivityParams params) { - if (start >= 0) - params = params.setOpeningTime(start * 3600.); - if (end >= 0) - params = params.setClosingTime(end * 3600.); - - return params; - } - - /** - * Add activity params for the scenario config. - */ - public static void addScoringParams(Config config) { - - for (SnzActivities value : SnzActivities.values()) { - for (long ii = 600; ii <= 97200; ii += 600) { - config.scoring().addActivityParams(value.apply(new ScoringConfigGroup.ActivityParams(value.name() + "_" + ii).setTypicalDuration(ii))); - } - } - - config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("car interaction").setTypicalDuration(60)); - config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("ride interaction").setTypicalDuration(60)); - config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("bike interaction").setTypicalDuration(60)); - - config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("other").setTypicalDuration(600 * 3)); - - config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("freight_start").setTypicalDuration(60 * 15)); - config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("freight_end").setTypicalDuration(60 * 15)); - - } -} From 3630417490a32482230ca7314eb21a552c208356 Mon Sep 17 00:00:00 2001 From: ikaddoura Date: Mon, 25 Mar 2024 17:35:10 +0100 Subject: [PATCH 2/8] adding a railway osm reader, similar to the existing highway approach --- .../osm/networkReader/OsmRailwayParser.java | 143 ++++++++++++++++++ .../osm/networkReader/OsmRailwayReader.java | 66 ++++++++ .../contrib/osm/networkReader/OsmTags.java | 10 ++ contribs/railsim/pom.xml | 7 + .../contrib/railsim/RunRailsimExample.java | 12 +- .../prepare/RunRailOsmNetworkReader.java | 43 ++++++ 6 files changed, 276 insertions(+), 5 deletions(-) create mode 100644 contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayParser.java create mode 100644 contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java create mode 100644 contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java diff --git a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayParser.java b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayParser.java new file mode 100644 index 00000000000..3e9c9053b55 --- /dev/null +++ b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayParser.java @@ -0,0 +1,143 @@ +package org.matsim.contrib.osm.networkReader; + +import de.topobyte.osm4j.core.model.iface.OsmNode; +import de.topobyte.osm4j.core.model.iface.OsmWay; +import de.topobyte.osm4j.core.model.util.OsmModelUtil; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.matsim.api.core.v01.Coord; +import org.matsim.core.utils.geometry.CoordinateTransformation; + +import java.nio.file.Path; +import java.text.NumberFormat; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.function.BiPredicate; +import java.util.stream.Collectors; + +class OsmRailwayParser extends OsmNetworkParser { + + private static final Logger log = LogManager.getLogger(OsmRailwayParser.class); + private static final NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.UK); + + private final CoordinateTransformation transformation; + private final Map linkProperties; + private final BiPredicate linkFilter; + final ExecutorService executor; + Map ways; + Map nodes; + Map> nodeReferences; + + OsmRailwayParser(CoordinateTransformation transformation, Map linkProperties, BiPredicate linkFilter, ExecutorService executor) { + super(transformation, linkProperties, linkFilter, executor); + + this.transformation = transformation; + this.linkProperties = linkProperties; + this.linkFilter = linkFilter; + this.executor = executor; + } + + public Map getWays() { + return ways; + } + + public Map getNodes() { + return nodes; + } + + void parse(Path inputFile) { + + // make sure we have empty collections + ways = new ConcurrentHashMap<>(); + nodes = new ConcurrentHashMap<>(); + nodeReferences = new ConcurrentHashMap<>(); + + new PbfParser.Builder() + .setWaysHandler(this::handleWay) + .setExecutor(executor) + .build() + .parse(inputFile); + + log.info("Finished reading ways"); + log.info("Starting to read nodes"); + + new PbfParser.Builder() + .setNodeHandler(this::handleNode) + .setExecutor(executor) + .build() + .parse(inputFile); + + log.info("finished reading nodes"); + } + + void handleNode(OsmNode osmNode) { + + if (nodeReferences.containsKey(osmNode.getId())) { + + List waysThatReferenceNode = nodeReferences.get(osmNode.getId()); + Coord transformedCoord = transformation.transform(new Coord(osmNode.getLongitude(), osmNode.getLatitude())); + + // 'testWhetherReferencingLinksAreInFilter' may be expensive because it might include a test whether the + // supplied coordinate is within a shape. Therefore we want to test as few cases as possible. Two cases are tested anyway: + // 1. if more than one way references this node, this node is an intersection and a possible end node for a + // matsim link. + // 2. if this node is either the start- or end node of a referencing way which makes it a candidate for a node + // in a matsim link as well + // + // if a way has both ends outside the filter and no intersections within the filter it will not be included + // in the final network. I think this is unlikely in real world scenarios, so I think we can live with this + // to achieve faster execution + List filteredReferencingLinks; + if (waysThatReferenceNode.size() > 1 || isEndNodeOfReferencingLink(osmNode, waysThatReferenceNode.get(0))) + filteredReferencingLinks = testWhetherReferencingLinksAreInFilter(transformedCoord, waysThatReferenceNode); + else + filteredReferencingLinks = Collections.emptyList(); + + ProcessedOsmNode result = new ProcessedOsmNode(osmNode.getId(), filteredReferencingLinks, transformedCoord); + this.nodes.put(result.getId(), result); + + if (nodes.size() % 100000 == 0) { + log.info("Added " + numberFormat.format(nodes.size()) + " nodes"); + } + } + } + + void handleWay(OsmWay osmWay) { + + Map tags = OsmModelUtil.getTagsAsMap(osmWay); + + if (isStreetOfInterest(tags)) { + LinkProperties linkProperty = linkProperties.get(tags.get(OsmTags.RAILWAY)); + ProcessedOsmWay processedWay = ProcessedOsmWay.create(osmWay, tags, linkProperty); + ways.put(osmWay.getId(), processedWay); + + // keep track of which node is referenced by which way + for (int i = 0; i < osmWay.getNumberOfNodes(); i++) { + + long nodeId = osmWay.getNodeId(i); + nodeReferences.computeIfAbsent(nodeId, id -> Collections.synchronizedList(new ArrayList<>())) + .add(processedWay); + } + + if (ways.size() % 10000 == 0) { + log.info("Added " + numberFormat.format(ways.size()) + " ways"); + } + } + } + + private boolean isStreetOfInterest(Map tags) { + return tags.containsKey(OsmTags.RAILWAY) && linkProperties.containsKey(tags.get(OsmTags.RAILWAY)); + } + + private boolean isEndNodeOfReferencingLink(OsmNode node, ProcessedOsmWay processedOsmWay) { + return processedOsmWay.getEndNodeId() == node.getId() || processedOsmWay.getStartNode() == node.getId(); + } + + private List testWhetherReferencingLinksAreInFilter(Coord coord, List waysThatReferenceNode) { + + return waysThatReferenceNode.stream() + .filter(way -> linkFilter.test(coord, way.getLinkProperties().hierarchyLevel)) + .collect(Collectors.toList()); + } +} diff --git a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java new file mode 100644 index 00000000000..faed409019c --- /dev/null +++ b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java @@ -0,0 +1,66 @@ +package org.matsim.contrib.osm.networkReader; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Executors; +import java.util.function.BiPredicate; +import java.util.function.Predicate; + +import org.matsim.api.core.v01.Coord; +import org.matsim.api.core.v01.network.Link; +import org.matsim.core.network.NetworkUtils; + +public final class OsmRailwayReader extends SupersonicOsmNetworkReader { + + public OsmRailwayReader(OsmNetworkParser parser, + Predicate preserveNodeWithId, + BiPredicate includeLinkAtCoordWithHierarchy, + AfterLinkCreated afterLinkCreated, double freeSpeedFactor, double adjustCapacityLength, boolean storeOriginalGeometry) { + + super(parser, preserveNodeWithId, includeLinkAtCoordWithHierarchy, (link, tags, direction) -> handleLink(link, tags, direction, afterLinkCreated), freeSpeedFactor, adjustCapacityLength, storeOriginalGeometry); + } + + private static void handleLink(Link link, Map tags, SupersonicOsmNetworkReader.Direction direction, AfterLinkCreated outfacingCallback) { + + String railwayType = tags.get(OsmTags.RAILWAY); + link.getAttributes().putAttribute("osm_way_type", "railway"); + link.getAttributes().putAttribute(NetworkUtils.TYPE, railwayType); + + for (String tag : tags.keySet()) { + link.getAttributes().putAttribute(tag, tags.get(tag)); + } + + setAllowedModes(link, tags); + + outfacingCallback.accept(link, tags, direction); + } + + private static void setAllowedModes(Link link, Map tags) { + if (tags.containsKey(OsmTags.SERVICE) && tags.get(OsmTags.SERVICE).equals("yard")) { + Set allowedModes = new HashSet<>(); + link.setAllowedModes(allowedModes); + } else { + // everything else should be allowed for rail + Set allowedModes = new HashSet<>(); + allowedModes.add("rail"); + link.setAllowedModes(allowedModes); + } + } + + @Override + Collection createLinks(WaySegment segment) { + Collection links = super.createLinks(segment); + return links; + } + + public static class Builder extends AbstractBuilder { + + @Override + OsmRailwayReader createInstance() { + OsmRailwayParser parser = new OsmRailwayParser(coordinateTransformation, linkProperties, includeLinkAtCoordWithHierarchy, Executors.newWorkStealingPool()); + return new OsmRailwayReader(parser, preserveNodeWithId, includeLinkAtCoordWithHierarchy, afterLinkCreated, freeSpeedFactor, adjustCapacityLength, storeOriginalGeometry); + } + } +} diff --git a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmTags.java b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmTags.java index 4d18e1c6d22..22cba7f7c83 100644 --- a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmTags.java +++ b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmTags.java @@ -42,4 +42,14 @@ public class OsmTags { public static final String CROSSING = "crossing"; public static final String TYPE = "type"; public static final String RESTRICTION = "restriction"; + + public static final String RAILWAY = "railway"; + public static final String RAIL = "rail"; + public static final String NARROW_GAUGE = "narrow_gauge"; + public static final String TRAM = "tram"; + public static final String FUNICULAR = "funicular"; + public static final String SUBWAY = "subway"; + public static final String LIGHT_RAIL = "light_rail"; + public static final String MONORAIL = "monorail"; + public static final String USAGE = "usage"; } diff --git a/contribs/railsim/pom.xml b/contribs/railsim/pom.xml index b6172ab206c..5398dba3ae7 100644 --- a/contribs/railsim/pom.xml +++ b/contribs/railsim/pom.xml @@ -28,6 +28,13 @@ mockito-core test + + + org.matsim.contrib + osm + 16.0-SNAPSHOT + compile + diff --git a/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/RunRailsimExample.java b/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/RunRailsimExample.java index e4f69dbb5b7..5b5343ed8f6 100644 --- a/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/RunRailsimExample.java +++ b/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/RunRailsimExample.java @@ -19,7 +19,6 @@ package ch.sbb.matsim.contrib.railsim; -import ch.sbb.matsim.contrib.railsim.qsimengine.RailsimQSimModule; import org.matsim.api.core.v01.Scenario; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; @@ -27,6 +26,8 @@ import org.matsim.core.controler.OutputDirectoryHierarchy; import org.matsim.core.scenario.ScenarioUtils; +import ch.sbb.matsim.contrib.railsim.qsimengine.RailsimQSimModule; + /** * Example script that shows how to use railsim included in this contrib. */ @@ -37,12 +38,13 @@ private RunRailsimExample() { public static void main(String[] args) { - if (args.length == 0) { - System.err.println("Path to config is required as first argument."); - System.exit(2); + String configFilename; + if (args.length != 0) { + configFilename = args[0]; + } else { + configFilename = "test/input/ch/sbb/matsim/contrib/railsim/integration/microOlten/config.xml"; } - String configFilename = args[0]; Config config = ConfigUtils.loadConfig(configFilename); config.controller().setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.deleteDirectoryIfExists); diff --git a/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java b/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java new file mode 100644 index 00000000000..841e535f50a --- /dev/null +++ b/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java @@ -0,0 +1,43 @@ +package ch.sbb.matsim.contrib.railsim.prepare; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import org.matsim.api.core.v01.network.Network; +import org.matsim.api.core.v01.network.NetworkWriter; +import org.matsim.contrib.osm.networkReader.LinkProperties; +import org.matsim.contrib.osm.networkReader.OsmRailwayReader; +import org.matsim.contrib.osm.networkReader.OsmTags; +import org.matsim.core.network.algorithms.NetworkCleaner; +import org.matsim.core.utils.geometry.CoordinateTransformation; +import org.matsim.core.utils.geometry.transformations.TransformationFactory; + +public class RunRailOsmNetworkReader { + + private static final String inputFile = "path/to/file.osm.pbf"; + private static final String outputFile = "path/to/network.xml.gz"; + + private static final CoordinateTransformation coordinateTransformation = TransformationFactory.getCoordinateTransformation(TransformationFactory.WGS84, "EPSG:2056"); + + public static void main(String[] args) { + + ConcurrentMap linkProperties = new ConcurrentHashMap<>(); + linkProperties.put(OsmTags.RAIL, new LinkProperties(1, 1, 30., 1000., false)); + linkProperties.put(OsmTags.NARROW_GAUGE, new LinkProperties(2, 1, 30., 1000., false)); + linkProperties.put(OsmTags.LIGHT_RAIL, new LinkProperties(3, 1, 30., 1000., false)); + linkProperties.put(OsmTags.SUBWAY, new LinkProperties(4, 1, 30., 1000., false)); + linkProperties.put(OsmTags.MONORAIL, new LinkProperties(5, 1, 30., 1000., false)); + + Network network = new OsmRailwayReader.Builder() + .setCoordinateTransformation(coordinateTransformation) + .setLinkProperties(linkProperties) + .setPreserveNodeWithId(id -> true) // this filter keeps the detailed geometries + .build() + .read(inputFile); + + network.getAttributes().putAttribute("data_origin", "OSM"); + + new NetworkCleaner().run(network); + new NetworkWriter(network).write(outputFile); + } +} From 6a6b49f36f3fc63feec064afeacf4aa3b3fe332f Mon Sep 17 00:00:00 2001 From: ikaddoura Date: Tue, 26 Mar 2024 11:13:23 +0100 Subject: [PATCH 3/8] improved setting of attributes --- .../osm/networkReader/OsmRailwayReader.java | 65 +++++++++++++++---- .../contrib/osm/networkReader/OsmTags.java | 6 ++ .../prepare/RunRailOsmNetworkReader.java | 26 +++----- 3 files changed, 67 insertions(+), 30 deletions(-) diff --git a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java index faed409019c..a2d6ffbf0e9 100644 --- a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java +++ b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java @@ -4,6 +4,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executors; import java.util.function.BiPredicate; import java.util.function.Predicate; @@ -28,25 +30,49 @@ private static void handleLink(Link link, Map tags, SupersonicOs link.getAttributes().putAttribute("osm_way_type", "railway"); link.getAttributes().putAttribute(NetworkUtils.TYPE, railwayType); - for (String tag : tags.keySet()) { - link.getAttributes().putAttribute(tag, tags.get(tag)); - } - + setAttributes(link, tags); setAllowedModes(link, tags); + setSpeed(link, tags); outfacingCallback.accept(link, tags, direction); } - private static void setAllowedModes(Link link, Map tags) { - if (tags.containsKey(OsmTags.SERVICE) && tags.get(OsmTags.SERVICE).equals("yard")) { - Set allowedModes = new HashSet<>(); - link.setAllowedModes(allowedModes); - } else { - // everything else should be allowed for rail - Set allowedModes = new HashSet<>(); - allowedModes.add("rail"); - link.setAllowedModes(allowedModes); + private static void setSpeed(Link link, Map tags) { + + } + + private static void setAttributes(Link link, Map tags) { + + if (tags.containsKey(OsmTags.USAGE)) { + link.getAttributes().putAttribute(OsmTags.USAGE, tags.get(OsmTags.USAGE)); + } + + if (tags.containsKey(OsmTags.GAUGE)) { + link.getAttributes().putAttribute(OsmTags.GAUGE, tags.get(OsmTags.GAUGE)); } + + if (tags.containsKey(OsmTags.ELECTRIFIED)) { + link.getAttributes().putAttribute(OsmTags.ELECTRIFIED, tags.get(OsmTags.ELECTRIFIED)); + } + + if (tags.containsKey(OsmTags.MAXSPEED)) { + link.getAttributes().putAttribute(OsmTags.MAXSPEED, tags.get(OsmTags.MAXSPEED)); + } + + if (tags.containsKey(OsmTags.ETCS)) { + link.getAttributes().putAttribute(OsmTags.ETCS, tags.get(OsmTags.ETCS)); + } + + if (tags.containsKey(OsmTags.OPERATOR)) { + link.getAttributes().putAttribute(OsmTags.OPERATOR, tags.get(OsmTags.OPERATOR)); + } + + } + + private static void setAllowedModes(Link link, Map tags) { + Set allowedModes = new HashSet<>(); + allowedModes.add(tags.get(OsmTags.RAILWAY)); + link.setAllowedModes(allowedModes); } @Override @@ -57,6 +83,19 @@ Collection createLinks(WaySegment segment) { public static class Builder extends AbstractBuilder { + public Builder() { + ConcurrentMap linkProperties = new ConcurrentHashMap<>(); + linkProperties.put(OsmTags.RAIL, new LinkProperties(1, 1, 30., 1000., false)); + linkProperties.put(OsmTags.NARROW_GAUGE, new LinkProperties(2, 1, 30., 1000., false)); + linkProperties.put(OsmTags.LIGHT_RAIL, new LinkProperties(3, 1, 30., 1000., false)); + linkProperties.put(OsmTags.MONORAIL, new LinkProperties(4, 1, 30., 1000., false)); + linkProperties.put(OsmTags.FUNICULAR, new LinkProperties(5, 1, 30., 1000., false)); + linkProperties.put(OsmTags.SUBWAY, new LinkProperties(6, 1, 30., 1000., false)); + linkProperties.put(OsmTags.TRAM, new LinkProperties(7, 1, 30., 1000., false)); + + setLinkProperties(linkProperties); + } + @Override OsmRailwayReader createInstance() { OsmRailwayParser parser = new OsmRailwayParser(coordinateTransformation, linkProperties, includeLinkAtCoordWithHierarchy, Executors.newWorkStealingPool()); diff --git a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmTags.java b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmTags.java index 22cba7f7c83..0c5dc5d6cb2 100644 --- a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmTags.java +++ b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmTags.java @@ -52,4 +52,10 @@ public class OsmTags { public static final String LIGHT_RAIL = "light_rail"; public static final String MONORAIL = "monorail"; public static final String USAGE = "usage"; + public static final String GAUGE = "gauge"; + public static final String ELECTRIFIED = "electrified"; + public static final String ETCS = "etcs"; + public static final String OPERATOR = "operator"; + + } diff --git a/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java b/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java index 841e535f50a..f483d5c5185 100644 --- a/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java +++ b/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java @@ -1,43 +1,35 @@ package ch.sbb.matsim.contrib.railsim.prepare; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.network.NetworkWriter; -import org.matsim.contrib.osm.networkReader.LinkProperties; import org.matsim.contrib.osm.networkReader.OsmRailwayReader; -import org.matsim.contrib.osm.networkReader.OsmTags; import org.matsim.core.network.algorithms.NetworkCleaner; import org.matsim.core.utils.geometry.CoordinateTransformation; import org.matsim.core.utils.geometry.transformations.TransformationFactory; public class RunRailOsmNetworkReader { - private static final String inputFile = "path/to/file.osm.pbf"; - private static final String outputFile = "path/to/network.xml.gz"; + private static final String baseDirectory = "path/to/directory/"; + + private static final String inputFile = baseDirectory + "switzerland-latest.osm.pbf"; + private static final String outputFile1 = baseDirectory + "switzerland_network.xml.gz"; + private static final String outputFile2 = baseDirectory + "switzerland_network_cleaned.xml.gz"; private static final CoordinateTransformation coordinateTransformation = TransformationFactory.getCoordinateTransformation(TransformationFactory.WGS84, "EPSG:2056"); public static void main(String[] args) { - - ConcurrentMap linkProperties = new ConcurrentHashMap<>(); - linkProperties.put(OsmTags.RAIL, new LinkProperties(1, 1, 30., 1000., false)); - linkProperties.put(OsmTags.NARROW_GAUGE, new LinkProperties(2, 1, 30., 1000., false)); - linkProperties.put(OsmTags.LIGHT_RAIL, new LinkProperties(3, 1, 30., 1000., false)); - linkProperties.put(OsmTags.SUBWAY, new LinkProperties(4, 1, 30., 1000., false)); - linkProperties.put(OsmTags.MONORAIL, new LinkProperties(5, 1, 30., 1000., false)); Network network = new OsmRailwayReader.Builder() .setCoordinateTransformation(coordinateTransformation) - .setLinkProperties(linkProperties) - .setPreserveNodeWithId(id -> true) // this filter keeps the detailed geometries + .setPreserveNodeWithId(id -> true) // this filter keeps the detailed geometries, only required for cosmetic reasons .build() .read(inputFile); network.getAttributes().putAttribute("data_origin", "OSM"); + new NetworkWriter(network).write(outputFile1); + new NetworkCleaner().run(network); - new NetworkWriter(network).write(outputFile); + new NetworkWriter(network).write(outputFile2); } } From 1d2dc59747e768af5e7d667f9045b487e8b1d4b3 Mon Sep 17 00:00:00 2001 From: ikaddoura Date: Tue, 26 Mar 2024 11:43:28 +0100 Subject: [PATCH 4/8] add an alternative constructor which allows for other way types, e.g. railway --- .../osm/networkReader/OsmNetworkParser.java | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmNetworkParser.java b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmNetworkParser.java index 168f57ace1a..4f4e9f72fe2 100644 --- a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmNetworkParser.java +++ b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmNetworkParser.java @@ -28,12 +28,39 @@ class OsmNetworkParser { Map ways; Map nodes; Map> nodeReferences; - + private final String wayType; + + /** + * The default constructor for roads (OSM highway tag) + * + * @param transformation + * @param linkProperties + * @param linkFilter + * @param executor + */ OsmNetworkParser(CoordinateTransformation transformation, Map linkProperties, BiPredicate linkFilter, ExecutorService executor) { this.transformation = transformation; this.linkProperties = linkProperties; this.linkFilter = linkFilter; this.executor = executor; + this.wayType = OsmTags.HIGHWAY; + } + + /** + * A more flexible constructor which allows to pass a different way type, e.g. railway + * + * @param transformation + * @param linkProperties + * @param linkFilter + * @param executor + * @param wayType + */ + OsmNetworkParser(CoordinateTransformation transformation, Map linkProperties, BiPredicate linkFilter, ExecutorService executor, String wayType) { + this.transformation = transformation; + this.linkProperties = linkProperties; + this.linkFilter = linkFilter; + this.executor = executor; + this.wayType = wayType; } public Map getWays() { @@ -106,7 +133,7 @@ void handleWay(OsmWay osmWay) { Map tags = OsmModelUtil.getTagsAsMap(osmWay); if (isStreetOfInterest(tags)) { - LinkProperties linkProperty = linkProperties.get(tags.get(OsmTags.HIGHWAY)); + LinkProperties linkProperty = linkProperties.get(tags.get(wayType)); ProcessedOsmWay processedWay = ProcessedOsmWay.create(osmWay, tags, linkProperty); ways.put(osmWay.getId(), processedWay); @@ -125,7 +152,7 @@ void handleWay(OsmWay osmWay) { } private boolean isStreetOfInterest(Map tags) { - return tags.containsKey(OsmTags.HIGHWAY) && linkProperties.containsKey(tags.get(OsmTags.HIGHWAY)); + return tags.containsKey(wayType) && linkProperties.containsKey(tags.get(wayType)); } private boolean isEndNodeOfReferencingLink(OsmNode node, ProcessedOsmWay processedOsmWay) { From b74fdd29650ae5b349909ee477196b52b4b3a6a0 Mon Sep 17 00:00:00 2001 From: ikaddoura Date: Tue, 26 Mar 2024 11:45:08 +0100 Subject: [PATCH 5/8] use more generic osm network parser --- .../org/matsim/contrib/osm/networkReader/OsmRailwayReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java index a2d6ffbf0e9..be35630e2a5 100644 --- a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java +++ b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java @@ -98,7 +98,7 @@ public Builder() { @Override OsmRailwayReader createInstance() { - OsmRailwayParser parser = new OsmRailwayParser(coordinateTransformation, linkProperties, includeLinkAtCoordWithHierarchy, Executors.newWorkStealingPool()); + OsmNetworkParser parser = new OsmNetworkParser(coordinateTransformation, linkProperties, includeLinkAtCoordWithHierarchy, Executors.newWorkStealingPool(), OsmTags.RAILWAY); return new OsmRailwayReader(parser, preserveNodeWithId, includeLinkAtCoordWithHierarchy, afterLinkCreated, freeSpeedFactor, adjustCapacityLength, storeOriginalGeometry); } } From cfff352ec7534eb53228c7423e47a4eec016b7d4 Mon Sep 17 00:00:00 2001 From: ikaddoura Date: Tue, 26 Mar 2024 11:45:27 +0100 Subject: [PATCH 6/8] remove first copy paste approach --- .../osm/networkReader/OsmRailwayParser.java | 143 ------------------ 1 file changed, 143 deletions(-) delete mode 100644 contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayParser.java diff --git a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayParser.java b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayParser.java deleted file mode 100644 index 3e9c9053b55..00000000000 --- a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayParser.java +++ /dev/null @@ -1,143 +0,0 @@ -package org.matsim.contrib.osm.networkReader; - -import de.topobyte.osm4j.core.model.iface.OsmNode; -import de.topobyte.osm4j.core.model.iface.OsmWay; -import de.topobyte.osm4j.core.model.util.OsmModelUtil; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.matsim.api.core.v01.Coord; -import org.matsim.core.utils.geometry.CoordinateTransformation; - -import java.nio.file.Path; -import java.text.NumberFormat; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.function.BiPredicate; -import java.util.stream.Collectors; - -class OsmRailwayParser extends OsmNetworkParser { - - private static final Logger log = LogManager.getLogger(OsmRailwayParser.class); - private static final NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.UK); - - private final CoordinateTransformation transformation; - private final Map linkProperties; - private final BiPredicate linkFilter; - final ExecutorService executor; - Map ways; - Map nodes; - Map> nodeReferences; - - OsmRailwayParser(CoordinateTransformation transformation, Map linkProperties, BiPredicate linkFilter, ExecutorService executor) { - super(transformation, linkProperties, linkFilter, executor); - - this.transformation = transformation; - this.linkProperties = linkProperties; - this.linkFilter = linkFilter; - this.executor = executor; - } - - public Map getWays() { - return ways; - } - - public Map getNodes() { - return nodes; - } - - void parse(Path inputFile) { - - // make sure we have empty collections - ways = new ConcurrentHashMap<>(); - nodes = new ConcurrentHashMap<>(); - nodeReferences = new ConcurrentHashMap<>(); - - new PbfParser.Builder() - .setWaysHandler(this::handleWay) - .setExecutor(executor) - .build() - .parse(inputFile); - - log.info("Finished reading ways"); - log.info("Starting to read nodes"); - - new PbfParser.Builder() - .setNodeHandler(this::handleNode) - .setExecutor(executor) - .build() - .parse(inputFile); - - log.info("finished reading nodes"); - } - - void handleNode(OsmNode osmNode) { - - if (nodeReferences.containsKey(osmNode.getId())) { - - List waysThatReferenceNode = nodeReferences.get(osmNode.getId()); - Coord transformedCoord = transformation.transform(new Coord(osmNode.getLongitude(), osmNode.getLatitude())); - - // 'testWhetherReferencingLinksAreInFilter' may be expensive because it might include a test whether the - // supplied coordinate is within a shape. Therefore we want to test as few cases as possible. Two cases are tested anyway: - // 1. if more than one way references this node, this node is an intersection and a possible end node for a - // matsim link. - // 2. if this node is either the start- or end node of a referencing way which makes it a candidate for a node - // in a matsim link as well - // - // if a way has both ends outside the filter and no intersections within the filter it will not be included - // in the final network. I think this is unlikely in real world scenarios, so I think we can live with this - // to achieve faster execution - List filteredReferencingLinks; - if (waysThatReferenceNode.size() > 1 || isEndNodeOfReferencingLink(osmNode, waysThatReferenceNode.get(0))) - filteredReferencingLinks = testWhetherReferencingLinksAreInFilter(transformedCoord, waysThatReferenceNode); - else - filteredReferencingLinks = Collections.emptyList(); - - ProcessedOsmNode result = new ProcessedOsmNode(osmNode.getId(), filteredReferencingLinks, transformedCoord); - this.nodes.put(result.getId(), result); - - if (nodes.size() % 100000 == 0) { - log.info("Added " + numberFormat.format(nodes.size()) + " nodes"); - } - } - } - - void handleWay(OsmWay osmWay) { - - Map tags = OsmModelUtil.getTagsAsMap(osmWay); - - if (isStreetOfInterest(tags)) { - LinkProperties linkProperty = linkProperties.get(tags.get(OsmTags.RAILWAY)); - ProcessedOsmWay processedWay = ProcessedOsmWay.create(osmWay, tags, linkProperty); - ways.put(osmWay.getId(), processedWay); - - // keep track of which node is referenced by which way - for (int i = 0; i < osmWay.getNumberOfNodes(); i++) { - - long nodeId = osmWay.getNodeId(i); - nodeReferences.computeIfAbsent(nodeId, id -> Collections.synchronizedList(new ArrayList<>())) - .add(processedWay); - } - - if (ways.size() % 10000 == 0) { - log.info("Added " + numberFormat.format(ways.size()) + " ways"); - } - } - } - - private boolean isStreetOfInterest(Map tags) { - return tags.containsKey(OsmTags.RAILWAY) && linkProperties.containsKey(tags.get(OsmTags.RAILWAY)); - } - - private boolean isEndNodeOfReferencingLink(OsmNode node, ProcessedOsmWay processedOsmWay) { - return processedOsmWay.getEndNodeId() == node.getId() || processedOsmWay.getStartNode() == node.getId(); - } - - private List testWhetherReferencingLinksAreInFilter(Coord coord, List waysThatReferenceNode) { - - return waysThatReferenceNode.stream() - .filter(way -> linkFilter.test(coord, way.getLinkProperties().hierarchyLevel)) - .collect(Collectors.toList()); - } -} From 49e34dac71e340b55e5f6e2cdb4466242f438cf7 Mon Sep 17 00:00:00 2001 From: ikaddoura Date: Tue, 26 Mar 2024 12:56:42 +0100 Subject: [PATCH 7/8] adjust the railway defaults --- .../osm/networkReader/OsmRailwayReader.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java index be35630e2a5..d20d7693ef7 100644 --- a/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java +++ b/contribs/osm/src/main/java/org/matsim/contrib/osm/networkReader/OsmRailwayReader.java @@ -15,6 +15,8 @@ import org.matsim.core.network.NetworkUtils; public final class OsmRailwayReader extends SupersonicOsmNetworkReader { + + private static final double FALLBACK_MAX_SPEED = 100.; public OsmRailwayReader(OsmNetworkParser parser, Predicate preserveNodeWithId, @@ -57,6 +59,8 @@ private static void setAttributes(Link link, Map tags) { if (tags.containsKey(OsmTags.MAXSPEED)) { link.getAttributes().putAttribute(OsmTags.MAXSPEED, tags.get(OsmTags.MAXSPEED)); + } else { + link.getAttributes().putAttribute(OsmTags.MAXSPEED, FALLBACK_MAX_SPEED); } if (tags.containsKey(OsmTags.ETCS)) { @@ -86,12 +90,12 @@ public static class Builder extends AbstractBuilder { public Builder() { ConcurrentMap linkProperties = new ConcurrentHashMap<>(); linkProperties.put(OsmTags.RAIL, new LinkProperties(1, 1, 30., 1000., false)); - linkProperties.put(OsmTags.NARROW_GAUGE, new LinkProperties(2, 1, 30., 1000., false)); - linkProperties.put(OsmTags.LIGHT_RAIL, new LinkProperties(3, 1, 30., 1000., false)); - linkProperties.put(OsmTags.MONORAIL, new LinkProperties(4, 1, 30., 1000., false)); - linkProperties.put(OsmTags.FUNICULAR, new LinkProperties(5, 1, 30., 1000., false)); - linkProperties.put(OsmTags.SUBWAY, new LinkProperties(6, 1, 30., 1000., false)); - linkProperties.put(OsmTags.TRAM, new LinkProperties(7, 1, 30., 1000., false)); + linkProperties.put(OsmTags.NARROW_GAUGE, new LinkProperties(1, 1, 30., 1000., false)); + linkProperties.put(OsmTags.LIGHT_RAIL, new LinkProperties(1, 1, 30., 1000., false)); + linkProperties.put(OsmTags.MONORAIL, new LinkProperties(1, 1, 30., 1000., false)); + linkProperties.put(OsmTags.FUNICULAR, new LinkProperties(1, 1, 30., 1000., false)); + linkProperties.put(OsmTags.SUBWAY, new LinkProperties(1, 1, 30., 1000., false)); + linkProperties.put(OsmTags.TRAM, new LinkProperties(1, 1, 30., 1000., false)); setLinkProperties(linkProperties); } From c1df036411acab2e83f5eb8dab005c3ea0ec5633 Mon Sep 17 00:00:00 2001 From: ikaddoura Date: Tue, 9 Apr 2024 11:20:51 +0200 Subject: [PATCH 8/8] remove dependency to osm contrib --- contribs/railsim/pom.xml | 7 ---- .../prepare/RunRailOsmNetworkReader.java | 35 ------------------- 2 files changed, 42 deletions(-) delete mode 100644 contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java diff --git a/contribs/railsim/pom.xml b/contribs/railsim/pom.xml index 5398dba3ae7..b6172ab206c 100644 --- a/contribs/railsim/pom.xml +++ b/contribs/railsim/pom.xml @@ -28,13 +28,6 @@ mockito-core test - - - org.matsim.contrib - osm - 16.0-SNAPSHOT - compile - diff --git a/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java b/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java deleted file mode 100644 index f483d5c5185..00000000000 --- a/contribs/railsim/src/main/java/ch/sbb/matsim/contrib/railsim/prepare/RunRailOsmNetworkReader.java +++ /dev/null @@ -1,35 +0,0 @@ -package ch.sbb.matsim.contrib.railsim.prepare; - -import org.matsim.api.core.v01.network.Network; -import org.matsim.api.core.v01.network.NetworkWriter; -import org.matsim.contrib.osm.networkReader.OsmRailwayReader; -import org.matsim.core.network.algorithms.NetworkCleaner; -import org.matsim.core.utils.geometry.CoordinateTransformation; -import org.matsim.core.utils.geometry.transformations.TransformationFactory; - -public class RunRailOsmNetworkReader { - - private static final String baseDirectory = "path/to/directory/"; - - private static final String inputFile = baseDirectory + "switzerland-latest.osm.pbf"; - private static final String outputFile1 = baseDirectory + "switzerland_network.xml.gz"; - private static final String outputFile2 = baseDirectory + "switzerland_network_cleaned.xml.gz"; - - private static final CoordinateTransformation coordinateTransformation = TransformationFactory.getCoordinateTransformation(TransformationFactory.WGS84, "EPSG:2056"); - - public static void main(String[] args) { - - Network network = new OsmRailwayReader.Builder() - .setCoordinateTransformation(coordinateTransformation) - .setPreserveNodeWithId(id -> true) // this filter keeps the detailed geometries, only required for cosmetic reasons - .build() - .read(inputFile); - - network.getAttributes().putAttribute("data_origin", "OSM"); - - new NetworkWriter(network).write(outputFile1); - - new NetworkCleaner().run(network); - new NetworkWriter(network).write(outputFile2); - } -}