]> git.openstreetmap.org Git - nominatim.git/blobdiff - utils/setup.php
Format of replicate-sequence URL has changed
[nominatim.git] / utils / setup.php
index 26d9e8c68433fd89eab67aa38d519a74eaed06fa..d7aa3bc7be97cc0ff4bf7dcc2eed6bb4f5354db8 100755 (executable)
@@ -18,7 +18,9 @@
                array('create-db', '', 0, 1, 0, 0, 'bool', 'Create nominatim db'),
                array('setup-db', '', 0, 1, 0, 0, 'bool', 'Build a blank nominatim db'),
                array('import-data', '', 0, 1, 0, 0, 'bool', 'Import a osm file'),
+               array('osm2pgsql-cache', '', 0, 1, 1, 1, 'int', 'Cache size used by osm2pgsql'),
                array('create-functions', '', 0, 1, 0, 0, 'bool', 'Create functions'),
+               array('create-minimal-tables', '', 0, 1, 0, 0, 'bool', 'Create minimal main tables'),
                array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
                array('create-partitions', '', 0, 1, 0, 0, 'bool', 'Create required partition tables and triggers'),
                array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'),
@@ -29,6 +31,8 @@
                array('osmosis-init-date', '', 0, 1, 1, 1, 'string', 'Generate default osmosis configuration'),
                array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'),
                array('index-output', '', 0, 1, 1, 1, 'string', 'File to dump index information to'),
+               array('create-search-indices', '', 0, 1, 0, 0, 'bool', 'Create additional indices required for search and update'),
+               array('create-website', '', 0, 1, 1, 1, 'realpath', 'Create symlinks to setup web directory'),
        );
        getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
@@ -56,6 +60,8 @@
                        $aCMDResult['osmosis-init-date'] = date('Y-m-d', $iTime).'T22:00:00Z';
                }
        }
+       $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
+       if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
 
        if ($aCMDResult['create-db'] || $aCMDResult['all'])
        {
@@ -64,9 +70,9 @@
                $oDB =& DB::connect(CONST_Database_DSN, false);
                if (!PEAR::isError($oDB))
                {
-                       fail('database already exists');
+                       fail('database already exists ('.CONST_Database_DSN.')');
                }
-               passthru('createdb nominatim');
+               passthru('createdb -E UTF-8 '.$aDSNInfo['database']);
        }
 
        if ($aCMDResult['create-db'] || $aCMDResult['all'])
                // TODO: path detection, detection memory, etc.
 
                $oDB =& getDB();
-               passthru('createlang plpgsql nominatim');
-               pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/_int.sql');
-               pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
+               passthru('createlang plpgsql '.$aDSNInfo['database']);
+        $pgver = (float) CONST_Postgresql_Version;
+               if ($pgver < 9.1) {
+                       pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
+               } else {
+                       pgsqlRunScript('CREATE EXTENSION hstore');
+               }
                pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
                pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
                echo "Import\n";
                $bDidSomething = true;
 
-               if (!file_exists(CONST_BasePath.'/osm2pgsql/osm2pgsql')) fail("please download and build osm2pgsql");
-               passthru(CONST_BasePath.'/osm2pgsql/osm2pgsql -lsc -O gazetteer -C 10000 --hstore -d nominatim '.$aCMDResult['osm-file']);
+               $osm2pgsql = CONST_Osm2pgsql_Binary;
+               if (!file_exists($osm2pgsql)) fail("please download and build osm2pgsql");
+               $osm2pgsql .= ' -lsc -O gazetteer --hstore';
+               if (isset($aCMDResult['osm2pgsql-cache']))
+               {
+                       $osm2pgsql .= ' -C '.$aCMDResult['osm2pgsql-cache'];
+               }
+               else
+               {
+                       $osm2pgsql .= ' -C 15000';
+               }
+               $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
+               passthru($osm2pgsql);
 
                $oDB =& getDB();
                $x = $oDB->getRow('select * from place limit 1');
                pgsqlRunScript($sTemplate);
        }
 
+       if ($aCMDResult['create-minimal-tables'])
+       {
+               echo "Minimal Tables\n";
+               $bDidSomething = true;
+               pgsqlRunScriptFile(CONST_BasePath.'/sql/tables-minimal.sql');
+
+               $sScript = '';
+
+               // Backstop the import process - easliest possible import id
+               $sScript .= "insert into import_npi_log values (18022);\n";
+
+               $hFile = @fopen(CONST_BasePath.'/settings/partitionedtags.def', "r");
+               if (!$hFile) fail('unable to open list of partitions: '.CONST_BasePath.'/settings/partitionedtags.def');
+
+               while (($sLine = fgets($hFile, 4096)) !== false && $sLine && substr($sLine,0,1) !='#')
+               {
+                       list($sClass, $sType) = explode(' ', trim($sLine));
+                       $sScript .= "create table place_classtype_".$sClass."_".$sType." as ";
+                       $sScript .= "select place_id as place_id,geometry as centroid from placex limit 0;\n";
+
+                       $sScript .= "CREATE INDEX idx_place_classtype_".$sClass."_".$sType."_centroid ";
+                       $sScript .= "ON place_classtype_".$sClass."_".$sType." USING GIST (centroid);\n";
+
+                       $sScript .= "CREATE INDEX idx_place_classtype_".$sClass."_".$sType."_place_id ";
+                       $sScript .= "ON place_classtype_".$sClass."_".$sType." USING btree(place_id);\n";
+               }
+               fclose($hFile);
+               pgsqlRunScript($sScript);
+       }
+
        if ($aCMDResult['create-tables'] || $aCMDResult['all'])
        {
                echo "Tables\n";
        {
                echo "Partitions\n";
                $bDidSomething = true;
-echo "here";
                $oDB =& getDB();
-echo "there";
                $sSQL = 'select partition from country_name order by country_code';
-var_dump($sSQL);
                $aPartitions = $oDB->getCol($sSQL);
-var_dump($aPartitions);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
@@ -147,11 +194,9 @@ var_dump($aPartitions);
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
                foreach($aMatches as $aMatch)
                {
-var_dump($aMatch);
                        $sResult = '';
                        foreach($aPartitions as $sPartitionName)
                        {
-var_dump($sPartitionName);
                                $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]);
                        }
                        $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate);
@@ -207,6 +252,8 @@ var_dump($sPartitionName);
                        echo '.';
                }
                echo "\n";
+               echo "Reanalysing database...\n";
+               pgsqlRunScript('ANALYSE');
        }
 
        if ($aCMDResult['create-roads'])
@@ -248,7 +295,7 @@ var_dump($sPartitionName);
                        $aDBInstances[$i] =& getDB(true);
                }
 
-               foreach(glob(CONST_BasePath.'/data/tiger2009/*.sql') as $sFile)
+               foreach(glob(CONST_BasePath.'/data/tiger2011/*.sql') as $sFile)
                {
                        echo $sFile.': ';
                        $hFile = fopen($sFile, "r");
@@ -294,6 +341,7 @@ var_dump($sPartitionName);
 
        if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all'])
        {
+               $bDidSomething = true;
                $oDB =& getDB();
                if (!pg_query($oDB->connection, 'DELETE from placex where osm_type=\'P\'')) fail(pg_last_error($oDB->connection));
                $sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,country_code,geometry) ";
@@ -312,17 +360,27 @@ var_dump($sPartitionName);
        if (($aCMDResult['osmosis-init'] || $aCMDResult['all']) && isset($aCMDResult['osmosis-init-date']))
        {
                $bDidSomething = true;
+               $oDB =& getDB();
 
-               if (!file_exists(CONST_BasePath.'/osmosis-0.38/bin/osmosis')) fail("please download osmosis");
+               if (!file_exists(CONST_Osmosis_Binary)) fail("please download osmosis");
                if (file_exists(CONST_BasePath.'/settings/configuration.txt')) echo "settings/configuration.txt already exists\n";
-               else passthru(CONST_BasePath.'/osmosis-0.38/bin/osmosis --read-replication-interval-init '.CONST_BasePath.'/settings');
+               else passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');
 
                $sDate = $aCMDResult['osmosis-init-date'];
-               $sURL = 'http://toolserver.org/~mazder/replicate-sequences/?'.$sDate;
+               $aDate = date_parse_from_format("Y-m-d\TH-i", $sDate);
+               $sURL = 'http://toolserver.org/~mazder/replicate-sequences/?';
+               $sURL .= 'Y='.$aDate['year'].'&m='.$aDate['month'].'&d='.$aDate['day'];
+               $sURL .= '&H='.$aDate['hour'].'&i='.$aDate['minute'].'&s=0';
+               $sURL .= '&stream=minute';
                echo "Getting state file: $sURL\n";
                $sStateFile = file_get_contents($sURL);
                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('".$sDate."')";
+               pg_query($oDB->connection, $sSQL);
+
        }
 
        if ($aCMDResult['index'] || $aCMDResult['all'])
@@ -330,7 +388,54 @@ var_dump($sPartitionName);
                $bDidSomething = true;
                $sOutputFile = '';
                if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
-               passthru(CONST_BasePath.'/nominatim/nominatim -i -d nominatim -t '.$iInstances.$sOutputFile);
+               $sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile;
+               passthru($sBaseCmd.' -R 4');
+               pgsqlRunScript('ANALYSE');
+               passthru($sBaseCmd.' -r 5 -R 25');
+               pgsqlRunScript('ANALYSE');
+               passthru($sBaseCmd.' -r 26');
+       }
+
+       if ($aCMDResult['create-search-indices'] || $aCMDResult['all'])
+       {
+               echo "Search indices\n";
+               $bDidSomething = true;
+               $oDB =& getDB();
+               $sSQL = 'select partition from country_name order by country_code';
+               $aPartitions = $oDB->getCol($sSQL);
+               if (PEAR::isError($aPartitions))
+               {
+                       fail($aPartitions->getMessage());
+               }
+               $aPartitions[] = 0;
+
+               $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
+               preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
+               foreach($aMatches as $aMatch)
+               {
+                       $sResult = '';
+                       foreach($aPartitions as $sPartitionName)
+                       {
+                               $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]);
+                       }
+                       $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate);
+               }
+
+               pgsqlRunScript($sTemplate);
+       }
+
+       if (isset($aCMDResult['create-website']))
+       {
+               $bDidSomething = true;
+               $sTargetDir = $aCMDResult['create-website'];
+               if (!is_dir($sTargetDir)) fail('please specify a directory to setup');
+               @symlink(CONST_BasePath.'/website/details.php', $sTargetDir.'/details.php');
+               @symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
+               @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');
+               @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/index.php');
+               @symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images');
+               @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
+               echo "Symlinks created\n";
        }
 
        if (!$bDidSomething)
@@ -371,26 +476,22 @@ var_dump($sPartitionName);
        {
                // Convert database DSN to psql paramaters
                $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
-               $sCMD = 'psql '.$aDSNInfo['database'];
-
+               if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
+               $sCMD = 'psql -p '.$aDSNInfo['port'].' '.$aDSNInfo['database'];
                $aDescriptors = array(
                        0 => array('pipe', 'r'),
-                       1 => array('pipe', 'w'),
-                       2 => array('file', '/dev/null', 'a')
+                       1 => STDOUT, 
+                       2 => STDERR
                );
                $ahPipes = null;
-               $hProcess = proc_open($sCMD, $aDescriptors, $ahPipes);
+               $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes);
                if (!is_resource($hProcess)) fail('unable to start pgsql');
 
-               fwrite($ahPipes[0], $sScript);
-               fclose($ahPipes[0]);
-
-               // TODO: error checking
-               while(!feof($ahPipes[1]))
+               while(strlen($sScript))
                {
-                       echo fread($ahPipes[1], 4096);
+                       $written = fwrite($ahPipes[0], $sScript);
+                       $sScript = substr($sScript, $written);
                }
-               fclose($ahPipes[1]);
-
+               fclose($ahPipes[0]);
                proc_close($hProcess);
        }