|
1 | 1 | import coreUtils from '@opentripplanner/core-utils' |
2 | 2 | import TransitiveCanvasOverlay from '@opentripplanner/transitive-overlay' |
| 3 | +import React, { Component } from 'react' |
3 | 4 | import { connect } from 'react-redux' |
4 | 5 |
|
5 | | -import { getActiveSearch, getActiveItinerary, getActiveItineraries } from '../../util/state' |
| 6 | +import { ComponentContext } from '../../util/contexts' |
| 7 | +import { getActiveItinerary, getActiveItineraries, getActiveSearch } from '../../util/state' |
| 8 | + |
| 9 | +/** |
| 10 | + * Wrapper for TransitiveCanvasOverlay that passes getTransitiveRouteLabel defined in ComponentContext. |
| 11 | + */ |
| 12 | +class TransitiveCanvasOverlayWithContext extends Component { |
| 13 | + static contextType = ComponentContext |
| 14 | + |
| 15 | + render () { |
| 16 | + const { activeSearchResponseOtp, activeSearchVisibleItinerary, ...otherProps } = this.props |
| 17 | + let transitiveData = null |
| 18 | + if (activeSearchVisibleItinerary) { |
| 19 | + transitiveData = coreUtils.map.itineraryToTransitive(activeSearchVisibleItinerary, null, this.context.getTransitiveRouteLabel) |
| 20 | + } else if (activeSearchResponseOtp) { |
| 21 | + transitiveData = activeSearchResponseOtp |
| 22 | + } |
| 23 | + |
| 24 | + return <TransitiveCanvasOverlay {...otherProps} transitiveData={transitiveData} /> |
| 25 | + } |
| 26 | +} |
6 | 27 |
|
7 | 28 | // connect to the redux store |
8 | 29 |
|
9 | 30 | const mapStateToProps = (state, ownProps) => { |
10 | 31 | const activeSearch = getActiveSearch(state.otp) |
11 | | - let transitiveData = null |
12 | | - if ( |
13 | | - activeSearch && |
14 | | - activeSearch.query.routingType === 'ITINERARY' && |
15 | | - activeSearch.response && |
16 | | - activeSearch.response.length > 0 |
17 | | - ) { |
18 | | - // FIXME: This may need some simplification. |
19 | | - const itins = getActiveItineraries(state.otp) |
20 | | - const visibleIndex = activeSearch.visibleItinerary !== undefined && activeSearch.visibleItinerary !== null |
21 | | - ? activeSearch.visibleItinerary |
22 | | - : activeSearch.activeItinerary |
23 | | - // TODO: prevent itineraryToTransitive() from being called more than needed |
24 | | - const visibleItinerary = itins[visibleIndex] ? itins[visibleIndex] : getActiveItinerary(state.otp) |
25 | | - if (visibleItinerary) transitiveData = coreUtils.map.itineraryToTransitive(visibleItinerary) |
26 | | - } else if ( |
27 | | - activeSearch && |
28 | | - activeSearch.response && |
29 | | - activeSearch.response.otp |
30 | | - ) { |
31 | | - transitiveData = activeSearch.response.otp |
32 | | - } |
33 | | - |
| 32 | + const { activeItinerary, query, response, visibleItinerary } = activeSearch || {} |
34 | 33 | const { labeledModes, styles } = state.otp.config.map.transitive || {} |
| 34 | + let activeSearchVisibleItinerary = null |
| 35 | + let activeSearchResponseOtp = null |
| 36 | + |
| 37 | + if (response) { |
| 38 | + if (query.routingType === 'ITINERARY' && response.length > 0) { |
| 39 | + // FIXME: This may need some simplification. |
| 40 | + const itins = getActiveItineraries(state.otp) |
| 41 | + const visibleIndex = visibleItinerary !== undefined && visibleItinerary !== null |
| 42 | + ? visibleItinerary |
| 43 | + : activeItinerary |
| 44 | + // TODO: prevent itineraryToTransitive() from being called more than needed |
| 45 | + activeSearchVisibleItinerary = itins[visibleIndex] || getActiveItinerary(state.otp) |
| 46 | + } else if (response.otp) { |
| 47 | + activeSearchResponseOtp = response.otp |
| 48 | + } |
| 49 | + } |
35 | 50 |
|
36 | 51 | return { |
37 | | - activeItinerary: activeSearch && activeSearch.activeItinerary, |
| 52 | + activeItinerary, |
| 53 | + activeSearchResponseOtp, |
| 54 | + activeSearchVisibleItinerary, |
38 | 55 | labeledModes, |
39 | | - routingType: activeSearch && activeSearch.query && activeSearch.query.routingType, |
| 56 | + routingType: query && query.routingType, |
40 | 57 | styles, |
41 | | - transitiveData, |
42 | 58 | visible: true |
43 | 59 | } |
44 | 60 | } |
45 | 61 |
|
46 | | -export default connect(mapStateToProps)(TransitiveCanvasOverlay) |
| 62 | +export default connect(mapStateToProps)(TransitiveCanvasOverlayWithContext) |
0 commit comments