safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Fix coding style.

Browse Source
This commit is contained in:
Markus Gail
2016-03-23 09:34:36 +01:00
parent a4ecd9d73e
commit 7dd0a63b68
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Geocode.php
View File

@@ -439,7 +439,8 @@
$sHousenumbers = ""; $sHousenumbers = "";
$i = 0; $i = 0;
$length = count($aPlaceIDs); $length = count($aPlaceIDs);
foreach($aPlaceIDs as $placeID => $housenumber){ foreach($aPlaceIDs as $placeID => $housenumber)
{
$i++; $i++;
$sHousenumbers .= "(".$placeID.", ".$housenumber.")"; $sHousenumbers .= "(".$placeID.", ".$housenumber.")";
if($i<$length) if($i<$length)
@@ -873,7 +874,8 @@
} }
// Do we have anything that looks like a lat/lon pair? // Do we have anything that looks like a lat/lon pair?
if ( $aLooksLike = looksLikeLatLonPair($sQuery) ){ if ( $aLooksLike = looksLikeLatLonPair($sQuery) )
{
$this->setNearPoint(array($aLooksLike['lat'], $aLooksLike['lon'])); $this->setNearPoint(array($aLooksLike['lat'], $aLooksLike['lon']));
$sQuery = $aLooksLike['query']; $sQuery = $aLooksLike['query'];
} }
@@ -1471,9 +1473,8 @@
$aPlaceIDs = $aRoadPlaceIDs; $aPlaceIDs = $aRoadPlaceIDs;
//set to -1, if no housenumbers were found //set to -1, if no housenumbers were found
$searchedHousenumber = -1; $searchedHousenumber = -1;
}else{
//housenumber was found, remains saved in searchedHousenumber
} }
//else: housenumber was found, remains saved in searchedHousenumber
} }
@@ -1624,7 +1625,8 @@
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aFilteredPlaceIDs = $this->oDB->getCol($sSQL); $aFilteredPlaceIDs = $this->oDB->getCol($sSQL);
$tempIDs = array(); $tempIDs = array();
foreach($aFilteredPlaceIDs as $placeID){ foreach($aFilteredPlaceIDs as $placeID)
{
$tempIDs[$placeID] = $aResultPlaceIDs[$placeID]; //assign housenumber to placeID $tempIDs[$placeID] = $aResultPlaceIDs[$placeID]; //assign housenumber to placeID
} }
$aResultPlaceIDs = $tempIDs; $aResultPlaceIDs = $tempIDs;

2
sql/tiger_import_start.sql
View File

@@ -10,7 +10,6 @@ DECLARE
endnumber INTEGER; endnumber INTEGER;
stepsize INTEGER; stepsize INTEGER;
numberrange INTEGER; numberrange INTEGER;
rangestartnumber INTEGER;
place_centroid GEOMETRY; place_centroid GEOMETRY;
out_partition INTEGER; out_partition INTEGER;
out_parent_place_id BIGINT; out_parent_place_id BIGINT;
@@ -28,7 +27,6 @@ BEGIN
END IF; END IF;
numberrange := endnumber - startnumber; numberrange := endnumber - startnumber;
rangestartnumber := startnumber;
IF (interpolationtype = 'odd' AND startnumber%2 = 0) OR (interpolationtype = 'even' AND startnumber%2 = 1) THEN IF (interpolationtype = 'odd' AND startnumber%2 = 0) OR (interpolationtype = 'even' AND startnumber%2 = 1) THEN
startnumber := startnumber + 1; startnumber := startnumber + 1;

2
website/details.php
View File

@@ -10,7 +10,7 @@
$fLoadAvg = getLoadAverage(); $fLoadAvg = getLoadAverage();
if ($fLoadAvg > 3) if ($fLoadAvg > 3)
{ {
echo "Page temporarily blocked due to high server load\n";F echo "Page temporarily blocked due to high server load\n";
exit; exit;
} }
*/ */