Other injury/fatality counts to meet higher sums

Author: gregallensworth

scss/components/_stats-counter.scss

@@ -16,7 +16,7 @@
 
   .count {
     display: inline-block;
-    width: 25%;
+    width: 20%;
     float: left;
   }
 

src/components/AboutCopy.js

@@ -130,8 +130,9 @@ const AboutCopy = () => (
     </p>
     <p>
       In the NYPD motor vehicles collisions dataset, some injuries and fatalities do not have a
-      role/vehicle ascribed to them. As a result the pedestrian/cyclist/motorist numbers in
-      CrashMapper may not add up to the exact total injuries and fatalities in OpenData.
+      role/vehicle ascribed to them. “Other” includes crashes in the source data that are not
+      labeled by category (pedestrian, cyclists or motorists). In our experience they include
+      mostly crashes where the victims are e-bike users.
     </p>
     <p>
       NYPD captures up to five (5) vehicles included in a crash. As long as any one of these

src/components/StatsLegend/StatsCounter.js

@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react';
 
 const StatsCounter = (props) => {
-  const { cyclist, ped, driver, total, title } = props;
+  const { cyclist, ped, driver, other, total, title } = props;
 
   return (
     <div className="stats-counter">
@@ -18,6 +18,10 @@ const StatsCounter = (props) => {
         <p>{driver.toLocaleString()}</p>
         <p>Motorist</p>
       </div>
+      <div className="count">
+        <p>{other.toLocaleString()}</p>
+        <p>Unknown</p>
+      </div>
       <div className="count">
         <p className="roboto-bold">{total.toLocaleString()}</p>
         <p className="roboto-bold">Total</p>
@@ -30,6 +34,7 @@ StatsCounter.defaultProps = {
   cyclist: 0,
   driver: 0,
   ped: 0,
+  other: 0,
   total: 0,
   title: ''
 };
@@ -38,6 +43,7 @@ StatsCounter.propTypes = {
   cyclist: PropTypes.number,
   driver: PropTypes.number,
   ped: PropTypes.number,
+  other: PropTypes.number,
   total: PropTypes.number,
   title: PropTypes.string
 };

src/components/StatsLegend/index.js

@@ -21,6 +21,8 @@ class StatsLegend extends Component {
       motorist_killed,
       pedestrian_injured,
       pedestrian_killed,
+      other_injured,
+      other_killed,
       persons_injured,
       persons_killed,
       total_crashes,
@@ -51,13 +53,15 @@ class StatsLegend extends Component {
                 cyclist={cyclist_killed}
                 driver={motorist_killed}
                 ped={pedestrian_killed}
+                other={other_killed}
                 total={persons_killed}
               />
               <StatsCounter
                 title={'Injuries'}
                 cyclist={cyclist_injured}
                 driver={motorist_injured}
                 ped={pedestrian_injured}
+                other={other_injured}
                 total={persons_injured}
               />
             </div>
@@ -82,6 +86,8 @@ StatsLegend.defaultProps = {
   motorist_killed: 0,
   pedestrian_injured: 0,
   pedestrian_killed: 0,
+  other_injured: 0,
+  other_killed: 0,
   persons_injured: 0,
   persons_killed: 0,
   total_crashes: 0,
@@ -102,6 +108,8 @@ StatsLegend.propTypes = {
   motorist_killed: PropTypes.number,
   pedestrian_injured: PropTypes.number,
   pedestrian_killed: PropTypes.number,
+  other_injured: PropTypes.number,
+  other_killed: PropTypes.number,
   persons_injured: PropTypes.number,
   persons_killed: PropTypes.number,
   total_crashes: PropTypes.number,

src/constants/sql_queries.js

@@ -157,10 +157,19 @@ const filterByTypeWhereClause = (filterType) => {
     })
     .join('OR');
 
+  const typesInjuredSelected = Object.values(injury).filter(i => i).length;
+  const typesKilledSelected = Object.values(fatality).filter(i => i).length;
+
   const typesInjuredMapped = mapTypes(injury, 'injury');
   const typesKilledMapped = mapTypes(fatality, 'fatality');
 
-  if (typesInjuredMapped.length > 0 && typesKilledMapped.length > 0) {
+  if (typesInjuredSelected === 3 && typesKilledSelected === 3) {
+    whereClause += 'AND (number_of_persons_injured > 0 OR number_of_persons_killed > 0)';
+  } else if (typesInjuredSelected > 0 && typesKilledSelected === 3) {
+    whereClause += `AND (${typesInjuredMapped} OR number_of_persons_killed > 0)`;
+  } else if (typesInjuredSelected === 3 && typesKilledSelected > 0) {
+    whereClause += `AND (number_of_persons_injured > 0 OR ${typesKilledMapped})`;
+  } else if (typesInjuredMapped.length > 0 && typesKilledMapped.length > 0) {
     whereClause += `AND (${typesInjuredMapped} OR ${typesKilledMapped})`;
   } else if (typesInjuredMapped.length > 0) {
     whereClause += `AND (${typesInjuredMapped})`;
@@ -179,6 +188,8 @@ const filterByTypeWhereClause = (filterType) => {
     `;
   }
 
+console.debug(['GDA', typesInjuredSelected, typesKilledSelected, whereClause ]);  //eslint-disable-line
+
   return whereClause;
 };
 
@@ -309,8 +320,10 @@ export const configureMapSQL = (params) => {
         SUM(c.number_of_motorist_killed) as motorist_killed,
         SUM(c.number_of_pedestrian_injured) as pedestrian_injured,
         SUM(c.number_of_pedestrian_killed) as pedestrian_killed,
-        SUM(c.number_of_pedestrian_injured + c.number_of_cyclist_injured + c.number_of_motorist_injured) as persons_injured,
-        SUM(c.number_of_pedestrian_killed + c.number_of_cyclist_killed + c.number_of_motorist_killed) as persons_killed
+        SUM(c.number_of_persons_injured - (c.number_of_pedestrian_injured + c.number_of_cyclist_injured + c.number_of_motorist_injured)) as other_injured,
+        SUM(c.number_of_persons_killed - (c.number_of_pedestrian_killed + c.number_of_cyclist_killed + c.number_of_motorist_killed)) as other_killed,
+        SUM(c.number_of_persons_injured) as persons_injured,
+        SUM(c.number_of_persons_killed) as persons_killed
       FROM
         ${nyc_crashes} c
       ${joinToGeoTableClause(geo)}
@@ -350,8 +363,10 @@ export const configureStatsSQL = (params) => {
       SUM(c.number_of_motorist_killed) as motorist_killed,
       SUM(c.number_of_pedestrian_injured) as pedestrian_injured,
       SUM(c.number_of_pedestrian_killed) as pedestrian_killed,
-      SUM(c.number_of_pedestrian_injured + c.number_of_cyclist_injured + c.number_of_motorist_injured) as persons_injured,
-      SUM(c.number_of_pedestrian_killed + c.number_of_cyclist_killed + c.number_of_motorist_killed) as persons_killed
+      SUM(c.number_of_persons_injured - (c.number_of_pedestrian_injured + c.number_of_cyclist_injured + c.number_of_motorist_injured)) as other_injured,
+      SUM(c.number_of_persons_killed - (c.number_of_pedestrian_killed + c.number_of_cyclist_killed + c.number_of_motorist_killed)) as other_killed,
+      SUM(c.number_of_persons_injured) as persons_injured,
+      SUM(c.number_of_persons_killed) as persons_killed
     FROM
       ${nyc_crashes} c
     ${joinToGeoTableClause(geo)}