From 386281a437198aef89758c02bb15d09fc3f236f9 Mon Sep 17 00:00:00 2001 From: Harish Krishna Date: Wed, 8 Apr 2015 17:41:51 -0400 Subject: [PATCH] keeping it consistent - alpha3 > admin0 --- helper/outputSchema.json | 4 ++-- test/unit/helper/geojsonify.js | 4 ++-- test/unit/helper/outputSchema.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helper/outputSchema.json b/helper/outputSchema.json index 30c5283c..cac43ed3 100644 --- a/helper/outputSchema.json +++ b/helper/outputSchema.json @@ -7,11 +7,11 @@ "GBR": { "local": ["neighborhood", "local_admin", "locality"], "regional": ["admin2", "admin1"], - "national": ["admin0", "alpha3"] + "national": ["alpha3", "admin0"] }, "default": { "local": ["local_admin", "locality", "neighborhood", "admin2"], "regional": ["admin1_abbr", "admin1"], - "national": ["admin0", "alpha3"] + "national": ["alpha3", "admin0"] } } \ No newline at end of file diff --git a/test/unit/helper/geojsonify.js b/test/unit/helper/geojsonify.js index adcd19c2..c775d8c9 100644 --- a/test/unit/helper/geojsonify.js +++ b/test/unit/helper/geojsonify.js @@ -115,7 +115,7 @@ module.exports.tests.search = function(test, common) { 'properties': { 'id': 'id1', 'layer': 'type1', - 'text': '\'Round Midnight Jazz and Blues Bar, test3, Angel, United Kingdom', + 'text': '\'Round Midnight Jazz and Blues Bar, test3, Angel, GBR', 'name': '\'Round Midnight Jazz and Blues Bar', 'alpha3': 'GBR', 'admin0': 'United Kingdom', @@ -139,7 +139,7 @@ module.exports.tests.search = function(test, common) { 'properties': { 'id': 'id2', 'layer': 'type2', - 'text': 'Blues Cafe, test3, Smithfield, United Kingdom', + 'text': 'Blues Cafe, test3, Smithfield, GBR', 'name': 'Blues Cafe', 'alpha3': 'GBR', 'admin0': 'United Kingdom', diff --git a/test/unit/helper/outputSchema.js b/test/unit/helper/outputSchema.js index 7e4346db..2a57d7cd 100644 --- a/test/unit/helper/outputSchema.js +++ b/test/unit/helper/outputSchema.js @@ -17,7 +17,7 @@ module.exports.tests.valid = function(test, common) { var default_schema = { local: ['local_admin', 'locality', 'neighborhood', 'admin2'], regional: ['admin1_abbr', 'admin1'], - national: ['admin0', 'alpha3'] + national: ['alpha3', 'admin0'] }; var isValid = function(keys, schema) {