From 509a6a7401de604787147f80140215138a8e3896 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Mon, 14 Sep 2015 17:11:39 -0400 Subject: [PATCH] Remove geocoding block from properties in GeoJSON responses All the attributes that were in this block are now put directly in the GeoJSON properties object --- helper/geojsonify.js | 12 ++-- test/unit/helper/geojsonify.js | 126 +++++++++++++++------------------ 2 files changed, 62 insertions(+), 76 deletions(-) diff --git a/helper/geojsonify.js b/helper/geojsonify.js index cf1f8744..13aef255 100644 --- a/helper/geojsonify.js +++ b/helper/geojsonify.js @@ -107,15 +107,13 @@ function geojsonifyPlace(details, place) { return warning('No doc or center_point property'); } - var geocoding = {}; + var output = {}; - addMetaData(place, geocoding); - addDetails(details, place, geocoding); - addLabel(place, geocoding); + addMetaData(place, output); + addDetails(details, place, output); + addLabel(place, output); - var output = {}; - output.geocoding = geocoding; // map center_point for GeoJSON to work properly // these should not show up in the final feature properties output.lat = parseFloat(place.center_point.lat); @@ -210,4 +208,4 @@ function warning( doc ) { } -module.exports.search = geojsonifyPlaces; \ No newline at end of file +module.exports.search = geojsonifyPlaces; diff --git a/test/unit/helper/geojsonify.js b/test/unit/helper/geojsonify.js index 141c2783..0565bf0e 100644 --- a/test/unit/helper/geojsonify.js +++ b/test/unit/helper/geojsonify.js @@ -140,25 +140,23 @@ module.exports.tests.search = function(test, common) { ] }, 'properties': { - 'geocoding': { - 'id': 'id1', - 'layer': 'type1', - 'source': 'type1', - 'label': '\'Round Midnight Jazz and Blues Bar, test3, Angel', - 'name': '\'Round Midnight Jazz and Blues Bar', - 'country_a': 'GBR', - 'country': 'United Kingdom', - 'region': 'Islington', - 'region_a': 'ISL', - 'county': 'Angel', - 'localadmin': 'test1', - 'locality': 'test2', - 'neighbourhood': 'test3', - 'category': ['food', 'nightlife'], - 'housenumber': '13', - 'street': 'Liverpool Road', - 'postalcode': 'N1 0RW' - } + 'id': 'id1', + 'layer': 'type1', + 'source': 'type1', + 'label': '\'Round Midnight Jazz and Blues Bar, test3, Angel', + 'name': '\'Round Midnight Jazz and Blues Bar', + 'country_a': 'GBR', + 'country': 'United Kingdom', + 'region': 'Islington', + 'region_a': 'ISL', + 'county': 'Angel', + 'localadmin': 'test1', + 'locality': 'test2', + 'neighbourhood': 'test3', + 'category': ['food', 'nightlife'], + 'housenumber': '13', + 'street': 'Liverpool Road', + 'postalcode': 'N1 0RW' } }, { @@ -171,21 +169,19 @@ module.exports.tests.search = function(test, common) { ] }, 'properties': { - 'geocoding': { - 'id': 'id2', - 'layer': 'type2', - 'source': 'type2', - 'label': 'Blues Cafe, test3, Smithfield', - 'name': 'Blues Cafe', - 'country_a': 'GBR', - 'country': 'United Kingdom', - 'region': 'City And County Of The City Of London', - 'region_a': 'COL', - 'county': 'Smithfield', - 'localadmin': 'test1', - 'locality': 'test2', - 'neighbourhood': 'test3' - } + 'id': 'id2', + 'layer': 'type2', + 'source': 'type2', + 'label': 'Blues Cafe, test3, Smithfield', + 'name': 'Blues Cafe', + 'country_a': 'GBR', + 'country': 'United Kingdom', + 'region': 'City And County Of The City Of London', + 'region_a': 'COL', + 'county': 'Smithfield', + 'localadmin': 'test1', + 'locality': 'test2', + 'neighbourhood': 'test3' } }, { @@ -198,22 +194,20 @@ module.exports.tests.search = function(test, common) { ] }, 'properties': { - 'geocoding': { - 'id': '34633854', - 'layer': 'venue', - 'source': 'osm', - 'label': 'Empire State Building, Manhattan, NY', - 'name': 'Empire State Building', - 'country_a': 'USA', - 'country': 'United States', - 'region': 'New York', - 'region_a': 'NY', - 'county': 'New York', - 'localadmin': 'Manhattan', - 'locality': 'New York', - 'neighbourhood': 'Koreatown', - 'category': ['tourism', 'transport'] - } + 'id': '34633854', + 'layer': 'venue', + 'source': 'osm', + 'label': 'Empire State Building, Manhattan, NY', + 'name': 'Empire State Building', + 'country_a': 'USA', + 'country': 'United States', + 'region': 'New York', + 'region_a': 'NY', + 'county': 'New York', + 'localadmin': 'Manhattan', + 'locality': 'New York', + 'neighbourhood': 'Koreatown', + 'category': ['tourism', 'transport'] } } ] @@ -249,12 +243,10 @@ module.exports.tests.search = function(test, common) { ] }, 'properties': { - 'geocoding': { - 'id': 'id1', - 'layer': 'type1', - 'source': 'type1', - 'label': '\'Round Midnight Jazz and Blues Bar, test3, Angel' - } + 'id': 'id1', + 'layer': 'type1', + 'source': 'type1', + 'label': '\'Round Midnight Jazz and Blues Bar, test3, Angel' } }, { @@ -267,12 +259,10 @@ module.exports.tests.search = function(test, common) { ] }, 'properties': { - 'geocoding': { - 'id': 'id2', - 'layer': 'type2', - 'source': 'type2', - 'label': 'Blues Cafe, test3, Smithfield' - } + 'id': 'id2', + 'layer': 'type2', + 'source': 'type2', + 'label': 'Blues Cafe, test3, Smithfield' } }, { @@ -285,12 +275,10 @@ module.exports.tests.search = function(test, common) { ] }, 'properties': { - 'geocoding': { - 'id': '34633854', - 'layer': 'venue', - 'source': 'osm', - 'label': 'Empire State Building, Manhattan, NY' - } + 'id': '34633854', + 'layer': 'venue', + 'source': 'osm', + 'label': 'Empire State Building, Manhattan, NY' } } ] @@ -322,4 +310,4 @@ module.exports.all = function (tape, common) { for( var testCase in module.exports.tests ){ module.exports.tests[testCase](test, common); } -}; \ No newline at end of file +};