X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/12c1deeb8a313873af7c33c878f48a819305b483..4e5b08053a5186715368d31bca769d5f02b15b0a:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index d2d4381e..80c139f7 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -141,7 +141,6 @@
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_statecounty.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_state.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_postcode.sql');
-		pgsqlRunScriptFile(CONST_BasePath.'/data/worldboundaries.sql');
 	}
 
 	if ($aCMDResult['import-data'] || $aCMDResult['all'])
@@ -155,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 .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
 		$osm2pgsql .= ' -C 16000';
@@ -364,7 +368,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));