From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 26 Apr 2020 19:48:43 +0000 (+0200)
Subject: Merge pull request #1770 from lonvia/eyusupov-separate-compilation
X-Git-Tag: v3.5.0~27
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/0e1e7c7df20940a95ac3ae5e88c8537539cd6945?hp=bae69f0102c8d79ed7ed442810101d0736e41343

Merge pull request #1770 from lonvia/eyusupov-separate-compilation

Separate compilation
---

diff --git a/docs/admin/Advanced-Installations.md b/docs/admin/Advanced-Installations.md
index b22d9a61..8486b6a2 100644
--- a/docs/admin/Advanced-Installations.md
+++ b/docs/admin/Advanced-Installations.md
@@ -101,7 +101,7 @@ Run the following command from your Nominatim directory after configuring the fi
 
     bash ./utils/update_database.sh
 
-This will get diffs from the replication server, import diffs and index the database. The default replication server in the script([Geofabric](https://download.geofabrik.de)) provides daily updates.
+This will get diffs from the replication server, import diffs and index the database. The default replication server in the script([Geofabrik](https://download.geofabrik.de)) provides daily updates.
 
 ## Verification and further setup
 
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 20909ff4..0a571f6d 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -1,7 +1,7 @@
 site_name: Nominatim Documentation
 theme: readthedocs
 docs_dir: ${CMAKE_CURRENT_BINARY_DIR}
-site_url: http://nominatim.org
+site_url: https://nominatim.org
 repo_url: https://github.com/openstreetmap/Nominatim
 pages:
     - 'Introduction' : 'index.md'
diff --git a/sql/functions/address_lookup.sql b/sql/functions/address_lookup.sql
index 9a4c630c..7885d0a9 100644
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@ -60,14 +60,16 @@ BEGIN
   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));
     IF currresult != prevresult AND currresult IS NOT NULL
        AND result[(100 - location.rank_address)] IS NULL
     THEN
-      result[(100 - location.rank_address)] := trim(get_name_by_language(location.name, languagepref));
+      result[(100 - location.rank_address)] := currresult;
       prevresult := currresult;
     END IF;
   END LOOP;