safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

introduce Result class in Geocode and SearchDescription

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-10-18 23:54:47 +02:00
parent 8f884d7f23
commit 42f079c355
3 changed files with 500 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

652
lib/Geocode.php
View File

@@ -45,7 +45,6 @@ class Geocode
protected $iMinAddressRank = 0; protected $iMinAddressRank = 0;
protected $iMaxAddressRank = 30; protected $iMaxAddressRank = 30;
protected $aAddressRankList = array(); protected $aAddressRankList = array();
protected $exactMatchCache = array();
protected $sAllowedTypesSQLList = false; protected $sAllowedTypesSQLList = false;
@@ -365,298 +364,320 @@ class Geocode
return false; return false;
} }
public function getDetails($aPlaceIDs, $oCtx) public function getDetails($aResults, $oCtx)
{ {
//$aPlaceIDs is an array with key: placeID and value: tiger-housenumber, if found, else -1 // Get the details for display (is this a redundant extra step?)
if (sizeof($aPlaceIDs) == 0) return array(); //$aResults is an array of Result objects
if (sizeof($aResults) == 0) return array();
$sLanguagePrefArraySQL = getArraySQL( $sLanguagePrefArraySQL = getArraySQL(
array_map("getDBQuoted", $this->aLangPrefOrder) array_map("getDBQuoted", $this->aLangPrefOrder)
); );
// Get the details for display (is this a redundant extra step?)
$sPlaceIDs = join(',', array_keys($aPlaceIDs));
$sImportanceSQL = $oCtx->viewboxImportanceSQL('ST_Collect(centroid)'); $sImportanceSQL = $oCtx->viewboxImportanceSQL('ST_Collect(centroid)');
$sImportanceSQLGeom = $oCtx->viewboxImportanceSQL('geometry'); $sImportanceSQLGeom = $oCtx->viewboxImportanceSQL('geometry');
$sSQL = "SELECT "; $aSubSelects = array();
$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 .= " 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->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text AS extra,";
if ($this->bIncludeNameDetails) $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)) $sImportanceSQL AS importance, ";
if ($oCtx->hasNearPoint()) {
$sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,";
} else {
$sSQL .= " ( ";
$sSQL .= " SELECT max(p.importance*(p.rank_address+2))";
$sSQL .= " FROM ";
$sSQL .= " place_addressline s, ";
$sSQL .= " placex p";
$sSQL .= " WHERE s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)";
$sSQL .= " AND p.place_id = s.address_place_id ";
$sSQL .= " AND s.isaddress ";
$sSQL .= " AND p.importance is not null ";
$sSQL .= " ) AS addressimportance, ";
}
$sSQL .= " (extratags->'place') AS extra_place ";
$sSQL .= " FROM placex";
$sSQL .= " WHERE place_id in ($sPlaceIDs) ";
$sSQL .= " AND (";
$sSQL .= " placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
$sSQL .= " OR (extratags->'place') = 'city'";
}
if ($this->aAddressRankList) {
$sSQL .= " OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
}
$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 .= " country_code, ";
$sSQL .= " importance, ";
if (!$this->bDeDupe) $sSQL .= "place_id,";
$sSQL .= " langaddress, ";
$sSQL .= " placename, ";
$sSQL .= " ref, ";
if ($this->bIncludeExtraTags) $sSQL .= "extratags, ";
if ($this->bIncludeNameDetails) $sSQL .= "name, ";
$sSQL .= " extratags->'place' ";
// postcode table $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX);
$sSQL .= "UNION "; if ($sPlaceIDs) {
$sSQL .= "SELECT"; $sSQL = "SELECT ";
$sSQL .= " 'P' as osm_type,"; $sSQL .= " osm_type,";
$sSQL .= " (SELECT osm_id from placex p WHERE p.place_id = lp.parent_place_id) as osm_id,"; $sSQL .= " osm_id,";
$sSQL .= " 'place' as class, 'postcode' as type,"; $sSQL .= " class,";
$sSQL .= " null as admin_level, rank_search, rank_address,"; $sSQL .= " type,";
$sSQL .= " place_id, parent_place_id, country_code,"; $sSQL .= " admin_level,";
$sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress,"; $sSQL .= " rank_search,";
$sSQL .= " postcode as placename,"; $sSQL .= " rank_address,";
$sSQL .= " postcode as ref,"; $sSQL .= " min(place_id) AS place_id, ";
if ($this->bIncludeExtraTags) $sSQL .= "null AS extra,"; $sSQL .= " min(parent_place_id) AS parent_place_id, ";
if ($this->bIncludeNameDetails) $sSQL .= "null AS names,"; $sSQL .= " country_code, ";
$sSQL .= " ST_x(st_centroid(geometry)) AS lon, ST_y(st_centroid(geometry)) AS lat,"; $sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress,";
$sSQL .= " (0.75-(rank_search::float/40)) $sImportanceSQLGeom AS importance, "; $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) AS placename,";
if ($oCtx->hasNearPoint()) { $sSQL .= " get_name_by_language(name, ARRAY['ref']) AS ref,";
$sSQL .= $oCtx->distanceSQL('geometry')." AS addressimportance,"; if ($this->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text AS extra,";
} else { if ($this->bIncludeNameDetails) $sSQL .= "hstore_to_json(name)::text AS names,";
$sSQL .= " ("; $sSQL .= " avg(ST_X(centroid)) AS lon, ";
$sSQL .= " SELECT max(p.importance*(p.rank_address+2))"; $sSQL .= " avg(ST_Y(centroid)) AS lat, ";
$sSQL .= " FROM "; $sSQL .= " COALESCE(importance,0.75-(rank_search::float/40)) $sImportanceSQL AS importance, ";
$sSQL .= " place_addressline s, ";
$sSQL .= " placex p";
$sSQL .= " WHERE s.place_id = lp.parent_place_id";
$sSQL .= " AND p.place_id = s.address_place_id ";
$sSQL .= " AND s.isaddress";
$sSQL .= " AND p.importance is not null";
$sSQL .= " ) AS addressimportance, ";
}
$sSQL .= " null AS extra_place ";
$sSQL .= "FROM location_postcode lp";
$sSQL .= " WHERE place_id in ($sPlaceIDs) ";
if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank) {
// only Tiger housenumbers and interpolation lines need to be interpolated, because they are saved as lines
// with start- and endnumber, the common osm housenumbers are usually saved as points
$sHousenumbers = "";
$i = 0;
$length = count($aPlaceIDs);
foreach ($aPlaceIDs as $placeID => $housenumber) {
$i++;
$sHousenumbers .= "(".$placeID.", ".$housenumber.")";
if ($i<$length) $sHousenumbers .= ", ";
}
if (CONST_Use_US_Tiger_Data) {
// Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
$sSQL .= " union";
$sSQL .= " SELECT ";
$sSQL .= " 'T' AS osm_type, ";
$sSQL .= " (SELECT osm_id from placex p WHERE p.place_id=min(blub.parent_place_id)) as osm_id, ";
$sSQL .= " 'place' AS class, ";
$sSQL .= " 'house' AS type, ";
$sSQL .= " null AS admin_level, ";
$sSQL .= " 30 AS rank_search, ";
$sSQL .= " 30 AS rank_address, ";
$sSQL .= " min(place_id) AS place_id, ";
$sSQL .= " min(parent_place_id) AS parent_place_id, ";
$sSQL .= " 'us' AS country_code, ";
$sSQL .= " get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress,";
$sSQL .= " null AS placename, ";
$sSQL .= " null AS ref, ";
if ($this->bIncludeExtraTags) $sSQL .= "null AS extra,";
if ($this->bIncludeNameDetails) $sSQL .= "null AS names,";
$sSQL .= " avg(st_x(centroid)) AS lon, ";
$sSQL .= " avg(st_y(centroid)) AS lat,";
$sSQL .= " -1.15".$sImportanceSQL." AS importance, ";
if ($oCtx->hasNearPoint()) {
$sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,";
} else {
$sSQL .= " (";
$sSQL .= " SELECT max(p.importance*(p.rank_address+2))";
$sSQL .= " FROM ";
$sSQL .= " place_addressline s, ";
$sSQL .= " placex p";
$sSQL .= " WHERE s.place_id = min(blub.parent_place_id)";
$sSQL .= " AND p.place_id = s.address_place_id ";
$sSQL .= " AND s.isaddress";
$sSQL .= " AND p.importance is not null";
$sSQL .= " ) AS addressimportance, ";
}
$sSQL .= " null 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>=0";
$sSQL .= " AND 30 between $this->iMinAddressRank AND $this->iMaxAddressRank";
$sSQL .= " ) AS blub"; //postgres wants an alias here
$sSQL .= " GROUP BY";
$sSQL .= " place_id, ";
$sSQL .= " housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique
if (!$this->bDeDupe) $sSQL .= ", place_id ";
}
// osmline
// interpolation line search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
$sSQL .= " UNION ";
$sSQL .= "SELECT ";
$sSQL .= " 'W' AS osm_type, ";
$sSQL .= " osm_id, ";
$sSQL .= " 'place' AS class, ";
$sSQL .= " 'house' AS type, ";
$sSQL .= " null AS admin_level, ";
$sSQL .= " 30 AS rank_search, ";
$sSQL .= " 30 AS rank_address, ";
$sSQL .= " min(place_id) as place_id, ";
$sSQL .= " min(parent_place_id) AS parent_place_id, ";
$sSQL .= " country_code, ";
$sSQL .= " get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress, ";
$sSQL .= " null AS placename, ";
$sSQL .= " null AS ref, ";
if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
$sSQL .= " AVG(st_x(centroid)) AS lon, ";
$sSQL .= " AVG(st_y(centroid)) AS lat, ";
$sSQL .= " -0.1".$sImportanceSQL." AS importance, "; // slightly smaller than the importance for normal houses with rank 30, which is 0
if ($oCtx->hasNearPoint()) { if ($oCtx->hasNearPoint()) {
$sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,"; $sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,";
} else {
$sSQL .= " ( ";
$sSQL .= " SELECT max(p.importance*(p.rank_address+2))";
$sSQL .= " FROM ";
$sSQL .= " place_addressline s, ";
$sSQL .= " placex p";
$sSQL .= " WHERE s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)";
$sSQL .= " AND p.place_id = s.address_place_id ";
$sSQL .= " AND s.isaddress ";
$sSQL .= " AND p.importance is not null ";
$sSQL .= " ) AS addressimportance, ";
}
$sSQL .= " (extratags->'place') AS extra_place ";
$sSQL .= " FROM placex";
$sSQL .= " WHERE place_id in ($sPlaceIDs) ";
$sSQL .= " AND (";
$sSQL .= " placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
$sSQL .= " OR (extratags->'place') = 'city'";
}
if ($this->aAddressRankList) {
$sSQL .= " OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
}
$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 .= " country_code, ";
$sSQL .= " importance, ";
if (!$this->bDeDupe) $sSQL .= "place_id,";
$sSQL .= " langaddress, ";
$sSQL .= " placename, ";
$sSQL .= " ref, ";
if ($this->bIncludeExtraTags) $sSQL .= "extratags, ";
if ($this->bIncludeNameDetails) $sSQL .= "name, ";
$sSQL .= " extratags->'place' ";
$aSubSelects[] = $sSQL;
}
// postcode table
$sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_POSTCODE);
if ($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 as admin_level, rank_search, rank_address,";
$sSQL .= " place_id, parent_place_id, country_code,";
$sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress,";
$sSQL .= " postcode as placename,";
$sSQL .= " postcode as ref,";
if ($this->bIncludeExtraTags) $sSQL .= "null AS extra,";
if ($this->bIncludeNameDetails) $sSQL .= "null AS names,";
$sSQL .= " ST_x(st_centroid(geometry)) AS lon, ST_y(st_centroid(geometry)) AS lat,";
$sSQL .= " (0.75-(rank_search::float/40)) $sImportanceSQLGeom AS importance, ";
if ($oCtx->hasNearPoint()) {
$sSQL .= $oCtx->distanceSQL('geometry')." AS addressimportance,";
} else { } else {
$sSQL .= " ("; $sSQL .= " (";
$sSQL .= " SELECT "; $sSQL .= " SELECT max(p.importance*(p.rank_address+2))";
$sSQL .= " MAX(p.importance*(p.rank_address+2)) "; $sSQL .= " FROM ";
$sSQL .= " FROM";
$sSQL .= " place_addressline s, "; $sSQL .= " place_addressline s, ";
$sSQL .= " placex p"; $sSQL .= " placex p";
$sSQL .= " WHERE s.place_id = min(blub.parent_place_id) "; $sSQL .= " WHERE s.place_id = lp.parent_place_id";
$sSQL .= " AND p.place_id = s.address_place_id "; $sSQL .= " AND p.place_id = s.address_place_id ";
$sSQL .= " AND s.isaddress "; $sSQL .= " AND s.isaddress";
$sSQL .= " AND p.importance is not null"; $sSQL .= " AND p.importance is not null";
$sSQL .= " ) AS addressimportance,"; $sSQL .= " ) AS addressimportance, ";
} }
$sSQL .= " null AS extra_place "; $sSQL .= " null AS extra_place ";
$sSQL .= " FROM ("; $sSQL .= "FROM location_postcode lp";
$sSQL .= " SELECT "; $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
$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 .= " AND 30 between $this->iMinAddressRank AND $this->iMaxAddressRank";
$sSQL .= " ) as blub"; //postgres wants an alias here
$sSQL .= " GROUP BY ";
$sSQL .= " osm_id, ";
$sSQL .= " place_id, ";
$sSQL .= " housenumber_for_place, ";
$sSQL .= " country_code "; //is this group by really needed?, place_id + housenumber (in combination) are unique
if (!$this->bDeDupe) $sSQL .= ", place_id ";
if (CONST_Use_Aux_Location_data) { $aSubSelects[] = $sSQL;
$sSQL .= " UNION "; }
$sSQL .= " SELECT ";
$sSQL .= " 'L' AS osm_type, "; // All other tables are rank 30 only.
$sSQL .= " place_id AS osm_id, "; if ($this->iMaxAddressRank == 30) {
$sSQL .= " 'place' AS class,"; // TIGER table
$sSQL .= " 'house' AS type, "; if (CONST_Use_US_Tiger_Data) {
$sSQL .= " null AS admin_level, "; $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_TIGER);
$sSQL .= " 0 AS rank_search,"; if ($sPlaceIDs) {
$sSQL .= " 0 AS rank_address, "; $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_TIGER);
$sSQL .= " min(place_id) AS place_id,"; // Tiger search only if a housenumber was searched and if it was found
$sSQL .= " min(parent_place_id) AS parent_place_id, "; // (realized through a join)
$sSQL .= " 'us' AS country_code, "; $sSQL = " SELECT ";
$sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress, "; $sSQL .= " 'T' AS osm_type, ";
$sSQL .= " null AS placename, "; $sSQL .= " (SELECT osm_id from placex p WHERE p.place_id=min(blub.parent_place_id)) as osm_id, ";
$sSQL .= " null AS ref, "; $sSQL .= " 'place' AS class, ";
$sSQL .= " 'house' AS type, ";
$sSQL .= " null AS admin_level, ";
$sSQL .= " 30 AS rank_search, ";
$sSQL .= " 30 AS rank_address, ";
$sSQL .= " min(place_id) AS place_id, ";
$sSQL .= " min(parent_place_id) AS parent_place_id, ";
$sSQL .= " 'us' AS country_code, ";
$sSQL .= " get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress,";
$sSQL .= " null AS placename, ";
$sSQL .= " null AS ref, ";
if ($this->bIncludeExtraTags) $sSQL .= "null AS extra,";
if ($this->bIncludeNameDetails) $sSQL .= "null AS names,";
$sSQL .= " avg(st_x(centroid)) AS lon, ";
$sSQL .= " avg(st_y(centroid)) AS lat,";
$sSQL .= " -1.15".$sImportanceSQL." AS importance, ";
if ($oCtx->hasNearPoint()) {
$sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,";
} else {
$sSQL .= " (";
$sSQL .= " SELECT max(p.importance*(p.rank_address+2))";
$sSQL .= " FROM ";
$sSQL .= " place_addressline s, ";
$sSQL .= " placex p";
$sSQL .= " WHERE s.place_id = min(blub.parent_place_id)";
$sSQL .= " AND p.place_id = s.address_place_id ";
$sSQL .= " AND s.isaddress";
$sSQL .= " AND p.importance is not null";
$sSQL .= " ) AS addressimportance, ";
}
$sSQL .= " null 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
$sSQL .= " GROUP BY";
$sSQL .= " place_id, ";
$sSQL .= " housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique
if (!$this->bDeDupe) $sSQL .= ", place_id ";
$aSubSelects[] = $sSQL;
}
}
// osmline - interpolated housenumbers
$sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_OSMLINE);
if ($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 AS admin_level, ";
$sSQL .= " 30 AS rank_search, ";
$sSQL .= " 30 AS rank_address, ";
$sSQL .= " min(place_id) as place_id, ";
$sSQL .= " min(parent_place_id) AS parent_place_id, ";
$sSQL .= " country_code, ";
$sSQL .= " get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress, ";
$sSQL .= " null AS placename, ";
$sSQL .= " null AS ref, ";
if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, "; if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
if ($this->bIncludeNameDetails) $sSQL .= "null AS names, "; if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
$sSQL .= " avg(ST_X(centroid)) AS lon, "; $sSQL .= " AVG(st_x(centroid)) AS lon, ";
$sSQL .= " avg(ST_Y(centroid)) AS lat, "; $sSQL .= " AVG(st_y(centroid)) AS lat, ";
$sSQL .= " -1.10".$sImportanceSQL." AS importance, "; $sSQL .= " -0.1".$sImportanceSQL." AS importance, "; // slightly smaller than the importance for normal houses with rank 30, which is 0
if ($oCtx->hasNearPoint()) { if ($oCtx->hasNearPoint()) {
$sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,"; $sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,";
} else { } else {
$sSQL .= " ( "; $sSQL .= " (";
$sSQL .= " SELECT max(p.importance*(p.rank_address+2))"; $sSQL .= " SELECT ";
$sSQL .= " FROM "; $sSQL .= " MAX(p.importance*(p.rank_address+2)) ";
$sSQL .= " place_addressline s, "; $sSQL .= " FROM";
$sSQL .= " placex p"; $sSQL .= " place_addressline s, ";
$sSQL .= " WHERE s.place_id = min(location_property_aux.parent_place_id)"; $sSQL .= " placex p";
$sSQL .= " AND p.place_id = s.address_place_id "; $sSQL .= " WHERE s.place_id = min(blub.parent_place_id) ";
$sSQL .= " AND s.isaddress"; $sSQL .= " AND p.place_id = s.address_place_id ";
$sSQL .= " AND p.importance is not null"; $sSQL .= " AND s.isaddress ";
$sSQL .= " ) AS addressimportance, "; $sSQL .= " AND p.importance is not null";
$sSQL .= " ) AS addressimportance,";
} }
$sSQL .= " null AS extra_place "; $sSQL .= " null AS extra_place ";
$sSQL .= " FROM location_property_aux "; $sSQL .= " FROM (";
$sSQL .= " WHERE place_id in ($sPlaceIDs) "; $sSQL .= " SELECT ";
$sSQL .= " AND 30 between $this->iMinAddressRank and $this->iMaxAddressRank "; $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 .= " AND 30 between $this->iMinAddressRank AND $this->iMaxAddressRank";
$sSQL .= " ) as blub"; //postgres wants an alias here
$sSQL .= " GROUP BY "; $sSQL .= " GROUP BY ";
$sSQL .= " place_id, "; $sSQL .= " osm_id, ";
if (!$this->bDeDupe) $sSQL .= "place_id, "; $sSQL .= " place_id, ";
$sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) "; $sSQL .= " housenumber_for_place, ";
$sSQL .= " country_code "; //is this group by really needed?, place_id + housenumber (in combination) are unique
if (!$this->bDeDupe) $sSQL .= ", place_id ";
$aSubSelects[] = $sSQL;
}
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 AS admin_level, ";
$sSQL .= " 0 AS rank_search,";
$sSQL .= " 0 AS rank_address, ";
$sSQL .= " min(place_id) AS place_id,";
$sSQL .= " min(parent_place_id) AS parent_place_id, ";
$sSQL .= " 'us' AS country_code, ";
$sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress, ";
$sSQL .= " null AS placename, ";
$sSQL .= " null AS ref, ";
if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
$sSQL .= " avg(ST_X(centroid)) AS lon, ";
$sSQL .= " avg(ST_Y(centroid)) AS lat, ";
$sSQL .= " -1.10".$sImportanceSQL." AS importance, ";
if ($oCtx->hasNearPoint()) {
$sSQL .= $oCtx->distanceSQL('ST_Collect(centroid)')." AS addressimportance,";
} else {
$sSQL .= " ( ";
$sSQL .= " SELECT max(p.importance*(p.rank_address+2))";
$sSQL .= " FROM ";
$sSQL .= " place_addressline s, ";
$sSQL .= " placex p";
$sSQL .= " WHERE s.place_id = min(location_property_aux.parent_place_id)";
$sSQL .= " AND p.place_id = s.address_place_id ";
$sSQL .= " AND s.isaddress";
$sSQL .= " AND p.importance is not null";
$sSQL .= " ) AS addressimportance, ";
}
$sSQL .= " null AS extra_place ";
$sSQL .= " FROM location_property_aux ";
$sSQL .= " WHERE place_id in ($sPlaceIDs) ";
$sSQL .= " AND 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
$sSQL .= " GROUP BY ";
$sSQL .= " place_id, ";
if (!$this->bDeDupe) $sSQL .= "place_id, ";
$sSQL .= " langaddress ";
$aSubSelects[] = $sSQL;
}
} }
} }
$sSQL .= " order by importance desc"; if (!sizeof($aSubSelects)) {
return array();
}
$sSQL = join(' UNION ', $aSubSelects)." order by importance desc";
if (CONST_Debug) { if (CONST_Debug) {
echo "<hr>"; echo "<hr>";
var_dump($sSQL); var_dump($sSQL);
@@ -1088,8 +1109,7 @@ class Geocode
if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens); if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
// Start the search process // Start the search process
// array with: placeid => -1 | tiger-housenumber $aResults = array();
$aResultPlaceIDs = array();
$iGroupLoop = 0; $iGroupLoop = 0;
$iQueryLoop = 0; $iQueryLoop = 0;
foreach ($aGroupedSearches as $iGroupedRank => $aSearches) { foreach ($aGroupedSearches as $iGroupedRank => $aSearches) {
@@ -1102,74 +1122,76 @@ class Geocode
_debugDumpGroupedSearches(array($iGroupedRank => array($oSearch)), $aValidTokens); _debugDumpGroupedSearches(array($iGroupedRank => array($oSearch)), $aValidTokens);
} }
$aRes = $oSearch->query( $aResults += $oSearch->query(
$this->oDB, $this->oDB,
$aWordFrequencyScores, $aWordFrequencyScores,
$this->exactMatchCache,
$this->iMinAddressRank, $this->iMinAddressRank,
$this->iMaxAddressRank, $this->iMaxAddressRank,
$this->iLimit $this->iLimit
); );
foreach ($aRes['IDs'] as $iPlaceID) {
// array for placeID => -1 | Tiger housenumber
$aResultPlaceIDs[$iPlaceID] = $aRes['houseNumber'];
}
if ($iQueryLoop > 20) break; if ($iQueryLoop > 20) break;
} }
if (sizeof($aResultPlaceIDs) && ($this->iMinAddressRank != 0 || $this->iMaxAddressRank != 30)) { if (sizeof($aResults) && ($this->iMinAddressRank != 0 || $this->iMaxAddressRank != 30)) {
// Need to verify passes rank limits before dropping out of the loop (yuk!) // Need to verify passes rank limits before dropping out of the loop (yuk!)
// reduces the number of place ids, like a filter // reduces the number of place ids, like a filter
// rank_address is 30 for interpolated housenumbers // rank_address is 30 for interpolated housenumbers
$sWherePlaceId = 'WHERE place_id in ('; $aFilterSql = array();
$sWherePlaceId .= join(',', array_keys($aResultPlaceIDs)).') '; $sPlaceIds = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX);
if ($sPlaceIds) {
$sSQL = 'SELECT place_id FROM placex ';
$sSQL .= 'WHERE place_id in ('.$sPlaceIds.') ';
$sSQL .= " AND (";
$sSQL .= " placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
$sSQL .= " OR (extratags->'place') = 'city'";
}
if ($this->aAddressRankList) {
$sSQL .= " OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
}
$sSQL .= ")";
$aFilterSql[] = $sSQL;
}
$sPlaceIds = Result::joinIdsByTable($aResults, Result::TABLE_POSTCODE);
if ($sPlaceIds) {
$sSQL = ' SELECT place_id FROM location_postcode lp ';
$sSQL .= 'WHERE place_id in ('.$sPlaceIds.') ';
$sSQL .= " AND (lp.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
if ($this->aAddressRankList) {
$sSQL .= " OR lp.rank_address in (".join(',', $this->aAddressRankList).")";
}
$sSQL .= ") ";
$aFilterSql[] = $sSQL;
}
$sSQL = "SELECT place_id "; $aFilteredIDs = array();
$sSQL .= "FROM placex ".$sWherePlaceId; if ($aFilterSql) {
$sSQL .= " AND ("; $sSQL = join(' UNION ', $aFilterSql);
$sSQL .= " placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank "; if (CONST_Debug) var_dump($sSQL);
if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) { $aFilteredIDs = chksql($this->oDB->getCol($sSQL));
$sSQL .= " OR (extratags->'place') = 'city'";
} }
if ($this->aAddressRankList) {
$sSQL .= " OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
}
$sSQL .= " ) UNION ";
$sSQL .= " SELECT place_id FROM location_postcode lp ".$sWherePlaceId;
$sSQL .= " AND (lp.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
if ($this->aAddressRankList) {
$sSQL .= " OR lp.rank_address in (".join(',', $this->aAddressRankList).")";
}
$sSQL .= ") ";
if (CONST_Use_US_Tiger_Data && $this->iMaxAddressRank == 30) {
$sSQL .= "UNION ";
$sSQL .= " SELECT place_id ";
$sSQL .= " FROM location_property_tiger ".$sWherePlaceId;
}
if ($this->iMaxAddressRank == 30) {
$sSQL .= "UNION ";
$sSQL .= " SELECT place_id ";
$sSQL .= " FROM location_property_osmline ".$sWherePlaceId;
}
if (CONST_Debug) var_dump($sSQL);
$aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
$tempIDs = array(); $tempIDs = array();
foreach ($aFilteredPlaceIDs as $placeID) { foreach ($aResults as $oResult) {
$tempIDs[$placeID] = $aResultPlaceIDs[$placeID]; //assign housenumber to placeID if (($this->iMaxAddressRank == 30 &&
($oResult->iTable == Result::TABLE_OSMLINE
|| $oResult->iTable == Result::TABLE_AUX
|| $oResult->iTable == Result::TABLE_TIGER))
|| in_array($oResult->iId, $aFilteredIDs)
) {
$tempIDs[$oResult->iId] = $oResult;
}
} }
$aResultPlaceIDs = $tempIDs; $aResults = $tempIDs;
} }
if (sizeof($aResultPlaceIDs)) break; if (sizeof($aResults)) break;
if ($iGroupLoop > 4) break; if ($iGroupLoop > 4) break;
if ($iQueryLoop > 30) break; if ($iQueryLoop > 30) break;
} }
// Did we find anything? $aSearchResults = $this->getDetails($aResults, $oCtx);
if (sizeof($aResultPlaceIDs)) {
$aSearchResults = $this->getDetails($aResultPlaceIDs, $oCtx);
}
} else { } else {
// Just interpret as a reverse geocode // Just interpret as a reverse geocode
$oReverse = new ReverseGeocode($this->oDB); $oReverse = new ReverseGeocode($this->oDB);
@@ -1180,8 +1202,8 @@ class Geocode
if (CONST_Debug) var_dump("Reverse search", $aLookup); if (CONST_Debug) var_dump("Reverse search", $aLookup);
if ($aLookup['place_id']) { if ($aLookup['place_id']) {
$aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1), $oCtx); $aResults = array($aLookup['place_id'] => new Result($aLookup['place_id']));
$aResultPlaceIDs[$aLookup['place_id']] = -1; $aSearchResults = $this->getDetails($aResults, $oCtx);
} else { } else {
$aSearchResults = array(); $aSearchResults = array();
} }
@@ -1251,7 +1273,7 @@ class Geocode
// if tag '&addressdetails=1' is set in query // if tag '&addressdetails=1' is set in query
if ($this->bIncludeAddressDetails) { if ($this->bIncludeAddressDetails) {
// getAddressDetails() is defined in lib.php and uses the SQL function get_addressdata in functions.sql // getAddressDetails() is defined in lib.php and uses the SQL function get_addressdata in functions.sql
$aResult['address'] = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code'], $aResultPlaceIDs[$aResult['place_id']]); $aResult['address'] = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code'], $aResults[$aResult['place_id']]->iHouseNumber);
if ($aResult['extra_place'] == 'city' && !isset($aResult['address']['city'])) { if ($aResult['extra_place'] == 'city' && !isset($aResult['address']['city'])) {
$aResult['address'] = array_merge(array('city' => array_values($aResult['address'])[0]), $aResult['address']); $aResult['address'] = array_merge(array('city' => array_values($aResult['address'])[0]), $aResult['address']);
} }
@@ -1296,11 +1318,7 @@ class Geocode
// - approximate importance of address parts // - approximate importance of address parts
$aResult['foundorder'] = -$aResult['addressimportance']/10; $aResult['foundorder'] = -$aResult['addressimportance']/10;
// - number of exact matches from the query // - number of exact matches from the query
if (isset($this->exactMatchCache[$aResult['place_id']])) { $aResult['foundorder'] -= $aResults[$aResult['place_id']]->iExactMatches;
$aResult['foundorder'] -= $this->exactMatchCache[$aResult['place_id']];
} elseif (isset($this->exactMatchCache[$aResult['parent_place_id']])) {
$aResult['foundorder'] -= $this->exactMatchCache[$aResult['parent_place_id']];
}
// - importance of the class/type // - importance of the class/type
if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance']) if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
&& $aClassType[$aResult['class'].':'.$aResult['type']]['importance'] && $aClassType[$aResult['class'].':'.$aResult['type']]['importance']

60
lib/Result.php Normal file
View File

@@ -0,0 +1,60 @@
<?php
namespace Nominatim;
/**
* A single result of a search operation or a reverse lookup.
*
* This object only contains the id of the result. It does not yet
* have any details needed to format the output document.
*/
class Result
{
const TABLE_PLACEX = 0;
const TABLE_POSTCODE = 1;
const TABLE_OSMLINE = 2;
const TABLE_AUX = 3;
const TABLE_TIGER = 4;
/// Database table that contains the result.
public $iTable;
/// Id of the result.
public $iId;
/// House number (only for interpolation results).
public $iHouseNumber = -1;
/// Number of exact matches in address (address searches only).
public $iExactMatches = 0;
/// Subranking within the results (the higher the worse).
public $iResultRank = 0;
public function __construct($sId, $iTable = Result::TABLE_PLACEX)
{
$this->iTable = $iTable;
$this->iId = (int) $sId;
}
public static function joinIdsByTable($aResults, $iTable)
{
return join(',', array_keys(array_filter(
$aResults,
function ($aValue) use ($iTable) {
return $aValue->iTable == $iTable;
}
)));
}
public static function sqlHouseNumberTable($aResults, $iTable)
{
$sHousenumbers = '';
$sSep = '';
foreach ($aResults as $oResult) {
if ($oResult->iTable == $iTable) {
$sHousenumbers .= $sSep.'('.$oResult->iId.',';
$sHousenumbers .= $oResult->iHouseNumber.')';
$sSep = ',';
}
}
return $sHousenumbers;
}
}

176
lib/SearchDescription.php
View File

@@ -4,6 +4,7 @@ namespace Nominatim;
require_once(CONST_BasePath.'/lib/SpecialSearchOperator.php'); require_once(CONST_BasePath.'/lib/SpecialSearchOperator.php');
require_once(CONST_BasePath.'/lib/SearchContext.php'); require_once(CONST_BasePath.'/lib/SearchContext.php');
require_once(CONST_BasePath.'/lib/Result.php');
/** /**
* Description of a single interpretation of a search query. * Description of a single interpretation of a search query.
@@ -405,7 +406,6 @@ class SearchDescription
* @param object $oDB Database connection to use. * @param object $oDB Database connection to use.
* @param mixed[] $aWordFrequencyScores Number of times tokens appears * @param mixed[] $aWordFrequencyScores Number of times tokens appears
* overall in a planet database. * overall in a planet database.
* @param mixed[] $aExactMatchCache Saves number of exact matches.
* @param integer $iMinRank Minimum address rank to restrict * @param integer $iMinRank Minimum address rank to restrict
* search to. * search to.
* @param integer $iMaxRank Maximum address rank to restrict * @param integer $iMaxRank Maximum address rank to restrict
@@ -416,9 +416,9 @@ class SearchDescription
* matching place IDs and houseNumber the houseNumber * matching place IDs and houseNumber the houseNumber
* if appicable or -1 if not. * if appicable or -1 if not.
*/ */
public function query(&$oDB, &$aWordFrequencyScores, &$aExactMatchCache, $iMinRank, $iMaxRank, $iLimit) public function query(&$oDB, &$aWordFrequencyScores, $iMinRank, $iMaxRank, $iLimit)
{ {
$aPlaceIDs = array(); $aResults = array();
$iHousenumber = -1; $iHousenumber = -1;
if ($this->sCountryCode if ($this->sCountryCode
@@ -429,21 +429,21 @@ class SearchDescription
) { ) {
// Just looking for a country - look it up // Just looking for a country - look it up
if (4 >= $iMinRank && 4 <= $iMaxRank) { if (4 >= $iMinRank && 4 <= $iMaxRank) {
$aPlaceIDs = $this->queryCountry($oDB); $aResults = $this->queryCountry($oDB);
} }
} elseif (!sizeof($this->aName) && !sizeof($this->aAddress)) { } elseif (!sizeof($this->aName) && !sizeof($this->aAddress)) {
// Neither name nor address? Then we must be // Neither name nor address? Then we must be
// looking for a POI in a geographic area. // looking for a POI in a geographic area.
if ($this->oContext->isBoundedSearch()) { if ($this->oContext->isBoundedSearch()) {
$aPlaceIDs = $this->queryNearbyPoi($oDB, $iLimit); $aResults = $this->queryNearbyPoi($oDB, $iLimit);
} }
} elseif ($this->iOperator == Operator::POSTCODE) { } elseif ($this->iOperator == Operator::POSTCODE) {
// looking for postcode // looking for postcode
$aPlaceIDs = $this->queryPostcode($oDB, $iLimit); $aResults = $this->queryPostcode($oDB, $iLimit);
} else { } else {
// Ordinary search: // Ordinary search:
// First search for places according to name and address. // First search for places according to name and address.
$aNamedPlaceIDs = $this->queryNamedPlace( $aResults = $this->queryNamedPlace(
$oDB, $oDB,
$aWordFrequencyScores, $aWordFrequencyScores,
$iMinRank, $iMinRank,
@@ -451,52 +451,50 @@ class SearchDescription
$iLimit $iLimit
); );
if (sizeof($aNamedPlaceIDs)) {
foreach ($aNamedPlaceIDs as $aRow) {
$aPlaceIDs[] = $aRow['place_id'];
$aExactMatchCache[$aRow['place_id']] = $aRow['exactmatch'];
}
}
//now search for housenumber, if housenumber provided //now search for housenumber, if housenumber provided
if ($this->sHouseNumber && sizeof($aPlaceIDs)) { if ($this->sHouseNumber && sizeof($aResults)) {
$aResult = $this->queryHouseNumber($oDB, $aPlaceIDs, $iLimit); $aNamedPlaceIDs = $aResults;
$aResults = $this->queryHouseNumber($oDB, $aNamedPlaceIDs, $iLimit);
if (sizeof($aResult)) { if (!sizeof($aResults) && $this->looksLikeFullAddress()) {
$iHousenumber = $aResult['iHouseNumber']; $aResults = $aNamedPlaceIDs;
$aPlaceIDs = $aResult['aPlaceIDs'];
} elseif (!$this->looksLikeFullAddress()) {
$aPlaceIDs = array();
} }
} }
// finally get POIs if requested // finally get POIs if requested
if ($this->sClass && sizeof($aPlaceIDs)) { if ($this->sClass && sizeof($aResults)) {
$aPlaceIDs = $this->queryPoiByOperator($oDB, $aPlaceIDs, $iLimit); $aResults = $this->queryPoiByOperator($oDB, $aResults, $iLimit);
} }
} }
if (CONST_Debug) { if (CONST_Debug) {
echo "<br><b>Place IDs:</b> "; echo "<br><b>Place IDs:</b> ";
var_Dump($aPlaceIDs); var_dump(array_keys($aResults));
} }
if (sizeof($aPlaceIDs) && $this->sPostcode) { if (sizeof($aResults) && $this->sPostcode) {
$sSQL = 'SELECT place_id FROM placex'; $sPlaceIds = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX);
$sSQL .= ' WHERE place_id in ('.join(',', $aPlaceIDs).')'; if ($sPlaceIds) {
$sSQL .= " AND postcode = '".$this->sPostcode."'"; $sSQL = 'SELECT place_id FROM placex';
if (CONST_Debug) var_dump($sSQL); $sSQL .= ' WHERE place_id in ('.$sPlaceIds.')';
$aFilteredPlaceIDs = chksql($oDB->getCol($sSQL)); $sSQL .= " AND postcode = '".$this->sPostcode."'";
if ($aFilteredPlaceIDs) { if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = $aFilteredPlaceIDs; $aFilteredPlaceIDs = chksql($oDB->getCol($sSQL));
if (CONST_Debug) { if ($aFilteredPlaceIDs) {
echo "<br><b>Place IDs after postcode filtering:</b> "; $aNewResults = array();
var_Dump($aPlaceIDs); foreach ($aFilteredPlaceIDs as $iPlaceId) {
$aNewResults[$iPlaceId] = $aResults[$iPLaceId];
}
$aResults = $aNewResults;
if (CONST_Debug) {
echo "<br><b>Place IDs after postcode filtering:</b> ";
var_dump(array_keys($aResults));
}
} }
} }
} }
return array('IDs' => $aPlaceIDs, 'houseNumber' => $iHousenumber); return $aResults;
} }
@@ -512,7 +510,12 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
return chksql($oDB->getCol($sSQL)); $aResults = array();
foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
$aResults[$iPlaceId] = new Result($iPlaceId);
}
return $aResults;
} }
private function queryNearbyPoi(&$oDB, $iLimit) private function queryNearbyPoi(&$oDB, $iLimit)
@@ -521,6 +524,7 @@ class SearchDescription
return array(); return array();
} }
$aDBResults = array();
$sPoiTable = $this->poiTable(); $sPoiTable = $this->poiTable();
$sSQL = 'SELECT count(*) FROM pg_tables WHERE tablename = \''.$sPoiTable."'"; $sSQL = 'SELECT count(*) FROM pg_tables WHERE tablename = \''.$sPoiTable."'";
@@ -546,7 +550,7 @@ class SearchDescription
} }
$sSQL .= " limit $iLimit"; $sSQL .= " limit $iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
return chksql($oDB->getCol($sSQL)); $aDBResults = chksql($oDB->getCol($sSQL));
} }
if ($this->oContext->hasNearPoint()) { if ($this->oContext->hasNearPoint()) {
@@ -560,10 +564,15 @@ class SearchDescription
$sSQL .= ' ORDER BY '.$this->oContext->distanceSQL('centroid')." ASC"; $sSQL .= ' ORDER BY '.$this->oContext->distanceSQL('centroid')." ASC";
$sSQL .= " LIMIT $iLimit"; $sSQL .= " LIMIT $iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
return chksql($oDB->getCol($sSQL)); $aDBResults = chksql($oDB->getCol($sSQL));
} }
return array(); $aResults = array();
foreach ($aDBResults as $iPlaceId) {
$aResults[$iPlaceId] = new Result($iPlaceId);
}
return $aResults;
} }
private function queryPostcode(&$oDB, $iLimit) private function queryPostcode(&$oDB, $iLimit)
@@ -586,7 +595,12 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
return chksql($oDB->getCol($sSQL)); $aResults = array();
foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
$aResults[$iPlaceId] = new Result($iPlaceId, Result::TABLE_POSTCODE);
}
return $aResults;
} }
private function queryNamedPlace(&$oDB, $aWordFrequencyScores, $iMinAddressRank, $iMaxAddressRank, $iLimit) private function queryNamedPlace(&$oDB, $aWordFrequencyScores, $iMinAddressRank, $iMaxAddressRank, $iLimit)
@@ -701,6 +715,8 @@ class SearchDescription
$iLimit = 20; $iLimit = 20;
} }
$aResults = array();
if (sizeof($aTerms)) { if (sizeof($aTerms)) {
$sSQL = 'SELECT place_id,'.$sExactMatchSQL; $sSQL = 'SELECT place_id,'.$sExactMatchSQL;
$sSQL .= ' FROM search_name'; $sSQL .= ' FROM search_name';
@@ -710,18 +726,29 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
return chksql( $aDBResults = chksql(
$oDB->getAll($sSQL), $oDB->getAll($sSQL),
"Could not get places for search terms." "Could not get places for search terms."
); );
foreach ($aDBResults as $aResult) {
$oResult = new Result($aResult['place_id']);
$oResult->iExactMatches = $aResult['exactmatch'];
$aResults[$aResult['place_id']] = $oResult;
}
} }
return array(); return $aResults;
} }
private function queryHouseNumber(&$oDB, $aRoadPlaceIDs, $iLimit) private function queryHouseNumber(&$oDB, $aRoadPlaceIDs, $iLimit)
{ {
$sPlaceIDs = join(',', $aRoadPlaceIDs); $aResults = array();
$sPlaceIDs = Result::joinIdsByTable($aRoadPlaceIDs, Result::TABLE_PLACEX);
if (!$sPlaceIDs) {
return $aResults;
}
$sHouseNumberRegex = '\\\\m'.$this->sHouseNumber.'\\\\M'; $sHouseNumberRegex = '\\\\m'.$this->sHouseNumber.'\\\\M';
$sSQL = 'SELECT place_id FROM placex '; $sSQL = 'SELECT place_id FROM placex ';
@@ -732,15 +759,14 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($oDB->getCol($sSQL)); // XXX should inherit the exactMatches from its parent
foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
if (sizeof($aPlaceIDs)) { $aResults[$iPlaceId] = new Result($iPlaceId);
return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => -1);
} }
$bIsIntHouseNumber= (bool) preg_match('/[0-9]+/', $this->sHouseNumber); $bIsIntHouseNumber= (bool) preg_match('/[0-9]+/', $this->sHouseNumber);
$iHousenumber = intval($this->sHouseNumber); $iHousenumber = intval($this->sHouseNumber);
if ($bIsIntHouseNumber) { if ($bIsIntHouseNumber && !sizeof($aResults)) {
// if nothing found, search in the interpolation line table // if nothing found, search in the interpolation line table
$sSQL = 'SELECT distinct place_id FROM location_property_osmline'; $sSQL = 'SELECT distinct place_id FROM location_property_osmline';
$sSQL .= ' WHERE startnumber is not NULL'; $sSQL .= ' WHERE startnumber is not NULL';
@@ -761,15 +787,15 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($oDB->getCol($sSQL, 0)); foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
$oResult = new Result($iPlaceId, Result::TABLE_OSMLINE);
if (sizeof($aPlaceIDs)) { $oResult->iHouseNumber = $iHousenumber;
return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => $iHousenumber); $aResults[$iPlaceId] = $oResult;
} }
} }
// If nothing found try the aux fallback table // If nothing found try the aux fallback table
if (CONST_Use_Aux_Location_data) { if (CONST_Use_Aux_Location_data && !sizeof($aResults)) {
$sSQL = 'SELECT place_id FROM location_property_aux'; $sSQL = 'SELECT place_id FROM location_property_aux';
$sSQL .= ' WHERE parent_place_id in ('.$sPlaceIDs.')'; $sSQL .= ' WHERE parent_place_id in ('.$sPlaceIDs.')';
$sSQL .= " AND housenumber = '".$this->sHouseNumber."'"; $sSQL .= " AND housenumber = '".$this->sHouseNumber."'";
@@ -778,16 +804,14 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($oDB->getCol($sSQL)); foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
$aResults[$iPlaceId] = new Result($iPlaceId, Result::TABLE_AUX);
if (sizeof($aPlaceIDs)) {
return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => -1);
} }
} }
// If nothing found then search in Tiger data (location_property_tiger) // If nothing found then search in Tiger data (location_property_tiger)
if (CONST_Use_US_Tiger_Data && $bIsIntHouseNumber) { if (CONST_Use_US_Tiger_Data && $bIsIntHouseNumber && !sizeof($aResults)) {
$sSQL = 'SELECT distinct place_id FROM location_property_tiger'; $sSQL = 'SELECT place_id FROM location_property_tiger';
$sSQL .= ' WHERE parent_place_id in ('.$sPlaceIDs.') and ('; $sSQL .= ' WHERE parent_place_id in ('.$sPlaceIDs.') and (';
if ($iHousenumber % 2 == 0) { if ($iHousenumber % 2 == 0) {
$sSQL .= "interpolationtype='even'"; $sSQL .= "interpolationtype='even'";
@@ -802,21 +826,25 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($oDB->getCol($sSQL, 0)); foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
$oResult = new Result($iPlaceId, Result::TABLE_TIGER);
if (sizeof($aPlaceIDs)) { $oResult->iHouseNumber = $iHousenumber;
return array('aPlaceIDs' => $aPlaceIDs, 'iHouseNumber' => $iHousenumber); $aResults[$iPlaceId] = $oResult;
} }
} }
return array(); return $aResults;
} }
private function queryPoiByOperator(&$oDB, $aParentIDs, $iLimit) private function queryPoiByOperator(&$oDB, $aParentIDs, $iLimit)
{ {
$sPlaceIDs = join(',', $aParentIDs); $aResults = array();
$aClassPlaceIDs = array(); $sPlaceIDs = Result::joinIdsByTable($aParentIDs, Result::TABLE_PLACEX);
if (!$sPlaceIDs) {
return $aResults;
}
if ($this->iOperator == Operator::TYPE || $this->iOperator == Operator::NAME) { if ($this->iOperator == Operator::TYPE || $this->iOperator == Operator::NAME) {
// If they were searching for a named class (i.e. 'Kings Head pub') // If they were searching for a named class (i.e. 'Kings Head pub')
@@ -832,7 +860,9 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aClassPlaceIDs = chksql($oDB->getCol($sSQL)); foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
$aResults[$iPlaceId] = new Result($iPlaceId);
}
} }
// NEAR and IN are handled the same // NEAR and IN are handled the same
@@ -912,7 +942,9 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($oDB->getCol($sSQL))); foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
$aResults[$iPlaceId] = new Result($iPlaceId);
}
} else { } else {
if ($this->oContext->hasNearPoint()) { if ($this->oContext->hasNearPoint()) {
$fRange = $this->oContext->nearRadius(); $fRange = $this->oContext->nearRadius();
@@ -942,12 +974,14 @@ class SearchDescription
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($oDB->getCol($sSQL))); foreach (chksql($oDB->getCol($sSQL)) as $iPlaceId) {
$aResults[$iPlaceId] = new Result($iPlaceId);
}
} }
} }
} }
return $aClassPlaceIDs; return $aResults;
} }
private function poiTable() private function poiTable()