@opentripplanner/vehicle-rental-overlay 5.0.0 → 6.0.0

package/README.md

@@ -1,6 +1,5 @@
-## Usage
+# Vehicle Rental Overlay
 
-```
+## Upgrade to OTP2 types
 
-TBD
-```
+Version 5.0.1 is the final version to support OTP1 types for the `stations` prop of `VehicleRentalOverlay`. Starting with version 6.0.0, the `stations` prop will be replaced with `entities`, with a type of `VehicleRentalStation[]`. This updated type can be found in the `@opentripplanner/types/otp2` package.

package/esm/index.js

@@ -10,11 +10,16 @@ import { BaseBikeRentalIcon, StationMarker } from "./styled";
 
 // TODO: Make configurable?
 var DETAILED_MARKER_CUTOFF = 16;
-var getColorForStation = function getColorForStation(v) {
-  if (v.isFloatingCar) return "#009cde";
-  if (v.isFloatingVehicle) return "#f5a729";
-  // TODO: nicer color to match transitive
-  if (v.bikesAvailable !== undefined || v.isFloatingBike) return "#f00";
+function entityIsStation(entity) {
+  return "availableVehicles" in entity;
+}
+var getColorForEntity = function getColorForEntity(entity) {
+  if (entityIsStation(entity)) {
+    if (entity.availableVehicles && entity.availableVehicles.total > 0) return "#f00";
+  } else {
+    if (entity.vehicleType.formFactor.startsWith("SCOOTER")) return "#f5a729";
+    if (entity.vehicleType.formFactor === "BICYCLE") return "#009cde";
+  }
   return "gray";
 };
 /**
@@ -25,11 +30,11 @@ var getColorForStation = function getColorForStation(v) {
 var VehicleRentalOverlay = function VehicleRentalOverlay(_ref) {
   var companies = _ref.companies,
     configCompanies = _ref.configCompanies,
+    entities = _ref.entities,
     getStationName = _ref.getStationName,
     id = _ref.id,
     refreshVehicles = _ref.refreshVehicles,
     _setLocation = _ref.setLocation,
-    stations = _ref.stations,
     visible = _ref.visible;
   var _useMap = useMap(),
     map = _useMap.current;
@@ -38,7 +43,7 @@ var VehicleRentalOverlay = function VehicleRentalOverlay(_ref) {
     zoom = _useState2[0],
     setZoom = _useState2[1];
   var layerId = "rental-vehicles-".concat(id);
-  var _useState3 = useState(null),
+  var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
     clickedVehicle = _useState4[0],
     setClickedVehicle = _useState4[1];
@@ -51,51 +56,66 @@ var VehicleRentalOverlay = function VehicleRentalOverlay(_ref) {
     setInterval(refreshVehicles, 30000);
   }, [refreshVehicles]);
   useEffect(function () {
-    var VEHICLE_LAYERS = [layerId];
-    VEHICLE_LAYERS.forEach(function (stopLayer) {
-      map === null || map === void 0 || map.on("mouseenter", stopLayer, function () {
-        map.getCanvas().style.cursor = "pointer";
-      });
-      map === null || map === void 0 || map.on("mouseleave", stopLayer, function () {
-        map.getCanvas().style.cursor = "";
-      });
-      map === null || map === void 0 || map.on("click", stopLayer, function (event) {
-        var _event$features;
-        setClickedVehicle((_event$features = event.features) === null || _event$features === void 0 ? void 0 : _event$features[0].properties);
-      });
-    });
-    map.on("zoom", function (e) {
+    var mouseEnterFunc = function mouseEnterFunc() {
+      map.getCanvas().style.cursor = "pointer";
+    };
+    var mouseLeaveFunc = function mouseLeaveFunc() {
+      map.getCanvas().style.cursor = "";
+    };
+    var clickFunc = function clickFunc(event) {
+      var _event$features;
+      var p = (_event$features = event.features) === null || _event$features === void 0 ? void 0 : _event$features[0].properties;
+      setClickedVehicle(_objectSpread(_objectSpread({}, p), {}, {
+        // the properties field of the GeoJSON Feature object serializes these
+        // two objects into JSON strings, so we need to parse them back into objects
+        availableSpaces: JSON.parse(p === null || p === void 0 ? void 0 : p.availableSpaces),
+        availableVehicles: JSON.parse(p === null || p === void 0 ? void 0 : p.availableVehicles)
+      }));
+    };
+    var zoomFunc = function zoomFunc(e) {
       // Avoid too many re-renders by only updating state if we are a whole number value different
       var newZoom = e.viewState.zoom;
       if (Math.floor(zoom / 2) !== Math.floor(newZoom / 2)) {
         setZoom(newZoom);
       }
-    });
+    };
+    map === null || map === void 0 || map.on("mouseenter", layerId, mouseEnterFunc);
+    map === null || map === void 0 || map.on("mouseleave", layerId, mouseLeaveFunc);
+    map === null || map === void 0 || map.on("click", layerId, clickFunc);
+    map === null || map === void 0 || map.on("zoom", zoomFunc);
+    return function () {
+      map === null || map === void 0 || map.off("mouseenter", layerId, mouseEnterFunc);
+      map === null || map === void 0 || map.off("mouseleave", layerId, mouseLeaveFunc);
+      map === null || map === void 0 || map.off("click", layerId, clickFunc);
+      map === null || map === void 0 || map.off("zoom", zoomFunc);
+    };
   }, [map]);
 
   // Don't render if no map or no stops are defined.
-  if (visible === false || !stations || stations.length === 0) {
+  if (visible === false || !entities || entities.length === 0) {
     // Null can't be returned here -- react-map-gl dislikes null values as children
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   var vehiclesGeoJSON = {
     type: "FeatureCollection",
-    features: stations.filter(function (vehicle) {
+    features: entities.filter(function (entity) {
+      return !!entity;
+    }).filter(function (entity) {
       return (
         // Include specified companies only if companies is specified and network info is available
-        !companies || !vehicle.networks || companies.includes(vehicle.networks[0])
+        !companies || !entity.rentalNetwork.networkId || companies.includes(entity.rentalNetwork.networkId)
       );
-    }).map(function (vehicle) {
+    }).map(function (entity) {
       return {
         type: "Feature",
         geometry: {
           type: "Point",
-          coordinates: [vehicle.x, vehicle.y]
+          coordinates: [entity.lon, entity.lat]
         },
-        properties: _objectSpread(_objectSpread({}, vehicle), {}, {
-          networks: JSON.stringify(vehicle.networks),
-          "stroke-width": vehicle.isFloatingBike || vehicle.isFloatingVehicle ? 1 : 2,
-          color: getColorForStation(vehicle)
+        properties: _objectSpread(_objectSpread({}, entity), {}, {
+          networks: entity.rentalNetwork.networkId,
+          "stroke-width": entityIsStation(entity) ? 1 : 2,
+          color: getColorForEntity(entity)
         })
       };
     })
@@ -112,13 +132,15 @@ var VehicleRentalOverlay = function VehicleRentalOverlay(_ref) {
       "circle-stroke-width": ["get", "stroke-width"]
     },
     type: "circle"
-  })), zoom >= DETAILED_MARKER_CUTOFF && stations.map(function (station) {
+  })), zoom >= DETAILED_MARKER_CUTOFF && entities.filter(function (entity) {
+    return !!entity;
+  }).map(function (entity) {
     return /*#__PURE__*/React.createElement(MarkerWithPopup, {
-      key: station.id,
+      key: entity.id,
       popupContents: /*#__PURE__*/React.createElement(StationPopup, {
         configCompanies: configCompanies,
         setLocation: function setLocation(location) {
-          setClickedVehicle(null);
+          setClickedVehicle(undefined);
           _setLocation(location);
         },
         getEntityName:
@@ -126,21 +148,21 @@ var VehicleRentalOverlay = function VehicleRentalOverlay(_ref) {
         getStationName && function (s, cc) {
           return getStationName(cc, s);
         },
-        entity: station
+        entity: entity
       }),
-      position: [station.y, station.x]
-    }, station.bikesAvailable !== undefined && !station.isFloatingBike && !station.isFloatingVehicle && station.spacesAvailable !== undefined ? /*#__PURE__*/React.createElement(BaseBikeRentalIcon, {
-      percent: (station === null || station === void 0 ? void 0 : station.bikesAvailable) / ((station === null || station === void 0 ? void 0 : station.bikesAvailable) + (station === null || station === void 0 ? void 0 : station.spacesAvailable))
+      position: [entity.lat, entity.lon]
+    }, entityIsStation(entity) && entity.availableSpaces !== undefined && entity.availableVehicles !== undefined && entity.availableVehicles.total > 0 ? /*#__PURE__*/React.createElement(BaseBikeRentalIcon, {
+      percent: (entity === null || entity === void 0 ? void 0 : entity.availableVehicles.total) / ((entity === null || entity === void 0 ? void 0 : entity.availableVehicles.total) + (entity === null || entity === void 0 ? void 0 : entity.availableSpaces.total))
     }) : /*#__PURE__*/React.createElement(StationMarker, {
       width: 12,
-      color: getColorForStation(station)
+      color: getColorForEntity(entity)
     }));
   }), clickedVehicle && /*#__PURE__*/React.createElement(Popup, {
-    latitude: clickedVehicle.y,
-    longitude: clickedVehicle.x,
+    latitude: clickedVehicle.lat,
+    longitude: clickedVehicle.lon,
     maxWidth: "100%",
     onClose: function onClose() {
-      setClickedVehicle(null);
+      setClickedVehicle(undefined);
     }
   }, /*#__PURE__*/React.createElement(StationPopup, {
     configCompanies: configCompanies,
@@ -150,12 +172,10 @@ var VehicleRentalOverlay = function VehicleRentalOverlay(_ref) {
       return getStationName(cc, s);
     },
     setLocation: function setLocation(location) {
-      setClickedVehicle(null);
+      setClickedVehicle(undefined);
       _setLocation(location);
     },
-    entity: _objectSpread(_objectSpread({}, clickedVehicle), {}, {
-      networks: JSON.parse(clickedVehicle.networks)
-    })
+    entity: clickedVehicle
   })));
 };
 export default VehicleRentalOverlay;

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["MarkerWithPopup","Popup","React","useEffect","useState","Layer","Source","useMap","StationPopup","BaseBikeRentalIcon","StationMarker","DETAILED_MARKER_CUTOFF","getColorForStation","v","isFloatingCar","isFloatingVehicle","bikesAvailable","undefined","isFloatingBike","VehicleRentalOverlay","_ref","companies","configCompanies","getStationName","id","refreshVehicles","setLocation","stations","visible","_useMap","map","current","_useState","getZoom","_useState2","_slicedToArray","zoom","setZoom","layerId","concat","_useState3","_useState4","clickedVehicle","setClickedVehicle","setInterval","VEHICLE_LAYERS","forEach","stopLayer","on","getCanvas","style","cursor","event","_event$features","features","properties","e","newZoom","viewState","Math","floor","length","createElement","Fragment","vehiclesGeoJSON","type","filter","vehicle","networks","includes","geometry","coordinates","x","y","_objectSpread","JSON","stringify","color","data","paint","station","key","popupContents","location","getEntityName","s","cc","entity","position","spacesAvailable","percent","width","latitude","longitude","maxWidth","onClose","parse"],"sources":["../src/index.tsx"],"sourcesContent":["import { MarkerWithPopup, Popup } from \"@opentripplanner/base-map\";\nimport {\n  Company,\n  ConfiguredCompany,\n  MapLocationActionArg,\n  Station\n} from \"@opentripplanner/types\";\nimport React, { useEffect, useState } from \"react\";\nimport {\n  Layer,\n  Source,\n  useMap,\n  ViewStateChangeEvent\n} from \"react-map-gl/maplibre\";\n\nimport StationPopup from \"@opentripplanner/map-popup\";\nimport { BaseBikeRentalIcon, StationMarker } from \"./styled\";\n\n// TODO: Make configurable?\nconst DETAILED_MARKER_CUTOFF = 16;\n\nconst getColorForStation = (v: Station) => {\n  if (v.isFloatingCar) return \"#009cde\";\n  if (v.isFloatingVehicle) return \"#f5a729\";\n  // TODO: nicer color to match transitive\n  if (v.bikesAvailable !== undefined || v.isFloatingBike) return \"#f00\";\n  return \"gray\";\n};\n\ntype Props = {\n  /**\n   * A list of companies that are applicable to just this instance of the\n   * overlay.\n   */\n  companies?: string[];\n  /**\n   * The entire companies config array.\n   */\n  configCompanies: ConfiguredCompany[];\n  /**\n   * An id, used to make this layer uniquely identifiable\n   */\n  id: string;\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?: (configCompanies: Company[], station: Station) => string;\n  /**\n   * If specified, a function that will be triggered every 30 seconds whenever this layer is\n   * visible.\n   */\n  refreshVehicles?: () => void;\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?: (arg: MapLocationActionArg) => void;\n  /**\n   * A list of the vehicle rental stations specific to this overlay instance.\n   */\n  stations: Station[];\n  /**\n   * Whether the overlay is currently visible.\n   */\n  visible?: boolean;\n  /**\n   * TODO: Add props for overriding symbols?\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 */\nconst VehicleRentalOverlay = ({\n  companies,\n  configCompanies,\n  getStationName,\n  id,\n  refreshVehicles,\n  setLocation,\n  stations,\n  visible\n}: Props): JSX.Element => {\n  const { current: map } = useMap();\n  const [zoom, setZoom] = useState(map?.getZoom());\n\n  const layerId = `rental-vehicles-${id}`;\n  const [clickedVehicle, setClickedVehicle] = useState(null);\n\n  useEffect(() => {\n    // TODO: Make 30s configurable?\n    if (!refreshVehicles || typeof refreshVehicles !== \"function\") {\n      return;\n    }\n\n    refreshVehicles();\n    setInterval(refreshVehicles, 30_000);\n  }, [refreshVehicles]);\n\n  useEffect(() => {\n    const VEHICLE_LAYERS = [layerId];\n    VEHICLE_LAYERS.forEach(stopLayer => {\n      map?.on(\"mouseenter\", stopLayer, () => {\n        map.getCanvas().style.cursor = \"pointer\";\n      });\n      map?.on(\"mouseleave\", stopLayer, () => {\n        map.getCanvas().style.cursor = \"\";\n      });\n      map?.on(\"click\", stopLayer, event => {\n        setClickedVehicle(event.features?.[0].properties);\n      });\n    });\n    map.on(\"zoom\", (e: ViewStateChangeEvent) => {\n      // Avoid too many re-renders by only updating state if we are a whole number value different\n      const { zoom: newZoom } = e.viewState;\n      if (Math.floor(zoom / 2) !== Math.floor(newZoom / 2)) {\n        setZoom(newZoom);\n      }\n    });\n  }, [map]);\n\n  // Don't render if no map or no stops are defined.\n  if (visible === false || !stations || stations.length === 0) {\n    // Null can't be returned here -- react-map-gl dislikes null values as children\n    return <></>;\n  }\n\n  const vehiclesGeoJSON: GeoJSON.FeatureCollection = {\n    type: \"FeatureCollection\",\n    features: stations\n      .filter(\n        vehicle =>\n          // Include specified companies only if companies is specified and network info is available\n          !companies ||\n          !vehicle.networks ||\n          companies.includes(vehicle.networks[0])\n      )\n      .map(vehicle => ({\n        type: \"Feature\",\n        geometry: { type: \"Point\", coordinates: [vehicle.x, vehicle.y] },\n        properties: {\n          ...vehicle,\n          networks: JSON.stringify(vehicle.networks),\n          \"stroke-width\":\n            vehicle.isFloatingBike || vehicle.isFloatingVehicle ? 1 : 2,\n          color: getColorForStation(vehicle)\n        }\n      }))\n  };\n\n  return (\n    <>\n      {zoom < DETAILED_MARKER_CUTOFF && (\n        <Source type=\"geojson\" data={vehiclesGeoJSON}>\n          <Layer\n            id={layerId}\n            paint={{\n              \"circle-color\": [\"get\", \"color\"],\n              \"circle-opacity\": 0.9,\n              \"circle-stroke-color\": \"#333\",\n              \"circle-stroke-width\": [\"get\", \"stroke-width\"]\n            }}\n            type=\"circle\"\n          />\n          {/* this is where we add the symbols layer. add a second layer that gets swapped in and out dynamically */}\n        </Source>\n      )}\n      {zoom >= DETAILED_MARKER_CUTOFF &&\n        stations.map(station => (\n          <MarkerWithPopup\n            key={station.id}\n            popupContents={\n              <StationPopup\n                configCompanies={configCompanies}\n                setLocation={location => {\n                  setClickedVehicle(null);\n                  setLocation(location);\n                }}\n                getEntityName={\n                  // @ts-expect-error no stop support. Avoid a breaking change\n                  getStationName && ((s, cc) => getStationName(cc, s))\n                }\n                entity={station}\n              />\n            }\n            position={[station.y, station.x]}\n          >\n            {station.bikesAvailable !== undefined &&\n            !station.isFloatingBike &&\n            !station.isFloatingVehicle &&\n            station.spacesAvailable !== undefined ? (\n              <BaseBikeRentalIcon\n                percent={\n                  station?.bikesAvailable /\n                  (station?.bikesAvailable + station?.spacesAvailable)\n                }\n              />\n            ) : (\n              <StationMarker width={12} color={getColorForStation(station)} />\n            )}\n          </MarkerWithPopup>\n        ))}\n      {clickedVehicle && (\n        <Popup\n          latitude={clickedVehicle.y}\n          longitude={clickedVehicle.x}\n          maxWidth=\"100%\"\n          onClose={() => {\n            setClickedVehicle(null);\n          }}\n        >\n          <StationPopup\n            configCompanies={configCompanies}\n            getEntityName={\n              // @ts-expect-error no stop support. Avoid a breaking change\n              getStationName && ((s, cc) => getStationName(cc, s))\n            }\n            setLocation={location => {\n              setClickedVehicle(null);\n              setLocation(location);\n            }}\n            entity={{\n              ...clickedVehicle,\n              networks: JSON.parse(clickedVehicle.networks)\n            }}\n          />\n        </Popup>\n      )}\n    </>\n  );\n};\nexport default VehicleRentalOverlay;\nexport { StationPopup };\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["MarkerWithPopup","Popup","React","useEffect","useState","Layer","Source","useMap","StationPopup","BaseBikeRentalIcon","StationMarker","DETAILED_MARKER_CUTOFF","entityIsStation","entity","getColorForEntity","availableVehicles","total","vehicleType","formFactor","startsWith","VehicleRentalOverlay","_ref","companies","configCompanies","entities","getStationName","id","refreshVehicles","setLocation","visible","_useMap","map","current","_useState","getZoom","_useState2","_slicedToArray","zoom","setZoom","layerId","concat","_useState3","_useState4","clickedVehicle","setClickedVehicle","setInterval","mouseEnterFunc","getCanvas","style","cursor","mouseLeaveFunc","clickFunc","event","_event$features","p","features","properties","_objectSpread","availableSpaces","JSON","parse","zoomFunc","e","newZoom","viewState","Math","floor","on","off","length","createElement","Fragment","vehiclesGeoJSON","type","filter","rentalNetwork","networkId","includes","geometry","coordinates","lon","lat","networks","color","data","paint","key","popupContents","location","undefined","getEntityName","s","cc","position","percent","width","latitude","longitude","maxWidth","onClose"],"sources":["../src/index.tsx"],"sourcesContent":["import { MarkerWithPopup, Popup } from \"@opentripplanner/base-map\";\nimport {\n  Company,\n  ConfiguredCompany,\n  MapLocationActionArg\n} from \"@opentripplanner/types\";\nimport {\n  RentalVehicle,\n  VehicleRentalStation\n} from \"@opentripplanner/types/otp2\";\nimport { Geometry } from \"geojson\";\nimport React, { useEffect, useState } from \"react\";\nimport { Layer, Source, useMap } from \"react-map-gl/maplibre\";\n\nimport StationPopup from \"@opentripplanner/map-popup\";\nimport { BaseBikeRentalIcon, StationMarker } from \"./styled\";\n\n// TODO: Make configurable?\nconst DETAILED_MARKER_CUTOFF = 16;\n\nfunction entityIsStation(\n  entity: VehicleRentalStation | RentalVehicle\n): entity is VehicleRentalStation {\n  return \"availableVehicles\" in entity;\n}\n\nconst getColorForEntity = (entity: VehicleRentalStation | RentalVehicle) => {\n  if (entityIsStation(entity)) {\n    if (entity.availableVehicles && entity.availableVehicles.total > 0)\n      return \"#f00\";\n  } else {\n    if (entity.vehicleType.formFactor.startsWith(\"SCOOTER\")) return \"#f5a729\";\n    if (entity.vehicleType.formFactor === \"BICYCLE\") return \"#009cde\";\n  }\n  return \"gray\";\n};\n\ntype Props = {\n  /**\n   * A list of companies that are applicable to just this instance of the\n   * overlay.\n   */\n  companies?: string[];\n  /**\n   * The entire companies config array.\n   */\n  configCompanies: ConfiguredCompany[];\n  /**\n   * The entities to be represented in the overlay. They can be a combination of VehicleRentalStation type\n   * (for stationary stations) and RentalVehicle type (for floating vehicles)\n   */\n  entities?: (VehicleRentalStation | RentalVehicle)[];\n  /**\n   * An id, used to make this layer uniquely identifiable\n   */\n  id: string;\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?: (\n    configCompanies: Company[],\n    station: VehicleRentalStation\n  ) => string;\n  /**\n   * If specified, a function that will be triggered every 30 seconds whenever this layer is\n   * visible.\n   */\n  refreshVehicles?: () => void;\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?: (arg: MapLocationActionArg) => void;\n  /**\n   * Whether the overlay is currently visible.\n   */\n  visible?: boolean;\n  /**\n   * TODO: Add props for overriding symbols?\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 */\nconst VehicleRentalOverlay = ({\n  companies,\n  configCompanies,\n  entities,\n  getStationName,\n  id,\n  refreshVehicles,\n  setLocation,\n  visible\n}: Props): JSX.Element => {\n  const { current: map } = useMap();\n  const [zoom, setZoom] = useState(map?.getZoom());\n\n  const layerId = `rental-vehicles-${id}`;\n  const [clickedVehicle, setClickedVehicle] = useState<\n    RentalVehicle | VehicleRentalStation | undefined\n  >();\n\n  useEffect(() => {\n    // TODO: Make 30s configurable?\n    if (!refreshVehicles || typeof refreshVehicles !== \"function\") {\n      return;\n    }\n\n    refreshVehicles();\n    setInterval(refreshVehicles, 30_000);\n  }, [refreshVehicles]);\n\n  useEffect(() => {\n    const mouseEnterFunc = () => {\n      map.getCanvas().style.cursor = \"pointer\";\n    };\n    const mouseLeaveFunc = () => {\n      map.getCanvas().style.cursor = \"\";\n    };\n    const clickFunc = event => {\n      const p = event.features?.[0].properties;\n      setClickedVehicle({\n        ...p,\n        // the properties field of the GeoJSON Feature object serializes these\n        // two objects into JSON strings, so we need to parse them back into objects\n        availableSpaces: JSON.parse(p?.availableSpaces),\n        availableVehicles: JSON.parse(p?.availableVehicles)\n      } as RentalVehicle | VehicleRentalStation);\n    };\n    const zoomFunc = e => {\n      // Avoid too many re-renders by only updating state if we are a whole number value different\n      const { zoom: newZoom } = e.viewState;\n      if (Math.floor(zoom / 2) !== Math.floor(newZoom / 2)) {\n        setZoom(newZoom);\n      }\n    };\n\n    map?.on(\"mouseenter\", layerId, mouseEnterFunc);\n    map?.on(\"mouseleave\", layerId, mouseLeaveFunc);\n    map?.on(\"click\", layerId, clickFunc);\n    map?.on(\"zoom\", zoomFunc);\n\n    return () => {\n      map?.off(\"mouseenter\", layerId, mouseEnterFunc);\n      map?.off(\"mouseleave\", layerId, mouseLeaveFunc);\n      map?.off(\"click\", layerId, clickFunc);\n      map?.off(\"zoom\", zoomFunc);\n    };\n  }, [map]);\n\n  // Don't render if no map or no stops are defined.\n  if (visible === false || !entities || entities.length === 0) {\n    // Null can't be returned here -- react-map-gl dislikes null values as children\n    return <></>;\n  }\n\n  const vehiclesGeoJSON: GeoJSON.FeatureCollection<\n    Geometry,\n    VehicleRentalStation | RentalVehicle\n  > = {\n    type: \"FeatureCollection\",\n    features: entities\n      .filter(entity => !!entity)\n      .filter(\n        entity =>\n          // Include specified companies only if companies is specified and network info is available\n          !companies ||\n          !entity.rentalNetwork.networkId ||\n          companies.includes(entity.rentalNetwork.networkId)\n      )\n      .map(entity => ({\n        type: \"Feature\",\n        geometry: { type: \"Point\", coordinates: [entity.lon, entity.lat] },\n        properties: {\n          ...entity,\n          networks: entity.rentalNetwork.networkId,\n          \"stroke-width\": entityIsStation(entity) ? 1 : 2,\n          color: getColorForEntity(entity)\n        }\n      }))\n  };\n\n  return (\n    <>\n      {zoom < DETAILED_MARKER_CUTOFF && (\n        <Source type=\"geojson\" data={vehiclesGeoJSON}>\n          <Layer\n            id={layerId}\n            paint={{\n              \"circle-color\": [\"get\", \"color\"],\n              \"circle-opacity\": 0.9,\n              \"circle-stroke-color\": \"#333\",\n              \"circle-stroke-width\": [\"get\", \"stroke-width\"]\n            }}\n            type=\"circle\"\n          />\n          {/* this is where we add the symbols layer. add a second layer that gets swapped in and out dynamically */}\n        </Source>\n      )}\n      {zoom >= DETAILED_MARKER_CUTOFF &&\n        entities\n          .filter(entity => !!entity)\n          .map(entity => (\n            <MarkerWithPopup\n              key={entity.id}\n              popupContents={\n                <StationPopup\n                  configCompanies={configCompanies}\n                  setLocation={location => {\n                    setClickedVehicle(undefined);\n                    setLocation(location);\n                  }}\n                  getEntityName={\n                    // @ts-expect-error no stop support. Avoid a breaking change\n                    getStationName && ((s, cc) => getStationName(cc, s))\n                  }\n                  entity={entity}\n                />\n              }\n              position={[entity.lat, entity.lon]}\n            >\n              {entityIsStation(entity) &&\n              entity.availableSpaces !== undefined &&\n              entity.availableVehicles !== undefined &&\n              entity.availableVehicles.total > 0 ? (\n                <BaseBikeRentalIcon\n                  percent={\n                    entity?.availableVehicles.total /\n                    (entity?.availableVehicles.total +\n                      entity?.availableSpaces.total)\n                  }\n                />\n              ) : (\n                <StationMarker width={12} color={getColorForEntity(entity)} />\n              )}\n            </MarkerWithPopup>\n          ))}\n      {clickedVehicle && (\n        <Popup\n          latitude={clickedVehicle.lat}\n          longitude={clickedVehicle.lon}\n          maxWidth=\"100%\"\n          onClose={() => {\n            setClickedVehicle(undefined);\n          }}\n        >\n          <StationPopup\n            configCompanies={configCompanies}\n            getEntityName={\n              // @ts-expect-error no stop support. Avoid a breaking change\n              getStationName && ((s, cc) => getStationName(cc, s))\n            }\n            setLocation={location => {\n              setClickedVehicle(undefined);\n              setLocation(location);\n            }}\n            entity={clickedVehicle}\n          />\n        </Popup>\n      )}\n    </>\n  );\n};\nexport default VehicleRentalOverlay;\nexport { StationPopup };\n"],"mappings":"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","ignoreList":[]}

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
-import { Company, ConfiguredCompany, MapLocationActionArg, Station } from "@opentripplanner/types";
+import { Company, ConfiguredCompany, MapLocationActionArg } from "@opentripplanner/types";
+import { RentalVehicle, VehicleRentalStation } from "@opentripplanner/types/otp2";
 import StationPopup from "@opentripplanner/map-popup";
 type Props = {
     /**
@@ -11,6 +12,11 @@ type Props = {
      * The entire companies config array.
      */
     configCompanies: ConfiguredCompany[];
+    /**
+     * The entities to be represented in the overlay. They can be a combination of VehicleRentalStation type
+     * (for stationary stations) and RentalVehicle type (for floating vehicles)
+     */
+    entities?: (VehicleRentalStation | RentalVehicle)[];
     /**
      * An id, used to make this layer uniquely identifiable
      */
@@ -20,7 +26,7 @@ type Props = {
      * rental station. This function takes two arguments of the configCompanies
      * prop and a vehicle rental station. The function must return a string.
      */
-    getStationName?: (configCompanies: Company[], station: Station) => string;
+    getStationName?: (configCompanies: Company[], station: VehicleRentalStation) => string;
     /**
      * If specified, a function that will be triggered every 30 seconds whenever this layer is
      * visible.
@@ -44,10 +50,6 @@ type Props = {
      * ```
      */
     setLocation?: (arg: MapLocationActionArg) => void;
-    /**
-     * A list of the vehicle rental stations specific to this overlay instance.
-     */
-    stations: Station[];
     /**
      * Whether the overlay is currently visible.
      */
@@ -58,7 +60,7 @@ type Props = {
  * types. This layer can be configured to show different styles of markers at
  * different zoom levels.
  */
-declare const VehicleRentalOverlay: ({ companies, configCompanies, getStationName, id, refreshVehicles, setLocation, stations, visible }: Props) => JSX.Element;
+declare const VehicleRentalOverlay: ({ companies, configCompanies, entities, getStationName, id, refreshVehicles, setLocation, visible }: Props) => JSX.Element;
 export default VehicleRentalOverlay;
 export { StationPopup };
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";AACA,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,oBAAoB,EACpB,OAAO,EACR,MAAM,wBAAwB,CAAC;AAShC,OAAO,YAAY,MAAM,4BAA4B,CAAC;AActD,KAAK,KAAK,GAAG;IACX;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB;;OAEG;IACH,eAAe,EAAE,iBAAiB,EAAE,CAAC;IACrC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,eAAe,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC;IAC1E;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAC7B;;;;;;;;;;;;;;;;OAgBG;IACH,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAClD;;OAEG;IACH,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CAInB,CAAC;AAEF;;;;GAIG;AACH,QAAA,MAAM,oBAAoB,wGASvB,KAAK,KAAG,WAoJV,CAAC;AACF,eAAe,oBAAoB,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";AACA,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,aAAa,EACb,oBAAoB,EACrB,MAAM,6BAA6B,CAAC;AAKrC,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAuBtD,KAAK,KAAK,GAAG;IACX;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB;;OAEG;IACH,eAAe,EAAE,iBAAiB,EAAE,CAAC;IACrC;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,oBAAoB,GAAG,aAAa,CAAC,EAAE,CAAC;IACpD;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,cAAc,CAAC,EAAE,CACf,eAAe,EAAE,OAAO,EAAE,EAC1B,OAAO,EAAE,oBAAoB,KAC1B,MAAM,CAAC;IACZ;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAC7B;;;;;;;;;;;;;;;;OAgBG;IACH,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAClD;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CAInB,CAAC;AAEF;;;;GAIG;AACH,QAAA,MAAM,oBAAoB,wGASvB,KAAK,KAAG,WAyKV,CAAC;AACF,eAAe,oBAAoB,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,CAAC"}