cleanup (#110)

src/components/display/VehicleLocation.tsx

@@ -21,7 +21,7 @@ export default function VehicleLocation(props: {
   const [view, setView] = useState<RView>({ center, zoom: 16 });
 
   useEffect(() => {
-    if (data && data.vehicle) {
+    if (data?.vehicle) {
       const latlong = fromLonLat([data.vehicle?.lon, data.vehicle?.lat]);
       setCenter(latlong);
       setView({ center: latlong, zoom: 16 });

src/components/etaCard/EtaCard.tsx

@@ -33,9 +33,10 @@ export function EtaCard(props: {
 }) {
   return (
     <li
-      className={
-        "eta-card" + (props.editable ? " " + style["card-with-button"] : "")
-      }
+      className={[
+        "eta-card",
+        props.editable ? style["card-with-button"] : "",
+      ].join(" ")}
     >
       <Link to={props.stopUrl} className={style["grid-item"]}>
         <Card className={style["clickable-card"]}>

src/components/fetch/FetchSubwayRoute.tsx

@@ -10,6 +10,35 @@ import RawDisplay from "../rawDisplay/RawDisplay.js";
 import styles from "./FetchSubwayRoute.module.css";
 import { getTTCSubwayData } from "./fetchUtils.js";
 
+const filterSubwayDirection = (input: string) => {
+  return input.replace(/LINE \d \([\w-]+\) /, "").toLowerCase();
+};
+
+const filterSubwayTitle = (input: string) => {
+  return `${input.split(/\(|\)/)[1].toLowerCase()} Line`;
+};
+
+const line3Tribute = () => {
+  const lines = new Map([
+    [0, "It is no more."],
+    [1, "It has ceased to be."],
+    [2, "Bereft of life, it rests in peace."],
+    [3, "It is an ex-line."],
+    [4, "It is pining for the fjords."],
+    [5, "It has kicked the bucket."],
+    [
+      6,
+      "It has shuffled off its mortal coil, run down the curtain and joined the choir invisible.",
+    ],
+    [7, "Its metallic processes are now history."],
+    [8, "It's definitely deceased."],
+    [9, "It is expired and gone to meet its maker."],
+    [10, "It's passed on."],
+  ]);
+
+  return lines.get(Math.floor(Math.random() * 11));
+};
+
 function RouteInfo(props: { line: number }): JSX.Element {
   const [data, setData] = useState<SubwayStations>();
   const [lineNum] = useState(props.line);
@@ -140,32 +169,3 @@ function RouteInfo(props: { line: number }): JSX.Element {
   }
 }
 export default RouteInfo;
-
-const filterSubwayDirection = (input: string) => {
-  return input.replace(/LINE \d \([\w-]+\) /, "").toLowerCase();
-};
-
-const filterSubwayTitle = (input: string) => {
-  return input.split(/\(|\)/)[1].toLowerCase() + " Line";
-};
-
-const line3Tribute = () => {
-  const lines = new Map([
-    [0, "It is no more."],
-    [1, "It has ceased to be."],
-    [2, "Bereft of life, it rests in peace."],
-    [3, "It is an ex-line."],
-    [4, "It is pining for the fjords."],
-    [5, "It has kicked the bucket."],
-    [
-      6,
-      "It has shuffled off its mortal coil, run down the curtain and joined the choir invisible.",
-    ],
-    [7, "Its metallic processes are now history."],
-    [8, "It's definitely deceased."],
-    [9, "It is expired and gone to meet its maker."],
-    [10, "It's passed on."],
-  ]);
-
-  return lines.get(Math.floor(Math.random() * 11));
-};

src/components/settings/Settings.tsx

@@ -95,7 +95,7 @@ export function Settings() {
   const handleSearchClick = useCallback(() => {
     if (stopInput !== "")
       if (stopInput === "yrt") {
-        navigate(`../yrt`);
+        navigate("../yrt");
       } else navigate(`../yrt/stops/${stopInput}`);
   }, [stopInput]);