Merge remote-tracking branch 'upstream/dev-2.x' into move-nearby-stop-finder

Author: optionsome

application/pom.xml

@@ -288,7 +288,7 @@
         <dependency>
             <groupId>org.onebusaway</groupId>
             <artifactId>onebusaway-gtfs</artifactId>
-            <version>11.2.2</version>
+            <version>12.0.1</version>
         </dependency>
         <!-- Used in DegreeGridNEDTileSource to fetch tiles from Amazon S3 -->
         <dependency>

application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java

@@ -24,7 +24,8 @@
 import org.opentripplanner.framework.application.OTPRequestTimeoutException;
 import org.opentripplanner.model.plan.Itinerary;
 import org.opentripplanner.place.api.NearbyStop;
-import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper;
+import org.opentripplanner.routing.algorithm.mapping.LegsToItineraryMapper;
+import org.opentripplanner.routing.algorithm.mapping.StreetPathToLegsMapper;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.service.streetdetails.StreetDetailsService;
 import org.opentripplanner.street.graph.Graph;
@@ -53,7 +54,7 @@ public class FlexRouter {
   private final FlexIndex flexIndex;
   private final FlexPathCalculator accessFlexPathCalculator;
   private final FlexPathCalculator egressFlexPathCalculator;
-  private final GraphPathToItineraryMapper graphPathToItineraryMapper;
+  private final StreetPathToLegsMapper streetPathToLegsMapper;
   private final FlexAccessEgressCallbackAdapter callbackService;
 
   /* Request data */
@@ -89,7 +90,7 @@ public FlexRouter(
       transitService.getCalendarService()::getServiceDatesForServiceId
     );
     this.callbackService = new CallbackAdapter();
-    this.graphPathToItineraryMapper = new GraphPathToItineraryMapper(
+    this.streetPathToLegsMapper = new StreetPathToLegsMapper(
       new TransitServiceResolver(transitService),
       transitService.getTimeZone(),
       graph.streetNotesService,
@@ -143,13 +144,10 @@ public List<Itinerary> createFlexOnlyItineraries(boolean arriveBy, RouteRequest
 
     for (DirectFlexPath it : directFlexPaths) {
       var startTime = startOfTime.plusSeconds(it.startTime());
-      var itinerary = graphPathToItineraryMapper
-        .generateItinerary(new StreetPath(it.state()), request)
-        .withTimeShiftToStartAt(startTime);
-
-      if (itinerary != null) {
-        itineraries.add(itinerary);
-      }
+      var path = new StreetPath(it.state());
+      var legs = streetPathToLegsMapper.map(path, request, startTime);
+      var itinerary = LegsToItineraryMapper.map(legs, false, path.calculateElevations());
+      itinerary.ifPresent(itineraries::add);
     }
     return itineraries;
   }

application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayAtDistanceType.java

@@ -9,7 +9,7 @@
 import graphql.schema.GraphQLOutputType;
 import java.util.Optional;
 import org.opentripplanner.api.model.transit.FeedScopedIdMapper;
-import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
+import org.opentripplanner.apis.transmodel.TransmodelRequestContext;
 import org.opentripplanner.place.api.NearbyStop;
 import org.opentripplanner.transit.service.TransitService;
 
@@ -61,6 +61,6 @@ public GraphQLObjectType createQD(GraphQLOutputType quayType, Relay relay) {
   }
 
   private TransitService getTransitService(DataFetchingEnvironment environment) {
-    return environment.<GraphQLRequestContext>getContext().transitService();
+    return environment.<TransmodelRequestContext>getContext().getTransitService();
   }
 }

application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyType.java

@@ -72,10 +72,21 @@ public GraphQLObjectType create(
       .field(
         GraphQLFieldDefinition.newFieldDefinition()
           .name("tripAlteration")
-          .description("Alterations specified on the Trip in the planned data")
+          .description(
+            "Alterations specified on the Trip in the planned data. Note: realtime alterations are not included"
+          )
           .type(EnumTypes.SERVICE_ALTERATION)
           .dataFetcher(environment -> tripOnServiceDate(environment).getTripAlteration())
       )
+      .field(
+        GraphQLFieldDefinition.newFieldDefinition()
+          .name("extraJourney")
+          .description(
+            "Whether this is an extra journey, either from planned data or added in realtime"
+          )
+          .type(new GraphQLNonNull(Scalars.GraphQLBoolean))
+          .dataFetcher(environment -> tripOnServiceDate(environment).isExtraJourney())
+      )
       .field(
         GraphQLFieldDefinition.newFieldDefinition()
           .name("replacementFor")

application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java

@@ -223,7 +223,8 @@ private static List<StyleBuilder> stops(
         .fillOpacity(0.5f)
         .fillOutlineColor(BLACK)
         .minZoom(6)
-        .maxZoom(MAX_ZOOM),
+        .maxZoom(MAX_ZOOM)
+        .intiallyHidden(),
       StyleBuilder.ofId("group-stop")
         .group(STOPS_GROUP)
         .typeFill()
@@ -232,7 +233,8 @@ private static List<StyleBuilder> stops(
         .fillOpacity(0.5f)
         .fillOutlineColor(BLACK)
         .minZoom(6)
-        .maxZoom(MAX_ZOOM),
+        .maxZoom(MAX_ZOOM)
+        .intiallyHidden(),
       StyleBuilder.ofId("regular-stop")
         .group(STOPS_GROUP)
         .typeCircle()

application/src/main/java/org/opentripplanner/graph_builder/issues/ElevationFlattened.java

@@ -2,10 +2,11 @@
 
 import org.locationtech.jts.geom.Geometry;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssue;
+import org.opentripplanner.graph_builder.issue.api.OsmUrlGenerator;
 import org.opentripplanner.street.model.edge.Edge;
 
 public record ElevationFlattened(Edge edge) implements DataImportIssue {
-  private static final String FMT = "Edge %s was steeper than Baldwin Street and was flattened.";
+  private static final String FMT = "Edge %s was steeper than 35 percent and flattened.";
 
   @Override
   public String getMessage() {
@@ -16,4 +17,12 @@ public String getMessage() {
   public Geometry getGeometry() {
     return edge.getGeometry();
   }
+
+  @Override
+  public String getHTMLMessage() {
+    return "<a href='%s'>Edge %s</a> was steeper than 35 percent and flattened.".formatted(
+      OsmUrlGenerator.fromCoordinate(edge.getFromVertex().getCoordinate()),
+      edge.getName()
+    );
+  }
 }

application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java

@@ -420,7 +420,8 @@ private static ElevationModule createElevationModule(
       config.distanceBetweenElevationSamples,
       config.maxElevationPropagationMeters,
       config.includeEllipsoidToGeoidDifference,
-      config.multiThreadElevationCalculations
+      config.multiThreadElevationCalculations,
+      config.elevationTileCacheSizeMB
     );
   }
 

application/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java

@@ -18,6 +18,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.eclipse.imagen.ImageN;
+import org.eclipse.imagen.TileCache;
 import org.geotools.api.coverage.Coverage;
 import org.geotools.api.coverage.PointOutsideCoverageException;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
@@ -62,6 +64,9 @@
 public class ElevationModule implements GraphBuilderModule {
 
   private static final Logger LOG = LoggerFactory.getLogger(ElevationModule.class);
+
+  private static final long ONE_MEGABYTE = 1024L * 1024L;
+
   /**
    * The WGS84 CRS with longitude-first axis order. The first time a CRS lookup is
    * performed is surprisingly expensive (around 500ms), apparently due to  initializing
@@ -99,6 +104,11 @@ public class ElevationModule implements GraphBuilderModule {
    * data and machine settings, it might be faster to use a single processor.
    */
   private final boolean multiThreadElevationCalculations;
+  /**
+   * Memory budget (in megabytes) for the Imagen tile cache. Applied to
+   * {@link org.eclipse.imagen.ImageN#getDefaultInstance()} before any tile is fetched.
+   */
+  private final int elevationTileCacheSizeMB;
   // Keep track of the proportion of elevation fetch operations that fail so we can issue warnings. AtomicInteger is
   // used to provide thread-safe updating capabilities.
   private final AtomicInteger nPointsEvaluated = new AtomicInteger(0);
@@ -138,7 +148,8 @@ public ElevationModule(ElevationGridCoverageFactory factory, Graph graph) {
       10,
       2000,
       true,
-      false
+      false,
+      100
     );
   }
 
@@ -153,7 +164,8 @@ public ElevationModule(
     double distanceBetweenSamplesM,
     double maxElevationPropagationMeters,
     boolean includeEllipsoidToGeoidDifference,
-    boolean multiThreadElevationCalculations
+    boolean multiThreadElevationCalculations,
+    int elevationTileCacheSizeMB
   ) {
     gridCoverageFactory = factory;
     this.graph = graph;
@@ -165,12 +177,14 @@ public ElevationModule(
     this.maxElevationPropagationMeters = maxElevationPropagationMeters;
     this.includeEllipsoidToGeoidDifference = includeEllipsoidToGeoidDifference;
     this.multiThreadElevationCalculations = multiThreadElevationCalculations;
+    this.elevationTileCacheSizeMB = elevationTileCacheSizeMB;
     this.distanceBetweenSamplesM = distanceBetweenSamplesM;
   }
 
   @Override
   public void buildGraph() {
     Instant start = Instant.now();
+    configureTileCache();
     gridCoverageFactory.fetchData(graph);
 
     graph.setDistanceBetweenElevationSamples(this.distanceBetweenSamplesM);
@@ -323,6 +337,28 @@ public void checkInputs() {
     }
   }
 
+  /**
+   * Resize the Imagen default tile cache to the configured budget. Run once before any DEM tile
+   * is fetched, so subsequent {@code getTile} calls hit the cache instead of re-decompressing.
+   * <p>
+   * Imagen's default cache is 16 MB, which is too small to hold the hot working set on regional
+   * DEMs and causes the elevation pass to spend most of its time re-decompressing TIFF tiles.
+   */
+  private void configureTileCache() {
+    long bytes = elevationTileCacheSizeMB * ONE_MEGABYTE;
+    TileCache cache = ImageN.getDefaultInstance().getTileCache();
+    long previousBytes = cache.getMemoryCapacity();
+    if (previousBytes == bytes) {
+      return;
+    }
+    cache.setMemoryCapacity(bytes);
+    LOG.info(
+      "Imagen tile cache memory capacity set to {} MB (was {} MB)",
+      elevationTileCacheSizeMB,
+      previousBytes / ONE_MEGABYTE
+    );
+  }
+
   private void updateElevationMetadata(Graph graph) {
     if (nPointsOutsideDEM.get() < nPointsEvaluated.get()) {
       graph.hasElevation = true;

application/src/main/java/org/opentripplanner/model/plan/Itinerary.java

@@ -282,19 +282,6 @@ public boolean hasSystemNoticeTag(String tag) {
     return systemNotices.stream().map(SystemNotice::tag).anyMatch(tag::equals);
   }
 
-  public Itinerary withTimeShiftToStartAt(ZonedDateTime afterTime) {
-    Duration duration = Duration.between(legs().getFirst().startTime(), afterTime);
-    List<Leg> timeShiftedLegs = legs()
-      .stream()
-      .map(leg -> leg.withTimeShift(duration))
-      .collect(Collectors.toList());
-    return new ItineraryBuilder(timeShiftedLegs, searchWindowAware)
-      .withGeneralizedCost(generalizedCost)
-      .withAccessPenalty(accessPenalty)
-      .withEgressPenalty(egressPenalty)
-      .build();
-  }
-
   /** Total duration of the itinerary in seconds */
   public Duration totalDuration() {
     return totalDuration;

application/src/main/java/org/opentripplanner/routing/algorithm/mapping/LegsToItineraryMapper.java

@@ -0,0 +1,31 @@
+package org.opentripplanner.routing.algorithm.mapping;
+
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import org.opentripplanner.core.model.basic.Cost;
+import org.opentripplanner.model.plan.Itinerary;
+import org.opentripplanner.model.plan.Leg;
+import org.opentripplanner.street.model.path.ElevationChange;
+
+public class LegsToItineraryMapper {
+
+  public static Optional<Itinerary> map(
+    List<Leg> legs,
+    boolean arrivedAtDestinationWithRentedVehicle,
+    @Nullable ElevationChange elevationChange
+  ) {
+    if (legs.isEmpty()) {
+      return Optional.empty();
+    }
+    var cost = Cost.costOfSeconds(legs.stream().mapToDouble(Leg::generalizedCost).sum());
+    var builder = Itinerary.ofDirect(legs).withGeneralizedCost(cost);
+
+    builder.withArrivedAtDestinationWithRentedVehicle(arrivedAtDestinationWithRentedVehicle);
+    if (elevationChange != null) {
+      builder.addElevationChange(elevationChange);
+    }
+
+    return Optional.of(builder.build());
+  }
+}