From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 1 Nov 2020 14:12:12 +0000 (+0100)
Subject: Merge pull request #2032 from lonvia/remove-ui
X-Git-Tag: v3.6.0~38
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ce1c3bab6d94163656c3bb06f735b27e6be2198b?hp=ba8accf4bbe6a02bfc1dbefc08fc4f6e0bd74c2d

Merge pull request #2032 from lonvia/remove-ui

Remove HTML output
---

diff --git a/docs/admin/Advanced-Installations.md b/docs/admin/Advanced-Installations.md
index 7ff56198..5b0275b3 100644
--- a/docs/admin/Advanced-Installations.md
+++ b/docs/admin/Advanced-Installations.md
@@ -51,7 +51,8 @@ The file `import_multiple_regions.sh` needs to be edited as per your requirement
 !!! tip
     If your database already exists and you want to add more countries, replace the setting up part
     `${SETUPFILE} --osm-file ${UPDATEDIR}/tmp/combined.osm.pbf --all 2>&1`
-    with `${UPDATEFILE} --import-file ${UPDATEDIR}/tmp/combined.osm.pbf 2>&1`.
+    with `${UPDATEFILE} --import-file ${UPDATEDIR}/tmp/combined.osm.pbf --index --index-instances N 2>&1`
+    where N is the numbers of CPUs in your system.
 
 ### Setting up multiple regions
 
diff --git a/utils/update.php b/utils/update.php
index f0b45b42..7e90016c 100644
--- a/utils/update.php
+++ b/utils/update.php
@@ -241,15 +241,15 @@ if (isset($aResult['import-way']) && $aResult['import-way']) {
     if ($bUseOSMApi) {
         $sContentURL = 'https://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full';
     } else {
-        $sContentURL = 'https://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;';
+        $sContentURL = 'https://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');%3E;);out%20meta;';
     }
 }
 
 if (isset($aResult['import-relation']) && $aResult['import-relation']) {
     if ($bUseOSMApi) {
-        $sContentURLsModifyXMLstr = 'https://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full';
+        $sContentURL = 'https://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full';
     } else {
-        $sContentURL = 'https://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;';
+        $sContentURL = 'https://overpass-api.de/api/interpreter?data=(rel(id:'.$aResult['import-relation'].');%3E;);out%20meta;';
     }
 }