Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better Route Search Remark #142

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 86 additions & 3 deletions src/components/route-board/RouteTerminus.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,104 @@
import React, { useContext, useMemo } from "react";
import { useTranslation } from "react-i18next";
import { Box, SxProps, Theme, Typography } from "@mui/material";
import { toProperCase } from "../../utils";
import AppContext from "../../AppContext";

const RouteTerminus = ({ terminus }) => {
const { t, i18n } = useTranslation();
const {
db: { routeList, stopList }
} = useContext(AppContext);
const { bound, route, stops, co, gtfsId, dest, orig } = terminus;

const firstLastDiff = (arr) => {
if (arr.length < 2) return arr;
return [arr[0], arr[arr.length - 1]];
};
const diffConsecutive = (array, sequence) => {
for (let i = 0; i <= array.length - sequence.length; i++) {
let j;
for (j = 0; j < sequence.length; j++) {
if (array[i + j] !== sequence[j]) {
break;
}
}
if (j === sequence.length) {
return true;
}
}
return false;
};

let routeRemark = useMemo(
() => {
let remark = "";
if (terminus.serviceType >= 2) {
for (let [, data] of Object.entries(routeList)) {
if (Number(data.serviceType) === 1 &&
route === data.route &&
JSON.stringify(bound) === JSON.stringify(data.bound) &&
(co[0] === "gmb" ? gtfsId === data.gtfsId : JSON.stringify(co) === JSON.stringify(data.co)))
{
if (data.dest.zh !== dest.zh) {
remark = t("開往") + dest[i18n.language];
} else if (data.orig.zh !== orig.zh) {
if (!terminus.nlbId) {
remark = t("從") + orig[i18n.language] + t("開出");
}
} else {
let mainRouteFirstStop = stopList[data.stops[co][0]].name;
let mainRouteLastStop = stopList[data.stops[co][data.stops[co].length - 1]].name;
let routeFirstStop = stopList[stops[co][0]].name;
let routeLastStop = stopList[stops[co][stops[co].length - 1]].name;

if (mainRouteLastStop.zh !== routeLastStop.zh) {
remark = t("開往") + routeLastStop[i18n.language];
} else if (mainRouteFirstStop.zh !== routeFirstStop.zh) {
if (!terminus.nlbId) {
remark = t("從") + routeFirstStop[i18n.language] + t("開出");
}
} else {
let difference = stops[co]
.filter(x => !data.stops[co].includes(x));
let diffName = difference
.map(x => stopList[x].name[i18n.language]);
if (difference.length > 0) {
remark = t("經") + firstLastDiff(diffName).join(t(diffConsecutive(data.stops[co], difference) ? "至" : "及"));
} else {
let difference = data.stops[co]
.filter(x => !stops[co].includes(x));
let diffName = difference
.map(x => stopList[x].name[i18n.language]);
if (difference.length > 0) {
remark = t("不經") + firstLastDiff(diffName).join(t(diffConsecutive(data.stops[co], difference) ? "至" : "及"));
}
}
}
}
break;
}
}
}
if (terminus.nlbId) {
remark = t("從") + toProperCase(terminus.orig[i18n.language]) + t("開出") + " " + remark;
}
return remark;
},
[terminus, routeList, i18n.language, bound, co, dest, gtfsId, orig, route, stopList, stops, t]
);

return (
<Box sx={rootSx}>
<Box sx={fromToWrapperSx}>
<span>{`${t("往")} `}</span>
<Typography component="h3" variant="h6" sx={destinationSx}>
<Typography component="h3" variant="h6" sx={destinationSx} textOverflow="ellipsis" overflow="hidden">
{toProperCase(terminus.dest[i18n.language])}
</Typography>
</Box>
<Box sx={fromWrapperSx}>
<Typography variant="body2">
{toProperCase(terminus.orig[i18n.language])}
<Typography variant="body2" textOverflow="ellipsis" overflow="hidden">
{routeRemark}
</Typography>
</Box>
</Box>
Expand Down
6 changes: 3 additions & 3 deletions src/components/route-eta/RouteHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from "react";
import { Box, Paper, SxProps, Theme, Typography } from "@mui/material";
import RouteNo from "../route-board/RouteNo";
import { toProperCase } from "../../utils";
import { toProperCase, langSpace } from "../../utils";
import { useTranslation } from "react-i18next";
import AppContext from "../../AppContext";
import ReverseButton from "./ReverseButton";
Expand All @@ -19,8 +19,8 @@ const RouteHeader = ({ routeId }: { routeId: string }) => {
<Paper id="route-eta-header" sx={PaperSx} elevation={0}>
<RouteNo routeNo={t(route)} component="h1" align="center" />
<Typography component="h2" variant="caption" align="center">
{t("往")} {toProperCase(dest[i18n.language])}{" "}
{nlbId ? t("") + " " + toProperCase(orig[i18n.language]) : ""}
{t("往")}{langSpace(i18n)}{toProperCase(dest[i18n.language])}{" "}
{nlbId ? t("") + toProperCase(orig[i18n.language]) + t("開出") : ""}
</Typography>
<ReverseButton routeId={routeId} />
<Box sx={rightBtnGroupSx}>
Expand Down
9 changes: 8 additions & 1 deletion src/i18n/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@
"設定": "Settings",
"取消": "Clear",
"路線": "Route",
"你的位置": "Your Location",
"從": "From ",
"開出": "",
"開往": "To ",
"經": "Via ",
"不經": "Skipping ",
"至": " to ",
"及": " and ",
"你的位置": "Your location",
"目的地": "Destination",
"已複製到剪貼簿": "Copied to clipboard",
"資料更新中": "Data updating",
Expand Down
5 changes: 5 additions & 0 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ import type { Company, EtaDb, Location, RouteList, StopList } from "hk-bus-eta";
import type { Location as GeoLocation } from "hk-bus-eta";
import type { TransportType } from "./typing";
import { isRouteAvaliable } from "./timetable";

export const langSpace = (i18n) => {
return i18n.language === "en" ? " " : "";
}

export const getDistance = (a: GeoLocation, b: GeoLocation) => {
const R = 6371e3; // metres
const φ1 = (a.lat * Math.PI) / 180; // φ, λ in radians
Expand Down
Loading