From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 2 Oct 2016 12:23:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~421
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/35df2bb75eae78f38b347f26862fa4cb8284d574?ds=inline;hp=-c

Merge remote-tracking branch 'upstream/master'
---

35df2bb75eae78f38b347f26862fa4cb8284d574
diff --combined lib/Geocode.php
index a3066b7c,ec7728d2..54e738ff
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -24,7 -24,7 +24,7 @@@ class Geocod
  
      protected $aExcludePlaceIDs = array();
      protected $bDeDupe = true;
 -    protected $bReverseInPlan = false;
 +    protected $bReverseInPlan = true;
  
      protected $iLimit = 20;
      protected $iFinalLimit = 10;
@@@ -1152,20 -1152,19 +1152,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'])."'";
@@@ -1481,6 -1480,7 +1481,7 @@@
  
              if ($aLookup['place_id']) {
                  $aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1));
+                 $aResultPlaceIDs[$aLookup['place_id']] = -1;
              } else {
                  $aSearchResults = array();
              }
diff --combined tests/features/api/search_params.feature
index 7cb597a8,de6bd53d..cd0db091
--- a/tests/features/api/search_params.feature
+++ b/tests/features/api/search_params.feature
@@@ -35,6 -35,12 +35,12 @@@ Feature: Search querie
            | country      | Canada
            | country_code | ca
  
+     Scenario: coordinate search with addressdetails
+         When sending json search query "51.193058013916,15.5245780944824" with address
+         Then result addresses contain
+           | village    | country | country_code
+           | Kraszowice | Polska  | pl
+ 
      Scenario: Address details with unknown class types
          When sending json search query "foobar, Essen" with address
          Then results contain
@@@ -84,7 -90,7 +90,7 @@@
      Scenario: bounded search remains within viewbox, even with no results
          Given the request parameters
           | bounded | viewbox
 -         | 1       | 43.54285,-5.662003,43.5403125,-5.6563282
 +         | 1       | 43.5403125,-5.6563282,43.54285,-5.662003
           When sending json search query "restaurant"
          Then less than 1 result is returned