opentripplanner · daniel-heppner-ibigroup · Nov 29, 2023 · Aug 11, 2023 · Aug 11, 2023 · Aug 11, 2023
diff --git a/packages/base-map/package.json b/packages/base-map/package.json
@@ -14,7 +14,7 @@
     "react-map-gl": "^7.0.15"
   },
   "peerDependencies": {
-    "@opentripplanner/types": "^6.1.0",
+    "@opentripplanner/types": "^6.2.0",
     "react": "^16.14.0",
     "styled-components": "^5.3.0"
   },

diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json
@@ -9,6 +9,7 @@
   "module": "esm/index.js",
   "private": false,
   "devDependencies": {
+    "@opentripplanner/types": "^6.2.0",
     "@opentripplanner/core-utils": "^11.1.3"
   },
   "peerDependencies": {

diff --git a/packages/core-utils/package.json b/packages/core-utils/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@conveyal/lonlat": "^1.4.1",
     "@mapbox/polyline": "^1.1.0",
-    "@opentripplanner/geocoder": "^1.4.2",
+    "@opentripplanner/geocoder": "^2.0.0",
     "@styled-icons/foundation": "^10.34.0",
     "@turf/along": "^6.0.1",
     "chroma-js": "^2.4.2",

diff --git a/packages/endpoints-overlay/package.json b/packages/endpoints-overlay/package.json
@@ -19,17 +19,17 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.0.14",
+    "@opentripplanner/base-map": "^3.0.15",
     "@opentripplanner/location-icon": "^1.4.1",
-    "@opentripplanner/core-utils": "^11.0.2",
+    "@opentripplanner/core-utils": "^11.1.3",
     "flat": "^5.0.2",
     "@styled-icons/fa-solid": "^10.34.0"
   },
   "devDependencies": {
+    "@opentripplanner/types": "^6.2.0",
     "@types/flat": "^5.0.2"
   },
   "peerDependencies": {
-    "@opentripplanner/types": "^6.1.0",
     "react": "^16.14.0",
     "react-dom": "^16.8.6",
     "react-intl": "^5.24.6",

diff --git a/packages/from-to-location-picker/package.json b/packages/from-to-location-picker/package.json
@@ -13,7 +13,7 @@
     "flat": "^5.0.2"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.1.0"
+    "@opentripplanner/types": "^6.2.0"
   },
   "peerDependencies": {
     "react": "^16.14.0",

diff --git a/packages/icons/package.json b/packages/icons/package.json
@@ -10,7 +10,7 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.0.2",
+    "@opentripplanner/core-utils": "^11.1.3",
     "prop-types": "^15.7.2"
   },
   "peerDependencies": {

diff --git a/packages/itinerary-body/package.json b/packages/itinerary-body/package.json
@@ -10,9 +10,9 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.0.2",
+    "@opentripplanner/core-utils": "^11.1.3",
     "@opentripplanner/humanize-distance": "^1.2.0",
-    "@opentripplanner/icons": "^2.0.5",
+    "@opentripplanner/icons": "^2.0.6",
     "@opentripplanner/location-icon": "^1.4.1",
     "@styled-icons/fa-solid": "^10.34.0",
     "@styled-icons/foundation": "^10.34.0",
@@ -24,7 +24,7 @@
     "string-similarity": "^4.0.4"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.1.0",
+    "@opentripplanner/types": "^6.2.0",
     "@types/flat": "^5.0.2"
   },
   "peerDependencies": {

diff --git a/packages/itinerary-body/src/otp-react-redux/transit-leg-subheader.tsx b/packages/itinerary-body/src/otp-react-redux/transit-leg-subheader.tsx
@@ -26,7 +26,7 @@ export default function TransitLegSubheader({
         }}
       />
       {!isFlex(leg) && (
-        <ViewStopButton onStopClick={onStopClick} stopId={from.stopId} />
+        <ViewStopButton onStopClick={onStopClick} stop={from.stop} />
       )}
     </S.PlaceSubheader>
   );

diff --git a/packages/itinerary-body/src/otp-react-redux/view-stop-button.tsx b/packages/itinerary-body/src/otp-react-redux/view-stop-button.tsx
@@ -1,18 +1,27 @@
 import React, { Component, ReactElement } from "react";
+import { Stop, StopEventHandler } from "@opentripplanner/types";
 import { FormattedMessage } from "react-intl";
 
 import * as S from "../styled";
 import { defaultMessages } from "../util";
 
-interface Props {
-  onStopClick: ({ stopId: string }) => void;
-  stopId: string;
+interface PropsWithStopId {
+  onStopClick: StopEventHandler;
+  stopId?: string;
+  stop?: never;
 }
+interface PropsWithStop {
+  onStopClick: StopEventHandler;
+  stopId?: never;
+  stop?: Stop;
+}
+
+type Props = PropsWithStop | PropsWithStopId;
 
 export default class ViewStopButton extends Component<Props> {
   onClick = (): void => {
-    const { onStopClick, stopId } = this.props;
-    onStopClick({ stopId });
+    const { onStopClick, stop, stopId } = this.props;
+    onStopClick({ ...stop, stopId: "gtfsId" in stop ? stop.gtfsId : stopId });
   };
 
   render(): ReactElement {

diff --git a/packages/itinerary-body/src/types.ts b/packages/itinerary-body/src/types.ts
@@ -8,6 +8,7 @@ import {
   Leg,
   LegIconComponent,
   Place,
+  Stop,
   TransitOperator
 } from "@opentripplanner/types";
 
@@ -84,7 +85,7 @@ export type SetViewedTripFunction = (tripSection: TripSection) => void;
 
 export interface TransitLegSubheaderProps {
   leg: Leg;
-  onStopClick?: ({ stopId: string }) => void;
+  onStopClick?: (stop: Stop) => void;
 }
 
 export interface TransitLegSummaryProps {

diff --git a/packages/location-field/package.json b/packages/location-field/package.json
@@ -10,8 +10,8 @@
   "private": false,
   "dependencies": {
     "@conveyal/geocoder-arcgis-geojson": "^0.0.3",
-    "@opentripplanner/core-utils": "^11.0.2",
-    "@opentripplanner/geocoder": "^1.4.2",
+    "@opentripplanner/core-utils": "^11.1.3",
+    "@opentripplanner/geocoder": "^2.0.0",
     "@opentripplanner/humanize-distance": "^1.2.0",
     "@opentripplanner/location-icon": "^1.4.1",
     "@styled-icons/fa-solid": "^10.34.0",

diff --git a/packages/map-popup/package.json b/packages/map-popup/package.json
@@ -11,13 +11,13 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/base-map": "^3.0.14",
-    "@opentripplanner/core-utils": "^11.0.2",
-    "@opentripplanner/from-to-location-picker": "^2.1.8",
+    "@opentripplanner/base-map": "^3.0.15",
+    "@opentripplanner/core-utils": "^11.1.3",
+    "@opentripplanner/from-to-location-picker": "^2.1.10",
     "flat": "^5.0.2"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.1.0"
+    "@opentripplanner/types": "^6.2.0"
   },
   "peerDependencies": {
     "react": "^16.14.0",

diff --git a/packages/map-popup/src/index.tsx b/packages/map-popup/src/index.tsx
@@ -3,7 +3,7 @@ import React, { useCallback } from "react";
 import { Styled as BaseMapStyled } from "@opentripplanner/base-map";
 import FromToLocationPicker from "@opentripplanner/from-to-location-picker";
 // eslint-disable-next-line prettier/prettier
-import type { Company, ConfiguredCompany, Location, Station, Stop } from "@opentripplanner/types";
+import type { Company, ConfiguredCompany, Location, Station, Stop, StopEventHandler } from "@opentripplanner/types";
 
 import { FormattedMessage, useIntl } from "react-intl";
 import { flatten } from "flat";
@@ -61,16 +61,16 @@ const StationHubDetails = ({ station }: { station: Station }) => {
 const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => void; }) => {
   return (
     <BaseMapStyled.PopupRow>
-        <strong>
-          <FormattedMessage
-            defaultMessage={defaultMessages["otpUi.MapPopup.stopId"]}
-            description="Displays the stop id"
-            id="otpUi.MapPopup.stopId"
-            values={{
-              stopId: id
-            }}
-          />
-        </strong>
+      <strong>
+        <FormattedMessage
+          defaultMessage={defaultMessages["otpUi.MapPopup.stopId"]}
+          description="Displays the stop id"
+          id="otpUi.MapPopup.stopId"
+          values={{
+            stopId: id
+          }}
+        />
+      </strong>
       <S.ViewStopButton onClick={setViewedStop}>
         <FormattedMessage
           defaultMessage={defaultMessages["otpUi.MapPopup.stopViewer"]}
@@ -88,9 +88,13 @@ type Props = {
   entity: Entity
   getEntityName?: (entity: Entity, configCompanies: Company[],) => string;
   setLocation?: ({ location, locationType }: { location: Location, locationType: string }) => void;
-  setViewedStop?: ({ stopId }: { stopId: string }) => void;
+  setViewedStop?: StopEventHandler;
 };
 
+function entityIsStation(entity: Entity): entity is Station {
+  return "bikesAvailable" in entity
+}
+
 /**
  * Renders a map popup for a stop, scooter, or shared bike
  */
@@ -102,9 +106,8 @@ export function MapPopup({ configCompanies, entity, getEntityName, setLocation,
   const name = getNameFunc(entity, configCompanies);
 
 
-  const bikesAvailablePresent = "bikesAvailable" in entity
+  const bikesAvailablePresent = entityIsStation(entity)
   const entityIsStationHub = bikesAvailablePresent && entity?.bikesAvailable !== undefined && !entity?.isFloatingBike;
-  // @ts-expect-error ts doesn't understand entityIsStop
   const stopId = !bikesAvailablePresent && entity?.code || entity.id.split(":")[1] || entity.id
 
   return (
@@ -114,7 +117,12 @@ export function MapPopup({ configCompanies, entity, getEntityName, setLocation,
       {entityIsStationHub && <StationHubDetails station={entity} />}
 
       {/* render stop viewer link if available */}
-      {setViewedStop && !bikesAvailablePresent && <StopDetails id={stopId} setViewedStop={useCallback(() => setViewedStop({ stopId: entity.id }), [entity.id])} />}
+      {setViewedStop && !bikesAvailablePresent && (
+        <StopDetails
+          id={stopId}
+          setViewedStop={useCallback(() => setViewedStop(entity), [entity])}
+        />
+      )}
 
       {/* The "Set as [from/to]" ButtonGroup */}
       {setLocation && (

diff --git a/packages/otp2-tile-overlay/package.json b/packages/otp2-tile-overlay/package.json
@@ -16,10 +16,10 @@
     "react-map-gl": "^7.0.15"
   },
   "dependencies": {
-    "@opentripplanner/map-popup": "^2.0.5"
+    "@opentripplanner/map-popup": "^2.0.7-alpha.1"
   },
   "devDependencies": {
-    "@opentripplanner/base-map": "^3.0.14",
-    "@opentripplanner/types": "^6.1.0"
+    "@opentripplanner/base-map": "^3.0.15",
+    "@opentripplanner/types": "^6.2.0"
   }
 }
diff --git a/packages/otp2-tile-overlay/src/index.tsx b/packages/otp2-tile-overlay/src/index.tsx
@@ -2,6 +2,8 @@ import EntityPopup from "@opentripplanner/map-popup"
 import {
   ConfiguredCompany,
   MapLocationActionArg,
+  Stop,
+  StopEventHandler,
 } from "@opentripplanner/types"
 // eslint-disable-next-line prettier/prettier
 import type { EventData } from "mapbox-gl"
@@ -52,7 +54,7 @@ const OTP2TileLayerWithPopup = ({
    * A method fired when the stop viewer is opened in the default popup. If this method is
    * not passed, the stop viewer link will not be shown.
    */
-  setViewedStop?: ({ stopId }: { stopId: string }) => void
+  setViewedStop?: StopEventHandler
   /**
    * Determines which layer of the OTP2 tile data to display. Also determines icon color.
    */
@@ -119,10 +121,10 @@ const OTP2TileLayerWithPopup = ({
     map?.on("click", id, onMapClick || defaultClickHandler)
 
     return () => {
-        map?.off("mouseenter", id, onLayerEnter);
-        map?.off("mouseleave", id, onLayerLeave);
-        map?.off("click", id, onMapClick || defaultClickHandler);
-      };
+      map?.off("mouseenter", id, onLayerEnter);
+      map?.off("mouseleave", id, onLayerLeave);
+      map?.off("click", id, onMapClick || defaultClickHandler);
+    };
   }, [id, map])
 
   return (
@@ -144,13 +146,13 @@ const OTP2TileLayerWithPopup = ({
           // TODO: only set null if the x is clicked, not a new stop
           onClose={() => setClickedEntity(null)}
         >
-            <EntityPopup
-              configCompanies={configCompanies}
-              entity={{ ...clickedEntity, id: clickedEntity?.id || clickedEntity?.gtfsId }}
-              setLocation={setLocation ? (location) => { setClickedEntity(null); setLocation(location) } : null}
-              setViewedStop={setViewedStop}
-            />
-         
+          <EntityPopup
+            configCompanies={configCompanies}
+            entity={{ ...clickedEntity, id: clickedEntity?.id || clickedEntity?.gtfsId }}
+            setLocation={setLocation ? (location) => { setClickedEntity(null); setLocation(location) } : null}
+            setViewedStop={setViewedStop}
+          />
+
         </Popup>
       )}
     </>
@@ -173,7 +175,7 @@ const generateOTP2TileLayers = (
   layers: { color?: string; name?: string; network?: string; type: string, initiallyVisible?: boolean }[],
   endpoint: string,
   setLocation?: (location: MapLocationActionArg) => void,
-  setViewedStop?: ({ stopId }: { stopId: string }) => void,
+  setViewedStop?: (stop: Stop) => void,
   configCompanies?: ConfiguredCompany[]
 ): JSX.Element[] => {
   return [

diff --git a/packages/park-and-ride-overlay/package.json b/packages/park-and-ride-overlay/package.json
@@ -19,8 +19,8 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.0.14",
-    "@opentripplanner/from-to-location-picker": "^2.1.8"
+    "@opentripplanner/base-map": "^3.0.15",
+    "@opentripplanner/from-to-location-picker": "^2.1.10"
   },
   "peerDependencies": {
     "react": "^16.14.0",

diff --git a/packages/printable-itinerary/package.json b/packages/printable-itinerary/package.json
@@ -10,11 +10,11 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.0.2",
-    "@opentripplanner/itinerary-body": "^5.0.7"
+    "@opentripplanner/core-utils": "^11.1.3",
+    "@opentripplanner/itinerary-body": "^5.1.2"
   },
   "devDependencies": {
-    "@opentripplanner/icons": "^2.0.5"
+    "@opentripplanner/icons": "^2.0.6"
   },
   "peerDependencies": {
     "react": "^16.14.0",

diff --git a/packages/route-viewer-overlay/package.json b/packages/route-viewer-overlay/package.json
@@ -20,12 +20,12 @@
   },
   "dependencies": {
     "@mapbox/polyline": "^1.1.0",
-    "@opentripplanner/base-map": "^3.0.14",
-    "@opentripplanner/core-utils": "^11.0.2",
+    "@opentripplanner/base-map": "^3.0.15",
+    "@opentripplanner/core-utils": "^11.1.3",
     "point-in-polygon": "^1.1.0"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.1.0",
+    "@opentripplanner/types": "^6.2.0",
     "point-in-polygon": "^1.1.0"
   },
   "peerDependencies": {

diff --git a/packages/stop-viewer-overlay/package.json b/packages/stop-viewer-overlay/package.json
@@ -19,11 +19,11 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.0.14",
-    "@opentripplanner/core-utils": "^11.0.2"
+    "@opentripplanner/base-map": "^3.0.15",
+    "@opentripplanner/core-utils": "^11.1.3"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.1.0"
+    "@opentripplanner/types": "^6.2.0"
   },
   "peerDependencies": {
     "react": "^16.14.0",