From: Marc Tobias Metten Date: Tue, 28 Apr 2015 19:07:34 +0000 (+0200) Subject: during reverse geocode lookup we also check the (optional) Tiger data for house numbers X-Git-Tag: v.2.5.0~60^2~2 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/9746629fd39c7f8de93b60716673cbcc4e75d231 during reverse geocode lookup we also check the (optional) Tiger data for house numbers --- diff --git a/AUTHORS b/AUTHORS index ea48a49c..2246d488 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,3 +15,6 @@ Nominatim was written by: Kurt Roeckx Rodolphe Quiédeville Marc Tobias Metten + +Reverse geocoding using Tiger data sponsored by + Linux training company, Guru Labs (https://www.gurulabs.com) diff --git a/ChangeLog b/ChangeLog index f8c4bb69..d6002d43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ + * reverse geocoding looking includes looking up Tiger data + + 2.4 * drop support for postgres 8.4 diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index 6da82fd8..2169983a 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -5,6 +5,8 @@ protected $iPlaceID; + protected $bIsTiger = false; + protected $aLangPrefOrder = array(); protected $bAddressDetails = false; @@ -35,6 +37,11 @@ $this->iPlaceID = $this->oDB->getOne($sSQL); } + function setIsTiger($b = false) + { + $this->bIsTiger = $b; + } + function lookup() { if (!$this->iPlaceID) return null; @@ -49,12 +56,29 @@ $sSQL .= " (case when centroid is null then st_y(st_centroid(geometry)) else st_y(centroid) end) as lat,"; $sSQL .= " (case when centroid is null then st_x(st_centroid(geometry)) else st_x(centroid) end) as lon"; $sSQL .= " from placex where place_id = ".(int)$this->iPlaceID; + + + if ($this->bIsTiger) + { + $sSQL = "select place_id,partition, 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, housenumber, null as street, null as isin, postcode,"; + $sSQL .= " 'us' as country_code, null as extratags, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,"; + $sSQL .= " coalesce(0,0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, 'us' as calculated_country_code, "; + $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,"; + $sSQL .= " null as placename,"; + $sSQL .= " null as ref,"; + $sSQL .= " st_y(centroid) as lat,"; + $sSQL .= " st_x(centroid) as lon"; + $sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID; + } + $aPlace = $this->oDB->getRow($sSQL); + if (PEAR::IsError($aPlace)) { failInternalError("Could not lookup place.", $sSQL, $aPlace); } + if (!$aPlace['place_id']) return null; if ($this->bAddressDetails) @@ -63,6 +87,7 @@ $aPlace['aAddress'] = $aAddress; } + $aClassType = getClassTypes(); $sAddressType = ''; $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']; diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index cb8c0c6b..2041b136 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -75,6 +75,8 @@ $iPlaceID = null; $aArea = false; $fMaxAreaDistance = 1; + $bIsInUnitedStates = false; + $bPlaceIsTiger = false; while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance) { $fSearchDiam = $fSearchDiam * 2; @@ -90,7 +92,7 @@ if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22; if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26; - $sSQL = 'select place_id,parent_place_id,rank_search from placex'; + $sSQL = 'select place_id,parent_place_id,rank_search,calculated_country_code from placex'; $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; $sSQL .= ' and rank_search != 28 and rank_search >= '.$iMaxRank; $sSQL .= ' and (name is not null or housenumber is not null)'; @@ -107,12 +109,53 @@ } $iPlaceID = $aPlace['place_id']; $iParentPlaceID = $aPlace['parent_place_id']; + $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) + { + $fSearchDiam = 0.001; + $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search '; + if (CONST_Debug) { $sSQL .= ', housenumber, ST_distance('.$sPointSQL.', centroid) as distance, st_y(centroid) as lat, st_x(centroid) as lon'; } + $sSQL .= ' FROM location_property_tiger WHERE parent_place_id = '.$iPlaceID; + $sSQL .= ' AND ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.')'; + $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', centroid) ASC limit 1'; + + + // print all house numbers in the parent (street) + if (CONST_Debug) + { + $sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL); + var_dump($sSQL); + + $aAllHouses = $this->oDB->getAll($sSQL); + foreach($aAllHouses as $i) + { + echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "
\n"; + } + } + + $aPlaceTiger = $this->oDB->getRow($sSQL); + if (PEAR::IsError($aPlace)) + { + failInternalError("Could not determine closest Tiger place.", $sSQL, $aPlaceTiger); + } + if ($aPlaceTiger) + { + if (CONST_Debug) var_dump('found Tiger place', $aPlaceTiger); + $bPlaceIsTiger = true; + $aPlace = $aPlaceTiger; + $iPlaceID = $aPlaceTiger['place_id']; + $iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street + } } // The point we found might be too small - use the address to find what it is a child of if ($iPlaceID && $iMaxRank < 28) { - if ($aPlace['rank_search'] > 28 && $iParentPlaceID) + if ($aPlace['rank_search'] > 28 && $iParentPlaceID && !$bPlaceIsTiger) { $iPlaceID = $iParentPlaceID; } @@ -132,6 +175,7 @@ $oPlaceLookup->setLanguagePreference($this->aLangPrefOrder); $oPlaceLookup->setIncludeAddressDetails($this->bAddressDetails); $oPlaceLookup->setPlaceId($iPlaceID); + $oPlaceLookup->setIsTiger($bPlaceIsTiger); return $oPlaceLookup->lookup(); } diff --git a/tests/features/api/reverse.feature b/tests/features/api/reverse.feature index b46ab2cd..32aff61c 100644 --- a/tests/features/api/reverse.feature +++ b/tests/features/api/reverse.feature @@ -11,3 +11,23 @@ Feature: Reverse geocoding | ID | country | 0 | Deutschland + @Tiger + Scenario: TIGER house number + 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