@opentripplanner/map-popup 7.0.0 → 8.0.0

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,9 +1,10 @@
-import { Agency, Company, Station, Stop, TileLayerStation } from "@opentripplanner/types";
+import { RentalVehicle, VehicleRentalStation } from "@opentripplanner/types/otp2";
+import { Agency, Company, Stop } from "@opentripplanner/types";
 import { IntlShape } from "react-intl";
 export type StopIdAgencyMap = Record<string, Agency>;
-export type Entity = Station | Stop | TileLayerStation;
+export type Entity = VehicleRentalStation | Stop | RentalVehicle;
 export declare function getNetwork(entity: Entity, configCompanies: Company[]): string;
 export declare function makeDefaultGetEntityName(intl: IntlShape, defaultEnglishMessages: {
     [key: string]: string;
-}): (entity: Entity, 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,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,KAChB,MAAM,GAAG,IAAI,CAoDjB"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,oBAAoB,EACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACrD,MAAM,MAAM,MAAM,GAAG,oBAAoB,GAAG,IAAI,GAAG,aAAa,CAAC;AAEjE,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,CA8DjB"}

package/lib/util.js

@@ -1,59 +1,65 @@
 "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 ("rentalNetwork" in entity &&
+        (core_utils_1.default.itinerary.getCompaniesLabelFromNetworks(entity.rentalNetwork.networkId, configCompanies) ||
+            entity.rentalNetwork.networkId));
 }
-
+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) {
+        var _a, _b, _c;
+        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 ("vehicleType" in entity &&
+            !("availableVehicles" in entity) &&
+            ((_a = entity.vehicleType) === null || _a === void 0 ? void 0 : _a.formFactor) === "BICYCLE") {
+            stationName = intl.formatMessage({
+                defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingBike"],
+                description: "Popup title for a free-floating bike",
+                id: "otpUi.MapPopup.floatingBike"
+            }, { name: stationName });
+        }
+        else if ("vehicleType" in entity &&
+            ((_b = entity.vehicleType) === null || _b === void 0 ? void 0 : _b.formFactor) === "CAR") {
+            // TODO: Stop generating this / passing it to the car string? Is it needed?
+            // In English we say "Car: " instead
+            const network = getNetwork(entity, configCompanies);
+            stationName = intl.formatMessage({
+                defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingCar"],
+                description: "Popup title for a free-floating car",
+                id: "otpUi.MapPopup.floatingCar"
+            }, {
+                company: network,
+                name: stationName
+            });
+        }
+        else if ("vehicleType" in entity &&
+            !("availableVehicles" in entity) &&
+            ((_c = entity.vehicleType) === null || _c === void 0 ? void 0 : _c.formFactor.startsWith("SCOOTER"))) {
+            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":";;;;;;AAMA,6EAAoD;AAKpD,SAAgB,UAAU,CAAC,MAAc,EAAE,eAA0B;IACnE,OAAO,CACL,eAAe,IAAI,MAAM;QACzB,CAAC,oBAAS,CAAC,SAAS,CAAC,6BAA6B,CAChD,MAAM,CAAC,aAAa,CAAC,SAAS,EAC9B,eAAe,CAChB;YACC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAClC,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,IACE,aAAa,IAAI,MAAM;YACvB,CAAC,CAAC,mBAAmB,IAAI,MAAM,CAAC;YAChC,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,MAAK,SAAS,EAC5C;YACA,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,IACL,aAAa,IAAI,MAAM;YACvB,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,MAAK,KAAK,EACxC;YACA,2EAA2E;YAC3E,oCAAoC;YACpC,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;YACpD,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,OAAO;gBAChB,IAAI,EAAE,WAAW;aAClB,CACF,CAAC;SACH;aAAM,IACL,aAAa,IAAI,MAAM;YACvB,CAAC,CAAC,mBAAmB,IAAI,MAAM,CAAC;aAChC,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA,EACpD;YACA,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;AAvED,4DAuEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentripplanner/map-popup",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "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/core-utils": "14.2.0",
     "@opentripplanner/base-map": "6.0.0",
     "@opentripplanner/building-blocks": "3.0.1",
-    "@opentripplanner/core-utils": "13.0.1",
     "@opentripplanner/from-to-location-picker": "4.0.1"
   },
   "devDependencies": {
-    "@opentripplanner/types": "7.0.0"
+    "@opentripplanner/types": "8.2.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",

package/src/MapPopup.story.tsx

@@ -1,9 +1,13 @@
 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 { Stop } from "@opentripplanner/types";
+import {
+  RentalVehicle,
+  VehicleRentalStation
+} from "@opentripplanner/types/otp2";
 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
@@ -68,57 +72,46 @@ const SAMPLE_FEEDS: Feed[] = [
   }
 ];
 
-const STATION = {
-  "stroke-width": 2,
+const VEHICLE_RENTAL_STATION: VehicleRentalStation = {
   allowDropoff: true,
   allowPickup: true,
-  color: "#f00",
+  availableVehicles: {
+    total: 6,
+    byType: [{ count: 6, vehicleType: { formFactor: "BICYCLE" } }]
+  },
+  availableSpaces: {
+    total: 11,
+    byType: [{ count: 12, vehicleType: { formFactor: "BICYCLE" } }]
+  },
   id: '"hub_1580"',
-  isCarStation: false,
-  isFloatingBike: false,
   lat: 45.5219604810172,
   lon: -122.6896771788597,
   name: "SW Morrison at 18th",
-  network: "BIKETOWN",
-  realTimeData: true,
-  spacesAvailable: 11,
-  vehiclesAvailable: 6
+  rentalNetwork: { networkId: "BIKETOWN" },
+  realtime: true
 };
 
-const FLOATING_VEHICLE = {
-  "stroke-width": 1,
-  allowDropoff: false,
-  allowPickup: true,
-  color: "#f00",
+const FLOATING_VEHICLE: RentalVehicle = {
+  allowPickupNow: true,
   id: '"bike_6861"',
-  isCarStation: false,
-  isFloatingBike: true,
+  vehicleType: { formFactor: "BICYCLE" },
   lat: 45.525486666666666,
   lon: -122.70486,
   name: "0541",
-  network: "BIKETOWN",
-  realTimeData: true,
-  spacesAvailable: 0,
-  vehiclesAvailable: 1
+  rentalNetwork: { networkId: "BIKETOWN" }
 };
 
-const FLOATING_CAR = {
-  "stroke-width": 1,
-  allowDropoff: false,
-  allowPickup: true,
-  color: "#333",
+const FLOATING_CAR: RentalVehicle = {
+  allowPickupNow: true,
   id: "car_6861",
-  isCarStation: false,
-  isFloatingCar: true,
+  vehicleType: { formFactor: "CAR" },
   lat: 52.52,
   lon: 13.405,
   name: "0541",
-  network: "MILES", // https://miles-mobility.com
-  realTimeData: true,
-  spacesAvailable: 0
+  rentalNetwork: { networkId: "MILES" }
 };
 
-const getEntityPrefixExample = (entity: Stop | Station) => {
+const getEntityPrefixExample = (entity: Stop | VehicleRentalStation) => {
   const DemoIcon = styled.span`
     background-color: blue;
     border-radius: 50px;
@@ -171,7 +164,7 @@ export const StopEntityNoStopCode = (): JSX.Element => (
 
 export const StationEntity = (): JSX.Element => (
   <MapPopupContents
-    entity={STATION}
+    entity={VEHICLE_RENTAL_STATION}
     setLocation={action("setLocation")}
     setViewedStop={action("setViewedStop")}
   />

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 hXaHvR">
+      <button class="styled__ViewStopButton-sc-12v7ov3-0 bbtcwi">
         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,6 +1,7 @@
 import React, { useCallback } from "react";
 import FromToLocationPicker from "@opentripplanner/from-to-location-picker";
 
+import { RentalVehicle, VehicleRentalStation } from "@opentripplanner/types/otp2";
 // eslint-disable-next-line prettier/prettier
 import type {
   Company,
@@ -8,15 +9,15 @@ import type {
   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 coreUtils from "@opentripplanner/core-utils";
 
-import { Entity, getNetwork, makeDefaultGetEntityName, type StopIdAgencyMap } from "./util";
+import { makeDefaultGetEntityName, type StopIdAgencyMap } from "./util";
 import { ViewStopButton } from "./styled";
 
 // Load the default messages.
@@ -36,7 +37,7 @@ export type Feed = {
 };
 
 
-const generateLocation = (entity: Entity, name: string) => {
+const generateLocation = (entity: MapPopupEntity, name: string) => {
   // @ts-expect-error some of these values may be null, but that's ok
   const { lon: entityLon, lat: entityLat, x, y } = entity
 
@@ -47,7 +48,7 @@ const generateLocation = (entity: Entity, name: string) => {
   return { lat, lon, name };
 }
 
-const StationHubDetails = ({ station }: { station: TileLayerStation }) => {
+const StationHubDetails = ({ availableVehicles, availableSpaces }: { availableVehicles: number, availableSpaces: number }) => {
   return (
     <Styled.PopupRow>
       <div>
@@ -57,7 +58,7 @@ const StationHubDetails = ({ station }: { station: TileLayerStation }) => {
           }
           description="Label text for the number of bikes available"
           id="otpUi.MapPopup.availableBikes"
-          values={{ value: station.vehiclesAvailable }}
+          values={{ value: availableVehicles }}
         />
       </div>
       <div>
@@ -67,14 +68,14 @@ const StationHubDetails = ({ station }: { station: TileLayerStation }) => {
           }
           description="Label text for the number of docks available"
           id="otpUi.MapPopup.availableDocks"
-          values={{ value: station.spacesAvailable }}
+          values={{ value: availableSpaces }}
         />
       </div>
     </Styled.PopupRow>
   )
 }
 
-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 +85,7 @@ const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => v
             description="Displays the stop id"
             id="otpUi.MapPopup.stopId"
             values={{
+              feedName,
               stopId: id
             }}
           />
@@ -99,20 +101,20 @@ const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => v
   )
 }
 
+type MapPopupEntity = Stop | VehicleRentalStation | RentalVehicle
+
 type Props = {
   closePopup?: (arg?: boolean) => void
   configCompanies?: ConfiguredCompany[];
-  entity: Entity
-  getEntityName?: (entity: Entity, configCompanies: Company[], feedName?: string) => string;
-  getEntityPrefix?: (entity: Entity) => JSX.Element
+  entity: MapPopupEntity
+  getEntityName?: (entity: MapPopupEntity, configCompanies: Company[], feedName?: string, includeParenthetical?: boolean) => string;
+  getEntityPrefix?: (entity: MapPopupEntity) => JSX.Element
   feeds?: Feed[]
   setLocation?: ({ location, locationType }: { location: Location, locationType: string }) => void;
   setViewedStop?: StopEventHandler;
 };
 
-function entityIsStation(entity: Entity): entity is TileLayerStation {
-  return "vehiclesAvailable" in entity
-}
+const entityIsStop = (entity: MapPopupEntity): entity is Stop => "gtfsId" in entity;
 
 /**
  * Renders a map popup for a stop, scooter, or shared bike
@@ -142,12 +144,13 @@ export function MapPopup({
   }
   
   const name = getNameFunc(entity, configCompanies, feedName);
+  const titleName = getNameFunc(entity, configCompanies, feedName, false);
 
-  const stationNetwork = getNetwork(entity, configCompanies);
+  const stationNetwork = "rentalNetwork" in entity && (coreUtils.itinerary.getCompaniesLabelFromNetworks(entity?.rentalNetwork.networkId, configCompanies) || entity?.rentalNetwork.networkId);
 
-  const bikesAvailablePresent = entityIsStation(entity)
-  const entityIsStationHub = bikesAvailablePresent && entity.vehiclesAvailable !== undefined && !entity.isFloatingBike;
-  const stopId = !bikesAvailablePresent && "code" in entity && entity.code;
+  const vehiclesAvailable = "availableVehicles" in entity;
+  const entityIsStationHub = vehiclesAvailable && entity?.availableVehicles !== undefined;
+  const stopId = entityIsStop(entity) ? entity.code : "";
   const id = `focus-${encodeURIComponent(entity.id).replace(/%/g, "")}-popup`
 
   return (
@@ -159,16 +162,17 @@ 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 */}
-      {entityIsStationHub && <StationHubDetails station={entity} />}
+      {entityIsStationHub && <StationHubDetails availableSpaces={entity.availableSpaces?.total} availableVehicles={entity.availableVehicles?.total} />}
 
       {/* render stop viewer link if available */}
-      {setViewedStop && !bikesAvailablePresent && (
+      {setViewedStop && entityIsStop(entity) && (
         <StopDetails
           id={stopId}
+          feedName={feedName}
           setViewedStop={useCallback(() => setViewedStop(entity as Stop), [entity])}
         />
       )}

package/src/util.ts

@@ -1,24 +1,22 @@
 import {
-  Agency,
-  Company,
-  Station,
-  Stop,
-  TileLayerStation
-} from "@opentripplanner/types";
+  RentalVehicle,
+  VehicleRentalStation
+} from "@opentripplanner/types/otp2";
+import { Agency, Company, Stop } 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 type Entity = VehicleRentalStation | Stop | RentalVehicle;
 
 export function getNetwork(entity: Entity, configCompanies: Company[]): string {
   return (
-    "network" in entity &&
+    "rentalNetwork" in entity &&
     (coreUtils.itinerary.getCompaniesLabelFromNetworks(
-      [entity.network] || [],
+      entity.rentalNetwork.networkId,
       configCompanies
     ) ||
-      entity.network)
+      entity.rentalNetwork.networkId)
   );
 }
 
@@ -30,7 +28,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)
@@ -43,7 +42,11 @@ export function makeDefaultGetEntityName(
       stationName = null;
     }
 
-    if ("isFloatingBike" in entity && entity.isFloatingBike) {
+    if (
+      "vehicleType" in entity &&
+      !("availableVehicles" in entity) &&
+      entity.vehicleType?.formFactor === "BICYCLE"
+    ) {
       stationName = intl.formatMessage(
         {
           defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingBike"],
@@ -52,10 +55,13 @@ export function makeDefaultGetEntityName(
         },
         { name: stationName }
       );
-    } else if ("isFloatingCar" in entity && entity.isFloatingCar) {
+    } else if (
+      "vehicleType" in entity &&
+      entity.vehicleType?.formFactor === "CAR"
+    ) {
       // TODO: Stop generating this / passing it to the car string? Is it needed?
       // In English we say "Car: " instead
-      const stationNetwork = getNetwork(entity, configCompanies);
+      const network = getNetwork(entity, configCompanies);
       stationName = intl.formatMessage(
         {
           defaultMessage: defaultEnglishMessages["otpUi.MapPopup.floatingCar"],
@@ -63,12 +69,15 @@ export function makeDefaultGetEntityName(
           id: "otpUi.MapPopup.floatingCar"
         },
         {
-          company: stationNetwork,
+          company: network,
           name: stationName
         }
       );
-    } else if ("isFloatingVehicle" in entity && entity.isFloatingVehicle) {
-      // assumes that all floating vehicles are E-scooters
+    } else if (
+      "vehicleType" in entity &&
+      !("availableVehicles" in entity) &&
+      entity.vehicleType?.formFactor.startsWith("SCOOTER")
+    ) {
       stationName = intl.formatMessage(
         {
           defaultMessage:
@@ -78,7 +87,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;