disable aux tables

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index c155fa573030fa54cb5a71629727b808dc2be972..a1c39d9d49e72c1824f43de6bc2bd3a9cb1bc1e9 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,44 +1,35 @@
 <?php
 <?php

+       @define('CONST_ConnectionBucket_PageType', 'Reverse');
+

        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
 
        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
 

-        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'];
 
 
        // Show address breakdown
        $bShowAddressDetails = true;
        if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
 

-        // Preferred language
-        $aLangPrefOrder = getPreferredLanguages();
-        $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);
 
 
        $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';
                if (!$iPlaceID) $sError = 'OSM ID Not Found';

-        }
+       }

        else
        {
                // Location to look up
        else
        {
                // Location to look up


@@ -48,31 +39,31 @@
 
                // Zoom to rank, this could probably be calculated but a lookup gives fine control
                $aZoomRank = array(
 
                // 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
-                       );
+                               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
                $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;
                $iPlaceID = null;
                $aArea = false;
                $fMaxAreaDistance = 1;


@@ -97,13 +88,13 @@
                        $sSQL .= ' and (name is not null or housenumber is not null)';
                        $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\')';
                        $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
                        $sSQL .= ' and (name is not null or housenumber is not null)';
                        $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';
                        $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';

-//var_dump($sSQL);
+                       if (CONST_Debug) var_dump($sSQL);

                        $aPlace = $oDB->getRow($sSQL);
                        if (PEAR::IsError($aPlace))
                        {
                        $aPlace = $oDB->getRow($sSQL);
                        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'];
                        }
                        $iPlaceID = $aPlace['place_id'];
                        $iParentPlaceID = $aPlace['parent_place_id'];


@@ -112,14 +103,15 @@
                // The point we found might be too small - use the address to find what it is a child of
                if ($iPlaceID && $iMaxRank < 28)
                {
                // 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))
                        {
                                $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)
                        {
                        }
                        if (!$iPlaceID)
                        {


@@ -131,17 +123,18 @@
        if ($iPlaceID)
        {
                $sSQL = "select placex.*,";
        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);
                $aPlace = $oDB->getRow($sSQL);

+               //var_dump($sSQL, $aPlace); exit;

 
                if ($bShowAddressDetails)
                {
 
                if ($bShowAddressDetails)
                {

-                       $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
+                       $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['calculated_country_code']);

                }
                $aClassType = getClassTypes();
                $sAddressType = '';
                }
                $aClassType = getClassTypes();
                $sAddressType = '';


@@ -160,4 +153,7 @@
                $aPlace['addresstype'] = $sAddressType;
 
        }
                $aPlace['addresstype'] = $sAddressType;
 
        }

+
+       if (CONST_Debug) exit;
+

        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');