fix: external inlinks for LTZ policy

eqasim-org · Jan 21, 2025 · abcc903 · abcc903
1 parent ccbc69d
commit abcc903
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/...france/src/main/java/org/eqasim/ile_de_france/policies/city_tax/CityTaxPolicyFactory.java b/...france/src/main/java/org/eqasim/ile_de_france/policies/city_tax/CityTaxPolicyFactory.java
@@ -56,7 +56,7 @@ private Policy createPolicy(CityTaxConfigGroup enterConfig, PolicyPersonFilter p
 		IdSet<Link> linkIds = PolicyLinkFinder
 				.create(new File(
 						ConfigGroup.getInputFileURL(config.getContext(), enterConfig.perimetersPath).getPath()))
-				.findLinks(network, Predicate.Entering);
+				.findLinks(network, Predicate.Entering, false);
 
 		logger.info("  Affected entering links: " + linkIds.size());
 

diff --git a/...g/eqasim/ile_de_france/policies/limited_traffic_zone/LimitedTrafficZonePolicyFactory.java b/...g/eqasim/ile_de_france/policies/limited_traffic_zone/LimitedTrafficZonePolicyFactory.java
@@ -67,7 +67,7 @@ private Policy createPolicy(LimitedTrafficZoneConfigGroup ltzConfig, PolicyPerso
 			linkIds = PolicyLinkFinder
 					.create(new File(
 							ConfigGroup.getInputFileURL(config.getContext(), ltzConfig.perimetersPath).getPath()))
-					.findLinks(network, Predicate.Inside);
+					.findLinks(network, Predicate.Inside, true);
 
 			logger.info("  Affected inside links: " + linkIds.size());
 		} else if (!ltzConfig.linkListPath.isEmpty()) {

diff --git a/ile_de_france/src/main/java/org/eqasim/ile_de_france/policies/routing/PolicyLinkFinder.java b/ile_de_france/src/main/java/org/eqasim/ile_de_france/policies/routing/PolicyLinkFinder.java
@@ -14,9 +14,11 @@
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.Point;
 import org.matsim.api.core.v01.Coord;
+import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.IdSet;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
+import org.matsim.api.core.v01.network.Node;
 
 public class PolicyLinkFinder {
 	private final static GeometryFactory geometryFactory = new GeometryFactory();
@@ -31,7 +33,7 @@ public enum Predicate {
 		Entering, Exiting, Crossing, Inside
 	}
 
-	public IdSet<Link> findLinks(Network network, Predicate predicate) {
+	public IdSet<Link> findLinks(Network network, Predicate predicate, boolean includeConnecting) {
 		IdSet<Link> linkIds = new IdSet<>(Link.class);
 
 		for (Link link : network.getLinks().values()) {
@@ -58,6 +60,38 @@ public IdSet<Link> findLinks(Network network, Predicate predicate) {
 			}
 		}
 
+		if (includeConnecting) {
+			boolean continueNextRound = true;
+			while (continueNextRound) {
+				continueNextRound = false;
+
+				for (Link link : network.getLinks().values()) {
+					if (linkIds.contains(link.getId())) {
+						continue; // skip tagged links
+					}
+
+					Node toNode = link.getToNode();
+
+					boolean allConnectionsTagged = true;
+					for (Id<Link> outlinkId : toNode.getOutLinks().keySet()) {
+						if (outlinkId.equals(link.getId())) {
+							continue; // skip self loops
+						}
+
+						if (!linkIds.contains(outlinkId)) {
+							allConnectionsTagged = false;
+							break;
+						}
+					}
+
+					if (allConnectionsTagged) {
+						continueNextRound = true;
+						linkIds.add(link.getId());
+					}
+				}
+			}
+		}
+
 		return linkIds;
 	}