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

fixup use of indexes for latest reverse changes

Browse Source
This commit is contained in:
Sarah Hoffmann
2018-08-08 22:04:39 +02:00
parent 9b7f0627ea
commit 60cea6c8bf
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ReverseGeocode.php
View File

@@ -113,9 +113,8 @@ class ReverseGeocode
$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.'\'';
$sSQL .= ' AND rank_search > 4'; $sSQL .= ' AND rank_search between 5 and ' .min(25, $iMaxRank);
$sSQL .= ' AND rank_search <= ' .min(25, $iMaxRank); $sSQL .= ' AND class = \'place\' AND type != \'postcode\'';
$sSQL .= ' AND type != \'postcode\'';
$sSQL .= ' AND name IS NOT NULL '; $sSQL .= ' AND name IS NOT NULL ';
$sSQL .= ' and indexed_status = 0 and linked_place_id is null'; $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
$sSQL .= ' AND ST_DWithin('.$sPointSQL.', geometry, 5.0)) p '; $sSQL .= ' AND ST_DWithin('.$sPointSQL.', geometry, 5.0)) p ';
@@ -194,13 +193,12 @@ class ReverseGeocode
// using rank_search because of a better differentiation // using rank_search because of a better differentiation
// for place nodes at rank_address 16 // for place nodes at rank_address 16
$sSQL .= ' AND rank_search > '.$iRankSearch; $sSQL .= ' AND rank_search > '.$iRankSearch;
$sSQL .= ' AND rank_search <= ' .$iMaxRank; $sSQL .= ' AND rank_search <= '.$iMaxRank;
$sSQL .= ' AND class = \'place\''; $sSQL .= ' AND class = \'place\'';
$sSQL .= ' AND type != \'postcode\''; $sSQL .= ' AND type != \'postcode\'';
$sSQL .= ' AND name IS NOT NULL '; $sSQL .= ' AND name IS NOT NULL ';
$sSQL .= ' AND indexed_status = 0 AND linked_place_id is null'; $sSQL .= ' AND indexed_status = 0 AND linked_place_id is null';
// preselection through bbox $sSQL .= ' AND ST_DWithin('.$sPointSQL.', geometry, reverse_place_diameter('.$iRankSearch.'::smallint))';
$sSQL .= ' AND (SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.') && geometry';
$sSQL .= ' ORDER BY distance ASC,'; $sSQL .= ' ORDER BY distance ASC,';
$sSQL .= ' rank_address DESC'; $sSQL .= ' rank_address DESC';
$sSQL .= ' limit 500) as a'; $sSQL .= ' limit 500) as a';

26
sql/indices.src.sql
View File

@@ -14,14 +14,24 @@ CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search) {ts:sear
CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address) {ts:search-index}; CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address) {ts:search-index};
CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometry_sector) {ts:address-index} where indexed_status > 0; CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometry_sector) {ts:address-index} where indexed_status > 0;
CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) {ts:search-index} where parent_place_id IS NOT NULL; CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) {ts:search-index} where parent_place_id IS NOT NULL;
CREATE INDEX idx_placex_geometry_reverse_lookupPoint ON placex USING gist (geometry) {ts:search-index}
where (name is not null or housenumber is not null or rank_address between 26 and 27) and class not in ('railway','tunnel','bridge','man_made') and rank_address >= 26 and indexed_status = 0 and linked_place_id is null; CREATE INDEX idx_placex_geometry_reverse_lookupPoint
CREATE INDEX idx_placex_geometry_reverse_lookupPolygon ON placex USING gist (geometry) {ts:search-index} where St_GeometryType(geometry) in ('ST_Polygon', 'ST_MultiPolygon') and rank_address between 4 and 25 and type != 'postcode' and name is not null and indexed_status = 0 and linked_place_id is null; ON placex USING gist (geometry) {ts:search-index}
CREATE INDEX idx_placex_geometry_reverse_placeNode_rank_search ON placex USING gist (geometry) {ts:search-index} where WHERE (name is not null or housenumber is not null or rank_address between 26 and 27)
osm_type = 'N' and rank_search > 0 and rank_search <= 25 and class = 'place' and type != 'postcode' and name is not null and indexed_status = 0 and linked_place_id is null; AND class not in ('railway','tunnel','bridge','man_made')
CREATE INDEX idx_placex_geometry_reverse_placeNode_rank_address ON placex USING gist (geometry) {ts:search-index} where AND rank_address >= 26 AND indexed_status = 0 AND linked_place_id is null;
osm_type = 'N' and rank_address > 0 and rank_address <= 25 and type != 'postcode' and name is not null and indexed_status = 0 and linked_place_id is null; CREATE INDEX idx_placex_geometry_reverse_lookupPolygon
GRANT SELECT ON Table country_osm_grid to "{www-user}"; ON placex USING gist (geometry) {ts:search-index}
WHERE St_GeometryType(geometry) in ('ST_Polygon', 'ST_MultiPolygon')
AND rank_address between 4 and 25 AND type != 'postcode'
AND name is not null AND indexed_status = 0 AND linked_place_id is null;
CREATE INDEX idx_placex_geometry_reverse_placeNode
ON placex USING gist (geometry) {ts:search-index}
WHERE osm_type = 'N' AND rank_search between 5 and 25
AND class = 'place' AND type != 'postcode'
AND name is not null AND indexed_status = 0 AND linked_place_id is null;
GRANT SELECT ON table country_osm_grid to "{www-user}";
CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id) {ts:address-index}; CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id) {ts:address-index};