fix inconsistency between getNearestNamendRoadFeature() and house number search

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 998e0429740107343ad939e625bdf44fe3701bfe..96d2c048fcae7d2b91ca2224a9b55805dcd335e8 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -165,18 +165,20 @@
        }
 
 
-       function getWordSets($aWords)
+       function getWordSets($aWords, $iDepth)
        {
                $aResult = array(array(join(' ',$aWords)));
                $sFirstToken = '';
-               while(sizeof($aWords) > 1)
-               {
-                       $sWord = array_shift($aWords);
-                       $sFirstToken .= ($sFirstToken?' ':'').$sWord;
-                       $aRest = getWordSets($aWords);
-                       foreach($aRest as $aSet)
+               if ($iDepth < 8) {
+                       while(sizeof($aWords) > 1)
                        {
-                               $aResult[] = array_merge(array($sFirstToken),$aSet);
+                               $sWord = array_shift($aWords);
+                               $sFirstToken .= ($sFirstToken?' ':'').$sWord;
+                               $aRest = getWordSets($aWords, $iDepth+1);
+                               foreach($aRest as $aSet)
+                               {
+                                       $aResult[] = array_merge(array($sFirstToken),$aSet);
+                               }
                        }
                }
                return $aResult;