Merge pull request #4939 from HSLdevcom/DT-6225

DT-6225: Use transferPenalty to avoid transfers
HSLdevcom · Jan 30, 2024 · 9d293dd · 9d293dd
2 parents db4cde8 + 2ff73de
commit 9d293dd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/app/component/CustomizeSearchNew.js b/app/component/CustomizeSearchNew.js
@@ -108,7 +108,7 @@ class CustomizeSearch extends React.Component {
               <TransferOptionsSection
                 defaultSettings={this.defaultSettings}
                 currentSettings={currentSettings}
-                walkBoardCostHigh={config.walkBoardCostHigh}
+                transferPenaltyHigh={config.transferPenaltyHigh}
               />
             </div>
           </div>

diff --git a/app/component/customizesearch/TransferOptionsSection.js b/app/component/customizesearch/TransferOptionsSection.js
@@ -6,11 +6,11 @@ import { saveRoutingSettings } from '../../action/SearchSettingsActions';
 import { addAnalyticsEvent } from '../../util/analyticsUtils';
 
 const TransferOptionsSection = (
-  { defaultSettings, walkBoardCostHigh, currentSettings },
+  { defaultSettings, transferPenaltyHigh, currentSettings },
   { executeAction },
 ) => {
   const avoidTransfers =
-    currentSettings.walkBoardCost !== defaultSettings.walkBoardCost;
+    currentSettings.transferPenalty !== defaultSettings.transferPenalty;
   return (
     <div className="mode-option-container toggle-container avoid-transfers-container">
       <label htmlFor="settings-toggle-transfers" className="settings-header">
@@ -23,9 +23,9 @@ const TransferOptionsSection = (
           toggled={avoidTransfers}
           onToggle={() => {
             executeAction(saveRoutingSettings, {
-              walkBoardCost: avoidTransfers
-                ? defaultSettings.walkBoardCost
-                : walkBoardCostHigh,
+              transferPenalty: avoidTransfers
+                ? defaultSettings.transferPenalty
+                : transferPenaltyHigh,
             });
             addAnalyticsEvent({
               category: 'ItinerarySettings',
@@ -43,9 +43,10 @@ const TransferOptionsSection = (
 TransferOptionsSection.propTypes = {
   defaultSettings: PropTypes.shape({
     walkBoardCost: PropTypes.number.isRequired,
+    transferPenalty: PropTypes.number.isRequired,
   }).isRequired,
   currentSettings: PropTypes.object.isRequired,
-  walkBoardCostHigh: PropTypes.number.isRequired,
+  transferPenaltyHigh: PropTypes.number.isRequired,
 };
 
 TransferOptionsSection.contextTypes = {

diff --git a/app/configurations/config.default.js b/app/configurations/config.default.js
@@ -194,6 +194,7 @@ export default {
     walkBoardCost: 120,
     walkReluctance: 1.8,
     walkSpeed: 1.2,
+    transferPenalty: 0,
     includeBikeSuggestions: true,
     includeParkAndRideSuggestions: false,
     includeCarSuggestions: false,
@@ -216,7 +217,7 @@ export default {
     bikeSpeed: [2.77, 4.15, 5.55, 6.94, 8.33],
   },
 
-  walkBoardCostHigh: 1600,
+  transferPenaltyHigh: 1600,
 
   suggestWalkMaxDistance: 10000,
   suggestBikeMaxDistance: 30000,

diff --git a/app/store/localStorage.js b/app/store/localStorage.js
@@ -107,6 +107,10 @@ export function setCustomizedSettings(data) {
       data.walkBoardCost,
       oldSettings.walkBoardCost,
     ),
+    transferPenalty: getNumberValueOrDefault(
+      data.transferPenalty,
+      oldSettings.transferPenalty,
+    ),
     walkReluctance: getNumberValueOrDefault(
       data.walkReluctance,
       oldSettings.walkReluctance,