Merge branch 'dev' into otp-ui-upgrade

# Conflicts:
#	package.json
#	yarn.lock

Author: miles-grant-ibigroup

Diff for: example-config.yml

@@ -308,6 +308,8 @@ itinerary:
   disableMetroSeperatorDot: false
   # Shows the duration of a leg below the leg in the metro itinerary summary
   showLegDurations: false
+  # Allows calorie counts to be hidden
+  displayCalories: true
 
 # The transitOperators key is a list of transit operators that can be used to
 # order transit agencies when sorting by route. Also, this can optionally

Diff for: lib/components/narrative/connected-trip-details.js

@@ -16,6 +16,10 @@ const mapStateToProps = (state) => {
   const { itinerary } = state.otp.config
   return {
     defaultFareKey: itinerary?.defaultFareKey || undefined,
+    displayCalories:
+      typeof itinerary?.displayCalories === 'boolean'
+        ? itinerary?.displayCalories
+        : undefined,
     fareDetailsLayout: itinerary?.fareDetailsLayout || undefined,
     fareKeyNameMap: itinerary?.fareKeyNameMap || {}
   }

Diff for: lib/components/narrative/utils.tsx

@@ -19,7 +19,7 @@ export function localizeGradationMap(
   gradationMap?: Record<string, any>
 ): Record<string, any> {
   if (!gradationMap) return {}
-  const newGradationMap: Record<string, any> = {}
+  const newGradationMap: Record<string, any> = { ...gradationMap }
 
   Object.keys(newGradationMap).forEach((key) => {
     // As these localization keys are in the config, rather than

Diff for: package.json

@@ -54,7 +54,7 @@
     "@opentripplanner/stops-overlay": "^5.0.2",
     "@opentripplanner/transit-vehicle-overlay": "^3.0.2",
     "@opentripplanner/transitive-overlay": "^3.0.3",
-    "@opentripplanner/trip-details": "^2.2.2",
+    "@opentripplanner/trip-details": "^2.2.3",
     "@opentripplanner/trip-form": "^2.0.3",
     "@opentripplanner/trip-viewer-overlay": "^2.0.2",
     "@opentripplanner/vehicle-rental-overlay": "^2.0.2",

Diff for: yarn.lock

@@ -2686,10 +2686,10 @@
     "@turf/bbox" "^6.5.0"
     lodash.isequal "^4.5.0"
 
-"@opentripplanner/trip-details@^2.2.2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-2.2.2.tgz#dae64b4177c135166886d4f8f2ab0715a165c413"
-  integrity sha512-lYkrrWU5ytYhbZlvcoo7UdeZwWqFsf3mqTvtKKJBe7IrCEoG7hLlcUaVDHAUieGkkQiMLGv91BdZ2ANhe2s45Q==
+"@opentripplanner/trip-details@^2.2.3":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-2.2.3.tgz#9af2e8466c8d7ee59749e81353ed1caa22284c24"
+  integrity sha512-Ky0SYND1Z2GofxHYCavgxLNQcbslc4S81f7chTdvpww/TPt4TTr2j0WGcBVnoW3uNo2QCSSCXk7J65kPoDLQsQ==
   dependencies:
     "@opentripplanner/core-utils" "^7.0.3"
     "@styled-icons/fa-solid" "^10.34.0"