X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7a964efb3a104e304be7620dc18fa123559f05c8..92f86de938fcb2fb18b22531bf491512e5b8c190:/lib/PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 0bf8c2fe..c94121f8 100644
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -43,11 +43,6 @@ class PlaceLookup
         $this->bIncludePolygonAsPoints = $b;
     }
 
-    public function setAddressDetails($b = true)
-    {
-        $this->bAddressDetails = $b;
-    }
-
     public function setAddressAdminLevels($b = true)
     {
         $this->bAddressAdminLevels = $b;
@@ -551,13 +546,15 @@ class PlaceLookup
     {
         $aAddressLines = $this->getAddressDetails(
             $iPlaceID,
-            false,
+            true,
             $sHousenumber === null ? -1 : $sHousenumber
         );
 
         $aAddress = array();
         foreach ($aAddressLines as $aLine) {
-            if (isset($aLine['admin_level'])) {
+            if (isset($aLine['admin_level'])
+                && $aLine['admin_level'] < 15
+                && !isset($aAddress['level'.$aLine['admin_level']])) {
                 $aAddress['level'.$aLine['admin_level']] = $aLine['localname'];
             }
         }
@@ -577,7 +574,7 @@ class PlaceLookup
      */
 
 
-    public function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = null)
+    public function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = null, $fLonReverse = null, $fLatReverse = null)
     {
 
         $aOutlineResult = array();
@@ -585,15 +582,27 @@ class PlaceLookup
 
         if (CONST_Search_AreaPolygons) {
             // Get the bounding box and outline polygon
-            $sSQL  = 'select place_id,0 as numfeatures,st_area(geometry) as area,';
-            $sSQL .= 'ST_Y(centroid) as centrelat,ST_X(centroid) as centrelon,';
-            $sSQL .= 'ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,';
-            $sSQL .= 'ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon';
+            $sSQL = 'select place_id,0 as numfeatures,st_area(geometry) as area,';
+            if ($fLonReverse != null && $fLatReverse != null) {
+                $sSQL .= ' ST_Y(closest_point) as centrelat,';
+                $sSQL .= ' ST_X(closest_point) as centrelon,';
+            } else {
+                $sSQL .= ' ST_Y(centroid) as centrelat, ST_X(centroid) as centrelon,';
+            }
+            $sSQL .= ' ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,';
+            $sSQL .= ' ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon';
             if ($this->bIncludePolygonAsGeoJSON) $sSQL .= ',ST_AsGeoJSON(geometry) as asgeojson';
             if ($this->bIncludePolygonAsKML) $sSQL .= ',ST_AsKML(geometry) as askml';
             if ($this->bIncludePolygonAsSVG) $sSQL .= ',ST_AsSVG(geometry) as assvg';
             if ($this->bIncludePolygonAsText || $this->bIncludePolygonAsPoints) $sSQL .= ',ST_AsText(geometry) as astext';
-            $sFrom = ' from placex where place_id = '.$iPlaceID;
+            if ($fLonReverse != null && $fLatReverse != null) {
+                $sFrom = ' from (SELECT * , CASE WHEN (class = \'highway\') AND (ST_GeometryType(geometry) = \'ST_LineString\') THEN ';
+                $sFrom .=' ST_ClosestPoint(geometry, ST_SetSRID(ST_Point('.$fLatReverse.','.$fLonReverse.'),4326))';
+                $sFrom .=' ELSE centroid END AS closest_point';
+                $sFrom .= ' from placex where place_id = '.$iPlaceID.') as plx';
+            } else {
+                $sFrom = ' from placex where place_id = '.$iPlaceID;
+            }
             if ($this->fPolygonSimplificationThreshold > 0) {
                 $sSQL .= ' from (select place_id,centroid,ST_SimplifyPreserveTopology(geometry,'.$this->fPolygonSimplificationThreshold.') as geometry'.$sFrom.') as plx';
             } else {