update Tiger import script to use 2014 data

[nominatim.git] / utils / imports.php

diff --git a/utils/imports.php b/utils/imports.php
index 752121d76dd7f5a5ddb950aaddfc81ea4b75c58a..332e5b3131d04479f989e0f354cac303ec5461ee 100755 (executable)
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -3,6 +3,7 @@
 
        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
        ini_set('memory_limit', '800M');
 
        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",
 
        $aCMDOptions = array(
                "Create and setup nominatim search system",


@@ -10,95 +11,20 @@
                array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
                array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
 
                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'),
-               array('parse-tiger-2011', '', 0, 1, 1, 1, 'realpath', 'Convert tiger edge files to nominatim sql import (source: edges directory of tiger data)'),
+               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);
 
        );
        getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 

-       $bDidSomething = false;

 
        if (isset($aCMDResult['parse-tiger']))
        {
 
        if (isset($aCMDResult['parse-tiger']))
        {

-               $bDidSomething = true;
-               foreach(glob($aCMDResult['parse-tiger'].'/??_*', GLOB_ONLYDIR) as $sStateFolder)
-               {
-                       preg_match('#([0-9]{2})_(.*)#',basename($sStateFolder), $aMatch);
-                       var_dump($aMatch);
-                       exit;
-                       foreach(glob($sStateFolder.'/?????_*', GLOB_ONLYDIR) as $sCountyFolder)
-                       {
-                               set_time_limit(30);
-                               preg_match('#([0-9]{5})_(.*)#',basename($sCountyFolder), $aMatch);
-                               $sCountyID = $aMatch[1];
-                               $sCountyName = str_replace('_', ' ', $aMatch[2]);
-                               $sImportFile = $sCountyFolder.'/tl_2009_'.$sCountyID.'_edges.zip';
-                               $sCountyName = str_replace("'", "''", $sCountyName);
-                               $sCountyName = str_replace(" County", "", $sCountyName);
-                               echo "'$sCountyID' : '$sCountyName' ,\n";
-                       }
-               }
-               exit;
-
-               if (!file_exists(CONST_BasePath.'/data/tiger2009')) mkdir(CONST_BasePath.'/data/tiger2009');
-
-               $sTempDir = tempnam('/tmp', 'tiger');
-               unlink($sTempDir);
-               mkdir($sTempDir);
-
-               foreach(glob($aCMDResult['parse-tiger'].'/??_*', GLOB_ONLYDIR) as $sStateFolder)
-               {
-                       foreach(glob($sStateFolder.'/?????_*', GLOB_ONLYDIR) as $sCountyFolder)
-                       {
-                               set_time_limit(30);
-                               preg_match('#([0-9]{5})_(.*)#',basename($sCountyFolder), $aMatch);
-                               $sCountyID = $aMatch[1];
-                               $sCountyName = str_replace('_', ' ', $aMatch[2]);
-                               $sImportFile = $sCountyFolder.'/tl_2009_'.$sCountyID.'_edges.zip';
-                               echo "$sCountyID, $sCountyName\n";
-                               if (!file_exists($sImportFile))
-                               {
-                                       echo "Missing: $sImportFile\n";
-                               }
-                               $sUnzipCmd = "unzip -d $sTempDir $sImportFile";
-                               exec($sUnzipCmd);
-                               if (!file_exists($sTempDir.'/tl_2009_'.$sCountyID.'_edges.shp'))
-                               {
-                                       echo "Failed unzip ($sCountyID)\n";
-                               }
-                               else
-                               {
-                                       $sParseCmd = CONST_BasePath.'/utils/tigerAddressImport.py '.$sTempDir.'/tl_2009_'.$sCountyID.'_edges.shp';
-                                       exec($sParseCmd);
-                                       if (!file_exists($sTempDir.'/tl_2009_'.$sCountyID.'_edges.osm1.osm'))
-                                       {
-                                               echo "Failed parse ($sCountyID)\n";
-                                       }
-                                       else
-                                       {
-                                               copy($sTempDir.'/tl_2009_'.$sCountyID.'_edges.osm1.osm', CONST_BasePath.'/data/tiger2009/'.$sCountyID.'.sql');
-                                       }
-                               }
-                               // Cleanup
-                               foreach(glob($sTempDir.'/*') as $sTmpFile)
-                               {
-                                       unlink($sTmpFile);
-                               }
-                       }
-               }
-       }
-
-
-       if (isset($aCMDResult['parse-tiger-2011']))
-       {
-               if (!file_exists(CONST_BasePath.'/data/tiger2011')) mkdir(CONST_BasePath.'/data/tiger2011');
+               if (!file_exists($sDefaultDataPath)) mkdir($sDefaultDataPath);

 
                $sTempDir = tempnam('/tmp', 'tiger');
                unlink($sTempDir);
                mkdir($sTempDir);
 
 
                $sTempDir = tempnam('/tmp', 'tiger');
                unlink($sTempDir);
                mkdir($sTempDir);
 

-
-               $bDidSomething = true;
-               foreach(glob($aCMDResult['parse-tiger-2011'].'/tl_2011_?????_edges.zip', 0) as $sImportFile)
+               foreach(glob($aCMDResult['parse-tiger'].'/tl_20??_?????_edges.zip', 0) as $sImportFile)

                {
                        set_time_limit(30);
                        preg_match('#([0-9]{5})_(.*)#',basename($sImportFile), $aMatch);
                {
                        set_time_limit(30);
                        preg_match('#([0-9]{5})_(.*)#',basename($sImportFile), $aMatch);


@@ -122,7 +48,7 @@
                                }
                                else
                                {
                                }
                                else
                                {

-                                       copy($sOsmFile, CONST_BasePath.'/data/tiger2011/'.$sCountyID.'.sql');
+                                       copy($sOsmFile, $sDefaultDataPath.'/'.$sCountyID.'.sql');

                                }
                        }
                        // Cleanup
                                }
                        }
                        // Cleanup