@opentripplanner/map-popup 6.1.0 → 7.0.1

package/lib/styled.js

@@ -1,14 +1,21 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.ViewStopButton = void 0;
-var _styledComponents = _interopRequireDefault(require("styled-components"));
+const styled_components_1 = __importDefault(require("styled-components"));
 /* eslint-disable-next-line import/prefer-default-export */
-const ViewStopButton = exports.ViewStopButton = _styledComponents.default.button.withConfig({
-  displayName: "styled__ViewStopButton",
-  componentId: "sc-12v7ov3-0"
-})(["background:none;border-bottom:none;", ";border-right:none;border-top:none;color:#008;font-family:inherit;padding-top:0;"], props => props.stopId != null ? "border-left: 1px solid #000; margin-left: 5px;" : "border-left: none; padding-left: 0;");
+exports.ViewStopButton = styled_components_1.default.button `
+  background: none;
+  border-bottom: none;
+  ${props => props.stopId != null
+    ? "border-left: 1px solid #000; margin-left: 5px;"
+    : "border-left: none; padding-left: 0;"};
+  border-right: none;
+  border-top: none;
+  color: #008;
+  font-family: inherit;
+  padding-top: 0;
+`;
 //# sourceMappingURL=styled.js.map

package/lib/styled.js.map

@@ -1 +1 @@
-{"version":3,"file":"styled.js","names":["_styledComponents","_interopRequireDefault","require","ViewStopButton","exports","styled","button","withConfig","displayName","componentId","props","stopId"],"sources":["../src/styled.ts"],"sourcesContent":["import styled from \"styled-components\";\n\n/* eslint-disable-next-line import/prefer-default-export */\nexport const ViewStopButton = styled.button<{ stopId?: string }>`\n  background: none;\n  border-bottom: none;\n  ${props =>\n    props.stopId != null\n      ? \"border-left: 1px solid #000; margin-left: 5px;\"\n      : \"border-left: none; padding-left: 0;\"};\n  border-right: none;\n  border-top: none;\n  color: #008;\n  font-family: inherit;\n  padding-top: 0;\n`;\n"],"mappings":";;;;;;;AAAA,IAAAA,iBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA;AACO,MAAMC,cAAc,GAAAC,OAAA,CAAAD,cAAA,GAAGE,yBAAM,CAACC,MAAM,CAAAC,UAAA;EAAAC,WAAA;EAAAC,WAAA;AAAA,gIAGvCC,KAAK,IACLA,KAAK,CAACC,MAAM,IAAI,IAAI,GAChB,gDAAgD,GAChD,qCAAqC,CAM5C","ignoreList":[]}
+{"version":3,"file":"styled.js","sourceRoot":"","sources":["../src/styled.ts"],"names":[],"mappings":";;;;;;AAAA,0EAAuC;AAEvC,2DAA2D;AAC9C,QAAA,cAAc,GAAG,2BAAM,CAAC,MAAM,CAAqB;;;IAG5D,KAAK,CAAC,EAAE,CACR,KAAK,CAAC,MAAM,IAAI,IAAI;IAClB,CAAC,CAAC,gDAAgD;IAClD,CAAC,CAAC,qCAAqC;;;;;;CAM5C,CAAC"}

package/lib/util.d.ts

@@ -1,7 +1,9 @@
-import { Agency, Company, Station, Stop } from "@opentripplanner/types";
+import { Agency, Company, Station, Stop, TileLayerStation } from "@opentripplanner/types";
 import { IntlShape } from "react-intl";
 export type StopIdAgencyMap = Record<string, Agency>;
+export type Entity = Station | Stop | TileLayerStation;
+export declare function getNetwork(entity: Entity, configCompanies: Company[]): string;
 export declare function makeDefaultGetEntityName(intl: IntlShape, defaultEnglishMessages: {
     [key: string]: string;
-}): (entity: Station | Stop, configCompanies: Company[], feedName?: string) => string | null;
+}): (entity: Entity, configCompanies: Company[], feedName?: string, includeParenthetical?: boolean) => string | null;
 //# sourceMappingURL=util.d.ts.map

package/lib/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAGrD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,SAAS,EACf,sBAAsB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,YAGvC,OAAO,GAAG,IAAI,mBACL,OAAO,EAAE,aACf,MAAM,KAChB,MAAM,GAAG,IAAI,CA0DjB"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,OAAO,EACP,OAAO,EACP,IAAI,EACJ,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACrD,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,gBAAgB,CAAC;AAEvD,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,MAAM,CAS7E;AAGD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,SAAS,EACf,sBAAsB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,YAGvC,MAAM,mBACG,OAAO,EAAE,aACf,MAAM,qCAEhB,MAAM,GAAG,IAAI,CAoDjB"}

package/lib/util.js

@@ -1,55 +1,60 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-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 &&
+        (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) {
-    var _entity$networks;
-    // 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.default.itinerary.getCompaniesLabelFromNetworks((entity === null || entity === void 0 ? void 0 : entity.networks) || [], configCompanies) || (entity === null || entity === void 0 || (_entity$networks = entity.networks) === null || _entity$networks === void 0 ? void 0 : _entity$networks[0]));
-    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) {
-      stationName = intl.formatMessage({
-        defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingCar"],
-        description: "Popup title for a free-floating car",
-        id: "otpUi.MapPopup.floatingCar"
-      }, {
-        company: stationNetworks,
-        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","makeDefaultGetEntityName","intl","defaultEnglishMessages","defaultGetEntityName","entity","configCompanies","feedName","_entity$networks","stationNetworks","coreUtils","itinerary","getCompaniesLabelFromNetworks","networks","stationName","name","id","match","length","isFloatingBike","formatMessage","defaultMessage","description","isFloatingCar","company","isFloatingVehicle","code"],"sources":["../src/util.ts"],"sourcesContent":["import { Agency, Company, Station, Stop } from \"@opentripplanner/types\";\nimport { IntlShape } from \"react-intl\";\nimport coreUtils from \"@opentripplanner/core-utils\";\n\nexport type StopIdAgencyMap = Record<string, Agency>;\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: Station | Stop,\n    configCompanies: Company[],\n    feedName?: string\n  ): string | null {\n    // TODO: Stop generating this / passing it to the car string? Is it needed?\n    // In English we say \"Car: \" instead\n    const stationNetworks =\n      \"networks\" in entity &&\n      (coreUtils.itinerary.getCompaniesLabelFromNetworks(\n        entity?.networks || [],\n        configCompanies\n      ) ||\n        entity?.networks?.[0]);\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      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: stationNetworks,\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":";;;;;;;AAEA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA;AACO,SAASC,wBAAwBA,CACtCC,IAAe,EACfC,sBAAiD,EACjD;EACA,OAAO,SAASC,oBAAoBA,CAClCC,MAAsB,EACtBC,eAA0B,EAC1BC,QAAiB,EACF;IAAA,IAAAC,gBAAA;IACf;IACA;IACA,MAAMC,eAAe,GACnB,UAAU,IAAIJ,MAAM,KACnBK,kBAAS,CAACC,SAAS,CAACC,6BAA6B,CAChD,CAAAP,MAAM,aAANA,MAAM,uBAANA,MAAM,CAAEQ,QAAQ,KAAI,EAAE,EACtBP,eACF,CAAC,KACCD,MAAM,aAANA,MAAM,gBAAAG,gBAAA,GAANH,MAAM,CAAEQ,QAAQ,cAAAL,gBAAA,uBAAhBA,gBAAA,CAAmB,CAAC,CAAC,EAAC;IAC1B,IAAIM,WAA0B,GAAGT,MAAM,CAACU,IAAI,IAAIV,MAAM,CAACW,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,IAAIT,MAAM,IAAIA,MAAM,CAACc,cAAc,EAAE;MACvDL,WAAW,GAAGZ,IAAI,CAACkB,aAAa,CAC9B;QACEC,cAAc,EAAElB,sBAAsB,CAAC,6BAA6B,CAAC;QACrEmB,WAAW,EAAE,sCAAsC;QACnDN,EAAE,EAAE;MACN,CAAC,EACD;QAAED,IAAI,EAAED;MAAY,CACtB,CAAC;IACH,CAAC,MAAM,IAAI,eAAe,IAAIT,MAAM,IAAIA,MAAM,CAACkB,aAAa,EAAE;MAC5DT,WAAW,GAAGZ,IAAI,CAACkB,aAAa,CAC9B;QACEC,cAAc,EAAElB,sBAAsB,CAAC,4BAA4B,CAAC;QACpEmB,WAAW,EAAE,qCAAqC;QAClDN,EAAE,EAAE;MACN,CAAC,EACD;QACEQ,OAAO,EAAEf,eAAe;QACxBM,IAAI,EAAED;MACR,CACF,CAAC;IACH,CAAC,MAAM,IAAI,mBAAmB,IAAIT,MAAM,IAAIA,MAAM,CAACoB,iBAAiB,EAAE;MACpE;MACAX,WAAW,GAAGZ,IAAI,CAACkB,aAAa,CAC9B;QACEC,cAAc,EACZlB,sBAAsB,CAAC,iCAAiC,CAAC;QAC3DmB,WAAW,EAAE,2CAA2C;QACxDN,EAAE,EAAE;MACN,CAAC,EACD;QAAED,IAAI,EAAED;MAAY,CACtB,CAAC;IACH,CAAC,MAAM,IAAIP,QAAQ,IAAI,MAAM,IAAIF,MAAM,EAAE;MACvCS,WAAW,GAAG,GAAGA,WAAW,KAAKP,QAAQ,IAAIF,MAAM,CAACqB,IAAI,GAAG;IAC7D;IACA,OAAOZ,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": "6.1.0",
+  "version": "7.0.1",
   "description": "A component for displaying map popup contents",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -13,12 +13,12 @@
   "dependencies": {
     "flat": "^5.0.2",
     "@opentripplanner/building-blocks": "3.0.1",
-    "@opentripplanner/core-utils": "13.0.1",
-    "@opentripplanner/from-to-location-picker": "4.0.1",
-    "@opentripplanner/base-map": "5.2.0"
+    "@opentripplanner/base-map": "6.0.0",
+    "@opentripplanner/core-utils": "14.0.0",
+    "@opentripplanner/from-to-location-picker": "4.0.1"
   },
   "devDependencies": {
-    "@opentripplanner/types": "6.5.3"
+    "@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
@@ -72,34 +72,34 @@ const STATION = {
   "stroke-width": 2,
   allowDropoff: true,
   allowPickup: true,
-  bikesAvailable: 6,
   color: "#f00",
   id: '"hub_1580"',
   isCarStation: false,
   isFloatingBike: false,
+  lat: 45.5219604810172,
+  lon: -122.6896771788597,
   name: "SW Morrison at 18th",
-  networks: ["BIKETOWN"],
+  network: "BIKETOWN",
   realTimeData: true,
   spacesAvailable: 11,
-  x: -122.6896771788597,
-  y: 45.5219604810172
+  vehiclesAvailable: 6
 };
 
 const FLOATING_VEHICLE = {
   "stroke-width": 1,
   allowDropoff: false,
   allowPickup: true,
-  bikesAvailable: 1,
   color: "#f00",
   id: '"bike_6861"',
   isCarStation: false,
   isFloatingBike: true,
+  lat: 45.525486666666666,
+  lon: -122.70486,
   name: "0541",
-  networks: ["BIKETOWN"],
+  network: "BIKETOWN",
   realTimeData: true,
   spacesAvailable: 0,
-  x: -122.70486,
-  y: 45.525486666666666
+  vehiclesAvailable: 1
 };
 
 const FLOATING_CAR = {
@@ -110,12 +110,12 @@ const FLOATING_CAR = {
   id: "car_6861",
   isCarStation: false,
   isFloatingCar: true,
+  lat: 52.52,
+  lon: 13.405,
   name: "0541",
-  networks: ["MILES"], // https://miles-mobility.com
+  network: "MILES", // https://miles-mobility.com
   realTimeData: true,
-  spacesAvailable: 0,
-  x: 13.405,
-  y: 52.52
+  spacesAvailable: 0
 };
 
 const getEntityPrefixExample = (entity: Stop | Station) => {

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

@@ -265,7 +265,7 @@ exports[`Map Popup StopEntityNoStopCode smoke-test 1`] = `
       W Burnside & SW 2nd
     </header>
     <p class="styled__PopupRow-sc-12kjso7-2 ckOOWr">
-      <button class="styled__ViewStopButton-sc-12v7ov3-0 bbtcwi">
+      <button class="styled__ViewStopButton-sc-12v7ov3-0 hXaHvR">
         Stop Viewer
       </button>
     </p>
@@ -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

@@ -1,20 +1,26 @@
 import React, { useCallback } from "react";
 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";
+import type {
+  Company,
+  ConfiguredCompany,
+  Location,
+  Stop,
+  StopEventHandler,
+  TileLayerStation
+} from "@opentripplanner/types";
 
 import { FocusTrapWrapper } from "@opentripplanner/building-blocks";
 import { flatten } from "flat";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Styled } from "@opentripplanner/base-map";
 
+import { Entity, getNetwork, makeDefaultGetEntityName, type StopIdAgencyMap } from "./util";
 import { ViewStopButton } from "./styled";
 
 // Load the default messages.
 import defaultEnglishMessages from "../i18n/en-US.yml";
-import { makeDefaultGetEntityName, type StopIdAgencyMap } from "./util";
 
 // HACK: We should flatten the messages loaded above because
 // the YAML loaders behave differently between webpack and our version of jest:
@@ -41,7 +47,7 @@ const generateLocation = (entity: Entity, name: string) => {
   return { lat, lon, name };
 }
 
-const StationHubDetails = ({ station }: { station: Station }) => {
+const StationHubDetails = ({ station }: { station: TileLayerStation }) => {
   return (
     <Styled.PopupRow>
       <div>
@@ -51,7 +57,7 @@ const StationHubDetails = ({ station }: { station: Station }) => {
           }
           description="Label text for the number of bikes available"
           id="otpUi.MapPopup.availableBikes"
-          values={{ value: station.bikesAvailable }}
+          values={{ value: station.vehiclesAvailable }}
         />
       </div>
       <div>
@@ -68,7 +74,7 @@ const StationHubDetails = ({ station }: { station: Station }) => {
   )
 }
 
-const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => void; }) => {
+const StopDetails = ({ id, feedName, setViewedStop }: { id: string, feedName?: string, setViewedStop: () => void; }) => {
   return (
     <Styled.PopupRow>
       {id &&
@@ -78,6 +84,7 @@ const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => v
             description="Displays the stop id"
             id="otpUi.MapPopup.stopId"
             values={{
+              feedName,
               stopId: id
             }}
           />
@@ -93,20 +100,19 @@ const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => v
   )
 }
 
-type Entity = Stop | Station
 type Props = {
-  closePopup?: (arg?: any) => void
+  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;
   setViewedStop?: StopEventHandler;
 };
 
-function entityIsStation(entity: Entity): entity is Station {
-  return "bikesAvailable" in entity
+function entityIsStation(entity: Entity): entity is TileLayerStation {
+  return "vehiclesAvailable" in entity
 }
 
 /**
@@ -137,12 +143,13 @@ export function MapPopup({
   }
   
   const name = getNameFunc(entity, configCompanies, feedName);
+  const titleName = getNameFunc(entity, configCompanies, feedName, false);
 
-  const stationNetwork = "networks" in entity && (coreUtils.itinerary.getCompaniesLabelFromNetworks(entity?.networks || [], configCompanies) || entity?.networks?.[0]);
+  const stationNetwork = getNetwork(entity, configCompanies);
 
   const bikesAvailablePresent = entityIsStation(entity)
-  const entityIsStationHub = bikesAvailablePresent && entity?.bikesAvailable !== undefined && !entity?.isFloatingBike;
-  const stopId = !bikesAvailablePresent && entity?.code;
+  const entityIsStationHub = bikesAvailablePresent && entity.vehiclesAvailable !== undefined && !entity.isFloatingBike;
+  const stopId = !bikesAvailablePresent && "code" in entity && entity.code;
   const id = `focus-${encodeURIComponent(entity.id).replace(/%/g, "")}-popup`
 
   return (
@@ -154,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 */}
@@ -164,7 +171,8 @@ export function MapPopup({
       {setViewedStop && !bikesAvailablePresent && (
         <StopDetails
           id={stopId}
-          setViewedStop={useCallback(() => setViewedStop(entity), [entity])}
+          feedName={feedName}
+          setViewedStop={useCallback(() => setViewedStop(entity as Stop), [entity])}
         />
       )}
 

package/src/util.ts

@@ -1,8 +1,26 @@
-import { Agency, Company, Station, Stop } from "@opentripplanner/types";
+import {
+  Agency,
+  Company,
+  Station,
+  Stop,
+  TileLayerStation
+} from "@opentripplanner/types";
 import { IntlShape } from "react-intl";
 import coreUtils from "@opentripplanner/core-utils";
 
 export type StopIdAgencyMap = Record<string, Agency>;
+export type Entity = Station | Stop | TileLayerStation;
+
+export function getNetwork(entity: Entity, configCompanies: Company[]): string {
+  return (
+    "network" in entity &&
+    (coreUtils.itinerary.getCompaniesLabelFromNetworks(
+      [entity.network],
+      configCompanies
+    ) ||
+      entity.network)
+  );
+}
 
 // eslint-disable-next-line import/prefer-default-export
 export function makeDefaultGetEntityName(
@@ -10,19 +28,11 @@ export function makeDefaultGetEntityName(
   defaultEnglishMessages: { [key: string]: string }
 ) {
   return function defaultGetEntityName(
-    entity: Station | Stop,
+    entity: Entity,
     configCompanies: Company[],
-    feedName?: string
+    feedName?: string,
+    includeParenthetical = true
   ): 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(
-        entity?.networks || [],
-        configCompanies
-      ) ||
-        entity?.networks?.[0]);
     let stationName: string | null = 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.
@@ -44,6 +54,9 @@ export function makeDefaultGetEntityName(
         { 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"],
@@ -51,7 +64,7 @@ export function makeDefaultGetEntityName(
           id: "otpUi.MapPopup.floatingCar"
         },
         {
-          company: stationNetworks,
+          company: stationNetwork,
           name: stationName
         }
       );
@@ -66,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;