Merge remote-tracking branch 'upstream/master'

diff --combined lib/Geocode.php
index eb6152aa3470cc5962c5eaa5c3cdba29aaecf9cd,a5b9d4859423e3929460e8a50295915b596f2a6a..5acb01d04c39ae6de406ea6b8d383b31363a27e2
--- 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;
@@@ -304,7 -304,7 +304,7 @@@
          $aViewbox = $oParams->getStringList('viewboxlbrt');
          if ($aViewbox) {
              if (count($aViewbox) != 4) {
-                 userError("Bad parmater 'viewbox'. Expected 4 coordinates.");
+                 userError("Bad parmater 'viewboxlbrt'. Expected 4 coordinates.");
              }
              $this->setViewbox($aViewbox);
          } else {
@@@ -372,7 -372,7 +372,7 @@@
          $this->aAddressRankList = array();
  
          $this->aStructuredQuery = array();
-         $this->sAllowedTypesSQLList = '';
+         $this->sAllowedTypesSQLList = False;
  
          $this->loadStructuredAddressElement($sAmenity, 'amenity', 26, 30, false);
          $this->loadStructuredAddressElement($sStreet, 'street', 26, 30, false);
@@@ -385,7 -385,7 +385,7 @@@
          if (sizeof($this->aStructuredQuery) > 0) {
              $this->sQuery = join(', ', $this->aStructuredQuery);
              if ($this->iMaxAddressRank < 30) {
-                 $sAllowedTypesSQLList = '(\'place\',\'boundary\')';
+                 $this->sAllowedTypesSQLList = '(\'place\',\'boundary\')';
              }
          }
      }
@@@ -1021,15 -1021,24 +1021,24 @@@
  
              // Any 'special' terms in the search?
              $bSpecialTerms = false;
-             preg_match_all('/\\[(.*)=(.*)\\]/', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
-             $aSpecialTerms = array();
+             preg_match_all('/\\[([\\w_]*)=([\\w_]*)\\]/', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
              foreach ($aSpecialTermsRaw as $aSpecialTerm) {
                  $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
-                 $aSpecialTerms[strtolower($aSpecialTerm[1])] = $aSpecialTerm[2];
+                 if (!$bSpecialTerms) {
+                     $aNewSearches = array();
+                     foreach ($aSearches as $aSearch) {
+                         $aNewSearch = $aSearch;
+                         $aNewSearch['sClass'] = $aSpecialTerm[1];
+                         $aNewSearch['sType'] = $aSpecialTerm[2];
+                         $aNewSearches[] = $aNewSearch;
+                     }
+ 
+                     $aSearches = $aNewSearches;
+                     $bSpecialTerms = true;
+                 }
              }
  
              preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
-             $aSpecialTerms = array();
              if (isset($this->aStructuredQuery['amenity']) && $this->aStructuredQuery['amenity']) {
                  $aSpecialTermsRaw[] = array('['.$this->aStructuredQuery['amenity'].']', $this->aStructuredQuery['amenity']);
                  unset($this->aStructuredQuery['amenity']);
@@@ -1037,6 -1046,10 +1046,10 @@@
  
              foreach ($aSpecialTermsRaw as $aSpecialTerm) {
                  $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
+                 if ($bSpecialTerms) {
+                     continue;
+                 }
+ 
                  $sToken = chksql($this->oDB->getOne("SELECT make_standard_name('".$aSpecialTerm[1]."') AS string"));
                  $sSQL = 'SELECT * ';
                  $sSQL .= 'FROM ( ';
@@@ -1044,25 -1057,17 +1057,17 @@@
                  $sSQL .= '   FROM word ';
                  $sSQL .= '   WHERE word_token in (\' '.$sToken.'\')';
                  $sSQL .= ') AS x ';
-                 $sSQL .= ' WHERE (class is not null AND class not in (\'place\')) ';
-                 $sSQL .= ' OR country_code is not null';
+                 $sSQL .= ' WHERE (class is not null AND class not in (\'place\'))';
                  if (CONST_Debug) var_Dump($sSQL);
                  $aSearchWords = chksql($this->oDB->getAll($sSQL));
                  $aNewSearches = array();
                  foreach ($aSearches as $aSearch) {
                      foreach ($aSearchWords as $aSearchTerm) {
                          $aNewSearch = $aSearch;
-                         if ($aSearchTerm['country_code']) {
-                             $aNewSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
-                             $aNewSearches[] = $aNewSearch;
-                             $bSpecialTerms = true;
-                         }
-                         if ($aSearchTerm['class']) {
-                             $aNewSearch['sClass'] = $aSearchTerm['class'];
-                             $aNewSearch['sType'] = $aSearchTerm['type'];
-                             $aNewSearches[] = $aNewSearch;
-                             $bSpecialTerms = true;
-                         }
+                         $aNewSearch['sClass'] = $aSearchTerm['class'];
+                         $aNewSearch['sType'] = $aSearchTerm['type'];
+                         $aNewSearches[] = $aNewSearch;
+                         $bSpecialTerms = true;
                      }
                  }
                  $aSearches = $aNewSearches;
@@@ -1269,8 -1274,8 +1274,8 @@@
                      }
  
                      // No location term?
-                     if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['oNear']) {
-                         if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber']) {
+                     if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress'])) {
+                         if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber'] && !$aSearch['oNear']) {
                              // Just looking for a country by code - look it up
                              if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank) {
                                  $sSQL = "SELECT place_id FROM placex WHERE country_code='".$aSearch['sCountryCode']."' AND rank_search = 4";
@@@ -1290,39 -1295,32 +1295,32 @@@
                              if (chksql($this->oDB->getOne($sSQL))) {
                                  $sSQL = "SELECT place_id FROM place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
                                  if ($sCountryCodesSQL) $sSQL .= " JOIN placex USING (place_id)";
-                                 $sSQL .= " WHERE st_contains($this->sViewboxSmallSQL, ct.centroid)";
+                                 if ($aSearch['oNear']) {
+                                     $sSQL .= " WHERE ".$aSearch['oNear']->withinSQL('ct.centroid');
+                                 } else {
+                                     $sSQL .= " WHERE st_contains($this->sViewboxSmallSQL, ct.centroid)";
+                                 }
                                  if ($sCountryCodesSQL) $sSQL .= " AND country_code in ($sCountryCodesSQL)";
                                  if (sizeof($this->aExcludePlaceIDs)) {
                                      $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";
                                  }
-                                 if ($this->sViewboxCentreSQL) $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, ct.centroid) ASC";
+                                 if ($this->sViewboxCentreSQL) {
+                                     $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, ct.centroid) ASC";
+                                 } elseif ($aSearch['oNear']) {
+                                     $sSQL .= " ORDER BY ".$aSearch['oNear']->distanceSQL('ct.centroid').' ASC';
+                                 }
                                  $sSQL .= " limit $this->iLimit";
                                  if (CONST_Debug) var_dump($sSQL);
                                  $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
- 
-                                 // If excluded place IDs are given, it is fair to assume that
-                                 // there have been results in the small box, so no further
-                                 // expansion in that case.
-                                 // Also don't expand if bounded results were requested.
-                                 if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs) && !$this->bBoundedSearch) {
-                                     $sSQL = "SELECT place_id FROM place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
-                                     if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
-                                     $sSQL .= " WHERE ST_Contains($this->sViewboxLargeSQL, ct.centroid)";
-                                     if ($sCountryCodesSQL) $sSQL .= " AND country_code in ($sCountryCodesSQL)";
-                                     if ($this->sViewboxCentreSQL) $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, ct.centroid) ASC";
-                                     $sSQL .= " LIMIT $this->iLimit";
-                                     if (CONST_Debug) var_dump($sSQL);
-                                     $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
-                                 }
-                             } else {
+                             } else if ($aSearch['oNear']) {
                                  $sSQL = "SELECT place_id ";
                                  $sSQL .= "FROM placex ";
                                  $sSQL .= "WHERE class='".$aSearch['sClass']."' ";
                                  $sSQL .= "  AND type='".$aSearch['sType']."'";
-                                 $sSQL .= "  AND ST_Contains($this->sViewboxSmallSQL, geometry) ";
+                                 $sSQL .= "  AND ".$aSearch['oNear']->withinSQL('geometry');
                                  $sSQL .= "  AND linked_place_id is null";
                                  if ($sCountryCodesSQL) $sSQL .= " AND country_code in ($sCountryCodesSQL)";
-                                 if ($this->sViewboxCentreSQL)   $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, centroid) ASC";
+                                 $sSQL .= " ORDER BY ".$aSearch['oNear']->distanceSQL('centroid')." ASC";
                                  $sSQL .= " LIMIT $this->iLimit";
                                  if (CONST_Debug) var_dump($sSQL);
                                  $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
@@@ -1385,26 -1383,25 +1383,26 @@@
                          // 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'])."'";
                          if ($aSearch['sHouseNumber']) {
                              $aTerms[] = "address_rank between 16 and 27";
-                         } else {
+                         } elseif (!$aSearch['sClass'] || $aSearch['sOperator'] == 'name') {
                              if ($this->iMinAddressRank > 0) {
                                  $aTerms[] = "address_rank >= ".$this->iMinAddressRank;
                              }
@@@ -1647,7 -1644,7 +1645,7 @@@
                                          } elseif ($sPlaceIDs) {
                                              $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)";
                                          } elseif ($sPlaceGeom) {
-                                             $sOrderBysSQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
+                                             $sOrderBySQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
                                          }
  
                                          $sSQL = "select distinct i.place_id".($sOrderBySQL?', i.order_term':'')." from (";
@@@ -1683,7 -1680,7 +1681,7 @@@
                                              $sOrderBySQL = "ST_Distance(l.geometry, f.geometry)";
                                          }
  
-                                         $sSQL = "SELECT distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'');
+                                         $sSQL = "SELECT distinct l.place_id".($sOrderBySQL?','.$sOrderBySQL:'');
                                          $sSQL .= " FROM placex as l, placex as f ";
                                          $sSQL .= " WHERE f.place_id in ($sPlaceIDs) ";
                                          $sSQL .= "  AND ST_DWithin(l.geometry, f.centroid, $fRange) ";
@@@ -1693,7 -1690,7 +1691,7 @@@
                                              $sSQL .= " AND l.place_id not in (".join(',', $this->aExcludePlaceIDs).")";
                                          }
                                          if ($sCountryCodesSQL) $sSQL .= " AND l.country_code in ($sCountryCodesSQL)";
-                                         if ($sOrderBy) $sSQL .= "ORDER BY ".$OrderBysSQL." ASC";
+                                         if ($sOrderBySQL) $sSQL .= "ORDER BY ".$sOrderBySQL." ASC";
                                          if ($this->iOffset) $sSQL .= " OFFSET $this->iOffset";
                                          $sSQL .= " limit $this->iLimit";
                                          if (CONST_Debug) var_dump($sSQL);

diff --combined lib/lib.php
index 28b44c50bde19b63209291c0e47adaf3385bd704,a5439ef25a9dd39fd41ed2a843e9bbb45b4fa1dc..b7564c7f7b42e70e8b6b4b2c2fde805b69bc9a13
--- 1/lib/lib.php
--- 2/lib/lib.php
+++ b/lib/lib.php
@@@ -545,8 -545,8 +545,8 @@@ function _debugDumpGroupedSearches($aDa
              echo "<td>".$aRow['sPostcode']."</td>";
              echo "<td>".$aRow['sHouseNumber']."</td>";
  
-             echo "<td>".$aRow['fLat']."</td>";
-             echo "<td>".$aRow['fLon']."</td>";
+             echo "<td>".$aRow['oNear']->lat()."</td>";
+             echo "<td>".$aRow['oNear']->lon()."</td>";
              echo "<td>".$aRow['fRadius']."</td>";
  
              echo "</tr>";
@@@ -613,10 -613,10 +613,10 @@@ function geometryText2Points($geometry_
          //
          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);