From cb6379166999e8a614f8f5dd17d2f6f5805989ac Mon Sep 17 00:00:00 2001
From: Peter Johnson <insomnia@rcpt.at>
Date: Mon, 1 Dec 2014 11:15:28 +0000
Subject: [PATCH] update output schema for GBR

---
 helper/outputSchema.json       |  4 ++--
 test/unit/helper/geojsonify.js | 16 ++++------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/helper/outputSchema.json b/helper/outputSchema.json
index 430b8e1a..f7a7540e 100644
--- a/helper/outputSchema.json
+++ b/helper/outputSchema.json
@@ -4,8 +4,8 @@
     "regional": ["admin1_abbr", "admin1", "admin0"]
   },
   "GBR": {
-    "local": ["admin2","neighborhood", "local_admin", "locality"],
-    "regional": ["admin0","admin1"]
+    "local": ["neighborhood", "admin2", "local_admin", "locality"],
+    "regional": ["admin2","admin0","admin1"]
   },
   "default": {
     "local": ["local_admin", "locality", "neighborhood", "admin2"],
diff --git a/test/unit/helper/geojsonify.js b/test/unit/helper/geojsonify.js
index 27bb8b31..485e8ac2 100644
--- a/test/unit/helper/geojsonify.js
+++ b/test/unit/helper/geojsonify.js
@@ -42,11 +42,7 @@ module.exports.tests.search = function(test, common) {
         "input": [
           "'round midnight jazz and blues bar"
         ],
-        "payload": {
-          "id": "osmnode/2208150035",
-          "geo": "-0.10697160000000001,51.53371440000001"
-        },
-        "output": "'Round Midnight Jazz and Blues Bar, Angel, United Kingdom"
+        "output": "osmnode:2208150035"
       }
     },
     {
@@ -72,11 +68,7 @@ module.exports.tests.search = function(test, common) {
         "input": [
           "blues cafe"
         ],
-        "payload": {
-          "id": "osmway/147495160",
-          "geo": "-0.101795,51.517806"
-        },
-        "output": "Blues Cafe, test3, COL"
+        "output": "osmway:147495160"
       }
     }
   ];
@@ -97,7 +89,7 @@ module.exports.tests.search = function(test, common) {
           "id": "id1",
           "type": "type1",
           "layer": "type1",
-          "text": "'Round Midnight Jazz and Blues Bar, Angel, United Kingdom",
+          "text": "'Round Midnight Jazz and Blues Bar, test3, Angel",
           "name": "'Round Midnight Jazz and Blues Bar",
           "alpha3": "GBR",
           "admin0": "United Kingdom",
@@ -122,7 +114,7 @@ module.exports.tests.search = function(test, common) {
           "id": "id2",
           "type": "type2",
           "layer": "type2",
-          "text": "Blues Cafe, Smithfield, United Kingdom",
+          "text": "Blues Cafe, test3, Smithfield",
           "name": "Blues Cafe",
           "alpha3": "GBR",
           "admin0": "United Kingdom",