Merge pull request #5062 from HSLdevcom/DT-5934

DT-5934 Minimum transfertime option

app/component/itinerary/CustomizeSearch.js

@@ -8,6 +8,7 @@ import FareZoneSelector from './customizesearch/FareZoneSelector';
 import StreetModeSelectorPanel from './customizesearch/StreetModeSelectorPanel';
 import TransportModesSection from './customizesearch/TransportModesSection';
 import WalkingOptionsSection from './customizesearch/WalkingOptionsSection';
+import MinTransferTimeSection from './customizesearch/MinTransferTimeSection';
 import AccessibilityOptionSection from './customizesearch/AccessibilityOptionSection';
 import TransferOptionsSection from './customizesearch/TransferOptionsSection';
 import RentalNetworkSelector from './customizesearch/RentalNetworkSelector';
@@ -128,6 +129,13 @@ class CustomizeSearch extends React.Component {
                 <TransportModesSection config={config} />
               </div>
             )}
+            {config.minTransferTimeSelection && (
+              <MinTransferTimeSection
+                minTransferTimeOptions={config.minTransferTimeSelection}
+                currentSettings={currentSettings}
+                defaultSettings={this.defaultSettings}
+              />
+            )}
             <div className="settings-option-container">
               <TransferOptionsSection
                 defaultSettings={this.defaultSettings}

app/component/itinerary/customizesearch/MinTransferTimeSection.js

@@ -0,0 +1,52 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { intlShape } from 'react-intl';
+import { saveRoutingSettings } from '../../../action/SearchSettingsActions';
+import { settingsShape, minTransferTimeShape } from '../../../util/shapes';
+import { addAnalyticsEvent } from '../../../util/analyticsUtils';
+import SearchSettingsDropdown from './SearchSettingsDropdown';
+
+const MinTransferTimeSection = (
+  { currentSettings, defaultSettings, minTransferTimeOptions },
+  { intl, executeAction },
+  options = minTransferTimeOptions,
+  currentSelection = options.find(
+    option => option.value === currentSettings.minTransferTime,
+  ),
+) => (
+  <div className="walk-options-container">
+    <SearchSettingsDropdown
+      currentSelection={currentSelection}
+      defaultValue={defaultSettings.minTransferTime}
+      onOptionSelected={value => {
+        executeAction(saveRoutingSettings, {
+          minTransferTime: value,
+        });
+        addAnalyticsEvent({
+          category: 'ItinerarySettings',
+          action: 'ChangeMinTransferTime',
+          name: value,
+        });
+      }}
+      options={options}
+      labelText={intl.formatMessage({ id: 'min-transfer-time' })}
+      highlightDefaulValue
+      formatOptions
+      name="minTransferTime"
+      translateLabels={false}
+    />
+  </div>
+);
+
+MinTransferTimeSection.propTypes = {
+  defaultSettings: settingsShape.isRequired,
+  minTransferTimeOptions: minTransferTimeShape.isRequired,
+  currentSettings: settingsShape.isRequired,
+};
+
+MinTransferTimeSection.contextTypes = {
+  intl: intlShape.isRequired,
+  executeAction: PropTypes.func.isRequired,
+};
+
+export default MinTransferTimeSection;

app/configurations/config.matka.js

@@ -391,4 +391,31 @@ export default {
   includePublicWithBikePlan: true,
 
   startSearchFromUserLocation: true,
+
+  minTransferTimeSelection: [
+    {
+      title: '1.5 min',
+      value: 90,
+    },
+    {
+      title: '3 min',
+      value: 180,
+    },
+    {
+      title: '5 min',
+      value: 300,
+    },
+    {
+      title: '7 min',
+      value: 420,
+    },
+    {
+      title: '10 min',
+      value: 600,
+    },
+    {
+      title: '30 min',
+      value: 1800,
+    },
+  ],
 };

app/configurations/config.waltti.js

@@ -244,4 +244,27 @@ export default {
   },
 
   startSearchFromUserLocation: true,
+
+  minTransferTimeSelection: [
+    {
+      title: '1.5 min',
+      value: 90,
+    },
+    {
+      title: '3 min',
+      value: 180,
+    },
+    {
+      title: '5 min',
+      value: 300,
+    },
+    {
+      title: '7 min',
+      value: 420,
+    },
+    {
+      title: '10 min',
+      value: 600,
+    },
+  ],
 };

app/translations.js

@@ -1263,6 +1263,7 @@ const translations = {
     'menu-link-to-privacy-policy': 'Privacy policy',
     'messagebar-label-close-message-bar': 'Close banner',
     'messagebar-label-page': 'Page',
+    'min-transfer-time': 'Interchange time',
     'minute-short': 'min',
     minutes: 'min',
     'minutes-or-route': 'Min / Route',
@@ -2476,6 +2477,7 @@ const translations = {
     'menu-link-to-privacy-policy': 'Rekisteriseloste',
     'messagebar-label-close-message-bar': 'Sulje banneri',
     'messagebar-label-page': 'Sivu',
+    'min-transfer-time': 'Vaihtoaika',
     'minute-short': 'min',
     minutes: 'min',
     'minutes-or-route': 'Min / Linja',
@@ -5336,6 +5338,7 @@ const translations = {
     'menu-link-to-privacy-policy': 'Registerbeskrivning',
     'messagebar-label-close-message-bar': 'Stäng banner',
     'messagebar-label-page': 'Sidan',
+    'min-transfer-time': 'Bytestid',
     'minute-short': 'min',
     minutes: 'min',
     'minutes-or-route': 'Min / Linje',

app/util/shapes.js

@@ -402,3 +402,10 @@ export const vehicleShape = PropTypes.shape({
   heading: PropTypes.number,
   headsign: PropTypes.string,
 });
+
+export const minTransferTimeShape = PropTypes.arrayOf(
+  PropTypes.shape({
+    title: PropTypes.string,
+    value: PropTypes.number,
+  }),
+);