Merge remote-tracking branch 'upstream/master' into cmake-port

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 94bed6d81a2529335b56a2140e0639dc8e94ed10..2278c6c1a2d00f1de93fff56cfed595838fc5332 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -110,7 +110,7 @@
        {
                $aResult = array(array(join(' ',$aWords)));
                $sFirstToken = '';
-               if ($iDepth < 8) {
+               if ($iDepth < 7) {
                        while(sizeof($aWords) > 1)
                        {
                                $sWord = array_shift($aWords);
@@ -787,10 +787,10 @@
                {
                        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);