Revert "restrict viewbox size"

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 2d5d33944e640a7b0fa92bfc6bb028ae84dc68bb..38f7614233ea3313c3e67a84aa550fa09afc6f25 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1599,6 +1599,21 @@
 
                        foreach($aSearchResults as $iResNum => $aResult)
                        {
 
                        foreach($aSearchResults as $iResNum => $aResult)
                        {

+                               // Default
+                               $fDiameter = 0.0001;
+
+                               if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
+                                               && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
+                               {
+                                       $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'];
+                               }
+                               elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
+                                               && $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
+                               {
+                                       $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'];
+                               }
+                               $fRadius = $fDiameter / 2;
+

                                if (CONST_Search_AreaPolygons)
                                {
                                        // Get the bounding box and outline polygon
                                if (CONST_Search_AreaPolygons)
                                {
                                        // Get the bounding box and outline polygon


@@ -1654,18 +1669,13 @@
                             */
                                                        elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
                                                        {
                             */
                                                        elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
                                                        {

-                                                               $fRadius = 0.01;
-                                                               $iSteps = ($fRadius * 40000)^2;
+                                                               $iSteps = max(8, min(100, ($fRadius * 40000)^2));

                                                                $fStepSize = (2*pi())/$iSteps;
                                                                $aPolyPoints = array();
                                                                for($f = 0; $f < 2*pi(); $f += $fStepSize)
                                                                {
                                                                        $aPolyPoints[] = array('',$aMatch[1]+($fRadius*sin($f)),$aMatch[2]+($fRadius*cos($f)));
                                                                }
                                                                $fStepSize = (2*pi())/$iSteps;
                                                                $aPolyPoints = array();
                                                                for($f = 0; $f < 2*pi(); $f += $fStepSize)
                                                                {
                                                                        $aPolyPoints[] = array('',$aMatch[1]+($fRadius*sin($f)),$aMatch[2]+($fRadius*cos($f)));
                                                                }

-                                                               $aPointPolygon['minlat'] = $aPointPolygon['minlat'] - $fRadius;
-                                                               $aPointPolygon['maxlat'] = $aPointPolygon['maxlat'] + $fRadius;
-                                                               $aPointPolygon['minlon'] = $aPointPolygon['minlon'] - $fRadius;
-                                                               $aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;

                                                        }
                                                }
 
                                                        }
                                                }
 


@@ -1678,7 +1688,18 @@
                                                                $aResult['aPolyPoints'][] = array($aPoint[1], $aPoint[2]);
                                                        }
                                                }
                                                                $aResult['aPolyPoints'][] = array($aPoint[1], $aPoint[2]);
                                                        }
                                                }

-                                               $aResult['aBoundingBox'] = array($aPointPolygon['minlat'],$aPointPolygon['maxlat'],$aPointPolygon['minlon'],$aPointPolygon['maxlon']);
+
+                                               if (abs($aPointPolygon['minlat'] - $aPointPolygon['maxlat']) < 0.0000001)
+                                               {
+                                                       $aPointPolygon['minlat'] = $aPointPolygon['minlat'] - $fRadius;
+                                                       $aPointPolygon['maxlat'] = $aPointPolygon['maxlat'] + $fRadius;
+                                               }
+                                               if (abs($aPointPolygon['minlon'] - $aPointPolygon['maxlon']) < 0.0000001)
+                                               {
+                                                       $aPointPolygon['minlon'] = $aPointPolygon['minlon'] - $fRadius;
+                                                       $aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
+                                               }
+                                               $aResult['aBoundingBox'] = array((string)$aPointPolygon['minlat'],(string)$aPointPolygon['maxlat'],(string)$aPointPolygon['minlon'],(string)$aPointPolygon['maxlon']);

                                        }
                                }
 
                                        }
                                }
 


@@ -1691,28 +1712,8 @@
 
                                if (!isset($aResult['aBoundingBox']))
                                {
 
                                if (!isset($aResult['aBoundingBox']))
                                {

-                                       // Default
-                                       $fDiameter = 0.0001;
-
-                                       if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
-                                                       && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
-                                       {
-                                               $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defzoom'];
-                                       }
-                                       elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
-                                                       && $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
-                                       {
-                                               $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'];
-                                       }
-                                       $fRadius = $fDiameter / 2;
-

                                        $iSteps = max(8,min(100,$fRadius * 3.14 * 100000));
                                        $fStepSize = (2*pi())/$iSteps;
                                        $iSteps = max(8,min(100,$fRadius * 3.14 * 100000));
                                        $fStepSize = (2*pi())/$iSteps;

-                                       $aPolyPoints = array();
-                                       for($f = 0; $f < 2*pi(); $f += $fStepSize)
-                                       {
-                                               $aPolyPoints[] = array('',$aResult['lon']+($fRadius*sin($f)),$aResult['lat']+($fRadius*cos($f)));
-                                       }

                                        $aPointPolygon['minlat'] = $aResult['lat'] - $fRadius;
                                        $aPointPolygon['maxlat'] = $aResult['lat'] + $fRadius;
                                        $aPointPolygon['minlon'] = $aResult['lon'] - $fRadius;
                                        $aPointPolygon['minlat'] = $aResult['lat'] - $fRadius;
                                        $aPointPolygon['maxlat'] = $aResult['lat'] + $fRadius;
                                        $aPointPolygon['minlon'] = $aResult['lon'] - $fRadius;


@@ -1721,6 +1722,11 @@
                                        // Output data suitable for display (points and a bounding box)
                                        if ($this->bIncludePolygonAsPoints)
                                        {
                                        // Output data suitable for display (points and a bounding box)
                                        if ($this->bIncludePolygonAsPoints)
                                        {

+                                               $aPolyPoints = array();
+                                               for($f = 0; $f < 2*pi(); $f += $fStepSize)
+                                               {
+                                                       $aPolyPoints[] = array('',$aResult['lon']+($fRadius*sin($f)),$aResult['lat']+($fRadius*cos($f)));
+                                               }

                                                $aResult['aPolyPoints'] = array();
                                                foreach($aPolyPoints as $aPoint)
                                                {
                                                $aResult['aPolyPoints'] = array();
                                                foreach($aPolyPoints as $aPoint)
                                                {