Merge pull request #436 from lonvia/remove-location-property-tables

[nominatim.git] / lib / PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index e29b6d0ae693aec509a40e590b145e0e09fbc514..c1fec6496ef66ca3118f7b214b2c7ee6f85a7173 100644 (file)
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -6,8 +6,8 @@
                protected $iPlaceID;
 
                protected $sType = false;
-        
-        protected $fTigerFraction =-1;
+
+               protected $fTigerFraction = -1;
 
                protected $aLangPrefOrder = array();
 
@@ -42,18 +42,12 @@
 
                function setIncludeExtraTags($bExtraTags = false)
                {
-                       if ((float) CONST_Postgresql_Version > 9.2)
-                       {
-                               $this->bExtraTags = $bExtraTags;
-                       }
+                       $this->bExtraTags = $bExtraTags;
                }
 
                function setIncludeNameDetails($bNameDetails = false)
                {
-                       if ((float) CONST_Postgresql_Version > 9.2)
-                       {
-                               $this->bNameDetails = $bNameDetails;
-                       }
+                       $this->bNameDetails = $bNameDetails;
                }
 
 
@@ -117,7 +111,7 @@
                        {
                                $this->setOSMID($details['osm_type'], $details['osm_id']);
                        }
-            if (isset($details['fraction'])) $this->fTigerFraction = $details['fraction'];
+                       if (isset($details['fraction'])) $this->fTigerFraction = $details['fraction'];
 
                        return $this->lookup();
                }
@@ -128,23 +122,23 @@
 
                        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
 
-                       if ($this->sType == 'tiger')
+                       if (CONST_Use_US_Tiger_Data && $this->sType == 'tiger')
                        {
                                $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, 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 .= " get_address_by_language(place_id, housenumber,$sLanguagePrefArraySQL) as langaddress,";
+                               $sSQL .= " get_address_by_language(place_id, housenumber, $sLanguagePrefArraySQL) as langaddress,";
                                $sSQL .= " null as placename,";
                                $sSQL .= " null as ref,";
                                if ($this->bExtraTags) $sSQL .= " null as extra,";
                                if ($this->bNameDetails) $sSQL .= " null as names,";
                                $sSQL .= " ST_X(point) as lon, ST_Y(point) as lat from (select *, ST_LineInterpolatePoint(linegeo, (housenumber-startnumber::float)/(endnumber-startnumber)::float) as point from ";
                                $sSQL .= " (select *, ";
-                $sSQL .= " CASE WHEN interpolationtype='odd' THEN floor((".$this->fTigerFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1";
-                $sSQL .= " WHEN interpolationtype='even' THEN ((".$this->fTigerFraction."*(endnumber-startnumber)+startnumber+1)/2)::int*2";
-                $sSQL .= " WHEN interpolationtype='all' THEN (".$this->fTigerFraction."*(endnumber-startnumber)+startnumber)::int";
-                $sSQL .= " END as housenumber";
-                $sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID.") as blub1) as blub2";
+                               $sSQL .= " CASE WHEN interpolationtype='odd' THEN floor((".$this->fTigerFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1";
+                               $sSQL .= " WHEN interpolationtype='even' THEN ((".$this->fTigerFraction."*(endnumber-startnumber)+startnumber+1)/2)::int*2";
+                               $sSQL .= " WHEN interpolationtype='all' THEN (".$this->fTigerFraction."*(endnumber-startnumber)+startnumber)::int";
+                               $sSQL .= " END as housenumber";
+                               $sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID.") as blub1) as blub2";
                        }
                        else
                        {
@@ -172,10 +166,10 @@
 
                        if ($this->bAddressDetails)
                        {
-                if($this->sType == 'tiger') // to get addressdetails for tiger data, the housenumber is needed
-                    $aAddress = $this->getAddressNames($aPlace['housenumber']);
-                else
-                    $aAddress = $this->getAddressNames();
+                               if(CONST_Use_US_Tiger_Data && $this->sType == 'tiger') // to get addressdetails for tiger data, the housenumber is needed
+                                       $aAddress = $this->getAddressNames($aPlace['housenumber']);
+                               else
+                                       $aAddress = $this->getAddressNames();
                                $aPlace['aAddress'] = $aAddress;
                        }