X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ddb2e4aa1271a9b991f08bcbfad21676e5f5f393..4f86a91d6141b36a269967dc34ad65f4e8b1dfe5:/utils/imports.php

diff --git a/utils/imports.php b/utils/imports.php
index 332e5b31..8dc2c820 100755
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -1,61 +1,52 @@
 #!/usr/bin/php -Cq
 <?php
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-	ini_set('memory_limit', '800M');
-	$sDefaultDataPath = CONST_BasePath.'/data/tiger2014';
-
-	$aCMDOptions = array(
-		"Create and setup nominatim search system",
-		array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
-		array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
-		array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
-
-		array('parse-tiger', '', 0, 1, 1, 1, 'realpath', 'Convert tiger edge files to nominatim sql import - datafiles from 2011 or later (source: edges directory of tiger data)'),
-	);
-	getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
-
-
-	if (isset($aCMDResult['parse-tiger']))
-	{
-		if (!file_exists($sDefaultDataPath)) mkdir($sDefaultDataPath);
-
-		$sTempDir = tempnam('/tmp', 'tiger');
-		unlink($sTempDir);
-		mkdir($sTempDir);
-
-		foreach(glob($aCMDResult['parse-tiger'].'/tl_20??_?????_edges.zip', 0) as $sImportFile)
-		{
-			set_time_limit(30);
-			preg_match('#([0-9]{5})_(.*)#',basename($sImportFile), $aMatch);
-			$sCountyID = $aMatch[1];
-			echo "Processing ".$sCountyID."...\n";
-			$sUnzipCmd = "unzip -d $sTempDir $sImportFile";
-			exec($sUnzipCmd);
-			$sShapeFile = $sTempDir.'/'.basename($sImportFile, '.zip').'.shp';
-			if (!file_exists($sShapeFile))
-			{
-				echo "Failed unzip ($sImportFile)\n";
-			}
-			else
-			{
-				$sParseCmd = CONST_BasePath.'/utils/tigerAddressImport.py '.$sShapeFile;
-				exec($sParseCmd);
-				$sOsmFile = $sTempDir.'/'.basename($sImportFile, '.zip').'.osm1.osm';
-				if (!file_exists($sOsmFile))
-				{
-					echo "Failed parse ($sImportFile)\n";
-				}
-				else
-				{
-					copy($sOsmFile, $sDefaultDataPath.'/'.$sCountyID.'.sql');
-				}
-			}
-			// Cleanup
-			foreach(glob($sTempDir.'/*') as $sTmpFile)
-			{
-				unlink($sTmpFile);
-			}
-
-		}
-	}
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+require_once(CONST_BasePath.'/lib/init-cmd.php');
+ini_set('memory_limit', '800M');
+
+$aCMDOptions
+ = array(
+    "Create and setup nominatim search system",
+    array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
+    array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
+    array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
+
+    array('parse-tiger', '', 0, 1, 1, 1, 'realpath', 'Convert tiger edge files to nominatim sql import - datafiles from 2011 or later (source: edges directory of tiger data)'),
+   );
+getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
+
+
+if (isset($aCMDResult['parse-tiger'])) {
+    if (!file_exists(CONST_Tiger_Data_Path)) mkdir(CONST_Tiger_Data_Path);
+
+    $sTempDir = tempnam('/tmp', 'tiger');
+    unlink($sTempDir);
+    mkdir($sTempDir);
+
+    foreach (glob($aCMDResult['parse-tiger'].'/tl_20??_?????_edges.zip', 0) as $sImportFile) {
+        set_time_limit(30);
+        preg_match('#([0-9]{5})_(.*)#', basename($sImportFile), $aMatch);
+        $sCountyID = $aMatch[1];
+        echo "Processing ".$sCountyID."...\n";
+        $sUnzipCmd = "unzip -d $sTempDir $sImportFile";
+        exec($sUnzipCmd);
+        $sShapeFile = $sTempDir.'/'.basename($sImportFile, '.zip').'.shp';
+        if (!file_exists($sShapeFile)) {
+            echo "Failed unzip ($sImportFile)\n";
+        } else {
+            $sParseCmd = CONST_BasePath.'/utils/tigerAddressImport.py '.$sShapeFile;
+            exec($sParseCmd);
+            $sOsmFile = $sTempDir.'/'.basename($sImportFile, '.zip').'.osm1.osm';
+            if (!file_exists($sOsmFile)) {
+                echo "Failed parse ($sImportFile)\n";
+            } else {
+                copy($sOsmFile, CONST_Tiger_Data_Path.'/'.$sCountyID.'.sql');
+            }
+        }
+        // Cleanup
+        foreach (glob($sTempDir.'/*') as $sTmpFile) {
+            unlink($sTmpFile);
+        }
+    }
+}