wrong variable name in json output

[nominatim.git] / utils / imports.php

diff --git a/utils/imports.php b/utils/imports.php
index 112ebd890a9c5f16ee82e04ca2ce6e73002794c8..752121d76dd7f5a5ddb950aaddfc81ea4b75c58a 100755 (executable)
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -10,7 +10,8 @@
                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 tigger edge files to nominatim sql import'),
+               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)'),

        );
        getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
        );
        getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 


@@ -18,6 +19,7 @@
 
        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);
                foreach(glob($aCMDResult['parse-tiger'].'/??_*', GLOB_ONLYDIR) as $sStateFolder)
                {
                        preg_match('#([0-9]{2})_(.*)#',basename($sStateFolder), $aMatch);


@@ -35,7 +37,7 @@
                                echo "'$sCountyID' : '$sCountyName' ,\n";
                        }
                }
                                echo "'$sCountyID' : '$sCountyName' ,\n";
                        }
                }

-exit;
+               exit;

 
                if (!file_exists(CONST_BasePath.'/data/tiger2009')) mkdir(CONST_BasePath.'/data/tiger2009');
 
 
                if (!file_exists(CONST_BasePath.'/data/tiger2009')) mkdir(CONST_BasePath.'/data/tiger2009');
 


@@ -84,3 +86,50 @@ exit;
                        }
                }
        }
                        }
                }
        }

+
+
+       if (isset($aCMDResult['parse-tiger-2011']))
+       {
+               if (!file_exists(CONST_BasePath.'/data/tiger2011')) mkdir(CONST_BasePath.'/data/tiger2011');
+
+               $sTempDir = tempnam('/tmp', 'tiger');
+               unlink($sTempDir);
+               mkdir($sTempDir);
+
+
+               $bDidSomething = true;
+               foreach(glob($aCMDResult['parse-tiger-2011'].'/tl_2011_?????_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_BasePath.'/data/tiger2011/'.$sCountyID.'.sql');
+                               }
+                       }
+                       // Cleanup
+                       foreach(glob($sTempDir.'/*') as $sTmpFile)
+                       {
+                               unlink($sTmpFile);
+                       }
+
+               }
+       }