Merge pull request #2173 from lonvia/penality-for-housenumberless-places

Increase penalty for places without housenumber

diff --git a/lib-php/Geocode.php b/lib-php/Geocode.php
index 12f9da37550f856e47a128641a275813d9c4e9de..b475add22e8eefaf3cd85d0cbc85c46e7c66bc98 100644 (file)
--- a/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@ -778,7 +778,7 @@ class Geocode
                 if (!empty($aResults)) {
                     $aSplitResults = Result::splitResults($aResults);
                     Debug::printVar('Split results', $aSplitResults);
-                    if ($iGroupLoop <= 4 && empty($aSplitResults['tail'])
+                    if ($iGroupLoop <= 4
                         && reset($aSplitResults['head'])->iResultRank > 0) {
                         // Haven't found an exact match for the query yet.
                         // Therefore add result from the next group level.
@@ -786,6 +786,10 @@ class Geocode
                         foreach ($aNextResults as $oRes) {
                             $oRes->iResultRank--;
                         }
+                        foreach ($aSplitResults['tail'] as $oRes) {
+                            $oRes->iResultRank--;
+                            $aNextResults[$oRes->iId] = $oRes;
+                        }
                         $aResults = array();
                     } else {
                         $aResults = $aSplitResults['head'];

diff --git a/lib-php/Result.php b/lib-php/Result.php
index a67c2fe474910a20356ac05edafdac68e3168c17..a7747ea34d6fee12e98b0a7eb31c9fbaccfb7fb8 100644 (file)
--- a/lib-php/Result.php
+++ b/lib-php/Result.php
@@ -26,6 +26,8 @@ class Result
     public $iExactMatches = 0;
     /// Subranking within the results (the higher the worse).
     public $iResultRank = 0;
+    /// Address rank of the result.
+    public $iAddressRank;
 
     public function debugInfo()
     {
@@ -84,7 +86,7 @@ class Result
 
         foreach ($aResults as $oRes) {
             if ($oRes->iResultRank < $iMinRank) {
-                $aTail = array_merge($aTail, $aHead);
+                $aTail += $aHead;
                 $aHead = array($oRes->iId => $oRes);
                 $iMinRank = $oRes->iResultRank;
             } elseif ($oRes->iResultRank == $iMinRank) {

diff --git a/lib-php/SearchDescription.php b/lib-php/SearchDescription.php
index 2053082f6bbff4a13bd6a5ba6c08bc89366e0c38..ea9d7f58feb5dd06b453033f39ac1ec446f13e31 100644 (file)
--- a/lib-php/SearchDescription.php
+++ b/lib-php/SearchDescription.php
@@ -450,7 +450,11 @@ class SearchDescription
                 // Downgrade the rank of the street results, they are missing
                 // the housenumber.
                 foreach ($aResults as $oRes) {
-                    $oRes->iResultRank++;
+                    if ($oRes->iAddressRank >= 26) {
+                        $oRes->iResultRank++;
+                    } else {
+                        $oRes->iResultRank += 2;
+                    }
                 }
 
                 $aHnResults = $this->queryHouseNumber($oDB, $aResults);
@@ -715,7 +719,7 @@ class SearchDescription
         $aResults = array();
 
         if (!empty($aTerms)) {
-            $sSQL = 'SELECT place_id,'.$sExactMatchSQL;
+            $sSQL = 'SELECT place_id, address_rank,'.$sExactMatchSQL;
             $sSQL .= ' FROM search_name';
             $sSQL .= ' WHERE '.join(' and ', $aTerms);
             $sSQL .= ' ORDER BY '.join(', ', $aOrder);
@@ -728,6 +732,7 @@ class SearchDescription
             foreach ($aDBResults as $aResult) {
                 $oResult = new Result($aResult['place_id']);
                 $oResult->iExactMatches = $aResult['exactmatch'];
+                $oResult->iAddressRank = $aResult['address_rank'];
                 $aResults[$aResult['place_id']] = $oResult;
             }
         }

diff --git a/test/php/Nominatim/ResultTest.php b/test/php/Nominatim/ResultTest.php
new file mode 100644 (file)
index 0000000..c18aa76
--- /dev/null
+++ b/test/php/Nominatim/ResultTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Nominatim;
+
+require_once(CONST_LibDir.'/Result.php');
+
+function mkRankedResult($iId, $iResultRank)
+{
+    $oResult = new Result($iId);
+    $oResult->iResultRank = $iResultRank;
+
+    return $oResult;
+}
+
+
+class ResultTest extends \PHPUnit\Framework\TestCase
+{
+    public function testSplitResults()
+    {
+        $aSplitResults = Result::splitResults(array(
+            mkRankedResult(1, 2),
+            mkRankedResult(2, 0),
+            mkRankedResult(3, 0),
+            mkRankedResult(4, 2),
+            mkRankedResult(5, 1)
+        ));
+
+
+        $aHead = array_keys($aSplitResults['head']);
+        $aTail = array_keys($aSplitResults['tail']);
+
+        $this->assertEquals($aHead, array(2, 3));
+        $this->assertEquals($aTail, array(1, 4, 5));
+    }
+}