From e6e9c1c574598c4ddddc450c4c8eacd598d7c61d Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@mapzen.com>
Date: Wed, 13 Apr 2016 12:07:01 -0400
Subject: [PATCH] Do not apply local naming conventions to records with no
 admin info

There's no way to decide what to do, and without handling this case the
API will return an error.
---
 middleware/localNamingConventions.js          |  3 +++
 .../unit/middleware/localNamingConventions.js | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/middleware/localNamingConventions.js b/middleware/localNamingConventions.js
index dd026bb3..e2851370 100644
--- a/middleware/localNamingConventions.js
+++ b/middleware/localNamingConventions.js
@@ -23,6 +23,9 @@ function applyLocalNamingConventions(req, res, next) {
 
   // loop through data items and flip relevant number/street
   res.data.filter(function(place){
+    // do nothing for records with no admin info
+    if (!place.parent || !place.parent.country_a) { return false; }
+
     // relevant for some countries
     var flip = place.parent.country_a.some(function(country) {
       return _.includes(flipNumberAndStreetCountries, country);
diff --git a/test/unit/middleware/localNamingConventions.js b/test/unit/middleware/localNamingConventions.js
index c544abe7..1d4102f0 100644
--- a/test/unit/middleware/localNamingConventions.js
+++ b/test/unit/middleware/localNamingConventions.js
@@ -77,8 +77,21 @@ module.exports.tests.flipNumberAndStreet = function(test, common) {
     }
   };
 
+  var unknownCountryAddress = {
+    '_id': 'test4',
+    '_type': 'test',
+    'name': { 'default': '123 Main Street' },
+    'center_point': { 'lon': 30.1, 'lat': -50 },
+    'address_parts': {
+       'number': '123',
+       'street': 'Main Street'
+    },
+    'parent': {
+    }
+  };
+
   var req = {},
-      res = { data: [ ukAddress, deAddress, nlAddress ] },
+      res = { data: [ ukAddress, deAddress, nlAddress, unknownCountryAddress ] },
       middleware = localNamingConventions();
 
   test('flipNumberAndStreet', function(t) {
@@ -96,6 +109,10 @@ module.exports.tests.flipNumberAndStreet = function(test, common) {
       // this definition comes from pelias configuration
       t.equal( res.data[2].name.default, 'Keizersgracht 117', 'flipped name' );
 
+      // addresses without a known country (either due to missing data or admin lookup
+      // being disabled), don't have the name flipped
+      t.equal( res.data[3].name.default, '123 Main Street', 'standard name');
+
       t.end();
     });
   });