diff --git a/components/trainMenu.js b/components/trainMenu.js
index 13876a0..b075037 100644
--- a/components/trainMenu.js
+++ b/components/trainMenu.js
@@ -1,43 +1,40 @@
-import React, { useRef, useMemo } from "react";
+import React, { useRef, useState, useEffect } from "react";
import { View, Text, TouchableOpacity, Linking } from "react-native";
import MapView, { Marker } from "react-native-maps";
import { MaterialCommunityIcons } from "@expo/vector-icons";
import { useCurrentTrain } from "../stateBox/useCurrentTrain";
import { useNavigation } from "@react-navigation/native";
+import lineColorList from "../assets/originData/lineColorList";
+import { stationIDPair } from "../lib/getStationList2";
export default function TrainMenu({ stationData, style }) {
const { webview } = useCurrentTrain();
const mapRef = useRef();
const { navigate } = useNavigation();
- const stationPin = useMemo(
- () =>
- Object.keys(stationData).map((d, indexBase) =>
- stationData[d].map((D, index) => {
- if (!D.StationMap) return null;
- const latlng = D.StationMap.replace(
- "https://www.google.co.jp/maps/place/",
- ""
- ).split(",");
- if (latlng.length == 0) return null;
- return (
- {
- webview.current?.injectJavaScript(
- `MoveDisplayStation('${d}_${D.MyStation}_${D.Station_JP}');
- setStrings();`
- );
- if (navigate) navigate("Apps");
- }}
- >
- );
- })
- ),
- [stationData]
- );
+ const [stationPin, setStationPin] = useState([]);
+ useEffect(() => {
+ const stationPinData = [];
+ Object.keys(stationData).map((d, indexBase) =>
+ stationData[d].map((D, index) => {
+ if (!D.StationMap) return null;
+ const latlng = D.StationMap.replace(
+ "https://www.google.co.jp/maps/place/",
+ ""
+ ).split(",");
+ if (latlng.length == 0) return null;
+ stationPinData.push({ D, d, latlng, indexBase: 0, index });
+ })
+ );
+ setStationPin(stationPinData);
+ }, [stationData]);
+ useEffect(() => {
+ mapRef.current.fitToCoordinates(
+ stationPin.map(({ latlng }) => ({
+ latitude: parseFloat(latlng[0]),
+ longitude: parseFloat(latlng[1]),
+ })),
+ { edgePadding: { top: 50, bottom: 50, left: 50, right: 50 } } // Add margin values here
+ );
+ }, [stationPin]);
return (
- {stationPin}
+ {stationPin.map(({ D, d, latlng, indexBase, index }) => (
+
+ ))}
+
+ {Object.keys(stationData).map((d) => (
+ {
+ setStationPin(
+ stationData[d].map((D, index) => {
+ if (!D.StationMap) return null;
+ const latlng = D.StationMap.replace(
+ "https://www.google.co.jp/maps/place/",
+ ""
+ ).split(",");
+ if (latlng.length == 0) return null;
+ return { D, d, latlng, indexBase: 0, index };
+ })
+ );
+ }}
+ >
+
+ {stationIDPair[d]}
+
+
+ ))}
+
{navigate && (
{
);
};
+
+const MapPin = ({ index, indexBase, latlng, D, d, navigate, webview }) => {
+ return (
+ {
+ webview.current?.injectJavaScript(
+ `MoveDisplayStation('${d}_${D.MyStation}_${D.Station_JP}');
+ setStrings();`
+ );
+ if (navigate) navigate("Apps");
+ }}
+ >
+ );
+};
diff --git a/lib/getStationList2.js b/lib/getStationList2.js
index a8b392b..11397b8 100644
--- a/lib/getStationList2.js
+++ b/lib/getStationList2.js
@@ -1,4 +1,3 @@
-let status = undefined;
import yosan from "../assets/originData/yosan";
import uwajima from "../assets/originData/uwajima";
import uwajima2 from "../assets/originData/uwajima2";
@@ -21,3 +20,15 @@ export const getStationList2 = async (props) => {
seto,
};
};
+
+export const stationIDPair = {
+ yosan: "Y",
+ uwajima: "U",
+ uwajima2: "S",
+ dosan: "D",
+ dosan2: "K",
+ koutoku: "T",
+ tokushima: "B",
+ naruto: "N",
+ seto: "M",
+};