X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/352fea4ff31a8d0f6120f6316d6fb687acc194b6..95c0f2a97b2dedc2bede01eed3824a325809d74a:/website/reverse.php
diff --git a/website/reverse.php b/website/reverse.php
index 253b84a5..a1c39d9d 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,60 +1,35 @@
0)
- {
- $fLoadAvg = getLoadAverage();
- if ($fLoadAvg >= CONST_BlockReverseMaxLoad) {
- header('HTTP/1.0 403 Forbidden');
- header('Content-type: text/html; charset=utf-8');
- echo "
App temporarily blocked
";
- echo "Your application has been temporarily blocked from the OpenStreetMap Nominatim ";
- echo "geolocation service due to high server load.";
- echo "\n\n";
- exit;
- }
-
- }
-
-
- if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
- {
- $fLoadAvg = getLoadAverage();
- if ($fLoadAvg > 2) sleep(60);
- if ($fLoadAvg > 4) sleep(120);
- if ($fLoadAvg > 6)
- {
- echo "Bulk User: Temporary block due to high server load\n";
- exit;
- }
- }
-
- $oDB =& getDB();
- ini_set('memory_limit', '200M');
-
- // Format for output
- $sOutputFormat = 'xml';
- if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
- {
- $sOutputFormat = $_GET['format'];
- }
+ $oDB =& getDB();
+ ini_set('memory_limit', '200M');
+
+ // Format for output
+ $sOutputFormat = 'xml';
+ if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
+ {
+ $sOutputFormat = $_GET['format'];
+ }
// Show address breakdown
$bShowAddressDetails = true;
if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
- // Prefered language
- $aLangPrefOrder = getPrefferedLangauges();
- $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
+ // Preferred language
+ $aLangPrefOrder = getPreferredLanguages();
+ $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
$hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
- if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R'))
- {
- $iPlaceID = $oDB->getOne("select place_id from placex where osm_type = '".$_GET['osm_type']."' and osm_id = ".(int)$_GET['osm_id']." order by type = 'postcode' asc");
+ if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R'))
+ {
+ $iPlaceID = $oDB->getOne($sSQL = ("select place_id from placex where osm_type = '".$_GET['osm_type']."' and osm_id = ".(int)$_GET['osm_id']." order by type = 'postcode' asc"));
+ if (CONST_Debug) var_dump($sSQL);
if (!$iPlaceID) $sError = 'OSM ID Not Found';
- }
+ }
else
{
// Location to look up
@@ -64,31 +39,31 @@
// Zoom to rank, this could probably be calculated but a lookup gives fine control
$aZoomRank = array(
- 0 => 2, // Continent / Sea
- 1 => 2,
- 2 => 2,
- 3 => 4, // Country
- 4 => 4,
- 5 => 8, // State
- 6 => 10, // Region
- 7 => 10,
- 8 => 12, // County
- 9 => 12,
- 10 => 17, // City
- 11 => 17,
- 12 => 18, // Town / Village
- 13 => 18,
- 14 => 22, // Suburb
- 15 => 22,
- 16 => 26, // Street, TODO: major street?
- 17 => 26,
- 18 => 30, // or >, Building
- 19 => 30, // or >, Building
- );
- $iMaxRank = isset($aZoomRank[$_GET['zoom']])?$aZoomRank[$_GET['zoom']]:28;
+ 0 => 2, // Continent / Sea
+ 1 => 2,
+ 2 => 2,
+ 3 => 4, // Country
+ 4 => 4,
+ 5 => 8, // State
+ 6 => 10, // Region
+ 7 => 10,
+ 8 => 12, // County
+ 9 => 12,
+ 10 => 17, // City
+ 11 => 17,
+ 12 => 18, // Town / Village
+ 13 => 18,
+ 14 => 22, // Suburb
+ 15 => 22,
+ 16 => 26, // Street, TODO: major street?
+ 17 => 26,
+ 18 => 30, // or >, Building
+ 19 => 30, // or >, Building
+ );
+ $iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28;
// Find the nearest point
- $fSearchDiam = 0.0001;
+ $fSearchDiam = 0.0004;
$iPlaceID = null;
$aArea = false;
$fMaxAreaDistance = 1;
@@ -111,31 +86,32 @@
$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
$sSQL .= ' and rank_search != 28 and rank_search >= '.$iMaxRank;
$sSQL .= ' and (name is not null or housenumber is not null)';
- $sSQL .= ' and class not in (\'waterway\')';
+ $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\')';
$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
- $sSQL .= ' OR ST_DWithin('.$sPointSQL.', ST_Centroid(geometry), '.$fSearchDiam.'))';
+ $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
-//var_dump($sSQL);
+ if (CONST_Debug) var_dump($sSQL);
$aPlace = $oDB->getRow($sSQL);
- $iPlaceID = $aPlace['place_id'];
- $iParentPlaceID = $aPlace['parent_place_id'];
- if (PEAR::IsError($iPlaceID))
+ if (PEAR::IsError($aPlace))
{
- failInternalError("Could not determine closest place.", $sSQL, $iPlaceID);
+ failInternalError("Could not determine closest place.", $sSQL, $iPlaceID);
}
+ $iPlaceID = $aPlace['place_id'];
+ $iParentPlaceID = $aPlace['parent_place_id'];
}
// The point we found might be too small - use the address to find what it is a child of
if ($iPlaceID && $iMaxRank < 28)
{
- if ($aPlace['rank_search'] > 28 && $iParentPlaceID) {
+ if ($aPlace['rank_search'] > 28 && $iParentPlaceID)
+ {
$iPlaceID = $iParentPlaceID;
}
$sSQL = "select address_place_id from place_addressline where place_id = $iPlaceID order by abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc limit 1";
$iPlaceID = $oDB->getOne($sSQL);
if (PEAR::IsError($iPlaceID))
{
- failInternalError("Could not get parent for place.", $sSQL, $iPlaceID);
+ failInternalError("Could not get parent for place.", $sSQL, $iPlaceID);
}
if (!$iPlaceID)
{
@@ -147,26 +123,37 @@
if ($iPlaceID)
{
$sSQL = "select placex.*,";
- $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
- $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
- $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
- $sSQL .= " st_y(st_centroid(geometry)) as lat, st_x(st_centroid(geometry)) as lon";
- $sSQL .= " from placex where place_id = $iPlaceID ";
-//var_dump($sSQL);
+ $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+ $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
+ $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
+ $sSQL .= " st_y(centroid) as lat, st_x(centroid) as lon";
+ $sSQL .= " from placex where place_id = $iPlaceID ";
+
$aPlace = $oDB->getRow($sSQL);
+ //var_dump($sSQL, $aPlace); exit;
if ($bShowAddressDetails)
{
- $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
+ $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['calculated_country_code']);
}
$aClassType = getClassTypes();
- $sAddressType = '';
- if (isset($aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]))
- $sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]['simplelabel'];
- elseif (isset($aClassType[$aPlace['class'].':'.$aPlace['type']]))
- $sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type']]['simplelabel'];
- else $sAddressType = $aPlace['class'];
- $aPlace['addresstype'] = $sAddressType;
+ $sAddressType = '';
+ $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
+ if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
+ {
+ $sAddressType = $aClassType[$aClassType]['simplelabel'];
+ }
+ else
+ {
+ $sClassType = $aPlace['class'].':'.$aPlace['type'];
+ if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
+ $sAddressType = $aClassType[$sClassType]['simplelabel'];
+ else $sAddressType = $aPlace['class'];
+ }
+ $aPlace['addresstype'] = $sAddressType;
}
+
+ if (CONST_Debug) exit;
+
include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');