]> git.openstreetmap.org Git - nominatim.git/blobdiff - utils/setup.php
remove --create-website function
[nominatim.git] / utils / setup.php
index 01402842e8bda9aa560a0709016ae07646c4f352..923756087b0d0027ee06aa516a514315a020e3b1 100755 (executable)
@@ -37,7 +37,6 @@
                array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'),
                array('index-noanalyse', '', 0, 1, 0, 0, 'bool', 'Do not perform analyse operations during index (EXPERT)'),
                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'),
                array('drop', '', 0, 1, 0, 0, 'bool', 'Drop tables needed for updates, making the database readonly (EXPERIMENTAL)'),
        );
        getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
@@ -94,7 +93,7 @@
        {
                echo "Create DB\n";
                $bDidSomething = true;
-               $oDB =& DB::connect(CONST_Database_DSN, false);
+               $oDB = DB::connect(CONST_Database_DSN, false);
                if (!PEAR::isError($oDB))
                {
                        fail('database already exists ('.CONST_Database_DSN.')');
                echo '.';
                if (!pg_query($oDB->connection, 'TRUNCATE placex')) fail(pg_last_error($oDB->connection));
                echo '.';
+               if (!pg_query($oDB->connection, 'TRUNCATE location_property_osmline')) fail(pg_last_error($oDB->connection));
+               echo '.';
                if (!pg_query($oDB->connection, 'TRUNCATE place_addressline')) fail(pg_last_error($oDB->connection));
                echo '.';
                if (!pg_query($oDB->connection, 'TRUNCATE place_boundingbox')) fail(pg_last_error($oDB->connection));
 
                echo "Load Data\n";
                $aDBInstances = array();
-               for($i = 0; $i < $iInstances; $i++)
+               $iLoadThreads = max(1, $iInstances - 1);
+               for($i = 0; $i < $iLoadThreads; $i++)
                {
                        $aDBInstances[$i] =& getDB(true);
                        $sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, ';
                        $sSQL .= 'housenumber, street, addr_place, isin, postcode, country_code, extratags, ';
-                       $sSQL .= 'geometry) select * from place where osm_id % '.$iInstances.' = '.$i;
+                       $sSQL .= 'geometry) select * from place where osm_id % '.$iLoadThreads.' = '.$i;
+                       $sSQL .= " and not (class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString')";
                        if ($aCMDResult['verbose']) echo "$sSQL\n";
                        if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));
                }
+               // last thread for interpolation lines
+               $aDBInstances[$iLoadThreads] =& getDB(true);
+               $sSQL = 'select insert_osmline (osm_id, housenumber, street, addr_place, postcode, country_code, ';
+               $sSQL .= 'geometry) from place where ';
+               $sSQL .= "class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString'";
+               if ($aCMDResult['verbose']) echo "$sSQL\n";
+               if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));
+
                $bAnyBusy = true;
                while($bAnyBusy)
                {
                        $bAnyBusy = false;
-                       for($i = 0; $i < $iInstances; $i++)
+                       for($i = 0; $i <= $iLoadThreads; $i++)
                        {
                                if (pg_connection_busy($aDBInstances[$i]->connection)) $bAnyBusy = true;
                        }
                pgsqlRunScript($sTemplate);
        }
 
-       if (isset($aCMDResult['create-website']))
-       {
-               $bDidSomething = true;
-               $sTargetDir = $aCMDResult['create-website'];
-               if (!is_dir($sTargetDir))
-               {
-                       echo "You must create the website directory before calling this function.\n";
-                       fail("Target directory does not exist.");
-               }
-
-               @symlink(CONST_InstallPath.'/website/details.php', $sTargetDir.'/details.php');
-               @symlink(CONST_InstallPath.'/website/reverse.php', $sTargetDir.'/reverse.php');
-               @symlink(CONST_InstallPath.'/website/search.php', $sTargetDir.'/search.php');
-               @symlink(CONST_InstallPath.'/website/search.php', $sTargetDir.'/index.php');
-               @symlink(CONST_InstallPath.'/website/lookup.php', $sTargetDir.'/lookup.php');
-               @symlink(CONST_InstallPath.'/website/deletable.php', $sTargetDir.'/deletable.php');
-               @symlink(CONST_InstallPath.'/website/polygons.php', $sTargetDir.'/polygons.php');
-               @symlink(CONST_InstallPath.'/website/status.php', $sTargetDir.'/status.php');
-               @symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images');
-               @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
-               @symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
-               echo "Symlinks created\n";
-
-               $sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/nominatim-ui.js');
-               if (!$sTestFile)
-               {
-                       echo "\nWARNING: Unable to access the website at ".CONST_Website_BaseURL."\n";
-                       echo "You may want to update settings/local.php with @define('CONST_Website_BaseURL', 'http://[HOST]/[PATH]/');\n";
-               }
-       }
-
        if ($aCMDResult['drop'])
        {
                // The implementation is potentially a bit dangerous because it uses