Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(connected-endpoints-overlay): Pass nearby to endpoint overlay #1335

Merged
merged 7 commits into from
Jan 23, 2025
Merged

feat(connected-endpoints-overlay): Pass nearby to endpoint overlay #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ffec4f3
feat(connected-endpoints-overlay): Pass nearby to endpoint overlay
amy-corson-ibigroup Jan 6, 2025
472a0aa
Merge branch 'dev' into pass-stop-viewer-to-endpoint
amy-corson-ibigroup Jan 6, 2025
e74a07d
Update to reflect otp-ui changes
amy-corson-ibigroup Jan 8, 2025
bae3ae3
Merge branch 'pass-stop-viewer-to-endpoint' of https://github.com/ope…
amy-corson-ibigroup Jan 8, 2025
ba29c13
Update endpoint-overlay package
amy-corson-ibigroup Jan 15, 2025
496f463
Merge branch 'dev' into pass-stop-viewer-to-endpoint
amy-corson-ibigroup Jan 15, 2025
3939f3a
Merge branch 'dev' into pass-stop-viewer-to-endpoint
amy-corson-ibigroup Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/components/map/connected-endpoints-overlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { connect } from 'react-redux'
import { IntlShape, useIntl } from 'react-intl'
import { UserLocationAndType } from '@opentripplanner/types'
import { Location, UserLocationAndType } from '@opentripplanner/types'
import EndpointsOverlay from '@opentripplanner/endpoints-overlay'
import React, { ComponentProps, useCallback } from 'react'

Expand All @@ -13,16 +13,19 @@ import {
} from '../../actions/user'
import { getActiveSearch, getShowUserSettings } from '../../util/state'
import { setLocation } from '../../actions/map'
import { setViewedStop } from '../../actions/ui'
import { toastOnPlaceSaved } from '../util/toasts'

type Props = ComponentProps<typeof EndpointsOverlay> & {
forgetPlace: (place: string, intl: IntlShape) => void
rememberPlace: (arg: UserLocationAndType, intl: IntlShape) => number
setViewedStop: (arg: Location) => void
}

const ConnectedEndpointsOverlay = ({
forgetPlace,
rememberPlace,
setViewedStop,
...otherProps
}: Props): JSX.Element => {
const intl = useIntl()
Expand All @@ -47,6 +50,7 @@ const ConnectedEndpointsOverlay = ({
{...otherProps}
forgetPlace={_forgetPlace}
rememberPlace={_rememberPlace}
setViewNearby={setViewedStop}
/>
)
}
Expand Down Expand Up @@ -89,7 +93,8 @@ const mapDispatchToProps = {
clearLocation,
forgetPlace,
rememberPlace,
setLocation
setLocation,
setViewedStop
}

export default connect(
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@opentripplanner/base-map": "4.0.0",
"@opentripplanner/building-blocks": "2.1.0",
"@opentripplanner/core-utils": "12.0.1",
"@opentripplanner/endpoints-overlay": "3.0.1",
"@opentripplanner/endpoints-overlay": "3.1.0",
"@opentripplanner/from-to-location-picker": "3.0.0",
"@opentripplanner/geocoder": "^3.0.2",
"@opentripplanner/humanize-distance": "^1.2.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2451,10 +2451,10 @@
lodash.isequal "^4.5.0"
qs "^6.9.1"

"@opentripplanner/endpoints-overlay@3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@opentripplanner/endpoints-overlay/-/endpoints-overlay-3.0.1.tgz#b6b8e2f08ae41fbaad475fc0f0fe3e72d7d36463"
integrity sha512-X3T0GM8U+VU/mOOSNUgj6fVcjAKMeciKFYnQNbKiNgNeDHa5JltwvtXsM4x3wCLP2xAF6jH/HTWJmYmsfLPlAw==
"@opentripplanner/endpoints-overlay@3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@opentripplanner/endpoints-overlay/-/endpoints-overlay-3.1.0.tgz#92ad54ed9445385e25c2a968f700945ae4fc9315"
integrity sha512-FxQrd/nDIP9Tq5yfMFVgWx0QIXmy64y521r6yFCNsY/rBLSAtnLCVMLNUW+bCtdo3IUpeSpqshJDLYHHDHpa/g==
dependencies:
"@opentripplanner/base-map" "^4.0.0"
"@opentripplanner/building-blocks" "^2.0.0"
Expand Down
Loading