From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 22 May 2015 20:10:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~455
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/deefdde24b63ad4e446c67cff255cad6ba0feb1f

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

deefdde24b63ad4e446c67cff255cad6ba0feb1f
diff --cc lib/Geocode.php
index 2d5d3394,bb067046..c79dcf1e
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -1651,10 -1660,8 +1666,9 @@@
  							{
  								preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
  							}
 +                            */
  							elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
  							{
- 								$fRadius = 0.01;
  								$iSteps = ($fRadius * 40000)^2;
  								$fStepSize = (2*pi())/$iSteps;
  								$aPolyPoints = array();