feat: dt-5325 emissions schema changes

HSLdevcom · Oct 24, 2023 · 92eb64d · 92eb64d
1 parent 5c06dbf
commit 92eb64d
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 27 deletions.
diff --git a/app/component/ItinerarySummaryListContainer/ItinerarySummaryListContainer.js b/app/component/ItinerarySummaryListContainer/ItinerarySummaryListContainer.js
@@ -57,12 +57,10 @@ function ItinerarySummaryListContainer(
   ) {
     const lowestCo2value = Math.round(
       itineraries
-        .filter(itinerary => itinerary.emissionsPerPerson?.co2Grams >= 0)
+        .filter(itinerary => itinerary.emissionsPerPerson?.co2 >= 0)
         .reduce((a, b) => {
-          return a.emissionsPerPerson?.co2Grams < b.emissionsPerPerson?.co2Grams
-            ? a
-            : b;
-        }, 0).emissionsPerPerson?.co2Grams,
+          return a.emissionsPerPerson?.co2 < b.emissionsPerPerson?.co2 ? a : b;
+        }, 0).emissionsPerPerson?.co2,
     );
     const summaries = itineraries.map((itinerary, i) => (
       <SummaryRow
@@ -345,7 +343,7 @@ const containerComponent = createFragmentContainer(
         startTime
         endTime
         emissionsPerPerson {
-          co2Grams
+          co2
         }
         legs {
           realTime

diff --git a/app/component/ItineraryTab.js b/app/component/ItineraryTab.js
@@ -68,7 +68,7 @@ const ItineraryShape = PropTypes.shape({
   ),
   fares: PropTypes.arrayOf(FareShape),
   emissionsPerPerson: PropTypes.shape({
-    co2Grams: PropTypes.number,
+    co2: PropTypes.number,
   }),
 });
 
@@ -219,8 +219,8 @@ class ItineraryTab extends React.Component {
     const suggestionIndex = this.context.match.params.secondHash
       ? Number(this.context.match.params.secondHash) + 1
       : Number(this.context.match.params.hash) + 1;
-    const co2value = typeof itinerary.emissionsPerPerson?.co2Grams === 'number' && itinerary.emissionsPerPerson?.co2Grams >= 0 ? Math.round(itinerary.emissionsPerPerson?.co2Grams) : -1;
-    const carCo2Value = this.props.carItinerary && this.props.carItinerary.length > 0 ? Math.round(this.props.carItinerary[0].emissionsPerPerson?.co2Grams) : 0;
+    const co2value = typeof itinerary.emissionsPerPerson?.co2 === 'number' && itinerary.emissionsPerPerson?.co2 >= 0 ? Math.round(itinerary.emissionsPerPerson?.co2) : -1;
+    const carCo2Value = this.props.carItinerary && this.props.carItinerary.length > 0 ? Math.round(this.props.carItinerary[0].emissionsPerPerson?.co2) : 0;
     const co2SimpleDesc =  carCo2Value === 0;
     return (
       <div className="itinerary-tab">
@@ -451,7 +451,7 @@ const withRelay = createFragmentContainer(
           type
         }
         emissionsPerPerson {
-          co2Grams
+          co2
         }
         legs {
           mode

diff --git a/app/component/SummaryPage.js b/app/component/SummaryPage.js
@@ -738,7 +738,7 @@ class SummaryPage extends React.Component {
             ...ItineraryTab_itinerary
             ...SummaryPlanContainer_itineraries
             emissionsPerPerson {
-              co2Grams
+              co2
             }
             legs {
               mode
@@ -794,7 +794,7 @@ class SummaryPage extends React.Component {
             ...ItineraryTab_itinerary
             ...SummaryPlanContainer_itineraries
             emissionsPerPerson {
-              co2Grams
+              co2
             }
             legs {
               mode
@@ -856,7 +856,7 @@ class SummaryPage extends React.Component {
             ...ItineraryTab_itinerary
             ...SummaryPlanContainer_itineraries
             emissionsPerPerson {
-              co2Grams
+              co2
             }
             legs {
               mode
@@ -1039,7 +1039,7 @@ class SummaryPage extends React.Component {
             ...ItineraryTab_itinerary
             ...SummaryPlanContainer_itineraries
             emissionsPerPerson {
-              co2Grams
+              co2
             }
             legs {
               mode
@@ -2972,7 +2972,7 @@ const containerComponent = createRefetchContainer(
             ...ItineraryTab_itinerary
             ...SummaryPlanContainer_itineraries
             emissionsPerPerson {
-              co2Grams
+              co2
             }
             legs {
               mode

diff --git a/app/component/SummaryPlanContainer.js b/app/component/SummaryPlanContainer.js
@@ -345,7 +345,7 @@ const connectedContainer = createFragmentContainer(
           startTime
           endTime
           emissionsPerPerson {
-            co2Grams
+            co2
           }
           legs {
             mode
@@ -402,7 +402,7 @@ const connectedContainer = createFragmentContainer(
         endTime
         startTime
         emissionsPerPerson {
-          co2Grams
+          co2
         }
         legs {
           mode

diff --git a/app/component/SummaryRow.js b/app/component/SummaryRow.js
@@ -238,9 +238,9 @@ const SummaryRow = (
   const endTime = moment(data.endTime);
   const duration = endTime.diff(startTime);
   const co2value =
-    typeof data.emissionsPerPerson?.co2Grams === 'number' &&
-    data.emissionsPerPerson?.co2Grams >= 0
-      ? Math.round(data.emissionsPerPerson?.co2Grams)
+    typeof data.emissionsPerPerson?.co2 === 'number' &&
+    data.emissionsPerPerson?.co2 >= 0
+      ? Math.round(data.emissionsPerPerson?.co2)
       : -1;
   const mobile = bp => !(bp === 'large');
   const legs = [];

diff --git a/app/prop-types/ItineraryShape.js b/app/prop-types/ItineraryShape.js
@@ -5,6 +5,6 @@ export default PropTypes.shape({
   startTime: PropTypes.number,
   legs: PropTypes.arrayOf(PropTypes.object),
   emissionsPerPerson: PropTypes.shape({
-    co2Grams: PropTypes.number,
+    co2: PropTypes.number,
   }),
 });
diff --git a/app/util/queryUtils.js b/app/util/queryUtils.js
@@ -265,7 +265,7 @@ export const moreItinerariesQuery = graphql`
         ...ItineraryTab_itinerary
         ...SummaryPlanContainer_itineraries
         emissionsPerPerson {
-          co2Grams
+          co2
         }
         legs {
           mode

diff --git a/build/schema.graphql b/build/schema.graphql
@@ -904,7 +904,7 @@ type Emissions {
     """
     CO₂ emissions in grams.
     """
-    co2Grams: Float
+    co2: Grams
 }
 
 type fare {
@@ -1008,6 +1008,8 @@ type Geometry {
 
 scalar GeoJson
 
+scalar Grams
+
 type StopGeometries {
     """Representation of the stop geometries as GeoJSON (https://geojson.org/)"""
     geoJson: GeoJson,

diff --git a/build/schema.json b/build/schema.json
@@ -2179,12 +2179,12 @@
                     "description": null,
                     "fields": [
                         {
-                            "name": "co2Grams",
-                            "description": "CO₂ emissions of the trip on this itinerary, in grams per person.",
+                            "name": "co2",
+                            "description": "CO₂ emissions in grams.",
                             "args": [],
                             "type": {
                                 "kind": "SCALAR",
-                                "name": "Float",
+                                "name": "Grams",
                                 "ofType": null
                             },
                             "isDeprecated": false,
@@ -2609,6 +2609,16 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "SCALAR",
+                    "name": "Grams",
+                    "description": "",
+                    "fields": null,
+                    "inputFields": null,
+                    "interfaces": null,
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "SCALAR",
                     "name": "ID",

diff --git a/digitransit-search-util/packages/digitransit-search-util-query-utils/schema/schema.graphql b/digitransit-search-util/packages/digitransit-search-util-query-utils/schema/schema.graphql
@@ -904,7 +904,7 @@ type Emissions {
     """
     CO₂ emissions in grams.
     """
-    co2Grams: Float
+    co2: Grams
 }
 
 type fare {
@@ -1008,6 +1008,8 @@ type Geometry {
 
 scalar GeoJson
 
+scalar Grams
+
 type StopGeometries {
     """Representation of the stop geometries as GeoJSON (https://geojson.org/)"""
     geoJson: GeoJson,