@digitransit-search-util/digitransit-search-util-execute-search-immidiate 1.1.2 → 1.2.2

package/index.js

@@ -221,6 +221,7 @@ const routeLayers = [
   'route-AIRPLANE',
 ];
 const locationLayers = ['favouritePlace', 'venue', 'address', 'street'];
+const parkingLayers = ['carpark', 'bikepark'];
 /**
  * Executes the search
  *
@@ -242,6 +243,7 @@ export function getSearchResults(
     getFavouriteLocations: locations,
     getOldSearches: prevSearches,
     getFavouriteStops: stops,
+    parkingAreaSources,
     getLanguage,
     getStopAndStationsQuery,
     getFavouriteBikeRentalStationsQuery,
@@ -307,6 +309,7 @@ export function getSearchResults(
         searchComponents.push(getBackSuggestion());
       }
     }
+
     if (allSources || sources.includes('Datasource')) {
       const geocodingLayers = ['station', 'venue', 'address', 'street'];
       const feedis = feedIDs.map(v => `gtfs${v}`);
@@ -333,6 +336,8 @@ export function getSearchResults(
         'futureRoute',
         'ownLocations',
         'bikeRentalStation',
+        'bikepark',
+        'carpark',
         'stop',
         'back',
       ];
@@ -340,6 +345,49 @@ export function getSearchResults(
       searchComponents.push(getOldSearches(locationHistory, input, dropLayers));
     }
   }
+  if (allTargets || targets.includes('ParkingAreas')) {
+    if (allSources || sources.includes('Datasource')) {
+      const searchParams = geocodingSearchParams;
+      if (geocodingSize && geocodingSize !== 10) {
+        searchParams.size = geocodingSize;
+      }
+      const geocodingLayers = ['carpark', 'bikepark'];
+      const feedIds = parkingAreaSources ? parkingAreaSources.join(',') : null;
+      searchComponents.push(
+        getGeocodingResults(
+          input,
+          searchParams,
+          language,
+          focusPoint,
+          feedIds,
+          URL_PELIAS,
+          minimalRegexp,
+          geocodingLayers,
+        ).then(results => {
+          if (filterResults) {
+            return filterResults(results, mode);
+          }
+          return results;
+        }),
+      );
+    }
+    if (allSources || sources.includes('History')) {
+      const history = prevSearches(context);
+      const dropLayers = [
+        'currentPosition',
+        'selectFromMap',
+        'futureRoute',
+        'ownLocations',
+        'favouritePlace',
+        'bikestation',
+        'bikeRentalStation',
+        'back',
+      ];
+      dropLayers.push(...routeLayers);
+      dropLayers.push(...locationLayers);
+      searchComponents.push(getOldSearches(history, input, dropLayers));
+    }
+  }
 
   if (allTargets || targets.includes('Stops')) {
     if (sources.includes('Favourite')) {
@@ -415,6 +463,7 @@ export function getSearchResults(
       ];
       dropLayers.push(...routeLayers);
       dropLayers.push(...locationLayers);
+      dropLayers.push(...parkingLayers);
       if (transportMode) {
         if (transportMode !== 'route-CITYBIKE') {
           dropLayers.push('bikeRentalStation');
@@ -459,6 +508,8 @@ export function getSearchResults(
         'favouritePlace',
         'stop',
         'station',
+        'bikepark',
+        'carpark',
         'ownLocations',
         'back',
       ];
@@ -486,9 +537,8 @@ export function getSearchResults(
     }
     if (allSources || sources.includes('Datasource')) {
       const geocodingLayers = ['bikestation'];
-      const searchParams = {
-        size: geocodingSize,
-      };
+      const searchParams =
+        geocodingSize && geocodingSize !== 10 ? { size: geocodingSize } : {};
       searchComponents.push(
         getGeocodingResults(
           input,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-search-util/digitransit-search-util-execute-search-immidiate",
-  "version": "1.1.2",
+  "version": "1.2.2",
   "description": "digitransit-search-util execute-search-immidiate module",
   "main": "index.js",
   "publishConfig": {
@@ -25,8 +25,8 @@
     "@digitransit-search-util/digitransit-search-util-get-geocoding-results": "0.0.5",
     "@digitransit-search-util/digitransit-search-util-get-json": "0.0.4",
     "@digitransit-search-util/digitransit-search-util-helpers": "1.0.3",
-    "@digitransit-search-util/digitransit-search-util-uniq-by-label": "0.1.1",
+    "@digitransit-search-util/digitransit-search-util-uniq-by-label": "^1.0.0",
     "lodash": "4.17.21"
   },
-  "gitHead": "0c3901e4be1733df892f22c266432e442a00fd95"
+  "gitHead": "7329304ce6d60ed6a3cf52735c873d2a354043b0"
 }