ensure that result object name is always first in display_name

The display name might be mixed up if the result object has a lower
rank_address than its address members.

diff --git a/sql/functions/address_lookup.sql b/sql/functions/address_lookup.sql
index 9a4c630ca14b224729b9de575fbc921080fae1d1..f8659c704bd75f623eb74a7690049a9ba0ed7267 100644 (file)
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@ -60,7 +60,9 @@ BEGIN
   prevresult := '';
 
   FOR location IN
   prevresult := '';
 
   FOR location IN

-    SELECT * FROM get_addressdata(for_place_id, housenumber)
+    SELECT name,
+       CASE WHEN place_id = for_place_id THEN 99 ELSE rank_address END as rank_address
+    FROM get_addressdata(for_place_id, housenumber)

     WHERE isaddress order by rank_address desc
   LOOP
     currresult := trim(get_name_by_language(location.name, languagepref));
     WHERE isaddress order by rank_address desc
   LOOP
     currresult := trim(get_name_by_language(location.name, languagepref));