apply Sarah's pull request feedback

This commit is contained in:
Marc Tobias Metten 2015-04-29 01:34:32 +02:00
parent 2a3672c19b
commit 2e1590ed89
3 changed files with 10 additions and 19 deletions

View File

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

View File

@ -69,6 +69,7 @@
{ {
$sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)'; $sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)';
$iMaxRank = $this->iMaxRank; $iMaxRank = $this->iMaxRank;
$iMaxRank_orig = $this->iMaxRank;
// Find the nearest point // Find the nearest point
$fSearchDiam = 0.0004; $fSearchDiam = 0.0004;
@ -112,9 +113,8 @@
$bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us'); $bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us');
} }
// Only street found? If it's in the US we can check TIGER data for nearest housenumber // 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; $fSearchDiam = 0.001;
$sSQL = 'SELECT place_id,parent_place_id,30 as rank_search '; $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search ';

View File

@ -16,18 +16,10 @@ Feature: Reverse geocoding
Given the request parameters Given the request parameters
| addressdetails | addressdetails
| 1 | 1
When looking up jsonv2 coordinates 40.6863624710666,-112.060005720023 When looking up coordinates 40.6863624710666,-112.060005720023
# Then exactly 1 result is returned And exactly 1 result is returned
# Then result addresses contain And result addresses contain
# | ID | house_number | road | postcode | country_code | ID | house_number | road | postcode | country_code
# | 0 | 7094 | Kings Estate Drive | 84128 | us | 0 | 7094 | Kings Estate Drive | 84128 | us
Then results contain And result 0 has not attributes osm_id,osm_type
| 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