Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index d2d4381ef82b6ed1d3893ea340018be6ecb2647e..270c1a4916220af8d3aeb2f5b8403e340e0d6274 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -26,6 +26,7 @@
                array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
                array('create-partition-tables', '', 0, 1, 0, 0, 'bool', 'Create required partition tables'),
                array('create-partition-functions', '', 0, 1, 0, 0, 'bool', 'Create required partition triggers'),
                array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
                array('create-partition-tables', '', 0, 1, 0, 0, 'bool', 'Create required partition tables'),
                array('create-partition-functions', '', 0, 1, 0, 0, 'bool', 'Create required partition triggers'),

+               array('no-partitions', '', 0, 1, 0, 0, 'bool', "Do not partition search indices (speeds up import of single country extracts)"),

                array('import-wikipedia-articles', '', 0, 1, 0, 0, 'bool', 'Import wikipedia article dump'),
                array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'),
                array('disable-token-precalc', '', 0, 1, 0, 0, 'bool', 'Disable name precalculation (EXPERT)'),
                array('import-wikipedia-articles', '', 0, 1, 0, 0, 'bool', 'Import wikipedia article dump'),
                array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'),
                array('disable-token-precalc', '', 0, 1, 0, 0, 'bool', 'Disable name precalculation (EXPERT)'),


@@ -124,7 +125,13 @@
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }
 
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }
 

-               pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
+               $fPostgisVersion = (float) CONST_Postgis_Version;
+               if ($fPostgisVersion < 2.0) {
+                       pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
+                       pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
+               } else {
+                       pgsqlRunScript('CREATE EXTENSION postgis');
+               }

                $sVersionString = $oDB->getOne('select postgis_full_version()');
                preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
                if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2])
                $sVersionString = $oDB->getOne('select postgis_full_version()');
                preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
                if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2])


@@ -133,7 +140,6 @@
                        exit;
                }
 
                        exit;
                }
 

-               pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');

                pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');


@@ -141,7 +147,11 @@
                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/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['no-partitions'])
+               {
+                       pgsqlRunScript('update country_name set partition = 0');
+               }

        }
 
        if ($aCMDResult['import-data'] || $aCMDResult['all'])
        }
 
        if ($aCMDResult['import-data'] || $aCMDResult['all'])


@@ -155,9 +165,14 @@
                        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'");
                }
                        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 .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
                $osm2pgsql .= ' -lsc -O gazetteer --hstore';

-               $osm2pgsql .= ' -C 16000';
+               $osm2pgsql .= ' -C 18000';

                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);
                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);


@@ -229,13 +244,13 @@
                echo "Partition Tables\n";
                $bDidSomething = true;
                $oDB =& getDB();
                echo "Partition Tables\n";
                $bDidSomething = true;
                $oDB =& getDB();

-               $sSQL = 'select partition from country_name order by country_code';
+               $sSQL = 'select distinct partition from country_name';

                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }
                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }

-               $aPartitions[] = 0;
+               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;

 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);


@@ -258,13 +273,13 @@
                echo "Partition Functions\n";
                $bDidSomething = true;
                $oDB =& getDB();
                echo "Partition Functions\n";
                $bDidSomething = true;
                $oDB =& getDB();

-               $sSQL = 'select partition from country_name order by country_code';
+               $sSQL = 'select distinct partition from country_name';

                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }
                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }

-               $aPartitions[] = 0;
+               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;

 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-functions.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-functions.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);


@@ -334,13 +349,13 @@
                if (!pg_query($oDB->connection, 'CREATE SEQUENCE seq_place start 100000')) fail(pg_last_error($oDB->connection));
                echo '.';
 
                if (!pg_query($oDB->connection, 'CREATE SEQUENCE seq_place start 100000')) fail(pg_last_error($oDB->connection));
                echo '.';
 

-               $sSQL = 'select partition from country_name order by country_code';
+               $sSQL = 'select distinct partition from country_name';

                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }
                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }

-               $aPartitions[] = 0;
+               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;

                foreach($aPartitions as $sPartition)
                {
                        if (!pg_query($oDB->connection, 'TRUNCATE location_road_'.$sPartition)) fail(pg_last_error($oDB->connection));
                foreach($aPartitions as $sPartition)
                {
                        if (!pg_query($oDB->connection, 'TRUNCATE location_road_'.$sPartition)) fail(pg_last_error($oDB->connection));


@@ -364,7 +379,7 @@
                {
                        $aDBInstances[$i] =& getDB(true);
                        $sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, ';
                {
                        $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));
                        $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));


@@ -499,75 +514,80 @@
                if (!file_exists(CONST_Osmosis_Binary))
                {
                        echo "Please download osmosis.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
                if (!file_exists(CONST_Osmosis_Binary))
                {
                        echo "Please download osmosis.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";

-                       fail("osmosis not found in '".CONST_Osmosis_Binary."'");
-               }
-               if (file_exists(CONST_BasePath.'/settings/configuration.txt'))
-               {
-                       echo "settings/configuration.txt already exists\n";
+                       if (!$aCMDResult['all'])
+                       {
+                               fail("osmosis not found in '".CONST_Osmosis_Binary."'");
+                       }

                }
                else
                {
                }
                else
                {

-                       passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');
-                       // update osmosis configuration.txt with our settings
-                       passthru("sed -i 's!baseUrl=.*!baseUrl=".CONST_Replication_Url."!' ".CONST_BasePath.'/settings/configuration.txt');
-                       passthru("sed -i 's:maxInterval = .*:maxInterval = ".CONST_Replication_MaxInterval.":' ".CONST_BasePath.'/settings/configuration.txt');
-               }
-
-               // Find the last node in the DB
-               $iLastOSMID = $oDB->getOne("select max(id) from planet_osm_nodes");
-
-               // Lookup the timestamp that node was created (less 3 hours for margin for changsets to be closed)
-               $sLastNodeURL = 'http://www.openstreetmap.org/api/0.6/node/'.$iLastOSMID."/1";
-               $sLastNodeXML = file_get_contents($sLastNodeURL);
-               preg_match('#timestamp="(([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z)"#', $sLastNodeXML, $aLastNodeDate);
-               $iLastNodeTimestamp = strtotime($aLastNodeDate[1]) - (3*60*60);
-
+                       if (file_exists(CONST_BasePath.'/settings/configuration.txt'))
+                       {
+                               echo "settings/configuration.txt already exists\n";
+                       }
+                       else
+                       {
+                               passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');
+                               // update osmosis configuration.txt with our settings
+                               passthru("sed -i 's!baseUrl=.*!baseUrl=".CONST_Replication_Url."!' ".CONST_BasePath.'/settings/configuration.txt');
+                               passthru("sed -i 's:maxInterval = .*:maxInterval = ".CONST_Replication_MaxInterval.":' ".CONST_BasePath.'/settings/configuration.txt');
+                       }

 
 

-               // Search for the correct state file - uses file timestamps so need to sort by date descending
-               $sRepURL = CONST_Replication_Url."/";
-               $sRep = file_get_contents($sRepURL."?C=M;O=D");
-               // download.geofabrik.de:    <a href="000/">000/</a></td><td align="right">26-Feb-2013 11:53  </td>
-               // planet.openstreetmap.org: <a href="273/">273/</a>                    22-Mar-2013 07:41    -
-               preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
-               $aPrevRepMatch = false;
-               foreach($aRepMatches as $aRepMatch)
-               {
-                       if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
-                       $aPrevRepMatch = $aRepMatch;
-               }
-               if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
+                       // Find the last node in the DB
+                       $iLastOSMID = $oDB->getOne("select max(id) from planet_osm_nodes");
+
+                       // Lookup the timestamp that node was created (less 3 hours for margin for changsets to be closed)
+                       $sLastNodeURL = 'http://www.openstreetmap.org/api/0.6/node/'.$iLastOSMID."/1";
+                       $sLastNodeXML = file_get_contents($sLastNodeURL);
+                       preg_match('#timestamp="(([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z)"#', $sLastNodeXML, $aLastNodeDate);
+                       $iLastNodeTimestamp = strtotime($aLastNodeDate[1]) - (3*60*60);
+
+                       // Search for the correct state file - uses file timestamps so need to sort by date descending
+                       $sRepURL = CONST_Replication_Url."/";
+                       $sRep = file_get_contents($sRepURL."?C=M;O=D");
+                       // download.geofabrik.de:    <a href="000/">000/</a></td><td align="right">26-Feb-2013 11:53  </td>
+                       // planet.openstreetmap.org: <a href="273/">273/</a>                    22-Mar-2013 07:41    -
+                       preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
+                       $aPrevRepMatch = false;
+                       foreach($aRepMatches as $aRepMatch)
+                       {
+                               if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
+                               $aPrevRepMatch = $aRepMatch;
+                       }
+                       if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;

 
 

-               $sRepURL .= $aRepMatch[1];
-               $sRep = file_get_contents($sRepURL."?C=M;O=D");
-               preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
-               $aPrevRepMatch = false;
-               foreach($aRepMatches as $aRepMatch)
-               {
-                       if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
-                       $aPrevRepMatch = $aRepMatch;
-               }
-               if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
+                       $sRepURL .= $aRepMatch[1];
+                       $sRep = file_get_contents($sRepURL."?C=M;O=D");
+                       preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
+                       $aPrevRepMatch = false;
+                       foreach($aRepMatches as $aRepMatch)
+                       {
+                               if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
+                               $aPrevRepMatch = $aRepMatch;
+                       }
+                       if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;

 
 

-               $sRepURL .= $aRepMatch[1];
-               $sRep = file_get_contents($sRepURL."?C=M;O=D");
-               preg_match_all('#<a href="[0-9]{3}.state.txt">([0-9]{3}).state.txt</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
-               $aPrevRepMatch = false;
-               foreach($aRepMatches as $aRepMatch)
-               {
-                       if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
-                       $aPrevRepMatch = $aRepMatch;
+                       $sRepURL .= $aRepMatch[1];
+                       $sRep = file_get_contents($sRepURL."?C=M;O=D");
+                       preg_match_all('#<a href="[0-9]{3}.state.txt">([0-9]{3}).state.txt</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
+                       $aPrevRepMatch = false;
+                       foreach($aRepMatches as $aRepMatch)
+                       {
+                               if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
+                               $aPrevRepMatch = $aRepMatch;
+                       }
+                       if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
+
+                       $sRepURL .= $aRepMatch[1].'.state.txt';
+                       echo "Getting state file: $sRepURL\n";
+                       $sStateFile = file_get_contents($sRepURL);
+                       if (!$sStateFile || strlen($sStateFile) > 1000) fail("unable to obtain state file");
+                       file_put_contents(CONST_BasePath.'/settings/state.txt', $sStateFile);
+                       echo "Updating DB status\n";
+                       pg_query($oDB->connection, 'TRUNCATE import_status');
+                       $sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')";
+                       pg_query($oDB->connection, $sSQL);

                }
                }

-               if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
-
-               $sRepURL .= $aRepMatch[1].'.state.txt';
-               echo "Getting state file: $sRepURL\n";
-               $sStateFile = file_get_contents($sRepURL);
-               if (!$sStateFile || strlen($sStateFile) > 1000) fail("unable to obtain state file");
-               file_put_contents(CONST_BasePath.'/settings/state.txt', $sStateFile);
-               echo "Updating DB status\n";
-               pg_query($oDB->connection, 'TRUNCATE import_status');
-               $sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')";
-               pg_query($oDB->connection, $sSQL);

        }
 
        if ($aCMDResult['index'] || $aCMDResult['all'])
        }
 
        if ($aCMDResult['index'] || $aCMDResult['all'])


@@ -588,13 +608,13 @@
                echo "Search indices\n";
                $bDidSomething = true;
                $oDB =& getDB();
                echo "Search indices\n";
                $bDidSomething = true;
                $oDB =& getDB();

-               $sSQL = 'select partition from country_name order by country_code';
+               $sSQL = 'select distinct partition from country_name';

                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }
                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }

-               $aPartitions[] = 0;
+               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;

 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);


@@ -632,6 +652,13 @@
                @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
                @symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
                echo "Symlinks created\n";
                @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
                @symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
                echo "Symlinks created\n";

+
+               $sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/tiles.js');
+               if (!$sTestFile)
+               {
+                       echo "\nWARNING: Unable to access the website at ".CONST_Website_BaseURL."\n";
+                       echo "You may want to update settings/local.php with @define('CONST_Website_BaseURL', 'http://[HOST]/[PATH]/');\n";
+               }

        }
 
        if (!$bDidSomething)
        }
 
        if (!$bDidSomething)