From c41c61bba792ccf6ac48c7abef5fd0bfc8274019 Mon Sep 17 00:00:00 2001
From: harukin-expo-dev-env <harukin@haruk.in>
Date: Tue, 6 May 2025 11:53:45 +0000
Subject: [PATCH] =?UTF-8?q?=E5=AE=87=E5=A4=9A=E6=B4=A5=E3=81=AB=E8=BF=91?=
 =?UTF-8?q?=E3=81=A5=E3=81=84=E3=81=9F=E3=82=89=E3=82=AF=E3=83=A9=E3=83=83?=
 =?UTF-8?q?=E3=82=B7=E3=83=A5=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C=E3=80=81?=
 =?UTF-8?q?=E7=8F=BE=E5=9C=A8=E5=9C=B0=E3=81=AE=E3=83=AA=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E6=A9=9F=E8=83=BD=E3=81=8C=E3=81=A1?=
 =?UTF-8?q?=E3=82=83=E3=82=93=E3=81=A8=E6=95=B4=E7=90=86=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/発車時刻表/EachData.tsx |  7 +++++--
 menu.js                                 | 25 ++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/components/発車時刻表/EachData.tsx b/components/発車時刻表/EachData.tsx
index f636d48..2fb5686 100644
--- a/components/発車時刻表/EachData.tsx
+++ b/components/発車時刻表/EachData.tsx
@@ -128,7 +128,10 @@ export const EachData: FC<Props> = (props) => {
     const diff = trainTime.diff(currentTime, "minute");
     if (diff < 2) setIsDepartureNow(true);
     else setIsDepartureNow(false);
-  })
+    return()=>{
+      setIsDepartureNow(false);
+    }
+  }, [d.time]);
   useInterval(()=>{
     if (isDepartureNow) {
    setIsShow(!isShow);
@@ -182,7 +185,7 @@ export const EachData: FC<Props> = (props) => {
         <StatusAndDelay trainDelayStatus={trainDelayStatus} />
       </TouchableOpacity>
       {!!isDepartureNow && (
-        <Description info={d.lastStation == "当駅止" ? "この列車は当駅止です。間もなく到着します。":"この列車は間もなく発車します。"} key={d.train + "-description"} />
+        <Description info={d.lastStation == "当駅止" ? "この列車は当駅止です。間もなく到着します。":"列車の出発時刻です。"} key={d.train + "-description"} />
       )}
       {trainDescriptionSwitch && (
         <TrainPosition
diff --git a/menu.js b/menu.js
index b02d605..a714611 100644
--- a/menu.js
+++ b/menu.js
@@ -33,7 +33,13 @@ configureReanimatedLogger({
   level: ReanimatedLogLevel.error, // Set the log level to error
   strict: true, // Reanimated runs in strict mode by default
 });
-export default function Menu({ scrollRef, mapHeight, MapFullHeight, mapMode, setMapMode }) {
+export default function Menu({
+  scrollRef,
+  mapHeight,
+  MapFullHeight,
+  mapMode,
+  setMapMode,
+}) {
   const { navigate, addListener, isFocused } = useNavigation();
   const { favoriteStation } = useFavoriteStation();
   const { originalStationList } = useStationList();
@@ -115,15 +121,24 @@ export default function Menu({ scrollRef, mapHeight, MapFullHeight, mapMode, set
       return NearStation;
     };
 
-    let returnDataBase = lineList
+    let _stList = lineList
       .map((d) => findStationEachLine(originalStationList[d]))
       .filter((d) => d.length > 0)
       .reduce((pre, current) => {
         pre.push(...current);
         return pre;
-      }, [])
-      .map((d) => [d]);
-    setNearPositionStation(returnDataBase.length ? returnDataBase : []);
+      }, []);
+    if (_stList.length == 0) setNearPositionStation([]);
+    else {
+      let returnData = [];
+      _stList.forEach((d, index, array) => {
+        const stationName = d.Station_JP;
+        if (returnData.findIndex((d) => d[0].Station_JP == stationName) != -1) return;
+        returnData.push(array.filter((d2) => d2.Station_JP == stationName));
+      });
+      returnData.forEach((d) => console.log(d));
+      setNearPositionStation(returnData);
+    }
   };
 
   const [nearPositionStation, setNearPositionStation] = useState([]); //第三要素