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

Merge branch 'master' of github.com:twain47/Nominatim

Browse Source
This commit is contained in:
Brian Quinion
2012-03-26 23:57:24 +01:00
parent b99a043c78 b6db7c17f9
commit 80cf5df1cd
7 changed files with 113 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
website/details.php
View File

@@ -48,11 +48,11 @@
$sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea,ST_GeometryType(geometry) as geotype, ST_Y(ST_Centroid(geometry)) as lat,ST_X(ST_Centroid(geometry)) as lon ";
$sSQL .= " from placex where place_id = $iPlaceID";
$aPointDetails = $oDB->getRow($sSQL);
IF (PEAR::IsError($aPointDetails))
if (PEAR::IsError($aPointDetails))
{
var_dump($aPointDetails);
exit;
failInternalError("Could not get details of place object.", $sSQL, $aPointDetails);
}
$aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
$fLon = $aPointDetails['lon'];
$fLat = $aPointDetails['lat'];
@@ -71,14 +71,13 @@
// Get the bounding box and outline polygon
$sSQL = "select ST_AsText(geometry) as outlinestring,";
$sSQL .= "ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),4)) as minlat,ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),2)) as maxlat,";
$sSQL .= "ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),1)) as minlon,ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),3)) as maxlon";
$sSQL .= "ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,";
$sSQL .= "ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon";
$sSQL .= " from placex where place_id = $iPlaceID";
$aPointPolygon = $oDB->getRow($sSQL);
IF (PEAR::IsError($aPointPolygon))
{
var_dump($aPointPolygon);
exit;
failInternalError("Could not get bounding box of place object.", $sSQL, $aPointPolygon);
}
if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$aPointPolygon['outlinestring'],$aMatch))
{

9
website/reverse.php
View File

@@ -105,8 +105,7 @@
$iPlaceID = $aPlace['place_id'];
if (PEAR::IsError($iPlaceID))
{
var_Dump($sSQL, $iPlaceID);
exit;
failInternalError("Could not determine closest place.", $sSQL, $iPlaceID);
}
}
@@ -118,8 +117,7 @@
$iPlaceID = $oDB->getOne($sSQL);
if (PEAR::IsError($iPlaceID))
{
var_Dump($sSQL, $iPlaceID);
exit;
failInternalError("Could not get parent for place.", $sSQL, $iPlaceID);
}
if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
@@ -129,8 +127,7 @@
$iPlaceID = $oDB->getOne($sSQL);
if (PEAR::IsError($iPlaceID))
{
var_Dump($sSQL, $iPlaceID);
exit;
failInternalError("Could not get larger parent for place.", $sSQL, $iPlaceID);
}
}
if (!$iPlaceID)

24
website/search.php
View File

@@ -163,8 +163,7 @@
$sViewboxSmallSQL = $oDB->getOne($sSQL);
if (PEAR::isError($sViewboxSmallSQL))
{
var_dump($sViewboxSmallSQL);
exit;
failInternalError("Could not get small viewbox.", $sSQL, $sViewboxSmallSQL);
}
$sViewboxSmallSQL = "'".$sViewboxSmallSQL."'::geometry";
@@ -172,8 +171,7 @@
$sViewboxLargeSQL = $oDB->getOne($sSQL);
if (PEAR::isError($sViewboxLargeSQL))
{
var_dump($sViewboxLargeSQL);
exit;
failInternalError("Could not get large viewbox.", $sSQL, $sViewboxLargeSQL);
}
$sViewboxLargeSQL = "'".$sViewboxLargeSQL."'::geometry";
}
@@ -325,8 +323,7 @@
$aDatabaseWords = array();
if (PEAR::IsError($aDatabaseWords))
{
var_dump($sSQL, $aDatabaseWords);
exit;
failInternalError("Could not get word tokens.", $sSQL, $aDatabaseWords);
}
$aPossibleMainWordIDs = array();
foreach($aDatabaseWords as $aToken)
@@ -796,8 +793,7 @@
$aViewBoxPlaceIDs = $oDB->getAll($sSQL);
if (PEAR::IsError($aViewBoxPlaceIDs))
{
var_dump($sSQL, $aViewBoxPlaceIDs);
exit;
failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs);
}
//var_dump($aViewBoxPlaceIDs);
// Did we have an viewbox matches?
@@ -978,8 +974,7 @@
if (PEAR::IsError($aPlaceIDs))
{
var_dump($sSQL, $aPlaceIDs);
exit;
failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs);
}
if (CONST_Debug) var_Dump($aPlaceIDs);
@@ -1055,8 +1050,7 @@
if (PEAR::IsError($aSearchResults))
{
var_dump($sSQL, $aSearchResults);
exit;
failInternalError("Could not get details for place.", $sSQL, $aSearchResults);
}
}
} // end if ($sQuery)
@@ -1124,8 +1118,7 @@
if (PEAR::IsError($aSearchResults))
{
var_dump($sSQL, $aSearchResults);
exit;
failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
}
}
}
@@ -1161,8 +1154,7 @@
$aPointPolygon = $oDB->getRow($sSQL);
if (PEAR::IsError($aPointPolygon))
{
var_dump($sSQL, $aPointPolygon);
exit;
failInternalError("Could not get outline.", $sSQL, $aPointPolygon);
}
if ($aPointPolygon['place_id'])
{