apply Sarah's pull request feedback

diff --git a/AUTHORS b/AUTHORS
index 2246d4882d8786ce589a01a976f06b4e02966fb8..b90e705714e4702a4714845c05fdd55a8551e73c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,5 +16,4 @@ Nominatim was written by:
   Rodolphe Quiédeville
   Marc Tobias Metten
 
-Reverse geocoding using Tiger data sponsored by
-  Linux training company, Guru Labs (https://www.gurulabs.com)
+Reverse geocoding using Tiger data feature made possible with support from Guru Labs

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 2041b136dc6b5280828b28909f1c7850165e145f..ae83af1e90a710aa0341cbd427210c781d70205d 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -69,6 +69,7 @@
                {
                        $sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)';
                        $iMaxRank = $this->iMaxRank;
+                       $iMaxRank_orig = $this->iMaxRank;
 
                        // Find the nearest point
                        $fSearchDiam = 0.0004;
@@ -112,9 +113,8 @@
                                $bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us');
                        }
 
-
                        // Only street found? If it's in the US we can check TIGER data for nearest housenumber
-                       if ($bIsInUnitedStates && $iPlaceID && $aPlace['rank_search'] == 26) 
+                       if ($bIsInUnitedStates && $iMaxRank_orig >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 )) 
                        {
                                $fSearchDiam = 0.001;
                                $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search ';

diff --git a/tests/features/api/reverse.feature b/tests/features/api/reverse.feature
index 32aff61ceff9d863458cf63db3a25b15827664bb..2486b013b06def133e869dbd827761798abd9901 100644 (file)
--- a/tests/features/api/reverse.feature
+++ b/tests/features/api/reverse.feature
@@ -16,18 +16,10 @@ Feature: Reverse geocoding
         Given the request parameters
           | addressdetails
           | 1
-        When looking up jsonv2 coordinates 40.6863624710666,-112.060005720023
-        # Then exactly 1 result is returned
-        # Then result addresses contain
-        # | ID | house_number | road               | postcode | country_code
-        # | 0  | 7094         | Kings Estate Drive | 84128    | us
-        Then results contain
-          | type | house
-        And results contain
-          | addresstype | place
-        And results contain
-          | road | Kings Estate Drive
-        And results contain
-          | house_number | 7094
-        And results contain
-          | postcode | 84128
+        When looking up coordinates 40.6863624710666,-112.060005720023
+        And exactly 1 result is returned
+        And result addresses contain
+          | ID | house_number | road               | postcode | country_code
+          | 0  | 7094         | Kings Estate Drive | 84128    | us
+        And result 0 has not attributes osm_id,osm_type
+