hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-07 02:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup of SQL for readability. No logic change

Browse Source
This commit is contained in:
marc tobias
2016-10-29 18:49:21 +02:00
committed by Sarah Hoffmann
parent d4daa0c4fa
commit 4f3074e538
2 changed files with 461 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

552
lib/Geocode.php
View File

@@ -169,10 +169,10 @@ class Geocode
} }
$this->sViewboxCentreSQL .= ")'::geometry,4326)"; $this->sViewboxCentreSQL .= ")'::geometry,4326)";
$this->sViewboxSmallSQL = 'st_buffer('.$this->sViewboxCentreSQL; $this->sViewboxSmallSQL = 'ST_BUFFER('.$this->sViewboxCentreSQL;
$this->sViewboxSmallSQL .= ','.($fRouteWidth/69).')'; $this->sViewboxSmallSQL .= ','.($fRouteWidth/69).')';
$this->sViewboxLargeSQL = 'st_buffer('.$this->sViewboxCentreSQL; $this->sViewboxLargeSQL = 'ST_BUFFER('.$this->sViewboxCentreSQL;
$this->sViewboxLargeSQL .= ','.($fRouteWidth/30).')'; $this->sViewboxLargeSQL .= ','.($fRouteWidth/30).')';
} }
@@ -199,8 +199,20 @@ class Geocode
$aBigViewBox[3] = $this->aViewBox[3] - $fWidth; $aBigViewBox[3] = $this->aViewBox[3] - $fWidth;
$this->sViewboxCentreSQL = false; $this->sViewboxCentreSQL = false;
$this->sViewboxSmallSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".$this->aViewBox[0].",".$this->aViewBox[1]."),ST_Point(".$this->aViewBox[2].",".$this->aViewBox[3].")),4326)"; $this->sViewboxSmallSQL = sprintf(
$this->sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".$aBigViewBox[0].",".$aBigViewBox[1]."),ST_Point(".$aBigViewBox[2].",".$aBigViewBox[3].")),4326)"; 'ST_SetSRID(ST_MakeBox2D(ST_Point(%F,%F),ST_Point(%F,%F)),4326)',
$this->aViewBox[0],
$this->aViewBox[1],
$this->aViewBox[2],
$this->aViewBox[3]
);
$this->sViewboxLargeSQL = sprintf(
'ST_SetSRID(ST_MakeBox2D(ST_Point(%F,%F),ST_Point(%F,%F)),4326)',
$aBigViewBox[0],
$aBigViewBox[1],
$aBigViewBox[2],
$aBigViewBox[3]
);
} }
public function setNearPoint($aNearPoint, $fRadiusDeg = 0.1) public function setNearPoint($aNearPoint, $fRadiusDeg = 0.1)
@@ -388,37 +400,71 @@ class Geocode
$sPlaceIDs = join(',', array_keys($aPlaceIDs)); $sPlaceIDs = join(',', array_keys($aPlaceIDs));
$sImportanceSQL = ''; $sImportanceSQL = '';
if ($this->sViewboxSmallSQL) $sImportanceSQL .= " case when ST_Contains($this->sViewboxSmallSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * "; if ($this->sViewboxSmallSQL) $sImportanceSQL .= " CASE WHEN ST_Contains($this->sViewboxSmallSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
if ($this->sViewboxLargeSQL) $sImportanceSQL .= " case when ST_Contains($this->sViewboxLargeSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * "; if ($this->sViewboxLargeSQL) $sImportanceSQL .= " CASE WHEN ST_Contains($this->sViewboxLargeSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code,"; $sSQL = "SELECT ";
$sSQL .= "get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) as langaddress,"; $sSQL .= " osm_type,";
$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,"; $sSQL .= " osm_id,";
$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,"; $sSQL .= " class,";
if ($this->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text as extra,"; $sSQL .= " type,";
if ($this->bIncludeNameDetails) $sSQL .= "hstore_to_json(name)::text as names,"; $sSQL .= " admin_level,";
$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, "; $sSQL .= " rank_search,";
$sSQL .= $sImportanceSQL."coalesce(importance,0.75-(rank_search::float/40)) as importance, "; $sSQL .= " rank_address,";
$sSQL .= "(select max(p.importance*(p.rank_address+2))"; $sSQL .= " min(place_id) AS place_id, ";
$sSQL .= " from place_addressline s, placex p"; $sSQL .= " min(parent_place_id) AS parent_place_id, ";
$sSQL .= " where s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)"; $sSQL .= " calculated_country_code AS country_code, ";
$sSQL .= " and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, "; $sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress,";
$sSQL .= "(extratags->'place') as extra_place "; $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) AS placename,";
$sSQL .= "from placex where place_id in ($sPlaceIDs) "; $sSQL .= " get_name_by_language(name, ARRAY['ref']) AS ref,";
$sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank "; if ($this->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text AS extra,";
if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'"; if ($this->bIncludeNameDetails) $sSQL .= "hstore_to_json(name)::text AS names,";
if ($this->aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',', $this->aAddressRankList).")"; $sSQL .= " avg(ST_X(centroid)) AS lon, ";
$sSQL .= ") "; $sSQL .= " avg(ST_Y(centroid)) AS lat, ";
if ($this->sAllowedTypesSQLList) $sSQL .= "and placex.class in $this->sAllowedTypesSQLList "; $sSQL .= " ".$sImportanceSQL."COALESCE(importance,0.75-(rank_search::float/40)) AS importance, ";
$sSQL .= "and linked_place_id is null "; $sSQL .= " ( ";
$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance"; $sSQL .= " SELECT max(p.importance*(p.rank_address+2))";
if (!$this->bDeDupe) $sSQL .= ",place_id"; $sSQL .= " FROM ";
$sSQL .= ",langaddress "; $sSQL .= " place_addressline s, ";
$sSQL .= ",placename "; $sSQL .= " placex p";
$sSQL .= ",ref "; $sSQL .= " WHERE s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)";
if ($this->bIncludeExtraTags) $sSQL .= ",extratags"; $sSQL .= " AND p.place_id = s.address_place_id ";
if ($this->bIncludeNameDetails) $sSQL .= ",name"; $sSQL .= " AND s.isaddress ";
$sSQL .= ",extratags->'place' "; $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 .= " calculated_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' ";
if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank) { if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank) {
// only Tiger housenumbers and interpolation lines need to be interpolated, because they are saved as lines // only Tiger housenumbers and interpolation lines need to be interpolated, because they are saved as lines
@@ -434,83 +480,151 @@ class Geocode
if (CONST_Use_US_Tiger_Data) { 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) // 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 .= " union";
$sSQL .= " select 'T' as osm_type, place_id as osm_id, 'place' as class,"; $sSQL .= " SELECT ";
$sSQL .= " 'house' as type, null as admin_level, 30 as rank_search,"; $sSQL .= " 'T' AS osm_type, ";
$sSQL .= " 30 as rank_address, min(place_id) as place_id,"; $sSQL .= " place_id AS osm_id, ";
$sSQL .= " min(parent_place_id) as parent_place_id, 'us' as country_code,"; $sSQL .= " 'place' AS class, ";
$sSQL .= " get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress,"; $sSQL .= " 'house' AS type, ";
$sSQL .= " null as placename, null as ref"; $sSQL .= " null AS admin_level, ";
if ($this->bIncludeExtraTags) $sSQL .= ", null as extra"; $sSQL .= " 30 AS rank_search, ";
if ($this->bIncludeNameDetails) $sSQL .= ", null as names"; $sSQL .= " 30 AS rank_address, ";
$sSQL .= ", avg(st_x(centroid)) as lon, avg(st_y(centroid)) as lat,"; $sSQL .= " min(place_id) AS place_id, ";
$sSQL .= $sImportanceSQL."-1.15 as importance "; $sSQL .= " min(parent_place_id) AS parent_place_id, ";
$sSQL .= ", (select max(p.importance*(p.rank_address+2))"; $sSQL .= " 'us' AS country_code, ";
$sSQL .= " from place_addressline s, placex p"; $sSQL .= " get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress,";
$sSQL .= " where s.place_id = min(blub.parent_place_id)"; $sSQL .= " null AS placename, ";
$sSQL .= " and p.place_id = s.address_place_id and s.isaddress"; $sSQL .= " null AS ref, ";
$sSQL .= " and p.importance is not null) as addressimportance "; if ($this->bIncludeExtraTags) $sSQL .= "null AS extra,";
$sSQL .= ", null as extra_place "; if ($this->bIncludeNameDetails) $sSQL .= "null AS names,";
$sSQL .= " from (select place_id"; $sSQL .= " avg(st_x(centroid)) AS lon, ";
// interpolate the Tiger housenumbers here $sSQL .= " avg(st_y(centroid)) AS lat,";
$sSQL .= ", ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) as centroid, parent_place_id, housenumber_for_place"; $sSQL .= " ".$sImportanceSQL."-1.15 AS importance, ";
$sSQL .= " from (location_property_tiger "; $sSQL .= " (";
$sSQL .= " join (values ".$sHousenumbers.") as housenumbers(place_id, housenumber_for_place) using(place_id)) "; $sSQL .= " SELECT max(p.importance*(p.rank_address+2))";
$sSQL .= " where housenumber_for_place>=0 and 30 between $this->iMinAddressRank and $this->iMaxAddressRank) as blub"; //postgres wants an alias here $sSQL .= " FROM ";
$sSQL .= " group by place_id, housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique $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 "; if (!$this->bDeDupe) $sSQL .= ", place_id ";
} }
// osmline // 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) // 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 .= " UNION ";
$sSQL .= "select 'W' as osm_type, place_id as osm_id, 'place' as class,"; $sSQL .= "SELECT ";
$sSQL .= " 'house' as type, null as admin_level, 30 as rank_search,"; $sSQL .= " 'W' AS osm_type, ";
$sSQL .= " 30 as rank_address, min(place_id) as place_id,"; $sSQL .= " place_id AS osm_id, ";
$sSQL .= " min(parent_place_id) as parent_place_id, calculated_country_code as country_code, "; $sSQL .= " 'place' AS class, ";
$sSQL .= "get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress, "; $sSQL .= " 'house' AS type, ";
$sSQL .= "null as placename, "; $sSQL .= " null AS admin_level, ";
$sSQL .= "null as ref, "; $sSQL .= " 30 AS rank_search, ";
if ($this->bIncludeExtraTags) $sSQL .= "null as extra, "; $sSQL .= " 30 AS rank_address, ";
if ($this->bIncludeNameDetails) $sSQL .= "null as names, "; $sSQL .= " min(place_id) as place_id, ";
$sSQL .= " avg(st_x(centroid)) as lon, avg(st_y(centroid)) as lat,"; $sSQL .= " min(parent_place_id) AS parent_place_id, ";
$sSQL .= $sImportanceSQL."-0.1 as importance, "; // slightly smaller than the importance for normal houses with rank 30, which is 0 $sSQL .= " calculated_country_code AS country_code, ";
$sSQL .= " (select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p"; $sSQL .= " get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress, ";
$sSQL .= " where s.place_id = min(blub.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance,"; $sSQL .= " null AS placename, ";
$sSQL .= " null as extra_place "; $sSQL .= " null AS ref, ";
$sSQL .= " from (select place_id, calculated_country_code "; if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
// interpolate the housenumbers here if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
$sSQL .= ", CASE WHEN startnumber != endnumber THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) "; $sSQL .= " AVG(st_x(centroid)) AS lon, ";
$sSQL .= " ELSE ST_LineInterpolatePoint(linegeo, 0.5) END as centroid"; $sSQL .= " AVG(st_y(centroid)) AS lat, ";
$sSQL .= ", parent_place_id, housenumber_for_place "; $sSQL .= " ".$sImportanceSQL."-0.1 AS importance, "; // slightly smaller than the importance for normal houses with rank 30, which is 0
$sSQL .= " from (location_property_osmline "; $sSQL .= " (";
$sSQL .= " join (values ".$sHousenumbers.") as housenumbers(place_id, housenumber_for_place) using(place_id)) "; $sSQL .= " SELECT ";
$sSQL .= " where housenumber_for_place>=0 and 30 between $this->iMinAddressRank and $this->iMaxAddressRank) as blub"; //postgres wants an alias here $sSQL .= " MAX(p.importance*(p.rank_address+2)) ";
$sSQL .= " group by place_id, housenumber_for_place, calculated_country_code "; //is this group by really needed?, place_id + housenumber (in combination) are unique $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 ";
$sSQL .= " place_id, ";
$sSQL .= " calculated_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 .= " calculated_country_code "; //is this group by really needed?, place_id + housenumber (in combination) are unique
if (!$this->bDeDupe) $sSQL .= ", place_id "; if (!$this->bDeDupe) $sSQL .= ", place_id ";
if (CONST_Use_Aux_Location_data) { if (CONST_Use_Aux_Location_data) {
$sSQL .= " union "; $sSQL .= " UNION ";
$sSQL .= "select 'L' as osm_type, place_id as osm_id, 'place' as class,"; $sSQL .= " SELECT ";
$sSQL .= " 'house' as type, null as admin_level, 0 as rank_search,"; $sSQL .= " 'L' AS osm_type, ";
$sSQL .= " 0 as rank_address, min(place_id) as place_id,"; $sSQL .= " place_id AS osm_id, ";
$sSQL .= " min(parent_place_id) as parent_place_id, 'us' as country_code, "; $sSQL .= " 'place' AS class,";
$sSQL .= "get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) as langaddress, "; $sSQL .= " 'house' AS type, ";
$sSQL .= "null as placename, "; $sSQL .= " null AS admin_level, ";
$sSQL .= "null as ref, "; $sSQL .= " 0 AS rank_search,";
if ($this->bIncludeExtraTags) $sSQL .= "null as extra, "; $sSQL .= " 0 AS rank_address, ";
if ($this->bIncludeNameDetails) $sSQL .= "null as names, "; $sSQL .= " min(place_id) AS place_id,";
$sSQL .= "avg(ST_X(centroid)) as lon, avg(ST_Y(centroid)) as lat, "; $sSQL .= " min(parent_place_id) AS parent_place_id, ";
$sSQL .= $sImportanceSQL."-1.10 as importance, "; $sSQL .= " 'us' AS country_code, ";
$sSQL .= "(select max(p.importance*(p.rank_address+2))"; $sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress, ";
$sSQL .= " from place_addressline s, placex p"; $sSQL .= " null AS placename, ";
$sSQL .= " where s.place_id = min(location_property_aux.parent_place_id)"; $sSQL .= " null AS ref, ";
$sSQL .= " and p.place_id = s.address_place_id and s.isaddress"; if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
$sSQL .= " and p.importance is not null) as addressimportance, "; if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
$sSQL .= "null as extra_place "; $sSQL .= " avg(ST_X(centroid)) AS lon, ";
$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) "; $sSQL .= " avg(ST_Y(centroid)) AS lat, ";
$sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank "; $sSQL .= " ".$sImportanceSQL."-1.10 AS importance, ";
$sSQL .= "group by place_id"; $sSQL .= " ( ";
if (!$this->bDeDupe) $sSQL .= ", place_id"; $sSQL .= " SELECT max(p.importance*(p.rank_address+2))";
$sSQL .= ", get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) "; $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 .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) ";
} }
} }
@@ -873,9 +987,15 @@ class Geocode
foreach ($aSpecialTermsRaw as $aSpecialTerm) { foreach ($aSpecialTermsRaw as $aSpecialTerm) {
$sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery); $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
$sToken = chksql($this->oDB->getOne("select make_standard_name('".$aSpecialTerm[1]."') as string")); $sToken = chksql($this->oDB->getOne("SELECT make_standard_name('".$aSpecialTerm[1]."') AS string"));
$sSQL = 'select * from (select word_id,word_token, word, class, type, country_code, operator'; $sSQL = 'SELECT * ';
$sSQL .= ' from word where word_token in (\' '.$sToken.'\')) as x where (class is not null and class not in (\'place\')) or country_code is not null'; $sSQL .= 'FROM ( ';
$sSQL .= ' SELECT word_id, word_token, word, class, type, country_code, operator';
$sSQL .= ' FROM word ';
$sSQL .= ' WHERE word_token in (\' '.$sToken.'\')';
$sSQL .= ') AS x ';
$sSQL .= ' WHERE (class is not null AND class not in (\'place\')) ';
$sSQL .= ' OR country_code is not null';
if (CONST_Debug) var_Dump($sSQL); if (CONST_Debug) var_Dump($sSQL);
$aSearchWords = chksql($this->oDB->getAll($sSQL)); $aSearchWords = chksql($this->oDB->getAll($sSQL));
$aNewSearches = array(); $aNewSearches = array();
@@ -915,7 +1035,7 @@ class Geocode
$aTokens = array(); $aTokens = array();
foreach ($aPhrases as $iPhrase => $sPhrase) { foreach ($aPhrases as $iPhrase => $sPhrase) {
$aPhrase = chksql( $aPhrase = chksql(
$this->oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string"), $this->oDB->getRow("SELECT make_standard_name('".pg_escape_string($sPhrase)."') as string"),
"Cannot normalize query string (is it a UTF-8 string?)" "Cannot normalize query string (is it a UTF-8 string?)"
); );
if (trim($aPhrase['string'])) { if (trim($aPhrase['string'])) {
@@ -934,8 +1054,9 @@ class Geocode
if (sizeof($aTokens)) { if (sizeof($aTokens)) {
// Check which tokens we have, get the ID numbers // Check which tokens we have, get the ID numbers
$sSQL = 'select word_id,word_token, word, class, type, country_code, operator, search_name_count'; $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, operator, search_name_count';
$sSQL .= ' from word where word_token in ('.join(',', array_map("getDBQuoted", $aTokens)).')'; $sSQL .= ' FROM word ';
$sSQL .= ' WHERE word_token in ('.join(',', array_map("getDBQuoted", $aTokens)).')';
if (CONST_Debug) var_Dump($sSQL); if (CONST_Debug) var_Dump($sSQL);
@@ -1111,11 +1232,11 @@ class Geocode
if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber']) { if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber']) {
// Just looking for a country by code - look it up // Just looking for a country by code - look it up
if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank) { if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank) {
$sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4"; $sSQL = "SELECT place_id FROM placex WHERE calculated_country_code='".$aSearch['sCountryCode']."' AND rank_search = 4";
if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)"; if ($sCountryCodesSQL) $sSQL .= " AND calculated_country_code in ($sCountryCodesSQL)";
if ($bBoundingBoxSearch) if ($bBoundingBoxSearch)
$sSQL .= " and _st_intersects($this->sViewboxSmallSQL, geometry)"; $sSQL .= " AND _st_intersects($this->sViewboxSmallSQL, geometry)";
$sSQL .= " order by st_area(geometry) desc limit 1"; $sSQL .= " ORDER BY st_area(geometry) DESC LIMIT 1";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
} else { } else {
@@ -1125,16 +1246,16 @@ class Geocode
if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue; if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue;
if (!$aSearch['sClass']) continue; if (!$aSearch['sClass']) continue;
$sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'"; $sSQL = "SELECT COUNT(*) FROM pg_tables WHERE tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
if (chksql($this->oDB->getOne($sSQL))) { if (chksql($this->oDB->getOne($sSQL))) {
$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct"; $sSQL = "SELECT place_id FROM place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)"; if ($sCountryCodesSQL) $sSQL .= " JOIN placex USING (place_id)";
$sSQL .= " where st_contains($this->sViewboxSmallSQL, ct.centroid)"; $sSQL .= " WHERE st_contains($this->sViewboxSmallSQL, ct.centroid)";
if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)"; if ($sCountryCodesSQL) $sSQL .= " AND calculated_country_code in ($sCountryCodesSQL)";
if (sizeof($this->aExcludePlaceIDs)) { if (sizeof($this->aExcludePlaceIDs)) {
$sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")"; $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";
} }
if ($this->sViewboxCentreSQL) $sSQL .= " order by st_distance($this->sViewboxCentreSQL, ct.centroid) asc"; if ($this->sViewboxCentreSQL) $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, ct.centroid) ASC";
$sSQL .= " limit $this->iLimit"; $sSQL .= " limit $this->iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
@@ -1144,21 +1265,25 @@ class Geocode
// expansion in that case. // expansion in that case.
// Also don't expand if bounded results were requested. // Also don't expand if bounded results were requested.
if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs) && !$this->bBoundedSearch) { if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs) && !$this->bBoundedSearch) {
$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct"; $sSQL = "SELECT place_id FROM place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)"; if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
$sSQL .= " where st_contains($this->sViewboxLargeSQL, ct.centroid)"; $sSQL .= " WHERE ST_Contains($this->sViewboxLargeSQL, ct.centroid)";
if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)"; if ($sCountryCodesSQL) $sSQL .= " AND calculated_country_code in ($sCountryCodesSQL)";
if ($this->sViewboxCentreSQL) $sSQL .= " order by st_distance($this->sViewboxCentreSQL, ct.centroid) asc"; if ($this->sViewboxCentreSQL) $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, ct.centroid) ASC";
$sSQL .= " limit $this->iLimit"; $sSQL .= " LIMIT $this->iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
} }
} else { } else {
$sSQL = "select place_id from placex where class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'"; $sSQL = "SELECT place_id ";
$sSQL .= " and st_contains($this->sViewboxSmallSQL, geometry) and linked_place_id is null"; $sSQL .= "FROM placex ";
if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)"; $sSQL .= "WHERE class='".$aSearch['sClass']."' ";
if ($this->sViewboxCentreSQL) $sSQL .= " order by st_distance($this->sViewboxCentreSQL, centroid) asc"; $sSQL .= " AND type='".$aSearch['sType']."'";
$sSQL .= " limit $this->iLimit"; $sSQL .= " AND ST_Contains($this->sViewboxSmallSQL, geometry) ";
$sSQL .= " AND linked_place_id is null";
if ($sCountryCodesSQL) $sSQL .= " AND calculated_country_code in ($sCountryCodesSQL)";
if ($this->sViewboxCentreSQL) $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, centroid) ASC";
$sSQL .= " LIMIT $this->iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
} }
@@ -1177,12 +1302,25 @@ class Geocode
if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress'])) { if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress'])) {
$sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M'; $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
$aOrder[] = ""; $aOrder[] = "";
$aOrder[0] = " (exists(select place_id from placex where parent_place_id = search_name.place_id"; $aOrder[0] = " (";
$aOrder[0] .= " and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) "; $aOrder[0] .= " EXISTS(";
$aOrder[0] .= " SELECT place_id ";
$aOrder[0] .= " FROM placex ";
$aOrder[0] .= " WHERE parent_place_id = search_name.place_id";
$aOrder[0] .= " AND transliteration(housenumber) ~* E'".$sHouseNumberRegex."' ";
$aOrder[0] .= " LIMIT 1";
$aOrder[0] .= " ) ";
// also housenumbers from interpolation lines table are needed // also housenumbers from interpolation lines table are needed
$aOrder[0] .= " or exists(select place_id from location_property_osmline where parent_place_id = search_name.place_id"; $aOrder[0] .= " OR EXISTS(";
$aOrder[0] .= " and ".intval($aSearch['sHouseNumber']).">=startnumber and ".intval($aSearch['sHouseNumber'])."<=endnumber limit 1))"; $aOrder[0] .= " SELECT place_id ";
$aOrder[0] .= " desc"; $aOrder[0] .= " FROM location_property_osmline ";
$aOrder[0] .= " WHERE parent_place_id = search_name.place_id";
$aOrder[0] .= " AND ".intval($aSearch['sHouseNumber']).">=startnumber ";
$aOrder[0] .= " AND ".intval($aSearch['sHouseNumber'])."<=endnumber ";
$aOrder[0] .= " LIMIT 1";
$aOrder[0] .= " )";
$aOrder[0] .= " )";
$aOrder[0] .= " DESC";
} }
// TODO: filter out the pointless search terms (2 letter name tokens and less) // TODO: filter out the pointless search terms (2 letter name tokens and less)
@@ -1215,7 +1353,13 @@ class Geocode
} }
} }
if ($aSearch['fLon'] && $aSearch['fLat']) { if ($aSearch['fLon'] && $aSearch['fLat']) {
$aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")"; $aTerms[] = sprintf(
'ST_DWithin(centroid, ST_SetSRID(ST_Point(%F,%F),4326), %F)',
$aSearch['fLon'],
$aSearch['fLat'],
$aSearch['fRadius']
);
$aOrder[] = "ST_Distance(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326)) ASC"; $aOrder[] = "ST_Distance(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326)) ASC";
} }
if (sizeof($this->aExcludePlaceIDs)) { if (sizeof($this->aExcludePlaceIDs)) {
@@ -1226,36 +1370,42 @@ class Geocode
} }
if ($bBoundingBoxSearch) $aTerms[] = "centroid && $this->sViewboxSmallSQL"; if ($bBoundingBoxSearch) $aTerms[] = "centroid && $this->sViewboxSmallSQL";
if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc"; if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) ASC";
if ($aSearch['sHouseNumber']) { if ($aSearch['sHouseNumber']) {
$sImportanceSQL = '- abs(26 - address_rank) + 3'; $sImportanceSQL = '- abs(26 - address_rank) + 3';
} else { } else {
$sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)'; $sImportanceSQL = '(CASE WHEN importance = 0 OR importance IS NULL THEN 0.75-(search_rank::float/40) ELSE importance END)';
} }
if ($this->sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($this->sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END"; if ($this->sViewboxSmallSQL) $sImportanceSQL .= " * CASE WHEN ST_Contains($this->sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
if ($this->sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($this->sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END"; if ($this->sViewboxLargeSQL) $sImportanceSQL .= " * CASE WHEN ST_Contains($this->sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
$aOrder[] = "$sImportanceSQL DESC"; $aOrder[] = "$sImportanceSQL DESC";
if (sizeof($aSearch['aFullNameAddress'])) { if (sizeof($aSearch['aFullNameAddress'])) {
$sExactMatchSQL = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'], ",").']) INTERSECT select unnest(nameaddress_vector))s) as exactmatch'; $sExactMatchSQL = ' ( ';
$sExactMatchSQL .= ' SELECT count(*) FROM ( ';
$sExactMatchSQL .= ' SELECT unnest(ARRAY['.join($aSearch['aFullNameAddress'], ",").']) ';
$sExactMatchSQL .= ' INTERSECT ';
$sExactMatchSQL .= ' SELECT unnest(nameaddress_vector)';
$sExactMatchSQL .= ' ) s';
$sExactMatchSQL .= ') as exactmatch';
$aOrder[] = 'exactmatch DESC'; $aOrder[] = 'exactmatch DESC';
} else { } else {
$sExactMatchSQL = '0::int as exactmatch'; $sExactMatchSQL = '0::int as exactmatch';
} }
if (sizeof($aTerms)) { if (sizeof($aTerms)) {
$sSQL = "select place_id, "; $sSQL = "SELECT place_id, ";
$sSQL .= $sExactMatchSQL; $sSQL .= $sExactMatchSQL;
$sSQL .= " from search_name"; $sSQL .= " FROM search_name";
$sSQL .= " where ".join(' and ', $aTerms); $sSQL .= " WHERE ".join(' and ', $aTerms);
$sSQL .= " order by ".join(', ', $aOrder); $sSQL .= " ORDER BY ".join(', ', $aOrder);
if ($aSearch['sHouseNumber'] || $aSearch['sClass']) { if ($aSearch['sHouseNumber'] || $aSearch['sClass']) {
$sSQL .= " limit 20"; $sSQL .= " LIMIT 20";
} elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass']) { } elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass']) {
$sSQL .= " limit 1"; $sSQL .= " LIMIT 1";
} else { } else {
$sSQL .= " limit ".$this->iLimit; $sSQL .= " LIMIT ".$this->iLimit;
} }
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
@@ -1287,11 +1437,12 @@ class Geocode
// Now they are indexed, look for a house attached to a street we found // Now they are indexed, look for a house attached to a street we found
$sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M'; $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
$sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and transliteration(housenumber) ~* E'".$sHouseNumberRegex."'"; $sSQL = "SELECT place_id FROM placex ";
$sSQL .= "WHERE parent_place_id in (".$sPlaceIDs.") and transliteration(housenumber) ~* E'".$sHouseNumberRegex."'";
if (sizeof($this->aExcludePlaceIDs)) { if (sizeof($this->aExcludePlaceIDs)) {
$sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")"; $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";
} }
$sSQL .= " limit $this->iLimit"; $sSQL .= " LIMIT $this->iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
@@ -1299,8 +1450,8 @@ class Geocode
if (!sizeof($aPlaceIDs)) { if (!sizeof($aPlaceIDs)) {
// do we need to use transliteration and the regex for housenumbers??? // do we need to use transliteration and the regex for housenumbers???
//new query for lines, not housenumbers anymore //new query for lines, not housenumbers anymore
$sSQL = "select distinct place_id from location_property_osmline"; $sSQL = "SELECT distinct place_id FROM location_property_osmline";
$sSQL .= " where parent_place_id in (".$sPlaceIDs.") and ("; $sSQL .= " WHERE parent_place_id in (".$sPlaceIDs.") and (";
if ($searchedHousenumber%2 == 0) { if ($searchedHousenumber%2 == 0) {
//if housenumber is even, look for housenumber in streets with interpolationtype even or all //if housenumber is even, look for housenumber in streets with interpolationtype even or all
$sSQL .= "interpolationtype='even'"; $sSQL .= "interpolationtype='even'";
@@ -1313,7 +1464,7 @@ class Geocode
$sSQL .= $searchedHousenumber."<=endnumber"; $sSQL .= $searchedHousenumber."<=endnumber";
if (sizeof($this->aExcludePlaceIDs)) { if (sizeof($this->aExcludePlaceIDs)) {
$sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")"; $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";
} }
//$sSQL .= " limit $this->iLimit"; //$sSQL .= " limit $this->iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
@@ -1323,9 +1474,11 @@ class Geocode
// If nothing found try the aux fallback table // If nothing found try the aux fallback table
if (CONST_Use_Aux_Location_data && !sizeof($aPlaceIDs)) { if (CONST_Use_Aux_Location_data && !sizeof($aPlaceIDs)) {
$sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'"; $sSQL = "SELECT place_id FROM location_property_aux ";
$sSQL .= " WHERE parent_place_id in (".$sPlaceIDs.") ";
$sSQL .= " AND housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
if (sizeof($this->aExcludePlaceIDs)) { if (sizeof($this->aExcludePlaceIDs)) {
$sSQL .= " and parent_place_id not in (".join(',', $this->aExcludePlaceIDs).")"; $sSQL .= " AND parent_place_id not in (".join(',', $this->aExcludePlaceIDs).")";
} }
//$sSQL .= " limit $this->iLimit"; //$sSQL .= " limit $this->iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
@@ -1334,8 +1487,8 @@ class Geocode
//if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger) //if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger)
if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs)) { if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs)) {
$sSQL = "select distinct place_id from location_property_tiger"; $sSQL = "SELECT distinct place_id FROM location_property_tiger";
$sSQL .= " where parent_place_id in (".$sPlaceIDs.") and ("; $sSQL .= " WHERE parent_place_id in (".$sPlaceIDs.") and (";
if ($searchedHousenumber%2 == 0) { if ($searchedHousenumber%2 == 0) {
$sSQL .= "interpolationtype='even'"; $sSQL .= "interpolationtype='even'";
} else { } else {
@@ -1346,7 +1499,7 @@ class Geocode
$sSQL .= $searchedHousenumber."<=endnumber"; $sSQL .= $searchedHousenumber."<=endnumber";
if (sizeof($this->aExcludePlaceIDs)) { if (sizeof($this->aExcludePlaceIDs)) {
$sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")"; $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";
} }
//$sSQL .= " limit $this->iLimit"; //$sSQL .= " limit $this->iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
@@ -1370,19 +1523,25 @@ class Geocode
if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name') { if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name') {
// If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match // If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match
$sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'"; $sSQL = "SELECT place_id ";
$sSQL .= " and linked_place_id is null"; $sSQL .= " FROM placex ";
if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)"; $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
$sSQL .= " order by rank_search asc limit $this->iLimit"; $sSQL .= " AND class='".$aSearch['sClass']."' ";
$sSQL .= " AND type='".$aSearch['sType']."'";
$sSQL .= " AND linked_place_id is null";
if ($sCountryCodesSQL) $sSQL .= " AND calculated_country_code in ($sCountryCodesSQL)";
$sSQL .= " ORDER BY rank_search ASC ";
$sSQL .= " LIMIT $this->iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aClassPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aClassPlaceIDs = chksql($this->oDB->getCol($sSQL));
} }
if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') { // & in if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') { // & in
$sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'"; $sSQL = "SELECT count(*) FROM pg_tables ";
$sSQL .= "WHERE tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
$bCacheTable = chksql($this->oDB->getOne($sSQL)); $bCacheTable = chksql($this->oDB->getOne($sSQL));
$sSQL = "select min(rank_search) from placex where place_id in ($sPlaceIDs)"; $sSQL = "SELECT min(rank_search) FROM placex WHERE place_id in ($sPlaceIDs)";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$this->iMaxRank = ((int)chksql($this->oDB->getOne($sSQL))); $this->iMaxRank = ((int)chksql($this->oDB->getOne($sSQL)));
@@ -1391,11 +1550,13 @@ class Geocode
$sPlaceGeom = false; $sPlaceGeom = false;
if ($this->iMaxRank < 9 && $bCacheTable) { if ($this->iMaxRank < 9 && $bCacheTable) {
// Try and get a polygon to search in instead // Try and get a polygon to search in instead
$sSQL = "select geometry from placex"; $sSQL = "SELECT geometry ";
$sSQL .= " where place_id in ($sPlaceIDs)"; $sSQL .= " FROM placex";
$sSQL .= " and rank_search < $this->iMaxRank + 5"; $sSQL .= " WHERE place_id in ($sPlaceIDs)";
$sSQL .= " and st_geometrytype(geometry) in ('ST_Polygon','ST_MultiPolygon')"; $sSQL .= " AND rank_search < $this->iMaxRank + 5";
$sSQL .= " order by rank_search asc limit 1"; $sSQL .= " AND ST_Geometrytype(geometry) in ('ST_Polygon','ST_MultiPolygon')";
$sSQL .= " ORDER BY rank_search ASC ";
$sSQL .= " LIMIT 1";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$sPlaceGeom = chksql($this->oDB->getOne($sSQL)); $sPlaceGeom = chksql($this->oDB->getOne($sSQL));
} }
@@ -1404,7 +1565,7 @@ class Geocode
$sPlaceIDs = false; $sPlaceIDs = false;
} else { } else {
$this->iMaxRank += 5; $this->iMaxRank += 5;
$sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and rank_search < $this->iMaxRank"; $sSQL = "SELECT place_id FROM placex WHERE place_id in ($sPlaceIDs) and rank_search < $this->iMaxRank";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
$sPlaceIDs = join(',', $aPlaceIDs); $sPlaceIDs = join(',', $aPlaceIDs);
@@ -1447,15 +1608,18 @@ class Geocode
if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.geometry)"; if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.geometry)";
else $sOrderBySQL = "ST_Distance(l.geometry, f.geometry)"; else $sOrderBySQL = "ST_Distance(l.geometry, f.geometry)";
$sSQL = "select distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'')." from placex as l,placex as f where "; $sSQL = "SELECT distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'');
$sSQL .= "f.place_id in ( $sPlaceIDs) and ST_DWithin(l.geometry, f.centroid, $fRange) "; $sSQL .= " FROM placex as l, placex as f ";
$sSQL .= "and l.class='".$aSearch['sClass']."' and l.type='".$aSearch['sType']."' "; $sSQL .= " WHERE f.place_id in ($sPlaceIDs) ";
$sSQL .= " AND ST_DWithin(l.geometry, f.centroid, $fRange) ";
$sSQL .= " AND l.class='".$aSearch['sClass']."' ";
$sSQL .= " AND l.type='".$aSearch['sType']."' ";
if (sizeof($this->aExcludePlaceIDs)) { if (sizeof($this->aExcludePlaceIDs)) {
$sSQL .= " and l.place_id not in (".join(',', $this->aExcludePlaceIDs).")"; $sSQL .= " AND l.place_id not in (".join(',', $this->aExcludePlaceIDs).")";
} }
if ($sCountryCodesSQL) $sSQL .= " and l.calculated_country_code in ($sCountryCodesSQL)"; if ($sCountryCodesSQL) $sSQL .= " AND l.calculated_country_code in ($sCountryCodesSQL)";
if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc"; if ($sOrderBy) $sSQL .= "ORDER BY ".$OrderBysSQL." ASC";
if ($this->iOffset) $sSQL .= " offset $this->iOffset"; if ($this->iOffset) $sSQL .= " OFFSET $this->iOffset";
$sSQL .= " limit $this->iLimit"; $sSQL .= " limit $this->iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($this->oDB->getCol($sSQL))); $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($this->oDB->getCol($sSQL)));
@@ -1482,17 +1646,31 @@ class Geocode
// 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
$sSQL = "select place_id from placex where place_id in (".join(',', array_keys($aResultPlaceIDs)).") "; $sSQL = "SELECT place_id ";
$sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank "; $sSQL .= "FROM placex ";
if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'"; $sSQL .= "WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).") ";
if ($this->aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',', $this->aAddressRankList).")"; $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).")";
}
if (CONST_Use_US_Tiger_Data) { if (CONST_Use_US_Tiger_Data) {
$sSQL .= ") UNION select place_id from location_property_tiger where place_id in (".join(',', array_keys($aResultPlaceIDs)).") "; $sSQL .= " ) ";
$sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank "; $sSQL .= "UNION ";
$sSQL .= " SELECT place_id ";
$sSQL .= " FROM location_property_tiger ";
$sSQL .= " WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).") ";
$sSQL .= " AND (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',', $this->aAddressRankList).")"; if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',', $this->aAddressRankList).")";
} }
$sSQL .= ") UNION select place_id from location_property_osmline where place_id in (".join(',', array_keys($aResultPlaceIDs)).")"; $sSQL .= ") UNION ";
$sSQL .= " and (30 between $this->iMinAddressRank and $this->iMaxAddressRank)"; $sSQL .= " SELECT place_id ";
$sSQL .= " FROM location_property_osmline ";
$sSQL .= " WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).")";
$sSQL .= " AND (30 between $this->iMinAddressRank and $this->iMaxAddressRank)";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL)); $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
$tempIDs = array(); $tempIDs = array();

139
website/details.php
View File

@@ -20,16 +20,30 @@ $iOsmId = $oParams->getInt('osmid', -1);
$oDB =& getDB(); $oDB =& getDB();
if ($sOsmType && $iOsmId > 0) { if ($sOsmType && $iOsmId > 0) {
$sPlaceId = chksql($oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc")); $sSQL = sprintf(
"SELECT place_id FROM placex WHERE osm_type='%s' AND osm_id=%d ORDER BY type='postcode' ASC",
$sOsmType,
$iOsmId
);
$sPlaceId = chksql($oDB->getOne($sSQL));
// Be nice about our error messages for broken geometry // Be nice about our error messages for broken geometry
if (!$sPlaceId) { if (!$sPlaceId) {
$sSQL = "select osm_type, osm_id, errormessage, class, type,"; $sSQL = "SELECT ";
$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname,"; $sSQL .= " osm_type, ";
$sSQL .= " ST_AsText(prevgeometry) as prevgeom, ST_AsText(newgeometry) as newgeom"; $sSQL .= " osm_id, ";
$sSQL .= " from import_polygon_error where osm_type = '".$sOsmType; $sSQL .= " errormessage, ";
$sSQL .= "' and osm_id = ".$iOsmId." order by updated desc limit 1"; $sSQL .= " class, ";
$sSQL .= " type, ";
$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname,";
$sSQL .= " ST_AsText(prevgeometry) AS prevgeom, ";
$sSQL .= " ST_AsText(newgeometry) AS newgeom";
$sSQL .= " FROM import_polygon_error ";
$sSQL .= " WHERE osm_type = '".$sOsmType."'";
$sSQL .= " AND osm_id = ".$iOsmId;
$sSQL .= " ORDER BY updated DESC";
$sSQL .= " LIMIT 1";
$aPointDetails = chksql($oDB->getRow($sSQL)); $aPointDetails = chksql($oDB->getRow($sSQL));
if (!PEAR::isError($aPointDetails) && $aPointDetails) { if (!PEAR::isError($aPointDetails) && $aPointDetails) {
if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches)) { if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches)) {
@@ -51,31 +65,41 @@ if (!$sPlaceId) userError("Please select a place id");
$iPlaceID = (int)$sPlaceId; $iPlaceID = (int)$sPlaceId;
if (CONST_Use_US_Tiger_Data) { if (CONST_Use_US_Tiger_Data) {
$iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID)); $iParentPlaceID = chksql($oDB->getOne('SELECT parent_place_id FROM location_property_tiger WHERE place_id = '.$iPlaceID));
if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
} }
if (CONST_Use_Aux_Location_data) { if (CONST_Use_Aux_Location_data) {
$iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID)); $iParentPlaceID = chksql($oDB->getOne('SELECT parent_place_id FROM location_property_aux WHERE place_id = '.$iPlaceID));
if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
} }
$hLog = logStart($oDB, 'details', $_SERVER['QUERY_STRING'], $aLangPrefOrder); $hLog = logStart($oDB, 'details', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
// Get the details for this point // Get the details for this point
$sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level,"; $sSQL = "SELECT place_id, osm_type, osm_id, class, type, name, admin_level,";
$sSQL .= " housenumber, street, isin, postcode, calculated_country_code as country_code,"; $sSQL .= " housenumber, street, isin, postcode, calculated_country_code AS country_code,";
$sSQL .= " importance, wikipedia,"; $sSQL .= " importance, wikipedia,";
$sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') as indexed_date,"; $sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') AS indexed_date,";
$sSQL .= " parent_place_id, rank_address, rank_search,"; $sSQL .= " parent_place_id, ";
$sSQL .= " get_searchrank_label(rank_search) as rank_search_label,"; $sSQL .= " rank_address, ";
$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, "; $sSQL .= " rank_search, ";
$sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, "; $sSQL .= " get_searchrank_label(rank_search) AS rank_search_label,";
//$sSQL .= " ST_Area(geometry::geography) as area, "; $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, ";
$sSQL .= " ST_y(centroid) as lat, ST_x(centroid) as lon,"; $sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea, ";
$sSQL .= " case when importance = 0 OR importance IS NULL then 0.75-(rank_search::float/40) else importance end as calculated_importance, "; //$sSQL .= " ST_Area(geometry::geography) AS area, ";
$sSQL .= " ST_AsText(CASE WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ELSE geometry END) as outlinestring"; $sSQL .= " ST_y(centroid) AS lat, ";
$sSQL .= " from placex where place_id = $iPlaceID"; $sSQL .= " ST_x(centroid) AS lon,";
$sSQL .= " CASE ";
$sSQL .= " WHEN importance = 0 OR importance IS NULL THEN 0.75-(rank_search::float/40) ";
$sSQL .= " ELSE importance ";
$sSQL .= " END as calculated_importance, ";
$sSQL .= " ST_AsText(CASE ";
$sSQL .= " WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ";
$sSQL .= " ELSE geometry ";
$sSQL .= " END) as outlinestring";
$sSQL .= " FROM placex ";
$sSQL .= " WHERE place_id = $iPlaceID";
$aPointDetails = chksql($oDB->getRow($sSQL), "Could not get details of place object."); $aPointDetails = chksql($oDB->getRow($sSQL), "Could not get details of place object.");
@@ -95,14 +119,14 @@ if (isset($aClassType[$sPointClassType]) && $aClassType[$sPointClassType]['icon'
} }
// Get all alternative names (languages, etc) // Get all alternative names (languages, etc)
$sSQL = "select (each(name)).key,(each(name)).value from placex where place_id = $iPlaceID order by (each(name)).key"; $sSQL = "SELECT (each(name)).key,(each(name)).value FROM placex WHERE place_id = $iPlaceID ORDER BY (each(name)).key";
$aPointDetails['aNames'] = $oDB->getAssoc($sSQL); $aPointDetails['aNames'] = $oDB->getAssoc($sSQL);
if (PEAR::isError($aPointDetails['aNames'])) { // possible timeout if (PEAR::isError($aPointDetails['aNames'])) { // possible timeout
$aPointDetails['aNames'] = []; $aPointDetails['aNames'] = [];
} }
// Extra tags // Extra tags
$sSQL = "select (each(extratags)).key,(each(extratags)).value from placex where place_id = $iPlaceID order by (each(extratags)).key"; $sSQL = "SELECT (each(extratags)).key,(each(extratags)).value FROM placex WHERE place_id = $iPlaceID ORDER BY (each(extratags)).key";
$aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL); $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
if (PEAR::isError($aPointDetails['aExtraTags'])) { // possible timeout if (PEAR::isError($aPointDetails['aExtraTags'])) { // possible timeout
$aPointDetails['aExtraTags'] = []; $aPointDetails['aExtraTags'] = [];
@@ -112,27 +136,56 @@ if (PEAR::isError($aPointDetails['aExtraTags'])) { // possible timeout
$aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], -1, true); $aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], -1, true);
// Linked places // Linked places
$sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber,"; $sSQL = "SELECT placex.place_id, osm_type, osm_id, class, type, housenumber,";
$sSQL .= " admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea,"; $sSQL .= " admin_level, rank_address, ";
$sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') as distance, "; $sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,";
$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength "; $sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, ";
$sSQL .= " from placex, (select centroid as placegeometry from placex where place_id = $iPlaceID) as x"; $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, ";
$sSQL .= " where linked_place_id = $iPlaceID"; $sSQL .= " length(name::text) AS namelength ";
$sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber"; $sSQL .= " FROM ";
$sSQL .= " placex, ";
$sSQL .= " ( ";
$sSQL .= " SELECT centroid AS placegeometry ";
$sSQL .= " FROM placex ";
$sSQL .= " WHERE place_id = $iPlaceID ";
$sSQL .= " ) AS x";
$sSQL .= " WHERE linked_place_id = $iPlaceID";
$sSQL .= " ORDER BY ";
$sSQL .= " rank_address ASC, ";
$sSQL .= " rank_search ASC, ";
$sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL), ";
$sSQL .= " housenumber";
$aLinkedLines = $oDB->getAll($sSQL); $aLinkedLines = $oDB->getAll($sSQL);
if (PEAR::isError($aLinkedLines)) { // possible timeout if (PEAR::isError($aLinkedLines)) { // possible timeout
$aLinkedLines = []; $aLinkedLines = [];
} }
// All places this is an imediate parent of // All places this is an imediate parent of
$sSQL = "select obj.place_id, osm_type, osm_id, class, type, housenumber,"; $sSQL = "SELECT obj.place_id, osm_type, osm_id, class, type, housenumber,";
$sSQL .= " admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea,"; $sSQL .= " admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,";
$sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') as distance, "; $sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, ";
$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength "; $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, ";
$sSQL .= " from (select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name from placex "; $sSQL .= " length(name::text) AS namelength ";
$sSQL .= " where parent_place_id = $iPlaceID order by rank_address asc,rank_search asc limit 500) as obj,"; $sSQL .= " FROM ";
$sSQL .= " (select centroid as placegeometry from placex where place_id = $iPlaceID) as x"; $sSQL .= " ( ";
$sSQL .= " order by rank_address asc,rank_search asc,localname,housenumber"; $sSQL .= " SELECT placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name ";
$sSQL .= " FROM placex ";
$sSQL .= " WHERE parent_place_id = $iPlaceID ";
$sSQL .= " ORDER BY ";
$sSQL .= " rank_address ASC, ";
$sSQL .= " rank_search ASC ";
$sSQL .= " LIMIT 500 ";
$sSQL .= " ) AS obj,";
$sSQL .= " ( ";
$sSQL .= " SELECT centroid AS placegeometry ";
$sSQL .= " FROM placex ";
$sSQL .= " WHERE place_id = $iPlaceID ";
$sSQL .= " ) AS x";
$sSQL .= " ORDER BY ";
$sSQL .= " rank_address ASC, ";
$sSQL .= " rank_search ASC, ";
$sSQL .= " localname, ";
$sSQL .= " housenumber";
$aParentOfLines = $oDB->getAll($sSQL); $aParentOfLines = $oDB->getAll($sSQL);
if (PEAR::isError($aParentOfLines)) { // possible timeout if (PEAR::isError($aParentOfLines)) { // possible timeout
$aParentOfLines = []; $aParentOfLines = [];
@@ -141,20 +194,19 @@ if (PEAR::isError($aParentOfLines)) { // possible timeout
$aPlaceSearchNameKeywords = false; $aPlaceSearchNameKeywords = false;
$aPlaceSearchAddressKeywords = false; $aPlaceSearchAddressKeywords = false;
if ($oParams->getBool('keywords')) { if ($oParams->getBool('keywords')) {
$sSQL = "select * from search_name where place_id = $iPlaceID"; $sSQL = "SELECT * FROM search_name WHERE place_id = $iPlaceID";
$aPlaceSearchName = $oDB->getRow($sSQL); $aPlaceSearchName = $oDB->getRow($sSQL);
if (PEAR::isError($aPlaceSearchName)) { // possible timeout if (PEAR::isError($aPlaceSearchName)) { // possible timeout
$aPlaceSearchName = []; $aPlaceSearchName = [];
} }
$sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['name_vector'], 1, -1).")"; $sSQL = "SELECT * FROM word WHERE word_id in (".substr($aPlaceSearchName['name_vector'], 1, -1).")";
$aPlaceSearchNameKeywords = $oDB->getAll($sSQL); $aPlaceSearchNameKeywords = $oDB->getAll($sSQL);
if (PEAR::isError($aPlaceSearchNameKeywords)) { // possible timeout if (PEAR::isError($aPlaceSearchNameKeywords)) { // possible timeout
$aPlaceSearchNameKeywords = []; $aPlaceSearchNameKeywords = [];
} }
$sSQL = "SELECT * FROM word WHERE word_id in (".substr($aPlaceSearchName['nameaddress_vector'], 1, -1).")";
$sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['nameaddress_vector'], 1, -1).")";
$aPlaceSearchAddressKeywords = $oDB->getAll($sSQL); $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL);
if (PEAR::isError($aPlaceSearchAddressKeywords)) { // possible timeout if (PEAR::isError($aPlaceSearchAddressKeywords)) { // possible timeout
$aPlaceSearchAddressKeywords = []; $aPlaceSearchAddressKeywords = [];
@@ -164,7 +216,8 @@ if ($oParams->getBool('keywords')) {
logEnd($oDB, $hLog, 1); logEnd($oDB, $hLog, 1);
if ($sOutputFormat=='html') { if ($sOutputFormat=='html') {
$sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1")); $sSQL = "SELECT TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' FROM import_status LIMIT 1";
$sDataDate = chksql($oDB->getOne($sSQL));
$sTileURL = CONST_Map_Tile_URL; $sTileURL = CONST_Map_Tile_URL;
$sTileAttribution = CONST_Map_Tile_Attribution; $sTileAttribution = CONST_Map_Tile_Attribution;
} }