X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/913341ee866297e78cf3b95832279120abe8a18a..1f2a262ee031adebbceb18ab8d9a848a033a6f81:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 52480b6e..c0bf0a39 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -154,6 +154,11 @@
 			echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
 			fail("osm2pgsql not found in '$osm2pgsql'");
 		}
+
+        if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+        {
+            $osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+        }
 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
 		$osm2pgsql .= ' -C '.$iCacheMemory;
 		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
@@ -362,7 +367,7 @@
 		{
 			$aDBInstances[$i] =& getDB(true);
 			$sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, ';
-			$sSQL .= 'housenumber, street, isin, postcode, country_code, extratags, ';
+			$sSQL .= 'housenumber, street, addr_place, isin, postcode, country_code, extratags, ';
 			$sSQL .= 'geometry) select * from place where osm_id % '.$iInstances.' = '.$i;
 			if ($aCMDResult['verbose']) echo "$sSQL\n";
 			if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));