Merge pull request #988 from ibi-group/add-stop-headsigns-for-mtc

Add stop headsigns for MTC

Author: miles-grant-ibigroup

__tests__/test-utils/mock-data/editor.js

@@ -12,6 +12,7 @@ export const mockTripWithoutStopTimes = {
   shape_id: '19',
   stopTimes: [],
   tripHeadsign: 'Walla Walla',
+  stopHeadsign: 'North',
   tripId: 'test-trip-id-1',
   tripShortName: null,
   wheelchair_accessible: null

i18n/english.yml

@@ -548,6 +548,37 @@ components:
       high: High
       low: Low
       medium: Medium
+      title: Usage tier
+  PageNotFound:
+    homePage: home page
+    pageNotFound: Page Not Found.
+  PatternStopCard:
+    PatternStopContents:
+      defaultDwellTime: Default dwell time
+      defaultTravelTime: Default travel time
+      firstStopTravelTime: Travel time for first stop must be zero
+      stopHeadsignPlaceholder: Outbound
+      stopHeadsignText: Stop headsign
+      stopHeadsignTitle: Headsign that overrides trip headsign between stops.
+      timepoint: Timepoint?
+      travelTimeHelp: Define the default time it takes to travel to this stop from the previous stop.
+    PickupDropOffSelect:
+      available: Available (0)
+      continuousDropOffTitle: Indicates whether a rider can alight from the transit vehicle at any point along the vehicle's travel path.
+      continuousPickupTitle: Indicates whether a rider can board the transit vehicle anywhere along the vehicle's travel path.
+      continuousServiceDefault: (Inherit from route)
+      dropOffTitle: Define the dropff method/availability at this stop.
+      mustCoordinate: Must coordinate with driver to arrange (3)
+      mustPhoneAgency: Must phone agency to arrange (2)
+      notAvailable: Not available (1)
+      pickupDropOffDefault: (Default - Available)
+      pickupTitle: Define the pickup method/availability at this stop.
+  Permissions:
+    approve-alert: Approve GTFS-RT Alerts
+    approve-gtfs: Approve GTFS Feeds
+    edit-alert: Edit GTFS-RT Alerts
+    edit-gtfs: Edit GTFS Feeds
+    manage-feed: Manage Feed Configuration
   ProjectAccessSettings:
     admin: Admin
     cannotFetchFeeds: Cannot fetch feeds

lib/editor/components/pattern/PatternStopCard.js

@@ -19,6 +19,7 @@ import * as stopStrategiesActions from '../../actions/map/stopStrategies'
 import * as tripPatternActions from '../../actions/tripPattern'
 import {getEntityName, getAbbreviatedStopName} from '../../util/gtfs'
 import MinuteSecondInput from '../MinuteSecondInput'
+import {getComponentMessages} from '../../../common/util/config'
 import type {Feed, Pattern, PatternStop} from '../../../types'
 
 import NormalizeStopTimesTip from './NormalizeStopTimesTip'
@@ -55,7 +56,7 @@ type PickupDropoffSelectProps = {
   activePattern: Pattern,
   controlLabel: string,
   onChange: (evt: SyntheticInputEvent<HTMLInputElement>) => void,
-  selectType: string,
+  selectType: "pickupType" | "dropOffType" | "continuousPickup" | "continuousDropOff",
   shouldHaveDisabledOption: boolean,
   title: string,
   value: string | number
@@ -67,22 +68,27 @@ type State = {
   update: boolean
 }
 
+const patternStopCardMessages = getComponentMessages('PatternStopCard')
+
 const pickupDropoffOptions = [
   {
-    value: 0,
-    text: 'Available (0)'
+    value: '' // Default text is defined conditionally based on the type of select (continuous-service or pickup-dropoff)
+  },
+  {
+    text: patternStopCardMessages('PickupDropOffSelect.available'),
+    value: 0
   },
   {
-    value: 1,
-    text: 'Not available (1)'
+    text: patternStopCardMessages('PickupDropOffSelect.notAvailable'),
+    value: 1
   },
   {
-    value: 2,
-    text: 'Must phone agency to arrange (2)'
+    text: patternStopCardMessages('PickupDropOffSelect.mustPhoneAgency'),
+    value: 2
   },
   {
-    value: 3,
-    text: 'Must coordinate with driver to arrange (3)'
+    text: patternStopCardMessages('PickupDropOffSelect.mustCoordinate'),
+    value: 3
   }
 ]
 
@@ -117,7 +123,11 @@ const PickupDropoffSelect = (props: PickupDropoffSelectProps) => {
         value={value}
       >
         {pickupDropoffOptions.map(o => (
-          <option key={o.value} value={o.value}>{o.text}</option>
+          <option key={o.value} value={o.value}>
+            {o.value !== '' ? o.text : selectType.includes('continuous')
+              ? patternStopCardMessages('PickupDropOffSelect.continuousServiceDefault')
+              : patternStopCardMessages('PickupDropOffSelect.pickupDropOffDefault') }
+          </option>
         ))}
       </FormControl>
     </FormGroup>
@@ -334,6 +344,18 @@ class PatternStopContents extends Component<Props, State> {
     updatePatternStops(activePattern, patternStops)
   }
 
+  _onHeadsignChange = (e: SyntheticInputEvent<HTMLInputElement>) => {
+    const {activePattern, index, updatePatternStops} = this.props
+    const patternStops = [...activePattern.patternStops]
+    patternStops[index] = {
+      ...patternStops[index],
+      stopHeadsign: e.target.value
+    }
+
+    this.setState({update: true})
+    updatePatternStops(activePattern, patternStops)
+  }
+
   render () {
     const {active, activePattern, patternEdited, patternStop} = this.props
     // This component has a special shouldComponentUpdate to ensure that state
@@ -350,7 +372,7 @@ class PatternStopContents extends Component<Props, State> {
             <Checkbox
               checked={patternStop.timepoint}
               onChange={this._onChangeTimepoint}>
-              Timepoint?
+              {patternStopCardMessages('PatternStopContents.timepoint')}
             </Checkbox>
           </Col>
           <Col xs={8}>
@@ -369,10 +391,10 @@ class PatternStopContents extends Component<Props, State> {
               bsSize='small'>
               <ControlLabel
                 title={this.props.index === 0
-                  ? 'Travel time for first stop must be zero'
-                  : 'Define the default time it takes to travel to this stop from the previous stop.'
+                  ? patternStopCardMessages('PatternStopContents.firstStopTravelTime')
+                  : patternStopCardMessages('PatternStopContents.travelTimeHelp')
                 }
-                className='small'>Default travel time</ControlLabel>
+                className='small'>{patternStopCardMessages('PatternStopContents.defaultTravelTime')}</ControlLabel>
               <MinuteSecondInput
                 disabled={this.props.index === 0}
                 seconds={this.state.initialTravelTime}
@@ -383,7 +405,7 @@ class PatternStopContents extends Component<Props, State> {
             <FormGroup
               controlId='defaultDwellTime'
               bsSize='small'>
-              <ControlLabel className='small'>Default dwell time</ControlLabel>
+              <ControlLabel className='small'>{patternStopCardMessages('PatternStopContents.defaultDwellTime')}</ControlLabel>
               <MinuteSecondInput
                 seconds={this.state.initialDwellTime}
                 onChange={this._onDwellTimeChange} />
@@ -399,8 +421,8 @@ class PatternStopContents extends Component<Props, State> {
               onChange={this._onPickupOrDropOffChange}
               selectType='pickupType'
               shouldHaveDisabledOption={false}
-              title='Define the pickup method/availability at this stop.'
-              value={patternStop.pickupType || ''}
+              title={patternStopCardMessages('PickupDropOffSelect.pickupTitle')}
+              value={(patternStop.pickupType || patternStop.pickupType === 0) ? patternStop.pickupType : ''}
             />
           </Col>
           <Col xs={6}>
@@ -410,8 +432,8 @@ class PatternStopContents extends Component<Props, State> {
               onChange={this._onPickupOrDropOffChange}
               selectType='dropOffType'
               shouldHaveDisabledOption={false}
-              title='Define the dropff method/availability at this stop.'
-              value={patternStop.dropOffType || ''}
+              title={patternStopCardMessages('PickupDropOffSelect.dropOffTitle')}
+              value={(patternStop.dropOffType || patternStop.dropOffType === 0) ? patternStop.dropOffType : ''}
             />
           </Col>
         </Row>
@@ -423,8 +445,8 @@ class PatternStopContents extends Component<Props, State> {
               onChange={this._onPickupOrDropOffChange}
               selectType='continuousPickup'
               shouldHaveDisabledOption
-              title='Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.'
-              value={(patternStop.continuousPickup || patternStop.continuousPickup === 0) ? patternStop.continuousPickup : 1}
+              title={patternStopCardMessages('PickupDropOffSelect.continuousPickupTitle')}
+              value={(patternStop.continuousPickup || patternStop.continuousPickup === 0) ? patternStop.continuousPickup : ''}
             />
           </Col>
           <Col xs={6}>
@@ -434,11 +456,30 @@ class PatternStopContents extends Component<Props, State> {
               onChange={this._onPickupOrDropOffChange}
               selectType='continuousDropOff'
               shouldHaveDisabledOption
-              title='Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.'
-              value={(patternStop.continuousDropOff || patternStop.continuousDropOff === 0) ? patternStop.continuousDropOff : 1}
+              title={patternStopCardMessages('PickupDropOffSelect.continuousDropOffTitle')}
+              value={(patternStop.continuousDropOff || patternStop.continuousDropOff === 0) ? patternStop.continuousDropOff : ''}
             />
           </Col>
         </Row>
+        <Row>
+          <Col xs={12}>
+            <FormGroup
+              controlId='stopHeadsign'
+              bsSize='small'>
+              <ControlLabel
+                className='small'
+                title={patternStopCardMessages('PatternStopContents.stopHeadsignTitle')}>
+                {patternStopCardMessages('PatternStopContents.stopHeadsignText')}
+              </ControlLabel>
+              <FormControl
+                onChange={this._onHeadsignChange}
+                placeholder={patternStopCardMessages('PatternStopContents.stopHeadsignPlaceholder')}
+                type='text'
+                value={patternStop.stopHeadsign || ''}
+              />
+            </FormGroup>
+          </Col >
+        </Row>
         <NormalizeStopTimesTip />
       </div>
     }

lib/editor/util/map.js

@@ -754,16 +754,17 @@ export function stopToPatternStop (
     throw new Error('Stop Id not set')
   }
   return {
-    id: generateUID(),
-    stopSequence,
-    stopId: stop.stop_id,
     continuousDropOff: 1,
     continuousPickup: 1,
     defaultDwellTime: 0,
     defaultTravelTime: 0,
     dropOffType: 0,
+    id: generateUID(),
     pickupType: 0,
     shapeDistTraveled: null,
+    stopHeadsign: '',
+    stopId: stop.stop_id,
+    stopSequence,
     timepoint: null
   }
 }

lib/gtfs/util/index.js

@@ -80,6 +80,7 @@ export function getGraphQLFieldsForEntity (type: string, editor: boolean = false
     timepoint
     continuous_pickup
     continuous_drop_off
+    stop_headsign
   }`
   switch (type.toLowerCase()) {
     case 'stoptime':

lib/manager/actions/feeds.js

@@ -67,7 +67,7 @@ export function createFeedSource (newFeed: NewFeed) {
     return dispatch(secureFetch(url, 'post', newFeed))
       .then((res) => res.json())
       .then((createdFeed) => {
-        return dispatch(fetchProjectWithFeeds(newFeed.projectId)).then(() => {
+        return dispatch(fetchProjectWithFeeds(newFeed.projectId, false, true)).then(() => {
           browserHistory.push(`/feed/${createdFeed.id}`)
         })
       })

lib/manager/actions/projects.js

@@ -107,7 +107,7 @@ export function fetchProject (projectId: string, unsecure: ?boolean) {
   }
 }
 
-export function fetchProjectWithFeeds (projectId: string, unsecure: ?boolean) {
+export function fetchProjectWithFeeds (projectId: string, unsecure: ?boolean, isSaving: ?boolean) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(requestingProject())
     const apiRoot = unsecure ? 'public' : 'secure'

lib/types/index.js

@@ -586,6 +586,7 @@ export type PatternStop = {
   id: string | number,
   pickupType: number,
   shapeDistTraveled: ?number,
+  stopHeadsign: ?string,
   stopId: string,
   stopSequence: number,
   stop_lat?: number,
@@ -908,6 +909,7 @@ export type Trip = {|
   route_id: string,
   service_id: string,
   shape_id: string,
+  stopHeadsign: string,
   stopTimes: Array<StopTime>,
   tripHeadsign: string,
   tripId: string,