Merge pull request #2332 from lonvia/fix-keyword-details

[nominatim.git] / lib-php / Result.php

diff --git a/lib-php/Result.php b/lib-php/Result.php
index a67c2fe474910a20356ac05edafdac68e3168c17..be103074040da27e56dfc9a914baa868cc3da8e3 100644 (file)
--- a/lib-php/Result.php
+++ b/lib-php/Result.php
@@ -13,8 +13,7 @@ class Result
     const TABLE_PLACEX = 0;
     const TABLE_POSTCODE = 1;
     const TABLE_OSMLINE = 2;
     const TABLE_PLACEX = 0;
     const TABLE_POSTCODE = 1;
     const TABLE_OSMLINE = 2;

-    const TABLE_AUX = 3;
-    const TABLE_TIGER = 4;
+    const TABLE_TIGER = 3;

 
     /// Database table that contains the result.
     public $iTable;
 
     /// Database table that contains the result.
     public $iTable;


@@ -26,6 +25,8 @@ class Result
     public $iExactMatches = 0;
     /// Subranking within the results (the higher the worse).
     public $iResultRank = 0;
     public $iExactMatches = 0;
     /// Subranking within the results (the higher the worse).
     public $iResultRank = 0;

+    /// Address rank of the result.
+    public $iAddressRank;

 
     public function debugInfo()
     {
 
     public function debugInfo()
     {


@@ -84,7 +85,7 @@ class Result
 
         foreach ($aResults as $oRes) {
             if ($oRes->iResultRank < $iMinRank) {
 
         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) {
                 $aHead = array($oRes->iId => $oRes);
                 $iMinRank = $oRes->iResultRank;
             } elseif ($oRes->iResultRank == $iMinRank) {