Location Groups July 2024 #1017
Open
Conversation
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
7 tasks
miles-grant-ibigroup
added
WIP
BLOCKED
fix: define and document MAP_BASE_URL to prevent gray maps
|
Excited for this update! |
miles-grant-ibigroup
removed
the
BLOCKED
| if (refetch) { | ||
| dispatch(fetchGTFSEntities({ | ||
| namespace, | ||
| id: savedEntity.id, |
There was a problem hiding this comment.
Sort attributes (2 instances)
| dispatch(receivedNewEntity({component: 'locationgroupstop', entity: savedEntity})) | ||
| } | ||
| }) | ||
| return dispatch(secureFetch(locationGroupUrl, method, data)) |
There was a problem hiding this comment.
The two big dispatch blocks are almost the same... Would it be possible to extract them (such as saveEntity('locationgroup', locationGroupUrl) and same for locationgroupstop)?
| @@ -207,8 +208,7 @@ export function addStopAtInterval (latlng: LatLng, activePattern: Pattern, contr | |||
| const stopControlPoint = result.controlPoints[controlPoints.length + index] | |||
| const patternStop = stopToPatternStop(s) | |||
| // Set pattern stop's shape dist traveled. | |||
| if (patternHaltIsStop(patternStop)) { | |||
There was a problem hiding this comment.
Didn't expect TS to make us inline so much code...
| patternStop={patternStop} /> | ||
| } | ||
| if (locationGroup) { | ||
| // 2024 TODO: support rendering location groups. will be tricky. need to |
There was a problem hiding this comment.
Remove "2024" or replace with "2025"!
|
|
||
| // find center to simulate stop | ||
| const center = centerOfMass(turfPolygon([polygon])) | ||
| if (center.geometry.coordinates) { |
There was a problem hiding this comment.
Extract a variable for center.geometry.coordinates.
| } | ||
| addStopToPattern={addStopToPattern} | ||
| index={index} | ||
| key={patternStop.id} |
There was a problem hiding this comment.
Should key be the same as ref? The ref value implies that key could be null.
| @@ -122,6 +124,7 @@ export default class EditShapePanel extends Component<Props> { | |||
| saveActiveGtfsEntity, | |||
| showConfirmModal, | |||
| stops, | |||
| locations, locationGroups, | |||
There was a problem hiding this comment.
Insert new line between props.
| cardBackground = 'hsla(187, 84%, 87%, 0.5)' | ||
| } | ||
| // $FlowFixMe flexDefaultTravelTime doens't exist on a PatternStop, which is the point of this check |
There was a problem hiding this comment.
Typo
Suggested change
| // $FlowFixMe flexDefaultTravelTime doens't exist on a PatternStop, which is the point of this check | |
| // $FlowFixMe flexDefaultTravelTime doesn't exist on a PatternStop, which is the point of this check |
Comment on lines
+303
to
315
| if (patternStop.stopId !== null) { | ||
| this.setState({ | ||
| // $FlowFixMe flow doesn't like our "type check" | ||
| initialDwellTime: patternStop.defaultDwellTime, | ||
| // $FlowFixMe flow doesn't like our "type check" | ||
| initialTravelTime: patternStop.defaultTravelTime, | ||
| initialDwellTime: patternStop.defaultDwellTime || undefined, | ||
| initialTravelTime: patternStop.defaultTravelTime || undefined, | ||
| update: false | ||
| }) | ||
| } else { | ||
| // If patternStop is not a fixed stop, it is a flex location/location group. | ||
| this.setState({ | ||
| // $FlowFixMe flow doesn't like our "type check" | ||
| flexDefaultZoneTime: patternStop.flexDefaultZoneTime, | ||
| // $FlowFixMe flow doesn't like our "type check" | ||
| flexDefaultTravelTime: patternStop.flexDefaultTravelTime, | ||
| // $FlowFixMe flow doesn't like our "type check" | ||
| meanDurationFactor: patternStop.meanDurationFactor, | ||
| // $FlowFixMe flow doesn't like our "type check" | ||
| meanDurationOffset: patternStop.meanDurationOffset, | ||
| // $FlowFixMe flow doesn't like our "type check" | ||
| safeDurationFactor: patternStop.safeDurationFactor, | ||
| // $FlowFixMe flow doesn't like our "type check" | ||
| safeDurationOffset: patternStop.safeDurationOffset, | ||
| defaultDwellTime: patternStop.defaultDwellTime || undefined, | ||
| defaultTravelTime: patternStop.defaultTravelTime || undefined, | ||
| update: false | ||
| }) |
There was a problem hiding this comment.
Contents in the if and else portions is the same, so you can remove the condition entirely.
| stop = locationGroups.find(lg => lg.location_group_id === card.locationGroupId) | ||
| // $FlowFixMe flow doesn't appreciate our type check | ||
| cumulativeTravelTime += card.flexDefaultZoneTime + card.flexDefaultTravelTime | ||
| cumulativeTravelTime += card.defaultDwellTime + card.defaultTravelTime |
There was a problem hiding this comment.
cumulativeTravelTime should be computed once for all the cases.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Location Group support following latest flex spec. Works with data tools-server
dev-flexbranch