@opentripplanner/map-popup 7.0.0 → 7.0.1

package/esm/index.js

@@ -53,12 +53,14 @@ var StationHubDetails = function StationHubDetails(_ref) {
 };
 var StopDetails = function StopDetails(_ref2) {
   var id = _ref2.id,
+    feedName = _ref2.feedName,
     setViewedStop = _ref2.setViewedStop;
   return /*#__PURE__*/React.createElement(Styled.PopupRow, null, id && /*#__PURE__*/React.createElement("strong", null, /*#__PURE__*/React.createElement(FormattedMessage, {
     defaultMessage: defaultMessages["otpUi.MapPopup.stopId"],
     description: "Displays the stop id",
     id: "otpUi.MapPopup.stopId",
     values: {
+      feedName: feedName,
       stopId: id
     }
   })), /*#__PURE__*/React.createElement(ViewStopButton, {
@@ -102,6 +104,7 @@ export function MapPopup(_ref3) {
     feedName = feed === null || feed === void 0 || (_feed$publisher = feed.publisher) === null || _feed$publisher === void 0 ? void 0 : _feed$publisher.name;
   }
   var name = getNameFunc(entity, configCompanies, feedName);
+  var titleName = getNameFunc(entity, configCompanies, feedName, false);
   var stationNetwork = getNetwork(entity, configCompanies);
   var bikesAvailablePresent = entityIsStation(entity);
   var entityIsStationHub = bikesAvailablePresent && entity.vehiclesAvailable !== undefined && !entity.isFloatingBike;
@@ -115,13 +118,14 @@ export function MapPopup(_ref3) {
     description: "Text for title of the popup, contains an optional company name",
     id: "otpUi.MapPopup.popupTitle",
     values: {
-      name: name,
+      name: titleName,
       stationNetwork: stationNetwork
     }
   })), entityIsStationHub && /*#__PURE__*/React.createElement(StationHubDetails, {
     station: entity
   }), setViewedStop && !bikesAvailablePresent && /*#__PURE__*/React.createElement(StopDetails, {
     id: stopId,
+    feedName: feedName,
     setViewedStop: useCallback(function () {
       return setViewedStop(entity);
     }, [entity])

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["React","useCallback","FromToLocationPicker","FocusTrapWrapper","flatten","FormattedMessage","useIntl","Styled","getNetwork","makeDefaultGetEntityName","ViewStopButton","defaultEnglishMessages","defaultMessages","generateLocation","entity","name","entityLon","lon","entityLat","lat","x","y","StationHubDetails","_ref","station","createElement","PopupRow","defaultMessage","description","id","values","value","vehiclesAvailable","spacesAvailable","StopDetails","_ref2","setViewedStop","stopId","onClick","entityIsStation","MapPopup","_ref3","_ref3$closePopup","closePopup","configCompanies","getEntityName","getEntityPrefix","setLocation","feeds","intl","Fragment","getNameFunc","feedName","_feed$publisher","feedId","split","feed","find","f","publisher","stationNetwork","bikesAvailablePresent","entityIsStationHub","undefined","isFloatingBike","code","concat","encodeURIComponent","replace","MapOverlayPopup","PopupTitle","label","location"],"sources":["../src/index.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport FromToLocationPicker from \"@opentripplanner/from-to-location-picker\";\n\n// eslint-disable-next-line prettier/prettier\nimport type {\n  Company,\n  ConfiguredCompany,\n  Location,\n  Stop,\n  StopEventHandler,\n  TileLayerStation\n} from \"@opentripplanner/types\";\n\nimport { FocusTrapWrapper } from \"@opentripplanner/building-blocks\";\nimport { flatten } from \"flat\";\nimport { FormattedMessage, useIntl } from \"react-intl\";\nimport { Styled } from \"@opentripplanner/base-map\";\n\nimport { Entity, getNetwork, makeDefaultGetEntityName, type StopIdAgencyMap } from \"./util\";\nimport { ViewStopButton } from \"./styled\";\n\n// Load the default messages.\nimport defaultEnglishMessages from \"../i18n/en-US.yml\";\n\n// HACK: We should flatten the messages loaded above because\n// the YAML loaders behave differently between webpack and our version of jest:\n// - the yaml loader for webpack returns a nested object,\n// - the yaml loader for jest returns messages with flattened ids.\nexport const defaultMessages: { [key: string]: string } = flatten(defaultEnglishMessages);\n\nexport type Feed = {\n  feedId: string;\n  publisher: {\n    name: string;\n  };\n};\n\n\nconst generateLocation = (entity: Entity, name: string) => {\n  // @ts-expect-error some of these values may be null, but that's ok\n  const { lon: entityLon, lat: entityLat, x, y } = entity\n\n  const lat = entityLat || y\n  const lon = entityLon || x\n  if (!lat || !lon) return null\n\n  return { lat, lon, name };\n}\n\nconst StationHubDetails = ({ station }: { station: TileLayerStation }) => {\n  return (\n    <Styled.PopupRow>\n      <div>\n        <FormattedMessage\n          defaultMessage={\n            defaultMessages[\"otpUi.MapPopup.availableBikes\"]\n          }\n          description=\"Label text for the number of bikes available\"\n          id=\"otpUi.MapPopup.availableBikes\"\n          values={{ value: station.vehiclesAvailable }}\n        />\n      </div>\n      <div>\n        <FormattedMessage\n          defaultMessage={\n            defaultMessages[\"otpUi.MapPopup.availableDocks\"]\n          }\n          description=\"Label text for the number of docks available\"\n          id=\"otpUi.MapPopup.availableDocks\"\n          values={{ value: station.spacesAvailable }}\n        />\n      </div>\n    </Styled.PopupRow>\n  )\n}\n\nconst StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => void; }) => {\n  return (\n    <Styled.PopupRow>\n      {id &&\n        <strong>\n          <FormattedMessage\n            defaultMessage={defaultMessages[\"otpUi.MapPopup.stopId\"]}\n            description=\"Displays the stop id\"\n            id=\"otpUi.MapPopup.stopId\"\n            values={{\n              stopId: id\n            }}\n          />\n        </strong>}\n      <ViewStopButton onClick={setViewedStop} stopId={id}> \n        <FormattedMessage\n          defaultMessage={defaultMessages[\"otpUi.MapPopup.stopViewer\"]}\n          description=\"Text for link that opens the stop viewer\"\n          id=\"otpUi.MapPopup.stopViewer\"\n        />\n      </ViewStopButton>\n    </Styled.PopupRow>\n  )\n}\n\ntype Props = {\n  closePopup?: (arg?: boolean) => void\n  configCompanies?: ConfiguredCompany[];\n  entity: Entity\n  getEntityName?: (entity: Entity, configCompanies: Company[], feedName?: string) => string;\n  getEntityPrefix?: (entity: Entity) => JSX.Element\n  feeds?: Feed[]\n  setLocation?: ({ location, locationType }: { location: Location, locationType: string }) => void;\n  setViewedStop?: StopEventHandler;\n};\n\nfunction entityIsStation(entity: Entity): entity is TileLayerStation {\n  return \"vehiclesAvailable\" in entity\n}\n\n/**\n * Renders a map popup for a stop, scooter, or shared bike\n */\nexport function MapPopup({ \n  closePopup = () => {}, \n  configCompanies, \n  entity, \n  getEntityName, \n  getEntityPrefix, \n  setLocation, \n  setViewedStop, \n  feeds,\n}: Props): JSX.Element {\n\n  const intl = useIntl()\n  if (!entity) return <></>\n\n  const getNameFunc = getEntityName || makeDefaultGetEntityName(intl, defaultMessages);\n  \n  // Find the feed name using the logic from generateLabel in otp.ts\n  let feedName: string | undefined;\n  if (feeds && entity.id) {\n    const feedId = entity.id.split(\":\")[0];\n    const feed = feeds.find(f => f.feedId === feedId);\n    feedName = feed?.publisher?.name;\n  }\n  \n  const name = getNameFunc(entity, configCompanies, feedName);\n\n  const stationNetwork = getNetwork(entity, configCompanies);\n\n  const bikesAvailablePresent = entityIsStation(entity)\n  const entityIsStationHub = bikesAvailablePresent && entity.vehiclesAvailable !== undefined && !entity.isFloatingBike;\n  const stopId = !bikesAvailablePresent && \"code\" in entity && entity.code;\n  const id = `focus-${encodeURIComponent(entity.id).replace(/%/g, \"\")}-popup`\n\n  return (\n    <Styled.MapOverlayPopup>\n      <FocusTrapWrapper closePopup={closePopup} id={id}>\n      <Styled.PopupTitle>\n        {getEntityPrefix && getEntityPrefix(entity)}\n        <FormattedMessage\n          defaultMessage={defaultMessages[\"otpUi.MapPopup.popupTitle\"]}\n          description=\"Text for title of the popup, contains an optional company name\"\n          id=\"otpUi.MapPopup.popupTitle\"\n          values={{ name, stationNetwork }}\n        />\n      </Styled.PopupTitle>\n      {/* render dock info if it is available */}\n      {entityIsStationHub && <StationHubDetails station={entity} />}\n\n      {/* render stop viewer link if available */}\n      {setViewedStop && !bikesAvailablePresent && (\n        <StopDetails\n          id={stopId}\n          setViewedStop={useCallback(() => setViewedStop(entity as Stop), [entity])}\n        />\n      )}\n\n      {/* The \"Set as [from/to]\" ButtonGroup */}\n      {setLocation && (\n        <Styled.PopupRow>\n          <FromToLocationPicker\n            label\n            location={generateLocation(entity, name)}\n            setLocation={setLocation}\n          />\n        </Styled.PopupRow>\n      )}\n      </FocusTrapWrapper>\n      \n    </Styled.MapOverlayPopup>\n  );\n}\n\nexport default MapPopup;\nexport { type StopIdAgencyMap };"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,QAAQ,OAAO;AAC1C,OAAOC,oBAAoB,MAAM,0CAA0C;;AAE3E;;AAUA,SAASC,gBAAgB,QAAQ,kCAAkC;AACnE,SAASC,OAAO,QAAQ,MAAM;AAC9B,SAASC,gBAAgB,EAAEC,OAAO,QAAQ,YAAY;AACtD,SAASC,MAAM,QAAQ,2BAA2B;AAElD,SAAiBC,UAAU,EAAEC,wBAAwB,QAA8B,QAAQ;AAC3F,SAASC,cAAc,QAAQ,UAAU;;AAEzC;AACA,OAAOC,sBAAsB,MAAM,mBAAmB;;AAEtD;AACA;AACA;AACA;AACA,OAAO,IAAMC,eAA0C,GAAGR,OAAO,CAACO,sBAAsB,CAAC;AAUzF,IAAME,gBAAgB,GAAG,SAAnBA,gBAAgBA,CAAIC,MAAc,EAAEC,IAAY,EAAK;EACzD;EACA,IAAaC,SAAS,GAA2BF,MAAM,CAA/CG,GAAG;IAAkBC,SAAS,GAAWJ,MAAM,CAA/BK,GAAG;IAAaC,CAAC,GAAQN,MAAM,CAAfM,CAAC;IAAEC,CAAC,GAAKP,MAAM,CAAZO,CAAC;EAE5C,IAAMF,GAAG,GAAGD,SAAS,IAAIG,CAAC;EAC1B,IAAMJ,GAAG,GAAGD,SAAS,IAAII,CAAC;EAC1B,IAAI,CAACD,GAAG,IAAI,CAACF,GAAG,EAAE,OAAO,IAAI;EAE7B,OAAO;IAAEE,GAAG,EAAHA,GAAG;IAAEF,GAAG,EAAHA,GAAG;IAAEF,IAAI,EAAJA;EAAK,CAAC;AAC3B,CAAC;AAED,IAAMO,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAAC,IAAA,EAAmD;EAAA,IAA7CC,OAAO,GAAAD,IAAA,CAAPC,OAAO;EAClC,oBACExB,KAAA,CAAAyB,aAAA,CAAClB,MAAM,CAACmB,QAAQ,qBACd1B,KAAA,CAAAyB,aAAA,2BACEzB,KAAA,CAAAyB,aAAA,CAACpB,gBAAgB;IACfsB,cAAc,EACZf,eAAe,CAAC,+BAA+B,CAChD;IACDgB,WAAW,EAAC,8CAA8C;IAC1DC,EAAE,EAAC,+BAA+B;IAClCC,MAAM,EAAE;MAAEC,KAAK,EAAEP,OAAO,CAACQ;IAAkB;EAAE,CAC9C,CACE,CAAC,eACNhC,KAAA,CAAAyB,aAAA,2BACEzB,KAAA,CAAAyB,aAAA,CAACpB,gBAAgB;IACfsB,cAAc,EACZf,eAAe,CAAC,+BAA+B,CAChD;IACDgB,WAAW,EAAC,8CAA8C;IAC1DC,EAAE,EAAC,+BAA+B;IAClCC,MAAM,EAAE;MAAEC,KAAK,EAAEP,OAAO,CAACS;IAAgB;EAAE,CAC5C,CACE,CACU,CAAC;AAEtB,CAAC;AAED,IAAMC,WAAW,GAAG,SAAdA,WAAWA,CAAAC,KAAA,EAA0E;EAAA,IAApEN,EAAE,GAAAM,KAAA,CAAFN,EAAE;IAAEO,aAAa,GAAAD,KAAA,CAAbC,aAAa;EACtC,oBACEpC,KAAA,CAAAyB,aAAA,CAAClB,MAAM,CAACmB,QAAQ,QACbG,EAAE,iBACD7B,KAAA,CAAAyB,aAAA,8BACEzB,KAAA,CAAAyB,aAAA,CAACpB,gBAAgB;IACfsB,cAAc,EAAEf,eAAe,CAAC,uBAAuB,CAAE;IACzDgB,WAAW,EAAC,sBAAsB;IAClCC,EAAE,EAAC,uBAAuB;IAC1BC,MAAM,EAAE;MACNO,MAAM,EAAER;IACV;EAAE,CACH,CACK,CAAC,eACX7B,KAAA,CAAAyB,aAAA,CAACf,cAAc;IAAC4B,OAAO,EAAEF,aAAc;IAACC,MAAM,EAAER;EAAG,gBACjD7B,KAAA,CAAAyB,aAAA,CAACpB,gBAAgB;IACfsB,cAAc,EAAEf,eAAe,CAAC,2BAA2B,CAAE;IAC7DgB,WAAW,EAAC,0CAA0C;IACtDC,EAAE,EAAC;EAA2B,CAC/B,CACa,CACD,CAAC;AAEtB,CAAC;AAaD,SAASU,eAAeA,CAACzB,MAAc,EAA8B;EACnE,OAAO,mBAAmB,IAAIA,MAAM;AACtC;;AAEA;AACA;AACA;AACA,OAAO,SAAS0B,QAAQA,CAAAC,KAAA,EASD;EAAA,IAAAC,gBAAA,GAAAD,KAAA,CARrBE,UAAU;IAAVA,UAAU,GAAAD,gBAAA,cAAG,YAAM,CAAC,CAAC,GAAAA,gBAAA;IACrBE,eAAe,GAAAH,KAAA,CAAfG,eAAe;IACf9B,MAAM,GAAA2B,KAAA,CAAN3B,MAAM;IACN+B,aAAa,GAAAJ,KAAA,CAAbI,aAAa;IACbC,eAAe,GAAAL,KAAA,CAAfK,eAAe;IACfC,WAAW,GAAAN,KAAA,CAAXM,WAAW;IACXX,aAAa,GAAAK,KAAA,CAAbL,aAAa;IACbY,KAAK,GAAAP,KAAA,CAALO,KAAK;EAGL,IAAMC,IAAI,GAAG3C,OAAO,CAAC,CAAC;EACtB,IAAI,CAACQ,MAAM,EAAE,oBAAOd,KAAA,CAAAyB,aAAA,CAAAzB,KAAA,CAAAkD,QAAA,MAAI,CAAC;EAEzB,IAAMC,WAAW,GAAGN,aAAa,IAAIpC,wBAAwB,CAACwC,IAAI,EAAErC,eAAe,CAAC;;EAEpF;EACA,IAAIwC,QAA4B;EAChC,IAAIJ,KAAK,IAAIlC,MAAM,CAACe,EAAE,EAAE;IAAA,IAAAwB,eAAA;IACtB,IAAMC,MAAM,GAAGxC,MAAM,CAACe,EAAE,CAAC0B,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACtC,IAAMC,IAAI,GAAGR,KAAK,CAACS,IAAI,CAAC,UAAAC,CAAC;MAAA,OAAIA,CAAC,CAACJ,MAAM,KAAKA,MAAM;IAAA,EAAC;IACjDF,QAAQ,GAAGI,IAAI,aAAJA,IAAI,gBAAAH,eAAA,GAAJG,IAAI,CAAEG,SAAS,cAAAN,eAAA,uBAAfA,eAAA,CAAiBtC,IAAI;EAClC;EAEA,IAAMA,IAAI,GAAGoC,WAAW,CAACrC,MAAM,EAAE8B,eAAe,EAAEQ,QAAQ,CAAC;EAE3D,IAAMQ,cAAc,GAAGpD,UAAU,CAACM,MAAM,EAAE8B,eAAe,CAAC;EAE1D,IAAMiB,qBAAqB,GAAGtB,eAAe,CAACzB,MAAM,CAAC;EACrD,IAAMgD,kBAAkB,GAAGD,qBAAqB,IAAI/C,MAAM,CAACkB,iBAAiB,KAAK+B,SAAS,IAAI,CAACjD,MAAM,CAACkD,cAAc;EACpH,IAAM3B,MAAM,GAAG,CAACwB,qBAAqB,IAAI,MAAM,IAAI/C,MAAM,IAAIA,MAAM,CAACmD,IAAI;EACxE,IAAMpC,EAAE,YAAAqC,MAAA,CAAYC,kBAAkB,CAACrD,MAAM,CAACe,EAAE,CAAC,CAACuC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,WAAQ;EAE3E,oBACEpE,KAAA,CAAAyB,aAAA,CAAClB,MAAM,CAAC8D,eAAe,qBACrBrE,KAAA,CAAAyB,aAAA,CAACtB,gBAAgB;IAACwC,UAAU,EAAEA,UAAW;IAACd,EAAE,EAAEA;EAAG,gBACjD7B,KAAA,CAAAyB,aAAA,CAAClB,MAAM,CAAC+D,UAAU,QACfxB,eAAe,IAAIA,eAAe,CAAChC,MAAM,CAAC,eAC3Cd,KAAA,CAAAyB,aAAA,CAACpB,gBAAgB;IACfsB,cAAc,EAAEf,eAAe,CAAC,2BAA2B,CAAE;IAC7DgB,WAAW,EAAC,gEAAgE;IAC5EC,EAAE,EAAC,2BAA2B;IAC9BC,MAAM,EAAE;MAAEf,IAAI,EAAJA,IAAI;MAAE6C,cAAc,EAAdA;IAAe;EAAE,CAClC,CACgB,CAAC,EAEnBE,kBAAkB,iBAAI9D,KAAA,CAAAyB,aAAA,CAACH,iBAAiB;IAACE,OAAO,EAAEV;EAAO,CAAE,CAAC,EAG5DsB,aAAa,IAAI,CAACyB,qBAAqB,iBACtC7D,KAAA,CAAAyB,aAAA,CAACS,WAAW;IACVL,EAAE,EAAEQ,MAAO;IACXD,aAAa,EAAEnC,WAAW,CAAC;MAAA,OAAMmC,aAAa,CAACtB,MAAc,CAAC;IAAA,GAAE,CAACA,MAAM,CAAC;EAAE,CAC3E,CACF,EAGAiC,WAAW,iBACV/C,KAAA,CAAAyB,aAAA,CAAClB,MAAM,CAACmB,QAAQ,qBACd1B,KAAA,CAAAyB,aAAA,CAACvB,oBAAoB;IACnBqE,KAAK;IACLC,QAAQ,EAAE3D,gBAAgB,CAACC,MAAM,EAAEC,IAAI,CAAE;IACzCgC,WAAW,EAAEA;EAAY,CAC1B,CACc,CAED,CAEI,CAAC;AAE7B;AAEA,eAAeP,QAAQ","ignoreList":[]}
+{"version":3,"file":"index.js","names":["React","useCallback","FromToLocationPicker","FocusTrapWrapper","flatten","FormattedMessage","useIntl","Styled","getNetwork","makeDefaultGetEntityName","ViewStopButton","defaultEnglishMessages","defaultMessages","generateLocation","entity","name","entityLon","lon","entityLat","lat","x","y","StationHubDetails","_ref","station","createElement","PopupRow","defaultMessage","description","id","values","value","vehiclesAvailable","spacesAvailable","StopDetails","_ref2","feedName","setViewedStop","stopId","onClick","entityIsStation","MapPopup","_ref3","_ref3$closePopup","closePopup","configCompanies","getEntityName","getEntityPrefix","setLocation","feeds","intl","Fragment","getNameFunc","_feed$publisher","feedId","split","feed","find","f","publisher","titleName","stationNetwork","bikesAvailablePresent","entityIsStationHub","undefined","isFloatingBike","code","concat","encodeURIComponent","replace","MapOverlayPopup","PopupTitle","label","location"],"sources":["../src/index.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport FromToLocationPicker from \"@opentripplanner/from-to-location-picker\";\n\n// eslint-disable-next-line prettier/prettier\nimport type {\n  Company,\n  ConfiguredCompany,\n  Location,\n  Stop,\n  StopEventHandler,\n  TileLayerStation\n} from \"@opentripplanner/types\";\n\nimport { FocusTrapWrapper } from \"@opentripplanner/building-blocks\";\nimport { flatten } from \"flat\";\nimport { FormattedMessage, useIntl } from \"react-intl\";\nimport { Styled } from \"@opentripplanner/base-map\";\n\nimport { Entity, getNetwork, makeDefaultGetEntityName, type StopIdAgencyMap } from \"./util\";\nimport { ViewStopButton } from \"./styled\";\n\n// Load the default messages.\nimport defaultEnglishMessages from \"../i18n/en-US.yml\";\n\n// HACK: We should flatten the messages loaded above because\n// the YAML loaders behave differently between webpack and our version of jest:\n// - the yaml loader for webpack returns a nested object,\n// - the yaml loader for jest returns messages with flattened ids.\nexport const defaultMessages: { [key: string]: string } = flatten(defaultEnglishMessages);\n\nexport type Feed = {\n  feedId: string;\n  publisher: {\n    name: string;\n  };\n};\n\n\nconst generateLocation = (entity: Entity, name: string) => {\n  // @ts-expect-error some of these values may be null, but that's ok\n  const { lon: entityLon, lat: entityLat, x, y } = entity\n\n  const lat = entityLat || y\n  const lon = entityLon || x\n  if (!lat || !lon) return null\n\n  return { lat, lon, name };\n}\n\nconst StationHubDetails = ({ station }: { station: TileLayerStation }) => {\n  return (\n    <Styled.PopupRow>\n      <div>\n        <FormattedMessage\n          defaultMessage={\n            defaultMessages[\"otpUi.MapPopup.availableBikes\"]\n          }\n          description=\"Label text for the number of bikes available\"\n          id=\"otpUi.MapPopup.availableBikes\"\n          values={{ value: station.vehiclesAvailable }}\n        />\n      </div>\n      <div>\n        <FormattedMessage\n          defaultMessage={\n            defaultMessages[\"otpUi.MapPopup.availableDocks\"]\n          }\n          description=\"Label text for the number of docks available\"\n          id=\"otpUi.MapPopup.availableDocks\"\n          values={{ value: station.spacesAvailable }}\n        />\n      </div>\n    </Styled.PopupRow>\n  )\n}\n\nconst StopDetails = ({ id, feedName, setViewedStop }: { id: string, feedName?: string, setViewedStop: () => void; }) => {\n  return (\n    <Styled.PopupRow>\n      {id &&\n        <strong>\n          <FormattedMessage\n            defaultMessage={defaultMessages[\"otpUi.MapPopup.stopId\"]}\n            description=\"Displays the stop id\"\n            id=\"otpUi.MapPopup.stopId\"\n            values={{\n              feedName,\n              stopId: id\n            }}\n          />\n        </strong>}\n      <ViewStopButton onClick={setViewedStop} stopId={id}> \n        <FormattedMessage\n          defaultMessage={defaultMessages[\"otpUi.MapPopup.stopViewer\"]}\n          description=\"Text for link that opens the stop viewer\"\n          id=\"otpUi.MapPopup.stopViewer\"\n        />\n      </ViewStopButton>\n    </Styled.PopupRow>\n  )\n}\n\ntype Props = {\n  closePopup?: (arg?: boolean) => void\n  configCompanies?: ConfiguredCompany[];\n  entity: Entity\n  getEntityName?: (entity: Entity, configCompanies: Company[], feedName?: string, includeParenthetical?: boolean) => string;\n  getEntityPrefix?: (entity: Entity) => JSX.Element\n  feeds?: Feed[]\n  setLocation?: ({ location, locationType }: { location: Location, locationType: string }) => void;\n  setViewedStop?: StopEventHandler;\n};\n\nfunction entityIsStation(entity: Entity): entity is TileLayerStation {\n  return \"vehiclesAvailable\" in entity\n}\n\n/**\n * Renders a map popup for a stop, scooter, or shared bike\n */\nexport function MapPopup({ \n  closePopup = () => {}, \n  configCompanies, \n  entity, \n  getEntityName, \n  getEntityPrefix, \n  setLocation, \n  setViewedStop, \n  feeds,\n}: Props): JSX.Element {\n\n  const intl = useIntl()\n  if (!entity) return <></>\n\n  const getNameFunc = getEntityName || makeDefaultGetEntityName(intl, defaultMessages);\n  \n  // Find the feed name using the logic from generateLabel in otp.ts\n  let feedName: string | undefined;\n  if (feeds && entity.id) {\n    const feedId = entity.id.split(\":\")[0];\n    const feed = feeds.find(f => f.feedId === feedId);\n    feedName = feed?.publisher?.name;\n  }\n  \n  const name = getNameFunc(entity, configCompanies, feedName);\n  const titleName = getNameFunc(entity, configCompanies, feedName, false);\n\n  const stationNetwork = getNetwork(entity, configCompanies);\n\n  const bikesAvailablePresent = entityIsStation(entity)\n  const entityIsStationHub = bikesAvailablePresent && entity.vehiclesAvailable !== undefined && !entity.isFloatingBike;\n  const stopId = !bikesAvailablePresent && \"code\" in entity && entity.code;\n  const id = `focus-${encodeURIComponent(entity.id).replace(/%/g, \"\")}-popup`\n\n  return (\n    <Styled.MapOverlayPopup>\n      <FocusTrapWrapper closePopup={closePopup} id={id}>\n      <Styled.PopupTitle>\n        {getEntityPrefix && getEntityPrefix(entity)}\n        <FormattedMessage\n          defaultMessage={defaultMessages[\"otpUi.MapPopup.popupTitle\"]}\n          description=\"Text for title of the popup, contains an optional company name\"\n          id=\"otpUi.MapPopup.popupTitle\"\n          values={{ name: titleName, stationNetwork }}\n        />\n      </Styled.PopupTitle>\n      {/* render dock info if it is available */}\n      {entityIsStationHub && <StationHubDetails station={entity} />}\n\n      {/* render stop viewer link if available */}\n      {setViewedStop && !bikesAvailablePresent && (\n        <StopDetails\n          id={stopId}\n          feedName={feedName}\n          setViewedStop={useCallback(() => setViewedStop(entity as Stop), [entity])}\n        />\n      )}\n\n      {/* The \"Set as [from/to]\" ButtonGroup */}\n      {setLocation && (\n        <Styled.PopupRow>\n          <FromToLocationPicker\n            label\n            location={generateLocation(entity, name)}\n            setLocation={setLocation}\n          />\n        </Styled.PopupRow>\n      )}\n      </FocusTrapWrapper>\n      \n    </Styled.MapOverlayPopup>\n  );\n}\n\nexport default MapPopup;\nexport { type StopIdAgencyMap };"],"mappings":"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","ignoreList":[]}

package/esm/util.js

@@ -1,11 +1,12 @@
 import coreUtils from "@opentripplanner/core-utils";
 export function getNetwork(entity, configCompanies) {
-  return "network" in entity && (coreUtils.itinerary.getCompaniesLabelFromNetworks([entity.network] || [], configCompanies) || entity.network);
+  return "network" in entity && (coreUtils.itinerary.getCompaniesLabelFromNetworks([entity.network], configCompanies) || entity.network);
 }
 
 // eslint-disable-next-line import/prefer-default-export
 export function makeDefaultGetEntityName(intl, defaultEnglishMessages) {
   return function defaultGetEntityName(entity, configCompanies, feedName) {
+    var includeParenthetical = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
     var 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.
@@ -42,7 +43,7 @@ export function makeDefaultGetEntityName(intl, defaultEnglishMessages) {
       }, {
         name: stationName
       });
-    } else if (feedName && "code" in entity) {
+    } else if (includeParenthetical && feedName && "code" in entity) {
       stationName = "".concat(stationName, " (").concat(feedName, " ").concat(entity.code, ")");
     }
     return stationName;

package/esm/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","names":["coreUtils","getNetwork","entity","configCompanies","itinerary","getCompaniesLabelFromNetworks","network","makeDefaultGetEntityName","intl","defaultEnglishMessages","defaultGetEntityName","feedName","stationName","name","id","match","length","isFloatingBike","formatMessage","defaultMessage","description","isFloatingCar","stationNetwork","company","isFloatingVehicle","concat","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,OAAOA,SAAS,MAAM,6BAA6B;AAKnD,OAAO,SAASC,UAAUA,CAACC,MAAc,EAAEC,eAA0B,EAAU;EAC7E,OACE,SAAS,IAAID,MAAM,KAClBF,SAAS,CAACI,SAAS,CAACC,6BAA6B,CAChD,CAACH,MAAM,CAACI,OAAO,CAAC,IAAI,EAAE,EACtBH,eACF,CAAC,IACCD,MAAM,CAACI,OAAO,CAAC;AAErB;;AAEA;AACA,OAAO,SAASC,wBAAwBA,CACtCC,IAAe,EACfC,sBAAiD,EACjD;EACA,OAAO,SAASC,oBAAoBA,CAClCR,MAAc,EACdC,eAA0B,EAC1BQ,QAAiB,EACF;IACf,IAAIC,WAA0B,GAAGV,MAAM,CAACW,IAAI,IAAIX,MAAM,CAACY,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,IAAIV,MAAM,IAAIA,MAAM,CAACe,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,IAAIV,MAAM,IAAIA,MAAM,CAACmB,aAAa,EAAE;MAC5D;MACA;MACA,IAAMC,cAAc,GAAGrB,UAAU,CAACC,MAAM,EAAEC,eAAe,CAAC;MAC1DS,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,IAAIV,MAAM,IAAIA,MAAM,CAACsB,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,IAAIT,MAAM,EAAE;MACvCU,WAAW,MAAAa,MAAA,CAAMb,WAAW,QAAAa,MAAA,CAAKd,QAAQ,OAAAc,MAAA,CAAIvB,MAAM,CAACwB,IAAI,MAAG;IAC7D;IACA,OAAOd,WAAW;EACpB,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"util.js","names":["coreUtils","getNetwork","entity","configCompanies","itinerary","getCompaniesLabelFromNetworks","network","makeDefaultGetEntityName","intl","defaultEnglishMessages","defaultGetEntityName","feedName","includeParenthetical","arguments","length","undefined","stationName","name","id","match","isFloatingBike","formatMessage","defaultMessage","description","isFloatingCar","stationNetwork","company","isFloatingVehicle","concat","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    includeParenthetical = true\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 (includeParenthetical && feedName && \"code\" in entity) {\n      stationName = `${stationName} (${feedName} ${entity.code})`;\n    }\n    return stationName;\n  };\n}\n"],"mappings":"AAQA,OAAOA,SAAS,MAAM,6BAA6B;AAKnD,OAAO,SAASC,UAAUA,CAACC,MAAc,EAAEC,eAA0B,EAAU;EAC7E,OACE,SAAS,IAAID,MAAM,KAClBF,SAAS,CAACI,SAAS,CAACC,6BAA6B,CAChD,CAACH,MAAM,CAACI,OAAO,CAAC,EAChBH,eACF,CAAC,IACCD,MAAM,CAACI,OAAO,CAAC;AAErB;;AAEA;AACA,OAAO,SAASC,wBAAwBA,CACtCC,IAAe,EACfC,sBAAiD,EACjD;EACA,OAAO,SAASC,oBAAoBA,CAClCR,MAAc,EACdC,eAA0B,EAC1BQ,QAAiB,EAEF;IAAA,IADfC,oBAAoB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;IAE3B,IAAIG,WAA0B,GAAGd,MAAM,CAACe,IAAI,IAAIf,MAAM,CAACgB,EAAE;IACzD;IACA;IACA;IACA,IACE,CAACF,WAAW,CAACG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,EAAEL,MAAM,GAAG,CAAC,IAC1CE,WAAW,KAAK,sBAAsB,EACtC;MACAA,WAAW,GAAG,IAAI;IACpB;IAEA,IAAI,gBAAgB,IAAId,MAAM,IAAIA,MAAM,CAACkB,cAAc,EAAE;MACvDJ,WAAW,GAAGR,IAAI,CAACa,aAAa,CAC9B;QACEC,cAAc,EAAEb,sBAAsB,CAAC,6BAA6B,CAAC;QACrEc,WAAW,EAAE,sCAAsC;QACnDL,EAAE,EAAE;MACN,CAAC,EACD;QAAED,IAAI,EAAED;MAAY,CACtB,CAAC;IACH,CAAC,MAAM,IAAI,eAAe,IAAId,MAAM,IAAIA,MAAM,CAACsB,aAAa,EAAE;MAC5D;MACA;MACA,IAAMC,cAAc,GAAGxB,UAAU,CAACC,MAAM,EAAEC,eAAe,CAAC;MAC1Da,WAAW,GAAGR,IAAI,CAACa,aAAa,CAC9B;QACEC,cAAc,EAAEb,sBAAsB,CAAC,4BAA4B,CAAC;QACpEc,WAAW,EAAE,qCAAqC;QAClDL,EAAE,EAAE;MACN,CAAC,EACD;QACEQ,OAAO,EAAED,cAAc;QACvBR,IAAI,EAAED;MACR,CACF,CAAC;IACH,CAAC,MAAM,IAAI,mBAAmB,IAAId,MAAM,IAAIA,MAAM,CAACyB,iBAAiB,EAAE;MACpE;MACAX,WAAW,GAAGR,IAAI,CAACa,aAAa,CAC9B;QACEC,cAAc,EACZb,sBAAsB,CAAC,iCAAiC,CAAC;QAC3Dc,WAAW,EAAE,2CAA2C;QACxDL,EAAE,EAAE;MACN,CAAC,EACD;QAAED,IAAI,EAAED;MAAY,CACtB,CAAC;IACH,CAAC,MAAM,IAAIJ,oBAAoB,IAAID,QAAQ,IAAI,MAAM,IAAIT,MAAM,EAAE;MAC/Dc,WAAW,MAAAY,MAAA,CAAMZ,WAAW,QAAAY,MAAA,CAAKjB,QAAQ,OAAAiB,MAAA,CAAI1B,MAAM,CAAC2B,IAAI,MAAG;IAC7D;IACA,OAAOb,WAAW;EACpB,CAAC;AACH","ignoreList":[]}

package/i18n/en-US.yml

@@ -6,5 +6,7 @@ otpUi:
     floatingCar: "Car: {name}"
     floatingEScooter: "E-scooter: {name}"
     popupTitle: "{stationNetwork, select, false {{name}} other {{stationNetwork} {name}}}"
-    stopId: "Stop ID: {stopId}"
+    stopId: >-
+      {feedName, select, undefined {Stop ID: {stopId}} other {Stop ID:
+      {feedName} {stopId}}}
     stopViewer: Stop Viewer

package/lib/index.d.ts

@@ -14,7 +14,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 }: {

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";AAIA,OAAO,KAAK,EACV,OAAO,EACP,iBAAiB,EACjB,QAAQ,EAER,gBAAgB,EAEjB,MAAM,wBAAwB,CAAC;AAOhC,OAAO,EAAE,MAAM,EAAwC,KAAK,eAAe,EAAE,MAAM,QAAQ,CAAC;AAU5F,eAAO,MAAM,eAAe,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAoC,CAAC;AAE1F,MAAM,MAAM,IAAI,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC;AAkEF,KAAK,KAAK,GAAG;IACX,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACpC,eAAe,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACtC,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1F,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,GAAG,CAAC,OAAO,CAAA;IACjD,KAAK,CAAC,EAAE,IAAI,EAAE,CAAA;IACd,WAAW,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACjG,aAAa,CAAC,EAAE,gBAAgB,CAAC;CAClC,CAAC;AAMF;;GAEG;AACH,wBAAgB,QAAQ,CAAC,EACvB,UAAqB,EACrB,eAAe,EACf,MAAM,EACN,aAAa,EACb,eAAe,EACf,WAAW,EACX,aAAa,EACb,KAAK,GACN,EAAE,KAAK,GAAG,GAAG,CAAC,OAAO,CA6DrB;AAED,eAAe,QAAQ,CAAC;AACxB,OAAO,EAAE,KAAK,eAAe,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";AAIA,OAAO,KAAK,EACV,OAAO,EACP,iBAAiB,EACjB,QAAQ,EAER,gBAAgB,EAEjB,MAAM,wBAAwB,CAAC;AAOhC,OAAO,EAAE,MAAM,EAAwC,KAAK,eAAe,EAAE,MAAM,QAAQ,CAAC;AAU5F,eAAO,MAAM,eAAe,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAoC,CAAC;AAE1F,MAAM,MAAM,IAAI,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC;AAmEF,KAAK,KAAK,GAAG;IACX,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACpC,eAAe,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACtC,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;IAC1H,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,GAAG,CAAC,OAAO,CAAA;IACjD,KAAK,CAAC,EAAE,IAAI,EAAE,CAAA;IACd,WAAW,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACjG,aAAa,CAAC,EAAE,gBAAgB,CAAC;CAClC,CAAC;AAMF;;GAEG;AACH,wBAAgB,QAAQ,CAAC,EACvB,UAAqB,EACrB,eAAe,EACf,MAAM,EACN,aAAa,EACb,eAAe,EACf,WAAW,EACX,aAAa,EACb,KAAK,GACN,EAAE,KAAK,GAAG,GAAG,CAAC,OAAO,CA+DrB;AAED,eAAe,QAAQ,CAAC;AACxB,OAAO,EAAE,KAAK,eAAe,EAAE,CAAC"}

package/lib/index.js

@@ -1,143 +1,110 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-exports.MapPopup = MapPopup;
-exports.defaultMessages = exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _fromToLocationPicker = _interopRequireDefault(require("@opentripplanner/from-to-location-picker"));
-var _buildingBlocks = require("@opentripplanner/building-blocks");
-var _flat = require("flat");
-var _reactIntl = require("react-intl");
-var _baseMap = require("@opentripplanner/base-map");
-var _util = require("./util");
-var _styled = require("./styled");
-var _enUS = _interopRequireDefault(require("../i18n/en-US.yml"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-// eslint-disable-next-line prettier/prettier
-
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MapPopup = exports.defaultMessages = void 0;
+const react_1 = __importStar(require("react"));
+const from_to_location_picker_1 = __importDefault(require("@opentripplanner/from-to-location-picker"));
+const building_blocks_1 = require("@opentripplanner/building-blocks");
+const flat_1 = require("flat");
+const react_intl_1 = require("react-intl");
+const base_map_1 = require("@opentripplanner/base-map");
+const util_1 = require("./util");
+const styled_1 = require("./styled");
 // Load the default messages.
-
+const en_US_yml_1 = __importDefault(require("../i18n/en-US.yml"));
 // HACK: We should flatten the messages loaded above because
 // the YAML loaders behave differently between webpack and our version of jest:
 // - the yaml loader for webpack returns a nested object,
 // - the yaml loader for jest returns messages with flattened ids.
-const defaultMessages = exports.defaultMessages = (0, _flat.flatten)(_enUS.default);
+exports.defaultMessages = (0, flat_1.flatten)(en_US_yml_1.default);
 const generateLocation = (entity, name) => {
-  // @ts-expect-error some of these values may be null, but that's ok
-  const {
-    lon: entityLon,
-    lat: entityLat,
-    x,
-    y
-  } = entity;
-  const lat = entityLat || y;
-  const lon = entityLon || x;
-  if (!lat || !lon) return null;
-  return {
-    lat,
-    lon,
-    name
-  };
+    // @ts-expect-error some of these values may be null, but that's ok
+    const { lon: entityLon, lat: entityLat, x, y } = entity;
+    const lat = entityLat || y;
+    const lon = entityLon || x;
+    if (!lat || !lon)
+        return null;
+    return { lat, lon, name };
 };
-const StationHubDetails = ({
-  station
-}) => {
-  return /*#__PURE__*/_react.default.createElement(_baseMap.Styled.PopupRow, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, {
-    defaultMessage: defaultMessages["otpUi.MapPopup.availableBikes"],
-    description: "Label text for the number of bikes available",
-    id: "otpUi.MapPopup.availableBikes",
-    values: {
-      value: station.vehiclesAvailable
-    }
-  })), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, {
-    defaultMessage: defaultMessages["otpUi.MapPopup.availableDocks"],
-    description: "Label text for the number of docks available",
-    id: "otpUi.MapPopup.availableDocks",
-    values: {
-      value: station.spacesAvailable
-    }
-  })));
+const StationHubDetails = ({ station }) => {
+    return (react_1.default.createElement(base_map_1.Styled.PopupRow, null,
+        react_1.default.createElement("div", null,
+            react_1.default.createElement(react_intl_1.FormattedMessage, { defaultMessage: exports.defaultMessages["otpUi.MapPopup.availableBikes"], description: "Label text for the number of bikes available", id: "otpUi.MapPopup.availableBikes", values: { value: station.vehiclesAvailable } })),
+        react_1.default.createElement("div", null,
+            react_1.default.createElement(react_intl_1.FormattedMessage, { defaultMessage: exports.defaultMessages["otpUi.MapPopup.availableDocks"], description: "Label text for the number of docks available", id: "otpUi.MapPopup.availableDocks", values: { value: station.spacesAvailable } }))));
 };
-const StopDetails = ({
-  id,
-  setViewedStop
-}) => {
-  return /*#__PURE__*/_react.default.createElement(_baseMap.Styled.PopupRow, null, id && /*#__PURE__*/_react.default.createElement("strong", null, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, {
-    defaultMessage: defaultMessages["otpUi.MapPopup.stopId"],
-    description: "Displays the stop id",
-    id: "otpUi.MapPopup.stopId",
-    values: {
-      stopId: id
-    }
-  })), /*#__PURE__*/_react.default.createElement(_styled.ViewStopButton, {
-    onClick: setViewedStop,
-    stopId: id
-  }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, {
-    defaultMessage: defaultMessages["otpUi.MapPopup.stopViewer"],
-    description: "Text for link that opens the stop viewer",
-    id: "otpUi.MapPopup.stopViewer"
-  })));
+const StopDetails = ({ id, feedName, setViewedStop }) => {
+    return (react_1.default.createElement(base_map_1.Styled.PopupRow, null,
+        id &&
+            react_1.default.createElement("strong", null,
+                react_1.default.createElement(react_intl_1.FormattedMessage, { defaultMessage: exports.defaultMessages["otpUi.MapPopup.stopId"], description: "Displays the stop id", id: "otpUi.MapPopup.stopId", values: {
+                        feedName,
+                        stopId: id
+                    } })),
+        react_1.default.createElement(styled_1.ViewStopButton, { onClick: setViewedStop, stopId: id },
+            react_1.default.createElement(react_intl_1.FormattedMessage, { defaultMessage: exports.defaultMessages["otpUi.MapPopup.stopViewer"], description: "Text for link that opens the stop viewer", id: "otpUi.MapPopup.stopViewer" }))));
 };
 function entityIsStation(entity) {
-  return "vehiclesAvailable" in entity;
+    return "vehiclesAvailable" in entity;
 }
-
 /**
  * Renders a map popup for a stop, scooter, or shared bike
  */
-function MapPopup({
-  closePopup = () => {},
-  configCompanies,
-  entity,
-  getEntityName,
-  getEntityPrefix,
-  setLocation,
-  setViewedStop,
-  feeds
-}) {
-  const intl = (0, _reactIntl.useIntl)();
-  if (!entity) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
-  const getNameFunc = getEntityName || (0, _util.makeDefaultGetEntityName)(intl, defaultMessages);
-
-  // Find the feed name using the logic from generateLabel in otp.ts
-  let feedName;
-  if (feeds && entity.id) {
-    var _feed$publisher;
-    const feedId = entity.id.split(":")[0];
-    const feed = feeds.find(f => f.feedId === feedId);
-    feedName = feed === null || feed === void 0 || (_feed$publisher = feed.publisher) === null || _feed$publisher === void 0 ? void 0 : _feed$publisher.name;
-  }
-  const name = getNameFunc(entity, configCompanies, feedName);
-  const stationNetwork = (0, _util.getNetwork)(entity, configCompanies);
-  const bikesAvailablePresent = entityIsStation(entity);
-  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 /*#__PURE__*/_react.default.createElement(_baseMap.Styled.MapOverlayPopup, null, /*#__PURE__*/_react.default.createElement(_buildingBlocks.FocusTrapWrapper, {
-    closePopup: closePopup,
-    id: id
-  }, /*#__PURE__*/_react.default.createElement(_baseMap.Styled.PopupTitle, null, getEntityPrefix && getEntityPrefix(entity), /*#__PURE__*/_react.default.createElement(_reactIntl.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
+function MapPopup({ closePopup = () => { }, configCompanies, entity, getEntityName, getEntityPrefix, setLocation, setViewedStop, feeds, }) {
+    var _a;
+    const intl = (0, react_intl_1.useIntl)();
+    if (!entity)
+        return react_1.default.createElement(react_1.default.Fragment, null);
+    const getNameFunc = getEntityName || (0, util_1.makeDefaultGetEntityName)(intl, exports.defaultMessages);
+    // Find the feed name using the logic from generateLabel in otp.ts
+    let feedName;
+    if (feeds && entity.id) {
+        const feedId = entity.id.split(":")[0];
+        const feed = feeds.find(f => f.feedId === feedId);
+        feedName = (_a = feed === null || feed === void 0 ? void 0 : feed.publisher) === null || _a === void 0 ? void 0 : _a.name;
     }
-  })), entityIsStationHub && /*#__PURE__*/_react.default.createElement(StationHubDetails, {
-    station: entity
-  }), setViewedStop && !bikesAvailablePresent && /*#__PURE__*/_react.default.createElement(StopDetails, {
-    id: stopId,
-    setViewedStop: (0, _react.useCallback)(() => setViewedStop(entity), [entity])
-  }), setLocation && /*#__PURE__*/_react.default.createElement(_baseMap.Styled.PopupRow, null, /*#__PURE__*/_react.default.createElement(_fromToLocationPicker.default, {
-    label: true,
-    location: generateLocation(entity, name),
-    setLocation: setLocation
-  }))));
+    const name = getNameFunc(entity, configCompanies, feedName);
+    const titleName = getNameFunc(entity, configCompanies, feedName, false);
+    const stationNetwork = (0, util_1.getNetwork)(entity, configCompanies);
+    const bikesAvailablePresent = entityIsStation(entity);
+    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 (react_1.default.createElement(base_map_1.Styled.MapOverlayPopup, null,
+        react_1.default.createElement(building_blocks_1.FocusTrapWrapper, { closePopup: closePopup, id: id },
+            react_1.default.createElement(base_map_1.Styled.PopupTitle, null,
+                getEntityPrefix && getEntityPrefix(entity),
+                react_1.default.createElement(react_intl_1.FormattedMessage, { defaultMessage: exports.defaultMessages["otpUi.MapPopup.popupTitle"], description: "Text for title of the popup, contains an optional company name", id: "otpUi.MapPopup.popupTitle", values: { name: titleName, stationNetwork } })),
+            entityIsStationHub && react_1.default.createElement(StationHubDetails, { station: entity }),
+            setViewedStop && !bikesAvailablePresent && (react_1.default.createElement(StopDetails, { id: stopId, feedName: feedName, setViewedStop: (0, react_1.useCallback)(() => setViewedStop(entity), [entity]) })),
+            setLocation && (react_1.default.createElement(base_map_1.Styled.PopupRow, null,
+                react_1.default.createElement(from_to_location_picker_1.default, { label: true, location: generateLocation(entity, name), setLocation: setLocation }))))));
 }
-var _default = exports.default = MapPopup;
+exports.MapPopup = MapPopup;
+exports.default = MapPopup;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_react","_interopRequireWildcard","require","_fromToLocationPicker","_interopRequireDefault","_buildingBlocks","_flat","_reactIntl","_baseMap","_util","_styled","_enUS","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","defaultMessages","exports","flatten","defaultEnglishMessages","generateLocation","entity","name","lon","entityLon","lat","entityLat","x","y","StationHubDetails","station","createElement","Styled","PopupRow","FormattedMessage","defaultMessage","description","id","values","value","vehiclesAvailable","spacesAvailable","StopDetails","setViewedStop","stopId","ViewStopButton","onClick","entityIsStation","MapPopup","closePopup","configCompanies","getEntityName","getEntityPrefix","setLocation","feeds","intl","useIntl","Fragment","getNameFunc","makeDefaultGetEntityName","feedName","_feed$publisher","feedId","split","feed","find","f","publisher","stationNetwork","getNetwork","bikesAvailablePresent","entityIsStationHub","undefined","isFloatingBike","code","encodeURIComponent","replace","MapOverlayPopup","FocusTrapWrapper","PopupTitle","useCallback","label","location","_default"],"sources":["../src/index.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport FromToLocationPicker from \"@opentripplanner/from-to-location-picker\";\n\n// eslint-disable-next-line prettier/prettier\nimport type {\n  Company,\n  ConfiguredCompany,\n  Location,\n  Stop,\n  StopEventHandler,\n  TileLayerStation\n} from \"@opentripplanner/types\";\n\nimport { FocusTrapWrapper } from \"@opentripplanner/building-blocks\";\nimport { flatten } from \"flat\";\nimport { FormattedMessage, useIntl } from \"react-intl\";\nimport { Styled } from \"@opentripplanner/base-map\";\n\nimport { Entity, getNetwork, makeDefaultGetEntityName, type StopIdAgencyMap } from \"./util\";\nimport { ViewStopButton } from \"./styled\";\n\n// Load the default messages.\nimport defaultEnglishMessages from \"../i18n/en-US.yml\";\n\n// HACK: We should flatten the messages loaded above because\n// the YAML loaders behave differently between webpack and our version of jest:\n// - the yaml loader for webpack returns a nested object,\n// - the yaml loader for jest returns messages with flattened ids.\nexport const defaultMessages: { [key: string]: string } = flatten(defaultEnglishMessages);\n\nexport type Feed = {\n  feedId: string;\n  publisher: {\n    name: string;\n  };\n};\n\n\nconst generateLocation = (entity: Entity, name: string) => {\n  // @ts-expect-error some of these values may be null, but that's ok\n  const { lon: entityLon, lat: entityLat, x, y } = entity\n\n  const lat = entityLat || y\n  const lon = entityLon || x\n  if (!lat || !lon) return null\n\n  return { lat, lon, name };\n}\n\nconst StationHubDetails = ({ station }: { station: TileLayerStation }) => {\n  return (\n    <Styled.PopupRow>\n      <div>\n        <FormattedMessage\n          defaultMessage={\n            defaultMessages[\"otpUi.MapPopup.availableBikes\"]\n          }\n          description=\"Label text for the number of bikes available\"\n          id=\"otpUi.MapPopup.availableBikes\"\n          values={{ value: station.vehiclesAvailable }}\n        />\n      </div>\n      <div>\n        <FormattedMessage\n          defaultMessage={\n            defaultMessages[\"otpUi.MapPopup.availableDocks\"]\n          }\n          description=\"Label text for the number of docks available\"\n          id=\"otpUi.MapPopup.availableDocks\"\n          values={{ value: station.spacesAvailable }}\n        />\n      </div>\n    </Styled.PopupRow>\n  )\n}\n\nconst StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => void; }) => {\n  return (\n    <Styled.PopupRow>\n      {id &&\n        <strong>\n          <FormattedMessage\n            defaultMessage={defaultMessages[\"otpUi.MapPopup.stopId\"]}\n            description=\"Displays the stop id\"\n            id=\"otpUi.MapPopup.stopId\"\n            values={{\n              stopId: id\n            }}\n          />\n        </strong>}\n      <ViewStopButton onClick={setViewedStop} stopId={id}> \n        <FormattedMessage\n          defaultMessage={defaultMessages[\"otpUi.MapPopup.stopViewer\"]}\n          description=\"Text for link that opens the stop viewer\"\n          id=\"otpUi.MapPopup.stopViewer\"\n        />\n      </ViewStopButton>\n    </Styled.PopupRow>\n  )\n}\n\ntype Props = {\n  closePopup?: (arg?: boolean) => void\n  configCompanies?: ConfiguredCompany[];\n  entity: Entity\n  getEntityName?: (entity: Entity, configCompanies: Company[], feedName?: string) => string;\n  getEntityPrefix?: (entity: Entity) => JSX.Element\n  feeds?: Feed[]\n  setLocation?: ({ location, locationType }: { location: Location, locationType: string }) => void;\n  setViewedStop?: StopEventHandler;\n};\n\nfunction entityIsStation(entity: Entity): entity is TileLayerStation {\n  return \"vehiclesAvailable\" in entity\n}\n\n/**\n * Renders a map popup for a stop, scooter, or shared bike\n */\nexport function MapPopup({ \n  closePopup = () => {}, \n  configCompanies, \n  entity, \n  getEntityName, \n  getEntityPrefix, \n  setLocation, \n  setViewedStop, \n  feeds,\n}: Props): JSX.Element {\n\n  const intl = useIntl()\n  if (!entity) return <></>\n\n  const getNameFunc = getEntityName || makeDefaultGetEntityName(intl, defaultMessages);\n  \n  // Find the feed name using the logic from generateLabel in otp.ts\n  let feedName: string | undefined;\n  if (feeds && entity.id) {\n    const feedId = entity.id.split(\":\")[0];\n    const feed = feeds.find(f => f.feedId === feedId);\n    feedName = feed?.publisher?.name;\n  }\n  \n  const name = getNameFunc(entity, configCompanies, feedName);\n\n  const stationNetwork = getNetwork(entity, configCompanies);\n\n  const bikesAvailablePresent = entityIsStation(entity)\n  const entityIsStationHub = bikesAvailablePresent && entity.vehiclesAvailable !== undefined && !entity.isFloatingBike;\n  const stopId = !bikesAvailablePresent && \"code\" in entity && entity.code;\n  const id = `focus-${encodeURIComponent(entity.id).replace(/%/g, \"\")}-popup`\n\n  return (\n    <Styled.MapOverlayPopup>\n      <FocusTrapWrapper closePopup={closePopup} id={id}>\n      <Styled.PopupTitle>\n        {getEntityPrefix && getEntityPrefix(entity)}\n        <FormattedMessage\n          defaultMessage={defaultMessages[\"otpUi.MapPopup.popupTitle\"]}\n          description=\"Text for title of the popup, contains an optional company name\"\n          id=\"otpUi.MapPopup.popupTitle\"\n          values={{ name, stationNetwork }}\n        />\n      </Styled.PopupTitle>\n      {/* render dock info if it is available */}\n      {entityIsStationHub && <StationHubDetails station={entity} />}\n\n      {/* render stop viewer link if available */}\n      {setViewedStop && !bikesAvailablePresent && (\n        <StopDetails\n          id={stopId}\n          setViewedStop={useCallback(() => setViewedStop(entity as Stop), [entity])}\n        />\n      )}\n\n      {/* The \"Set as [from/to]\" ButtonGroup */}\n      {setLocation && (\n        <Styled.PopupRow>\n          <FromToLocationPicker\n            label\n            location={generateLocation(entity, name)}\n            setLocation={setLocation}\n          />\n        </Styled.PopupRow>\n      )}\n      </FocusTrapWrapper>\n      \n    </Styled.MapOverlayPopup>\n  );\n}\n\nexport default MapPopup;\nexport { type StopIdAgencyMap };"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}

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

@@ -5,5 +5,5 @@ 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: 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,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"}