remove commented-out lines

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index ae83af1e90a710aa0341cbd427210c781d70205d..e40ce6cceaa23f2904be061914c46a3bdf73b718 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -9,8 +9,6 @@
 
                protected $aLangPrefOrder = array();
 
 
                protected $aLangPrefOrder = array();
 

-               protected $bShowAddressDetails = true;
-

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


@@ -21,11 +19,6 @@
                        $this->aLangPrefOrder = $aLangPref;
                }
 
                        $this->aLangPrefOrder = $aLangPref;
                }
 

-               function setIncludeAddressDetails($bAddressDetails = true)
-               {
-                       $this->bAddressDetails = $bAddressDetails;
-               }
-

                function setLatLon($fLat, $fLon)
                {
                        $this->fLat = (float)$fLat;
                function setLatLon($fLat, $fLon)
                {
                        $this->fLat = (float)$fLat;


@@ -97,7 +90,7 @@
                                $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 .= ' 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.'))';
                                $sSQL .= ' and indexed_status = 0 ';
                                $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
                                $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';


@@ -171,13 +164,8 @@
                                }
                        }
 
                                }
                        }
 

-                       $oPlaceLookup = new PlaceLookup($this->oDB);
-                       $oPlaceLookup->setLanguagePreference($this->aLangPrefOrder);
-                       $oPlaceLookup->setIncludeAddressDetails($this->bAddressDetails);
-                       $oPlaceLookup->setPlaceId($iPlaceID);
-                       $oPlaceLookup->setIsTiger($bPlaceIsTiger);
-
-                       return $oPlaceLookup->lookup();
+                       return array('place_id' => $iPlaceID,
+                                            'type' => $bPlaceIsTiger ? 'tiger' : 'osm');

                }
        }
 ?>
                }
        }
 ?>