From 2e1590ed89e16eea79c9c1f140b979b2533ea212 Mon Sep 17 00:00:00 2001
From: Marc Tobias Metten <mtmail@gmx.net>
Date: Wed, 29 Apr 2015 01:34:32 +0200
Subject: [PATCH] apply Sarah's pull request feedback

---
 AUTHORS                            |  3 +--
 lib/ReverseGeocode.php             |  4 ++--
 tests/features/api/reverse.feature | 22 +++++++---------------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2246d488..b90e7057 100644
--- 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 2041b136..ae83af1e 100644
--- 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 32aff61c..2486b013 100644
--- 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
+