From dc71269f0dd17b67f7476dce6622b11db66915c7 Mon Sep 17 00:00:00 2001
From: Lukas Connolly <lukas_connolly@hotmail.com>
Date: Tue, 11 Jun 2024 22:35:39 +0200
Subject: [PATCH 1/2] ENH: NAV-95 - Reduce default walking speed to be more
 realistic.

---
 src/main/java/ch/naviqore/app/service/ServiceConfigParser.java | 2 +-
 src/main/resources/application.properties                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/naviqore/app/service/ServiceConfigParser.java b/src/main/java/ch/naviqore/app/service/ServiceConfigParser.java
index cb9d9e63..7b069a17 100644
--- a/src/main/java/ch/naviqore/app/service/ServiceConfigParser.java
+++ b/src/main/java/ch/naviqore/app/service/ServiceConfigParser.java
@@ -15,7 +15,7 @@ public ServiceConfigParser(@Value("${gtfs.static.url}") String gtfsUrl,
                                @Value("${transfer.time.minimum:120}") int minimumTransferTime,
                                @Value("${transfer.defaultSameStationTransferTime:120}") int sameStationTransferTime,
                                @Value("${walking.distance.maximum:500}") int maxWalkingDistance,
-                               @Value("${walking.speed:3500}") int walkingSpeed,
+                               @Value("${walking.speed:2500}") int walkingSpeed,
                                @Value("${walking.calculator.type:BEE_LINE_DISTANCE}") String walkCalculatorTypeStr) {
         ServiceConfig.WalkCalculatorType walkCalculatorType = ServiceConfig.WalkCalculatorType.valueOf(
                 walkCalculatorTypeStr.toUpperCase());
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2f53c016..706419c3 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -8,5 +8,5 @@ gtfs.static.update.interval.hours=${GTFS_STATIC_UPDATE_INTERVAL:24}
 transfer.time.minimum=${TRANSFER_TIME_MINIMUM:120}
 # walking
 walking.calculator.type=${WALKING_CALCULATOR_TYPE:BEE_LINE_DISTANCE}
-walking.speed=${WALKING_SPEED:3500}
+walking.speed=${WALKING_SPEED:2500}
 walking.distance.maximum=${WALKING_DISTANCE_MAXIMUM:500}
\ No newline at end of file

From e2cde7999b7093b7c972e842ccb6dd82a6acb2e4 Mon Sep 17 00:00:00 2001
From: Lukas Connolly <lukas_connolly@hotmail.com>
Date: Tue, 11 Jun 2024 22:36:10 +0200
Subject: [PATCH 2/2] FIX: NAV-95 - Get actual arrival time at stop to expand
 footpaths.

---
 src/main/java/ch/naviqore/raptor/Raptor.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ch/naviqore/raptor/Raptor.java b/src/main/java/ch/naviqore/raptor/Raptor.java
index 6454af5c..76a45966 100644
--- a/src/main/java/ch/naviqore/raptor/Raptor.java
+++ b/src/main/java/ch/naviqore/raptor/Raptor.java
@@ -437,7 +437,14 @@ private void expandFootpathsFromStop(int stopIdx, int[] earliestArrivals, List<L
             return;
         }
         Stop sourceStop = stops[stopIdx];
-        int arrivalTime = earliestArrivals[stopIdx];
+        Leg previousLeg = earliestArrivalsPerRound.get(round)[stopIdx];
+
+        // do not relax footpath from stop that was only reached by footpath in the same round
+        if (previousLeg == null || previousLeg.type == ArrivalType.TRANSFER) {
+            return;
+        }
+
+        int arrivalTime = previousLeg.arrivalTime();
 
         for (int i = sourceStop.transferIdx(); i < sourceStop.transferIdx() + sourceStop.numberOfTransfers(); i++) {
             Transfer transfer = transfers[i];