Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index cb8c0c6bcf84b7febe7b17a053b12ab1cfd9fe8f..e40ce6cceaa23f2904be061914c46a3bdf73b718 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -9,8 +9,6 @@
 
                protected $aLangPrefOrder = array();
 
-               protected $bShowAddressDetails = true;
-
                function ReverseGeocode(&$oDB)
                {
                        $this->oDB =& $oDB;
@@ -21,11 +19,6 @@
                        $this->aLangPrefOrder = $aLangPref;
                }
 
-               function setIncludeAddressDetails($bAddressDetails = true)
-               {
-                       $this->bAddressDetails = $bAddressDetails;
-               }
-
                function setLatLon($fLat, $fLon)
                {
                        $this->fLat = (float)$fLat;
@@ -69,12 +62,15 @@
                {
                        $sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)';
                        $iMaxRank = $this->iMaxRank;
+                       $iMaxRank_orig = $this->iMaxRank;
 
                        // Find the nearest point
                        $fSearchDiam = 0.0004;
                        $iPlaceID = null;
                        $aArea = false;
                        $fMaxAreaDistance = 1;
+                       $bIsInUnitedStates = false;
+                       $bPlaceIsTiger = false;
                        while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance)
                        {
                                $fSearchDiam = $fSearchDiam * 2;
@@ -90,11 +86,11 @@
                                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)';
-                               $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\')';
+                               $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
                                $sSQL .= ' and indexed_status = 0 ';
                                $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
                                $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
@@ -107,12 +103,52 @@
                                }
                                $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 && $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 ';
+                               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']. ' | '. "<br>\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;
                                }
@@ -128,12 +164,8 @@
                                }
                        }
 
-                       $oPlaceLookup = new PlaceLookup($this->oDB);
-                       $oPlaceLookup->setLanguagePreference($this->aLangPrefOrder);
-                       $oPlaceLookup->setIncludeAddressDetails($this->bAddressDetails);
-                       $oPlaceLookup->setPlaceId($iPlaceID);
-
-                       return $oPlaceLookup->lookup();
+                       return array('place_id' => $iPlaceID,
+                                            'type' => $bPlaceIsTiger ? 'tiger' : 'osm');
                }
        }
 ?>