Merge pull request #73 from SmartColumbusOS/cota_routes

Cota routes

package.json

@@ -48,6 +48,7 @@
     "apisauce": "^1.0.3",
     "identity-obj-proxy": "^3.0.0",
     "leaflet": "^1.5.1",
+    "lodash": "^4.17.15",
     "node-sass": "^4.12.0",
     "normalize.css": "^8.0.1",
     "phoenix": "1.3.0",

src/reducers/reducers.js

@@ -1,6 +1,7 @@
 import { combineReducers } from 'redux'
 import { POSITION_UPDATE, ROUTE_FILTER, CEAV_UPDATE, ROUTE_UPDATE } from '../actions'
 import { CEAV, COTA } from '../variables'
+import _ from 'lodash'
 
 const filter = (filter = [], action) => {
   switch (action.type) {
@@ -60,9 +61,11 @@ const data = (data = {}, action) => {
 const availableRoutes = (availableRoutes = [], action) => {
   switch (action.type) {
     case ROUTE_UPDATE:
-      let routesToUse = action.update.result.records.map((route) => {
-        const lineNumber = route.LINENUM.padStart(3, '0')
-        const lineName = `${route.LINENUM} - ${route.LINENAME}`
+      const sorted = _.sortBy(action.update, ({ linenum }) => linenum);
+      const uniqueRoutes = _.sortedUniqBy(sorted, ({ linenum }) => linenum)
+      let routesToUse = uniqueRoutes.map((route) => {
+        const lineNumber = new String(route.linenum).padStart(3, '0')
+        const lineName = `${route.linenum} - ${route.linename}`
         return { value: lineNumber, label: lineName, provider: 'COTA' }
       })
       routesToUse.push({ value: CEAV, label: 'SMRT - Smart Circuit', provider: CEAV })

src/reducers/reducers.test.js

@@ -101,22 +101,16 @@ describe('cotaApp reducers', () => {
   })
 
   it('will transform the data on a ROUTE_UPDATE action', () => {
-    let message = {
-      'help': 'not necessary',
-      'success': true,
-      'result': {
-        'records': [
-          {
-            'LINENUM': '1',
-            'LINENAME': 'Crazy Town'
-          },
-          {
-            'LINENUM': '101',
-            'LINENAME': 'Smallville'
-          }
-        ]
+    let message = [
+      {
+        'linenum': 1,
+        'linename': 'Crazy Town'
+      },
+      {
+        'linenum': 101,
+        'linename': 'Smallville'
       }
-    }
+    ]
 
     let state = [
       { value: '001', label: '1 - Crazy Town', provider: 'COTA' },
@@ -129,22 +123,16 @@ describe('cotaApp reducers', () => {
   })
 
   it('will append CEAV Smart Circuit on a ROUTE_UPDATE action', () => {
-    let message = {
-      'help': 'not necessary',
-      'success': true,
-      'result': {
-        'records': [
-          {
-            'LINENUM': '1',
-            'LINENAME': 'Crazy Town'
-          },
-          {
-            'LINENUM': '101',
-            'LINENAME': 'Smallville'
-          }
-        ]
+    let message = [
+      {
+        'linenum': 1,
+        'linename': 'Crazy Town'
+      },
+      {
+        'linenum': 101,
+        'linename': 'Smallville'
       }
-    }
+    ]
 
     let newState = reducer(undefined, { type: ROUTE_UPDATE, update: message })
     expect(newState.availableRoutes[2]).toEqual({ value: 'CEAV', label: 'SMRT - Smart Circuit', provider: 'CEAV' })

src/sagas/route.js

@@ -6,15 +6,13 @@ const COTA_LINE_DATA_SET_ID = `"2a329570-33d7-4cde-818d-6ef323e68875"`
 
 const fetchRoutes = function* (action) {
   const api = create({
-    baseURL: 'https://ckan.smartcolumbusos.com'
+    baseURL: 'https://data.smartcolumbusos.com/api/v1',
+    headers: { 'Accept': 'application/json' }
   })
 
   const { data } = yield call(
     api.get,
-    '/api/action/datastore_search_sql',
-    {
-      sql: `select distinct "LINENAME", "LINENUM" from ${COTA_LINE_DATA_SET_ID} order by "LINENUM"`
-    }
+    'organization/central_ohio_transit_authority/dataset/2a329570_33d7_4cde_818d_6ef323e68875/query'
   )
 
   yield put(routeUpdate(data))