@digitransit-search-util/digitransit-search-util-execute-search-immidiate 2.0.3 → 3.0.1

package/index.js

@@ -167,9 +167,12 @@ function getBackSuggestion() {
   ]);
 }
 
-function filterFavouriteStops(stopsAndStations, input) {
-  return stopsAndStations.then(stops => {
-    return filterMatchingToInput(stops, input, [
+function filterFavouriteStops(stopsAndStations, input, useStops, useStations) {
+  return stopsAndStations.then(stopsStations => {
+    const candidates = stopsStations.filter(s =>
+      s.type === 'stop' ? useStops : useStations,
+    );
+    return filterMatchingToInput(candidates, input, [
       'properties.name',
       'properties.name',
       'properties.address',
@@ -229,9 +232,12 @@ const routeLayers = [
   'route-FERRY',
   'route-SUBWAY',
   'route-AIRPLANE',
+  'route-FUNICULAR',
 ];
-const locationLayers = ['favouritePlace', 'venue', 'address', 'street'];
+const locationLayers = ['venue', 'address', 'street'];
 const parkingLayers = ['carpark', 'bikepark'];
+const stopLayers = ['stop', 'station'];
+
 /**
  * Executes the search
  *
@@ -323,16 +329,17 @@ export function getSearchResults(
     }
 
     if (allSources || sources.includes('Datasource')) {
-      const geocodingLayers = ['station', 'venue', 'address', 'street'];
-      const feedis = feedIDs.map(v => `gtfs${v}`);
-      const geosources = geocodingSources.concat(feedis).join(',');
+      const geocodingLayers = ['venue', 'address', 'street'];
+      if (targets.includes('Stations')) {
+        geocodingLayers.push('station'); // search stations from OSM
+      }
       searchComponents.push(
         getGeocodingResults(
           input,
           searchParams,
           language,
           focusPoint,
-          geosources,
+          geocodingSources.join(','),
           URL_PELIAS,
           minimalRegexp,
           geocodingLayers,
@@ -341,18 +348,10 @@ export function getSearchResults(
     }
     if (allSources || sources.includes('History')) {
       const locationHistory = getOldSearches(context, 'endpoint');
-      const dropLayers = [
-        'currentPosition',
-        'selectFromMap',
-        'futureRoute',
-        'ownLocations',
-        'vehicleRentalStation',
-        'bikepark',
-        'carpark',
-        'stop',
-        'back',
-      ];
+      const dropLayers = ['bikestation'];
+      dropLayers.push(...stopLayers);
       dropLayers.push(...routeLayers);
+      dropLayers.push(...parkingLayers);
       searchComponents.push(
         filterOldSearches(locationHistory, input, dropLayers),
       );
@@ -386,25 +385,18 @@ export function getSearchResults(
     }
     if (allSources || sources.includes('History')) {
       const history = getOldSearches(context);
-      const dropLayers = [
-        'currentPosition',
-        'selectFromMap',
-        'futureRoute',
-        'ownLocations',
-        'favouritePlace',
-        'bikestation',
-        'vehicleRentalStation',
-        'back',
-        'stop',
-        'station',
-      ];
+      const dropLayers = ['bikestation'];
+      dropLayers.push(...stopLayers);
       dropLayers.push(...routeLayers);
       dropLayers.push(...locationLayers);
       searchComponents.push(filterOldSearches(history, input, dropLayers));
     }
   }
 
-  if (allTargets || targets.includes('Stops')) {
+  const useStops = targets.includes('Stops');
+  const useStations = targets.includes('Stations');
+
+  if (allTargets || useStops || useStations) {
     if (sources.includes('Favourite')) {
       const favouriteStops = getFavouriteStops(context);
       let stopsAndStations;
@@ -430,10 +422,18 @@ export function getSearchResults(
             return results;
           });
       }
-      searchComponents.push(filterFavouriteStops(stopsAndStations, input));
+      searchComponents.push(
+        filterFavouriteStops(stopsAndStations, input, useStops, useStations),
+      );
     }
     if (allSources || sources.includes('Datasource')) {
-      const geocodingLayers = ['stop', 'station'];
+      const geocodingLayers = [];
+      if (useStops) {
+        geocodingLayers.push('stop');
+      }
+      if (useStations) {
+        geocodingLayers.push('station');
+      }
       const searchParams =
         geocodingSize && geocodingSize !== 10 ? { size: geocodingSize } : {};
       if (geocodingSearchParams && geocodingSearchParams['boundary.country']) {
@@ -445,14 +445,14 @@ export function getSearchResults(
       if (allTargets || targets.includes('Locations')) {
         searchParams.dedupestops = 1;
       }
-      const feedis = feedIDs.map(v => `gtfs${v}`).join(',');
+      const feeds = feedIDs.map(v => `gtfs${v}`).join(',');
       searchComponents.push(
         getGeocodingResults(
           input,
           searchParams,
           language,
           focusPoint,
-          feedis,
+          feeds,
           URL_PELIAS,
           minimalRegexp,
           geocodingLayers,
@@ -471,23 +471,17 @@ export function getSearchResults(
         }
         return true;
       });
-      const dropLayers = [
-        'currentPosition',
-        'selectFromMap',
-        'futureRoute',
-        'ownLocations',
-        'favouritePlace',
-        'vehicleRentalStation',
-        'back',
-      ];
+      const dropLayers = ['bikestation'];
       dropLayers.push(...routeLayers);
       dropLayers.push(...locationLayers);
       dropLayers.push(...parkingLayers);
+      if (!useStops) {
+        dropLayers.push('stop');
+      }
+      if (!useStations) {
+        dropLayers.push('station');
+      }
       if (transportMode) {
-        if (transportMode !== 'route-CITYBIKE') {
-          dropLayers.push('vehicleRentalStation');
-          dropLayers.push('bikestation');
-        }
         searchComponents.push(
           filterOldSearches(stopHistory, input, dropLayers).then(result =>
             filterResults ? filterResults(result, mode) : result,
@@ -500,7 +494,6 @@ export function getSearchResults(
       }
     }
   }
-
   if (allTargets || targets.includes('Routes')) {
     if (sources.includes('Favourite')) {
       const favouriteRoutes = getFavouriteRoutes(context);
@@ -518,26 +511,14 @@ export function getSearchResults(
     );
     if (allSources || sources.includes('History')) {
       const routeHistory = getOldSearches(context);
-      const dropLayers = [
-        'currentPosition',
-        'selectFromMap',
-        'futureRoute',
-        'favouritePlace',
-        'stop',
-        'station',
-        'bikepark',
-        'carpark',
-        'ownLocations',
-        'back',
-      ];
+      const dropLayers = ['bikestation'];
       if (transportMode) {
-        if (transportMode !== 'route-CITYBIKE') {
-          dropLayers.push('vehicleRentalStation');
-          dropLayers.push('bikestation');
-        }
         dropLayers.push(...routeLayers.filter(i => !(i === transportMode)));
       }
+      dropLayers.push(...stopLayers);
       dropLayers.push(...locationLayers);
+      dropLayers.push(...parkingLayers);
+
       searchComponents.push(
         filterOldSearches(routeHistory, input, dropLayers).then(results =>
           filterResults ? filterResults(results, mode, 'Routes') : results,
@@ -578,6 +559,15 @@ export function getSearchResults(
         }),
       );
     }
+    if (allSources || sources.includes('History')) {
+      const history = getOldSearches(context);
+      const dropLayers = [...stopLayers];
+      dropLayers.push(...routeLayers);
+      dropLayers.push(...locationLayers);
+      dropLayers.push(...parkingLayers);
+
+      searchComponents.push(filterOldSearches(history, input, dropLayers));
+    }
   }
 
   const searchResultsPromise = Promise.all(searchComponents)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-search-util/digitransit-search-util-execute-search-immidiate",
-  "version": "2.0.3",
+  "version": "3.0.1",
   "description": "digitransit-search-util execute-search-immidiate module",
   "main": "index.js",
   "publishConfig": {
@@ -27,5 +27,5 @@
     "@digitransit-search-util/digitransit-search-util-helpers": "2.0.0",
     "lodash": "4.17.21"
   },
-  "gitHead": "ec8983842715dc421b7f806fc943f1c729ac42c3"
+  "gitHead": "d47e439a2d01ec41702a85ac226a7bc1ccaaa47c"
 }