From fd9e9efbaa468e722d43ca58cf22ba063ee59ca9 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Mon, 3 Feb 2025 15:02:23 +0100
Subject: [PATCH] Revert changes to AreaStopsToVerticesMapper

---
 .../ext/flex/AreaStopsToVerticesMapper.java   | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java b/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java
index e3592c74c9b..85a4f749b16 100644
--- a/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java
+++ b/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java
@@ -3,18 +3,13 @@
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMultimap;
 import jakarta.inject.Inject;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
 import org.locationtech.jts.geom.Point;
 import org.opentripplanner.framework.geometry.GeometryUtils;
 import org.opentripplanner.graph_builder.model.GraphBuilderModule;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.graph.index.StreetIndex;
 import org.opentripplanner.street.model.vertex.StreetVertex;
-import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.transit.model.site.AreaStop;
 import org.opentripplanner.transit.service.TimetableRepository;
 import org.opentripplanner.utils.logging.ProgressTracker;
@@ -57,18 +52,12 @@ public void buildGraph() {
     var results = timetableRepository
       .getSiteRepository()
       .listAreaStops()
-      .stream()
-      .sorted(Comparator.comparingDouble(areaStop -> areaStop.getGeometry().getArea()))
-      .parallel()
+      .parallelStream()
       .flatMap(areaStop -> {
-        LOG.info(
-          "Computing vertices for {} with area {}",
-          areaStop,
-          areaStop.getGeometry().getArea()
-        );
-        var result = matchingVerticesForStop(streetIndex, areaStop);
+        var matchedVertices = matchingVerticesForStop(streetIndex, areaStop);
+        // Keep lambda! A method-ref would cause incorrect class and line number to be logged
         progress.step(m -> LOG.info(m));
-        return result;
+        return matchedVertices;
       });
 
     ImmutableMultimap<StreetVertex, AreaStop> mappedResults = results.collect(