@opentripplanner/map-popup 7.0.0 → 7.0.1

package/lib/util.js

@@ -1,59 +1,60 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getNetwork = getNetwork;
-exports.makeDefaultGetEntityName = makeDefaultGetEntityName;
-var _coreUtils = _interopRequireDefault(require("@opentripplanner/core-utils"));
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeDefaultGetEntityName = exports.getNetwork = void 0;
+const core_utils_1 = __importDefault(require("@opentripplanner/core-utils"));
 function getNetwork(entity, configCompanies) {
-  return "network" in entity && (_coreUtils.default.itinerary.getCompaniesLabelFromNetworks([entity.network] || [], configCompanies) || entity.network);
+    return ("network" in entity &&
+        (core_utils_1.default.itinerary.getCompaniesLabelFromNetworks([entity.network], configCompanies) ||
+            entity.network));
 }
-
+exports.getNetwork = getNetwork;
 // eslint-disable-next-line import/prefer-default-export
 function makeDefaultGetEntityName(intl, defaultEnglishMessages) {
-  return function defaultGetEntityName(entity, configCompanies, feedName) {
-    let stationName = entity.name || entity.id;
-    // If the station name or id is a giant UUID (with more than 3 "-" characters)
-    // best not to show that at all. The company name will still be shown.
-    // Also ignore "Default Vehicle Type"
-    if ((stationName.match(/-/g) || []).length > 3 || stationName === "Default vehicle type") {
-      stationName = null;
-    }
-    if ("isFloatingBike" in entity && entity.isFloatingBike) {
-      stationName = intl.formatMessage({
-        defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingBike"],
-        description: "Popup title for a free-floating bike",
-        id: "otpUi.MapPopup.floatingBike"
-      }, {
-        name: stationName
-      });
-    } else if ("isFloatingCar" in entity && entity.isFloatingCar) {
-      // TODO: Stop generating this / passing it to the car string? Is it needed?
-      // In English we say "Car: " instead
-      const stationNetwork = getNetwork(entity, configCompanies);
-      stationName = intl.formatMessage({
-        defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingCar"],
-        description: "Popup title for a free-floating car",
-        id: "otpUi.MapPopup.floatingCar"
-      }, {
-        company: stationNetwork,
-        name: stationName
-      });
-    } else if ("isFloatingVehicle" in entity && entity.isFloatingVehicle) {
-      // assumes that all floating vehicles are E-scooters
-      stationName = intl.formatMessage({
-        defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingEScooter"],
-        description: "Popup title for a free-floating e-scooter",
-        id: "otpUi.MapPopup.floatingEScooter"
-      }, {
-        name: stationName
-      });
-    } else if (feedName && "code" in entity) {
-      stationName = `${stationName} (${feedName} ${entity.code})`;
-    }
-    return stationName;
-  };
+    return function defaultGetEntityName(entity, configCompanies, feedName, includeParenthetical = true) {
+        let stationName = entity.name || entity.id;
+        // If the station name or id is a giant UUID (with more than 3 "-" characters)
+        // best not to show that at all. The company name will still be shown.
+        // Also ignore "Default Vehicle Type"
+        if ((stationName.match(/-/g) || []).length > 3 ||
+            stationName === "Default vehicle type") {
+            stationName = null;
+        }
+        if ("isFloatingBike" in entity && entity.isFloatingBike) {
+            stationName = intl.formatMessage({
+                defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingBike"],
+                description: "Popup title for a free-floating bike",
+                id: "otpUi.MapPopup.floatingBike"
+            }, { name: stationName });
+        }
+        else if ("isFloatingCar" in entity && entity.isFloatingCar) {
+            // TODO: Stop generating this / passing it to the car string? Is it needed?
+            // In English we say "Car: " instead
+            const stationNetwork = getNetwork(entity, configCompanies);
+            stationName = intl.formatMessage({
+                defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingCar"],
+                description: "Popup title for a free-floating car",
+                id: "otpUi.MapPopup.floatingCar"
+            }, {
+                company: stationNetwork,
+                name: stationName
+            });
+        }
+        else if ("isFloatingVehicle" in entity && entity.isFloatingVehicle) {
+            // assumes that all floating vehicles are E-scooters
+            stationName = intl.formatMessage({
+                defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingEScooter"],
+                description: "Popup title for a free-floating e-scooter",
+                id: "otpUi.MapPopup.floatingEScooter"
+            }, { name: stationName });
+        }
+        else if (includeParenthetical && feedName && "code" in entity) {
+            stationName = `${stationName} (${feedName} ${entity.code})`;
+        }
+        return stationName;
+    };
 }
+exports.makeDefaultGetEntityName = makeDefaultGetEntityName;
 //# sourceMappingURL=util.js.map

package/lib/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","names":["_coreUtils","_interopRequireDefault","require","getNetwork","entity","configCompanies","coreUtils","itinerary","getCompaniesLabelFromNetworks","network","makeDefaultGetEntityName","intl","defaultEnglishMessages","defaultGetEntityName","feedName","stationName","name","id","match","length","isFloatingBike","formatMessage","defaultMessage","description","isFloatingCar","stationNetwork","company","isFloatingVehicle","code"],"sources":["../src/util.ts"],"sourcesContent":["import {\n  Agency,\n  Company,\n  Station,\n  Stop,\n  TileLayerStation\n} from \"@opentripplanner/types\";\nimport { IntlShape } from \"react-intl\";\nimport coreUtils from \"@opentripplanner/core-utils\";\n\nexport type StopIdAgencyMap = Record<string, Agency>;\nexport type Entity = Station | Stop | TileLayerStation;\n\nexport function getNetwork(entity: Entity, configCompanies: Company[]): string {\n  return (\n    \"network\" in entity &&\n    (coreUtils.itinerary.getCompaniesLabelFromNetworks(\n      [entity.network] || [],\n      configCompanies\n    ) ||\n      entity.network)\n  );\n}\n\n// eslint-disable-next-line import/prefer-default-export\nexport function makeDefaultGetEntityName(\n  intl: IntlShape,\n  defaultEnglishMessages: { [key: string]: string }\n) {\n  return function defaultGetEntityName(\n    entity: Entity,\n    configCompanies: Company[],\n    feedName?: string\n  ): string | null {\n    let stationName: string | null = entity.name || entity.id;\n    // If the station name or id is a giant UUID (with more than 3 \"-\" characters)\n    // best not to show that at all. The company name will still be shown.\n    // Also ignore \"Default Vehicle Type\"\n    if (\n      (stationName.match(/-/g) || []).length > 3 ||\n      stationName === \"Default vehicle type\"\n    ) {\n      stationName = null;\n    }\n\n    if (\"isFloatingBike\" in entity && entity.isFloatingBike) {\n      stationName = intl.formatMessage(\n        {\n          defaultMessage: defaultEnglishMessages[\"otpUi.MapPopup.floatingBike\"],\n          description: \"Popup title for a free-floating bike\",\n          id: \"otpUi.MapPopup.floatingBike\"\n        },\n        { name: stationName }\n      );\n    } else if (\"isFloatingCar\" in entity && entity.isFloatingCar) {\n      // TODO: Stop generating this / passing it to the car string? Is it needed?\n      // In English we say \"Car: \" instead\n      const stationNetwork = getNetwork(entity, configCompanies);\n      stationName = intl.formatMessage(\n        {\n          defaultMessage: defaultEnglishMessages[\"otpUi.MapPopup.floatingCar\"],\n          description: \"Popup title for a free-floating car\",\n          id: \"otpUi.MapPopup.floatingCar\"\n        },\n        {\n          company: stationNetwork,\n          name: stationName\n        }\n      );\n    } else if (\"isFloatingVehicle\" in entity && entity.isFloatingVehicle) {\n      // assumes that all floating vehicles are E-scooters\n      stationName = intl.formatMessage(\n        {\n          defaultMessage:\n            defaultEnglishMessages[\"otpUi.MapPopup.floatingEScooter\"],\n          description: \"Popup title for a free-floating e-scooter\",\n          id: \"otpUi.MapPopup.floatingEScooter\"\n        },\n        { name: stationName }\n      );\n    } else if (feedName && \"code\" in entity) {\n      stationName = `${stationName} (${feedName} ${entity.code})`;\n    }\n    return stationName;\n  };\n}\n"],"mappings":";;;;;;;;AAQA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AAKO,SAASC,UAAUA,CAACC,MAAc,EAAEC,eAA0B,EAAU;EAC7E,OACE,SAAS,IAAID,MAAM,KAClBE,kBAAS,CAACC,SAAS,CAACC,6BAA6B,CAChD,CAACJ,MAAM,CAACK,OAAO,CAAC,IAAI,EAAE,EACtBJ,eACF,CAAC,IACCD,MAAM,CAACK,OAAO,CAAC;AAErB;;AAEA;AACO,SAASC,wBAAwBA,CACtCC,IAAe,EACfC,sBAAiD,EACjD;EACA,OAAO,SAASC,oBAAoBA,CAClCT,MAAc,EACdC,eAA0B,EAC1BS,QAAiB,EACF;IACf,IAAIC,WAA0B,GAAGX,MAAM,CAACY,IAAI,IAAIZ,MAAM,CAACa,EAAE;IACzD;IACA;IACA;IACA,IACE,CAACF,WAAW,CAACG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,EAAEC,MAAM,GAAG,CAAC,IAC1CJ,WAAW,KAAK,sBAAsB,EACtC;MACAA,WAAW,GAAG,IAAI;IACpB;IAEA,IAAI,gBAAgB,IAAIX,MAAM,IAAIA,MAAM,CAACgB,cAAc,EAAE;MACvDL,WAAW,GAAGJ,IAAI,CAACU,aAAa,CAC9B;QACEC,cAAc,EAAEV,sBAAsB,CAAC,6BAA6B,CAAC;QACrEW,WAAW,EAAE,sCAAsC;QACnDN,EAAE,EAAE;MACN,CAAC,EACD;QAAED,IAAI,EAAED;MAAY,CACtB,CAAC;IACH,CAAC,MAAM,IAAI,eAAe,IAAIX,MAAM,IAAIA,MAAM,CAACoB,aAAa,EAAE;MAC5D;MACA;MACA,MAAMC,cAAc,GAAGtB,UAAU,CAACC,MAAM,EAAEC,eAAe,CAAC;MAC1DU,WAAW,GAAGJ,IAAI,CAACU,aAAa,CAC9B;QACEC,cAAc,EAAEV,sBAAsB,CAAC,4BAA4B,CAAC;QACpEW,WAAW,EAAE,qCAAqC;QAClDN,EAAE,EAAE;MACN,CAAC,EACD;QACES,OAAO,EAAED,cAAc;QACvBT,IAAI,EAAED;MACR,CACF,CAAC;IACH,CAAC,MAAM,IAAI,mBAAmB,IAAIX,MAAM,IAAIA,MAAM,CAACuB,iBAAiB,EAAE;MACpE;MACAZ,WAAW,GAAGJ,IAAI,CAACU,aAAa,CAC9B;QACEC,cAAc,EACZV,sBAAsB,CAAC,iCAAiC,CAAC;QAC3DW,WAAW,EAAE,2CAA2C;QACxDN,EAAE,EAAE;MACN,CAAC,EACD;QAAED,IAAI,EAAED;MAAY,CACtB,CAAC;IACH,CAAC,MAAM,IAAID,QAAQ,IAAI,MAAM,IAAIV,MAAM,EAAE;MACvCW,WAAW,GAAG,GAAGA,WAAW,KAAKD,QAAQ,IAAIV,MAAM,CAACwB,IAAI,GAAG;IAC7D;IACA,OAAOb,WAAW;EACpB,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;;;;AAQA,6EAAoD;AAKpD,SAAgB,UAAU,CAAC,MAAc,EAAE,eAA0B;IACnE,OAAO,CACL,SAAS,IAAI,MAAM;QACnB,CAAC,oBAAS,CAAC,SAAS,CAAC,6BAA6B,CAChD,CAAC,MAAM,CAAC,OAAO,CAAC,EAChB,eAAe,CAChB;YACC,MAAM,CAAC,OAAO,CAAC,CAClB,CAAC;AACJ,CAAC;AATD,gCASC;AAED,wDAAwD;AACxD,SAAgB,wBAAwB,CACtC,IAAe,EACf,sBAAiD;IAEjD,OAAO,SAAS,oBAAoB,CAClC,MAAc,EACd,eAA0B,EAC1B,QAAiB,EACjB,oBAAoB,GAAG,IAAI;QAE3B,IAAI,WAAW,GAAkB,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,CAAC;QAC1D,8EAA8E;QAC9E,sEAAsE;QACtE,qCAAqC;QACrC,IACE,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC;YAC1C,WAAW,KAAK,sBAAsB,EACtC;YACA,WAAW,GAAG,IAAI,CAAC;SACpB;QAED,IAAI,gBAAgB,IAAI,MAAM,IAAI,MAAM,CAAC,cAAc,EAAE;YACvD,WAAW,GAAG,IAAI,CAAC,aAAa,CAC9B;gBACE,cAAc,EAAE,sBAAsB,CAAC,6BAA6B,CAAC;gBACrE,WAAW,EAAE,sCAAsC;gBACnD,EAAE,EAAE,6BAA6B;aAClC,EACD,EAAE,IAAI,EAAE,WAAW,EAAE,CACtB,CAAC;SACH;aAAM,IAAI,eAAe,IAAI,MAAM,IAAI,MAAM,CAAC,aAAa,EAAE;YAC5D,2EAA2E;YAC3E,oCAAoC;YACpC,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;YAC3D,WAAW,GAAG,IAAI,CAAC,aAAa,CAC9B;gBACE,cAAc,EAAE,sBAAsB,CAAC,4BAA4B,CAAC;gBACpE,WAAW,EAAE,qCAAqC;gBAClD,EAAE,EAAE,4BAA4B;aACjC,EACD;gBACE,OAAO,EAAE,cAAc;gBACvB,IAAI,EAAE,WAAW;aAClB,CACF,CAAC;SACH;aAAM,IAAI,mBAAmB,IAAI,MAAM,IAAI,MAAM,CAAC,iBAAiB,EAAE;YACpE,oDAAoD;YACpD,WAAW,GAAG,IAAI,CAAC,aAAa,CAC9B;gBACE,cAAc,EACZ,sBAAsB,CAAC,iCAAiC,CAAC;gBAC3D,WAAW,EAAE,2CAA2C;gBACxD,EAAE,EAAE,iCAAiC;aACtC,EACD,EAAE,IAAI,EAAE,WAAW,EAAE,CACtB,CAAC;SACH;aAAM,IAAI,oBAAoB,IAAI,QAAQ,IAAI,MAAM,IAAI,MAAM,EAAE;YAC/D,WAAW,GAAG,GAAG,WAAW,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC;SAC7D;QACD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AA7DD,4DA6DC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentripplanner/map-popup",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "A component for displaying map popup contents",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -12,13 +12,13 @@
   "private": false,
   "dependencies": {
     "flat": "^5.0.2",
-    "@opentripplanner/base-map": "6.0.0",
     "@opentripplanner/building-blocks": "3.0.1",
-    "@opentripplanner/core-utils": "13.0.1",
+    "@opentripplanner/base-map": "6.0.0",
+    "@opentripplanner/core-utils": "14.0.0",
     "@opentripplanner/from-to-location-picker": "4.0.1"
   },
   "devDependencies": {
-    "@opentripplanner/types": "7.0.0"
+    "@opentripplanner/types": "8.0.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",

package/src/MapPopup.story.tsx

@@ -1,9 +1,9 @@
 import React from "react";
-import { action } from "@storybook/addon-actions";
+import { action } from "storybook/actions";
 import styled from "styled-components";
 import { Station, Stop } from "@opentripplanner/types";
 import { IntlProvider } from "react-intl";
-import { Meta } from "@storybook/react";
+import { Meta } from "@storybook/react-vite";
 import MapPopupContents, { Feed } from "./index";
 
 // HOC to wrap components with IntlProvider

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

@@ -392,11 +392,11 @@ exports[`Map Popup StopEntityWithFeedName smoke-test 1`] = `
        role="presentation"
   >
     <header class="styled__PopupTitle-sc-12kjso7-3 jRNaQh">
-      W Burnside &amp; SW 2nd (TriMet 9526)
+      W Burnside &amp; SW 2nd
     </header>
     <p class="styled__PopupRow-sc-12kjso7-2 ckOOWr">
       <strong>
-        Stop ID: 9526
+        Stop ID: TriMet 9526
       </strong>
       <button class="styled__ViewStopButton-sc-12v7ov3-0 hXaHvR">
         Stop Viewer

package/src/index.tsx

@@ -74,7 +74,7 @@ const StationHubDetails = ({ station }: { station: TileLayerStation }) => {
   )
 }
 
-const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => void; }) => {
+const StopDetails = ({ id, feedName, setViewedStop }: { id: string, feedName?: string, setViewedStop: () => void; }) => {
   return (
     <Styled.PopupRow>
       {id &&
@@ -84,6 +84,7 @@ const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => v
             description="Displays the stop id"
             id="otpUi.MapPopup.stopId"
             values={{
+              feedName,
               stopId: id
             }}
           />
@@ -103,7 +104,7 @@ type Props = {
   closePopup?: (arg?: boolean) => void
   configCompanies?: ConfiguredCompany[];
   entity: Entity
-  getEntityName?: (entity: Entity, configCompanies: Company[], feedName?: string) => string;
+  getEntityName?: (entity: Entity, configCompanies: Company[], feedName?: string, includeParenthetical?: boolean) => string;
   getEntityPrefix?: (entity: Entity) => JSX.Element
   feeds?: Feed[]
   setLocation?: ({ location, locationType }: { location: Location, locationType: string }) => void;
@@ -142,6 +143,7 @@ export function MapPopup({
   }
   
   const name = getNameFunc(entity, configCompanies, feedName);
+  const titleName = getNameFunc(entity, configCompanies, feedName, false);
 
   const stationNetwork = getNetwork(entity, configCompanies);
 
@@ -159,7 +161,7 @@ export function MapPopup({
           defaultMessage={defaultMessages["otpUi.MapPopup.popupTitle"]}
           description="Text for title of the popup, contains an optional company name"
           id="otpUi.MapPopup.popupTitle"
-          values={{ name, stationNetwork }}
+          values={{ name: titleName, stationNetwork }}
         />
       </Styled.PopupTitle>
       {/* render dock info if it is available */}
@@ -169,6 +171,7 @@ export function MapPopup({
       {setViewedStop && !bikesAvailablePresent && (
         <StopDetails
           id={stopId}
+          feedName={feedName}
           setViewedStop={useCallback(() => setViewedStop(entity as Stop), [entity])}
         />
       )}

package/src/util.ts

@@ -15,7 +15,7 @@ export function getNetwork(entity: Entity, configCompanies: Company[]): string {
   return (
     "network" in entity &&
     (coreUtils.itinerary.getCompaniesLabelFromNetworks(
-      [entity.network] || [],
+      [entity.network],
       configCompanies
     ) ||
       entity.network)
@@ -30,7 +30,8 @@ export function makeDefaultGetEntityName(
   return function defaultGetEntityName(
     entity: Entity,
     configCompanies: Company[],
-    feedName?: string
+    feedName?: string,
+    includeParenthetical = true
   ): string | null {
     let stationName: string | null = entity.name || entity.id;
     // If the station name or id is a giant UUID (with more than 3 "-" characters)
@@ -78,7 +79,7 @@ export function makeDefaultGetEntityName(
         },
         { name: stationName }
       );
-    } else if (feedName && "code" in entity) {
+    } else if (includeParenthetical && feedName && "code" in entity) {
       stationName = `${stationName} (${feedName} ${entity.code})`;
     }
     return stationName;