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

package/index.js

@@ -22,6 +22,9 @@ import truEq from '@digitransit-search-util/digitransit-search-util-tru-eq';
  * digitransit-util.isDuplicate(param1, param2);
  * //=true
  */
+
+const gtfsStopLayers = ['stop', 'station', 'favouriteStop', 'favouriteStation'];
+
 export default function isDuplicate(item1, item2) {
   const props1 = item1.properties;
   const props2 = item2.properties;
@@ -35,10 +38,7 @@ 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;
+    return name1 === name2;
   }
   if (item1.type === 'FutureRoute' || item2.type === 'FutureRoute') {
     return false;
@@ -52,14 +52,16 @@ export default function isDuplicate(item1, item2) {
   ) {
     return props1.labelId === props2.labelId;
   }
-  if (truEq(props1.gtfsId, props2.gtfsId)) {
-    return true;
+  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 (
+    gtfsStopLayers.includes(props1.layer) &&
+    gtfsStopLayers.includes(props2.layer) &&
+    props1.gid &&
+    props2.gid
+  ) {
+    return props1.gid === props2.gid;
   }
 
   const p1 = item1 && item1.geometry ? item1.geometry.coordinates : undefined;

package/package.json

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