Merge remote-tracking branch 'upstream/master' into cmake-port

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 05093af388cfaf36ddd192290f3d96409d8af7d3..b523d0aaa9b54a726389691596d28eea5c2a9d31 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -2,42 +2,13 @@
        class ReverseGeocode
        {
                protected $oDB;
        class ReverseGeocode
        {
                protected $oDB;

-
-               protected $fLat;
-               protected $fLon;

                protected $iMaxRank = 28;
 
                protected $iMaxRank = 28;
 

-               protected $aLangPrefOrder = array();
-
-               protected $bIncludePolygonAsPoints = false;
-               protected $bIncludePolygonAsText = false;
-               protected $bIncludePolygonAsGeoJSON = false;
-               protected $bIncludePolygonAsKML = false;
-               protected $bIncludePolygonAsSVG = false;
-               protected $fPolygonSimplificationThreshold = 0.0;
-
-

                function ReverseGeocode(&$oDB)
                {
                        $this->oDB =& $oDB;
                }
 
                function ReverseGeocode(&$oDB)
                {
                        $this->oDB =& $oDB;
                }
 

-               function setLanguagePreference($aLangPref)
-               {
-                       $this->aLangPrefOrder = $aLangPref;
-               }
-
-               function setLatLon($fLat, $fLon)
-               {
-                       $this->fLat = (float)$fLat;
-                       $this->fLon = (float)$fLon;
-               }
-
-               function setRank($iRank)
-               {
-                       $this->iMaxRank = $iRank;
-               }
-

                function setZoom($iZoom)
                {
                        // Zoom to rank, this could probably be calculated but a lookup gives fine control
                function setZoom($iZoom)
                {
                        // Zoom to rank, this could probably be calculated but a lookup gives fine control


@@ -66,53 +37,12 @@
                        $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
                }
 
                        $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
                }
 

-                               function setIncludePolygonAsPoints($b = true)
-               {
-                       $this->bIncludePolygonAsPoints = $b;
-               }
-
-               function getIncludePolygonAsPoints()
-               {
-                       return $this->bIncludePolygonAsPoints;
-               }
-
-               function setIncludePolygonAsText($b = true)
-               {
-                       $this->bIncludePolygonAsText = $b;
-               }
-
-               function getIncludePolygonAsText()
-               {
-                       return $this->bIncludePolygonAsText;
-               }
-
-               function setIncludePolygonAsGeoJSON($b = true)
-               {
-                       $this->bIncludePolygonAsGeoJSON = $b;
-               }
-
-               function setIncludePolygonAsKML($b = true)
-               {
-                       $this->bIncludePolygonAsKML = $b;
-               }
-
-               function setIncludePolygonAsSVG($b = true)
-               {
-                       $this->bIncludePolygonAsSVG = $b;
-               }
-
-               function setPolygonSimplificationThreshold($f)
-               {
-                       $this->fPolygonSimplificationThreshold = $f;
-               }
-

                // returns { place_id =>, type => '(osm|tiger)' }
                // fails if no place was found
                // returns { place_id =>, type => '(osm|tiger)' }
                // fails if no place was found

-               function lookup()
+               function lookup($fLat, $fLon, $bDoInterpolation = true)

                {
                {

-                       $sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)';
+                       $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)';

                        $iMaxRank = $this->iMaxRank;
                        $iMaxRank = $this->iMaxRank;

-                       $iMaxRank_orig = $this->iMaxRank;

 
                        // Find the nearest point
                        $fSearchDiam = 0.0004;
 
                        // Find the nearest point
                        $fSearchDiam = 0.0004;


@@ -148,17 +78,14 @@
                                $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
                                $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
                                if (CONST_Debug) var_dump($sSQL);
                                $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
                                $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
                                if (CONST_Debug) var_dump($sSQL);

-                               $aPlace = $this->oDB->getRow($sSQL);
-                               if (PEAR::IsError($aPlace))
-                               {
-                                       failInternalError("Could not determine closest place.", $sSQL, $aPlace);
-                               }
+                               $aPlace = chksql($this->oDB->getRow($sSQL),
+                                                "Could not determine closest place.");

                                $iPlaceID = $aPlace['place_id'];
                                $iParentPlaceID = $aPlace['parent_place_id'];
                                $bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us');
                        }
                        // if a street or house was found, look in interpolation lines table
                                $iPlaceID = $aPlace['place_id'];
                                $iParentPlaceID = $aPlace['parent_place_id'];
                                $bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us');
                        }
                        // if a street or house was found, look in interpolation lines table

-                       if ($iMaxRank_orig >= 28 && $aPlace && $aPlace['rank_search'] >= 26)
+                       if ($bDoInterpolation && $this->iMaxRank >= 28 && $aPlace && $aPlace['rank_search'] >= 26)

                        {
                                // if a house was found, search the interpolation line that is at least as close as the house
                                $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction';
                        {
                                // if a house was found, search the interpolation line that is at least as close as the house
                                $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction';


@@ -172,17 +99,14 @@
                                        $sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL);
                                        var_dump($sSQL);
 
                                        $sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL);
                                        var_dump($sSQL);
 

-                                       $aAllHouses = $this->oDB->getAll($sSQL);
+                                       $aAllHouses = chksql($this->oDB->getAll($sSQL));

                                        foreach($aAllHouses as $i)
                                        {
                                                echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\n";
                                        }
                                }
                                        foreach($aAllHouses as $i)
                                        {
                                                echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\n";
                                        }
                                }

-                               $aPlaceLine = $this->oDB->getRow($sSQL);
-                               if (PEAR::IsError($aPlaceLine))
-                               {
-                                       failInternalError("Could not determine closest housenumber on an osm interpolation line.", $sSQL, $aPlaceLine);
-                               }
+                               $aPlaceLine = chksql($this->oDB->getRow($sSQL),
+                                                    "Could not determine closest housenumber on an osm interpolation line.");

                                if ($aPlaceLine)
                                {
                                        if (CONST_Debug) var_dump('found housenumber in interpolation lines table', $aPlaceLine);
                                if ($aPlaceLine)
                                {
                                        if (CONST_Debug) var_dump('found housenumber in interpolation lines table', $aPlaceLine);


@@ -192,20 +116,14 @@
                                                // if the placex house or the interpolated house are closer to the searched point
                                                // distance between point and placex house
                                                $sSQL = 'SELECT ST_distance('.$sPointSQL.', house.geometry) as distance FROM placex as house WHERE house.place_id='.$iPlaceID;
                                                // if the placex house or the interpolated house are closer to the searched point
                                                // distance between point and placex house
                                                $sSQL = 'SELECT ST_distance('.$sPointSQL.', house.geometry) as distance FROM placex as house WHERE house.place_id='.$iPlaceID;

-                                               $aDistancePlacex = $this->oDB->getRow($sSQL);
-                                               if (PEAR::IsError($aDistancePlacex))
-                                               {
-                                                       failInternalError("Could not determine distance between searched point and placex house.", $sSQL, $aDistancePlacex);
-                                               }
+                                               $aDistancePlacex = chksql($this->oDB->getRow($sSQL),
+                                                                         "Could not determine distance between searched point and placex house.");

                                                $fDistancePlacex = $aDistancePlacex['distance'];
                                                // distance between point and interpolated house (fraction on interpolation line)
                                                $sSQL = 'SELECT ST_distance('.$sPointSQL.', ST_LineInterpolatePoint(linegeo, '.$aPlaceLine['fraction'].')) as distance';
                                                $sSQL .= ' FROM location_property_osmline WHERE place_id = '.$aPlaceLine['place_id'];
                                                $fDistancePlacex = $aDistancePlacex['distance'];
                                                // distance between point and interpolated house (fraction on interpolation line)
                                                $sSQL = 'SELECT ST_distance('.$sPointSQL.', ST_LineInterpolatePoint(linegeo, '.$aPlaceLine['fraction'].')) as distance';
                                                $sSQL .= ' FROM location_property_osmline WHERE place_id = '.$aPlaceLine['place_id'];

-                                               $aDistanceInterpolation = $this->oDB->getRow($sSQL);
-                                               if (PEAR::IsError($aDistanceInterpolation))
-                                               {
-                                                       failInternalError("Could not determine distance between searched point and interpolated house.", $sSQL, $aDistanceInterpolation);
-                                               }
+                                               $aDistanceInterpolation = chksql($this->oDB->getRow($sSQL),
+                                                                                "Could not determine distance between searched point and interpolated house.");

                                                $fDistanceInterpolation = $aDistanceInterpolation['distance'];
                                                if ($fDistanceInterpolation < $fDistancePlacex)
                                                {
                                                $fDistanceInterpolation = $aDistanceInterpolation['distance'];
                                                if ($fDistanceInterpolation < $fDistancePlacex)
                                                {


@@ -215,6 +133,7 @@
                                                        $iPlaceID = $aPlaceLine['place_id'];
                                                        $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
                                                        $fFraction = $aPlaceLine['fraction'];
                                                        $iPlaceID = $aPlaceLine['place_id'];
                                                        $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
                                                        $fFraction = $aPlaceLine['fraction'];

+                                                       $iMaxRank = 30;

                                                }
                                                // else: nothing to do, take placex house from above
                                        }
                                                }
                                                // else: nothing to do, take placex house from above
                                        }


@@ -225,12 +144,13 @@
                                                $iPlaceID = $aPlaceLine['place_id'];
                                                $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
                                                $fFraction = $aPlaceLine['fraction'];
                                                $iPlaceID = $aPlaceLine['place_id'];
                                                $iParentPlaceID = $aPlaceLine['parent_place_id']; // the street
                                                $fFraction = $aPlaceLine['fraction'];

+                                               $iMaxRank = 30;

                                        }
                                }
                        }
                        
                        // 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 (CONST_Use_US_Tiger_Data && $bIsInUnitedStates && $iMaxRank_orig >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 ))
+                       if (CONST_Use_US_Tiger_Data && $bDoInterpolation && $bIsInUnitedStates && $this->iMaxRank >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 ))

                        {
                                $fSearchDiam = 0.001;
                                $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction';
                        {
                                $fSearchDiam = 0.001;
                                $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction';


@@ -244,18 +164,15 @@
                                        $sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL);
                                        var_dump($sSQL);
 
                                        $sSQL = preg_replace('/limit 1/', 'limit 100', $sSQL);
                                        var_dump($sSQL);
 

-                                       $aAllHouses = $this->oDB->getAll($sSQL);
+                                       $aAllHouses = chksql($this->oDB->getAll($sSQL));

                                        foreach($aAllHouses as $i)
                                        {
                                                echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\n";
                                        }
                                }
 
                                        foreach($aAllHouses as $i)
                                        {
                                                echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\n";
                                        }
                                }
 

-                               $aPlaceTiger = $this->oDB->getRow($sSQL);
-                               if (PEAR::IsError($aPlaceTiger))
-                               {
-                                       failInternalError("Could not determine closest Tiger place.", $sSQL, $aPlaceTiger);
-                               }
+                               $aPlaceTiger = chksql($this->oDB->getRow($sSQL),
+                                                     "Could not determine closest Tiger place.");

                                if ($aPlaceTiger)
                                {
                                        if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger);
                                if ($aPlaceTiger)
                                {
                                        if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger);


@@ -264,6 +181,7 @@
                                        $iPlaceID = $aPlaceTiger['place_id'];
                                        $iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street
                                        $fFraction = $aPlaceTiger['fraction'];
                                        $iPlaceID = $aPlaceTiger['place_id'];
                                        $iParentPlaceID = $aPlaceTiger['parent_place_id']; // the street
                                        $fFraction = $aPlaceTiger['fraction'];

+                                       $iMaxRank = 30;

                                }
                        }
 
                                }
                        }
 


@@ -279,18 +197,15 @@
                                $sSQL .= " WHERE place_id = $iPlaceID";
                                $sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc";
                                $sSQL .= ' LIMIT 1';
                                $sSQL .= " WHERE place_id = $iPlaceID";
                                $sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc";
                                $sSQL .= ' LIMIT 1';

-                               $iPlaceID = $this->oDB->getOne($sSQL);
-                               if (PEAR::IsError($iPlaceID))
-                               {
-                                       failInternalError("Could not get parent for place.", $sSQL, $iPlaceID);
-                               }
+                               $iPlaceID = chksql($this->oDB->getOne($sSQL),
+                                                  "Could not get parent for place.");

                                if (!$iPlaceID)
                                {
                                        $iPlaceID = $aPlace['place_id'];
                                }
                        }
                        return array('place_id' => $iPlaceID,
                                if (!$iPlaceID)
                                {
                                        $iPlaceID = $aPlace['place_id'];
                                }
                        }
                        return array('place_id' => $iPlaceID,

-                                               'type' => $bPlaceIsTiger ? 'tiger' : $bPlaceIsLine ? 'interpolation' : 'osm',
+                                               'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'),

                                                'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1);
                }
                
                                                'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1);
                }