osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-27 00:49:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

avoid 'SELECT *'

Browse Source
This commit is contained in:
Sarah Hoffmann 2018-07-05 19:27:21 +02:00
parent 9955155ce0
commit 2bd7c75a35
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ReverseGeocode.php
View File

@ -96,8 +96,8 @@ class ReverseGeocode
{ {
// searches for polygon in table country_osm_grid which contains the searchpoint // searches for polygon in table country_osm_grid which contains the searchpoint
// and searches for the nearest place node to the searchpoint in this polygon // and searches for the nearest place node to the searchpoint in this polygon
$sSQL = 'SELECT * FROM country_osm_grid'; $sSQL = 'SELECT country_code FROM country_osm_grid';
$sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.' )'; $sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.') limit 1';
$aPoly = chksql( $aPoly = chksql(
$this->oDB->getRow($sSQL), $this->oDB->getRow($sSQL),
@ -106,7 +106,7 @@ class ReverseGeocode
if ($aPoly) { if ($aPoly) {
$sCountryCode = $aPoly['country_code']; $sCountryCode = $aPoly['country_code'];
$sSQL = 'SELECT *, ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL = 'SELECT place_id, ST_distance('.$sPointSQL.', geometry) as distance';
$sSQL .= ' FROM placex'; $sSQL .= ' FROM placex';
$sSQL .= ' WHERE osm_type = \'N\''; $sSQL .= ' WHERE osm_type = \'N\'';
$sSQL .= ' AND country_code = \''.$sCountryCode.'\''; $sSQL .= ' AND country_code = \''.$sCountryCode.'\'';
@ -140,8 +140,8 @@ class ReverseGeocode
// no polygon search over country-level // no polygon search over country-level
if ($iMaxRank < 4) $iMaxRank = 4; if ($iMaxRank < 4) $iMaxRank = 4;
// search for polygon // search for polygon
$sSQL = 'SELECT * FROM'; $sSQL = 'SELECT place_id, parent_place_id, rank_address, rank_search FROM';
$sSQL .= '(select place_id,parent_place_id,rank_address, rank_search, country_code, geometry'; $sSQL .= '(select place_id, parent_place_id, rank_address, rank_search, country_code, geometry';
$sSQL .= ' FROM placex'; $sSQL .= ' FROM placex';
$sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\', \'ST_MultiPolygon\')'; $sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\', \'ST_MultiPolygon\')';
$sSQL .= ' AND rank_address Between 4 AND ' .$iMaxRank; $sSQL .= ' AND rank_address Between 4 AND ' .$iMaxRank;
@ -181,8 +181,8 @@ class ReverseGeocode
} elseif ($iMaxRank <= 25) { } elseif ($iMaxRank <= 25) {
$fSearchDiam = 0.1; $fSearchDiam = 0.1;
} }
$sSQL = 'SELECT *'; $sSQL = 'SELECT place_id';
$sSQL .= ' FROM ('; $sSQL .= ' FROM (';
$sSQL .= ' SELECT place_id, rank_address,country_code, geometry,'; $sSQL .= ' SELECT place_id, rank_address,country_code, geometry,';
$sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';