駅到着直後に次の駅へ一瞬進んでしまうデグレを修正 (#5338)

Author: TinyKitten

src/hooks/useNearestStation.ts

@@ -49,10 +49,11 @@ export const useNearestStation = (): Station | undefined => {
         sta.longitude === nearestCoordinates.longitude
     );
 
+    // currentStationを優先して返すことで、到着直後にnextStationへ誤って進むのを防ぐ
     return (
-      nearestStations.find(
-        (s) => s.id === currentStation?.id || s.id === nextStation?.id
-      ) ?? nearestStations[0]
+      nearestStations.find((s) => s.id === currentStation?.id) ??
+      nearestStations.find((s) => s.id === nextStation?.id) ??
+      nearestStations[0]
     );
   }, [latitude, longitude, validStations, currentStation, nextStation]);
 

src/hooks/useRefreshStation.ts

@@ -44,6 +44,7 @@ export const useRefreshStation = (): void => {
   const approachingNotifiedIdRef = useRef<number | null>(null);
   const arrivedNotifiedIdRef = useRef<number | null>(null);
   const lastArrivedTimeRef = useRef<number>(0);
+  const lastArrivedStationIdRef = useRef<number | null>(null);
   const { targetStationIds } = useAtomValue(notifyState);
 
   const nearestStation = useNearestStation();
@@ -64,14 +65,17 @@ export const useRefreshStation = (): void => {
   const effectiveApproachingThreshold = approachingThreshold + accuracyBonus;
 
   const isArrived = useMemo((): boolean => {
+    if (latitude == null || longitude == null || !nearestStation) {
+      return true;
+    }
+
+    // グレース期間は到着を引き起こした駅にのみ適用する
+    // 別の駅に対してtrueを返すと誤って駅が進んでしまう
     const inGracePeriod =
       Date.now() - lastArrivedTimeRef.current < ARRIVED_GRACE_PERIOD_MS;
-
     if (
-      latitude == null ||
-      longitude == null ||
-      !nearestStation ||
-      inGracePeriod
+      inGracePeriod &&
+      nearestStation.id === lastArrivedStationIdRef.current
     ) {
       return true;
     }
@@ -91,6 +95,7 @@ export const useRefreshStation = (): void => {
 
     if (arrived) {
       lastArrivedTimeRef.current = Date.now();
+      lastArrivedStationIdRef.current = nearestStation.id ?? null;
     }
     return arrived;
   }, [effectiveArrivedThreshold, latitude, longitude, nearestStation]);