Merge remote-tracking branch 'upstream/master'

diff --git a/lib/Geocode.php b/lib/Geocode.php
index a3066b7c858087cfbe837ea21fbda547afc02457..54e738ff5aa90e7ece10478c3f5588a7c55509b9 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1481,6 +1481,7 @@ class Geocode
 
             if ($aLookup['place_id']) {
                 $aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1));
+                $aResultPlaceIDs[$aLookup['place_id']] = -1;
             } else {
                 $aSearchResults = array();
             }

diff --git a/tests/features/api/search_params.feature b/tests/features/api/search_params.feature
index 7cb597a86e1835759af15badd02c17c607cb6526..cd0db091e44a4669ec15757c6585cafc887361d3 100644 (file)
--- a/tests/features/api/search_params.feature
+++ b/tests/features/api/search_params.feature
@@ -35,6 +35,12 @@ Feature: Search queries
           | 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