Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index fb89c48bfe433d12ab7f3db936dee15758927ace..cdd6b5cb773e9ce500959876a0dfd026983d5917 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -548,10 +548,10 @@ function _debugDumpGroupedSearches($aData, $aTokens)
             if ($aRow['oNear']) {
                 echo "<td>".$aRow['oNear']->lat()."</td>";
                 echo "<td>".$aRow['oNear']->lon()."</td>";
+                echo "<td>".$aRow['oNear']->radius()."</td>";
             } else {
-                echo "<td></td><td></td>";
+                echo "<td></td><td></td><td></td>";
             }
-            echo "<td>".$aRow['fRadius']."</td>";
 
             echo "</tr>";
         }
@@ -617,10 +617,10 @@ function geometryText2Points($geometry_as_text, $fRadius)
         //
         preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);
         //
-    } elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) {
+/*    } elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) {
         //
         preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);
-        //
+        */
     } elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#', $geometry_as_text, $aMatch)) {
         //
         $aPolyPoints = createPointsAroundCenter($aMatch[1], $aMatch[2], $fRadius);