Merge remote-tracking branch 'upstream/master'

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index a3860cbaa2ab737ffc2a8d0d5f92476d8dea6cd9..a156fb7115417d60647e7d01a787cb06dda85811 100644 (file)
--- 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 332cbb00f70013a42387a39e392e5ffc1a3de79c..9bbc7527fdf65b89f667a228c9b950002970c922 100644 (file)
--- 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 %}