X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e94b667e16177916dc34d790df475a69fe01a7d9..4f9f21f661685d4b14654253dacb09848b16d69c:/lib/PlaceLookup.php diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index f62ca627..94e414dc 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -7,7 +7,7 @@ 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; } @@ -133,7 +127,7 @@ $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,";