Merge pull request #802 from mtmail/coordinate-extract-missing-first-minus-sign

[nominatim.git] / lib / PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 431a30afd5a877d0cd4d01dde02615403d553ef5..40d003fa7c593fc81e3aee0c62c258f8613850c4 100644 (file)
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -1,5 +1,7 @@
 <?php
 
 <?php
 

+namespace Nominatim;
+

 class PlaceLookup
 {
     protected $oDB;
 class PlaceLookup
 {
     protected $oDB;


@@ -18,73 +20,73 @@ class PlaceLookup
     protected $fPolygonSimplificationThreshold = 0.0;
 
 
     protected $fPolygonSimplificationThreshold = 0.0;
 
 

-    function PlaceLookup(&$oDB)
+    public function __construct(&$oDB)

     {
         $this->oDB =& $oDB;
     }
 
     {
         $this->oDB =& $oDB;
     }
 

-    function setLanguagePreference($aLangPrefOrder)
+    public function setLanguagePreference($aLangPrefOrder)

     {
         $this->aLangPrefOrder = $aLangPrefOrder;
     }
 
     {
         $this->aLangPrefOrder = $aLangPrefOrder;
     }
 

-    function setIncludeAddressDetails($bAddressDetails = true)
+    public function setIncludeAddressDetails($bAddressDetails = true)

     {
         $this->bAddressDetails = $bAddressDetails;
     }
 
     {
         $this->bAddressDetails = $bAddressDetails;
     }
 

-    function setIncludeExtraTags($bExtraTags = false)
+    public function setIncludeExtraTags($bExtraTags = false)

     {
         $this->bExtraTags = $bExtraTags;
     }
 
     {
         $this->bExtraTags = $bExtraTags;
     }
 

-    function setIncludeNameDetails($bNameDetails = false)
+    public function setIncludeNameDetails($bNameDetails = false)

     {
         $this->bNameDetails = $bNameDetails;
     }
 
 
     {
         $this->bNameDetails = $bNameDetails;
     }
 
 

-    function setIncludePolygonAsPoints($b = true)
+    public function setIncludePolygonAsPoints($b = true)

     {
         $this->bIncludePolygonAsPoints = $b;
     }
 
     {
         $this->bIncludePolygonAsPoints = $b;
     }
 

-    function getIncludePolygonAsPoints()
+    public function getIncludePolygonAsPoints()

     {
         return $this->bIncludePolygonAsPoints;
     }
 
     {
         return $this->bIncludePolygonAsPoints;
     }
 

-    function setIncludePolygonAsText($b = true)
+    public function setIncludePolygonAsText($b = true)

     {
         $this->bIncludePolygonAsText = $b;
     }
 
     {
         $this->bIncludePolygonAsText = $b;
     }
 

-    function getIncludePolygonAsText()
+    public function getIncludePolygonAsText()

     {
         return $this->bIncludePolygonAsText;
     }
 
     {
         return $this->bIncludePolygonAsText;
     }
 

-    function setIncludePolygonAsGeoJSON($b = true)
+    public function setIncludePolygonAsGeoJSON($b = true)

     {
         $this->bIncludePolygonAsGeoJSON = $b;
     }
 
     {
         $this->bIncludePolygonAsGeoJSON = $b;
     }
 

-    function setIncludePolygonAsKML($b = true)
+    public function setIncludePolygonAsKML($b = true)

     {
         $this->bIncludePolygonAsKML = $b;
     }
 
     {
         $this->bIncludePolygonAsKML = $b;
     }
 

-    function setIncludePolygonAsSVG($b = true)
+    public function setIncludePolygonAsSVG($b = true)

     {
         $this->bIncludePolygonAsSVG = $b;
     }
 
     {
         $this->bIncludePolygonAsSVG = $b;
     }
 

-    function setPolygonSimplificationThreshold($f)
+    public function setPolygonSimplificationThreshold($f)

     {
         $this->fPolygonSimplificationThreshold = $f;
     }
 
     {
         $this->fPolygonSimplificationThreshold = $f;
     }
 

-    function lookupOSMID($sType, $iID)
+    public function lookupOSMID($sType, $iID)

     {
         $sSQL = "select place_id from placex where osm_type = '".pg_escape_string($sType)."' and osm_id = ".(int)$iID." order by type = 'postcode' asc";
         $iPlaceID = chksql($this->oDB->getOne($sSQL));
     {
         $sSQL = "select place_id from placex where osm_type = '".pg_escape_string($sType)."' and osm_id = ".(int)$iID." order by type = 'postcode' asc";
         $iPlaceID = chksql($this->oDB->getOne($sSQL));


@@ -92,7 +94,7 @@ class PlaceLookup
         return $this->lookup((int)$iPlaceID);
     }
 
         return $this->lookup((int)$iPlaceID);
     }
 

-    function lookup($iPlaceID, $sType = '', $fInterpolFraction = 0.0)
+    public function lookup($iPlaceID, $sType = '', $fInterpolFraction = 0.0)

     {
         if (!$iPlaceID) return null;
 
     {
         if (!$iPlaceID) return null;
 


@@ -101,9 +103,9 @@ class PlaceLookup
         $bIsInterpolation = $sType == 'interpolation';
 
         if ($bIsTiger) {
         $bIsInterpolation = $sType == 'interpolation';
 
         if ($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 = "select place_id,partition, 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, housenumber, postcode,";

             $sSQL .= " 'us' as country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
             $sSQL .= " 'us' as country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";

-            $sSQL .= " coalesce(null,0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, 'us' as calculated_country_code, ";
+            $sSQL .= " coalesce(null,0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, 'us' as country_code, ";

             $sSQL .= " get_address_by_language(place_id, housenumber, $sLanguagePrefArraySQL) as langaddress,";
             $sSQL .= " null as placename,";
             $sSQL .= " null as ref,";
             $sSQL .= " get_address_by_language(place_id, housenumber, $sLanguagePrefArraySQL) as langaddress,";
             $sSQL .= " null as placename,";
             $sSQL .= " null as ref,";


@@ -117,9 +119,9 @@ class PlaceLookup
             $sSQL .= " END as housenumber";
             $sSQL .= " from location_property_tiger where place_id = ".$iPlaceID.") as blub1) as blub2";
         } elseif ($bIsInterpolation) {
             $sSQL .= " END as housenumber";
             $sSQL .= " from location_property_tiger where place_id = ".$iPlaceID.") as blub1) as blub2";
         } elseif ($bIsInterpolation) {

-            $sSQL = "select place_id, partition, 'W' as osm_type, osm_id, 'place' as class, 'house' as type, null admin_level, housenumber, null as street, null as isin, postcode,";
-            $sSQL .= " calculated_country_code as country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
-            $sSQL .= " (0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, calculated_country_code, ";
+            $sSQL = "select place_id, partition, 'W' as osm_type, osm_id, 'place' as class, 'house' as type, null admin_level, housenumber, postcode,";
+            $sSQL .= " country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
+            $sSQL .= " (0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, country_code, ";

             $sSQL .= " get_address_by_language(place_id, housenumber, $sLanguagePrefArraySQL) as langaddress,";
             $sSQL .= " null as placename,";
             $sSQL .= " null as ref,";
             $sSQL .= " get_address_by_language(place_id, housenumber, $sLanguagePrefArraySQL) as langaddress,";
             $sSQL .= " null as placename,";
             $sSQL .= " null as ref,";


@@ -136,8 +138,10 @@ class PlaceLookup
             // but this will never happen, because if the searched point is that close to the endnumber, the endnumber house will be directly taken from placex (in ReverseGeocode.php line 220)
             // and not interpolated
         } else {
             // but this will never happen, because if the searched point is that close to the endnumber, the endnumber house will be directly taken from placex (in ReverseGeocode.php line 220)
             // and not interpolated
         } else {

-            $sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, parent_place_id, linked_place_id, rank_address, rank_search, ";
-            $sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, calculated_country_code, ";
+            $sSQL = "select placex.place_id, partition, osm_type, osm_id, class,";
+            $sSQL .= " type, admin_level, housenumber, postcode, country_code,";
+            $sSQL .= " parent_place_id, linked_place_id, rank_address, rank_search, ";
+            $sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, country_code, ";

             $sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) as langaddress,";
             $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
             $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
             $sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) as langaddress,";
             $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
             $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";


@@ -191,7 +195,7 @@ class PlaceLookup
         return $aPlace;
     }
 
         return $aPlace;
     }
 

-    function getAddressDetails($iPlaceID, $bAll = false, $housenumber = -1)
+    public function getAddressDetails($iPlaceID, $bAll = false, $housenumber = -1)

     {
         $sLanguagePrefArraySQL = "ARRAY[".join(',', array_map("getDBQuoted", $this->aLangPrefOrder))."]";
 
     {
         $sLanguagePrefArraySQL = "ARRAY[".join(',', array_map("getDBQuoted", $this->aLangPrefOrder))."]";
 


@@ -202,7 +206,7 @@ class PlaceLookup
         return chksql($this->oDB->getAll($sSQL));
     }
 
         return chksql($this->oDB->getAll($sSQL));
     }
 

-    function getAddressNames($iPlaceID, $housenumber = -1)
+    public function getAddressNames($iPlaceID, $housenumber = -1)

     {
         $aAddressLines = $this->getAddressDetails($iPlaceID, false, $housenumber);
 
     {
         $aAddressLines = $this->getAddressDetails($iPlaceID, false, $housenumber);
 


@@ -237,16 +241,19 @@ class PlaceLookup
 
 
 
 
 
 

-    // returns an array which will contain the keys
-    //   aBoundingBox
-    // and may also contain one or more of the keys
-    //   asgeojson
-    //   askml
-    //   assvg
-    //   astext
-    //   lat
-    //   lon
-    function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = null)
+    /* returns an array which will contain the keys
+     *   aBoundingBox
+     * and may also contain one or more of the keys
+     *   asgeojson
+     *   askml
+     *   assvg
+     *   astext
+     *   lat
+     *   lon
+     */
+
+
+    public function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = null)

     {
 
         $aOutlineResult = array();
     {
 
         $aOutlineResult = array();


@@ -301,7 +308,7 @@ class PlaceLookup
                                                    (string)$aPointPolygon['maxlon']
                                                   );
             }
                                                    (string)$aPointPolygon['maxlon']
                                                   );
             }

-        } // CONST_Search_AreaPolygons
+        }

 
         // as a fallback we generate a bounding box without knowing the size of the geometry
         if ((!isset($aOutlineResult['aBoundingBox'])) && isset($fLon)) {
 
         // as a fallback we generate a bounding box without knowing the size of the geometry
         if ((!isset($aOutlineResult['aBoundingBox'])) && isset($fLon)) {