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('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);
{
fail('database already exists ('.CONST_Database_DSN.')');
}
- passthru('createdb '.$aDSNInfo['database']);
+ passthru('createdb -E UTF-8 '.$aDSNInfo['database']);
}
if ($aCMDResult['create-db'] || $aCMDResult['all'])
$oDB =& getDB();
passthru('createlang plpgsql '.$aDSNInfo['database']);
- pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/_int.sql');
- pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
+ $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;
- $osm2pgsql = CONST_BasePath.'/osm2pgsql/osm2pgsql';
- if (!file_exists($osm2pgsql)) $osm2pgsql = trim(`which osm2pgsql`);
+ $osm2pgsql = CONST_Osm2pgsql_Binary;
if (!file_exists($osm2pgsql)) fail("please download and build osm2pgsql");
- passthru($osm2pgsql.' -lsc -O gazetteer -C 10000 --hstore -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file']);
+ $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');
echo '.';
}
echo "\n";
+ echo "Reanalysing database...\n";
+ pgsqlRunScript('ANALYSE');
}
if ($aCMDResult['create-roads'])
$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");
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'])
$bDidSomething = true;
$sOutputFile = '';
if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
- passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -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']))
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');
while(strlen($sScript))
projects / nominatim.git / blobdiff