X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/bb1c3f23abe70a618851bdda27e8410b59ab7faf..9908c93d4cec91b5109d4fbc83dde18b5076350f:/lib/PlaceLookup.php diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index eff66fd1..46b17882 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -2,11 +2,14 @@ namespace Nominatim; +require_once(CONST_BasePath.'/lib/AddressDetails.php'); +require_once(CONST_BasePath.'/lib/Result.php'); + class PlaceLookup { protected $oDB; - protected $aLangPrefOrder = array(); + protected $aLangPrefOrderSql = "''"; protected $bAddressDetails = false; protected $bExtraTags = false; @@ -19,227 +22,449 @@ class PlaceLookup protected $bIncludePolygonAsSVG = false; protected $fPolygonSimplificationThreshold = 0.0; + protected $sAnchorSql = null; + protected $sAddressRankListSql = null; + protected $sAllowedTypesSQLList = null; + protected $bDeDupe = true; + public function __construct(&$oDB) { $this->oDB =& $oDB; } - public function setLanguagePreference($aLangPrefOrder) + public function doDeDupe() { - $this->aLangPrefOrder = $aLangPrefOrder; + return $this->bDeDupe; } - public function setIncludeAddressDetails($bAddressDetails = true) + public function setIncludePolygonAsPoints($b = true) { - $this->bAddressDetails = $bAddressDetails; + $this->bIncludePolygonAsPoints = $b; } - public function setIncludeExtraTags($bExtraTags = false) + public function setIncludeAddressDetails($b) { - $this->bExtraTags = $bExtraTags; + $this->bAddressDetails = $b; } - public function setIncludeNameDetails($bNameDetails = false) + public function loadParamArray($oParams, $sGeomType = null) { - $this->bNameDetails = $bNameDetails; - } + $aLangs = $oParams->getPreferredLanguages(); + $this->aLangPrefOrderSql = + 'ARRAY['.join(',', array_map('getDBQuoted', $aLangs)).']'; + $this->bExtraTags = $oParams->getBool('extratags', false); + $this->bNameDetails = $oParams->getBool('namedetails', false); - public function setIncludePolygonAsPoints($b = true) - { - $this->bIncludePolygonAsPoints = $b; + $this->bDeDupe = $oParams->getBool('dedupe', $this->bDeDupe); + + if ($sGeomType === null || $sGeomType == 'geojson') { + $this->bIncludePolygonAsGeoJSON = $oParams->getBool('polygon_geojson'); + $this->bIncludePolygonAsPoints = false; + } + + if ($oParams->getString('format', '') !== 'geojson') { + if ($sGeomType === null || $sGeomType == 'text') { + $this->bIncludePolygonAsText = $oParams->getBool('polygon_text'); + } + if ($sGeomType === null || $sGeomType == 'kml') { + $this->bIncludePolygonAsKML = $oParams->getBool('polygon_kml'); + } + if ($sGeomType === null || $sGeomType == 'svg') { + $this->bIncludePolygonAsSVG = $oParams->getBool('polygon_svg'); + } + } + $this->fPolygonSimplificationThreshold + = $oParams->getFloat('polygon_threshold', 0.0); + + $iWantedTypes = + ($this->bIncludePolygonAsText ? 1 : 0) + + ($this->bIncludePolygonAsGeoJSON ? 1 : 0) + + ($this->bIncludePolygonAsKML ? 1 : 0) + + ($this->bIncludePolygonAsSVG ? 1 : 0); + if ($iWantedTypes > CONST_PolygonOutput_MaximumTypes) { + if (CONST_PolygonOutput_MaximumTypes) { + userError('Select only '.CONST_PolygonOutput_MaximumTypes.' polgyon output option'); + } else { + userError('Polygon output is disabled'); + } + } } - public function getIncludePolygonAsPoints() + public function getMoreUrlParams() { - return $this->bIncludePolygonAsPoints; + $aParams = array(); + + if ($this->bAddressDetails) $aParams['addressdetails'] = '1'; + if ($this->bExtraTags) $aParams['extratags'] = '1'; + if ($this->bNameDetails) $aParams['namedetails'] = '1'; + + if ($this->bIncludePolygonAsPoints) $aParams['polygon'] = '1'; + if ($this->bIncludePolygonAsText) $aParams['polygon_text'] = '1'; + if ($this->bIncludePolygonAsGeoJSON) $aParams['polygon_geojson'] = '1'; + if ($this->bIncludePolygonAsKML) $aParams['polygon_kml'] = '1'; + if ($this->bIncludePolygonAsSVG) $aParams['polygon_svg'] = '1'; + + if ($this->fPolygonSimplificationThreshold > 0.0) { + $aParams['polygon_threshold'] = $this->fPolygonSimplificationThreshold; + } + + if (!$this->bDeDupe) $aParams['dedupe'] = '0'; + + return $aParams; } - public function setIncludePolygonAsText($b = true) + public function setAnchorSql($sPoint) { - $this->bIncludePolygonAsText = $b; + $this->sAnchorSql = $sPoint; } - public function getIncludePolygonAsText() + public function setAddressRankList($aList) { - return $this->bIncludePolygonAsText; + $this->sAddressRankListSql = '('.join(',', $aList).')'; } - public function setIncludePolygonAsGeoJSON($b = true) + public function setAllowedTypesSQLList($sSql) { - $this->bIncludePolygonAsGeoJSON = $b; + $this->sAllowedTypesSQLList = $sSql; } - public function setIncludePolygonAsKML($b = true) + public function setLanguagePreference($aLangPrefOrder) { - $this->bIncludePolygonAsKML = $b; + $this->aLangPrefOrderSql = + 'ARRAY['.join(',', array_map('getDBQuoted', $aLangPrefOrder)).']'; } - public function setIncludePolygonAsSVG($b = true) + private function addressImportanceSql($sGeometry, $sPlaceId) { - $this->bIncludePolygonAsSVG = $b; + if ($this->sAnchorSql) { + $sSQL = 'ST_Distance('.$this->sAnchorSql.','.$sGeometry.')'; + } else { + $sSQL = '(SELECT max(ai_p.importance * (ai_p.rank_address + 2))'; + $sSQL .= ' FROM place_addressline ai_s, placex ai_p'; + $sSQL .= ' WHERE ai_s.place_id = '.$sPlaceId; + $sSQL .= ' AND ai_p.place_id = ai_s.address_place_id '; + $sSQL .= ' AND ai_s.isaddress '; + $sSQL .= ' AND ai_p.importance is not null)'; + } + + return $sSQL.' AS addressimportance,'; } - public function setPolygonSimplificationThreshold($f) + private function langAddressSql($sHousenumber) { - $this->fPolygonSimplificationThreshold = $f; + if ($this->bAddressDetails) + return ''; // langaddress will be computed from address details + + return 'get_address_by_language(place_id,'.$sHousenumber.','.$this->aLangPrefOrderSql.') AS langaddress,'; } 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"; + $sSQL = "select place_id from placex where osm_type = '".$sType."' and osm_id = ".$iID; $iPlaceID = chksql($this->oDB->getOne($sSQL)); - return $this->lookup((int)$iPlaceID); - } - - public function lookup($iPlaceID, $sType = '', $fInterpolFraction = 0.0) - { - if (!$iPlaceID) return null; - - $sLanguagePrefArraySQL = "ARRAY[".join(',', array_map("getDBQuoted", $this->aLangPrefOrder))."]"; - $bIsTiger = CONST_Use_US_Tiger_Data && $sType == 'tiger'; - $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 .= " '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((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1"; - $sSQL .= " WHEN interpolationtype='even' THEN ((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2"; - $sSQL .= " WHEN interpolationtype='all' THEN (".$fInterpolFraction."*(endnumber-startnumber)+startnumber)::int"; - $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 .= " 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((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1"; - $sSQL .= " WHEN interpolationtype='even' THEN ((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2"; - $sSQL .= " WHEN interpolationtype='all' THEN (".$fInterpolFraction."*(endnumber-startnumber)+startnumber)::int"; - $sSQL .= " END as housenumber"; - $sSQL .= " from location_property_osmline where place_id = ".$iPlaceID.") as blub1) as blub2"; - // testcase: interpolationtype=odd, startnumber=1000, endnumber=1006, fInterpolFraction=1 => housenumber=1007 => error in st_lineinterpolatepoint - // 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,"; - $sSQL .= " type, admin_level, housenumber, street, isin, 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, 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 = ".$iPlaceID; + if (!$iPlaceID) { + return null; } - $aPlace = chksql($this->oDB->getRow($sSQL), "Could not lookup place"); + $aResults = $this->lookup(array($iPlaceID => new Result($iPlaceID))); - if (!$aPlace['place_id']) return null; + return empty($aResults) ? null : reset($aResults); + } - if ($this->bAddressDetails) { - // to get addressdetails for tiger data, the housenumber is needed - $iHousenumber = ($bIsTiger || $bIsInterpolation) ? $aPlace['housenumber'] : -1; - $aPlace['aAddress'] = $this->getAddressNames($aPlace['place_id'], $iHousenumber); - } + public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30) + { + Debug::newFunction('Place lookup'); - if ($this->bExtraTags) { - if ($aPlace['extra']) { - $aPlace['sExtraTags'] = json_decode($aPlace['extra']); - } else { - $aPlace['sExtraTags'] = (object) array(); - } + if (empty($aResults)) { + return array(); } - - if ($this->bNameDetails) { - if ($aPlace['names']) { - $aPlace['sNameDetails'] = json_decode($aPlace['names']); - } else { - $aPlace['sNameDetails'] = (object) array(); + $aSubSelects = array(); + + $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX); + if ($sPlaceIDs) { + Debug::printVar('Ids from placex', $sPlaceIDs); + $sSQL = 'SELECT '; + $sSQL .= ' osm_type,'; + $sSQL .= ' osm_id,'; + $sSQL .= ' class,'; + $sSQL .= ' type,'; + $sSQL .= ' admin_level,'; + $sSQL .= ' rank_search,'; + $sSQL .= ' rank_address,'; + $sSQL .= ' min(place_id) AS place_id,'; + $sSQL .= ' min(parent_place_id) AS parent_place_id,'; + $sSQL .= ' -1 as housenumber,'; + $sSQL .= ' country_code,'; + $sSQL .= $this->langAddressSql('-1'); + $sSQL .= ' get_name_by_language(name,'.$this->aLangPrefOrderSql.') AS placename,'; + $sSQL .= " get_name_by_language(name, ARRAY['ref']) AS ref,"; + if ($this->bExtraTags) { + $sSQL .= 'hstore_to_json(extratags)::text AS extra,'; + } + if ($this->bNameDetails) { + $sSQL .= 'hstore_to_json(name)::text AS names,'; + } + $sSQL .= ' avg(ST_X(centroid)) AS lon, '; + $sSQL .= ' avg(ST_Y(centroid)) AS lat, '; + $sSQL .= ' COALESCE(importance,0.75-(rank_search::float/40)) AS importance, '; + $sSQL .= $this->addressImportanceSql( + 'ST_Collect(centroid)', + 'min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)' + ); + $sSQL .= " (extratags->'place') AS extra_place "; + $sSQL .= ' FROM placex'; + $sSQL .= " WHERE place_id in ($sPlaceIDs) "; + $sSQL .= ' AND ('; + $sSQL .= " placex.rank_address between $iMinRank and $iMaxRank "; + if (14 >= $iMinRank && 14 <= $iMaxRank) { + $sSQL .= " OR (extratags->'place') = 'city'"; } + if ($this->sAddressRankListSql) { + $sSQL .= ' OR placex.rank_address in '.$this->sAddressRankListSql; + } + $sSQL .= ' ) '; + if ($this->sAllowedTypesSQLList) { + $sSQL .= 'AND placex.class in '.$this->sAllowedTypesSQLList; + } + $sSQL .= ' AND linked_place_id is null '; + $sSQL .= ' GROUP BY '; + $sSQL .= ' osm_type, '; + $sSQL .= ' osm_id, '; + $sSQL .= ' class, '; + $sSQL .= ' type, '; + $sSQL .= ' admin_level, '; + $sSQL .= ' rank_search, '; + $sSQL .= ' rank_address, '; + $sSQL .= ' housenumber,'; + $sSQL .= ' country_code, '; + $sSQL .= ' importance, '; + if (!$this->bDeDupe) $sSQL .= 'place_id,'; + if (!$this->bAddressDetails) $sSQL .= 'langaddress, '; + $sSQL .= ' placename, '; + $sSQL .= ' ref, '; + if ($this->bExtraTags) $sSQL .= 'extratags, '; + if ($this->bNameDetails) $sSQL .= 'name, '; + $sSQL .= " extratags->'place' "; + + $aSubSelects[] = $sSQL; } - $aClassType = getClassTypes(); - $sAddressType = ''; - $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']; - if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel'])) { - $sAddressType = $aClassType[$aClassType]['simplelabel']; - } else { - $sClassType = $aPlace['class'].':'.$aPlace['type']; - if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel'])) - $sAddressType = $aClassType[$sClassType]['simplelabel']; - else $sAddressType = $aPlace['class']; + // postcode table + $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_POSTCODE); + if ($sPlaceIDs) { + Debug::printVar('Ids from location_postcode', $sPlaceIDs); + $sSQL = 'SELECT'; + $sSQL .= " 'P' as osm_type,"; + $sSQL .= ' (SELECT osm_id from placex p WHERE p.place_id = lp.parent_place_id) as osm_id,'; + $sSQL .= " 'place' as class, 'postcode' as type,"; + $sSQL .= ' null::smallint as admin_level, rank_search, rank_address,'; + $sSQL .= ' place_id, parent_place_id,'; + $sSQL .= ' -1 as housenumber,'; + $sSQL .= ' country_code,'; + $sSQL .= $this->langAddressSql('-1'); + $sSQL .= ' postcode as placename,'; + $sSQL .= ' postcode as ref,'; + if ($this->bExtraTags) $sSQL .= 'null::text AS extra,'; + if ($this->bNameDetails) $sSQL .= 'null::text AS names,'; + $sSQL .= ' ST_x(geometry) AS lon, ST_y(geometry) AS lat,'; + $sSQL .= ' (0.75-(rank_search::float/40)) AS importance, '; + $sSQL .= $this->addressImportanceSql('geometry', 'lp.parent_place_id'); + $sSQL .= ' null::text AS extra_place '; + $sSQL .= 'FROM location_postcode lp'; + $sSQL .= " WHERE place_id in ($sPlaceIDs) "; + $sSQL .= " AND lp.rank_address between $iMinRank and $iMaxRank"; + + $aSubSelects[] = $sSQL; } - $aPlace['addresstype'] = $sAddressType; + // All other tables are rank 30 only. + if ($iMaxRank == 30) { + // TIGER table + if (CONST_Use_US_Tiger_Data) { + $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_TIGER); + if ($sPlaceIDs) { + Debug::printVar('Ids from Tiger table', $sPlaceIDs); + $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_TIGER); + // Tiger search only if a housenumber was searched and if it was found + // (realized through a join) + $sSQL = ' SELECT '; + $sSQL .= " 'T' AS osm_type, "; + $sSQL .= ' (SELECT osm_id from placex p WHERE p.place_id=blub.parent_place_id) as osm_id, '; + $sSQL .= " 'place' AS class, "; + $sSQL .= " 'house' AS type, "; + $sSQL .= ' null::smallint AS admin_level, '; + $sSQL .= ' 30 AS rank_search, '; + $sSQL .= ' 30 AS rank_address, '; + $sSQL .= ' place_id, '; + $sSQL .= ' parent_place_id, '; + $sSQL .= ' housenumber_for_place as housenumber,'; + $sSQL .= " 'us' AS country_code, "; + $sSQL .= $this->langAddressSql('housenumber_for_place'); + $sSQL .= ' null::text AS placename, '; + $sSQL .= ' null::text AS ref, '; + if ($this->bExtraTags) $sSQL .= 'null::text AS extra,'; + if ($this->bNameDetails) $sSQL .= 'null::text AS names,'; + $sSQL .= ' st_x(centroid) AS lon, '; + $sSQL .= ' st_y(centroid) AS lat,'; + $sSQL .= ' -1.15 AS importance, '; + $sSQL .= $this->addressImportanceSql('centroid', 'blub.parent_place_id'); + $sSQL .= ' null::text AS extra_place '; + $sSQL .= ' FROM ('; + $sSQL .= ' SELECT place_id, '; // interpolate the Tiger housenumbers here + $sSQL .= ' ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) AS centroid, '; + $sSQL .= ' parent_place_id, '; + $sSQL .= ' housenumber_for_place'; + $sSQL .= ' FROM ('; + $sSQL .= ' location_property_tiger '; + $sSQL .= ' JOIN (values '.$sHousenumbers.') AS housenumbers(place_id, housenumber_for_place) USING(place_id)) '; + $sSQL .= ' WHERE '; + $sSQL .= ' housenumber_for_place >= startnumber'; + $sSQL .= ' AND housenumber_for_place <= endnumber'; + $sSQL .= ' ) AS blub'; //postgres wants an alias here + + $aSubSelects[] = $sSQL; + } + } - return $aPlace; - } + // osmline - interpolated housenumbers + $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_OSMLINE); + if ($sPlaceIDs) { + Debug::printVar('Ids from interpolation', $sPlaceIDs); + $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_OSMLINE); + // interpolation line search only if a housenumber was searched + // (realized through a join) + $sSQL = 'SELECT '; + $sSQL .= " 'W' AS osm_type, "; + $sSQL .= ' osm_id, '; + $sSQL .= " 'place' AS class, "; + $sSQL .= " 'house' AS type, "; + $sSQL .= ' null::smallint AS admin_level, '; + $sSQL .= ' 30 AS rank_search, '; + $sSQL .= ' 30 AS rank_address, '; + $sSQL .= ' place_id, '; + $sSQL .= ' parent_place_id, '; + $sSQL .= ' housenumber_for_place as housenumber,'; + $sSQL .= ' country_code, '; + $sSQL .= $this->langAddressSql('housenumber_for_place'); + $sSQL .= ' null::text AS placename, '; + $sSQL .= ' null::text AS ref, '; + if ($this->bExtraTags) $sSQL .= 'null::text AS extra, '; + if ($this->bNameDetails) $sSQL .= 'null::text AS names, '; + $sSQL .= ' st_x(centroid) AS lon, '; + $sSQL .= ' st_y(centroid) AS lat, '; + // slightly smaller than the importance for normal houses + $sSQL .= ' -0.1 AS importance, '; + $sSQL .= $this->addressImportanceSql('centroid', 'blub.parent_place_id'); + $sSQL .= ' null::text AS extra_place '; + $sSQL .= ' FROM ('; + $sSQL .= ' SELECT '; + $sSQL .= ' osm_id, '; + $sSQL .= ' place_id, '; + $sSQL .= ' country_code, '; + $sSQL .= ' CASE '; // interpolate the housenumbers here + $sSQL .= ' WHEN startnumber != endnumber '; + $sSQL .= ' THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) '; + $sSQL .= ' ELSE ST_LineInterpolatePoint(linegeo, 0.5) '; + $sSQL .= ' END as centroid, '; + $sSQL .= ' parent_place_id, '; + $sSQL .= ' housenumber_for_place '; + $sSQL .= ' FROM ('; + $sSQL .= ' location_property_osmline '; + $sSQL .= ' JOIN (values '.$sHousenumbers.') AS housenumbers(place_id, housenumber_for_place) USING(place_id)'; + $sSQL .= ' ) '; + $sSQL .= ' WHERE housenumber_for_place >= 0 '; + $sSQL .= ' ) as blub'; //postgres wants an alias here + + $aSubSelects[] = $sSQL; + } - public function getAddressDetails($iPlaceID, $bAll = false, $housenumber = -1) - { - $sLanguagePrefArraySQL = "ARRAY[".join(',', array_map("getDBQuoted", $this->aLangPrefOrder))."]"; + if (CONST_Use_Aux_Location_data) { + $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_AUX); + if ($sPlaceIDs) { + $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_AUX); + $sSQL = ' SELECT '; + $sSQL .= " 'L' AS osm_type, "; + $sSQL .= ' place_id AS osm_id, '; + $sSQL .= " 'place' AS class,"; + $sSQL .= " 'house' AS type, "; + $sSQL .= ' null::smallint AS admin_level, '; + $sSQL .= ' 30 AS rank_search,'; + $sSQL .= ' 30 AS rank_address, '; + $sSQL .= ' place_id,'; + $sSQL .= ' parent_place_id, '; + $sSQL .= ' housenumber,'; + $sSQL .= " 'us' AS country_code, "; + $sSQL .= $this->langAddressSql('-1'); + $sSQL .= ' null::text AS placename, '; + $sSQL .= ' null::text AS ref, '; + if ($this->bExtraTags) $sSQL .= 'null::text AS extra, '; + if ($this->bNameDetails) $sSQL .= 'null::text AS names, '; + $sSQL .= ' ST_X(centroid) AS lon, '; + $sSQL .= ' ST_Y(centroid) AS lat, '; + $sSQL .= ' -1.10 AS importance, '; + $sSQL .= $this->addressImportanceSql( + 'centroid', + 'location_property_aux.parent_place_id' + ); + $sSQL .= ' null::text AS extra_place '; + $sSQL .= ' FROM location_property_aux '; + $sSQL .= " WHERE place_id in ($sPlaceIDs) "; + + $aSubSelects[] = $sSQL; + } + } + } - $sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata(".$iPlaceID.",".$housenumber.")"; - if (!$bAll) $sSQL .= " WHERE isaddress OR type = 'country_code'"; - $sSQL .= " order by rank_address desc,isaddress desc"; + if (empty($aSubSelects)) { + return array(); + } - return chksql($this->oDB->getAll($sSQL)); - } + $sSQL = join(' UNION ', $aSubSelects); + Debug::printSQL($sSQL); + $aPlaces = chksql($this->oDB->getAll($sSQL), 'Could not lookup place'); + + foreach ($aPlaces as &$aPlace) { + if ($this->bAddressDetails) { + // to get addressdetails for tiger data, the housenumber is needed + $aPlace['address'] = new AddressDetails( + $this->oDB, + $aPlace['place_id'], + $aPlace['housenumber'], + $this->aLangPrefOrderSql + ); + $aPlace['langaddress'] = $aPlace['address']->getLocaleAddress(); + } - public function getAddressNames($iPlaceID, $housenumber = -1) - { - $aAddressLines = $this->getAddressDetails($iPlaceID, false, $housenumber); - - $aAddress = array(); - $aFallback = array(); - $aClassType = getClassTypes(); - foreach ($aAddressLines as $aLine) { - $bFallback = false; - $aTypeLabel = false; - if (isset($aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']])) { - $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']]; - } elseif (isset($aClassType[$aLine['class'].':'.$aLine['type']])) { - $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type']]; - } elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))])) { - $aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))]; - $bFallback = true; - } else { - $aTypeLabel = array('simplelabel' => 'address'.$aLine['rank_address']); - $bFallback = true; + if ($this->bExtraTags) { + if ($aPlace['extra']) { + $aPlace['sExtraTags'] = json_decode($aPlace['extra']); + } else { + $aPlace['sExtraTags'] = (object) array(); + } } - if ($aTypeLabel && ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber']))) { - $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']); - $sTypeLabel = str_replace(' ', '_', $sTypeLabel); - if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place') { - $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber']; + + if ($this->bNameDetails) { + if ($aPlace['names']) { + $aPlace['sNameDetails'] = json_decode($aPlace['names']); + } else { + $aPlace['sNameDetails'] = (object) array(); } - $aFallback[$sTypeLabel] = $bFallback; } + + $aPlace['addresstype'] = ClassTypes\getProperty( + $aPlace, + 'simplelabel', + $aPlace['class'] + ); } - return $aAddress; - } + Debug::printVar('Places', $aPlaces); + return $aPlaces; + } /* returns an array which will contain the keys * aBoundingBox @@ -253,7 +478,7 @@ class PlaceLookup */ - public function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = null) + public function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = null, $fLonReverse = null, $fLatReverse = null) { $aOutlineResult = array(); @@ -261,22 +486,34 @@ class PlaceLookup if (CONST_Search_AreaPolygons) { // Get the bounding box and outline polygon - $sSQL = "select place_id,0 as numfeatures,st_area(geometry) as area,"; - $sSQL .= "ST_Y(centroid) as centrelat,ST_X(centroid) as centrelon,"; - $sSQL .= "ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,"; - $sSQL .= "ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon"; - if ($this->bIncludePolygonAsGeoJSON) $sSQL .= ",ST_AsGeoJSON(geometry) as asgeojson"; - if ($this->bIncludePolygonAsKML) $sSQL .= ",ST_AsKML(geometry) as askml"; - if ($this->bIncludePolygonAsSVG) $sSQL .= ",ST_AsSVG(geometry) as assvg"; - if ($this->bIncludePolygonAsText || $this->bIncludePolygonAsPoints) $sSQL .= ",ST_AsText(geometry) as astext"; - $sFrom = " from placex where place_id = ".$iPlaceID; + $sSQL = 'select place_id,0 as numfeatures,st_area(geometry) as area,'; + if ($fLonReverse != null && $fLatReverse != null) { + $sSQL .= ' ST_Y(closest_point) as centrelat,'; + $sSQL .= ' ST_X(closest_point) as centrelon,'; + } else { + $sSQL .= ' ST_Y(centroid) as centrelat, ST_X(centroid) as centrelon,'; + } + $sSQL .= ' ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,'; + $sSQL .= ' ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon'; + if ($this->bIncludePolygonAsGeoJSON) $sSQL .= ',ST_AsGeoJSON(geometry) as asgeojson'; + if ($this->bIncludePolygonAsKML) $sSQL .= ',ST_AsKML(geometry) as askml'; + if ($this->bIncludePolygonAsSVG) $sSQL .= ',ST_AsSVG(geometry) as assvg'; + if ($this->bIncludePolygonAsText || $this->bIncludePolygonAsPoints) $sSQL .= ',ST_AsText(geometry) as astext'; + if ($fLonReverse != null && $fLatReverse != null) { + $sFrom = ' from (SELECT * , CASE WHEN (class = \'highway\') AND (ST_GeometryType(geometry) = \'ST_LineString\') THEN '; + $sFrom .=' ST_ClosestPoint(geometry, ST_SetSRID(ST_Point('.$fLatReverse.','.$fLonReverse.'),4326))'; + $sFrom .=' ELSE centroid END AS closest_point'; + $sFrom .= ' from placex where place_id = '.$iPlaceID.') as plx'; + } else { + $sFrom = ' from placex where place_id = '.$iPlaceID; + } if ($this->fPolygonSimplificationThreshold > 0) { - $sSQL .= " from (select place_id,centroid,ST_SimplifyPreserveTopology(geometry,".$this->fPolygonSimplificationThreshold.") as geometry".$sFrom.") as plx"; + $sSQL .= ' from (select place_id,centroid,ST_SimplifyPreserveTopology(geometry,'.$this->fPolygonSimplificationThreshold.') as geometry'.$sFrom.') as plx'; } else { $sSQL .= $sFrom; } - $aPointPolygon = chksql($this->oDB->getRow($sSQL), "Could not get outline"); + $aPointPolygon = chksql($this->oDB->getRow($sSQL), 'Could not get outline'); if ($aPointPolygon['place_id']) { if ($aPointPolygon['centrelon'] !== null && $aPointPolygon['centrelat'] !== null) {