npm - @opentripplanner/map-popup - Versions diffs - 3.1.1-alpha.1 → 3.1.2 - Mend

@opentripplanner/map-popup 3.1.1-alpha.1 → 3.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

package/esm/index.js +17 -6
package/esm/index.js.map +1 -1
package/esm/styled.js +21 -0
package/esm/styled.js.map +1 -1
package/esm/util.js +4 -2
package/esm/util.js.map +1 -1
package/i18n/en-US.yml +2 -1
package/i18n/es.yml +2 -1
package/i18n/fr.yml +2 -1
package/i18n/ko.yml +2 -1
package/i18n/nb_NO.yml +4 -3
package/i18n/ru.yml +2 -1
package/i18n/tl.yml +2 -1
package/i18n/tr.yml +1 -0
package/i18n/vi.yml +2 -1
package/i18n/zh_Hans.yml +2 -1
package/lib/index.d.ts.map +1 -1
package/lib/index.js +17 -6
package/lib/index.js.map +1 -1
package/lib/styled.d.ts +8 -0
package/lib/styled.d.ts.map +1 -1
package/lib/styled.js +33 -1
package/lib/styled.js.map +1 -1
package/lib/util.d.ts.map +1 -1
package/lib/util.js +4 -2
package/lib/util.js.map +1 -1
package/package.json +3 -4
package/src/MapPopup.story.tsx +21 -1
package/src/__snapshots__/MapPopup.story.tsx.snap +302 -0
package/src/index.tsx +19 -11
package/src/styled.ts +29 -0
package/src/util.ts +4 -2
package/tsconfig.tsbuildinfo +1 -1

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@opentripplanner/map-popup",
-  "version": "3.1.1-alpha.1",
+  "version": "3.1.2",
   "description": "A component for displaying map popup contents",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -11,8 +11,7 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/base-map": "^3.1.0",
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/core-utils": "^11.4.1",
     "@opentripplanner/from-to-location-picker": "^2.1.12",
     "flat": "^5.0.2"
   },
@@ -20,7 +19,7 @@
     "@opentripplanner/types": "^6.5.0"
   },
   "peerDependencies": {
-    "react": "^16.14.0",
+    "react": "^18.2.0",
     "react-intl": "^5.24.6",
     "styled-components": "^5.3.0"
   },

package/src/MapPopup.story.tsx CHANGED Viewed

@@ -40,7 +40,7 @@ const FLOATING_VEHICLE = {
   id: '"bike_6861"',
   isCarStation: false,
   isFloatingBike: true,
-  name: "0541 BIKETOWN",
+  name: "0541",
   networks: ["BIKETOWN"],
   realTimeData: true,
   spacesAvailable: 0,
@@ -48,6 +48,22 @@ const FLOATING_VEHICLE = {
   y: 45.525486666666666
 };
+const FLOATING_CAR = {
+  "stroke-width": 1,
+  allowDropoff: false,
+  allowPickup: true,
+  color: "#333",
+  id: "car_6861",
+  isCarStation: false,
+  isFloatingCar: true,
+  name: "0541",
+  networks: ["MILES"], // https://miles-mobility.com
+  realTimeData: true,
+  spacesAvailable: 0,
+  x: 13.405,
+  y: 52.52
+};
 export const StopEntity = (): JSX.Element => (
   <MapPopupContents
     entity={STOP}
@@ -68,6 +84,10 @@ export const StationEntity = (): JSX.Element => (
   />
 );
+export const FloatingCarEntity = (): JSX.Element => (
+  <MapPopupContents entity={FLOATING_CAR} setLocation={action("setLocation")} />
+);
 export const FloatingVehicleEntity = (): JSX.Element => (
   <MapPopupContents
     entity={FLOATING_VEHICLE}

package/src/__snapshots__/MapPopup.story.tsx.snap ADDED Viewed

@@ -0,0 +1,302 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`Map Popup FloatingCarEntity smoke-test 1`] = `
+<div class="styled__MapOverlayPopup-sc-12v7ov3-2 hLIcgt">
+  <header class="styled__PopupTitle-sc-12v7ov3-4 jMeCoZ">
+    MILES Car: 0541
+  </header>
+  <p class="styled__PopupRow-sc-12v7ov3-3 bGmFCM">
+    <strong>
+      Plan a trip:
+    </strong>
+    <span class="styled__FromToPickerSpan-sc-vb4790-1 hmUShj">
+      <span class="styled__LocationPickerSpan-sc-vb4790-0 gwsIFy">
+        <svg viewbox="0 0 512 512"
+             height="0.9em"
+             width="0.9em"
+             aria-hidden="true"
+             focusable="false"
+             fill="currentColor"
+             xmlns="http://www.w3.org/2000/svg"
+             class="StyledIconBase-ea9ulj-0 hPhvO styled__FromIcon-sc-n5xcvc-0 jTjMOf"
+        >
+          <path fill="currentColor"
+                d="M256 56c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m0-48C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 168c-44.183 0-80 35.817-80 80s35.817 80 80 80 80-35.817 80-80-35.817-80-80-80z"
+          >
+          </path>
+        </svg>
+        <button class="styled__Button-sc-vb4790-2 hNNoVB">
+          From here
+        </button>
+      </span>
+      <span class="styled__LocationPickerSpan-sc-vb4790-0 gwsIFy">
+        <svg viewbox="0 0 384 512"
+             height="0.9em"
+             width="0.9em"
+             aria-hidden="true"
+             focusable="false"
+             fill="currentColor"
+             xmlns="http://www.w3.org/2000/svg"
+             class="StyledIconBase-ea9ulj-0 hPhvO styled__ToIcon-sc-n5xcvc-2 ipFnZE"
+        >
+          <path fill="currentColor"
+                d="M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0zM192 272c44.183 0 80-35.817 80-80s-35.817-80-80-80-80 35.817-80 80 35.817 80 80 80z"
+          >
+          </path>
+        </svg>
+        <button class="styled__Button-sc-vb4790-2 hNNoVB">
+          To here
+        </button>
+      </span>
+    </span>
+  </p>
+</div>
+`;
+exports[`Map Popup FloatingVehicleEntity smoke-test 1`] = `
+<div class="styled__MapOverlayPopup-sc-12v7ov3-2 hLIcgt">
+  <header class="styled__PopupTitle-sc-12v7ov3-4 jMeCoZ">
+    BIKETOWN Free-floating bike: 0541
+  </header>
+  <p class="styled__PopupRow-sc-12v7ov3-3 bGmFCM">
+    <strong>
+      Plan a trip:
+    </strong>
+    <span class="styled__FromToPickerSpan-sc-vb4790-1 hmUShj">
+      <span class="styled__LocationPickerSpan-sc-vb4790-0 gwsIFy">
+        <svg viewbox="0 0 512 512"
+             height="0.9em"
+             width="0.9em"
+             aria-hidden="true"
+             focusable="false"
+             fill="currentColor"
+             xmlns="http://www.w3.org/2000/svg"
+             class="StyledIconBase-ea9ulj-0 hPhvO styled__FromIcon-sc-n5xcvc-0 jTjMOf"
+        >
+          <path fill="currentColor"
+                d="M256 56c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m0-48C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 168c-44.183 0-80 35.817-80 80s35.817 80 80 80 80-35.817 80-80-35.817-80-80-80z"
+          >
+          </path>
+        </svg>
+        <button class="styled__Button-sc-vb4790-2 hNNoVB">
+          From here
+        </button>
+      </span>
+      <span class="styled__LocationPickerSpan-sc-vb4790-0 gwsIFy">
+        <svg viewbox="0 0 384 512"
+             height="0.9em"
+             width="0.9em"
+             aria-hidden="true"
+             focusable="false"
+             fill="currentColor"
+             xmlns="http://www.w3.org/2000/svg"
+             class="StyledIconBase-ea9ulj-0 hPhvO styled__ToIcon-sc-n5xcvc-2 ipFnZE"
+        >
+          <path fill="currentColor"
+                d="M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0zM192 272c44.183 0 80-35.817 80-80s-35.817-80-80-80-80 35.817-80 80 35.817 80 80 80z"
+          >
+          </path>
+        </svg>
+        <button class="styled__Button-sc-vb4790-2 hNNoVB">
+          To here
+        </button>
+      </span>
+    </span>
+  </p>
+</div>
+`;
+exports[`Map Popup StationEntity smoke-test 1`] = `
+<div class="styled__MapOverlayPopup-sc-12v7ov3-2 hLIcgt">
+  <header class="styled__PopupTitle-sc-12v7ov3-4 jMeCoZ">
+    BIKETOWN SW Morrison at 18th
+  </header>
+  <p class="styled__PopupRow-sc-12v7ov3-3 bGmFCM">
+    <div>
+      Available bikes: 6
+    </div>
+    <div>
+      Available docks: 11
+    </div>
+  </p>
+  <p class="styled__PopupRow-sc-12v7ov3-3 bGmFCM">
+    <strong>
+      Plan a trip:
+    </strong>
+    <span class="styled__FromToPickerSpan-sc-vb4790-1 hmUShj">
+      <span class="styled__LocationPickerSpan-sc-vb4790-0 gwsIFy">
+        <svg viewbox="0 0 512 512"
+             height="0.9em"
+             width="0.9em"
+             aria-hidden="true"
+             focusable="false"
+             fill="currentColor"
+             xmlns="http://www.w3.org/2000/svg"
+             class="StyledIconBase-ea9ulj-0 hPhvO styled__FromIcon-sc-n5xcvc-0 jTjMOf"
+        >
+          <path fill="currentColor"
+                d="M256 56c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m0-48C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 168c-44.183 0-80 35.817-80 80s35.817 80 80 80 80-35.817 80-80-35.817-80-80-80z"
+          >
+          </path>
+        </svg>
+        <button class="styled__Button-sc-vb4790-2 hNNoVB">
+          From here
+        </button>
+      </span>
+      <span class="styled__LocationPickerSpan-sc-vb4790-0 gwsIFy">
+        <svg viewbox="0 0 384 512"
+             height="0.9em"
+             width="0.9em"
+             aria-hidden="true"
+             focusable="false"
+             fill="currentColor"
+             xmlns="http://www.w3.org/2000/svg"
+             class="StyledIconBase-ea9ulj-0 hPhvO styled__ToIcon-sc-n5xcvc-2 ipFnZE"
+        >
+          <path fill="currentColor"
+                d="M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0zM192 272c44.183 0 80-35.817 80-80s-35.817-80-80-80-80 35.817-80 80 35.817 80 80 80z"
+          >
+          </path>
+        </svg>
+        <button class="styled__Button-sc-vb4790-2 hNNoVB">
+          To here
+        </button>
+      </span>
+    </span>
+  </p>
+</div>
+`;
+exports[`Map Popup StopEntity smoke-test 1`] = `
+<div class="styled__MapOverlayPopup-sc-12v7ov3-2 hLIcgt">
+  <header class="styled__PopupTitle-sc-12v7ov3-4 jMeCoZ">
+    W Burnside &amp; SW 2nd
+  </header>
+  <p class="styled__PopupRow-sc-12v7ov3-3 bGmFCM">
+    <strong>
+      Stop ID: 9526
+    </strong>
+    <button class="styled__ViewStopButton-sc-12v7ov3-0 jdXQjY">
+      Stop Viewer
+    </button>
+  </p>
+  <p class="styled__PopupRow-sc-12v7ov3-3 bGmFCM">
+    <strong>
+      Plan a trip:
+    </strong>
+    <span class="styled__FromToPickerSpan-sc-vb4790-1 hmUShj">
+      <span class="styled__LocationPickerSpan-sc-vb4790-0 gwsIFy">
+        <svg viewbox="0 0 512 512"
+             height="0.9em"
+             width="0.9em"
+             aria-hidden="true"
+             focusable="false"
+             fill="currentColor"
+             xmlns="http://www.w3.org/2000/svg"
+             class="StyledIconBase-ea9ulj-0 hPhvO styled__FromIcon-sc-n5xcvc-0 jTjMOf"
+        >
+          <path fill="currentColor"
+                d="M256 56c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m0-48C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 168c-44.183 0-80 35.817-80 80s35.817 80 80 80 80-35.817 80-80-35.817-80-80-80z"
+          >
+          </path>
+        </svg>
+        <button class="styled__Button-sc-vb4790-2 hNNoVB">
+          From here
+        </button>
+      </span>
+      <span class="styled__LocationPickerSpan-sc-vb4790-0 gwsIFy">
+        <svg viewbox="0 0 384 512"
+             height="0.9em"
+             width="0.9em"
+             aria-hidden="true"
+             focusable="false"
+             fill="currentColor"
+             xmlns="http://www.w3.org/2000/svg"
+             class="StyledIconBase-ea9ulj-0 hPhvO styled__ToIcon-sc-n5xcvc-2 ipFnZE"
+        >
+          <path fill="currentColor"
+                d="M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0zM192 272c44.183 0 80-35.817 80-80s-35.817-80-80-80-80 35.817-80 80 35.817 80 80 80z"
+          >
+          </path>
+        </svg>
+        <button class="styled__Button-sc-vb4790-2 hNNoVB">
+          To here
+        </button>
+      </span>
+    </span>
+  </p>
+</div>
+`;
+exports[`Map Popup StopEntityNoHandlers smoke-test 1`] = `
+<div class="styled__MapOverlayPopup-sc-12v7ov3-2 hLIcgt">
+  <header class="styled__PopupTitle-sc-12v7ov3-4 jMeCoZ">
+    W Burnside &amp; SW 2nd
+  </header>
+</div>
+`;
+exports[`Map Popup StopEntityWithFocusTrap smoke-test 1`] = `
+<div id="storybook-stop-popup-focus-trap"
+     role="presentation"
+>
+  <div class="styled__MapOverlayPopup-sc-12v7ov3-2 hLIcgt">
+    <header class="styled__PopupTitle-sc-12v7ov3-4 jMeCoZ">
+      W Burnside &amp; SW 2nd
+    </header>
+    <p class="styled__PopupRow-sc-12v7ov3-3 bGmFCM">
+      <strong>
+        Stop ID: 9526
+      </strong>
+      <button class="styled__ViewStopButton-sc-12v7ov3-0 jdXQjY">
+        Stop Viewer
+      </button>
+    </p>
+    <p class="styled__PopupRow-sc-12v7ov3-3 bGmFCM">
+      <strong>
+        Plan a trip:
+      </strong>
+      <span class="styled__FromToPickerSpan-sc-vb4790-1 hmUShj">
+        <span class="styled__LocationPickerSpan-sc-vb4790-0 gwsIFy">
+          <svg viewbox="0 0 512 512"
+               height="0.9em"
+               width="0.9em"
+               aria-hidden="true"
+               focusable="false"
+               fill="currentColor"
+               xmlns="http://www.w3.org/2000/svg"
+               class="StyledIconBase-ea9ulj-0 hPhvO styled__FromIcon-sc-n5xcvc-0 jTjMOf"
+          >
+            <path fill="currentColor"
+                  d="M256 56c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m0-48C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 168c-44.183 0-80 35.817-80 80s35.817 80 80 80 80-35.817 80-80-35.817-80-80-80z"
+            >
+            </path>
+          </svg>
+          <button class="styled__Button-sc-vb4790-2 hNNoVB">
+            From here
+          </button>
+        </span>
+        <span class="styled__LocationPickerSpan-sc-vb4790-0 gwsIFy">
+          <svg viewbox="0 0 384 512"
+               height="0.9em"
+               width="0.9em"
+               aria-hidden="true"
+               focusable="false"
+               fill="currentColor"
+               xmlns="http://www.w3.org/2000/svg"
+               class="StyledIconBase-ea9ulj-0 hPhvO styled__ToIcon-sc-n5xcvc-2 ipFnZE"
+          >
+            <path fill="currentColor"
+                  d="M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0zM192 272c44.183 0 80-35.817 80-80s-35.817-80-80-80-80 35.817-80 80 35.817 80 80 80z"
+            >
+            </path>
+          </svg>
+          <button class="styled__Button-sc-vb4790-2 hNNoVB">
+            To here
+          </button>
+        </span>
+      </span>
+    </p>
+  </div>
+</div>
+`;

package/src/index.tsx CHANGED Viewed

@@ -1,7 +1,7 @@
 import React, { useCallback } from "react";
-import { Styled as BaseMapStyled } from "@opentripplanner/base-map";
 import FromToLocationPicker from "@opentripplanner/from-to-location-picker";
+import coreUtils from "@opentripplanner/core-utils";
 // eslint-disable-next-line prettier/prettier
 import type { Company, ConfiguredCompany, Location, Station, Stop, StopEventHandler } from "@opentripplanner/types";
@@ -33,7 +33,7 @@ const generateLocation = (entity: Entity, name: string) => {
 const StationHubDetails = ({ station }: { station: Station }) => {
   return (
-    <BaseMapStyled.PopupRow>
+    <S.PopupRow>
       <div>
         <FormattedMessage
           defaultMessage={
@@ -54,13 +54,13 @@ const StationHubDetails = ({ station }: { station: Station }) => {
           values={{ value: station.spacesAvailable }}
         />
       </div>
-    </BaseMapStyled.PopupRow>
+    </S.PopupRow>
   )
 }
 const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => void; }) => {
   return (
-    <BaseMapStyled.PopupRow>
+    <S.PopupRow>
       <strong>
         <FormattedMessage
           defaultMessage={defaultMessages["otpUi.MapPopup.stopId"]}
@@ -78,7 +78,7 @@ const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => v
           id="otpUi.MapPopup.stopViewer"
         />
       </S.ViewStopButton>
-    </BaseMapStyled.PopupRow>
+    </S.PopupRow>
   )
 }
@@ -105,14 +105,22 @@ export function MapPopup({ configCompanies, entity, getEntityName, setLocation,
   const getNameFunc = getEntityName || makeDefaultGetEntityName(intl, defaultMessages);
   const name = getNameFunc(entity, configCompanies);
+  const stationNetwork = "networks" in entity && (coreUtils.itinerary.getCompaniesLabelFromNetworks(entity?.networks || [], configCompanies) || entity?.networks?.[0]);
   const bikesAvailablePresent = entityIsStation(entity)
   const entityIsStationHub = bikesAvailablePresent && entity?.bikesAvailable !== undefined && !entity?.isFloatingBike;
   const stopId = !bikesAvailablePresent && entity?.code || entity.id.split(":")[1] || entity.id
   return (
-    <BaseMapStyled.MapOverlayPopup>
-      <BaseMapStyled.PopupTitle>{name}</BaseMapStyled.PopupTitle>
+    <S.MapOverlayPopup>
+      <S.PopupTitle>
+        <FormattedMessage
+          defaultMessage={defaultMessages["otpUi.MapPopup.popupTitle"]}
+          description="Text for title of the popup, contains an optional company name"
+          id="otpUi.MapPopup.popupTitle"
+          values={{ name, stationNetwork }}
+        />
+      </S.PopupTitle>
       {/* render dock info if it is available */}
       {entityIsStationHub && <StationHubDetails station={entity} />}
@@ -126,15 +134,15 @@ export function MapPopup({ configCompanies, entity, getEntityName, setLocation,
       {/* The "Set as [from/to]" ButtonGroup */}
       {setLocation && (
-        <BaseMapStyled.PopupRow>
+        <S.PopupRow>
           <FromToLocationPicker
             label
             location={generateLocation(entity, name)}
             setLocation={setLocation}
           />
-        </BaseMapStyled.PopupRow>
+        </S.PopupRow>
       )}
-    </BaseMapStyled.MapOverlayPopup>
+    </S.MapOverlayPopup>
   );
 }

package/src/styled.ts CHANGED Viewed

@@ -1,5 +1,7 @@
 import styled from "styled-components";
+import { Popup as MapGlPopup } from "react-map-gl";
 /* eslint-disable-next-line import/prefer-default-export */
 export const ViewStopButton = styled.button`
   background: none;
@@ -12,3 +14,30 @@ export const ViewStopButton = styled.button`
   margin-left: 5px;
   padding-top: 0;
 `;
+/**
+ * Adds a box shadow and tweaks border radius to make popups easier to read.
+ */
+export const Popup = styled(MapGlPopup)`
+  & > .maplibregl-popup-content,
+  & > .mapboxgl-popup-content {
+    border-radius: 10px;
+    box-shadow: 0 3px 14px 4px rgb(0 0 0 / 20%);
+  }
+`;
+export const MapOverlayPopup = styled.div`
+  font-size: 12px;
+  line-height: 1.5;
+  min-width: 250px;
+`;
+export const PopupRow = styled.p`
+  margin-top: 6px;
+`;
+export const PopupTitle = styled.header`
+  font-size: 18px;
+  font-weight: 500;
+  margin-bottom: 6px;
+`;

package/src/util.ts CHANGED Viewed

@@ -11,6 +11,8 @@ export function makeDefaultGetEntityName(
     entity: Station | Stop,
     configCompanies: Company[]
   ): string | null {
+    // TODO: Stop generating this / passing it to the car string? Is it needed?
+    // In English we say "Car: " instead
     const stationNetworks =
       "networks" in entity &&
       (coreUtils.itinerary.getCompaniesLabelFromNetworks(
@@ -36,7 +38,7 @@ export function makeDefaultGetEntityName(
           description: "Popup title for a free-floating bike",
           id: "otpUi.MapPopup.floatingBike"
         },
-        { name: stationName || stationNetworks }
+        { name: stationName }
       );
     } else if ("isFloatingCar" in entity && entity.isFloatingCar) {
       stationName = intl.formatMessage(
@@ -59,7 +61,7 @@ export function makeDefaultGetEntityName(
           description: "Popup title for a free-floating e-scooter",
           id: "otpUi.MapPopup.floatingEScooter"
         },
-        { name: stationName || stationNetworks }
+        { name: stationName }
       );
     }
     return stationName;