Merge pull request #5411 from HSLdevcom/DT-6889

DT-6889 separate bicycle button for matka

Author: vesameskanen

app/component/itinerary/customizesearch/StreetModeSelectorPanel.js

@@ -66,17 +66,14 @@ const StreetModeSelectorPanel = (
             </label>
           </div>
         </div>
-        {!config.includePublicWithBikePlan ||
-        currentSettings.includeBikeSuggestions ? (
-          <BikingOptionsSection
-            bikeSpeed={currentSettings.bikeSpeed}
-            defaultSettings={defaultSettings}
-            bikeSpeedOptions={config.defaultOptions.bikeSpeed}
-            overrideStyle={overrideStyle}
-          />
-        ) : null}
-        {config.showBikeAndParkItineraries &&
-        !config.includePublicWithBikePlan ? (
+        <BikingOptionsSection
+          bikeSpeed={currentSettings.bikeSpeed}
+          defaultSettings={defaultSettings}
+          bikeSpeedOptions={config.defaultOptions.bikeSpeed}
+          overrideStyle={overrideStyle}
+        />
+
+        {config.showBikeAndParkItineraries ? (
           <div className="settings-mode-option-container">
             {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
             <label

app/configurations/config.hsl.js

@@ -572,8 +572,6 @@ export default {
 
   includeCarSuggestions: true,
   includeParkAndRideSuggestions: true,
-  // Include both bike and park and bike and public, if bike is enabled
-  includePublicWithBikePlan: false,
   // Park and ride and car suggestions separated into two switches
   separatedParkAndRideSwitch: true,
 

app/configurations/config.matka.js

@@ -423,9 +423,6 @@ export default {
 
   disabledLegTextModes: ['ferry'],
 
-  // Include both bike and park and bike and public, if bike is enabled
-  includePublicWithBikePlan: true,
-
   startSearchFromUserLocation: true,
 
   minTransferTimeSelection: [

app/util/planParamUtil.js

@@ -222,9 +222,7 @@ export function planQueryNeeded(
         transitModes.length > 0 &&
         !wheelchair &&
         config.showBikeAndParkItineraries &&
-        (config.includePublicWithBikePlan
-          ? settings.includeBikeSuggestions
-          : settings.showBikeAndParkItineraries)
+        settings.showBikeAndParkItineraries
       );
 
     case PLANTYPE.BIKETRANSIT: