@opentripplanner/vehicle-rental-overlay 1.4.1 → 1.4.3

package/esm/DefaultMarkers/index.js

@@ -1,6 +1,5 @@
 import { divIcon } from "leaflet";
 import memoize from "lodash.memoize";
-import coreUtils from "@opentripplanner/core-utils";
 import PropTypes from "prop-types";
 import React from "react";
 import ReactDOMServer from "react-dom/server";
@@ -21,7 +20,9 @@ var templatePropTypes = {
   children: PropTypes.node,
 
   /** The rental vehicle or station to render. */
-  entity: coreUtils.types.stationType.isRequired,
+  // entity: coreUtils.types.stationType.isRequired,
+  // eslint-disable-next-line react/forbid-prop-types
+  entity: PropTypes.object.isRequired,
 
   /** leaflet attribute to control tabindex value for keyboaryd-only / SR users */
   keyboard: PropTypes.bool

package/esm/DefaultMarkers/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/DefaultMarkers/index.js"],"names":["divIcon","memoize","coreUtils","PropTypes","React","ReactDOMServer","CircleMarker","Marker","floatingBikeIcon","hubIcons","Styled","templatePropTypes","children","node","entity","types","stationType","isRequired","keyboard","bool","templateDefaultProps","SharedBikeCircle","dockStrokeColor","fillColor","pixels","strokeColor","GeneratedMarker","station","newStrokeColor","isFloatingBike","y","x","propTypes","defaultProps","HubAndFloatingBike","icon","capacity","bikesAvailable","spacesAvailable","pctFull","i","Math","round","getStationMarkerByColor","color","className","iconSize","popupAnchor","html","renderToStaticMarkup","GenericMarker","markerIcon"],"mappings":"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","sourcesContent":["import { divIcon } from \"leaflet\";\nimport memoize from \"lodash.memoize\";\nimport coreUtils from \"@opentripplanner/core-utils\";\nimport PropTypes from \"prop-types\";\nimport React from \"react\";\nimport ReactDOMServer from \"react-dom/server\";\nimport { CircleMarker, Marker } from \"react-leaflet\";\n\nimport { floatingBikeIcon, hubIcons } from \"../bike-icons\";\nimport * as Styled from \"../styled\";\n\n/**\n * This file contains default marker types for rental vehicles,\n * that can be used when defining the VehicleRentalOverlay's symbol prop:\n * - SharedBikeCircle\n * - GenericMarker\n * - HubAndFloatingBike\n */\n\n// Prop types reused across components.\nconst templatePropTypes = {\n  /** The children of the component. */\n  children: PropTypes.node,\n  /** The rental vehicle or station to render. */\n  entity: coreUtils.types.stationType.isRequired,\n  /** leaflet attribute to control tabindex value for keyboaryd-only / SR users */\n  keyboard: PropTypes.bool\n};\nconst templateDefaultProps = {\n  children: null,\n  keyboard: false\n};\n\n/**\n * Renders a shared bike or shared bike dock as a circle\n * with predefined colors and size.\n */\nexport const SharedBikeCircle = ({\n  dockStrokeColor,\n  fillColor = \"gray\",\n  pixels,\n  strokeColor\n}) => {\n  const GeneratedMarker = ({ children, keyboard, entity: station }) => {\n    let newStrokeColor = strokeColor || fillColor;\n\n    if (!station.isFloatingBike) {\n      newStrokeColor = dockStrokeColor || strokeColor;\n    }\n\n    return (\n      <CircleMarker\n        center={[station.y, station.x]}\n        color={newStrokeColor}\n        fillColor={fillColor}\n        fillOpacity={1}\n        keyboard={keyboard}\n        radius={pixels - (station.isFloatingBike ? 1 : 0)}\n        weight={1}\n      >\n        {children}\n      </CircleMarker>\n    );\n  };\n\n  GeneratedMarker.propTypes = templatePropTypes;\n  GeneratedMarker.defaultProps = templateDefaultProps;\n  return GeneratedMarker;\n};\n\n/**\n * A component that renders rental bike entities\n * either as a bike or a bike dock (or hub, showing spaces available).\n */\nexport const HubAndFloatingBike = ({ children, keyboard, entity: station }) => {\n  let icon;\n  if (station.isFloatingBike) {\n    icon = floatingBikeIcon;\n  } else {\n    const capacity = station.bikesAvailable + station.spacesAvailable;\n    if (capacity === 0) return null;\n    const pctFull = station.bikesAvailable / capacity;\n    const i = Math.round(pctFull * 9);\n    icon = hubIcons[i];\n  }\n  return (\n    <Marker icon={icon} keyboard={keyboard} position={[station.y, station.x]}>\n      {children}\n    </Marker>\n  );\n};\nHubAndFloatingBike.propTypes = templatePropTypes;\nHubAndFloatingBike.defaultProps = templateDefaultProps;\n\n/**\n * Creates and caches a leaflet element icon based on color.\n */\nconst getStationMarkerByColor = memoize(color =>\n  divIcon({\n    className: \"\",\n    iconSize: [11, 16],\n    popupAnchor: [0, -6],\n    html: ReactDOMServer.renderToStaticMarkup(\n      <Styled.StationMarker color={color} />\n    )\n  })\n);\n\n/**\n * Helper function to create a leaflet Marker component to render entities\n * using fixed fill color.\n * Usage: GenericMarker({ fillColor: \"#F204B5\" })\n */\nexport const GenericMarker = ({ fillColor = \"gray\" }) => {\n  const markerIcon = getStationMarkerByColor(fillColor);\n\n  const GeneratedMarker = ({ children, keyboard, entity: station }) => (\n    <Marker\n      icon={markerIcon}\n      keyboard={keyboard}\n      position={[station.y, station.x]}\n    >\n      {children}\n    </Marker>\n  );\n  GeneratedMarker.propTypes = templatePropTypes;\n  GeneratedMarker.defaultProps = templateDefaultProps;\n  return GeneratedMarker;\n};\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/DefaultMarkers/index.js"],"names":["divIcon","memoize","PropTypes","React","ReactDOMServer","CircleMarker","Marker","floatingBikeIcon","hubIcons","Styled","templatePropTypes","children","node","entity","object","isRequired","keyboard","bool","templateDefaultProps","SharedBikeCircle","dockStrokeColor","fillColor","pixels","strokeColor","GeneratedMarker","station","newStrokeColor","isFloatingBike","y","x","propTypes","defaultProps","HubAndFloatingBike","icon","capacity","bikesAvailable","spacesAvailable","pctFull","i","Math","round","getStationMarkerByColor","color","className","iconSize","popupAnchor","html","renderToStaticMarkup","GenericMarker","markerIcon"],"mappings":"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","sourcesContent":["import { divIcon } from \"leaflet\";\nimport memoize from \"lodash.memoize\";\nimport PropTypes from \"prop-types\";\nimport React from \"react\";\nimport ReactDOMServer from \"react-dom/server\";\nimport { CircleMarker, Marker } from \"react-leaflet\";\n\nimport { floatingBikeIcon, hubIcons } from \"../bike-icons\";\nimport * as Styled from \"../styled\";\n\n/**\n * This file contains default marker types for rental vehicles,\n * that can be used when defining the VehicleRentalOverlay's symbol prop:\n * - SharedBikeCircle\n * - GenericMarker\n * - HubAndFloatingBike\n */\n\n// Prop types reused across components.\nconst templatePropTypes = {\n  /** The children of the component. */\n  children: PropTypes.node,\n  /** The rental vehicle or station to render. */\n  // entity: coreUtils.types.stationType.isRequired,\n  // eslint-disable-next-line react/forbid-prop-types\n  entity: PropTypes.object.isRequired,\n  /** leaflet attribute to control tabindex value for keyboaryd-only / SR users */\n  keyboard: PropTypes.bool\n};\nconst templateDefaultProps = {\n  children: null,\n  keyboard: false\n};\n\n/**\n * Renders a shared bike or shared bike dock as a circle\n * with predefined colors and size.\n */\nexport const SharedBikeCircle = ({\n  dockStrokeColor,\n  fillColor = \"gray\",\n  pixels,\n  strokeColor\n}) => {\n  const GeneratedMarker = ({ children, keyboard, entity: station }) => {\n    let newStrokeColor = strokeColor || fillColor;\n\n    if (!station.isFloatingBike) {\n      newStrokeColor = dockStrokeColor || strokeColor;\n    }\n\n    return (\n      <CircleMarker\n        center={[station.y, station.x]}\n        color={newStrokeColor}\n        fillColor={fillColor}\n        fillOpacity={1}\n        keyboard={keyboard}\n        radius={pixels - (station.isFloatingBike ? 1 : 0)}\n        weight={1}\n      >\n        {children}\n      </CircleMarker>\n    );\n  };\n\n  GeneratedMarker.propTypes = templatePropTypes;\n  GeneratedMarker.defaultProps = templateDefaultProps;\n  return GeneratedMarker;\n};\n\n/**\n * A component that renders rental bike entities\n * either as a bike or a bike dock (or hub, showing spaces available).\n */\nexport const HubAndFloatingBike = ({ children, keyboard, entity: station }) => {\n  let icon;\n  if (station.isFloatingBike) {\n    icon = floatingBikeIcon;\n  } else {\n    const capacity = station.bikesAvailable + station.spacesAvailable;\n    if (capacity === 0) return null;\n    const pctFull = station.bikesAvailable / capacity;\n    const i = Math.round(pctFull * 9);\n    icon = hubIcons[i];\n  }\n  return (\n    <Marker icon={icon} keyboard={keyboard} position={[station.y, station.x]}>\n      {children}\n    </Marker>\n  );\n};\nHubAndFloatingBike.propTypes = templatePropTypes;\nHubAndFloatingBike.defaultProps = templateDefaultProps;\n\n/**\n * Creates and caches a leaflet element icon based on color.\n */\nconst getStationMarkerByColor = memoize(color =>\n  divIcon({\n    className: \"\",\n    iconSize: [11, 16],\n    popupAnchor: [0, -6],\n    html: ReactDOMServer.renderToStaticMarkup(\n      <Styled.StationMarker color={color} />\n    )\n  })\n);\n\n/**\n * Helper function to create a leaflet Marker component to render entities\n * using fixed fill color.\n * Usage: GenericMarker({ fillColor: \"#F204B5\" })\n */\nexport const GenericMarker = ({ fillColor = \"gray\" }) => {\n  const markerIcon = getStationMarkerByColor(fillColor);\n\n  const GeneratedMarker = ({ children, keyboard, entity: station }) => (\n    <Marker\n      icon={markerIcon}\n      keyboard={keyboard}\n      position={[station.y, station.x]}\n    >\n      {children}\n    </Marker>\n  );\n  GeneratedMarker.propTypes = templatePropTypes;\n  GeneratedMarker.defaultProps = templateDefaultProps;\n  return GeneratedMarker;\n};\n"],"file":"index.js"}

package/esm/index.js

@@ -15,7 +15,7 @@ import FromToLocationPicker from "@opentripplanner/from-to-location-picker";
 import ZoomBasedMarkers from "@opentripplanner/zoom-based-markers";
 import PropTypes from "prop-types";
 import React from "react";
-import { FormattedMessage } from "react-intl";
+import { FormattedMessage, injectIntl } from "react-intl";
 import { FeatureGroup, MapLayer, Popup, withLeaflet } from "react-leaflet";
 import { GenericMarker, HubAndFloatingBike, SharedBikeCircle } from "./DefaultMarkers"; // Load the default messages.
 
@@ -25,12 +25,55 @@ import defaultEnglishMessages from "../i18n/en-US.yml"; // HACK: We should flatt
 // - the yaml loader for jest returns messages with flattened ids.
 
 var defaultMessages = flatten(defaultEnglishMessages);
+
+function makeDefaultGetStationName(intl) {
+  return function defaultGetStationName(configCompanies, station) {
+    var stationNetworks = coreUtils.itinerary.getCompaniesLabelFromNetworks(station.networks, configCompanies);
+    var stationName = station.name || station.id; // If the station name or id is a giant UUID (with more than 3 "-" characters)
+    // best not to show that at all and instead use the network name.
+
+    if ((stationName.match(/-/g) || []).length > 3) {
+      stationName = stationNetworks;
+    }
+
+    if (station.isFloatingBike) {
+      stationName = intl.formatMessage({
+        defaultMessage: defaultEnglishMessages["otpUi.VehicleRentalOverlay.floatingBike"],
+        description: "Popup title for a free-floating bike",
+        id: "otpUi.VehicleRentalOverlay.floatingBike"
+      }, {
+        name: stationName
+      });
+    } else if (station.isFloatingCar) {
+      stationName = intl.formatMessage({
+        defaultMessage: defaultEnglishMessages["otpUi.VehicleRentalOverlay.floatingCar"],
+        description: "Popup title for a free-floating car",
+        id: "otpUi.VehicleRentalOverlay.floatingCar"
+      }, {
+        company: stationNetworks,
+        name: stationName
+      });
+    } else if (station.isFloatingVehicle) {
+      // assumes that all floating vehicles are E-scooters
+      stationName = intl.formatMessage({
+        defaultMessage: defaultEnglishMessages["otpUi.VehicleRentalOverlay.floatingEScooter"],
+        description: "Popup title for a free-floating e-scooter",
+        id: "otpUi.VehicleRentalOverlay.floatingEScooter"
+      }, {
+        company: stationNetworks
+      });
+    }
+
+    return stationName;
+  };
+}
 /**
  * This vehicle rental overlay can be used to render vehicle rentals of various
  * types. This layer can be configured to show different styles of markers at
  * different zoom levels.
  */
 
+
 var VehicleRentalOverlay = /*#__PURE__*/function (_MapLayer) {
   _inherits(VehicleRentalOverlay, _MapLayer);
 
@@ -54,7 +97,7 @@ var VehicleRentalOverlay = /*#__PURE__*/function (_MapLayer) {
       };
 
       SymbolWrapper.propTypes = {
-        entity: coreUtils.types.stationType.isRequired,
+        // entity: coreUtils.types.stationType.isRequired,
         zoom: PropTypes.number.isRequired
       };
       return SymbolWrapper;
@@ -113,8 +156,10 @@ var VehicleRentalOverlay = /*#__PURE__*/function (_MapLayer) {
       var _this$props = _this.props,
           configCompanies = _this$props.configCompanies,
           getStationName = _this$props.getStationName,
+          intl = _this$props.intl,
           setLocation = _this$props.setLocation;
-      var stationName = getStationName(configCompanies, station);
+      var getStationNameFunc = getStationName || makeDefaultGetStationName(intl);
+      var stationName = getStationNameFunc(configCompanies, station);
       var location = {
         lat: station.y,
         lon: station.x,
@@ -262,7 +307,8 @@ VehicleRentalOverlay.props = {
   /**
    * The entire companies config array.
    */
-  configCompanies: PropTypes.arrayOf(coreUtils.types.companyType.isRequired).isRequired,
+  // configCompanies: PropTypes.arrayOf(coreUtils.types.companyType.isRequired)
+  //   .isRequired,
 
   /**
    * A list of companies that are applicable to just this instance of the
@@ -281,7 +327,7 @@ VehicleRentalOverlay.props = {
    * A configuration of what map markers or symbols to show at various
    * zoom levels.
    */
-  mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,
+  // mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,
 
   /**
    * If specified, a function that will be triggered every 30 seconds whenever this layer is
@@ -311,7 +357,7 @@ VehicleRentalOverlay.props = {
   /**
    * A list of the vehicle rental stations specific to this overlay instance.
    */
-  stations: PropTypes.arrayOf(coreUtils.types.stationType),
+  // stations: PropTypes.arrayOf(coreUtils.types.stationType),
 
   /**
    * Whether the overlay is currently visible.
@@ -319,21 +365,7 @@ VehicleRentalOverlay.props = {
   visible: PropTypes.bool
 };
 VehicleRentalOverlay.defaultProps = {
-  getStationName: function getStationName(configCompanies, station) {
-    var stationNetworks = coreUtils.itinerary.getCompaniesLabelFromNetworks(station.networks, configCompanies);
-    var stationName = station.name || station.id;
-
-    if (station.isFloatingBike) {
-      stationName = "Free-floating bike: ".concat(stationName);
-    } else if (station.isFloatingCar) {
-      stationName = "".concat(stationNetworks, " ").concat(stationName);
-    } else if (station.isFloatingVehicle) {
-      // assumes that all floating vehicles are E-scooters
-      stationName = "".concat(stationNetworks, " E-scooter");
-    }
-
-    return stationName;
-  },
+  getStationName: null,
   mapSymbols: [{
     zoom: 0,
     symbol: GenericMarker
@@ -342,5 +374,5 @@ VehicleRentalOverlay.defaultProps = {
   stations: [],
   visible: false
 };
-export default withLeaflet(VehicleRentalOverlay);
+export default withLeaflet(injectIntl(VehicleRentalOverlay));
 //# sourceMappingURL=index.js.map

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["flatten","Styled","BaseMapStyled","coreUtils","FromToLocationPicker","ZoomBasedMarkers","PropTypes","React","FormattedMessage","FeatureGroup","MapLayer","Popup","withLeaflet","GenericMarker","HubAndFloatingBike","SharedBikeCircle","defaultEnglishMessages","defaultMessages","VehicleRentalOverlay","props","renderSymbolWithPopup","Symbol","SymbolWrapper","station","entity","zoom","renderPopupForStation","bikesAvailable","undefined","isFloatingBike","propTypes","types","stationType","isRequired","number","convertToZoomMarkerSymbols","mapSymbols","map","mapSymbol","symbol","type","minZoom","onOverlayAdded","startRefreshing","onOverlayRemoved","stopRefreshing","onViewportChanged","viewport","newZoom","state","setState","stationIsHub","configCompanies","getStationName","setLocation","stationName","location","lat","y","lon","x","name","value","spacesAvailable","refreshVehicles","refreshTimer","setInterval","clearInterval","leaflet","registerOverlay","visible","getZoom","companies","stations","filteredStations","filter","networks","includes","length","symbols","arrayOf","companyType","string","func","vehicleRentalMapOverlaySymbolsType","bool","defaultProps","stationNetworks","itinerary","getCompaniesLabelFromNetworks","id","isFloatingCar","isFloatingVehicle"],"mappings":"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","sourcesContent":["import flatten from \"flat\";\nimport { Styled as BaseMapStyled } from \"@opentripplanner/base-map\";\nimport coreUtils from \"@opentripplanner/core-utils\";\nimport FromToLocationPicker from \"@opentripplanner/from-to-location-picker\";\nimport ZoomBasedMarkers from \"@opentripplanner/zoom-based-markers\";\nimport PropTypes from \"prop-types\";\nimport React from \"react\";\nimport { FormattedMessage } from \"react-intl\";\nimport { FeatureGroup, MapLayer, Popup, withLeaflet } from \"react-leaflet\";\n\nimport {\n  GenericMarker,\n  HubAndFloatingBike,\n  SharedBikeCircle\n} from \"./DefaultMarkers\";\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.\nconst defaultMessages = flatten(defaultEnglishMessages);\n\n/**\n * This vehicle rental overlay can be used to render vehicle rentals of various\n * types. This layer can be configured to show different styles of markers at\n * different zoom levels.\n */\nclass VehicleRentalOverlay extends MapLayer {\n  constructor(props) {\n    super(props);\n    this.state = {\n      zoom: null\n    };\n  }\n\n  /**\n   * This helper method will be passed to the ZoomBasedMarkers symbolTransform prop.\n   * It creates a component that inserts a popup\n   * as a child of the specified symbol from the mapSymbols prop.\n   */\n  renderSymbolWithPopup = Symbol => {\n    const SymbolWrapper = ({ entity: station, zoom }) => (\n      <Symbol entity={station} zoom={zoom}>\n        {this.renderPopupForStation(\n          station,\n          station.bikesAvailable !== undefined && !station.isFloatingBike\n        )}\n      </Symbol>\n    );\n    SymbolWrapper.propTypes = {\n      entity: coreUtils.types.stationType.isRequired,\n      zoom: PropTypes.number.isRequired\n    };\n\n    return SymbolWrapper;\n  };\n\n  /**\n   * Convert map symbols to zoomBasedSymbolType.\n   */\n  convertToZoomMarkerSymbols = mapSymbols =>\n    mapSymbols.map(mapSymbol => {\n      // If mapSymbol uses zoomBasedSymbolType, use it as is.\n      if (mapSymbol.symbol) {\n        return mapSymbol;\n      }\n\n      // Otherwise, convert into zoomBasedType (no support for symbols by type).\n      let symbol;\n      switch (mapSymbol.type) {\n        case \"circle\":\n          symbol = SharedBikeCircle(mapSymbol);\n          break;\n        case \"hubAndFloatingBike\":\n          symbol = HubAndFloatingBike;\n          break;\n        default:\n          symbol = GenericMarker(mapSymbol);\n      }\n\n      return {\n        minZoom: mapSymbol.minZoom,\n        symbol\n      };\n    });\n\n  createLeafletElement() {}\n\n  updateLeafletElement() {}\n\n  startRefreshing() {\n    const { refreshVehicles } = this.props;\n\n    // Create the timer only if refreshVehicles is a valid function.\n    if (typeof refreshVehicles === \"function\") {\n      // initial station retrieval\n      refreshVehicles();\n\n      // set up timer to refresh stations periodically\n      this.refreshTimer = setInterval(() => {\n        refreshVehicles();\n      }, 30000); // defaults to every 30 sec. TODO: make this configurable?\n    }\n  }\n\n  stopRefreshing() {\n    if (this.refreshTimer) clearInterval(this.refreshTimer);\n  }\n\n  /**\n   * When the layer is added (or toggled on, or its visibility becomes true),\n   * start refreshing vehicle positions.\n   */\n  onOverlayAdded = () => {\n    this.startRefreshing();\n  };\n\n  /**\n   * When the layer is removed (or toggled off, or its visibility becomes false),\n   * stop refreshing vehicle positions.\n   */\n  onOverlayRemoved = () => {\n    this.stopRefreshing();\n  };\n\n  /**\n   * Listen to changes on the BaseMap's center or zoom.\n   * @param viewport The viewport data. See https://github.com/PaulLeCam/react-leaflet/blob/master/example/components/viewport.js for details.\n   */\n  onViewportChanged = viewport => {\n    const { zoom: newZoom } = viewport;\n    if (this.state.zoom !== newZoom) {\n      this.setState({ zoom: newZoom });\n    }\n  };\n\n  /**\n   * Upon mounting, see whether the vehicles should be fetched,\n   * and also call the register overlay prop that the\n   * @opentripplanner/base-map package has injected to listen to zoom/position changes.\n   */\n  componentDidMount() {\n    const { leaflet, registerOverlay, visible } = this.props;\n    this.setState({\n      zoom: leaflet.map.getZoom()\n    });\n    if (visible) this.startRefreshing();\n    if (typeof registerOverlay === \"function\") {\n      registerOverlay(this);\n    }\n  }\n\n  componentWillUnmount() {\n    this.stopRefreshing();\n  }\n\n  /**\n   * Render some popup html for a station. This contains custom logic for\n   * displaying rental vehicles in the TriMet MOD website that might not be\n   * applicable to other regions.\n   */\n  renderPopupForStation = (station, stationIsHub = false) => {\n    const { configCompanies, getStationName, setLocation } = this.props;\n    const stationName = getStationName(configCompanies, station);\n    const location = {\n      lat: station.y,\n      lon: station.x,\n      name: stationName\n    };\n    return (\n      <Popup>\n        <BaseMapStyled.MapOverlayPopup>\n          <BaseMapStyled.PopupTitle>{stationName}</BaseMapStyled.PopupTitle>\n\n          {/* render dock info if it is available */}\n          {stationIsHub && (\n            <BaseMapStyled.PopupRow>\n              <div>\n                <FormattedMessage\n                  defaultMessage={\n                    defaultMessages[\"otpUi.VehicleRentalOverlay.availableBikes\"]\n                  }\n                  description=\"Label text for the number of bikes available\"\n                  id=\"otpUi.VehicleRentalOverlay.availableBikes\"\n                  values={{ value: station.bikesAvailable }}\n                />\n              </div>\n              <div>\n                <FormattedMessage\n                  defaultMessage={\n                    defaultMessages[\"otpUi.VehicleRentalOverlay.availableDocks\"]\n                  }\n                  description=\"Label text for the number of docks available\"\n                  id=\"otpUi.VehicleRentalOverlay.availableDocks\"\n                  values={{ value: station.spacesAvailable }}\n                />\n              </div>\n            </BaseMapStyled.PopupRow>\n          )}\n\n          {/* Set as from/to toolbar */}\n          <BaseMapStyled.PopupRow>\n            <FromToLocationPicker\n              label\n              location={location}\n              setLocation={setLocation}\n            />\n          </BaseMapStyled.PopupRow>\n        </BaseMapStyled.MapOverlayPopup>\n      </Popup>\n    );\n  };\n\n  render() {\n    const { companies, leaflet, mapSymbols, stations } = this.props;\n    const { zoom = leaflet.map.getZoom() } = this.state;\n    // Render an empty FeatureGroup if the rental vehicles should not be visible\n    // on the map. Otherwise previous stations may still be shown due to some\n    // react-leaflet internals, maybe? Also, do not return null because that will\n    // prevent the overlay from appearing in the layer controls.\n\n    let filteredStations = stations;\n    if (companies) {\n      filteredStations = stations.filter(\n        station =>\n          station.networks.filter(value => companies.includes(value)).length > 0\n      );\n    }\n\n    if (!filteredStations || filteredStations.length === 0) {\n      return <FeatureGroup />;\n    }\n\n    // Convert map symbols for this overlay to zoomBasedSymbolType.\n    const symbols = this.convertToZoomMarkerSymbols(mapSymbols);\n\n    return (\n      <FeatureGroup>\n        <ZoomBasedMarkers\n          entities={filteredStations}\n          symbols={symbols}\n          symbolTransform={this.renderSymbolWithPopup}\n          zoom={zoom}\n        />\n      </FeatureGroup>\n    );\n  }\n}\n\nVehicleRentalOverlay.props = {\n  /**\n   * The entire companies config array.\n   */\n  configCompanies: PropTypes.arrayOf(coreUtils.types.companyType.isRequired)\n    .isRequired,\n  /**\n   * A list of companies that are applicable to just this instance of the\n   * overlay.\n   */\n  companies: PropTypes.arrayOf(PropTypes.string.isRequired),\n  /**\n   * An optional custom function to create a string name of a particular vehicle\n   * rental station. This function takes two arguments of the configCompanies\n   * prop and a vehicle rental station. The function must return a string.\n   */\n  getStationName: PropTypes.func,\n  /**\n   * A configuration of what map markers or symbols to show at various\n   * zoom levels.\n   */\n  mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,\n  /**\n   * If specified, a function that will be triggered every 30 seconds whenever this layer is\n   * visible.\n   */\n  refreshVehicles: PropTypes.func,\n  /**\n   * A callback for when a user clicks on setting this stop as either the from\n   * or to location of a new search.\n   *\n   * This will be dispatched with the following argument:\n   *\n   * ```js\n   *  {\n   *    location: {\n   *      lat: number,\n   *      lon: number,\n   *      name: string\n   *    },\n   *    locationType: \"from\" or \"to\"\n   *  }\n   * ```\n   */\n  setLocation: PropTypes.func.isRequired,\n  /**\n   * A list of the vehicle rental stations specific to this overlay instance.\n   */\n  stations: PropTypes.arrayOf(coreUtils.types.stationType),\n  /**\n   * Whether the overlay is currently visible.\n   */\n  visible: PropTypes.bool\n};\n\nVehicleRentalOverlay.defaultProps = {\n  getStationName: (configCompanies, station) => {\n    const stationNetworks = coreUtils.itinerary.getCompaniesLabelFromNetworks(\n      station.networks,\n      configCompanies\n    );\n    let stationName = station.name || station.id;\n    if (station.isFloatingBike) {\n      stationName = `Free-floating bike: ${stationName}`;\n    } else if (station.isFloatingCar) {\n      stationName = `${stationNetworks} ${stationName}`;\n    } else if (station.isFloatingVehicle) {\n      // assumes that all floating vehicles are E-scooters\n      stationName = `${stationNetworks} E-scooter`;\n    }\n    return stationName;\n  },\n  mapSymbols: [\n    {\n      zoom: 0,\n      symbol: GenericMarker\n    }\n  ],\n  refreshVehicles: null,\n  stations: [],\n  visible: false\n};\n\nexport default withLeaflet(VehicleRentalOverlay);\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["flatten","Styled","BaseMapStyled","coreUtils","FromToLocationPicker","ZoomBasedMarkers","PropTypes","React","FormattedMessage","injectIntl","FeatureGroup","MapLayer","Popup","withLeaflet","GenericMarker","HubAndFloatingBike","SharedBikeCircle","defaultEnglishMessages","defaultMessages","makeDefaultGetStationName","intl","defaultGetStationName","configCompanies","station","stationNetworks","itinerary","getCompaniesLabelFromNetworks","networks","stationName","name","id","match","length","isFloatingBike","formatMessage","defaultMessage","description","isFloatingCar","company","isFloatingVehicle","VehicleRentalOverlay","props","renderSymbolWithPopup","Symbol","SymbolWrapper","entity","zoom","renderPopupForStation","bikesAvailable","undefined","propTypes","number","isRequired","convertToZoomMarkerSymbols","mapSymbols","map","mapSymbol","symbol","type","minZoom","onOverlayAdded","startRefreshing","onOverlayRemoved","stopRefreshing","onViewportChanged","viewport","newZoom","state","setState","stationIsHub","getStationName","setLocation","getStationNameFunc","location","lat","y","lon","x","value","spacesAvailable","refreshVehicles","refreshTimer","setInterval","clearInterval","leaflet","registerOverlay","visible","getZoom","companies","stations","filteredStations","filter","includes","symbols","arrayOf","string","func","bool","defaultProps"],"mappings":"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","sourcesContent":["import flatten from \"flat\";\nimport { Styled as BaseMapStyled } from \"@opentripplanner/base-map\";\nimport coreUtils from \"@opentripplanner/core-utils\";\nimport FromToLocationPicker from \"@opentripplanner/from-to-location-picker\";\nimport ZoomBasedMarkers from \"@opentripplanner/zoom-based-markers\";\nimport PropTypes from \"prop-types\";\nimport React from \"react\";\nimport { FormattedMessage, injectIntl } from \"react-intl\";\nimport { FeatureGroup, MapLayer, Popup, withLeaflet } from \"react-leaflet\";\n\nimport {\n  GenericMarker,\n  HubAndFloatingBike,\n  SharedBikeCircle\n} from \"./DefaultMarkers\";\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.\nconst defaultMessages = flatten(defaultEnglishMessages);\n\nfunction makeDefaultGetStationName(intl) {\n  return function defaultGetStationName(configCompanies, station) {\n    const stationNetworks = coreUtils.itinerary.getCompaniesLabelFromNetworks(\n      station.networks,\n      configCompanies\n    );\n    let stationName = station.name || station.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 and instead use the network name.\n    if ((stationName.match(/-/g) || []).length > 3) {\n      stationName = stationNetworks;\n    }\n\n    if (station.isFloatingBike) {\n      stationName = intl.formatMessage(\n        {\n          defaultMessage:\n            defaultEnglishMessages[\"otpUi.VehicleRentalOverlay.floatingBike\"],\n          description: \"Popup title for a free-floating bike\",\n          id: \"otpUi.VehicleRentalOverlay.floatingBike\"\n        },\n        { name: stationName }\n      );\n    } else if (station.isFloatingCar) {\n      stationName = intl.formatMessage(\n        {\n          defaultMessage:\n            defaultEnglishMessages[\"otpUi.VehicleRentalOverlay.floatingCar\"],\n          description: \"Popup title for a free-floating car\",\n          id: \"otpUi.VehicleRentalOverlay.floatingCar\"\n        },\n        {\n          company: stationNetworks,\n          name: stationName\n        }\n      );\n    } else if (station.isFloatingVehicle) {\n      // assumes that all floating vehicles are E-scooters\n      stationName = intl.formatMessage(\n        {\n          defaultMessage:\n            defaultEnglishMessages[\n              \"otpUi.VehicleRentalOverlay.floatingEScooter\"\n            ],\n          description: \"Popup title for a free-floating e-scooter\",\n          id: \"otpUi.VehicleRentalOverlay.floatingEScooter\"\n        },\n        { company: stationNetworks }\n      );\n    }\n    return stationName;\n  };\n}\n\n/**\n * This vehicle rental overlay can be used to render vehicle rentals of various\n * types. This layer can be configured to show different styles of markers at\n * different zoom levels.\n */\nclass VehicleRentalOverlay extends MapLayer {\n  constructor(props) {\n    super(props);\n    this.state = {\n      zoom: null\n    };\n  }\n\n  /**\n   * This helper method will be passed to the ZoomBasedMarkers symbolTransform prop.\n   * It creates a component that inserts a popup\n   * as a child of the specified symbol from the mapSymbols prop.\n   */\n  renderSymbolWithPopup = Symbol => {\n    const SymbolWrapper = ({ entity: station, zoom }) => (\n      <Symbol entity={station} zoom={zoom}>\n        {this.renderPopupForStation(\n          station,\n          station.bikesAvailable !== undefined && !station.isFloatingBike\n        )}\n      </Symbol>\n    );\n    SymbolWrapper.propTypes = {\n      // entity: coreUtils.types.stationType.isRequired,\n      zoom: PropTypes.number.isRequired\n    };\n\n    return SymbolWrapper;\n  };\n\n  /**\n   * Convert map symbols to zoomBasedSymbolType.\n   */\n  convertToZoomMarkerSymbols = mapSymbols =>\n    mapSymbols.map(mapSymbol => {\n      // If mapSymbol uses zoomBasedSymbolType, use it as is.\n      if (mapSymbol.symbol) {\n        return mapSymbol;\n      }\n\n      // Otherwise, convert into zoomBasedType (no support for symbols by type).\n      let symbol;\n      switch (mapSymbol.type) {\n        case \"circle\":\n          symbol = SharedBikeCircle(mapSymbol);\n          break;\n        case \"hubAndFloatingBike\":\n          symbol = HubAndFloatingBike;\n          break;\n        default:\n          symbol = GenericMarker(mapSymbol);\n      }\n\n      return {\n        minZoom: mapSymbol.minZoom,\n        symbol\n      };\n    });\n\n  createLeafletElement() {}\n\n  updateLeafletElement() {}\n\n  startRefreshing() {\n    const { refreshVehicles } = this.props;\n\n    // Create the timer only if refreshVehicles is a valid function.\n    if (typeof refreshVehicles === \"function\") {\n      // initial station retrieval\n      refreshVehicles();\n\n      // set up timer to refresh stations periodically\n      this.refreshTimer = setInterval(() => {\n        refreshVehicles();\n      }, 30000); // defaults to every 30 sec. TODO: make this configurable?\n    }\n  }\n\n  stopRefreshing() {\n    if (this.refreshTimer) clearInterval(this.refreshTimer);\n  }\n\n  /**\n   * When the layer is added (or toggled on, or its visibility becomes true),\n   * start refreshing vehicle positions.\n   */\n  onOverlayAdded = () => {\n    this.startRefreshing();\n  };\n\n  /**\n   * When the layer is removed (or toggled off, or its visibility becomes false),\n   * stop refreshing vehicle positions.\n   */\n  onOverlayRemoved = () => {\n    this.stopRefreshing();\n  };\n\n  /**\n   * Listen to changes on the BaseMap's center or zoom.\n   * @param viewport The viewport data. See https://github.com/PaulLeCam/react-leaflet/blob/master/example/components/viewport.js for details.\n   */\n  onViewportChanged = viewport => {\n    const { zoom: newZoom } = viewport;\n    if (this.state.zoom !== newZoom) {\n      this.setState({ zoom: newZoom });\n    }\n  };\n\n  /**\n   * Upon mounting, see whether the vehicles should be fetched,\n   * and also call the register overlay prop that the\n   * @opentripplanner/base-map package has injected to listen to zoom/position changes.\n   */\n  componentDidMount() {\n    const { leaflet, registerOverlay, visible } = this.props;\n    this.setState({\n      zoom: leaflet.map.getZoom()\n    });\n    if (visible) this.startRefreshing();\n    if (typeof registerOverlay === \"function\") {\n      registerOverlay(this);\n    }\n  }\n\n  componentWillUnmount() {\n    this.stopRefreshing();\n  }\n\n  /**\n   * Render some popup html for a station. This contains custom logic for\n   * displaying rental vehicles in the TriMet MOD website that might not be\n   * applicable to other regions.\n   */\n  renderPopupForStation = (station, stationIsHub = false) => {\n    const { configCompanies, getStationName, intl, setLocation } = this.props;\n    const getStationNameFunc =\n      getStationName || makeDefaultGetStationName(intl);\n    const stationName = getStationNameFunc(configCompanies, station);\n    const location = {\n      lat: station.y,\n      lon: station.x,\n      name: stationName\n    };\n    return (\n      <Popup>\n        <BaseMapStyled.MapOverlayPopup>\n          <BaseMapStyled.PopupTitle>{stationName}</BaseMapStyled.PopupTitle>\n\n          {/* render dock info if it is available */}\n          {stationIsHub && (\n            <BaseMapStyled.PopupRow>\n              <div>\n                <FormattedMessage\n                  defaultMessage={\n                    defaultMessages[\"otpUi.VehicleRentalOverlay.availableBikes\"]\n                  }\n                  description=\"Label text for the number of bikes available\"\n                  id=\"otpUi.VehicleRentalOverlay.availableBikes\"\n                  values={{ value: station.bikesAvailable }}\n                />\n              </div>\n              <div>\n                <FormattedMessage\n                  defaultMessage={\n                    defaultMessages[\"otpUi.VehicleRentalOverlay.availableDocks\"]\n                  }\n                  description=\"Label text for the number of docks available\"\n                  id=\"otpUi.VehicleRentalOverlay.availableDocks\"\n                  values={{ value: station.spacesAvailable }}\n                />\n              </div>\n            </BaseMapStyled.PopupRow>\n          )}\n\n          {/* Set as from/to toolbar */}\n          <BaseMapStyled.PopupRow>\n            <FromToLocationPicker\n              label\n              location={location}\n              setLocation={setLocation}\n            />\n          </BaseMapStyled.PopupRow>\n        </BaseMapStyled.MapOverlayPopup>\n      </Popup>\n    );\n  };\n\n  render() {\n    const { companies, leaflet, mapSymbols, stations } = this.props;\n    const { zoom = leaflet.map.getZoom() } = this.state;\n    // Render an empty FeatureGroup if the rental vehicles should not be visible\n    // on the map. Otherwise previous stations may still be shown due to some\n    // react-leaflet internals, maybe? Also, do not return null because that will\n    // prevent the overlay from appearing in the layer controls.\n\n    let filteredStations = stations;\n    if (companies) {\n      filteredStations = stations.filter(\n        station =>\n          station.networks.filter(value => companies.includes(value)).length > 0\n      );\n    }\n\n    if (!filteredStations || filteredStations.length === 0) {\n      return <FeatureGroup />;\n    }\n\n    // Convert map symbols for this overlay to zoomBasedSymbolType.\n    const symbols = this.convertToZoomMarkerSymbols(mapSymbols);\n\n    return (\n      <FeatureGroup>\n        <ZoomBasedMarkers\n          entities={filteredStations}\n          symbols={symbols}\n          symbolTransform={this.renderSymbolWithPopup}\n          zoom={zoom}\n        />\n      </FeatureGroup>\n    );\n  }\n}\n\nVehicleRentalOverlay.props = {\n  /**\n   * The entire companies config array.\n   */\n  // configCompanies: PropTypes.arrayOf(coreUtils.types.companyType.isRequired)\n  //   .isRequired,\n  /**\n   * A list of companies that are applicable to just this instance of the\n   * overlay.\n   */\n  companies: PropTypes.arrayOf(PropTypes.string.isRequired),\n  /**\n   * An optional custom function to create a string name of a particular vehicle\n   * rental station. This function takes two arguments of the configCompanies\n   * prop and a vehicle rental station. The function must return a string.\n   */\n  getStationName: PropTypes.func,\n  /**\n   * A configuration of what map markers or symbols to show at various\n   * zoom levels.\n   */\n  // mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,\n  /**\n   * If specified, a function that will be triggered every 30 seconds whenever this layer is\n   * visible.\n   */\n  refreshVehicles: PropTypes.func,\n  /**\n   * A callback for when a user clicks on setting this stop as either the from\n   * or to location of a new search.\n   *\n   * This will be dispatched with the following argument:\n   *\n   * ```js\n   *  {\n   *    location: {\n   *      lat: number,\n   *      lon: number,\n   *      name: string\n   *    },\n   *    locationType: \"from\" or \"to\"\n   *  }\n   * ```\n   */\n  setLocation: PropTypes.func.isRequired,\n  /**\n   * A list of the vehicle rental stations specific to this overlay instance.\n   */\n  // stations: PropTypes.arrayOf(coreUtils.types.stationType),\n  /**\n   * Whether the overlay is currently visible.\n   */\n  visible: PropTypes.bool\n};\n\nVehicleRentalOverlay.defaultProps = {\n  getStationName: null,\n  mapSymbols: [\n    {\n      zoom: 0,\n      symbol: GenericMarker\n    }\n  ],\n  refreshVehicles: null,\n  stations: [],\n  visible: false\n};\n\nexport default withLeaflet(injectIntl(VehicleRentalOverlay));\n"],"file":"index.js"}

package/i18n/en-US.yml

@@ -12,3 +12,6 @@ otpUi:
   VehicleRentalOverlay:
     availableBikes: "Available bikes: {value}"
     availableDocks: "Available docks: {value}"
+    floatingBike: "Free-floating bike: {name}"
+    floatingCar: "{company} {name}" # as in "CarCompany Veh1234a"
+    floatingEScooter: "{company} E-scooter"

package/i18n/fr.yml

@@ -12,3 +12,6 @@ otpUi:
   VehicleRentalOverlay:
     availableBikes: "Vélos disponibles : {value}"
     availableDocks: "Bornes disponibles : {value}"
+    floatingBike: "Vélo flottant : {name}"
+    floatingCar: "{company} {name}" # as in "CarCompany Veh1234a"
+    floatingEScooter: "Trottinette {company}"

package/lib/DefaultMarkers/index.js

@@ -11,8 +11,6 @@ var _leaflet = require("leaflet");
 
 var _lodash = _interopRequireDefault(require("lodash.memoize"));
 
-var _coreUtils = _interopRequireDefault(require("@opentripplanner/core-utils"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -42,7 +40,9 @@ const templatePropTypes = {
   children: _propTypes.default.node,
 
   /** The rental vehicle or station to render. */
-  entity: _coreUtils.default.types.stationType.isRequired,
+  // entity: coreUtils.types.stationType.isRequired,
+  // eslint-disable-next-line react/forbid-prop-types
+  entity: _propTypes.default.object.isRequired,
 
   /** leaflet attribute to control tabindex value for keyboaryd-only / SR users */
   keyboard: _propTypes.default.bool

package/lib/DefaultMarkers/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/DefaultMarkers/index.js"],"names":["templatePropTypes","children","PropTypes","node","entity","coreUtils","types","stationType","isRequired","keyboard","bool","templateDefaultProps","SharedBikeCircle","dockStrokeColor","fillColor","pixels","strokeColor","GeneratedMarker","station","newStrokeColor","isFloatingBike","y","x","propTypes","defaultProps","HubAndFloatingBike","icon","floatingBikeIcon","capacity","bikesAvailable","spacesAvailable","pctFull","i","Math","round","hubIcons","getStationMarkerByColor","color","className","iconSize","popupAnchor","html","ReactDOMServer","renderToStaticMarkup","GenericMarker","markerIcon"],"mappings":"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","sourcesContent":["import { divIcon } from \"leaflet\";\nimport memoize from \"lodash.memoize\";\nimport coreUtils from \"@opentripplanner/core-utils\";\nimport PropTypes from \"prop-types\";\nimport React from \"react\";\nimport ReactDOMServer from \"react-dom/server\";\nimport { CircleMarker, Marker } from \"react-leaflet\";\n\nimport { floatingBikeIcon, hubIcons } from \"../bike-icons\";\nimport * as Styled from \"../styled\";\n\n/**\n * This file contains default marker types for rental vehicles,\n * that can be used when defining the VehicleRentalOverlay's symbol prop:\n * - SharedBikeCircle\n * - GenericMarker\n * - HubAndFloatingBike\n */\n\n// Prop types reused across components.\nconst templatePropTypes = {\n  /** The children of the component. */\n  children: PropTypes.node,\n  /** The rental vehicle or station to render. */\n  entity: coreUtils.types.stationType.isRequired,\n  /** leaflet attribute to control tabindex value for keyboaryd-only / SR users */\n  keyboard: PropTypes.bool\n};\nconst templateDefaultProps = {\n  children: null,\n  keyboard: false\n};\n\n/**\n * Renders a shared bike or shared bike dock as a circle\n * with predefined colors and size.\n */\nexport const SharedBikeCircle = ({\n  dockStrokeColor,\n  fillColor = \"gray\",\n  pixels,\n  strokeColor\n}) => {\n  const GeneratedMarker = ({ children, keyboard, entity: station }) => {\n    let newStrokeColor = strokeColor || fillColor;\n\n    if (!station.isFloatingBike) {\n      newStrokeColor = dockStrokeColor || strokeColor;\n    }\n\n    return (\n      <CircleMarker\n        center={[station.y, station.x]}\n        color={newStrokeColor}\n        fillColor={fillColor}\n        fillOpacity={1}\n        keyboard={keyboard}\n        radius={pixels - (station.isFloatingBike ? 1 : 0)}\n        weight={1}\n      >\n        {children}\n      </CircleMarker>\n    );\n  };\n\n  GeneratedMarker.propTypes = templatePropTypes;\n  GeneratedMarker.defaultProps = templateDefaultProps;\n  return GeneratedMarker;\n};\n\n/**\n * A component that renders rental bike entities\n * either as a bike or a bike dock (or hub, showing spaces available).\n */\nexport const HubAndFloatingBike = ({ children, keyboard, entity: station }) => {\n  let icon;\n  if (station.isFloatingBike) {\n    icon = floatingBikeIcon;\n  } else {\n    const capacity = station.bikesAvailable + station.spacesAvailable;\n    if (capacity === 0) return null;\n    const pctFull = station.bikesAvailable / capacity;\n    const i = Math.round(pctFull * 9);\n    icon = hubIcons[i];\n  }\n  return (\n    <Marker icon={icon} keyboard={keyboard} position={[station.y, station.x]}>\n      {children}\n    </Marker>\n  );\n};\nHubAndFloatingBike.propTypes = templatePropTypes;\nHubAndFloatingBike.defaultProps = templateDefaultProps;\n\n/**\n * Creates and caches a leaflet element icon based on color.\n */\nconst getStationMarkerByColor = memoize(color =>\n  divIcon({\n    className: \"\",\n    iconSize: [11, 16],\n    popupAnchor: [0, -6],\n    html: ReactDOMServer.renderToStaticMarkup(\n      <Styled.StationMarker color={color} />\n    )\n  })\n);\n\n/**\n * Helper function to create a leaflet Marker component to render entities\n * using fixed fill color.\n * Usage: GenericMarker({ fillColor: \"#F204B5\" })\n */\nexport const GenericMarker = ({ fillColor = \"gray\" }) => {\n  const markerIcon = getStationMarkerByColor(fillColor);\n\n  const GeneratedMarker = ({ children, keyboard, entity: station }) => (\n    <Marker\n      icon={markerIcon}\n      keyboard={keyboard}\n      position={[station.y, station.x]}\n    >\n      {children}\n    </Marker>\n  );\n  GeneratedMarker.propTypes = templatePropTypes;\n  GeneratedMarker.defaultProps = templateDefaultProps;\n  return GeneratedMarker;\n};\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/DefaultMarkers/index.js"],"names":["templatePropTypes","children","PropTypes","node","entity","object","isRequired","keyboard","bool","templateDefaultProps","SharedBikeCircle","dockStrokeColor","fillColor","pixels","strokeColor","GeneratedMarker","station","newStrokeColor","isFloatingBike","y","x","propTypes","defaultProps","HubAndFloatingBike","icon","floatingBikeIcon","capacity","bikesAvailable","spacesAvailable","pctFull","i","Math","round","hubIcons","getStationMarkerByColor","color","className","iconSize","popupAnchor","html","ReactDOMServer","renderToStaticMarkup","GenericMarker","markerIcon"],"mappings":"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","sourcesContent":["import { divIcon } from \"leaflet\";\nimport memoize from \"lodash.memoize\";\nimport PropTypes from \"prop-types\";\nimport React from \"react\";\nimport ReactDOMServer from \"react-dom/server\";\nimport { CircleMarker, Marker } from \"react-leaflet\";\n\nimport { floatingBikeIcon, hubIcons } from \"../bike-icons\";\nimport * as Styled from \"../styled\";\n\n/**\n * This file contains default marker types for rental vehicles,\n * that can be used when defining the VehicleRentalOverlay's symbol prop:\n * - SharedBikeCircle\n * - GenericMarker\n * - HubAndFloatingBike\n */\n\n// Prop types reused across components.\nconst templatePropTypes = {\n  /** The children of the component. */\n  children: PropTypes.node,\n  /** The rental vehicle or station to render. */\n  // entity: coreUtils.types.stationType.isRequired,\n  // eslint-disable-next-line react/forbid-prop-types\n  entity: PropTypes.object.isRequired,\n  /** leaflet attribute to control tabindex value for keyboaryd-only / SR users */\n  keyboard: PropTypes.bool\n};\nconst templateDefaultProps = {\n  children: null,\n  keyboard: false\n};\n\n/**\n * Renders a shared bike or shared bike dock as a circle\n * with predefined colors and size.\n */\nexport const SharedBikeCircle = ({\n  dockStrokeColor,\n  fillColor = \"gray\",\n  pixels,\n  strokeColor\n}) => {\n  const GeneratedMarker = ({ children, keyboard, entity: station }) => {\n    let newStrokeColor = strokeColor || fillColor;\n\n    if (!station.isFloatingBike) {\n      newStrokeColor = dockStrokeColor || strokeColor;\n    }\n\n    return (\n      <CircleMarker\n        center={[station.y, station.x]}\n        color={newStrokeColor}\n        fillColor={fillColor}\n        fillOpacity={1}\n        keyboard={keyboard}\n        radius={pixels - (station.isFloatingBike ? 1 : 0)}\n        weight={1}\n      >\n        {children}\n      </CircleMarker>\n    );\n  };\n\n  GeneratedMarker.propTypes = templatePropTypes;\n  GeneratedMarker.defaultProps = templateDefaultProps;\n  return GeneratedMarker;\n};\n\n/**\n * A component that renders rental bike entities\n * either as a bike or a bike dock (or hub, showing spaces available).\n */\nexport const HubAndFloatingBike = ({ children, keyboard, entity: station }) => {\n  let icon;\n  if (station.isFloatingBike) {\n    icon = floatingBikeIcon;\n  } else {\n    const capacity = station.bikesAvailable + station.spacesAvailable;\n    if (capacity === 0) return null;\n    const pctFull = station.bikesAvailable / capacity;\n    const i = Math.round(pctFull * 9);\n    icon = hubIcons[i];\n  }\n  return (\n    <Marker icon={icon} keyboard={keyboard} position={[station.y, station.x]}>\n      {children}\n    </Marker>\n  );\n};\nHubAndFloatingBike.propTypes = templatePropTypes;\nHubAndFloatingBike.defaultProps = templateDefaultProps;\n\n/**\n * Creates and caches a leaflet element icon based on color.\n */\nconst getStationMarkerByColor = memoize(color =>\n  divIcon({\n    className: \"\",\n    iconSize: [11, 16],\n    popupAnchor: [0, -6],\n    html: ReactDOMServer.renderToStaticMarkup(\n      <Styled.StationMarker color={color} />\n    )\n  })\n);\n\n/**\n * Helper function to create a leaflet Marker component to render entities\n * using fixed fill color.\n * Usage: GenericMarker({ fillColor: \"#F204B5\" })\n */\nexport const GenericMarker = ({ fillColor = \"gray\" }) => {\n  const markerIcon = getStationMarkerByColor(fillColor);\n\n  const GeneratedMarker = ({ children, keyboard, entity: station }) => (\n    <Marker\n      icon={markerIcon}\n      keyboard={keyboard}\n      position={[station.y, station.x]}\n    >\n      {children}\n    </Marker>\n  );\n  GeneratedMarker.propTypes = templatePropTypes;\n  GeneratedMarker.defaultProps = templateDefaultProps;\n  return GeneratedMarker;\n};\n"],"file":"index.js"}

package/lib/index.js

@@ -35,12 +35,56 @@ var _enUS = _interopRequireDefault(require("../i18n/en-US.yml"));
 // - the yaml loader for webpack returns a nested object,
 // - the yaml loader for jest returns messages with flattened ids.
 const defaultMessages = (0, _flat.default)(_enUS.default);
+
+function makeDefaultGetStationName(intl) {
+  return function defaultGetStationName(configCompanies, station) {
+    const stationNetworks = _coreUtils.default.itinerary.getCompaniesLabelFromNetworks(station.networks, configCompanies);
+
+    let stationName = station.name || station.id; // If the station name or id is a giant UUID (with more than 3 "-" characters)
+    // best not to show that at all and instead use the network name.
+
+    if ((stationName.match(/-/g) || []).length > 3) {
+      stationName = stationNetworks;
+    }
+
+    if (station.isFloatingBike) {
+      stationName = intl.formatMessage({
+        defaultMessage: _enUS.default["otpUi.VehicleRentalOverlay.floatingBike"],
+        description: "Popup title for a free-floating bike",
+        id: "otpUi.VehicleRentalOverlay.floatingBike"
+      }, {
+        name: stationName
+      });
+    } else if (station.isFloatingCar) {
+      stationName = intl.formatMessage({
+        defaultMessage: _enUS.default["otpUi.VehicleRentalOverlay.floatingCar"],
+        description: "Popup title for a free-floating car",
+        id: "otpUi.VehicleRentalOverlay.floatingCar"
+      }, {
+        company: stationNetworks,
+        name: stationName
+      });
+    } else if (station.isFloatingVehicle) {
+      // assumes that all floating vehicles are E-scooters
+      stationName = intl.formatMessage({
+        defaultMessage: _enUS.default["otpUi.VehicleRentalOverlay.floatingEScooter"],
+        description: "Popup title for a free-floating e-scooter",
+        id: "otpUi.VehicleRentalOverlay.floatingEScooter"
+      }, {
+        company: stationNetworks
+      });
+    }
+
+    return stationName;
+  };
+}
 /**
  * This vehicle rental overlay can be used to render vehicle rentals of various
  * types. This layer can be configured to show different styles of markers at
  * different zoom levels.
  */
 
+
 class VehicleRentalOverlay extends _reactLeaflet.MapLayer {
   constructor(props) {
     super(props);
@@ -55,7 +99,7 @@ class VehicleRentalOverlay extends _reactLeaflet.MapLayer {
       }, this.renderPopupForStation(station, station.bikesAvailable !== undefined && !station.isFloatingBike));
 
       SymbolWrapper.propTypes = {
-        entity: _coreUtils.default.types.stationType.isRequired,
+        // entity: coreUtils.types.stationType.isRequired,
         zoom: _propTypes.default.number.isRequired
       };
       return SymbolWrapper;
@@ -113,9 +157,11 @@ class VehicleRentalOverlay extends _reactLeaflet.MapLayer {
       const {
         configCompanies,
         getStationName,
+        intl,
         setLocation
       } = this.props;
-      const stationName = getStationName(configCompanies, station);
+      const getStationNameFunc = getStationName || makeDefaultGetStationName(intl);
+      const stationName = getStationNameFunc(configCompanies, station);
       const location = {
         lat: station.y,
         lon: station.x,
@@ -252,7 +298,8 @@ VehicleRentalOverlay.props = {
   /**
    * The entire companies config array.
    */
-  configCompanies: _propTypes.default.arrayOf(_coreUtils.default.types.companyType.isRequired).isRequired,
+  // configCompanies: PropTypes.arrayOf(coreUtils.types.companyType.isRequired)
+  //   .isRequired,
 
   /**
    * A list of companies that are applicable to just this instance of the
@@ -271,7 +318,7 @@ VehicleRentalOverlay.props = {
    * A configuration of what map markers or symbols to show at various
    * zoom levels.
    */
-  mapSymbols: _coreUtils.default.types.vehicleRentalMapOverlaySymbolsType,
+  // mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,
 
   /**
    * If specified, a function that will be triggered every 30 seconds whenever this layer is
@@ -301,7 +348,7 @@ VehicleRentalOverlay.props = {
   /**
    * A list of the vehicle rental stations specific to this overlay instance.
    */
-  stations: _propTypes.default.arrayOf(_coreUtils.default.types.stationType),
+  // stations: PropTypes.arrayOf(coreUtils.types.stationType),
 
   /**
    * Whether the overlay is currently visible.
@@ -309,22 +356,7 @@ VehicleRentalOverlay.props = {
   visible: _propTypes.default.bool
 };
 VehicleRentalOverlay.defaultProps = {
-  getStationName: (configCompanies, station) => {
-    const stationNetworks = _coreUtils.default.itinerary.getCompaniesLabelFromNetworks(station.networks, configCompanies);
-
-    let stationName = station.name || station.id;
-
-    if (station.isFloatingBike) {
-      stationName = `Free-floating bike: ${stationName}`;
-    } else if (station.isFloatingCar) {
-      stationName = `${stationNetworks} ${stationName}`;
-    } else if (station.isFloatingVehicle) {
-      // assumes that all floating vehicles are E-scooters
-      stationName = `${stationNetworks} E-scooter`;
-    }
-
-    return stationName;
-  },
+  getStationName: null,
   mapSymbols: [{
     zoom: 0,
     symbol: _DefaultMarkers.GenericMarker
@@ -334,7 +366,7 @@ VehicleRentalOverlay.defaultProps = {
   visible: false
 };
 
-var _default = (0, _reactLeaflet.withLeaflet)(VehicleRentalOverlay);
+var _default = (0, _reactLeaflet.withLeaflet)((0, _reactIntl.injectIntl)(VehicleRentalOverlay));
 
 exports.default = _default;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["defaultMessages","defaultEnglishMessages","VehicleRentalOverlay","MapLayer","constructor","props","renderSymbolWithPopup","Symbol","SymbolWrapper","entity","station","zoom","renderPopupForStation","bikesAvailable","undefined","isFloatingBike","propTypes","coreUtils","types","stationType","isRequired","PropTypes","number","convertToZoomMarkerSymbols","mapSymbols","map","mapSymbol","symbol","type","HubAndFloatingBike","minZoom","onOverlayAdded","startRefreshing","onOverlayRemoved","stopRefreshing","onViewportChanged","viewport","newZoom","state","setState","stationIsHub","configCompanies","getStationName","setLocation","stationName","location","lat","y","lon","x","name","value","spacesAvailable","createLeafletElement","updateLeafletElement","refreshVehicles","refreshTimer","setInterval","clearInterval","componentDidMount","leaflet","registerOverlay","visible","getZoom","componentWillUnmount","render","companies","stations","filteredStations","filter","networks","includes","length","symbols","arrayOf","companyType","string","func","vehicleRentalMapOverlaySymbolsType","bool","defaultProps","stationNetworks","itinerary","getCompaniesLabelFromNetworks","id","isFloatingCar","isFloatingVehicle","GenericMarker"],"mappings":"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","sourcesContent":["import flatten from \"flat\";\nimport { Styled as BaseMapStyled } from \"@opentripplanner/base-map\";\nimport coreUtils from \"@opentripplanner/core-utils\";\nimport FromToLocationPicker from \"@opentripplanner/from-to-location-picker\";\nimport ZoomBasedMarkers from \"@opentripplanner/zoom-based-markers\";\nimport PropTypes from \"prop-types\";\nimport React from \"react\";\nimport { FormattedMessage } from \"react-intl\";\nimport { FeatureGroup, MapLayer, Popup, withLeaflet } from \"react-leaflet\";\n\nimport {\n  GenericMarker,\n  HubAndFloatingBike,\n  SharedBikeCircle\n} from \"./DefaultMarkers\";\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.\nconst defaultMessages = flatten(defaultEnglishMessages);\n\n/**\n * This vehicle rental overlay can be used to render vehicle rentals of various\n * types. This layer can be configured to show different styles of markers at\n * different zoom levels.\n */\nclass VehicleRentalOverlay extends MapLayer {\n  constructor(props) {\n    super(props);\n    this.state = {\n      zoom: null\n    };\n  }\n\n  /**\n   * This helper method will be passed to the ZoomBasedMarkers symbolTransform prop.\n   * It creates a component that inserts a popup\n   * as a child of the specified symbol from the mapSymbols prop.\n   */\n  renderSymbolWithPopup = Symbol => {\n    const SymbolWrapper = ({ entity: station, zoom }) => (\n      <Symbol entity={station} zoom={zoom}>\n        {this.renderPopupForStation(\n          station,\n          station.bikesAvailable !== undefined && !station.isFloatingBike\n        )}\n      </Symbol>\n    );\n    SymbolWrapper.propTypes = {\n      entity: coreUtils.types.stationType.isRequired,\n      zoom: PropTypes.number.isRequired\n    };\n\n    return SymbolWrapper;\n  };\n\n  /**\n   * Convert map symbols to zoomBasedSymbolType.\n   */\n  convertToZoomMarkerSymbols = mapSymbols =>\n    mapSymbols.map(mapSymbol => {\n      // If mapSymbol uses zoomBasedSymbolType, use it as is.\n      if (mapSymbol.symbol) {\n        return mapSymbol;\n      }\n\n      // Otherwise, convert into zoomBasedType (no support for symbols by type).\n      let symbol;\n      switch (mapSymbol.type) {\n        case \"circle\":\n          symbol = SharedBikeCircle(mapSymbol);\n          break;\n        case \"hubAndFloatingBike\":\n          symbol = HubAndFloatingBike;\n          break;\n        default:\n          symbol = GenericMarker(mapSymbol);\n      }\n\n      return {\n        minZoom: mapSymbol.minZoom,\n        symbol\n      };\n    });\n\n  createLeafletElement() {}\n\n  updateLeafletElement() {}\n\n  startRefreshing() {\n    const { refreshVehicles } = this.props;\n\n    // Create the timer only if refreshVehicles is a valid function.\n    if (typeof refreshVehicles === \"function\") {\n      // initial station retrieval\n      refreshVehicles();\n\n      // set up timer to refresh stations periodically\n      this.refreshTimer = setInterval(() => {\n        refreshVehicles();\n      }, 30000); // defaults to every 30 sec. TODO: make this configurable?\n    }\n  }\n\n  stopRefreshing() {\n    if (this.refreshTimer) clearInterval(this.refreshTimer);\n  }\n\n  /**\n   * When the layer is added (or toggled on, or its visibility becomes true),\n   * start refreshing vehicle positions.\n   */\n  onOverlayAdded = () => {\n    this.startRefreshing();\n  };\n\n  /**\n   * When the layer is removed (or toggled off, or its visibility becomes false),\n   * stop refreshing vehicle positions.\n   */\n  onOverlayRemoved = () => {\n    this.stopRefreshing();\n  };\n\n  /**\n   * Listen to changes on the BaseMap's center or zoom.\n   * @param viewport The viewport data. See https://github.com/PaulLeCam/react-leaflet/blob/master/example/components/viewport.js for details.\n   */\n  onViewportChanged = viewport => {\n    const { zoom: newZoom } = viewport;\n    if (this.state.zoom !== newZoom) {\n      this.setState({ zoom: newZoom });\n    }\n  };\n\n  /**\n   * Upon mounting, see whether the vehicles should be fetched,\n   * and also call the register overlay prop that the\n   * @opentripplanner/base-map package has injected to listen to zoom/position changes.\n   */\n  componentDidMount() {\n    const { leaflet, registerOverlay, visible } = this.props;\n    this.setState({\n      zoom: leaflet.map.getZoom()\n    });\n    if (visible) this.startRefreshing();\n    if (typeof registerOverlay === \"function\") {\n      registerOverlay(this);\n    }\n  }\n\n  componentWillUnmount() {\n    this.stopRefreshing();\n  }\n\n  /**\n   * Render some popup html for a station. This contains custom logic for\n   * displaying rental vehicles in the TriMet MOD website that might not be\n   * applicable to other regions.\n   */\n  renderPopupForStation = (station, stationIsHub = false) => {\n    const { configCompanies, getStationName, setLocation } = this.props;\n    const stationName = getStationName(configCompanies, station);\n    const location = {\n      lat: station.y,\n      lon: station.x,\n      name: stationName\n    };\n    return (\n      <Popup>\n        <BaseMapStyled.MapOverlayPopup>\n          <BaseMapStyled.PopupTitle>{stationName}</BaseMapStyled.PopupTitle>\n\n          {/* render dock info if it is available */}\n          {stationIsHub && (\n            <BaseMapStyled.PopupRow>\n              <div>\n                <FormattedMessage\n                  defaultMessage={\n                    defaultMessages[\"otpUi.VehicleRentalOverlay.availableBikes\"]\n                  }\n                  description=\"Label text for the number of bikes available\"\n                  id=\"otpUi.VehicleRentalOverlay.availableBikes\"\n                  values={{ value: station.bikesAvailable }}\n                />\n              </div>\n              <div>\n                <FormattedMessage\n                  defaultMessage={\n                    defaultMessages[\"otpUi.VehicleRentalOverlay.availableDocks\"]\n                  }\n                  description=\"Label text for the number of docks available\"\n                  id=\"otpUi.VehicleRentalOverlay.availableDocks\"\n                  values={{ value: station.spacesAvailable }}\n                />\n              </div>\n            </BaseMapStyled.PopupRow>\n          )}\n\n          {/* Set as from/to toolbar */}\n          <BaseMapStyled.PopupRow>\n            <FromToLocationPicker\n              label\n              location={location}\n              setLocation={setLocation}\n            />\n          </BaseMapStyled.PopupRow>\n        </BaseMapStyled.MapOverlayPopup>\n      </Popup>\n    );\n  };\n\n  render() {\n    const { companies, leaflet, mapSymbols, stations } = this.props;\n    const { zoom = leaflet.map.getZoom() } = this.state;\n    // Render an empty FeatureGroup if the rental vehicles should not be visible\n    // on the map. Otherwise previous stations may still be shown due to some\n    // react-leaflet internals, maybe? Also, do not return null because that will\n    // prevent the overlay from appearing in the layer controls.\n\n    let filteredStations = stations;\n    if (companies) {\n      filteredStations = stations.filter(\n        station =>\n          station.networks.filter(value => companies.includes(value)).length > 0\n      );\n    }\n\n    if (!filteredStations || filteredStations.length === 0) {\n      return <FeatureGroup />;\n    }\n\n    // Convert map symbols for this overlay to zoomBasedSymbolType.\n    const symbols = this.convertToZoomMarkerSymbols(mapSymbols);\n\n    return (\n      <FeatureGroup>\n        <ZoomBasedMarkers\n          entities={filteredStations}\n          symbols={symbols}\n          symbolTransform={this.renderSymbolWithPopup}\n          zoom={zoom}\n        />\n      </FeatureGroup>\n    );\n  }\n}\n\nVehicleRentalOverlay.props = {\n  /**\n   * The entire companies config array.\n   */\n  configCompanies: PropTypes.arrayOf(coreUtils.types.companyType.isRequired)\n    .isRequired,\n  /**\n   * A list of companies that are applicable to just this instance of the\n   * overlay.\n   */\n  companies: PropTypes.arrayOf(PropTypes.string.isRequired),\n  /**\n   * An optional custom function to create a string name of a particular vehicle\n   * rental station. This function takes two arguments of the configCompanies\n   * prop and a vehicle rental station. The function must return a string.\n   */\n  getStationName: PropTypes.func,\n  /**\n   * A configuration of what map markers or symbols to show at various\n   * zoom levels.\n   */\n  mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,\n  /**\n   * If specified, a function that will be triggered every 30 seconds whenever this layer is\n   * visible.\n   */\n  refreshVehicles: PropTypes.func,\n  /**\n   * A callback for when a user clicks on setting this stop as either the from\n   * or to location of a new search.\n   *\n   * This will be dispatched with the following argument:\n   *\n   * ```js\n   *  {\n   *    location: {\n   *      lat: number,\n   *      lon: number,\n   *      name: string\n   *    },\n   *    locationType: \"from\" or \"to\"\n   *  }\n   * ```\n   */\n  setLocation: PropTypes.func.isRequired,\n  /**\n   * A list of the vehicle rental stations specific to this overlay instance.\n   */\n  stations: PropTypes.arrayOf(coreUtils.types.stationType),\n  /**\n   * Whether the overlay is currently visible.\n   */\n  visible: PropTypes.bool\n};\n\nVehicleRentalOverlay.defaultProps = {\n  getStationName: (configCompanies, station) => {\n    const stationNetworks = coreUtils.itinerary.getCompaniesLabelFromNetworks(\n      station.networks,\n      configCompanies\n    );\n    let stationName = station.name || station.id;\n    if (station.isFloatingBike) {\n      stationName = `Free-floating bike: ${stationName}`;\n    } else if (station.isFloatingCar) {\n      stationName = `${stationNetworks} ${stationName}`;\n    } else if (station.isFloatingVehicle) {\n      // assumes that all floating vehicles are E-scooters\n      stationName = `${stationNetworks} E-scooter`;\n    }\n    return stationName;\n  },\n  mapSymbols: [\n    {\n      zoom: 0,\n      symbol: GenericMarker\n    }\n  ],\n  refreshVehicles: null,\n  stations: [],\n  visible: false\n};\n\nexport default withLeaflet(VehicleRentalOverlay);\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["defaultMessages","defaultEnglishMessages","makeDefaultGetStationName","intl","defaultGetStationName","configCompanies","station","stationNetworks","coreUtils","itinerary","getCompaniesLabelFromNetworks","networks","stationName","name","id","match","length","isFloatingBike","formatMessage","defaultMessage","description","isFloatingCar","company","isFloatingVehicle","VehicleRentalOverlay","MapLayer","constructor","props","renderSymbolWithPopup","Symbol","SymbolWrapper","entity","zoom","renderPopupForStation","bikesAvailable","undefined","propTypes","PropTypes","number","isRequired","convertToZoomMarkerSymbols","mapSymbols","map","mapSymbol","symbol","type","HubAndFloatingBike","minZoom","onOverlayAdded","startRefreshing","onOverlayRemoved","stopRefreshing","onViewportChanged","viewport","newZoom","state","setState","stationIsHub","getStationName","setLocation","getStationNameFunc","location","lat","y","lon","x","value","spacesAvailable","createLeafletElement","updateLeafletElement","refreshVehicles","refreshTimer","setInterval","clearInterval","componentDidMount","leaflet","registerOverlay","visible","getZoom","componentWillUnmount","render","companies","stations","filteredStations","filter","includes","symbols","arrayOf","string","func","bool","defaultProps","GenericMarker"],"mappings":"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","sourcesContent":["import flatten from \"flat\";\nimport { Styled as BaseMapStyled } from \"@opentripplanner/base-map\";\nimport coreUtils from \"@opentripplanner/core-utils\";\nimport FromToLocationPicker from \"@opentripplanner/from-to-location-picker\";\nimport ZoomBasedMarkers from \"@opentripplanner/zoom-based-markers\";\nimport PropTypes from \"prop-types\";\nimport React from \"react\";\nimport { FormattedMessage, injectIntl } from \"react-intl\";\nimport { FeatureGroup, MapLayer, Popup, withLeaflet } from \"react-leaflet\";\n\nimport {\n  GenericMarker,\n  HubAndFloatingBike,\n  SharedBikeCircle\n} from \"./DefaultMarkers\";\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.\nconst defaultMessages = flatten(defaultEnglishMessages);\n\nfunction makeDefaultGetStationName(intl) {\n  return function defaultGetStationName(configCompanies, station) {\n    const stationNetworks = coreUtils.itinerary.getCompaniesLabelFromNetworks(\n      station.networks,\n      configCompanies\n    );\n    let stationName = station.name || station.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 and instead use the network name.\n    if ((stationName.match(/-/g) || []).length > 3) {\n      stationName = stationNetworks;\n    }\n\n    if (station.isFloatingBike) {\n      stationName = intl.formatMessage(\n        {\n          defaultMessage:\n            defaultEnglishMessages[\"otpUi.VehicleRentalOverlay.floatingBike\"],\n          description: \"Popup title for a free-floating bike\",\n          id: \"otpUi.VehicleRentalOverlay.floatingBike\"\n        },\n        { name: stationName }\n      );\n    } else if (station.isFloatingCar) {\n      stationName = intl.formatMessage(\n        {\n          defaultMessage:\n            defaultEnglishMessages[\"otpUi.VehicleRentalOverlay.floatingCar\"],\n          description: \"Popup title for a free-floating car\",\n          id: \"otpUi.VehicleRentalOverlay.floatingCar\"\n        },\n        {\n          company: stationNetworks,\n          name: stationName\n        }\n      );\n    } else if (station.isFloatingVehicle) {\n      // assumes that all floating vehicles are E-scooters\n      stationName = intl.formatMessage(\n        {\n          defaultMessage:\n            defaultEnglishMessages[\n              \"otpUi.VehicleRentalOverlay.floatingEScooter\"\n            ],\n          description: \"Popup title for a free-floating e-scooter\",\n          id: \"otpUi.VehicleRentalOverlay.floatingEScooter\"\n        },\n        { company: stationNetworks }\n      );\n    }\n    return stationName;\n  };\n}\n\n/**\n * This vehicle rental overlay can be used to render vehicle rentals of various\n * types. This layer can be configured to show different styles of markers at\n * different zoom levels.\n */\nclass VehicleRentalOverlay extends MapLayer {\n  constructor(props) {\n    super(props);\n    this.state = {\n      zoom: null\n    };\n  }\n\n  /**\n   * This helper method will be passed to the ZoomBasedMarkers symbolTransform prop.\n   * It creates a component that inserts a popup\n   * as a child of the specified symbol from the mapSymbols prop.\n   */\n  renderSymbolWithPopup = Symbol => {\n    const SymbolWrapper = ({ entity: station, zoom }) => (\n      <Symbol entity={station} zoom={zoom}>\n        {this.renderPopupForStation(\n          station,\n          station.bikesAvailable !== undefined && !station.isFloatingBike\n        )}\n      </Symbol>\n    );\n    SymbolWrapper.propTypes = {\n      // entity: coreUtils.types.stationType.isRequired,\n      zoom: PropTypes.number.isRequired\n    };\n\n    return SymbolWrapper;\n  };\n\n  /**\n   * Convert map symbols to zoomBasedSymbolType.\n   */\n  convertToZoomMarkerSymbols = mapSymbols =>\n    mapSymbols.map(mapSymbol => {\n      // If mapSymbol uses zoomBasedSymbolType, use it as is.\n      if (mapSymbol.symbol) {\n        return mapSymbol;\n      }\n\n      // Otherwise, convert into zoomBasedType (no support for symbols by type).\n      let symbol;\n      switch (mapSymbol.type) {\n        case \"circle\":\n          symbol = SharedBikeCircle(mapSymbol);\n          break;\n        case \"hubAndFloatingBike\":\n          symbol = HubAndFloatingBike;\n          break;\n        default:\n          symbol = GenericMarker(mapSymbol);\n      }\n\n      return {\n        minZoom: mapSymbol.minZoom,\n        symbol\n      };\n    });\n\n  createLeafletElement() {}\n\n  updateLeafletElement() {}\n\n  startRefreshing() {\n    const { refreshVehicles } = this.props;\n\n    // Create the timer only if refreshVehicles is a valid function.\n    if (typeof refreshVehicles === \"function\") {\n      // initial station retrieval\n      refreshVehicles();\n\n      // set up timer to refresh stations periodically\n      this.refreshTimer = setInterval(() => {\n        refreshVehicles();\n      }, 30000); // defaults to every 30 sec. TODO: make this configurable?\n    }\n  }\n\n  stopRefreshing() {\n    if (this.refreshTimer) clearInterval(this.refreshTimer);\n  }\n\n  /**\n   * When the layer is added (or toggled on, or its visibility becomes true),\n   * start refreshing vehicle positions.\n   */\n  onOverlayAdded = () => {\n    this.startRefreshing();\n  };\n\n  /**\n   * When the layer is removed (or toggled off, or its visibility becomes false),\n   * stop refreshing vehicle positions.\n   */\n  onOverlayRemoved = () => {\n    this.stopRefreshing();\n  };\n\n  /**\n   * Listen to changes on the BaseMap's center or zoom.\n   * @param viewport The viewport data. See https://github.com/PaulLeCam/react-leaflet/blob/master/example/components/viewport.js for details.\n   */\n  onViewportChanged = viewport => {\n    const { zoom: newZoom } = viewport;\n    if (this.state.zoom !== newZoom) {\n      this.setState({ zoom: newZoom });\n    }\n  };\n\n  /**\n   * Upon mounting, see whether the vehicles should be fetched,\n   * and also call the register overlay prop that the\n   * @opentripplanner/base-map package has injected to listen to zoom/position changes.\n   */\n  componentDidMount() {\n    const { leaflet, registerOverlay, visible } = this.props;\n    this.setState({\n      zoom: leaflet.map.getZoom()\n    });\n    if (visible) this.startRefreshing();\n    if (typeof registerOverlay === \"function\") {\n      registerOverlay(this);\n    }\n  }\n\n  componentWillUnmount() {\n    this.stopRefreshing();\n  }\n\n  /**\n   * Render some popup html for a station. This contains custom logic for\n   * displaying rental vehicles in the TriMet MOD website that might not be\n   * applicable to other regions.\n   */\n  renderPopupForStation = (station, stationIsHub = false) => {\n    const { configCompanies, getStationName, intl, setLocation } = this.props;\n    const getStationNameFunc =\n      getStationName || makeDefaultGetStationName(intl);\n    const stationName = getStationNameFunc(configCompanies, station);\n    const location = {\n      lat: station.y,\n      lon: station.x,\n      name: stationName\n    };\n    return (\n      <Popup>\n        <BaseMapStyled.MapOverlayPopup>\n          <BaseMapStyled.PopupTitle>{stationName}</BaseMapStyled.PopupTitle>\n\n          {/* render dock info if it is available */}\n          {stationIsHub && (\n            <BaseMapStyled.PopupRow>\n              <div>\n                <FormattedMessage\n                  defaultMessage={\n                    defaultMessages[\"otpUi.VehicleRentalOverlay.availableBikes\"]\n                  }\n                  description=\"Label text for the number of bikes available\"\n                  id=\"otpUi.VehicleRentalOverlay.availableBikes\"\n                  values={{ value: station.bikesAvailable }}\n                />\n              </div>\n              <div>\n                <FormattedMessage\n                  defaultMessage={\n                    defaultMessages[\"otpUi.VehicleRentalOverlay.availableDocks\"]\n                  }\n                  description=\"Label text for the number of docks available\"\n                  id=\"otpUi.VehicleRentalOverlay.availableDocks\"\n                  values={{ value: station.spacesAvailable }}\n                />\n              </div>\n            </BaseMapStyled.PopupRow>\n          )}\n\n          {/* Set as from/to toolbar */}\n          <BaseMapStyled.PopupRow>\n            <FromToLocationPicker\n              label\n              location={location}\n              setLocation={setLocation}\n            />\n          </BaseMapStyled.PopupRow>\n        </BaseMapStyled.MapOverlayPopup>\n      </Popup>\n    );\n  };\n\n  render() {\n    const { companies, leaflet, mapSymbols, stations } = this.props;\n    const { zoom = leaflet.map.getZoom() } = this.state;\n    // Render an empty FeatureGroup if the rental vehicles should not be visible\n    // on the map. Otherwise previous stations may still be shown due to some\n    // react-leaflet internals, maybe? Also, do not return null because that will\n    // prevent the overlay from appearing in the layer controls.\n\n    let filteredStations = stations;\n    if (companies) {\n      filteredStations = stations.filter(\n        station =>\n          station.networks.filter(value => companies.includes(value)).length > 0\n      );\n    }\n\n    if (!filteredStations || filteredStations.length === 0) {\n      return <FeatureGroup />;\n    }\n\n    // Convert map symbols for this overlay to zoomBasedSymbolType.\n    const symbols = this.convertToZoomMarkerSymbols(mapSymbols);\n\n    return (\n      <FeatureGroup>\n        <ZoomBasedMarkers\n          entities={filteredStations}\n          symbols={symbols}\n          symbolTransform={this.renderSymbolWithPopup}\n          zoom={zoom}\n        />\n      </FeatureGroup>\n    );\n  }\n}\n\nVehicleRentalOverlay.props = {\n  /**\n   * The entire companies config array.\n   */\n  // configCompanies: PropTypes.arrayOf(coreUtils.types.companyType.isRequired)\n  //   .isRequired,\n  /**\n   * A list of companies that are applicable to just this instance of the\n   * overlay.\n   */\n  companies: PropTypes.arrayOf(PropTypes.string.isRequired),\n  /**\n   * An optional custom function to create a string name of a particular vehicle\n   * rental station. This function takes two arguments of the configCompanies\n   * prop and a vehicle rental station. The function must return a string.\n   */\n  getStationName: PropTypes.func,\n  /**\n   * A configuration of what map markers or symbols to show at various\n   * zoom levels.\n   */\n  // mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,\n  /**\n   * If specified, a function that will be triggered every 30 seconds whenever this layer is\n   * visible.\n   */\n  refreshVehicles: PropTypes.func,\n  /**\n   * A callback for when a user clicks on setting this stop as either the from\n   * or to location of a new search.\n   *\n   * This will be dispatched with the following argument:\n   *\n   * ```js\n   *  {\n   *    location: {\n   *      lat: number,\n   *      lon: number,\n   *      name: string\n   *    },\n   *    locationType: \"from\" or \"to\"\n   *  }\n   * ```\n   */\n  setLocation: PropTypes.func.isRequired,\n  /**\n   * A list of the vehicle rental stations specific to this overlay instance.\n   */\n  // stations: PropTypes.arrayOf(coreUtils.types.stationType),\n  /**\n   * Whether the overlay is currently visible.\n   */\n  visible: PropTypes.bool\n};\n\nVehicleRentalOverlay.defaultProps = {\n  getStationName: null,\n  mapSymbols: [\n    {\n      zoom: 0,\n      symbol: GenericMarker\n    }\n  ],\n  refreshVehicles: null,\n  stations: [],\n  visible: false\n};\n\nexport default withLeaflet(injectIntl(VehicleRentalOverlay));\n"],"file":"index.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentripplanner/vehicle-rental-overlay",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "A map overlay to show vehicle rentals from a specific company",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@opentripplanner/core-utils": "^4.5.0",
-    "@opentripplanner/from-to-location-picker": "^2.1.0",
+    "@opentripplanner/from-to-location-picker": "^2.1.2",
     "@opentripplanner/zoom-based-markers": "^1.2.1",
     "@styled-icons/fa-solid": "^10.34.0",
     "flat": "^5.0.2",

package/src/DefaultMarkers/index.js

@@ -1,6 +1,5 @@
 import { divIcon } from "leaflet";
 import memoize from "lodash.memoize";
-import coreUtils from "@opentripplanner/core-utils";
 import PropTypes from "prop-types";
 import React from "react";
 import ReactDOMServer from "react-dom/server";
@@ -22,7 +21,9 @@ const templatePropTypes = {
   /** The children of the component. */
   children: PropTypes.node,
   /** The rental vehicle or station to render. */
-  entity: coreUtils.types.stationType.isRequired,
+  // entity: coreUtils.types.stationType.isRequired,
+  // eslint-disable-next-line react/forbid-prop-types
+  entity: PropTypes.object.isRequired,
   /** leaflet attribute to control tabindex value for keyboaryd-only / SR users */
   keyboard: PropTypes.bool
 };

package/src/VehicleRentalOverlay.story.js

@@ -1,5 +1,6 @@
+// Removed as core-utils is typescripted. TODO: Remove when typescripting!
+/* eslint-disable react/forbid-prop-types */
 import BaseMap from "@opentripplanner/base-map";
-import coreUtils from "@opentripplanner/core-utils";
 import PropTypes from "prop-types";
 import React from "react";
 import { CircleMarker } from "react-leaflet";
@@ -37,7 +38,8 @@ const MyCircle = ({ fillColor = "gray", pixels, strokeColor }) => {
   );
   GeneratedCircle.propTypes = {
     children: PropTypes.node,
-    entity: coreUtils.types.stationType.isRequired
+    // entity: coreUtils.types.stationType.isRequired
+    entity: PropTypes.object.isRequired
   };
   GeneratedCircle.defaultProps = {
     children: null
@@ -194,10 +196,12 @@ const ZoomControlledMapWithVehicleRentalOverlay = ({
 ZoomControlledMapWithVehicleRentalOverlay.propTypes = {
   companies: PropTypes.arrayOf(PropTypes.string.isRequired),
   getStationName: PropTypes.func,
-  mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,
+  // mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,
+  mapSymbols: PropTypes.object,
   refreshVehicles: PropTypes.func.isRequired,
-  stations: PropTypes.arrayOf(coreUtils.types.stationType.isRequired)
-    .isRequired,
+  // stations: PropTypes.arrayOf(coreUtils.types.stationType.isRequired)
+  //   .isRequired,
+  stations: PropTypes.arrayOf(PropTypes.object.isRequired).isRequired,
   visible: PropTypes.bool
 };
 

package/src/index.js

@@ -5,7 +5,7 @@ import FromToLocationPicker from "@opentripplanner/from-to-location-picker";
 import ZoomBasedMarkers from "@opentripplanner/zoom-based-markers";
 import PropTypes from "prop-types";
 import React from "react";
-import { FormattedMessage } from "react-intl";
+import { FormattedMessage, injectIntl } from "react-intl";
 import { FeatureGroup, MapLayer, Popup, withLeaflet } from "react-leaflet";
 
 import {
@@ -23,6 +23,60 @@ import defaultEnglishMessages from "../i18n/en-US.yml";
 // - the yaml loader for jest returns messages with flattened ids.
 const defaultMessages = flatten(defaultEnglishMessages);
 
+function makeDefaultGetStationName(intl) {
+  return function defaultGetStationName(configCompanies, station) {
+    const stationNetworks = coreUtils.itinerary.getCompaniesLabelFromNetworks(
+      station.networks,
+      configCompanies
+    );
+    let stationName = station.name || station.id;
+    // If the station name or id is a giant UUID (with more than 3 "-" characters)
+    // best not to show that at all and instead use the network name.
+    if ((stationName.match(/-/g) || []).length > 3) {
+      stationName = stationNetworks;
+    }
+
+    if (station.isFloatingBike) {
+      stationName = intl.formatMessage(
+        {
+          defaultMessage:
+            defaultEnglishMessages["otpUi.VehicleRentalOverlay.floatingBike"],
+          description: "Popup title for a free-floating bike",
+          id: "otpUi.VehicleRentalOverlay.floatingBike"
+        },
+        { name: stationName }
+      );
+    } else if (station.isFloatingCar) {
+      stationName = intl.formatMessage(
+        {
+          defaultMessage:
+            defaultEnglishMessages["otpUi.VehicleRentalOverlay.floatingCar"],
+          description: "Popup title for a free-floating car",
+          id: "otpUi.VehicleRentalOverlay.floatingCar"
+        },
+        {
+          company: stationNetworks,
+          name: stationName
+        }
+      );
+    } else if (station.isFloatingVehicle) {
+      // assumes that all floating vehicles are E-scooters
+      stationName = intl.formatMessage(
+        {
+          defaultMessage:
+            defaultEnglishMessages[
+              "otpUi.VehicleRentalOverlay.floatingEScooter"
+            ],
+          description: "Popup title for a free-floating e-scooter",
+          id: "otpUi.VehicleRentalOverlay.floatingEScooter"
+        },
+        { company: stationNetworks }
+      );
+    }
+    return stationName;
+  };
+}
+
 /**
  * This vehicle rental overlay can be used to render vehicle rentals of various
  * types. This layer can be configured to show different styles of markers at
@@ -51,7 +105,7 @@ class VehicleRentalOverlay extends MapLayer {
       </Symbol>
     );
     SymbolWrapper.propTypes = {
-      entity: coreUtils.types.stationType.isRequired,
+      // entity: coreUtils.types.stationType.isRequired,
       zoom: PropTypes.number.isRequired
     };
 
@@ -163,8 +217,10 @@ class VehicleRentalOverlay extends MapLayer {
    * applicable to other regions.
    */
   renderPopupForStation = (station, stationIsHub = false) => {
-    const { configCompanies, getStationName, setLocation } = this.props;
-    const stationName = getStationName(configCompanies, station);
+    const { configCompanies, getStationName, intl, setLocation } = this.props;
+    const getStationNameFunc =
+      getStationName || makeDefaultGetStationName(intl);
+    const stationName = getStationNameFunc(configCompanies, station);
     const location = {
       lat: station.y,
       lon: station.x,
@@ -254,8 +310,8 @@ VehicleRentalOverlay.props = {
   /**
    * The entire companies config array.
    */
-  configCompanies: PropTypes.arrayOf(coreUtils.types.companyType.isRequired)
-    .isRequired,
+  // configCompanies: PropTypes.arrayOf(coreUtils.types.companyType.isRequired)
+  //   .isRequired,
   /**
    * A list of companies that are applicable to just this instance of the
    * overlay.
@@ -271,7 +327,7 @@ VehicleRentalOverlay.props = {
    * A configuration of what map markers or symbols to show at various
    * zoom levels.
    */
-  mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,
+  // mapSymbols: coreUtils.types.vehicleRentalMapOverlaySymbolsType,
   /**
    * If specified, a function that will be triggered every 30 seconds whenever this layer is
    * visible.
@@ -298,7 +354,7 @@ VehicleRentalOverlay.props = {
   /**
    * A list of the vehicle rental stations specific to this overlay instance.
    */
-  stations: PropTypes.arrayOf(coreUtils.types.stationType),
+  // stations: PropTypes.arrayOf(coreUtils.types.stationType),
   /**
    * Whether the overlay is currently visible.
    */
@@ -306,22 +362,7 @@ VehicleRentalOverlay.props = {
 };
 
 VehicleRentalOverlay.defaultProps = {
-  getStationName: (configCompanies, station) => {
-    const stationNetworks = coreUtils.itinerary.getCompaniesLabelFromNetworks(
-      station.networks,
-      configCompanies
-    );
-    let stationName = station.name || station.id;
-    if (station.isFloatingBike) {
-      stationName = `Free-floating bike: ${stationName}`;
-    } else if (station.isFloatingCar) {
-      stationName = `${stationNetworks} ${stationName}`;
-    } else if (station.isFloatingVehicle) {
-      // assumes that all floating vehicles are E-scooters
-      stationName = `${stationNetworks} E-scooter`;
-    }
-    return stationName;
-  },
+  getStationName: null,
   mapSymbols: [
     {
       zoom: 0,
@@ -333,4 +374,4 @@ VehicleRentalOverlay.defaultProps = {
   visible: false
 };
 
-export default withLeaflet(VehicleRentalOverlay);
+export default withLeaflet(injectIntl(VehicleRentalOverlay));