fix: support multiple networks on BusinessAreaBorder vertices

BusinessAreaBorder previously held a single network string, so when
multiple operators' business areas shared boundary edges, the last one
to be applied would overwrite earlier ones. This caused riders on
overwritten networks to pass through the border unchecked.

BusinessAreaBorder now holds a Set<String> of networks. Vertex methods
are additive (addBusinessAreaBorderNetwork) and removal is per-network
(removeBusinessAreaBorderNetwork), so updaters only remove their own
network without affecting others.

Also fixes the graph builder to group business areas by network before
computing the union polygon

Author: testower

application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java

@@ -13,7 +13,6 @@
 import org.opentripplanner.service.vehiclerental.VehicleRentalRepository;
 import org.opentripplanner.service.vehiclerental.model.GeofencingZone;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
-import org.opentripplanner.service.vehiclerental.street.BusinessAreaBorder;
 import org.opentripplanner.service.vehiclerental.street.GeofencingBoundaryExtension;
 import org.opentripplanner.service.vehiclerental.street.GeofencingZoneApplier;
 import org.opentripplanner.service.vehiclerental.street.GeofencingZoneIndex;
@@ -54,7 +53,7 @@ public class VehicleRentalUpdater extends PollingGraphUpdater {
   private final String nameForLogging;
   private final boolean applyBusinessAreas;
 
-  private Map<StreetEdge, BusinessAreaBorder> latestBusinessAreaEdges = Map.of();
+  private Map<StreetEdge, String> latestBusinessAreaEdges = Map.of();
   private Map<StreetEdge, GeofencingBoundaryExtension> latestBoundaryEdges = Map.of();
   private GeofencingZoneIndex latestZoneIndex;
   private Set<GeofencingZone> latestAppliedGeofencingZones = Set.of();
@@ -217,7 +216,7 @@ public void run(RealTimeUpdateContext context) {
         LOG.info("Computing geofencing zones for {}", nameForLogging);
         var start = System.currentTimeMillis();
 
-        latestBusinessAreaEdges.forEach((edge, border) -> edge.removeBusinessAreaBorder());
+        latestBusinessAreaEdges.forEach(StreetEdge::removeBusinessAreaBorderNetwork);
         latestBoundaryEdges.forEach(StreetEdge::removeGeofencingBoundary);
 
         var graph = context.graph();

street/src/main/java/org/opentripplanner/service/vehiclerental/street/BusinessAreaBorder.java

@@ -1,11 +1,13 @@
 package org.opentripplanner.service.vehiclerental.street;
 
+import java.util.HashSet;
+import java.util.Set;
 import org.opentripplanner.street.search.state.State;
 
 /**
- * Marks a vertex as being on the border of a rental network's business area.
- * Traversal is banned for vehicles of the matching network — they cannot leave
- * the business area. Enforced via {@code Vertex.rentalTraversalBanned(State)}.
+ * Marks a vertex as being on the border of one or more rental networks' business areas.
+ * Traversal is banned for vehicles of any matching network — they cannot leave
+ * their business area. Enforced via {@code Vertex.rentalTraversalBanned(State)}.
  *
  * @deprecated Business areas are an OTP-specific concept not defined in the GBFS spec.
  *     They are inferred from GBFS zones with no restrictions, but this inference is
@@ -16,10 +18,22 @@
 @Deprecated
 public final class BusinessAreaBorder {
 
-  private final String network;
+  private final Set<String> networks;
 
-  public BusinessAreaBorder(String network) {
-    this.network = network;
+  public BusinessAreaBorder() {
+    this.networks = new HashSet<>();
+  }
+
+  public void addNetwork(String network) {
+    networks.add(network);
+  }
+
+  public void removeNetwork(String network) {
+    networks.remove(network);
+  }
+
+  public boolean isEmpty() {
+    return networks.isEmpty();
   }
 
   public boolean traversalBanned(State state) {
@@ -31,10 +45,10 @@ public boolean traversalBanned(State state) {
     if (state.getVehicleRentalNetwork() == null) {
       return false;
     }
-    return network.equals(state.getVehicleRentalNetwork());
+    return networks.contains(state.getVehicleRentalNetwork());
   }
 
-  public String network() {
-    return network;
+  public Set<String> networks() {
+    return Set.copyOf(networks);
   }
 }

street/src/main/java/org/opentripplanner/service/vehiclerental/street/GeofencingZoneApplier.java

@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 import org.locationtech.jts.geom.Envelope;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.LineString;
@@ -54,21 +55,22 @@ public GeofencingZoneApplierResult applyGeofencingZones(
       .filter(z -> z.geometry() != null)
       .toList();
 
-    var businessAreaEdges = new HashMap<StreetEdge, BusinessAreaBorder>();
+    var businessAreaEdges = new HashMap<StreetEdge, String>();
 
     // Boundary marking: apply GeofencingBoundaryExtension to boundary-crossing edges
     var boundaryEdges = addBoundaryExtensions(zonesWithGeometry);
 
     // Business area borders (deprecated — not a GBFS concept)
     if (applyBusinessAreas) {
-      var generalBusinessAreas = geofencingZones
+      var businessAreasByNetwork = geofencingZones
         .stream()
         .filter(GeofencingZone::isBusinessArea)
-        .toList();
+        .collect(Collectors.groupingBy(z -> z.id().getFeedId()));
 
-      if (!generalBusinessAreas.isEmpty()) {
-        var network = generalBusinessAreas.get(0).id().getFeedId();
-        var polygons = generalBusinessAreas
+      for (var entry : businessAreasByNetwork.entrySet()) {
+        var network = entry.getKey();
+        var polygons = entry
+          .getValue()
           .stream()
           .map(GeofencingZone::geometry)
           .toArray(Geometry[]::new);
@@ -77,9 +79,7 @@ public GeofencingZoneApplierResult applyGeofencingZones(
           .createGeometryCollection(polygons)
           .union();
 
-        businessAreaEdges.putAll(
-          applyBusinessAreaBorder(unionOfBusinessAreas, new BusinessAreaBorder(network))
-        );
+        businessAreaEdges.putAll(applyBusinessAreaBorder(unionOfBusinessAreas, network));
       }
     }
 
@@ -161,11 +161,8 @@ private Map<StreetEdge, GeofencingBoundaryExtension> addBoundaryExtensions(
    * Apply a business area border extension to edges that cross the boundary of the polygon.
    * Uses vertex containment to detect boundary crossings without decompressing edge geometry.
    */
-  private Map<StreetEdge, BusinessAreaBorder> applyBusinessAreaBorder(
-    Geometry polygon,
-    BusinessAreaBorder ext
-  ) {
-    var edgesUpdated = new HashMap<StreetEdge, BusinessAreaBorder>();
+  private Map<StreetEdge, String> applyBusinessAreaBorder(Geometry polygon, String network) {
+    var edgesUpdated = new HashMap<StreetEdge, String>();
     Set<Edge> candidates = Set.copyOf(findEdgesForEnvelope.apply(polygon.getEnvelopeInternal()));
     var preparedPolygon = PreparedGeometryFactory.prepare(polygon);
     var polygonBBox = polygon.getEnvelopeInternal();
@@ -186,8 +183,8 @@ private Map<StreetEdge, BusinessAreaBorder> applyBusinessAreaBorder(
         boolean toInZone = toMayBeInZone && preparedPolygon.covers(gf.createPoint(toCoord));
 
         if (fromInZone != toInZone) {
-          streetEdge.setBusinessAreaBorder(ext);
-          edgesUpdated.put(streetEdge, ext);
+          streetEdge.addBusinessAreaBorderNetwork(network);
+          edgesUpdated.put(streetEdge, network);
         }
       }
     }

street/src/main/java/org/opentripplanner/service/vehiclerental/street/GeofencingZoneApplierResult.java

@@ -6,12 +6,12 @@
 /**
  * Result of applying geofencing zones to the street graph.
  *
- * @param businessAreaEdges edges with BusinessAreaBorder, tracked for cleanup on subsequent runs
+ * @param businessAreaEdges edges with BusinessAreaBorder (edge → network), tracked for cleanup
  * @param boundaryEdges edges with boundary-crossing extensions, tracked for cleanup
  * @param zoneIndex spatial index of all zones for containment queries
  */
 public record GeofencingZoneApplierResult(
-  Map<StreetEdge, BusinessAreaBorder> businessAreaEdges,
+  Map<StreetEdge, String> businessAreaEdges,
   Map<StreetEdge, GeofencingBoundaryExtension> boundaryEdges,
   GeofencingZoneIndex zoneIndex
 ) {}

street/src/main/java/org/opentripplanner/street/linking/VertexLinker.java

@@ -557,8 +557,10 @@ private SplitterVertex createSplitVertex(
     v.copyRentalRestrictionsFrom(originalEdge.getFromVertex());
     // Also copy from tov if it has different restrictions
     var toVertex = originalEdge.getToVertex();
-    if (toVertex.getBusinessAreaBorder() != null && v.getBusinessAreaBorder() == null) {
-      v.setBusinessAreaBorder(toVertex.getBusinessAreaBorder());
+    if (toVertex.getBusinessAreaBorder() != null) {
+      for (var network : toVertex.getBusinessAreaBorder().networks()) {
+        v.addBusinessAreaBorderNetwork(network);
+      }
     }
     for (var boundary : toVertex.getGeofencingBoundaries()) {
       if (!v.getGeofencingBoundaries().contains(boundary)) {

street/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java

@@ -12,7 +12,6 @@
 import org.locationtech.jts.geom.impl.PackedCoordinateSequence;
 import org.opentripplanner.core.model.i18n.I18NString;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleType.PropulsionType;
-import org.opentripplanner.service.vehiclerental.street.BusinessAreaBorder;
 import org.opentripplanner.service.vehiclerental.street.GeofencingBoundaryExtension;
 import org.opentripplanner.street.geometry.CompactLineStringUtils;
 import org.opentripplanner.street.geometry.DirectionUtils;
@@ -535,9 +534,9 @@ public void removeGeofencingBoundary(GeofencingBoundaryExtension ext) {
     tov.removeGeofencingBoundary(ext);
   }
 
-  public void removeBusinessAreaBorder() {
-    fromv.removeBusinessAreaBorder();
-    tov.removeBusinessAreaBorder();
+  public void removeBusinessAreaBorderNetwork(String network) {
+    fromv.removeBusinessAreaBorderNetwork(network);
+    tov.removeBusinessAreaBorderNetwork(network);
   }
 
   @Override
@@ -660,8 +659,8 @@ public void addGeofencingBoundary(GeofencingBoundaryExtension ext) {
     fromv.addGeofencingBoundary(ext);
   }
 
-  public void setBusinessAreaBorder(BusinessAreaBorder border) {
-    fromv.setBusinessAreaBorder(border);
+  public void addBusinessAreaBorderNetwork(String network) {
+    fromv.addBusinessAreaBorderNetwork(network);
   }
 
   /**

street/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java

@@ -313,8 +313,20 @@ private boolean hasGeofencingBoundaryMatching(State currentState, boolean traver
     return false;
   }
 
-  public void setBusinessAreaBorder(BusinessAreaBorder border) {
-    this.businessAreaBorder = border;
+  public void addBusinessAreaBorderNetwork(String network) {
+    if (businessAreaBorder == null) {
+      businessAreaBorder = new BusinessAreaBorder();
+    }
+    businessAreaBorder.addNetwork(network);
+  }
+
+  public void removeBusinessAreaBorderNetwork(String network) {
+    if (businessAreaBorder != null) {
+      businessAreaBorder.removeNetwork(network);
+      if (businessAreaBorder.isEmpty()) {
+        businessAreaBorder = null;
+      }
+    }
   }
 
   @javax.annotation.Nullable
@@ -341,15 +353,19 @@ public void removeGeofencingBoundary(GeofencingBoundaryExtension ext) {
     geofencingBoundaries = List.copyOf(newList);
   }
 
-  public void removeBusinessAreaBorder() {
+  public void removeAllBusinessAreaBorders() {
     this.businessAreaBorder = null;
   }
 
   /**
    * Copy all rental restriction data from another vertex to this one.
    */
   public void copyRentalRestrictionsFrom(Vertex other) {
-    this.businessAreaBorder = other.businessAreaBorder;
+    if (other.businessAreaBorder != null) {
+      for (var network : other.businessAreaBorder.networks()) {
+        addBusinessAreaBorderNetwork(network);
+      }
+    }
     this.geofencingBoundaries = other.geofencingBoundaries;
   }
 

street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeGeofencingTest.java

@@ -18,7 +18,6 @@
 import org.opentripplanner.core.model.id.FeedScopedId;
 import org.opentripplanner.service.vehiclerental.model.GeofencingZone;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleType.PropulsionType;
-import org.opentripplanner.service.vehiclerental.street.BusinessAreaBorder;
 import org.opentripplanner.service.vehiclerental.street.GeofencingBoundaryExtension;
 import org.opentripplanner.street.model.RentalFormFactor;
 import org.opentripplanner.street.model.StreetMode;
@@ -64,30 +63,30 @@ class StreetEdgeGeofencingTest {
   StreetVertex V4 = intersectionVertex("V4", 3, 3);
 
   @Test
-  public void setBusinessAreaBorder() {
+  public void addBusinessAreaBorderNetwork() {
     var edge = streetEdge(V1, V2);
-    edge.setBusinessAreaBorder(new BusinessAreaBorder("a"));
+    edge.addBusinessAreaBorderNetwork("a");
 
     assertTrue(edge.fromv.rentalTraversalBanned(forwardState("a")));
     assertFalse(edge.fromv.rentalTraversalBanned(forwardState("b")));
   }
 
   @Test
-  public void removeBusinessAreaBorder() {
+  public void removeBusinessAreaBorderNetwork() {
     var edge = streetEdge(V1, V2);
-    edge.setBusinessAreaBorder(new BusinessAreaBorder("a"));
+    edge.addBusinessAreaBorderNetwork("a");
 
     assertTrue(edge.fromv.rentalTraversalBanned(forwardState("a")));
 
-    edge.removeBusinessAreaBorder();
+    edge.removeBusinessAreaBorderNetwork("a");
 
     assertFalse(edge.fromv.rentalTraversalBanned(forwardState("a")));
   }
 
   @Test
   public void checkNetwork() {
     var edge = streetEdge(V1, V2);
-    edge.setBusinessAreaBorder(new BusinessAreaBorder("a"));
+    edge.addBusinessAreaBorderNetwork("a");
 
     var state = traverseFromV1(edge);
 
@@ -108,8 +107,7 @@ public void finishInEdgeWithoutRestrictions() {
     @Test
     public void leaveBusinessAreaOnFoot() {
       var edge1 = streetEdge(V1, V2);
-      var ext = new BusinessAreaBorder(NETWORK_TIER);
-      V2.setBusinessAreaBorder(ext);
+      V2.addBusinessAreaBorderNetwork(NETWORK_TIER);
 
       var results = traverseFromV1(edge1);