From 224836ce9af04c440b70f501c7a4ed72e869985c Mon Sep 17 00:00:00 2001 From: Brian Quinion Date: Thu, 6 Feb 2014 13:09:32 +0000 Subject: [PATCH] include rank and importance in reverse geocode output --- lib/PlaceLookup.php | 4 ++-- lib/template/address-jsonv2.php | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index 65aff13e..ed2f494d 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -41,8 +41,8 @@ $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]"; - $sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, extratags, parent_place_id, linked_place_id, rank_address, rank_search"; - $sSQL .= " importance, indexed_status, indexed_date, wikipedia, calculated_country_code, "; + $sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, extratags, parent_place_id, linked_place_id, rank_address, rank_search, "; + $sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, calculated_country_code, "; $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,"; $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,"; $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,"; diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php index baf53129..92cf4f1c 100644 --- a/lib/template/address-jsonv2.php +++ b/lib/template/address-jsonv2.php @@ -20,8 +20,14 @@ } if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat']; if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon']; + + $aFilteredPlaces['place_rank'] = $aPlace['rank_search']; + $aFilteredPlaces['category'] = $aPlace['class']; $aFilteredPlaces['type'] = $aPlace['type']; + + $aFilteredPlaces['importance'] = $aPlace['importance']; + $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']); $aFilteredPlaces['display_name'] = $aPlace['langaddress']; -- 2.39.5