Merge pull request #4686 from HSLdevcom/DT-5609-v2

DT-5609 do not search train stops from HSL data in matka
HSLdevcom · Nov 18, 2022 · a5c07d8 · a5c07d8
2 parents e894996 + 2dd0f30
commit a5c07d8
Show file tree

Hide file tree

Showing 32 changed files with 284 additions and 194 deletions.
diff --git a/app/component/IndexPage.js b/app/component/IndexPage.js
@@ -223,11 +223,11 @@ class IndexPage extends React.Component {
       'Stops',
     ];
 
-    if (useCitybikes(this.context.config.cityBike?.networks)) {
+    if (useCitybikes(config.cityBike?.networks)) {
       stopAndRouteSearchTargets.push('BikeRentalStations');
       locationSearchTargets.push('BikeRentalStations');
     }
-    if (this.context.config.includeParkAndRideSuggestions) {
+    if (config.includeParkAndRideSuggestions) {
       stopAndRouteSearchTargets.push('ParkingAreas');
       locationSearchTargets.push('ParkingAreas');
     }
@@ -290,6 +290,15 @@ class IndexPage extends React.Component {
       modeIconColors: config.colors.iconColors,
       modeSet: config.iconModeSet,
     };
+
+    if (config.stopSearchFilter) {
+      stopRouteSearchProps.filterResults = results =>
+        results.filter(config.stopSearchFilter);
+      stopRouteSearchProps.geocodingSize = 40; // increase size to compensate filtering
+      locationSearchProps.filterResults = results =>
+        results.filter(config.stopSearchFilter);
+    }
+
     const transportModes = getTransportModes(config);
     const nearYouModes = getNearYouModes(config);
 

diff --git a/app/component/OriginDestinationBar.js b/app/component/OriginDestinationBar.js
@@ -119,6 +119,7 @@ class OriginDestinationBar extends React.Component {
   };
 
   render() {
+    const { config } = this.context;
     const refPoint = getRefPoint(
       this.props.origin,
       this.props.destination,
@@ -129,6 +130,9 @@ class OriginDestinationBar extends React.Component {
       desktopTargets.push('BikeRentalStations');
     }
     const mobileTargets = [...desktopTargets, 'MapPosition'];
+    const filter = config.stopSearchFilter
+      ? results => results.filter(config.stopSearchFilter)
+      : undefined;
     return (
       <div
         className={cx(
@@ -167,6 +171,7 @@ class OriginDestinationBar extends React.Component {
           }
           modeSet={this.props.modeSet}
           onFocusChange={() => {}}
+          filterResults={filter}
         />{' '}
       </div>
     );

diff --git a/app/component/StopsNearYouSearch.js b/app/component/StopsNearYouSearch.js
@@ -14,6 +14,12 @@ function StopsNearYouSearch({ mode, breakpoint, lang }, { router, config }) {
   const isMobile = breakpoint !== 'large';
   const transportMode = `route-${mode}`;
 
+  const filter = config.stopSearchFilter
+    ? (results, transportmode, type) =>
+        filterSearchResultsByMode(results, transportmode, type).filter(
+          config.stopSearchFilter,
+        )
+    : filterSearchResultsByMode;
   const selectHandler = item => {
     router.push(getStopRoutePath(item));
   };
@@ -30,7 +36,7 @@ function StopsNearYouSearch({ mode, breakpoint, lang }, { router, config }) {
           transportMode={transportMode}
           geocodingSize={40}
           value=""
-          filterResults={filterSearchResultsByMode}
+          filterResults={filter}
           sources={searchSources}
           targets={
             mode === 'CITYBIKE' ? ['BikeRentalStations'] : ['Stops', 'Routes']

diff --git a/app/configurations/config.matka.js b/app/configurations/config.matka.js
@@ -82,6 +82,17 @@ export default {
     'digitraffic',
   ],
 
+  stopSearchFilter: stop => {
+    const props = stop.properties;
+    if (
+      props?.id?.includes('GTFS:HSL') &&
+      props?.addendum?.GTFS?.modes?.includes('RAIL')
+    ) {
+      return false;
+    }
+    return true;
+  },
+
   meta: {
     description: APP_DESCRIPTION,
     keywords: `reitti,reitit,opas,reittiopas,joukkoliikenne`,

diff --git a/digitransit-component/packages/digitransit-component-autosuggest-panel/package.json b/digitransit-component/packages/digitransit-component-autosuggest-panel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-autosuggest-panel",
-  "version": "1.4.11",
+  "version": "1.5.3",
   "description": "digitransit-component autosuggest-panel module",
   "main": "index.js",
   "files": [
@@ -28,8 +28,8 @@
   "author": "Digitransit Authors",
   "license": "(AGPL-3.0 OR EUPL-1.2)",
   "peerDependencies": {
-    "@digitransit-component/digitransit-component-autosuggest": "^1.8.12",
-    "@digitransit-component/digitransit-component-icon": "^0.1.18",
+    "@digitransit-component/digitransit-component-autosuggest": "^1.9.2",
+    "@digitransit-component/digitransit-component-icon": "^0.2.0",
     "@hsl-fi/sass": "^0.2.0",
     "classnames": "2.2.6",
     "i18next": "^19.3.3",

diff --git a/...ransit-component/packages/digitransit-component-autosuggest-panel/src/helpers/styles.scss b/...ransit-component/packages/digitransit-component-autosuggest-panel/src/helpers/styles.scss
@@ -231,4 +231,8 @@ $zindex: base, map-container, map-gradient, map-fullscreen-toggle,
     margin-left: 25px;
     margin-top: -5px;
   }
+}
+
+.search-panel-whitespace {
+  min-width: 40px;
 }
diff --git a/digitransit-component/packages/digitransit-component-autosuggest-panel/src/index.js b/digitransit-component/packages/digitransit-component-autosuggest-panel/src/index.js
@@ -656,24 +656,27 @@ class DTAutosuggestPanel extends React.Component {
             showScroll={this.props.showScroll}
             isEmbedded={this.props.isEmbedded}
           />
-          <ItinerarySearchControl
-            className={cx(styles['add-via-point'], styles.more, {
-              collapsed: viaPoints.length > 4,
-            })}
-            enabled={showMultiPointControls}
-            onClick={() => this.handleAddViaPointClick()}
-            onKeyPress={e =>
-              this.isKeyboardSelectionEvent(e) && this.handleAddViaPointClick()
-            }
-            aria-label={i18next.t('add-via-button-label')}
-          >
-            <Icon
-              img="viapoint"
-              width={1.25}
-              height={1.375}
-              color={this.props.color}
-            />
-          </ItinerarySearchControl>
+          {showMultiPointControls && (
+            <ItinerarySearchControl
+              className={cx(styles['add-via-point'], styles.more, {
+                collapsed: viaPoints.length > 4,
+              })}
+              enabled={showMultiPointControls}
+              onClick={() => this.handleAddViaPointClick()}
+              onKeyPress={e =>
+                this.isKeyboardSelectionEvent(e) &&
+                this.handleAddViaPointClick()
+              }
+              aria-label={i18next.t('add-via-button-label')}
+            >
+              <Icon
+                img="viapoint"
+                width={1.25}
+                height={1.375}
+                color={this.props.color}
+              />
+            </ItinerarySearchControl>
+          )}
         </div>
       </div>
     );

diff --git a/digitransit-component/packages/digitransit-component-autosuggest/package.json b/digitransit-component/packages/digitransit-component-autosuggest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-autosuggest",
-  "version": "1.8.12",
+  "version": "1.9.2",
   "description": "digitransit-component autosuggest module",
   "main": "index.js",
   "files": [
@@ -29,15 +29,15 @@
   "author": "Digitransit Authors",
   "license": "(AGPL-3.0 OR EUPL-1.2)",
   "dependencies": {
-    "@digitransit-search-util/digitransit-search-util-execute-search-immidiate": "^1.2.3",
-    "@digitransit-search-util/digitransit-search-util-get-label": "^0.1.2",
-    "@digitransit-search-util/digitransit-search-util-uniq-by-label": "^1.0.0",
+    "@digitransit-search-util/digitransit-search-util-execute-search-immidiate": "^1.3.1",
+    "@digitransit-search-util/digitransit-search-util-get-label": "^0.2.0",
+    "@digitransit-search-util/digitransit-search-util-uniq-by-label": "^1.1.0",
     "@hsl-fi/hooks": "^1.2.0"
   },
   "peerDependencies": {
     "@digitransit-component/digitransit-component-dialog-modal": "^0.3.4",
-    "@digitransit-component/digitransit-component-icon": "^0.1.18",
-    "@digitransit-component/digitransit-component-suggestion-item": "^1.0.4",
+    "@digitransit-component/digitransit-component-icon": "^0.2.0",
+    "@digitransit-component/digitransit-component-suggestion-item": "^1.1.0",
     "@hsl-fi/sass": "^0.2.0",
     "classnames": "2.2.6",
     "i18next": "^19.3.3",

diff --git a/...ransit-component/packages/digitransit-component-autosuggest/src/helpers/MobileSearch.scss b/...ransit-component/packages/digitransit-component-autosuggest/src/helpers/MobileSearch.scss
@@ -48,6 +48,8 @@ input[type='text'] {
   justify-content: center;
   height: 100%;
   width: 52px;
+  border: 0;
+  background: none;
   svg {
     fill: $primary-color;
     width: 14px;
@@ -172,6 +174,7 @@ button.clear-input {
 
 .clear-search-history {
   display: flex;
+  font-family: 'Gotham Rounded A', 'Gotham Rounded B', 'Roboto', Arial, Georgia, Serif;
   margin-top: auto;
   align-items: center;
   justify-content: center;
@@ -182,6 +185,7 @@ button.clear-input {
   font-size: 15px;
   font-weight: var(--font-weight-medium);
   letter-spacing: -0.42px;
+  border: none;
   border-top: 1px solid #ddd;
 }
 

diff --git a/digitransit-component/packages/digitransit-component-autosuggest/src/index.js b/digitransit-component/packages/digitransit-component-autosuggest/src/index.js
@@ -312,6 +312,7 @@ class DTAutosuggest extends React.Component {
       'mode-metro': '#ed8c00',
       'mode-ferry': '#007A97',
       'mode-citybike': '#f2b62d',
+      'mode-funicular': '#ff00ff',
     },
     required: false,
     modeSet: undefined,
@@ -682,6 +683,7 @@ class DTAutosuggest extends React.Component {
       value: '',
       sources: this.props.sources,
       ownPlaces: false,
+      renderMobileSearch: this.props.isMobile,
     };
     // must update suggestions
     this.setState(newState, () =>
@@ -695,6 +697,7 @@ class DTAutosuggest extends React.Component {
 
   inputClicked = inputValue => {
     this.input.focus();
+    this.clearLocationText();
     if (this.props.isMobile) {
       this.props.lock();
     }
@@ -728,6 +731,8 @@ class DTAutosuggest extends React.Component {
         this.fetchFunction({ value: this.state.value });
         this.setState(newState);
       }
+    } else if (this.props.isMobile && !this.state.renderMobileSearch) {
+      this.setState({ renderMobileSearch: true });
     }
   };
 
@@ -874,7 +879,7 @@ class DTAutosuggest extends React.Component {
     this.props.id === 'via-point' ||
     this.props.id === 'origin-stop-near-you';
 
-  onFocus = () => {
+  clearLocationText = () => {
     const positions = [
       'Valittu sijainti',
       'Nykyinen sijaintisi',
@@ -890,10 +895,13 @@ class DTAutosuggest extends React.Component {
     if (positions.includes(this.state.value)) {
       this.clearInput();
     }
+  };
+
+  onFocus = () => {
+    this.clearLocationText();
+
     const scrollY = window.pageYOffset;
-    return this.setState({
-      scrollY,
-    });
+    return this.setState({ scrollY });
   };
 
   render() {

diff --git a/digitransit-component/packages/digitransit-component-control-panel/package.json b/digitransit-component/packages/digitransit-component-control-panel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-control-panel",
-  "version": "1.0.4",
+  "version": "1.1.1",
   "description": "digitransit-component control-panel module",
   "main": "index.js",
   "files": [
@@ -29,7 +29,7 @@
   "author": "Digitransit Authors",
   "license": "(AGPL-3.0 OR EUPL-1.2)",
   "peerDependencies": {
-    "@digitransit-component/digitransit-component-icon": "^0.1.18",
+    "@digitransit-component/digitransit-component-icon": "^0.2.0",
     "@hsl-fi/sass": "~0.2.0",
     "classnames": "2.2.6",
     "i18next": "^19.3.3",