update comments and formatting

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index f18556738b6c698438862136e0bedf859e661784..5ae604d41e2bb0e61c11b3947ff577cdd8b87530 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -217,7 +217,7 @@
                echo "Functions\n";
                $bDidSomething = true;
                if (!file_exists(CONST_InstallPath.'/module/nominatim.so')) fail("nominatim module not built");
-               create_sql_functions();
+               create_sql_functions($aCMDResult);
        }
 
        if ($aCMDResult['create-tables'] || $aCMDResult['all'])
@@ -243,7 +243,7 @@
 
                // re-run the functions
                echo "Functions\n";
-               create_sql_functions();
+               create_sql_functions($aCMDResult);
        }
 
        if ($aCMDResult['create-partition-tables'] || $aCMDResult['all'])
@@ -353,6 +353,8 @@
                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));
@@ -394,20 +396,30 @@
 
                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;
                        }
@@ -656,7 +668,7 @@
                @symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
                echo "Symlinks created\n";
 
-               $sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/tiles.js');
+               $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";
@@ -900,7 +912,7 @@
                return $sSql;
        }
 
-       function create_sql_functions()
+       function create_sql_functions($aCMDResult)
        {
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
                $sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate);