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

package/index.js

@@ -35,15 +35,22 @@ export default function isDuplicate(item1, item2) {
     const name1 = `${o1.name}//${o1.locality}//${d1.name}//${d1.locality}`;
     const name2 = `${o2.name}//${o2.locality}//${d2.name}//${d2.locality}`;
 
-    if (truEq(name1, name2)) {
-      return true;
-    }
-    return false;
-  } else if (item1.type === 'FutureRoute' || item2.type === 'FutureRoute') {
+    return name1 === name2;
+  }
+  if (item1.type === 'FutureRoute' || item2.type === 'FutureRoute') {
     return false;
   }
-  if (truEq(props1.gtfsId, props2.gtfsId)) {
-    return true;
+  if (
+    ((props1.layer === 'bikeRentalStation' ||
+      props1.layer === 'favouriteBikeRentalStation') &&
+      (props2.layer === 'bikeRentalStation' ||
+        props2.layer === 'favouriteBikeRentalStation')) ||
+    (props1.layer === 'bikestation' && props2.layer === 'bikestation')
+  ) {
+    return props1.labelId === props2.labelId;
+  }
+  if (props1.gtfsId && props2.gtfsId) {
+    return props1.gtfsId === props2.gtfsId;
   }
   if (props1.gtfsId && props2.gid && props2.gid.includes(props1.gtfsId)) {
     return true;
@@ -51,6 +58,14 @@ export default function isDuplicate(item1, item2) {
   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') &&
+    props1.gid &&
+    props2.gid
+  ) {
+    return props1.gid === props2.gid;
+  }
 
   const p1 = item1 && item1.geometry ? item1.geometry.coordinates : undefined;
   const p2 = item2 && item2.geometry ? item2.geometry.coordinates : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-search-util/digitransit-search-util-is-duplicate",
-  "version": "0.0.4",
+  "version": "0.0.8",
   "description": "digitransit-search-util is-duplicate module",
   "main": "index.js",
   "publishConfig": {
@@ -21,7 +21,7 @@
   "author": "Digitransit Authors",
   "license": "(AGPL-3.0 OR EUPL-1.2)",
   "dependencies": {
-    "@digitransit-search-util/digitransit-search-util-tru-eq": "0.0.1"
+    "@digitransit-search-util/digitransit-search-util-tru-eq": "0.0.2"
   },
-  "gitHead": "2a2958ff28ff926b6a3b04e5af82f5a9ac49accf"
+  "gitHead": "7b26c6654a58951bd14f1794a632007817a6e48d"
 }