Move method into sandbox

Author: leonardehrenfried

src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java

@@ -21,6 +21,7 @@
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.Deduplicator;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.transit.model.network.Route;
 import org.opentripplanner.transit.model.organization.Agency;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.Station;
@@ -131,15 +132,6 @@ public List<TransitMode> getModesOfStopLocation(StopLocation stop) {
         }
       }
 
-      @Override
-      public List<Agency> getAgenciesForStopLocation(StopLocation stop) {
-        if (stop.equals(ALEXANDERPLATZ_BUS)) {
-          return List.of(BVG);
-        } else {
-          return List.of();
-        }
-      }
-
       @Override
       public Agency getAgencyForId(FeedScopedId id) {
         if (id.equals(BVG.getId())) {
@@ -148,6 +140,11 @@ public Agency getAgencyForId(FeedScopedId id) {
         return null;
       }
 
+      @Override
+      public Set<Route> getRoutesForStop(StopLocation stop) {
+        return Set.of(TransitModelForTest.route("route1").withAgency(BVG).build());
+      }
+
       @Override
       public FeedInfo getFeedInfo(String feedId) {
         return new FeedInfo(

src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java

@@ -2,11 +2,13 @@
 
 import com.google.common.collect.Iterables;
 import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 import org.opentripplanner.framework.collection.ListUtils;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.model.FeedInfo;
+import org.opentripplanner.transit.model.network.Route;
 import org.opentripplanner.transit.model.organization.Agency;
 import org.opentripplanner.transit.model.site.StopLocation;
 import org.opentripplanner.transit.model.site.StopLocationsGroup;
@@ -59,8 +61,7 @@ Iterable<LuceneStopCluster> generateStopClusters(
 
   LuceneStopCluster map(StopLocationsGroup g) {
     var modes = transitService.getModesOfStopLocationsGroup(g).stream().map(Enum::name).toList();
-    var agencies = transitService
-      .getAgenciesForStopLocationsGroup(g)
+    var agencies = agenciesForStopLocationsGroup(g)
       .stream()
       .map(s -> s.getId().toString())
       .toList();
@@ -75,11 +76,7 @@ LuceneStopCluster map(StopLocationsGroup g) {
   }
 
   Optional<LuceneStopCluster> map(StopLocation sl) {
-    var agencies = transitService
-      .getAgenciesForStopLocation(sl)
-      .stream()
-      .map(a -> a.getId().toString())
-      .toList();
+    var agencies = agenciesForStopLocation(sl).stream().map(a -> a.getId().toString()).toList();
     return Optional
       .ofNullable(sl.getName())
       .map(name -> {
@@ -95,6 +92,19 @@ Optional<LuceneStopCluster> map(StopLocation sl) {
       });
   }
 
+  private List<Agency> agenciesForStopLocation(StopLocation stop) {
+    return transitService.getRoutesForStop(stop).stream().map(Route::getAgency).distinct().toList();
+  }
+
+  private List<Agency> agenciesForStopLocationsGroup(StopLocationsGroup group) {
+    return group
+      .getChildStops()
+      .stream()
+      .flatMap(sl -> agenciesForStopLocation(sl).stream())
+      .distinct()
+      .toList();
+  }
+
   private static StopCluster.Coordinate toCoordinate(WgsCoordinate c) {
     return new StopCluster.Coordinate(c.latitude(), c.longitude());
   }

src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java

@@ -572,21 +572,6 @@ public List<TransitMode> getModesOfStopLocation(StopLocation stop) {
     return sortByOccurrenceAndReduce(getPatternModesOfStop(stop)).toList();
   }
 
-  @Override
-  public List<Agency> getAgenciesForStopLocation(StopLocation stop) {
-    return getRoutesForStop(stop).stream().map(Route::getAgency).distinct().toList();
-  }
-
-  @Override
-  public List<Agency> getAgenciesForStopLocationsGroup(StopLocationsGroup group) {
-    return group
-      .getChildStops()
-      .stream()
-      .flatMap(sl -> getAgenciesForStopLocation(sl).stream())
-      .distinct()
-      .toList();
-  }
-
   /**
    * For each pattern visiting this {@link StopLocation} return its {@link TransitMode}
    */

src/main/java/org/opentripplanner/transit/service/TransitService.java

@@ -215,16 +215,4 @@ List<TripTimeOnDate> stopTimesForPatternAtStop(
    * So, if more patterns of mode BUS than RAIL visit the stop, the result will be [BUS,RAIL].
    */
   List<TransitMode> getModesOfStopLocation(StopLocation stop);
-
-  /**
-   * Iterates over all child stops, the routes that visit this stop and return a de-duplicated list
-   * of their agencies.
-   */
-  List<Agency> getAgenciesForStopLocationsGroup(StopLocationsGroup group);
-
-  /**
-   * Iterates over all routes that visit this stop location and return a de-duplicated list
-   * of their agencies.
-   */
-  List<Agency> getAgenciesForStopLocation(StopLocation stop);
 }

src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java

@@ -76,11 +76,4 @@ void stationModes() {
     var modes = service.getModesOfStopLocationsGroup(STATION);
     assertEquals(List.of(RAIL, FERRY, TRAM), modes);
   }
-
-  @Test
-  void stopAgencies() {
-    var stop = RAIL_PATTERN.getStopPattern().getStop(0);
-    var agencies = service.getAgenciesForStopLocation(stop);
-    assertEquals("[Agency{F:A1 Agency Test}]", agencies.toString());
-  }
 }