Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 134b5e4e84d76cdb8ba6d12243b62993d6e71027..ed877899faa672aa0160539840bf3b9fc6afbda3 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -3,6 +3,8 @@
 
        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');

+       require_once(CONST_BasePath.'/lib/PlaceLookup.php');
+       require_once(CONST_BasePath.'/lib/ReverseGeocode.php');

 
        $oDB =& getDB();
        ini_set('memory_limit', '200M');
 
        $oDB =& getDB();
        ini_set('memory_limit', '200M');


@@ -20,139 +22,30 @@
 
        // Preferred language
        $aLangPrefOrder = getPreferredLanguages();
 
        // 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'))
        {
 
        $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($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
-               $fLat = (float)$_GET['lat'];
-               $fLon = (float)$_GET['lon'];
-               $sPointSQL = "ST_SetSRID(ST_Point($fLon,$fLat),4326)";
-
-               // 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($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28;
-
-               // Find the nearest point
-               $fSearchDiam = 0.0004;
-               $iPlaceID = null;
-               $aArea = false;
-               $fMaxAreaDistance = 1;
-               while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance)
-               {
-                       $fSearchDiam = $fSearchDiam * 2;
+               $oPlaceLookup = new PlaceLookup($oDB);
+               $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
+               $oPlaceLookup->setIncludeAddressDetails($bShowAddressDetails);
+               $oPlaceLookup->setOSMID($_GET['osm_type'], $_GET['osm_id']);

 
 

-                       // If we have to expand the search area by a large amount then we need a larger feature
-                       // then there is a limit to how small the feature should be
-                       if ($fSearchDiam > 2 && $iMaxRank > 4) $iMaxRank = 4;
-                       if ($fSearchDiam > 1 && $iMaxRank > 9) $iMaxRank = 8;
-                       if ($fSearchDiam > 0.8 && $iMaxRank > 10) $iMaxRank = 10;
-                       if ($fSearchDiam > 0.6 && $iMaxRank > 12) $iMaxRank = 12;
-                       if ($fSearchDiam > 0.2 && $iMaxRank > 17) $iMaxRank = 17;
-                       if ($fSearchDiam > 0.1 && $iMaxRank > 18) $iMaxRank = 18;
-                       if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
-                       if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26;
+               $aPlace = $oPlaceLookup->lookup();

 
 

-                       $sSQL = 'select place_id,parent_place_id,rank_search from placex';
-                       $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\',\'railway\',\'tunnel\',\'bridge\')';
-                       $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
-                       $sSQL .= ' and indexed_status = 0 ';
-                       $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
-                       $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
-                       if (CONST_Debug) var_dump($sSQL);
-                       $aPlace = $oDB->getRow($sSQL);
-                       if (PEAR::IsError($aPlace))
-                       {
-                               failInternalError("Could not determine closest place.", $sSQL, $aPlace);
-                       }
-                       $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)
-                       {
-                               $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);
-                       }
-                       if (!$iPlaceID)
-                       {
-                               $iPlaceID = $aPlace['place_id'];
-                       }
-               }
+               //if (!$iPlaceID) $sError = 'OSM ID Not Found';

        }
        }

-
-       if ($iPlaceID)
+       else

        {
        {

-               $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(centroid) as lat, st_x(centroid) as lon";
-               $sSQL .= " from placex where place_id = $iPlaceID ";
-
-               $aPlace = $oDB->getRow($sSQL);
-               //var_dump($sSQL, $aPlace); exit;
+               $oReverseGeocode = new ReverseGeocode($oDB);
+               $oReverseGeocode->setLanguagePreference($aLangPrefOrder);
+               $oReverseGeocode->setIncludeAddressDetails($bShowAddressDetails);

 
 

-               if ($bShowAddressDetails)
-               {
-                       $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['calculated_country_code']);
-               }
-               $aClassType = getClassTypes();
-               $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;
+               $oReverseGeocode->setLatLon($_GET['lat'], $_GET['lon']);
+               $oReverseGeocode->setZoom(@$_GET['zoom']);

 
 

+               $aPlace = $oReverseGeocode->lookup();

        }
 
        if (CONST_Debug) exit;
        }
 
        if (CONST_Debug) exit;