Merge pull request #41 from opentripplanner/dev

New release

Author: David Emory

Diff for: .gitattributes

@@ -0,0 +1,2 @@
+# ensure that branch-specific package.json does not change on merge
+package.json merge=ours

Diff for: .travis.yml

@@ -5,6 +5,8 @@ notifications:
   email: false
 node_js:
   - '6'
+before_install:
+  - npm i -g yarn codecov
 after_success:
   - yarn run semantic-release
 before_script:

Diff for: __tests__/actions/__snapshots__/api.js.snap

@@ -1,77 +1,50 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`actions > api > planTrip should gracefully handle bad response 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "PLAN_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "error": true,
-      "payload": [Error: Received error from server],
-      "type": "PLAN_ERROR",
-    },
-  ],
-]
-`;
+exports[`OTP Query Path 1`] = `"/api/plan?fromPlace=12%2C34&toPlace=34%2C12"`;
 
-exports[`actions > api > planTrip should make a query to OTP with customOtpQueryBuilder in state config 1`] = `"/api/plan?from=here&to=there"`;
-
-exports[`actions > api > planTrip should make a query to OTP with customOtpQueryBuilder in state config 2`] = `
+exports[`actions > api > routingQuery should gracefully handle bad response 1`] = `
 Array [
-  Array [
-    Object {
-      "type": "PLAN_REQUEST",
-    },
-  ],
   Array [
     Object {
       "payload": Object {
-        "fake": "response",
+        "routingType": "ITINERARY",
+        "searchId": 2,
       },
-      "type": "PLAN_RESPONSE",
-    },
-  ],
-]
-`;
-
-exports[`actions > api > planTrip should make a query to OTP with customOtpQueryBuilder sent to action 1`] = `"/api/plan?from=here&to=there"`;
-
-exports[`actions > api > planTrip should make a query to OTP with customOtpQueryBuilder sent to action 2`] = `
-Array [
-  Array [
-    Object {
-      "type": "PLAN_REQUEST",
+      "type": "ROUTING_REQUEST",
     },
   ],
   Array [
     Object {
       "payload": Object {
-        "fake": "response",
+        "error": [Error: Received error from server],
+        "searchId": 2,
       },
-      "type": "PLAN_RESPONSE",
+      "type": "ROUTING_ERROR",
     },
   ],
 ]
 `;
 
-exports[`actions > api > planTrip should make a query to OTP with default settings 1`] = `"/api/plan?arriveBy=false&fromPlace=12%2C34&showIntermediateStops=true&toPlace=34%2C12"`;
-
-exports[`actions > api > planTrip should make a query to OTP with default settings 2`] = `
+exports[`actions > api > routingQuery should make a query to OTP 1`] = `
 Array [
   Array [
     Object {
-      "type": "PLAN_REQUEST",
+      "payload": Object {
+        "routingType": "ITINERARY",
+        "searchId": 1,
+      },
+      "type": "ROUTING_REQUEST",
     },
   ],
   Array [
     Object {
       "payload": Object {
-        "fake": "response",
+        "response": Object {
+          "fake": "response",
+        },
+        "searchId": 1,
       },
-      "type": "PLAN_RESPONSE",
+      "type": "ROUTING_RESPONSE",
     },
   ],
 ]

Diff for: __tests__/actions/api.js

@@ -4,10 +4,10 @@ import nock from 'nock'
 
 import {timeoutPromise} from '../test-utils'
 
-import {planTrip} from '../../lib/actions/api'
+import {routingQuery} from '../../lib/actions/api'
 
 describe('actions > api', () => {
-  describe('> planTrip', () => {
+  describe('> routingQuery', () => {
     const defaultState = {
       otp: {
         config: {
@@ -19,73 +19,38 @@ describe('actions > api', () => {
         },
         currentQuery: {
           from: { lat: 12, lon: 34 },
+          routingType: 'ITINERARY',
           to: { lat: 34, lon: 12 }
         },
         searches: []
       }
     }
 
-    const customOtpQueryBuilder = () => {
-      return `http://mock-host.com/api/plan?from=here&to=there`
-    }
-
-    const stateWithCustomBuilderFunction = {
-      otp: {
-        config: {
-          api: {
-            host: 'http://mock-host.com',
-            path: '/api',
-            port: 80
-          },
-          customOtpQueryBuilder
-        },
-        currentQuery: {
-          from: { lat: 12, lon: 34 },
-          to: { lat: 34, lon: 12 }
-        },
-        searches: []
-      }
-    }
+    it('should make a query to OTP', async () => {
+      const routingQueryAction = routingQuery()
 
-    const testCases = [{
-      state: defaultState,
-      title: 'default settings'
-    }, {
-      customOtpQueryBuilder,
-      state: defaultState,
-      title: 'customOtpQueryBuilder sent to action'
-    }, {
-      state: stateWithCustomBuilderFunction,
-      title: 'customOtpQueryBuilder in state config'
-    }]
-
-    testCases.forEach((testCase) => {
-      it(`should make a query to OTP with ${testCase.title}`, async () => {
-        const planTripAction = planTrip(testCase.customOtpQueryBuilder)
-
-        nock('http://mock-host.com')
-          .get(/api\/plan/)
-          .reply(200, {
-            fake: 'response'
-          })
-          .on('request', (req, interceptor) => {
-            expect(req.path).toMatchSnapshot()
-          })
-
-        const mockDispatch = jest.fn()
-        planTripAction(mockDispatch, () => {
-          return testCase.state
+      nock('http://mock-host.com')
+        .get(/api\/plan/)
+        .reply(200, {
+          fake: 'response'
+        })
+        .on('request', (req, interceptor) => {
+          expect(req.path).toMatchSnapshot('OTP Query Path')
         })
 
-        // wait for request to complete
-        await timeoutPromise(100)
-
-        expect(mockDispatch.mock.calls).toMatchSnapshot()
+      const mockDispatch = jest.fn()
+      routingQueryAction(mockDispatch, () => {
+        return defaultState
       })
+
+      // wait for request to complete
+      await timeoutPromise(100)
+
+      expect(mockDispatch.mock.calls).toMatchSnapshot()
     })
 
     it('should gracefully handle bad response', async () => {
-      const planTripAction = planTrip()
+      const routingQueryAction = routingQuery()
 
       nock('http://mock-host.com')
         .get(/api\/plan/)
@@ -94,7 +59,7 @@ describe('actions > api', () => {
         })
 
       const mockDispatch = jest.fn()
-      planTripAction(mockDispatch, () => {
+      routingQueryAction(mockDispatch, () => {
         return defaultState
       })
 

Diff for: __tests__/util/__snapshots__/state.js.snap

@@ -10,12 +10,12 @@ Object {
     "name": "12.00000, 34.00000",
   },
   "mode": undefined,
+  "routingType": "ITINERARY",
   "time": "12:34",
   "to": Object {
     "lat": "34",
     "lon": "12",
     "name": "34.00000, 12.00000",
   },
-  "type": "ITINERARY",
 }
 `;

Diff for: cpbuild.sh

@@ -0,0 +1,5 @@
+echo 'rebuilding..'
+yarn prepublish
+echo 'copying built js..'
+cp -r ./build ~/dev/otp/trimet-mod-otp/node_modules/otp-react-redux
+echo 'done'

Diff for: cpcss.sh

@@ -0,0 +1,5 @@
+echo "building and copying css.."
+mastarm build
+cp ~/dev/otp/otp-react-redux/dist/index.css* ~/dev/otp/trimet-mod-otp/node_modules/otp-react-redux/dist/
+echo "done"
+

Diff for: example-config.yml

@@ -22,6 +22,18 @@ geocoder:
       minLat: 45.273
       maxLat: 45.7445
   MAPZEN_KEY: MAPZEN_KEY
+  focusPoint:
+    lat: 45.5223452
+    lon: -122.6821804
+  # Optional custom Pelias instance (defaults to Mapzen Search)
+  # baseUrl: https://geocoder.example.com/pelias/v1
 
-modes:
-  - TRANSIT,WALK
+modeGroups:
+  - name: Transit
+    modes:
+      - TRAM
+      - BUS
+  - name: Walk/Bike
+    modes:
+      - WALK
+      - BICYCLE

Diff for: example.css

@@ -1,4 +1,4 @@
-.row {
+.main-row {
   position: fixed;
   top: 52px;
   bottom: 0px;
@@ -18,3 +18,7 @@
   margin: 0px;
   padding: 0px;
 }
+
+.date-time-selector {
+  margin-top: 20px;
+}

Diff for: example.js

@@ -11,20 +11,21 @@ import { Navbar, Grid, Row, Col } from 'react-bootstrap'
 
 // import OTP-RR components
 import {
+  BaseLayers,
+  BaseMap,
+  BikeRentalOverlay,
+  DateTimeSelector,
   EndpointsOverlay,
-  ItineraryCarousel,
+  ErrorMessage,
   ItineraryOverlay,
   LocationField,
-  ModeSelector,
-  DateTimeSelector,
-  // NarrativeItineraries,
-  BaseMap,
-  BaseLayers,
-  // OsmBaseLayer,
+  NarrativeItineraries,
   PlanTripButton,
-  createOtpReducer,
-  ErrorMessage,
-  SwitchButton
+  TransitiveOverlay,
+  SettingsSelectorPanel,
+  SwitchButton,
+
+  createOtpReducer
 } from './lib'
 
 // load the OTP configuration
@@ -61,23 +62,24 @@ class OtpRRExample extends Component {
         <Navbar.Brand>OpenTripPlanner</Navbar.Brand>
       </Navbar>
       <Grid fluid>
-        <Row>
+        <Row className='main-row'>
           <Col xs={12} md={4} className='sidebar'>
             <LocationField type='from' label='Enter start location or click on map...' />
             <LocationField type='to' label='Enter destination or click on map...' />
             <SwitchButton />
-            <ModeSelector />
             <DateTimeSelector />
+            <SettingsSelectorPanel />
             <ErrorMessage />
             <PlanTripButton />
-            {/* <NarrativeItineraries /> */}
-            <ItineraryCarousel />
+            <NarrativeItineraries />
           </Col>
 
           <Col xsHidden md={8} className='map-container'>
             <BaseMap>
               <BaseLayers />
+              <BikeRentalOverlay />
               <ItineraryOverlay />
+              <TransitiveOverlay />
               <EndpointsOverlay />
             </BaseMap>
           </Col>