@digitransit-search-util/digitransit-search-util-is-duplicate 1.0.0 → 2.1.0

package/index.js

@@ -24,6 +24,18 @@ import truEq from '@digitransit-search-util/digitransit-search-util-tru-eq';
  */
 
 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;
@@ -35,8 +47,8 @@ export default function isDuplicate(item1, item2) {
     const o2 = props2.origin;
     const d2 = props2.destination;
 
-    const name1 = `${o1.name}//${o1.locality}//${d1.name}//${d1.locality}`;
-    const name2 = `${o2.name}//${o2.locality}//${d2.name}//${d2.locality}`;
+    const name1 = `${o1.name}//${o1.localadmin}//${d1.name}//${d1.localadmin}`;
+    const name2 = `${o2.name}//${o2.localadmin}//${d2.name}//${d2.localadmin}`;
 
     return name1 === name2;
   }
@@ -44,13 +56,12 @@ 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-search-util/digitransit-search-util-is-duplicate",
-  "version": "1.0.0",
+  "version": "2.1.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": "5c78ef7df03c2e12cc7a4be8d3ea3f2d76261d0a"
+  "gitHead": "37479033b6cc5d8fa3b2b17a46e79c2080ea3b96"
 }