From bafd92093bc080c791698182a31ab06a89ae53b5 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 30 Apr 2014 23:31:28 +0200 Subject: [PATCH] prefer place tag for address details --- lib/PlaceLookup.php | 2 +- lib/lib.php | 2 +- sql/functions.sql | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index ed2f494d..e0016337 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -124,7 +124,7 @@ { $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']); $sTypeLabel = str_replace(' ','_',$sTypeLabel); - if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel])) + if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place') { $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber']; } diff --git a/lib/lib.php b/lib/lib.php index 268c7558..afcc02ef 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -788,7 +788,7 @@ { $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']); $sTypeLabel = str_replace(' ','_',$sTypeLabel); - if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel])) + if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place') { $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber']; } diff --git a/sql/functions.sql b/sql/functions.sql index f6ff3caa..c2268f43 100644 --- a/sql/functions.sql +++ b/sql/functions.sql @@ -2501,7 +2501,9 @@ BEGIN FOR location IN select placex.place_id, osm_type, osm_id, CASE WHEN class = 'place' and type = 'postcode' THEN hstore('name', postcode) ELSE name END as name, - class, type, admin_level, fromarea, isaddress, + CASE WHEN extratags ? 'place' THEN 'place' ELSE class END as class, + CASE WHEN extratags ? 'place' THEN extratags->'place' ELSE type END as type, + admin_level, fromarea, isaddress, CASE WHEN address_place_id = for_place_id AND rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address, distance,calculated_country_code,postcode from place_addressline join placex on (address_place_id = placex.place_id) -- 2.39.5