From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 30 Jun 2022 07:32:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~101
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/3bcd32ca2006cb2184f290e18f4e054f8aca8bf4?hp=d2ec1abaedd12792e1f544ee9b2fabf5edecc714

Merge remote-tracking branch 'upstream/master'
---

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index a3860cba..a156fb71 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -3,7 +3,7 @@ theme: readthedocs
 docs_dir: ${CMAKE_CURRENT_BINARY_DIR}
 site_url: https://nominatim.org
 repo_url: https://github.com/openstreetmap/Nominatim
-pages:
+nav:
     - 'Introduction' : 'index.md'
     - 'API Reference':
         - 'Overview': 'api/Overview.md'
diff --git a/lib-sql/indices.sql b/lib-sql/indices.sql
index 332cbb00..9bbc7527 100644
--- a/lib-sql/indices.sql
+++ b/lib-sql/indices.sql
@@ -63,12 +63,12 @@ CREATE INDEX IF NOT EXISTS idx_postcode_postcode
 
   {% if postgres.has_index_non_key_column %}
     CREATE INDEX IF NOT EXISTS idx_placex_housenumber
-      ON placex USING btree (parent_place_id) {{db.tablespace.search_index}}
-      INCLUDE (housenumber)
+      ON placex USING btree (parent_place_id)
+      INCLUDE (housenumber) {{db.tablespace.search_index}}
       WHERE housenumber is not null;
     CREATE INDEX IF NOT EXISTS idx_osmline_parent_osm_id_with_hnr
-      ON location_property_osmline USING btree(parent_place_id) {{db.tablespace.search_index}}
-      INCLUDE (startnumber, endnumber)
+      ON location_property_osmline USING btree(parent_place_id)
+      INCLUDE (startnumber, endnumber) {{db.tablespace.search_index}}
       WHERE startnumber is not null;
   {% endif %}
 {% endif %}