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

better error checking for middle of the sea

Browse Source
This commit is contained in:
Brian Quinion
2011-02-22 20:01:26 +00:00
parent fb6d13a1a7
commit 9c41353340
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
website/reverse.php
View File

@@ -72,7 +72,7 @@
$fSearchDiam = 0.0001; $fSearchDiam = 0.0001;
$iPlaceID = null; $iPlaceID = null;
$aArea = false; $aArea = false;
$fMaxAreaDistance = 10; $fMaxAreaDistance = 1;
while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance) while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance)
{ {
$fSearchDiam = $fSearchDiam * 2; $fSearchDiam = $fSearchDiam * 2;
@@ -107,28 +107,30 @@
} }
// The point we found might be too small - use the address to find what it is a child of // The point we found might be too small - use the address to find what it is a child of
$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = $iPlaceID order by cached_rank_address desc,isaddress desc,distance desc"; if ($iPlaceID)
//var_dump($sSQL);
$iPlaceID = $oDB->getOne($sSQL);
if (PEAR::IsError($iPlaceID))
{ {
var_Dump($sSQL, $iPlaceID); $sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = $iPlaceID order by cached_rank_address desc,isaddress desc,distance desc";
exit;
}
if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
{
$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = ".$aPlace['place_id']." order by cached_rank_address desc,isaddress desc,distance desc";
//var_dump($sSQL);
$iPlaceID = $oDB->getOne($sSQL); $iPlaceID = $oDB->getOne($sSQL);
if (PEAR::IsError($iPlaceID)) if (PEAR::IsError($iPlaceID))
{ {
var_Dump($sSQL, $iPlaceID); var_Dump($sSQL, $iPlaceID);
exit; exit;
} }
}
if (!$iPlaceID) if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
{ {
$iPlaceID = $aPlace['place_id']; $sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = ".$aPlace['place_id']." order by cached_rank_address desc,isaddress desc,distance desc";
$iPlaceID = $oDB->getOne($sSQL);
if (PEAR::IsError($iPlaceID))
{
var_Dump($sSQL, $iPlaceID);
exit;
}
}
if (!$iPlaceID)
{
$iPlaceID = $aPlace['place_id'];
}
} }
} }