Merge pull request #1614 from pelias/dedupe-skip-us-states

Do not deduplicate US States

Author: orangejulius

helper/diffPlaces.js

@@ -40,6 +40,11 @@ function isLayerDifferent(item1, item2){
   return false;
 }
 
+function isUsState(item) {
+  if (!_.isArray(item.parent.country_a)) { return false; }
+  return item.parent.country_a[0] === 'USA' && item.layer === 'region';
+}
+
 /**
  * Compare the parent properties if they exist.
  * Returns false if the objects are the same, else true.
@@ -59,6 +64,13 @@ function isParentHierarchyDifferent(item1, item2){
   // note: this really shouldn't happen as at least one parent should exist
   if( !isPojo1 || !isPojo2 ){ return false; }
 
+  // US states should not be deduplicated, except against other US states
+  if (isUsState(item1) || isUsState(item2)) {
+    if (!isUsState(item1) || !isUsState(item2)) {
+      return true;
+    }
+  }
+
   // special handling of postal codes, which we consider to be strictly
   // unique within a single country/dependency regardless of the rest of
   // the hierarchy (ie. we ignore other parent properties)

test/unit/helper/diffPlaces.js

@@ -82,6 +82,46 @@ module.exports.tests.dedupe = function(test, common) {
     t.end();
   });
 
+  test('isParentHierarchyDifferent: do not dedupe US states', function(t) {
+    var item1 = {
+      layer: 'region',
+      parent: {
+        region_id: '123',
+        country_a: ['USA']
+      }
+    };
+    var item2 = {
+      layer: 'locality',
+      parent: {
+        region_id: '123',
+        locality_id: '456'
+      }
+    };
+
+    t.true(isDifferent(item1, item2), 'should be considered different');
+    t.end();
+  });
+
+  test('isParentHierarchyDifferent: do not dedupe US states, except against each other', function(t) {
+    var item1 = {
+      layer: 'region',
+      parent: {
+        region_id: '123',
+        country_a: ['USA']
+      }
+    };
+    var item2 = {
+      layer: 'region',
+      parent: {
+        region_id: '123',
+        country_a: ['USA']
+      }
+    };
+
+    t.false(isDifferent(item1, item2), 'should not be considered different');
+    t.end();
+  });
+
   test('isParentHierarchyDifferent: do compare parentage at higher levels than the highest item placetypes', function(t) {
     var item1 = {
       'layer': 'country',