Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 092965baa27123c5cf21f64d3728646a71f9201f..f020a8b2b8ac81b0005de42cc4438043b72d221b 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -55,7 +55,7 @@ function getWordSets($aWords, $iDepth)
 {
     $aResult = array(array(join(' ', $aWords)));
     $sFirstToken = '';
-    if ($iDepth < 8) {
+    if ($iDepth < 7) {
         while (sizeof($aWords) > 1) {
             $sWord = array_shift($aWords);
             $sFirstToken .= ($sFirstToken?' ':'').$sWord;
@@ -494,7 +494,10 @@ function _debugDumpGroupedSearches($aData, $aTokens)
         }
     }
     echo "<table border=\"1\">";
-    echo "<tr><th>rank</th><th>Name Tokens</th><th>Name Not</th><th>Address Tokens</th><th>Address Not</th><th>country</th><th>operator</th><th>class</th><th>type</th><th>house#</th><th>Lat</th><th>Lon</th><th>Radius</th></tr>";
+    echo "<tr><th>rank</th><th>Name Tokens</th><th>Name Not</th>";
+    echo "<th>Address Tokens</th><th>Address Not</th><th>country</th>";
+    echo "<th>operator</th><th>class</th><th>type</th><th>house#</th>";
+    echo "<th>Lat</th><th>Lon</th><th>Radius</th></tr>";
     foreach ($aData as $iRank => $aRankedSet) {
         foreach ($aRankedSet as $aRow) {
             echo "<tr>";
@@ -691,10 +694,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);