@digitransit-search-util/digitransit-search-util-is-duplicate 0.0.8 → 2.0.0

package/index.js

@@ -22,6 +22,21 @@ import truEq from '@digitransit-search-util/digitransit-search-util-tru-eq';
  * digitransit-util.isDuplicate(param1, param2);
  * //=true
  */
+
+const gtfsStopLayers = ['stop', 'station', 'favouriteStop', 'favouriteStation'];
+const vehicleRentalLayers = ['favouriteVehicleRentalStation', 'bikestation'];
+
+function labelIdToGid(id) {
+  if (!id) {
+    return '';
+  }
+  const parts = id.split(':');
+  if (parts.length === 0) {
+    return '';
+  }
+  return `citybikes${parts[0]}:bikestation:${parts[1]}`;
+}
+
 export default function isDuplicate(item1, item2) {
   const props1 = item1.properties;
   const props2 = item2.properties;
@@ -41,26 +56,19 @@ export default function isDuplicate(item1, item2) {
     return false;
   }
   if (
-    ((props1.layer === 'bikeRentalStation' ||
-      props1.layer === 'favouriteBikeRentalStation') &&
-      (props2.layer === 'bikeRentalStation' ||
-        props2.layer === 'favouriteBikeRentalStation')) ||
-    (props1.layer === 'bikestation' && props2.layer === 'bikestation')
+    vehicleRentalLayers.includes(props1.layer) &&
+    vehicleRentalLayers.includes(props2.layer)
   ) {
-    return props1.labelId === props2.labelId;
+    const id1 = props1.gid || labelIdToGid(props1.labelId);
+    const id2 = props2.gid || labelIdToGid(props2.labelId);
+    return id1 === id2;
   }
   if (props1.gtfsId && props2.gtfsId) {
     return props1.gtfsId === props2.gtfsId;
   }
-  if (props1.gtfsId && props2.gid && props2.gid.includes(props1.gtfsId)) {
-    return true;
-  }
-  if (props2.gtfsId && props1.gid && props1.gid.includes(props2.gtfsId)) {
-    return true;
-  }
   if (
-    (props1.layer === 'stop' || props1.layer === 'station') &&
-    (props2.layer === 'stop' || props2.layer === 'station') &&
+    gtfsStopLayers.includes(props1.layer) &&
+    gtfsStopLayers.includes(props2.layer) &&
     props1.gid &&
     props2.gid
   ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-search-util/digitransit-search-util-is-duplicate",
-  "version": "0.0.8",
+  "version": "2.0.0",
   "description": "digitransit-search-util is-duplicate module",
   "main": "index.js",
   "publishConfig": {
@@ -23,5 +23,5 @@
   "dependencies": {
     "@digitransit-search-util/digitransit-search-util-tru-eq": "0.0.2"
   },
-  "gitHead": "7b26c6654a58951bd14f1794a632007817a6e48d"
+  "gitHead": "f904285c98141cf0a03ca9c1fab54674c5c47e3e"
 }