Merge remote-tracking branch 'upstream/master'

diff --combined lib/Geocode.php
index 3c53777735039137771024752caa0d7454c43481,aef2d3841cc5f4eec9d4e060baf002700e463f1f..f142731dac0f3233d96d59c12b86b967081a898c
--- 1/lib/Geocode.php
--- 2/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -25,7 -25,7 +25,7 @@@ class Geocod
  
      protected $aExcludePlaceIDs = array();
      protected $bDeDupe = true;
 -    protected $bReverseInPlan = false;
 +    protected $bReverseInPlan = true;
  
      protected $iLimit = 20;
      protected $iFinalLimit = 10;
@@@ -1387,20 -1387,19 +1387,20 @@@
                          // TODO: filter out the pointless search terms (2 letter name tokens and less)
                          // they might be right - but they are just too darned expensive to run
                          if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'], ",")."]";
 -                        if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'], ",")."]";
 +                        //if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'], ",")."]";
                          if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress']) {
                              // For infrequent name terms disable index usage for address
                              if (CONST_Search_NameOnlySearchFrequencyThreshold
                                  && sizeof($aSearch['aName']) == 1
                                  && $aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold
                              ) {
 -                                $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'], $aSearch['aAddressNonSearch']), ",")."]";
 +                                //$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'], $aSearch['aAddressNonSearch']), ",")."]";
 +                                $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddress'],",")."]";
                              } else {
                                  $aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'], ",")."]";
 -                                if (sizeof($aSearch['aAddressNonSearch'])) {
 +                                /*if (sizeof($aSearch['aAddressNonSearch'])) {
                                      $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'], ",")."]";
 -                                }
 +                                }*/
                              }
                          }
                          if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
@@@ -1739,9 -1738,11 +1739,11 @@@
                      // Need to verify passes rank limits before dropping out of the loop (yuk!)
                      // reduces the number of place ids, like a filter
                      // rank_address is 30 for interpolated housenumbers
+                     $sWherePlaceId = 'WHERE place_id in (';
+                     $sWherePlaceId .= join(',', array_keys($aResultPlaceIDs)).') ';
+ 
                      $sSQL = "SELECT place_id ";
-                     $sSQL .= "FROM placex ";
-                     $sSQL .= "WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).") ";
+                     $sSQL .= "FROM placex ".$sWherePlaceId;
                      $sSQL .= "  AND (";
                      $sSQL .= "         placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
                      if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
@@@ -1750,18 -1751,22 +1752,22 @@@
                      if ($this->aAddressRankList) {
                          $sSQL .= "     OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
                      }
-                     $sSQL .= "  ) ";
+                     $sSQL .= "  ) UNION ";
+                     $sSQL .= " SELECT place_id FROM location_postcode lp ".$sWherePlaceId;
+                     $sSQL .= "  AND (lp.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
+                     if ($this->aAddressRankList) {
+                         $sSQL .= "     OR lp.rank_address in (".join(',', $this->aAddressRankList).")";
+                     }
+                     $sSQL .= ") ";
                      if (CONST_Use_US_Tiger_Data && $this->iMaxAddressRank == 30) {
                          $sSQL .= "UNION ";
                          $sSQL .= "  SELECT place_id ";
-                         $sSQL .= "  FROM location_property_tiger ";
-                         $sSQL .= "  WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).") ";
+                         $sSQL .= "  FROM location_property_tiger ".$sWherePlaceId;
                      }
                      if ($this->iMaxAddressRank == 30) {
                          $sSQL .= "UNION ";
                          $sSQL .= "  SELECT place_id ";
-                         $sSQL .= "  FROM location_property_osmline ";
-                         $sSQL .= "  WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).")";
+                         $sSQL .= "  FROM location_property_osmline ".$sWherePlaceId;
                      }
                      if (CONST_Debug) var_dump($sSQL);
                      $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));