hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 05:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tetris' of https://github.com/roques/Nominatim into roques-tetris

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-04-20 20:56:44 +02:00
parent 71e6d5f9a6 4d4b95923e
commit 4c7145c293
10 changed files with 99 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/setup.php
View File

@@ -360,13 +360,13 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) {
}
echo "Load Data\n";
$sColumns = 'osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry';
$aDBInstances = array();
$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 .= ' address, extratags, geometry) ';
$sSQL .= 'select * from place where osm_id % '.$iLoadThreads.' = '.$i;
$sSQL = "INSERT INTO placex ($sColumns) SELECT $sColumns 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)) {