From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 28 May 2015 19:27:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~454
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b42939a3249e73027516eb6e79a9f1f8c642ff95

Merge remote-tracking branch 'upstream/master'
---

b42939a3249e73027516eb6e79a9f1f8c642ff95
diff --cc lib/Geocode.php
index c79dcf1e,4ca832dc..a9fe9611
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -1666,10 -1660,9 +1666,10 @@@
  							{
  								preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
  							}
 +                            */
  							elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
  							{
- 								$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)