@digitransit-search-util/digitransit-search-util-execute-search-immidiate 1.3.4 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +16 -13
- package/package.json +3 -4
package/index.js
CHANGED
|
@@ -5,7 +5,6 @@ import {
|
|
|
5
5
|
sortSearchResults,
|
|
6
6
|
isStop,
|
|
7
7
|
} from '@digitransit-search-util/digitransit-search-util-helpers';
|
|
8
|
-
import uniqByLabel from '@digitransit-search-util/digitransit-search-util-uniq-by-label';
|
|
9
8
|
import filterMatchingToInput from '@digitransit-search-util/digitransit-search-util-filter-matching-to-input';
|
|
10
9
|
import getGeocodingResults from '@digitransit-search-util/digitransit-search-util-get-geocoding-results';
|
|
11
10
|
import getJson from '@digitransit-search-util/digitransit-search-util-get-json';
|
|
@@ -248,8 +247,8 @@ export function getSearchResults(
|
|
|
248
247
|
parkingAreaSources,
|
|
249
248
|
getLanguage,
|
|
250
249
|
getStopAndStationsQuery,
|
|
251
|
-
|
|
252
|
-
|
|
250
|
+
getFavouriteVehicleRentalStationsQuery,
|
|
251
|
+
getFavouriteVehicleRentalStations,
|
|
253
252
|
getFavouriteRoutesQuery,
|
|
254
253
|
getFavouriteRoutes,
|
|
255
254
|
getRoutesQuery,
|
|
@@ -338,7 +337,7 @@ export function getSearchResults(
|
|
|
338
337
|
'selectFromMap',
|
|
339
338
|
'futureRoute',
|
|
340
339
|
'ownLocations',
|
|
341
|
-
'
|
|
340
|
+
'vehicleRentalStation',
|
|
342
341
|
'bikepark',
|
|
343
342
|
'carpark',
|
|
344
343
|
'stop',
|
|
@@ -385,7 +384,7 @@ export function getSearchResults(
|
|
|
385
384
|
'ownLocations',
|
|
386
385
|
'favouritePlace',
|
|
387
386
|
'bikestation',
|
|
388
|
-
'
|
|
387
|
+
'vehicleRentalStation',
|
|
389
388
|
'back',
|
|
390
389
|
'stop',
|
|
391
390
|
'station',
|
|
@@ -469,7 +468,7 @@ export function getSearchResults(
|
|
|
469
468
|
'futureRoute',
|
|
470
469
|
'ownLocations',
|
|
471
470
|
'favouritePlace',
|
|
472
|
-
'
|
|
471
|
+
'vehicleRentalStation',
|
|
473
472
|
'back',
|
|
474
473
|
];
|
|
475
474
|
dropLayers.push(...routeLayers);
|
|
@@ -477,7 +476,7 @@ export function getSearchResults(
|
|
|
477
476
|
dropLayers.push(...parkingLayers);
|
|
478
477
|
if (transportMode) {
|
|
479
478
|
if (transportMode !== 'route-CITYBIKE') {
|
|
480
|
-
dropLayers.push('
|
|
479
|
+
dropLayers.push('vehicleRentalStation');
|
|
481
480
|
dropLayers.push('bikestation');
|
|
482
481
|
}
|
|
483
482
|
searchComponents.push(
|
|
@@ -528,7 +527,7 @@ export function getSearchResults(
|
|
|
528
527
|
];
|
|
529
528
|
if (transportMode) {
|
|
530
529
|
if (transportMode !== 'route-CITYBIKE') {
|
|
531
|
-
dropLayers.push('
|
|
530
|
+
dropLayers.push('vehicleRentalStation');
|
|
532
531
|
dropLayers.push('bikestation');
|
|
533
532
|
}
|
|
534
533
|
dropLayers.push(...routeLayers.filter(i => !(i === transportMode)));
|
|
@@ -541,11 +540,16 @@ export function getSearchResults(
|
|
|
541
540
|
);
|
|
542
541
|
}
|
|
543
542
|
}
|
|
544
|
-
if (allTargets || targets.includes('
|
|
543
|
+
if (allTargets || targets.includes('VehicleRentalStations')) {
|
|
545
544
|
if (sources.includes('Favourite')) {
|
|
546
|
-
const
|
|
545
|
+
const favouriteVehicleRentalStation = getFavouriteVehicleRentalStations(
|
|
546
|
+
context,
|
|
547
|
+
);
|
|
547
548
|
searchComponents.push(
|
|
548
|
-
|
|
549
|
+
getFavouriteVehicleRentalStationsQuery(
|
|
550
|
+
favouriteVehicleRentalStation,
|
|
551
|
+
input,
|
|
552
|
+
),
|
|
549
553
|
);
|
|
550
554
|
}
|
|
551
555
|
if (allSources || sources.includes('Datasource')) {
|
|
@@ -564,7 +568,7 @@ export function getSearchResults(
|
|
|
564
568
|
geocodingLayers,
|
|
565
569
|
).then(results => {
|
|
566
570
|
if (filterResults) {
|
|
567
|
-
return filterResults(results, mode, '
|
|
571
|
+
return filterResults(results, mode, 'VehicleRentalStations');
|
|
568
572
|
}
|
|
569
573
|
return results;
|
|
570
574
|
}),
|
|
@@ -574,7 +578,6 @@ export function getSearchResults(
|
|
|
574
578
|
|
|
575
579
|
const searchResultsPromise = Promise.all(searchComponents)
|
|
576
580
|
.then(flatten)
|
|
577
|
-
.then(uniqByLabel)
|
|
578
581
|
.then(results => {
|
|
579
582
|
searches.results = results;
|
|
580
583
|
})
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@digitransit-search-util/digitransit-search-util-execute-search-immidiate",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"description": "digitransit-search-util execute-search-immidiate module",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -24,9 +24,8 @@
|
|
|
24
24
|
"@digitransit-search-util/digitransit-search-util-filter-matching-to-input": "0.0.3",
|
|
25
25
|
"@digitransit-search-util/digitransit-search-util-get-geocoding-results": "0.0.5",
|
|
26
26
|
"@digitransit-search-util/digitransit-search-util-get-json": "0.0.4",
|
|
27
|
-
"@digitransit-search-util/digitransit-search-util-helpers": "
|
|
28
|
-
"@digitransit-search-util/digitransit-search-util-uniq-by-label": "^1.1.0",
|
|
27
|
+
"@digitransit-search-util/digitransit-search-util-helpers": "2.0.0",
|
|
29
28
|
"lodash": "4.17.21"
|
|
30
29
|
},
|
|
31
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "f904285c98141cf0a03ca9c1fab54674c5c47e3e"
|
|
32
31
|
}
|