Merge pull request #170 from opentraffic/misc-improvements

Misc improvements

Author: drewda

circle.yml

@@ -1,3 +1,18 @@
+# Using Yarn, rather than NPM. See https://circleci.com/docs/1.0/yarn/
+
 machine:
   node:
     version: 8.2.0
+  environment:
+    PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
+
+dependencies:
+  override:
+    - yarn install
+  cache_directories:
+    - ~/.cache/yarn
+
+test:
+  override:
+    - yarn test   # run all tests, including the linter
+    - yarn build  # make sure we can successfully build

src/app/route.js

@@ -200,6 +200,7 @@ export function showRoute (waypoints) {
           const fullArrayDist = Distance(coordsSlice[0], coordsSlice[coordsSlice.length - 1])
           let speed = -1
           let speedByHour = []
+          let percentDiff = 0
           let dist = 0
           if (edge.traffic_segments) {
             for (let t = 0; t < edge.traffic_segments.length; t++) {
@@ -248,6 +249,7 @@ export function showRoute (waypoints) {
                 if (id === parsedIds[i].id) {
                   speed = parsedIds[i].speed
                   speedByHour = parsedIds[i].speedByHour
+                  percentDiff = parsedIds[i].percentDiff
                   speeds.push({
                     coordinates: coordsSlice,
                     speed: speed,
@@ -270,7 +272,8 @@ export function showRoute (waypoints) {
                   id: edge.traffic_segments[t],
                   osmlr_id: edge.traffic_segments[t].segment_id,
                   speed: speed,
-                  speedByHour: speedByHour
+                  speedByHour: speedByHour,
+                  percentDiff: percentDiff
                   // Note, this is missing properties that are already there in the region view
                 }
               })

src/components/Sidebar/ExportData/index.js

@@ -11,7 +11,8 @@ class ExportData extends React.Component {
     analysisName: PropTypes.string,
     analysisMode: PropTypes.string,
     date: PropTypes.object,
-    route: PropTypes.object
+    route: PropTypes.object,
+    refSpeedComparisonEnabled: PropTypes.bool
   }
 
   constructor (props) {
@@ -23,7 +24,7 @@ class ExportData extends React.Component {
   }
 
   onClickButton = (format) => {
-    const result = exportData(this.props.geoJSON, this.props.analysisName, format, this.props.analysisMode, this.props.date, this.props.route)
+    const result = exportData(this.props.geoJSON, this.props.analysisName, format, this.props.analysisMode, this.props.date, this.props.refSpeedComparisonEnabled, this.props.route)
     if (result === false) {
       this.setState({
         message: 'There is no data to download.'
@@ -60,7 +61,8 @@ function mapStateToProps (state) {
     analysisName: state.app.viewName,
     analysisMode: state.app.analysisMode,
     date: state.date,
-    route: state.route
+    route: state.route,
+    refSpeedComparisonEnabled: state.app.refSpeedComparisonEnabled
   }
 }
 

src/components/Sidebar/Legend/index.js

@@ -22,7 +22,7 @@ export default class Legend extends React.PureComponent {
     return (
       <Segment>
         <Header as="h3">
-          { (this.props.compareEnabled) ? 'Percent change in speed' : 'Speed, in kilometers per hour' }
+          { (this.props.compareEnabled) ? 'Percent change, compared to reference speeds' : 'Speed, in kilometers per hour' }
         </Header>
         <table>
           <tbody>

src/components/Sidebar/TimeFilters/index.js

@@ -100,33 +100,32 @@ export class TimeFilters extends React.Component {
   render () {
     return (
       <Segment>
-        <div className="radio">
-          <strong>
-            <Radio
-              toggle
-              label="Compare against reference speeds"
-              checked={this.props.refSpeedComparisonEnabled}
-              onChange={(event, data) => {
-                this.props.dispatch(setRefSpeedComparisonEnabled(data.checked))
-              }}
-            />
-          </strong>
-        </div>
-        <Divider />
         <div className="timefilter-daily">
           <strong>
-            { (this.props.refSpeedComparisonEnabled) ? 'Percent change in Speed by day-of-week' : 'Average by day-of-week' }
+            { (this.props.refSpeedComparisonEnabled) ? 'Percent change in speed by day-of-week' : 'Average speed (KPH) by day-of-week' }
           </strong>
           <div ref={(ref) => { this.dailyChartEl = ref }} />
         </div>
 
         <div className="timefilter-hourly">
           <strong>
-            { (this.props.refSpeedComparisonEnabled) ? 'Percent change in Speed by hour-of-day' : 'Average by hour-of-day' }
+            { (this.props.refSpeedComparisonEnabled) ? 'Percent change in speed by hour-of-day' : 'Average speed (KPH) by hour-of-day' }
           </strong>
           <div ref={(ref) => { this.hourlyChartEl = ref }} />
         </div>
         <Divider />
+        <div className="radio">
+          <strong>
+            <Radio
+              toggle
+              label="Compare against reference speeds"
+              checked={this.props.refSpeedComparisonEnabled}
+              onChange={(event, data) => {
+                this.props.dispatch(setRefSpeedComparisonEnabled(data.checked))
+              }}
+            />
+          </strong>
+        </div>
       </Segment>
     )
   }

src/lib/exporter.js

@@ -3,7 +3,7 @@ import _ from 'lodash'
 
 const DAYS_OF_WEEK = [null, 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday']
 
-function prepareCsvForExport (data, analysisMode, route) {
+function prepareCsvForExport (data, analysisMode, refSpeedComparisonEnabled, route) {
   let rows = []
   if (analysisMode === 'ROUTE') {
     rows.push({
@@ -12,15 +12,20 @@ function prepareCsvForExport (data, analysisMode, route) {
       'traffic_route_time': route.trafficRouteTime
     })
   }
+
   rows = rows.concat(_.map(data.features, (segment) => {
     var row = {
       'row_type': 'segment',
       'osmlr_id': segment.properties.osmlr_id
     }
-    segment.properties.speedByHour.forEach((speedByHour) => {
-      let dayOfWeek = DAYS_OF_WEEK[speedByHour.dayOfWeek]
-      row[`average_speed_on_${dayOfWeek}_at_hour_${speedByHour.hourOfDay}`] = speedByHour.speedThisHour
-    })
+    if (refSpeedComparisonEnabled) {
+      row['percent_diff_from_reference_speed'] = segment.properties.percentDiff
+    } else {
+      segment.properties.speedByHour.forEach((speedByHour) => {
+        let dayOfWeek = DAYS_OF_WEEK[speedByHour.dayOfWeek]
+        row[`average_speed_on_${dayOfWeek}_at_hour_${speedByHour.hourOfDay}`] = speedByHour.speedThisHour
+      })
+    }
     return row
   }))
   let str = convertArrayOfObjectsToCsv(rows)
@@ -78,25 +83,42 @@ export function convertArrayOfObjectsToCsv (data, columnDelimiter = ',', lineDel
  * @param {Object} date
  * @param {Object} route
  */
-export function exportData (obj, name = 'untitled', format = 'geojson', analysisMode, date, route) {
+export function exportData (obj, name = 'untitled', format = 'geojson', analysisMode, date, refSpeedComparisonEnabled, route) {
   if (!obj) return false
 
   let blob
 
-  obj.properties.analysisMode = analysisMode
-  obj.properties.analysisName = name
-  obj.properties.date = {
+  let data = JSON.parse(JSON.stringify(obj)) // deep clone, so we can modify the data
+
+  data.properties.analysisMode = analysisMode
+  data.properties.analysisName = name
+  const days = (date && date.dayFilter) ? _.slice(DAYS_OF_WEEK, date.dayFilter[0] + 1, date.dayFilter[1] + 1) : _.slice(DAYS_OF_WEEK, 1, 8)
+  const hours = (date && date.hourFilter) ? _.range(date.hourFilter[0], date.hourFilter[1]) : _.range(0, 25)
+  data.properties.date = {
     year: date.year,
     week: parseInt(date.week, 10),
-    days: _.slice(DAYS_OF_WEEK, date.dayFilter[0] + 1, date.dayFilter[1] + 1),
-    hours: _.range(date.hourFilter[0], date.hourFilter[1] + 1)
+    days: days,
+    hours: hours
+  }
+
+  if (refSpeedComparisonEnabled) {
+    data.features = data.features.map((feature) => {
+      delete feature.properties.speedByHour
+      delete feature.properties.speed
+      return feature
+    })
+  } else {
+    data.features = data.features.map((feature) => {
+      delete feature.properties.percentDiff
+      return feature
+    })
   }
 
   if (format === 'geojson') {
-    let str = JSON.stringify(obj, null, 2)
+    let str = JSON.stringify(data, null, 2)
     blob = new Blob([str], {type: 'application/json;charset=utf-8'})
   } else if (format === 'csv') {
-    let str = prepareCsvForExport(obj, analysisMode, route)
+    let str = prepareCsvForExport(data, analysisMode, refSpeedComparisonEnabled, route)
     blob = new Blob([str], {type: 'text/csv;charset=utf-8'})
   } else {
     throw new Error('exportData() only supports GeoJSON or CSV formats')