From c9b1718829492a25fdc897f61cec4f59e645abaf Mon Sep 17 00:00:00 2001
From: Peter Johnson <wiz@wiz.co.nz>
Date: Fri, 3 Oct 2014 13:56:53 +0200
Subject: [PATCH] display all admin fields

---
 helper/geojsonify.js           |  5 +++++
 test/unit/helper/geojsonify.js | 24 ++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/helper/geojsonify.js b/helper/geojsonify.js
index bd78b1f0..d4263900 100644
--- a/helper/geojsonify.js
+++ b/helper/geojsonify.js
@@ -69,9 +69,14 @@ function search( docs ){
     output.name = doc.name.default;
 
     // map admin values
+    if( doc.alpha3 ){ output.alpha3 = doc.alpha3; }
     if( doc.admin0 ){ output.admin0 = doc.admin0; }
     if( doc.admin1 ){ output.admin1 = doc.admin1; }
+    if( doc.admin1_abbr ){ output.admin1_abbr = doc.admin1_abbr; }
     if( doc.admin2 ){ output.admin2 = doc.admin2; }
+    if( doc.local_admin ){ output.local_admin = doc.local_admin; }
+    if( doc.locality ){ output.locality = doc.locality; }
+    if( doc.neighborhood ){ output.neighborhood = doc.neighborhood; }
 
     // map suggest output
     if( doc.suggest && doc.suggest.output ){
diff --git a/test/unit/helper/geojsonify.js b/test/unit/helper/geojsonify.js
index e74e4b4d..f6bdff2b 100644
--- a/test/unit/helper/geojsonify.js
+++ b/test/unit/helper/geojsonify.js
@@ -88,9 +88,14 @@ module.exports.tests.search = function(test, common) {
         "street": "Liverpool Road",
         "zip": "N1 0RW"
       },
+      "alpha3": "GBR",
       "admin0": "United Kingdom",
       "admin1": "Islington",
+      "admin1_abbr": "ISL",
       "admin2": "Angel",
+      "local_admin": "test1",
+      "locality": "test2",
+      "neighborhood": "test3",
       "suggest": {
         "input": [
           "'round midnight jazz and blues bar"
@@ -111,9 +116,14 @@ module.exports.tests.search = function(test, common) {
         "lat": "51.517806",
         "lon": "-0.101795"
       },
+      "alpha3": "GBR",
       "admin0": "United Kingdom",
       "admin1": "City And County Of The City Of London",
+      "admin1_abbr": "COL",
       "admin2": "Smithfield",
+      "local_admin": "test1",
+      "locality": "test2",
+      "neighborhood": "test3",
       "suggest": {
         "input": [
           "blues cafe"
@@ -142,9 +152,14 @@ module.exports.tests.search = function(test, common) {
         "properties": {
           "text": "'Round Midnight Jazz and Blues Bar, Angel, United Kingdom",
           "name": "'Round Midnight Jazz and Blues Bar",
+          "alpha3": "GBR",
           "admin0": "United Kingdom",
           "admin1": "Islington",
-          "admin2": "Angel"
+          "admin1_abbr": "ISL",
+          "admin2": "Angel",
+          "local_admin": "test1",
+          "locality": "test2",
+          "neighborhood": "test3",
         }
       },
       {
@@ -159,9 +174,14 @@ module.exports.tests.search = function(test, common) {
         "properties": {
           "text": "Blues Cafe, Smithfield, United Kingdom",
           "name": "Blues Cafe",
+          "alpha3": "GBR",
           "admin0": "United Kingdom",
           "admin1": "City And County Of The City Of London",
-          "admin2": "Smithfield"
+          "admin1_abbr": "COL",
+          "admin2": "Smithfield",
+          "local_admin": "test1",
+          "locality": "test2",
+          "neighborhood": "test3",
         }
       }
     ]