Merge commit '063f58dcc7a4578513124e5d9fc51644909639e2' into feature/anpanman-status-icon

components/ActionSheetComponents/StationDeteilView.js

@@ -130,7 +130,6 @@ export const StationDeteilView = (props) => {
                     info:
                       currentStation[0].JrHpUrl.replace("/index.html", "/") +
                       "/kounai_map.html",
-
                     goTo,
                     useShow,
                   });

components/駅名表/Sign.js

@@ -64,7 +64,7 @@ export default function Sign(props) {
   useEffect(() => {
     setNexPrePosition(0);
     getPreNextStation(currentStation[0]);
-    if(currentStation.length == 1)return ()=>{};
+    if (currentStation.length == 1) return () => {};
     getPreNextStation(currentStation[1]);
   }, [currentStation]);
 
@@ -96,8 +96,13 @@ export default function Sign(props) {
         ];
       }
     });
-    if(returnData[0])setPreStation(returnData[0]);
-    if(returnData[1])setNexStation(returnData[1]);
+    if (now.Station_JP == "宇多津" && now.StationNumber == null) {
+      if (returnData[1]) setPreStation(returnData[1]);
+      if (returnData[0]) setNexStation(returnData[0]);
+    } else {
+      if (returnData[0]) setPreStation(returnData[0]);
+      if (returnData[1]) setNexStation(returnData[1]);
+    }
   };
   const isMatsuyama = currentStation[0].StationNumber == "Y55";
   //const isMatsuyama = true;
@@ -106,11 +111,7 @@ export default function Sign(props) {
       const otherData = favoriteStation.filter((d) => {
         const compare = JSON.stringify(d);
         const current = JSON.stringify(currentStation);
-        if (compare !== current) {
-          return true;
-        } else {
-          return false;
-        }
+        return compare !== current;
       });
       AS.setItem("favoriteStation", JSON.stringify(otherData));
       setFavoriteStation(otherData);