X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ea48e50c60e3d09030d95a005bd679985e708eca..d8703c223b50f87a6adb779311f651853e6d4e36:/lib/PlaceLookup.php diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index e0016337..55e0f11c 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -5,10 +5,18 @@ protected $iPlaceID; + protected $sType = false; + + protected $fTigerFraction =-1; + protected $aLangPrefOrder = array(); protected $bAddressDetails = false; + protected $bExtraTags = false; + + protected $bNameDetails = false; + function PlaceLookup(&$oDB) { $this->oDB =& $oDB; @@ -24,6 +32,22 @@ $this->bAddressDetails = $bAddressDetails; } + function setIncludeExtraTags($bExtraTags = false) + { + if ((float) CONST_Postgresql_Version > 9.2) + { + $this->bExtraTags = $bExtraTags; + } + } + + function setIncludeNameDetails($bNameDetails = false) + { + if ((float) CONST_Postgresql_Version > 9.2) + { + $this->bNameDetails = $bNameDetails; + } + } + function setPlaceID($iPlaceID) { $this->iPlaceID = $iPlaceID; @@ -35,29 +59,100 @@ $this->iPlaceID = $this->oDB->getOne($sSQL); } + function lookupPlace($details) + { + if (isset($details['place_id'])) $this->iPlaceID = $details['place_id']; + if (isset($details['type'])) $this->sType = $details['type']; + if (isset($details['osm_type']) && isset($details['osm_id'])) + { + $this->setOSMID($details['osm_type'], $details['osm_id']); + } + if (isset($details['fraction'])) $this->fTigerFraction = $details['fraction']; + + return $this->lookup(); + } + function lookup() { if (!$this->iPlaceID) return null; $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]"; - $sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, extratags, 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 .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,"; - $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,"; - $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,"; - $sSQL .= " st_y(centroid) as lat, st_x(centroid) as lon"; - $sSQL .= " from placex where place_id = ".(int)$this->iPlaceID; + if ($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 .= " 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"; + } + 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 .= " 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,"; + if ($this->bExtraTags) $sSQL .= " hstore_to_json(extratags) as extra,"; + if ($this->bNameDetails) $sSQL .= " hstore_to_json(name) as names,"; + $sSQL .= " (case when centroid is null then st_y(st_centroid(geometry)) else st_y(centroid) end) as lat,"; + $sSQL .= " (case when centroid is null then st_x(st_centroid(geometry)) else st_x(centroid) end) as lon"; + $sSQL .= " from placex where place_id = ".(int)$this->iPlaceID; + } + $aPlace = $this->oDB->getRow($sSQL); + + if (PEAR::IsError($aPlace)) + { + failInternalError("Could not lookup place.", $sSQL, $aPlace); + } + if (!$aPlace['place_id']) return null; if ($this->bAddressDetails) { - $aAddress = $this->getAddressNames(); + if($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; } + if ($this->bExtraTags) + { + if ($aPlace['extra']) + { + $aPlace['sExtraTags'] = json_decode($aPlace['extra']); + } + else + { + $aPlace['sExtraTags'] = (object) array(); + } + } + + if ($this->bNameDetails) + { + if ($aPlace['names']) + { + $aPlace['sNameDetails'] = json_decode($aPlace['names']); + } + else + { + $aPlace['sNameDetails'] = (object) array(); + } + } + $aClassType = getClassTypes(); $sAddressType = ''; $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']; @@ -78,13 +173,13 @@ return $aPlace; } - function getAddressDetails($bAll = false) + function getAddressDetails($bAll = false, $housenumber = -1) { if (!$this->iPlaceID) return null; $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]"; - $sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata(".$this->iPlaceID.")"; + $sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata(".$this->iPlaceID.",".$housenumber.")"; if (!$bAll) $sSQL .= " WHERE isaddress OR type = 'country_code'"; $sSQL .= " order by rank_address desc,isaddress desc"; @@ -97,9 +192,9 @@ return $aAddressLines; } - function getAddressNames() + function getAddressNames($housenumber = -1) { - $aAddressLines = $this->getAddressDetails(false);; + $aAddressLines = $this->getAddressDetails(false, $housenumber); $aAddress = array(); $aFallback = array();