From cef0cc2de317f696ecbc5394d5942f16350bb479 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Fri, 11 Aug 2023 14:29:58 -0700 Subject: [PATCH 01/26] feat(types): Add "stop" to Place type --- packages/types/src/index.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index f39a5bfee..69b47f45c 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -238,9 +238,22 @@ export type Place = { name: string; networks?: string[]; rentalVehicle?: { network: string }; + stop?: Stop; + /** + * @deprecated Only for OTP1 support, removal is immenent + */ stopCode?: string; + /** + * @deprecated Only for OTP1 support, removal is immenent + */ stopId?: string; + /** + * @deprecated Only for OTP1 support, removal is immenent + */ stopIndex?: number; + /** + * @deprecated Only for OTP1 support, removal is immenent + */ stopSequence?: number; vertexType: string; zoneId?: string; From 4857a569ef0d52580e693b365ef3ffbb1b0e37ba Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Fri, 11 Aug 2023 15:01:55 -0700 Subject: [PATCH 02/26] feat(types): add otp2 types to stop type --- packages/types/src/index.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 69b47f45c..3604a7438 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -486,10 +486,11 @@ export type Stop = { dist?: number; geometries?: { geoJson?: GeoJSON.Polygon }; id: string; - lat: number; - lon: number; + lat?: number; + lon?: number; name: string; routes?: Route[]; + gtfsId: string; }; export type Agency = { From e85f08d3ae3cfa3436d3bd1a1059adf4a5a33a5a Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Fri, 11 Aug 2023 16:46:29 -0700 Subject: [PATCH 03/26] feat(itinerary-body): add full stop data to view stop button return --- packages/itinerary-body/package.json | 2 +- .../otp-react-redux/transit-leg-subheader.tsx | 2 +- .../src/otp-react-redux/view-stop-button.tsx | 9 +++--- packages/itinerary-body/src/types.ts | 3 +- yarn.lock | 32 ++++++------------- 5 files changed, 18 insertions(+), 30 deletions(-) diff --git a/packages/itinerary-body/package.json b/packages/itinerary-body/package.json index 00f3b8fcf..99231476b 100644 --- a/packages/itinerary-body/package.json +++ b/packages/itinerary-body/package.json @@ -24,7 +24,7 @@ "string-similarity": "^4.0.4" }, "devDependencies": { - "@opentripplanner/types": "^6.0.0", + "@opentripplanner/types": "^7.0.0-alpha.6", "@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 index c2d92784b..5f85f6c65 100644 --- 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) && ( - + )} ); 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 index 864a0d47a..0f007be71 100644 --- 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,19 @@ import React, { Component, ReactElement } from "react"; +import { Stop } 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; + onStopClick: (stop: Stop) => void; + stop: Stop; } export default class ViewStopButton extends Component { onClick = (): void => { - const { onStopClick, stopId } = this.props; - onStopClick({ stopId }); + const { onStopClick, stop } = this.props; + onStopClick(stop); }; render(): ReactElement { diff --git a/packages/itinerary-body/src/types.ts b/packages/itinerary-body/src/types.ts index 208ef1496..32a670967 100644 --- 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"; @@ -73,7 +74,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/yarn.lock b/yarn.lock index c095481fa..454de5c08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3241,29 +3241,15 @@ resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca" integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q== -"@opentripplanner/core-utils@^9.0.3": - version "9.0.3" - resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.3.tgz#c1ebdcc3ad5999fb28427102c9be7d7268f6bd37" - integrity sha512-8P3Bi41jF7z18P/soo6lEw+nrqarsyGMAxivsF1/kMJdRo4wnakp0zcrVZjDXTxoR6LPtj6Kkuxv3JQFO9jKiw== - dependencies: - "@conveyal/lonlat" "^1.4.1" - "@mapbox/polyline" "^1.1.0" - "@opentripplanner/geocoder" "^1.4.1" - "@styled-icons/foundation" "^10.34.0" - "@turf/along" "^6.0.1" - bowser "^2.7.0" - chroma-js "^2.4.2" - date-fns "^2.28.0" - date-fns-tz "^1.2.2" - graphql "^16.6.0" - lodash.clonedeep "^4.5.0" - lodash.isequal "^4.5.0" - qs "^6.9.1" - -"@opentripplanner/types@6.0.0-alpha.4": - version "6.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.0.0-alpha.4.tgz#dee3c06675e30c596159d182ed707e7710cd937c" - integrity sha512-FlYsHm/tk+x0ldrEG1X9Ph1R1k3way1oEdKX7XSnhu9lNTzL4lO0hfT1PLzNXMfBRar7TzK94PHNDibJsod8Kw== +"@opentripplanner/types@7.0.0-alpha.2": + version "7.0.0-alpha.2" + resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-7.0.0-alpha.2.tgz#d10c69f99b2da6d1e80ab5989520bde8e558627b" + integrity sha512-IzQwBcxkoyM+r/W7u+nzICf/6QnreLKppkrZZNl0yVxFiT6RBOd0U2UxMxLPYuRd/3awQabI3/qQ3/6ZxMWPfA== + +"@opentripplanner/types@^7.0.0-alpha.6": + version "7.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-7.0.0-alpha.6.tgz#11c1ccfe479ac66a96f5b529728bbdfad58b6a81" + integrity sha512-nck8RRvn4/h0XBwD7ij5OOw/W+fRP4GdJo4XVtUWX4TYjBv5SLRb8T/OpkBkETW63LN5gi/qcrdnIdLg6W1aYA== "@peculiar/asn1-schema@^2.1.6", "@peculiar/asn1-schema@^2.3.0": version "2.3.3" From fc1a706e3b5f6cb1f6e7ec9f13366554f7aef613 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Fri, 11 Aug 2023 16:52:59 -0700 Subject: [PATCH 04/26] fix(core-utils): add more data to stop object --- packages/core-utils/src/planQuery.graphql | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/core-utils/src/planQuery.graphql b/packages/core-utils/src/planQuery.graphql index 7105e362d..02ddedad6 100644 --- a/packages/core-utils/src/planQuery.graphql +++ b/packages/core-utils/src/planQuery.graphql @@ -1,3 +1,12 @@ +fragment StopParameters on Stop { + code + gtfsId + name + id + lat + lon +} + query Plan( $fromPlace: String! $toPlace: String! @@ -98,9 +107,7 @@ query Plan( effectiveStartDate id } - code - gtfsId - id + ...StopParameters } vertexType } @@ -198,9 +205,7 @@ query Plan( effectiveStartDate id } - code - gtfsId - id + ...StopParameters } vertexType } @@ -208,15 +213,13 @@ query Plan( trip { arrivalStoptime { stop { - gtfsId - id + ...StopParameters } stopPosition } departureStoptime { stop { - gtfsId - id + ...StopParameters } stopPosition } From e58cf718aa773d2c55086216ade99a98c9053e4b Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Tue, 15 Aug 2023 11:58:45 -0700 Subject: [PATCH 05/26] fix(map-popup): setViewedStop passes whole stop --- packages/map-popup/src/index.tsx | 36 +++++++++++++++++++------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/packages/map-popup/src/index.tsx b/packages/map-popup/src/index.tsx index f45250240..26e63a8c4 100644 --- a/packages/map-popup/src/index.tsx +++ b/packages/map-popup/src/index.tsx @@ -61,16 +61,16 @@ const StationHubDetails = ({ station }: { station: Station }) => { const StopDetails = ({ id, setViewedStop }: { id: string, setViewedStop: () => void; }) => { return ( - - - + + + string; setLocation?: ({ location, locationType }: { location: Location, locationType: string }) => void; - setViewedStop?: ({ stopId }: { stopId: string }) => void; + setViewedStop?: (stop: Stop) => void; }; +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 && } {/* render stop viewer link if available */} - {setViewedStop && !bikesAvailablePresent && setViewedStop({ stopId: entity.id }), [entity.id])} />} + {setViewedStop && !bikesAvailablePresent && ( + setViewedStop(entity), [entity])} + /> + )} {/* The "Set as [from/to]" ButtonGroup */} {setLocation && ( From 38aefe6564afea4873c453f7d0c01e82b736658f Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Tue, 15 Aug 2023 13:25:08 -0700 Subject: [PATCH 06/26] fix(otp2-tile-overlay): use new stop callback --- packages/otp2-tile-overlay/src/index.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/otp2-tile-overlay/src/index.tsx b/packages/otp2-tile-overlay/src/index.tsx index 36b025352..cb3b25698 100644 --- a/packages/otp2-tile-overlay/src/index.tsx +++ b/packages/otp2-tile-overlay/src/index.tsx @@ -2,6 +2,7 @@ import EntityPopup from "@opentripplanner/map-popup" import { ConfiguredCompany, MapLocationActionArg, + Stop, } from "@opentripplanner/types" // eslint-disable-next-line prettier/prettier import type { EventData } from "mapbox-gl" @@ -52,7 +53,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?: (stop: Stop) => void /** * Determines which layer of the OTP2 tile data to display. Also determines icon color. */ @@ -173,7 +174,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 [ From eb9b041256cd0f7fbb43019721cc48a0a585066f Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Tue, 15 Aug 2023 13:25:46 -0700 Subject: [PATCH 07/26] fix(stops-overlay): use new stop callback --- packages/stops-overlay/src/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stops-overlay/src/index.tsx b/packages/stops-overlay/src/index.tsx index 0b2089cbc..5bec2c1e0 100644 --- a/packages/stops-overlay/src/index.tsx +++ b/packages/stops-overlay/src/index.tsx @@ -40,7 +40,7 @@ type Props = { /** * A method fired when the stop viewer is opened in the popup */ - setViewedStop?: ({ stopId: string }) => void; + setViewedStop?: (stop: Stop) => void; }; /** From f52f435b37dea47e17ab5d66e1258ca77027bdf1 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 28 Sep 2023 13:55:14 -0700 Subject: [PATCH 08/26] fix: use alpha versions --- packages/otp2-tile-overlay/package.json | 2 +- packages/stops-overlay/package.json | 2 +- yarn.lock | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/otp2-tile-overlay/package.json b/packages/otp2-tile-overlay/package.json index b4ca7e04a..508501439 100644 --- a/packages/otp2-tile-overlay/package.json +++ b/packages/otp2-tile-overlay/package.json @@ -16,7 +16,7 @@ "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", diff --git a/packages/stops-overlay/package.json b/packages/stops-overlay/package.json index 8721a8beb..29ddeca60 100644 --- a/packages/stops-overlay/package.json +++ b/packages/stops-overlay/package.json @@ -21,7 +21,7 @@ "dependencies": { "@opentripplanner/base-map": "^3.0.14", "@opentripplanner/from-to-location-picker": "^2.1.8", - "@opentripplanner/map-popup": "^2.0.5", + "@opentripplanner/map-popup": "^2.0.7-alpha.1", "flat": "^5.0.2" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 917932aaa..ca222b0b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3241,6 +3241,16 @@ resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca" integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q== +"@opentripplanner/map-popup@^2.0.7-alpha.1": + version "2.0.7-alpha.1" + resolved "https://registry.yarnpkg.com/@opentripplanner/map-popup/-/map-popup-2.0.7-alpha.1.tgz#c8e771989ecad23b1614e83b4ee4831c7c019491" + integrity sha512-YXNoE1R30ClgaPuj5khWlKv7bcBBbJETuniqrg+55AeL8dpMEndUQPsmDWexr9XkY5xOmqhrrfjJ6aew00gYOQ== + dependencies: + "@opentripplanner/base-map" "^3.0.14" + "@opentripplanner/core-utils" "^11.0.2" + "@opentripplanner/from-to-location-picker" "^2.1.8" + flat "^5.0.2" + "@opentripplanner/types@7.0.0-alpha.2": version "7.0.0-alpha.2" resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-7.0.0-alpha.2.tgz#d10c69f99b2da6d1e80ab5989520bde8e558627b" From a4483f69132358e27e77dcc0aec080e723e1a359 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Tue, 24 Oct 2023 14:50:48 -0700 Subject: [PATCH 09/26] feat(stops-overlay): add highlighted stop support --- .../stops-overlay/src/StopsOverlay.story.tsx | 4 +++- packages/stops-overlay/src/index.tsx | 21 ++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/packages/stops-overlay/src/StopsOverlay.story.tsx b/packages/stops-overlay/src/StopsOverlay.story.tsx index 60beada72..651749e2d 100644 --- a/packages/stops-overlay/src/StopsOverlay.story.tsx +++ b/packages/stops-overlay/src/StopsOverlay.story.tsx @@ -13,7 +13,8 @@ const Example = ({ minZoom = 15, setLocation = action("setLocation"), setViewedStop = action("setViewedStop"), - stops = mockStops + stops = mockStops, + highlightedStop = "8338" }: StopProps & { mapCenter?: [number, number] }) => { return ( ); diff --git a/packages/stops-overlay/src/index.tsx b/packages/stops-overlay/src/index.tsx index 5bec2c1e0..938c482c9 100644 --- a/packages/stops-overlay/src/index.tsx +++ b/packages/stops-overlay/src/index.tsx @@ -16,6 +16,10 @@ type Props = { * An optional id to override the active stop with */ activeStop?: string; + /** + * An optional id to highlight a stop on the map + */ + highlightedStop?: string; /** * The list of stops to create stop markers for. */ @@ -51,6 +55,7 @@ const StopsOverlay = (props: Props): JSX.Element => { const { activeStop, color, + highlightedStop, minZoom, refreshStops, setLocation, @@ -127,7 +132,8 @@ const StopsOverlay = (props: Props): JSX.Element => { type: "Feature", properties: { ...stop, - flex: isGeoJsonFlex(stop?.geometries?.geoJson) + flex: isGeoJsonFlex(stop?.geometries?.geoJson), + highlighted: stop.id === highlightedStop }, geometry: { type: "Point", coordinates: [stop.lon, stop.lat] } })) @@ -157,6 +163,19 @@ const StopsOverlay = (props: Props): JSX.Element => { }} type="circle" /> + Date: Wed, 25 Oct 2023 15:37:18 -0700 Subject: [PATCH 10/26] fix(stops-overlay): add support for custom highlight color # Conflicts: # yarn.lock --- packages/stops-overlay/src/StopsOverlay.story.tsx | 1 + packages/stops-overlay/src/index.tsx | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/stops-overlay/src/StopsOverlay.story.tsx b/packages/stops-overlay/src/StopsOverlay.story.tsx index 651749e2d..b9cc20bae 100644 --- a/packages/stops-overlay/src/StopsOverlay.story.tsx +++ b/packages/stops-overlay/src/StopsOverlay.story.tsx @@ -23,6 +23,7 @@ const Example = ({ setViewedStop={setViewedStop} stops={stops} highlightedStop={highlightedStop} + highlightedStopColor="#0000ff" visible /> ); diff --git a/packages/stops-overlay/src/index.tsx b/packages/stops-overlay/src/index.tsx index 938c482c9..d28821a66 100644 --- a/packages/stops-overlay/src/index.tsx +++ b/packages/stops-overlay/src/index.tsx @@ -20,6 +20,10 @@ type Props = { * An optional id to highlight a stop on the map */ highlightedStop?: string; + /** + * A color to use for the highlighted stop + */ + highlightedStopColor?: string; /** * The list of stops to create stop markers for. */ @@ -56,6 +60,7 @@ const StopsOverlay = (props: Props): JSX.Element => { activeStop, color, highlightedStop, + highlightedStopColor, minZoom, refreshStops, setLocation, @@ -167,7 +172,7 @@ const StopsOverlay = (props: Props): JSX.Element => { id="higlightedStop" filter={["==", "highlighted", true]} paint={{ - "circle-color": color || "#ff0000", + "circle-color": highlightedStopColor || "#ff0000", "circle-opacity": 1, "circle-radius": 10, // TODO: Use tinycolor to generate outline with appropriate contrast. From b500a4927f694f319e6611d85b9239aa9e99157c Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Tue, 24 Oct 2023 15:29:48 -0700 Subject: [PATCH 11/26] fix(stops-overlay): fix memoization on highlighted stop --- packages/stops-overlay/src/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stops-overlay/src/index.tsx b/packages/stops-overlay/src/index.tsx index d28821a66..f85c64d91 100644 --- a/packages/stops-overlay/src/index.tsx +++ b/packages/stops-overlay/src/index.tsx @@ -143,7 +143,7 @@ const StopsOverlay = (props: Props): JSX.Element => { geometry: { type: "Point", coordinates: [stop.lon, stop.lat] } })) }), - [stops] + [stops, highlightedStop] ); // Don't render if no map or no stops are defined. From 694575d9b419024c3f069a99c0eece8694905f75 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Mon, 13 Nov 2023 17:46:08 +0100 Subject: [PATCH 12/26] deps: update internal dependencies --- packages/base-map/package.json | 2 +- packages/building-blocks/package.json | 2 +- packages/endpoints-overlay/package.json | 6 +++--- packages/from-to-location-picker/package.json | 2 +- packages/icons/package.json | 2 +- packages/itinerary-body/package.json | 6 +++--- packages/location-field/package.json | 2 +- packages/map-popup/package.json | 8 ++++---- packages/otp2-tile-overlay/package.json | 4 ++-- packages/park-and-ride-overlay/package.json | 4 ++-- packages/printable-itinerary/package.json | 6 +++--- packages/route-viewer-overlay/package.json | 6 +++--- packages/stop-viewer-overlay/package.json | 6 +++--- packages/stops-overlay/package.json | 6 +++--- packages/transit-vehicle-overlay/package.json | 8 ++++---- packages/transitive-overlay/package.json | 10 +++++----- packages/trip-details/package.json | 4 ++-- packages/trip-form/package.json | 2 +- packages/trip-viewer-overlay/package.json | 4 ++-- packages/vehicle-rental-overlay/package.json | 10 +++++----- packages/zoom-based-markers/package.json | 6 +++--- yarn.lock | 10 ---------- 22 files changed, 53 insertions(+), 63 deletions(-) diff --git a/packages/base-map/package.json b/packages/base-map/package.json index b131afb79..ba84e1afe 100644 --- 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.1.1", "react": "^16.14.0", "styled-components": "^5.3.0" }, diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json index 32331ea1b..264a98cb2 100644 --- a/packages/building-blocks/package.json +++ b/packages/building-blocks/package.json @@ -15,7 +15,7 @@ "@opentripplanner/core-utils": "11.1.2" }, "peerDependencies": { - "@opentripplanner/types": "^6.1.0", + "@opentripplanner/types": "^6.1.1", "react": "^16.14.0", "styled-components": "^5.3.0" }, diff --git a/packages/endpoints-overlay/package.json b/packages/endpoints-overlay/package.json index 5cdd794f1..294dec8de 100644 --- a/packages/endpoints-overlay/package.json +++ b/packages/endpoints-overlay/package.json @@ -19,9 +19,9 @@ "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.2", "flat": "^5.0.2", "@styled-icons/fa-solid": "^10.34.0" }, @@ -29,7 +29,7 @@ "@types/flat": "^5.0.2" }, "peerDependencies": { - "@opentripplanner/types": "^6.1.0", + "@opentripplanner/types": "^6.1.1", "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 index cf9869a23..332ff5704 100644 --- 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.1.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/icons/package.json b/packages/icons/package.json index cb9683400..459ca6130 100644 --- 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.2", "prop-types": "^15.7.2" }, "peerDependencies": { diff --git a/packages/itinerary-body/package.json b/packages/itinerary-body/package.json index 28c1f10c5..a9e4f1126 100644 --- 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.2", "@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.1.1", "@types/flat": "^5.0.2" }, "peerDependencies": { diff --git a/packages/location-field/package.json b/packages/location-field/package.json index 1cddee830..df7845261 100644 --- a/packages/location-field/package.json +++ b/packages/location-field/package.json @@ -10,7 +10,7 @@ "private": false, "dependencies": { "@conveyal/geocoder-arcgis-geojson": "^0.0.3", - "@opentripplanner/core-utils": "^11.0.2", + "@opentripplanner/core-utils": "^11.1.2", "@opentripplanner/geocoder": "^1.4.2", "@opentripplanner/humanize-distance": "^1.2.0", "@opentripplanner/location-icon": "^1.4.1", diff --git a/packages/map-popup/package.json b/packages/map-popup/package.json index 4acac46a0..9857f386f 100644 --- 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.2", + "@opentripplanner/from-to-location-picker": "^2.1.10", "flat": "^5.0.2" }, "devDependencies": { - "@opentripplanner/types": "^6.1.0" + "@opentripplanner/types": "^6.1.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/otp2-tile-overlay/package.json b/packages/otp2-tile-overlay/package.json index 508501439..b67d841c0 100644 --- a/packages/otp2-tile-overlay/package.json +++ b/packages/otp2-tile-overlay/package.json @@ -19,7 +19,7 @@ "@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.1.1" } } diff --git a/packages/park-and-ride-overlay/package.json b/packages/park-and-ride-overlay/package.json index 15401fa1d..1a9f60d75 100644 --- 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 index 34d222d02..5c327bc67 100644 --- 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.2", + "@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 index 67c5d5c15..5cba3d719 100644 --- 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.2", "point-in-polygon": "^1.1.0" }, "devDependencies": { - "@opentripplanner/types": "^6.1.0", + "@opentripplanner/types": "^6.1.1", "point-in-polygon": "^1.1.0" }, "peerDependencies": { diff --git a/packages/stop-viewer-overlay/package.json b/packages/stop-viewer-overlay/package.json index 9e1568913..66f9b21c4 100644 --- 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.2" }, "devDependencies": { - "@opentripplanner/types": "^6.1.0" + "@opentripplanner/types": "^6.1.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/stops-overlay/package.json b/packages/stops-overlay/package.json index 29ddeca60..ab1958c12 100644 --- a/packages/stops-overlay/package.json +++ b/packages/stops-overlay/package.json @@ -19,13 +19,13 @@ "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", "@opentripplanner/map-popup": "^2.0.7-alpha.1", "flat": "^5.0.2" }, "devDependencies": { - "@opentripplanner/types": "^6.1.0", + "@opentripplanner/types": "^6.1.1", "styled-icons": "^10.34.0" }, "peerDependencies": { diff --git a/packages/transit-vehicle-overlay/package.json b/packages/transit-vehicle-overlay/package.json index f08d65a4d..a3cea4740 100644 --- a/packages/transit-vehicle-overlay/package.json +++ b/packages/transit-vehicle-overlay/package.json @@ -9,13 +9,13 @@ "module": "esm/index.js", "private": false, "dependencies": { - "@opentripplanner/base-map": "^3.0.14", - "@opentripplanner/core-utils": "^11.0.2", - "@opentripplanner/icons": "^2.0.5", + "@opentripplanner/base-map": "^3.0.15", + "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/icons": "^2.0.6", "flat": "^5.0.2" }, "devDependencies": { - "@opentripplanner/types": "^6.1.0" + "@opentripplanner/types": "^6.1.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/transitive-overlay/package.json b/packages/transitive-overlay/package.json index 919c5e29a..7fefec651 100644 --- a/packages/transitive-overlay/package.json +++ b/packages/transitive-overlay/package.json @@ -20,9 +20,9 @@ }, "dependencies": { "@mapbox/polyline": "^1.1.1", - "@opentripplanner/base-map": "^3.0.14", - "@opentripplanner/core-utils": "^11.0.2", - "@opentripplanner/itinerary-body": "^5.0.2", + "@opentripplanner/base-map": "^3.0.15", + "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/itinerary-body": "^5.1.2", "@turf/bbox": "^6.5.0", "@turf/bearing": "^6.5.0", "@turf/destination": "^6.5.0", @@ -32,8 +32,8 @@ "lodash.isequal": "^4.5.0" }, "devDependencies": { - "@opentripplanner/endpoints-overlay": "^2.0.8", - "@opentripplanner/types": "^6.1.0" + "@opentripplanner/endpoints-overlay": "^2.0.10", + "@opentripplanner/types": "^6.1.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/trip-details/package.json b/packages/trip-details/package.json index b9a9135fa..833faac17 100644 --- a/packages/trip-details/package.json +++ b/packages/trip-details/package.json @@ -11,13 +11,13 @@ "license": "MIT", "private": false, "dependencies": { - "@opentripplanner/core-utils": "^11.0.2", + "@opentripplanner/core-utils": "^11.1.2", "@styled-icons/fa-solid": "^10.34.0", "flat": "^5.0.2", "react-animate-height": "^3.0.4" }, "devDependencies": { - "@opentripplanner/types": "^6.0.0", + "@opentripplanner/types": "^6.1.1", "@types/flat": "^5.0.2" }, "peerDependencies": { diff --git a/packages/trip-form/package.json b/packages/trip-form/package.json index 3de331e4e..775f1e492 100644 --- a/packages/trip-form/package.json +++ b/packages/trip-form/package.json @@ -10,7 +10,7 @@ "types": "lib/index.d.ts", "private": false, "dependencies": { - "@opentripplanner/core-utils": "^11.0.2", + "@opentripplanner/core-utils": "^11.1.2", "@floating-ui/react": "^0.19.2", "@styled-icons/bootstrap": "^10.34.0", "@styled-icons/boxicons-regular": "^10.38.0", diff --git a/packages/trip-viewer-overlay/package.json b/packages/trip-viewer-overlay/package.json index cd58d495c..fb14cdb03 100644 --- a/packages/trip-viewer-overlay/package.json +++ b/packages/trip-viewer-overlay/package.json @@ -20,8 +20,8 @@ }, "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.2" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/vehicle-rental-overlay/package.json b/packages/vehicle-rental-overlay/package.json index 29d45bc08..3dff1963f 100644 --- a/packages/vehicle-rental-overlay/package.json +++ b/packages/vehicle-rental-overlay/package.json @@ -19,16 +19,16 @@ "url": "git+https://github.com/opentripplanner/otp-ui.git" }, "dependencies": { - "@opentripplanner/base-map": "^3.0.14", - "@opentripplanner/core-utils": "^11.0.2", - "@opentripplanner/from-to-location-picker": "^2.1.8", - "@opentripplanner/map-popup": "^2.0.5", + "@opentripplanner/base-map": "^3.0.15", + "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/from-to-location-picker": "^2.1.10", + "@opentripplanner/map-popup": "^2.0.7", "@styled-icons/fa-solid": "^10.34.0", "flat": "^5.0.2", "lodash.memoize": "^4.1.2" }, "devDependencies": { - "@opentripplanner/types": "^6.1.0" + "@opentripplanner/types": "^6.1.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/zoom-based-markers/package.json b/packages/zoom-based-markers/package.json index a40e2eeb9..df88b6628 100644 --- a/packages/zoom-based-markers/package.json +++ b/packages/zoom-based-markers/package.json @@ -19,11 +19,11 @@ "url": "https://github.com/opentripplanner/otp-ui/issues" }, "dependencies": { - "@opentripplanner/core-utils": "^11.0.2", - "@opentripplanner/base-map": "^3.0.14" + "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/base-map": "^3.0.15" }, "devDependencies": { - "@opentripplanner/types": "^6.1.0" + "@opentripplanner/types": "^6.1.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/yarn.lock b/yarn.lock index ca222b0b6..917932aaa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3241,16 +3241,6 @@ resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca" integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q== -"@opentripplanner/map-popup@^2.0.7-alpha.1": - version "2.0.7-alpha.1" - resolved "https://registry.yarnpkg.com/@opentripplanner/map-popup/-/map-popup-2.0.7-alpha.1.tgz#c8e771989ecad23b1614e83b4ee4831c7c019491" - integrity sha512-YXNoE1R30ClgaPuj5khWlKv7bcBBbJETuniqrg+55AeL8dpMEndUQPsmDWexr9XkY5xOmqhrrfjJ6aew00gYOQ== - dependencies: - "@opentripplanner/base-map" "^3.0.14" - "@opentripplanner/core-utils" "^11.0.2" - "@opentripplanner/from-to-location-picker" "^2.1.8" - flat "^5.0.2" - "@opentripplanner/types@7.0.0-alpha.2": version "7.0.0-alpha.2" resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-7.0.0-alpha.2.tgz#d10c69f99b2da6d1e80ab5989520bde8e558627b" From d2ffb77a51ee87d4a3a3c277f06d4c20b959bd45 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 16 Nov 2023 01:28:32 +0100 Subject: [PATCH 13/26] revert unneeded change to graphql query --- packages/core-utils/src/planQuery.graphql | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/packages/core-utils/src/planQuery.graphql b/packages/core-utils/src/planQuery.graphql index f41d16c8e..551d012eb 100644 --- a/packages/core-utils/src/planQuery.graphql +++ b/packages/core-utils/src/planQuery.graphql @@ -1,12 +1,3 @@ -fragment StopParameters on Stop { - code - gtfsId - name - id - lat - lon -} - query Plan( $arriveBy: Boolean $banned: InputBanned @@ -116,7 +107,9 @@ query Plan( effectiveStartDate id } - ...StopParameters + code + gtfsId + id } vertexType } @@ -216,7 +209,9 @@ query Plan( effectiveStartDate id } - ...StopParameters + code + gtfsId + id } vertexType } @@ -224,13 +219,15 @@ query Plan( trip { arrivalStoptime { stop { - ...StopParameters + gtfsId + id } stopPosition } departureStoptime { stop { - ...StopParameters + gtfsId + id } stopPosition } From 16b1e65877a7ac1d1db5f6fb9220cd2818af890b Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 16 Nov 2023 01:28:42 +0100 Subject: [PATCH 14/26] fix duplicate id in types --- packages/types/src/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index a9c3bd789..b0888d8bb 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -493,7 +493,6 @@ export type Stop = { lon?: number; name: string; routes?: Route[]; - gtfsId: string; }; export type Agency = { From 7a178dea50e78a48266d3436b079dc9c0e65da05 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 16 Nov 2023 01:32:00 +0100 Subject: [PATCH 15/26] use new stopeventhandler --- .../itinerary-body/src/otp-react-redux/view-stop-button.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 0f007be71..b413008c5 100644 --- 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,12 +1,12 @@ import React, { Component, ReactElement } from "react"; -import { Stop } from "@opentripplanner/types"; +import { Stop, StopEventHandler } from "@opentripplanner/types"; import { FormattedMessage } from "react-intl"; import * as S from "../styled"; import { defaultMessages } from "../util"; interface Props { - onStopClick: (stop: Stop) => void; + onStopClick: StopEventHandler; stop: Stop; } From 8b59a21a1f77f8efdb1c9ceb83b0da18f60c285c Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 16 Nov 2023 01:33:50 +0100 Subject: [PATCH 16/26] add stopId to prevent breaking change --- .../itinerary-body/src/otp-react-redux/view-stop-button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index b413008c5..14d4acb93 100644 --- a/packages/itinerary-body/src/otp-react-redux/view-stop-button.tsx +++ b/packages/itinerary-body/src/otp-react-redux/view-stop-button.tsx @@ -13,7 +13,7 @@ interface Props { export default class ViewStopButton extends Component { onClick = (): void => { const { onStopClick, stop } = this.props; - onStopClick(stop); + onStopClick({ ...stop, stopId: stop.gtfsId }); }; render(): ReactElement { From bf4da86afa7474711b4c0573bae61b8c99befb7a Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 16 Nov 2023 01:38:52 +0100 Subject: [PATCH 17/26] fix(map-popup): use StopEventHandler --- packages/map-popup/src/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/map-popup/src/index.tsx b/packages/map-popup/src/index.tsx index 26e63a8c4..871dea051 100644 --- 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"; @@ -88,7 +88,7 @@ type Props = { entity: Entity getEntityName?: (entity: Entity, configCompanies: Company[],) => string; setLocation?: ({ location, locationType }: { location: Location, locationType: string }) => void; - setViewedStop?: (stop: Stop) => void; + setViewedStop?: StopEventHandler; }; function entityIsStation(entity: Entity): entity is Station { From f40bd02eeed3141c7f042865c989fcdf49fe92d9 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 16 Nov 2023 01:39:44 +0100 Subject: [PATCH 18/26] fix(otp2-tile-overlay): use StopEventHandler --- packages/otp2-tile-overlay/src/index.tsx | 25 ++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/otp2-tile-overlay/src/index.tsx b/packages/otp2-tile-overlay/src/index.tsx index cb3b25698..c5a4fc4c3 100644 --- a/packages/otp2-tile-overlay/src/index.tsx +++ b/packages/otp2-tile-overlay/src/index.tsx @@ -3,6 +3,7 @@ import { ConfiguredCompany, MapLocationActionArg, Stop, + StopEventHandler, } from "@opentripplanner/types" // eslint-disable-next-line prettier/prettier import type { EventData } from "mapbox-gl" @@ -53,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?: (stop: Stop) => void + setViewedStop?: StopEventHandler /** * Determines which layer of the OTP2 tile data to display. Also determines icon color. */ @@ -120,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 ( @@ -145,13 +146,13 @@ const OTP2TileLayerWithPopup = ({ // TODO: only set null if the x is clicked, not a new stop onClose={() => setClickedEntity(null)} > - { setClickedEntity(null); setLocation(location) } : null} - setViewedStop={setViewedStop} - /> - + { setClickedEntity(null); setLocation(location) } : null} + setViewedStop={setViewedStop} + /> + )} From e6fb5447f42cf3bd75bf6d2a3d857173b8f93b41 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 16 Nov 2023 01:41:34 +0100 Subject: [PATCH 19/26] fix(stops-overlay): use StopEventHandler type --- packages/stops-overlay/src/index.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/stops-overlay/src/index.tsx b/packages/stops-overlay/src/index.tsx index f85c64d91..19c33b7ea 100644 --- a/packages/stops-overlay/src/index.tsx +++ b/packages/stops-overlay/src/index.tsx @@ -1,5 +1,9 @@ import { Popup } from "@opentripplanner/base-map"; -import { MapLocationActionArg, Stop } from "@opentripplanner/types"; +import { + MapLocationActionArg, + Stop, + StopEventHandler +} from "@opentripplanner/types"; import { EventData } from "mapbox-gl"; import { Layer, Source, useMap } from "react-map-gl"; import React, { useCallback, useEffect, useMemo, useState } from "react"; @@ -48,7 +52,7 @@ type Props = { /** * A method fired when the stop viewer is opened in the popup */ - setViewedStop?: (stop: Stop) => void; + setViewedStop?: StopEventHandler; }; /** From ff5b3dbfd0a8da0be18eb8128160cd6bff677e66 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Sat, 18 Nov 2023 13:44:10 +0100 Subject: [PATCH 20/26] deps: update internal dependencies --- packages/base-map/package.json | 2 +- packages/core-utils/package.json | 2 +- packages/endpoints-overlay/package.json | 4 ++-- packages/from-to-location-picker/package.json | 2 +- packages/icons/package.json | 2 +- packages/itinerary-body/package.json | 4 ++-- packages/location-field/package.json | 4 ++-- packages/map-popup/package.json | 4 ++-- packages/otp2-tile-overlay/package.json | 2 +- packages/printable-itinerary/package.json | 2 +- packages/route-viewer-overlay/package.json | 4 ++-- packages/stop-viewer-overlay/package.json | 4 ++-- packages/stops-overlay/package.json | 2 +- packages/transit-vehicle-overlay/package.json | 4 ++-- packages/transitive-overlay/package.json | 4 ++-- packages/trip-details/package.json | 4 ++-- packages/trip-form/package.json | 2 +- packages/trip-viewer-overlay/package.json | 2 +- packages/vehicle-rental-overlay/package.json | 4 ++-- packages/zoom-based-markers/package.json | 4 ++-- yarn.lock | 10 ---------- 21 files changed, 31 insertions(+), 41 deletions(-) diff --git a/packages/base-map/package.json b/packages/base-map/package.json index ba84e1afe..fe086744a 100644 --- 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.1", + "@opentripplanner/types": "^6.2.0", "react": "^16.14.0", "styled-components": "^5.3.0" }, diff --git a/packages/core-utils/package.json b/packages/core-utils/package.json index b2d909922..13f029451 100644 --- 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 index 294dec8de..eb3621ddd 100644 --- a/packages/endpoints-overlay/package.json +++ b/packages/endpoints-overlay/package.json @@ -21,7 +21,7 @@ "dependencies": { "@opentripplanner/base-map": "^3.0.15", "@opentripplanner/location-icon": "^1.4.1", - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "flat": "^5.0.2", "@styled-icons/fa-solid": "^10.34.0" }, @@ -29,7 +29,7 @@ "@types/flat": "^5.0.2" }, "peerDependencies": { - "@opentripplanner/types": "^6.1.1", + "@opentripplanner/types": "^6.2.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 index 332ff5704..cb0f02ca6 100644 --- 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.1" + "@opentripplanner/types": "^6.2.0" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/icons/package.json b/packages/icons/package.json index 459ca6130..df41611af 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -10,7 +10,7 @@ "license": "MIT", "private": false, "dependencies": { - "@opentripplanner/core-utils": "^11.1.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 index a9e4f1126..cc957220a 100644 --- a/packages/itinerary-body/package.json +++ b/packages/itinerary-body/package.json @@ -10,7 +10,7 @@ "license": "MIT", "private": false, "dependencies": { - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "@opentripplanner/humanize-distance": "^1.2.0", "@opentripplanner/icons": "^2.0.6", "@opentripplanner/location-icon": "^1.4.1", @@ -24,7 +24,7 @@ "string-similarity": "^4.0.4" }, "devDependencies": { - "@opentripplanner/types": "^6.1.1", + "@opentripplanner/types": "^6.2.0", "@types/flat": "^5.0.2" }, "peerDependencies": { diff --git a/packages/location-field/package.json b/packages/location-field/package.json index df7845261..5157d0ec4 100644 --- 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.1.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 index 9857f386f..843a0daa9 100644 --- a/packages/map-popup/package.json +++ b/packages/map-popup/package.json @@ -12,12 +12,12 @@ "private": false, "dependencies": { "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "@opentripplanner/from-to-location-picker": "^2.1.10", "flat": "^5.0.2" }, "devDependencies": { - "@opentripplanner/types": "^6.1.1" + "@opentripplanner/types": "^6.2.0" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/otp2-tile-overlay/package.json b/packages/otp2-tile-overlay/package.json index b67d841c0..ca156c6bd 100644 --- a/packages/otp2-tile-overlay/package.json +++ b/packages/otp2-tile-overlay/package.json @@ -20,6 +20,6 @@ }, "devDependencies": { "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/types": "^6.1.1" + "@opentripplanner/types": "^6.2.0" } } diff --git a/packages/printable-itinerary/package.json b/packages/printable-itinerary/package.json index 5c327bc67..f0e74af23 100644 --- a/packages/printable-itinerary/package.json +++ b/packages/printable-itinerary/package.json @@ -10,7 +10,7 @@ "license": "MIT", "private": false, "dependencies": { - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "@opentripplanner/itinerary-body": "^5.1.2" }, "devDependencies": { diff --git a/packages/route-viewer-overlay/package.json b/packages/route-viewer-overlay/package.json index 5cba3d719..483b8452f 100644 --- a/packages/route-viewer-overlay/package.json +++ b/packages/route-viewer-overlay/package.json @@ -21,11 +21,11 @@ "dependencies": { "@mapbox/polyline": "^1.1.0", "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "point-in-polygon": "^1.1.0" }, "devDependencies": { - "@opentripplanner/types": "^6.1.1", + "@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 index 66f9b21c4..bfe345bdd 100644 --- a/packages/stop-viewer-overlay/package.json +++ b/packages/stop-viewer-overlay/package.json @@ -20,10 +20,10 @@ }, "dependencies": { "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/core-utils": "^11.1.2" + "@opentripplanner/core-utils": "^11.1.3" }, "devDependencies": { - "@opentripplanner/types": "^6.1.1" + "@opentripplanner/types": "^6.2.0" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/stops-overlay/package.json b/packages/stops-overlay/package.json index ab1958c12..e61916fa8 100644 --- a/packages/stops-overlay/package.json +++ b/packages/stops-overlay/package.json @@ -25,7 +25,7 @@ "flat": "^5.0.2" }, "devDependencies": { - "@opentripplanner/types": "^6.1.1", + "@opentripplanner/types": "^6.2.0", "styled-icons": "^10.34.0" }, "peerDependencies": { diff --git a/packages/transit-vehicle-overlay/package.json b/packages/transit-vehicle-overlay/package.json index a3cea4740..d61feb8d9 100644 --- a/packages/transit-vehicle-overlay/package.json +++ b/packages/transit-vehicle-overlay/package.json @@ -10,12 +10,12 @@ "private": false, "dependencies": { "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "@opentripplanner/icons": "^2.0.6", "flat": "^5.0.2" }, "devDependencies": { - "@opentripplanner/types": "^6.1.1" + "@opentripplanner/types": "^6.2.0" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/transitive-overlay/package.json b/packages/transitive-overlay/package.json index 7fefec651..60da18ab7 100644 --- a/packages/transitive-overlay/package.json +++ b/packages/transitive-overlay/package.json @@ -21,7 +21,7 @@ "dependencies": { "@mapbox/polyline": "^1.1.1", "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "@opentripplanner/itinerary-body": "^5.1.2", "@turf/bbox": "^6.5.0", "@turf/bearing": "^6.5.0", @@ -33,7 +33,7 @@ }, "devDependencies": { "@opentripplanner/endpoints-overlay": "^2.0.10", - "@opentripplanner/types": "^6.1.1" + "@opentripplanner/types": "^6.2.0" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/trip-details/package.json b/packages/trip-details/package.json index 833faac17..9a863582f 100644 --- a/packages/trip-details/package.json +++ b/packages/trip-details/package.json @@ -11,13 +11,13 @@ "license": "MIT", "private": false, "dependencies": { - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "@styled-icons/fa-solid": "^10.34.0", "flat": "^5.0.2", "react-animate-height": "^3.0.4" }, "devDependencies": { - "@opentripplanner/types": "^6.1.1", + "@opentripplanner/types": "^6.2.0", "@types/flat": "^5.0.2" }, "peerDependencies": { diff --git a/packages/trip-form/package.json b/packages/trip-form/package.json index 775f1e492..8f2883a2d 100644 --- a/packages/trip-form/package.json +++ b/packages/trip-form/package.json @@ -10,7 +10,7 @@ "types": "lib/index.d.ts", "private": false, "dependencies": { - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "@floating-ui/react": "^0.19.2", "@styled-icons/bootstrap": "^10.34.0", "@styled-icons/boxicons-regular": "^10.38.0", diff --git a/packages/trip-viewer-overlay/package.json b/packages/trip-viewer-overlay/package.json index fb14cdb03..2a46266ba 100644 --- a/packages/trip-viewer-overlay/package.json +++ b/packages/trip-viewer-overlay/package.json @@ -21,7 +21,7 @@ "dependencies": { "@mapbox/polyline": "^1.1.0", "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/core-utils": "^11.1.2" + "@opentripplanner/core-utils": "^11.1.3" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/vehicle-rental-overlay/package.json b/packages/vehicle-rental-overlay/package.json index 3dff1963f..306f02a33 100644 --- a/packages/vehicle-rental-overlay/package.json +++ b/packages/vehicle-rental-overlay/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "@opentripplanner/from-to-location-picker": "^2.1.10", "@opentripplanner/map-popup": "^2.0.7", "@styled-icons/fa-solid": "^10.34.0", @@ -28,7 +28,7 @@ "lodash.memoize": "^4.1.2" }, "devDependencies": { - "@opentripplanner/types": "^6.1.1" + "@opentripplanner/types": "^6.2.0" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/zoom-based-markers/package.json b/packages/zoom-based-markers/package.json index df88b6628..ab26d6021 100644 --- a/packages/zoom-based-markers/package.json +++ b/packages/zoom-based-markers/package.json @@ -19,11 +19,11 @@ "url": "https://github.com/opentripplanner/otp-ui/issues" }, "dependencies": { - "@opentripplanner/core-utils": "^11.1.2", + "@opentripplanner/core-utils": "^11.1.3", "@opentripplanner/base-map": "^3.0.15" }, "devDependencies": { - "@opentripplanner/types": "^6.1.1" + "@opentripplanner/types": "^6.2.0" }, "peerDependencies": { "react": "^16.14.0", diff --git a/yarn.lock b/yarn.lock index 0bd4801d9..917932aaa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3241,16 +3241,6 @@ resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca" integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q== -"@opentripplanner/geocoder@^1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@opentripplanner/geocoder/-/geocoder-1.4.2.tgz#0f827dffca42c7f7a23063b54990a291dd028b80" - integrity sha512-yzMVrKXEHO6Y50j9kntk1+odvHaqn9K9D4aKJAd+EabhiZckesfScLb0updmWRUloEWjN45nuDSFto8fbU7Uiw== - dependencies: - "@conveyal/geocoder-arcgis-geojson" "^0.0.3" - "@conveyal/lonlat" "^1.4.1" - isomorphic-mapzen-search "^1.6.1" - lodash.memoize "^4.1.2" - "@opentripplanner/types@7.0.0-alpha.2": version "7.0.0-alpha.2" resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-7.0.0-alpha.2.tgz#d10c69f99b2da6d1e80ab5989520bde8e558627b" From b2cdbbfe3aea027851ff6fcc95ffc7b08e88be3e Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Sat, 18 Nov 2023 13:55:35 +0100 Subject: [PATCH 21/26] deps: move deps into devdeps --- packages/building-blocks/package.json | 2 +- packages/endpoints-overlay/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json index b7fb07df0..15b1b7561 100644 --- a/packages/building-blocks/package.json +++ b/packages/building-blocks/package.json @@ -9,10 +9,10 @@ "module": "esm/index.js", "private": false, "devDependencies": { + "@opentripplanner/types": "^6.2.0", "@opentripplanner/core-utils": "^11.1.3" }, "peerDependencies": { - "@opentripplanner/types": "^6.2.0", "react": "^16.14.0", "styled-components": "^5.3.0" }, diff --git a/packages/endpoints-overlay/package.json b/packages/endpoints-overlay/package.json index eb3621ddd..b79078b31 100644 --- a/packages/endpoints-overlay/package.json +++ b/packages/endpoints-overlay/package.json @@ -26,10 +26,10 @@ "@styled-icons/fa-solid": "^10.34.0" }, "devDependencies": { + "@opentripplanner/types": "^6.2.0", "@types/flat": "^5.0.2" }, "peerDependencies": { - "@opentripplanner/types": "^6.2.0", "react": "^16.14.0", "react-dom": "^16.8.6", "react-intl": "^5.24.6", From b6fa7aaa02d8776cae0df18095a343d8f5853cdd Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Sat, 18 Nov 2023 13:55:44 +0100 Subject: [PATCH 22/26] revert breaking change in itinerary body --- .../src/otp-react-redux/view-stop-button.tsx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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 index 14d4acb93..ff47f66dd 100644 --- a/packages/itinerary-body/src/otp-react-redux/view-stop-button.tsx +++ b/packages/itinerary-body/src/otp-react-redux/view-stop-button.tsx @@ -5,15 +5,23 @@ import { FormattedMessage } from "react-intl"; import * as S from "../styled"; import { defaultMessages } from "../util"; -interface Props { +interface PropsWithStopId { onStopClick: StopEventHandler; - stop: Stop; + stopId?: string; + stop?: never; } +interface PropsWithStop { + onStopClick: StopEventHandler; + stopId?: never; + stop?: Stop; +} + +type Props = PropsWithStop | PropsWithStopId; export default class ViewStopButton extends Component { onClick = (): void => { - const { onStopClick, stop } = this.props; - onStopClick({ ...stop, stopId: stop.gtfsId }); + const { onStopClick, stop, stopId } = this.props; + onStopClick({ ...stop, stopId: "gtfsId" in stop ? stop.gtfsId : stopId }); }; render(): ReactElement { From 27ff93922f9f4b39165cc91f34ee72ecbbf3a563 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Sat, 18 Nov 2023 14:12:11 +0100 Subject: [PATCH 23/26] sort props --- packages/stops-overlay/src/StopsOverlay.story.tsx | 8 ++++---- packages/stops-overlay/src/index.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/stops-overlay/src/StopsOverlay.story.tsx b/packages/stops-overlay/src/StopsOverlay.story.tsx index b9cc20bae..c12fc2b61 100644 --- a/packages/stops-overlay/src/StopsOverlay.story.tsx +++ b/packages/stops-overlay/src/StopsOverlay.story.tsx @@ -10,20 +10,20 @@ import StopsOverlay, { StopProps } from "."; const center: [number, number] = [45.523092, -122.671202]; const Example = ({ + highlightedStop = "8338", minZoom = 15, setLocation = action("setLocation"), setViewedStop = action("setViewedStop"), - stops = mockStops, - highlightedStop = "8338" + stops = mockStops }: StopProps & { mapCenter?: [number, number] }) => { return ( ); diff --git a/packages/stops-overlay/src/index.tsx b/packages/stops-overlay/src/index.tsx index 19c33b7ea..676416171 100644 --- a/packages/stops-overlay/src/index.tsx +++ b/packages/stops-overlay/src/index.tsx @@ -173,8 +173,8 @@ const StopsOverlay = (props: Props): JSX.Element => { type="circle" /> Date: Mon, 20 Nov 2023 19:47:49 +0100 Subject: [PATCH 24/26] feat(map-popup): pass the whole Stop object on stop click BREAKING CHANGE: Callback handler for setViewedStop needs to handle a Stop object --- packages/map-popup/src/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/map-popup/src/index.tsx b/packages/map-popup/src/index.tsx index 871dea051..f14a8cd0d 100644 --- a/packages/map-popup/src/index.tsx +++ b/packages/map-popup/src/index.tsx @@ -19,7 +19,6 @@ import { makeDefaultGetEntityName } from "./util"; // - the yaml loader for jest returns messages with flattened ids. export const defaultMessages: { [key: string]: string } = flatten(defaultEnglishMessages); - const generateLocation = (entity: Entity, name: string) => { // @ts-expect-error some of these values may be null, but that's ok const { lon: entityLon, lat: entityLat, x, y } = entity From 8ba60ef20e3a0ece345665f0d745ebf6080ea8ae Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Tue, 21 Nov 2023 23:06:07 +0100 Subject: [PATCH 25/26] simplify types --- .../src/otp-react-redux/view-stop-button.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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 index ff47f66dd..43009d8c1 100644 --- a/packages/itinerary-body/src/otp-react-redux/view-stop-button.tsx +++ b/packages/itinerary-body/src/otp-react-redux/view-stop-button.tsx @@ -5,19 +5,12 @@ import { FormattedMessage } from "react-intl"; import * as S from "../styled"; import { defaultMessages } from "../util"; -interface PropsWithStopId { +interface Props { onStopClick: StopEventHandler; stopId?: string; - stop?: never; -} -interface PropsWithStop { - onStopClick: StopEventHandler; - stopId?: never; stop?: Stop; } -type Props = PropsWithStop | PropsWithStopId; - export default class ViewStopButton extends Component { onClick = (): void => { const { onStopClick, stop, stopId } = this.props; From edbdc5d76b85114a5a3121cbf006211619f2546e Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Mon, 27 Nov 2023 14:12:22 -0800 Subject: [PATCH 26/26] deps: update internal dependencies --- packages/base-map/package.json | 2 +- packages/building-blocks/package.json | 2 +- packages/endpoints-overlay/package.json | 2 +- packages/from-to-location-picker/package.json | 2 +- packages/itinerary-body/package.json | 4 ++-- packages/map-popup/package.json | 4 ++-- packages/otp2-tile-overlay/package.json | 2 +- packages/park-and-ride-overlay/package.json | 2 +- packages/printable-itinerary/package.json | 4 ++-- packages/route-viewer-overlay/package.json | 2 +- packages/stop-viewer-overlay/package.json | 2 +- packages/stops-overlay/package.json | 4 ++-- packages/transit-vehicle-overlay/package.json | 4 ++-- packages/transitive-overlay/package.json | 6 +++--- packages/trip-details/package.json | 2 +- packages/vehicle-rental-overlay/package.json | 6 +++--- packages/zoom-based-markers/package.json | 2 +- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/base-map/package.json b/packages/base-map/package.json index fe086744a..6ee4bb5b2 100644 --- 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.2.0", + "@opentripplanner/types": "^6.2.1", "react": "^16.14.0", "styled-components": "^5.3.0" }, diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json index 15b1b7561..2b1a92084 100644 --- a/packages/building-blocks/package.json +++ b/packages/building-blocks/package.json @@ -9,7 +9,7 @@ "module": "esm/index.js", "private": false, "devDependencies": { - "@opentripplanner/types": "^6.2.0", + "@opentripplanner/types": "^6.2.1", "@opentripplanner/core-utils": "^11.1.3" }, "peerDependencies": { diff --git a/packages/endpoints-overlay/package.json b/packages/endpoints-overlay/package.json index 501d47b60..f09dce995 100644 --- a/packages/endpoints-overlay/package.json +++ b/packages/endpoints-overlay/package.json @@ -26,7 +26,7 @@ "@styled-icons/fa-solid": "^10.34.0" }, "devDependencies": { - "@opentripplanner/types": "^6.2.0", + "@opentripplanner/types": "^6.2.1", "@types/flat": "^5.0.2" }, "peerDependencies": { diff --git a/packages/from-to-location-picker/package.json b/packages/from-to-location-picker/package.json index a7a4bfabf..b8cb812d9 100644 --- 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.2.0" + "@opentripplanner/types": "^6.2.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/itinerary-body/package.json b/packages/itinerary-body/package.json index 809860dfd..fd1087a2d 100644 --- a/packages/itinerary-body/package.json +++ b/packages/itinerary-body/package.json @@ -12,7 +12,7 @@ "dependencies": { "@opentripplanner/core-utils": "^11.1.3", "@opentripplanner/humanize-distance": "^1.2.0", - "@opentripplanner/icons": "^2.0.6", + "@opentripplanner/icons": "^2.0.7", "@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.2.0", + "@opentripplanner/types": "^6.2.1", "@types/flat": "^5.0.2" }, "peerDependencies": { diff --git a/packages/map-popup/package.json b/packages/map-popup/package.json index e721b1de3..a17e20411 100644 --- a/packages/map-popup/package.json +++ b/packages/map-popup/package.json @@ -13,11 +13,11 @@ "dependencies": { "@opentripplanner/base-map": "^3.0.15", "@opentripplanner/core-utils": "^11.1.3", - "@opentripplanner/from-to-location-picker": "^2.1.10", + "@opentripplanner/from-to-location-picker": "^2.1.11", "flat": "^5.0.2" }, "devDependencies": { - "@opentripplanner/types": "^6.2.0" + "@opentripplanner/types": "^6.2.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/otp2-tile-overlay/package.json b/packages/otp2-tile-overlay/package.json index ca156c6bd..f4f517f3c 100644 --- a/packages/otp2-tile-overlay/package.json +++ b/packages/otp2-tile-overlay/package.json @@ -20,6 +20,6 @@ }, "devDependencies": { "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/types": "^6.2.0" + "@opentripplanner/types": "^6.2.1" } } diff --git a/packages/park-and-ride-overlay/package.json b/packages/park-and-ride-overlay/package.json index 1a9f60d75..b14585cd3 100644 --- a/packages/park-and-ride-overlay/package.json +++ b/packages/park-and-ride-overlay/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/from-to-location-picker": "^2.1.10" + "@opentripplanner/from-to-location-picker": "^2.1.11" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/printable-itinerary/package.json b/packages/printable-itinerary/package.json index 6145e990d..8da2cc3d5 100644 --- a/packages/printable-itinerary/package.json +++ b/packages/printable-itinerary/package.json @@ -11,10 +11,10 @@ "private": false, "dependencies": { "@opentripplanner/core-utils": "^11.1.3", - "@opentripplanner/itinerary-body": "^5.1.2" + "@opentripplanner/itinerary-body": "^5.1.5" }, "devDependencies": { - "@opentripplanner/icons": "^2.0.6" + "@opentripplanner/icons": "^2.0.7" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/route-viewer-overlay/package.json b/packages/route-viewer-overlay/package.json index 483b8452f..38b0e34d5 100644 --- a/packages/route-viewer-overlay/package.json +++ b/packages/route-viewer-overlay/package.json @@ -25,7 +25,7 @@ "point-in-polygon": "^1.1.0" }, "devDependencies": { - "@opentripplanner/types": "^6.2.0", + "@opentripplanner/types": "^6.2.1", "point-in-polygon": "^1.1.0" }, "peerDependencies": { diff --git a/packages/stop-viewer-overlay/package.json b/packages/stop-viewer-overlay/package.json index bfe345bdd..a0e1d65f2 100644 --- a/packages/stop-viewer-overlay/package.json +++ b/packages/stop-viewer-overlay/package.json @@ -23,7 +23,7 @@ "@opentripplanner/core-utils": "^11.1.3" }, "devDependencies": { - "@opentripplanner/types": "^6.2.0" + "@opentripplanner/types": "^6.2.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/stops-overlay/package.json b/packages/stops-overlay/package.json index e61916fa8..d58ad5c18 100644 --- a/packages/stops-overlay/package.json +++ b/packages/stops-overlay/package.json @@ -20,12 +20,12 @@ }, "dependencies": { "@opentripplanner/base-map": "^3.0.15", - "@opentripplanner/from-to-location-picker": "^2.1.10", + "@opentripplanner/from-to-location-picker": "^2.1.11", "@opentripplanner/map-popup": "^2.0.7-alpha.1", "flat": "^5.0.2" }, "devDependencies": { - "@opentripplanner/types": "^6.2.0", + "@opentripplanner/types": "^6.2.1", "styled-icons": "^10.34.0" }, "peerDependencies": { diff --git a/packages/transit-vehicle-overlay/package.json b/packages/transit-vehicle-overlay/package.json index 7cdea36b4..3f47b0dfa 100644 --- a/packages/transit-vehicle-overlay/package.json +++ b/packages/transit-vehicle-overlay/package.json @@ -11,11 +11,11 @@ "dependencies": { "@opentripplanner/base-map": "^3.0.15", "@opentripplanner/core-utils": "^11.1.3", - "@opentripplanner/icons": "^2.0.6", + "@opentripplanner/icons": "^2.0.7", "flat": "^5.0.2" }, "devDependencies": { - "@opentripplanner/types": "^6.2.0" + "@opentripplanner/types": "^6.2.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/transitive-overlay/package.json b/packages/transitive-overlay/package.json index 60da18ab7..124e095a9 100644 --- a/packages/transitive-overlay/package.json +++ b/packages/transitive-overlay/package.json @@ -22,7 +22,7 @@ "@mapbox/polyline": "^1.1.1", "@opentripplanner/base-map": "^3.0.15", "@opentripplanner/core-utils": "^11.1.3", - "@opentripplanner/itinerary-body": "^5.1.2", + "@opentripplanner/itinerary-body": "^5.1.5", "@turf/bbox": "^6.5.0", "@turf/bearing": "^6.5.0", "@turf/destination": "^6.5.0", @@ -32,8 +32,8 @@ "lodash.isequal": "^4.5.0" }, "devDependencies": { - "@opentripplanner/endpoints-overlay": "^2.0.10", - "@opentripplanner/types": "^6.2.0" + "@opentripplanner/endpoints-overlay": "^2.0.11", + "@opentripplanner/types": "^6.2.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/trip-details/package.json b/packages/trip-details/package.json index e70ed0b22..c7bae0045 100644 --- a/packages/trip-details/package.json +++ b/packages/trip-details/package.json @@ -17,7 +17,7 @@ "react-animate-height": "^3.0.4" }, "devDependencies": { - "@opentripplanner/types": "^6.2.0", + "@opentripplanner/types": "^6.2.1", "@types/flat": "^5.0.2" }, "peerDependencies": { diff --git a/packages/vehicle-rental-overlay/package.json b/packages/vehicle-rental-overlay/package.json index 306f02a33..92619fcd4 100644 --- a/packages/vehicle-rental-overlay/package.json +++ b/packages/vehicle-rental-overlay/package.json @@ -21,14 +21,14 @@ "dependencies": { "@opentripplanner/base-map": "^3.0.15", "@opentripplanner/core-utils": "^11.1.3", - "@opentripplanner/from-to-location-picker": "^2.1.10", - "@opentripplanner/map-popup": "^2.0.7", + "@opentripplanner/from-to-location-picker": "^2.1.11", + "@opentripplanner/map-popup": "^2.0.8", "@styled-icons/fa-solid": "^10.34.0", "flat": "^5.0.2", "lodash.memoize": "^4.1.2" }, "devDependencies": { - "@opentripplanner/types": "^6.2.0" + "@opentripplanner/types": "^6.2.1" }, "peerDependencies": { "react": "^16.14.0", diff --git a/packages/zoom-based-markers/package.json b/packages/zoom-based-markers/package.json index ab26d6021..67a16fca0 100644 --- a/packages/zoom-based-markers/package.json +++ b/packages/zoom-based-markers/package.json @@ -23,7 +23,7 @@ "@opentripplanner/base-map": "^3.0.15" }, "devDependencies": { - "@opentripplanner/types": "^6.2.0" + "@opentripplanner/types": "^6.2.1" }, "peerDependencies": { "react": "^16.14.0",