-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1058 from opentripplanner/itin-summary-overlay
Itinerary Summary Overlay
- Loading branch information
Showing
11 changed files
with
267 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,241 @@ | ||
| import { connect } from 'react-redux' | ||
| import { Feature, lineString, LineString, Position } from '@turf/helpers' | ||
| import { Itinerary, Location } from '@opentripplanner/types' | ||
| import { Marker } from 'react-map-gl' | ||
| import centroid from '@turf/centroid' | ||
| import distance from '@turf/distance' | ||
| import polyline from '@mapbox/polyline' | ||
| import React, { useContext, useState } from 'react' | ||
| import styled from 'styled-components' | ||
|
|
||
| import * as narriativeActions from '../../actions/narrative' | ||
| import { AppReduxState } from '../../util/state-types' | ||
| import { boxShadowCss } from '../form/batch-styled' | ||
| import { ComponentContext } from '../../util/contexts' | ||
| import { doMergeItineraries } from '../narrative/narrative-itineraries' | ||
| import { | ||
| getActiveItinerary, | ||
| getActiveSearch, | ||
| getVisibleItineraryIndex | ||
| } from '../../util/state' | ||
| import MetroItineraryRoutes from '../narrative/metro/metro-itinerary-routes' | ||
|
|
||
| type ItinWithGeometry = Itinerary & { | ||
| allLegGeometry: Feature<LineString> | ||
| allStartTimes?: Itinerary[] | ||
| index?: number | ||
| } | ||
|
|
||
| type Props = { | ||
| from: Location | ||
| itins: Itinerary[] | ||
| setActiveItinerary: ({ index }: { index: number | null | undefined }) => void | ||
| setVisibleItinerary: ({ index }: { index: number | null | undefined }) => void | ||
| to: Location | ||
| visible?: boolean | ||
| visibleItinerary?: number | ||
| } | ||
|
|
||
| const Card = styled.div` | ||
| ${boxShadowCss} | ||
| background: #fffffffa; | ||
| border-radius: 5px; | ||
| padding: 6px; | ||
| align-items: center; | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| span { | ||
| span { | ||
| span { | ||
| max-height: 28px; | ||
| min-height: 20px; | ||
| } | ||
| } | ||
| } | ||
| div { | ||
| margin-top: -0px!important; | ||
| } | ||
| .route-block-wrapper span { | ||
| padding: 0px; | ||
| } | ||
| * { | ||
| height: 26px; | ||
| } | ||
| } | ||
| ` | ||
|
|
||
| function addItinLineString(itin: Itinerary): ItinWithGeometry { | ||
| return { | ||
| ...itin, | ||
| allLegGeometry: lineString( | ||
| itin.legs.flatMap((leg) => polyline.decode(leg.legGeometry.points)) | ||
| ) | ||
| } | ||
| } | ||
| function addTrueIndex(array: ItinWithGeometry[]): ItinWithGeometry[] { | ||
| for (let i = 0; i < array.length; i++) { | ||
| const prevIndex = array?.[i - 1]?.index | ||
| const itin = array[i] | ||
| const nextIndex = itin?.allStartTimes?.length ?? 1 | ||
| array[i] = { | ||
| ...itin, | ||
| index: (prevIndex ?? -1) + nextIndex | ||
| } | ||
| } | ||
| return array | ||
| } | ||
|
|
||
| type ItinUniquePoint = { | ||
| itin: ItinWithGeometry | ||
| uniquePoint: Position | ||
| } | ||
|
|
||
| function getUniquePoint( | ||
| thisItin: ItinWithGeometry, | ||
| otherPoints: ItinUniquePoint[] | ||
| ): ItinUniquePoint { | ||
| const otherMidpoints = otherPoints.map((mp) => mp.uniquePoint) | ||
| let maxDistance = -Infinity | ||
| const line = thisItin.allLegGeometry | ||
| const centerOfLine = centroid(line).geometry.coordinates | ||
| let uniquePoint = centerOfLine | ||
|
|
||
| line.geometry.coordinates.forEach((point) => { | ||
| const totalDistance = otherMidpoints.reduce( | ||
| (prev, cur) => (prev += distance(point, cur)), | ||
| 0 | ||
| ) | ||
|
|
||
| const selfDistance = distance(point, centerOfLine) | ||
| // maximize distance from all other points while minimizing distance to center of our own line | ||
| const averageDistance = totalDistance / otherMidpoints.length - selfDistance | ||
|
|
||
| if (averageDistance > maxDistance) { | ||
| maxDistance = averageDistance | ||
| uniquePoint = point | ||
| } | ||
| }) | ||
| return { itin: thisItin, uniquePoint } | ||
| } | ||
|
|
||
| const ItinerarySummaryOverlay = ({ | ||
| itins, | ||
| setActiveItinerary: setActive, | ||
| setVisibleItinerary: setVisible, | ||
| visible, | ||
| visibleItinerary | ||
| }: Props) => { | ||
| // @ts-expect-error React context is populated dynamically | ||
| const { LegIcon } = useContext(ComponentContext) | ||
|
|
||
| const [sharedTimeout, setSharedTimeout] = useState<null | NodeJS.Timeout>( | ||
| null | ||
| ) | ||
|
|
||
| if (!itins || !visible) return <></> | ||
| const mergedItins: ItinWithGeometry[] = addTrueIndex( | ||
| doMergeItineraries(itins).mergedItineraries.map(addItinLineString) | ||
| ) | ||
|
|
||
| const midPoints = mergedItins.reduce<ItinUniquePoint[]>((prev, curItin) => { | ||
| prev.push(getUniquePoint(curItin, prev)) | ||
| return prev | ||
| }, []) | ||
| // The first point is probably not well placed, so let's run the algorithm again | ||
| if (midPoints.length > 1) { | ||
| midPoints[0] = getUniquePoint(mergedItins[0], midPoints) | ||
| } | ||
|
|
||
| try { | ||
| return ( | ||
| <> | ||
| {midPoints.map( | ||
| (mp) => | ||
| // If no itinerary is hovered, show all of them. If one is selected, show only that one | ||
| // TODO: clean up conditionals, move these to a more appropriate place without breaking indexing | ||
| (visibleItinerary !== null && visibleItinerary !== undefined | ||
| ? visibleItinerary === mp.itin.index | ||
| : true) && | ||
| mp.uniquePoint && ( | ||
| <Marker | ||
| key={mp.itin.duration} | ||
| latitude={mp.uniquePoint[0]} | ||
| longitude={mp.uniquePoint[1]} | ||
| style={{ cursor: 'pointer' }} | ||
| > | ||
| <Card | ||
| onClick={() => { | ||
| setActive({ index: mp.itin.index }) | ||
| }} | ||
| // TODO: useCallback here (getting weird errors?) | ||
| onMouseEnter={() => { | ||
| setSharedTimeout( | ||
| setTimeout(() => { | ||
| setVisible({ index: mp.itin.index }) | ||
| }, 150) | ||
| ) | ||
| }} | ||
| onMouseLeave={() => { | ||
| sharedTimeout && clearTimeout(sharedTimeout) | ||
| setVisible({ index: null }) | ||
| }} | ||
| > | ||
| <MetroItineraryRoutes | ||
| expanded={false} | ||
| itinerary={mp.itin} | ||
| LegIcon={LegIcon} | ||
| /> | ||
| </Card> | ||
| </Marker> | ||
| ) | ||
| )} | ||
| </> | ||
| ) | ||
| } catch (error) { | ||
| console.warn(`Can't create geojson from route: ${error}`) | ||
| return <></> | ||
| } | ||
| } | ||
|
|
||
| const mapStateToProps = (state: AppReduxState) => { | ||
| const { activeSearchId, config } = state.otp | ||
| if (config.itinerary?.previewOverlay !== true) { | ||
| return {} | ||
| } | ||
| if (!activeSearchId) return {} | ||
|
|
||
| const visibleItinerary = getVisibleItineraryIndex(state) | ||
| const activeItinerary = getActiveItinerary(state) | ||
|
|
||
| const activeSearch = getActiveSearch(state) | ||
| // @ts-expect-error state is not typed | ||
| const itins = activeSearch?.response.flatMap( | ||
| (serverResponse: { plan?: { itineraries?: Itinerary[] } }) => | ||
| serverResponse?.plan?.itineraries | ||
| ) | ||
|
|
||
| // @ts-expect-error state is not typed | ||
| const query = activeSearch ? activeSearch?.query : state.otp.currentQuery | ||
| const { from, to } = query | ||
|
|
||
| return { | ||
| from, | ||
| itins, | ||
| to, | ||
| visible: activeItinerary === undefined || activeItinerary === null, | ||
| visibleItinerary | ||
| } | ||
| } | ||
|
|
||
| const mapDispatchToProps = { | ||
| setActiveItinerary: narriativeActions.setActiveItinerary, | ||
| setVisibleItinerary: narriativeActions.setVisibleItinerary | ||
| } | ||
|
|
||
| export default connect( | ||
| mapStateToProps, | ||
| mapDispatchToProps | ||
| )(ItinerarySummaryOverlay) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters