mirror of
https://github.com/osm-search/Nominatim.git
synced 2024-09-20 15:37:49 +03:00
make Tiger data path configurable
This commit is contained in:
parent
ddb2e4aa12
commit
3257c04d94
@ -18,6 +18,7 @@
|
|||||||
@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-'.CONST_Postgis_Version);
|
@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-'.CONST_Postgis_Version);
|
||||||
@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
|
@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
|
||||||
@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
|
@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
|
||||||
|
@define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
|
||||||
|
|
||||||
// osm2pgsql settings
|
// osm2pgsql settings
|
||||||
@define('CONST_Osm2pgsql_Flatnode_File', null);
|
@define('CONST_Osm2pgsql_Flatnode_File', null);
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
|
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
|
||||||
ini_set('memory_limit', '800M');
|
ini_set('memory_limit', '800M');
|
||||||
$sDefaultDataPath = CONST_BasePath.'/data/tiger2014';
|
|
||||||
|
|
||||||
$aCMDOptions = array(
|
$aCMDOptions = array(
|
||||||
"Create and setup nominatim search system",
|
"Create and setup nominatim search system",
|
||||||
@ -18,7 +17,7 @@
|
|||||||
|
|
||||||
if (isset($aCMDResult['parse-tiger']))
|
if (isset($aCMDResult['parse-tiger']))
|
||||||
{
|
{
|
||||||
if (!file_exists($sDefaultDataPath)) mkdir($sDefaultDataPath);
|
if (!file_exists(CONST_Tiger_Data_Path)) mkdir(CONST_Tiger_Data_Path);
|
||||||
|
|
||||||
$sTempDir = tempnam('/tmp', 'tiger');
|
$sTempDir = tempnam('/tmp', 'tiger');
|
||||||
unlink($sTempDir);
|
unlink($sTempDir);
|
||||||
@ -48,7 +47,7 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
copy($sOsmFile, $sDefaultDataPath.'/'.$sCountyID.'.sql');
|
copy($sOsmFile, CONST_Tiger_Data_Path.'/'.$sCountyID.'.sql');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Cleanup
|
// Cleanup
|
||||||
|
@ -484,7 +484,7 @@
|
|||||||
$aDBInstances[$i] =& getDB(true);
|
$aDBInstances[$i] =& getDB(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach(glob(CONST_BasePath.'/data/tiger2014/*.sql') as $sFile)
|
foreach(glob(CONST_Tiger_Data_Path.'/*.sql') as $sFile)
|
||||||
{
|
{
|
||||||
echo $sFile.': ';
|
echo $sFile.': ';
|
||||||
$hFile = fopen($sFile, "r");
|
$hFile = fopen($sFile, "r");
|
||||||
|
Loading…
Reference in New Issue
Block a user