From 134553b1844ee8c82bd606b9e401cf6d3e3b8b8a Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 4 Aug 2015 21:44:19 +0200 Subject: [PATCH] ignore man_made objects in reverse search fixes https://trac.openstreetmap.org/ticket/5339 --- lib/ReverseGeocode.php | 2 +- sql/indices.src.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index ae83af1e..98110d82 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -97,7 +97,7 @@ $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')'; $sSQL .= ' and rank_search != 28 and rank_search >= '.$iMaxRank; $sSQL .= ' and (name is not null or housenumber is not null)'; - $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\')'; + $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; $sSQL .= ' and indexed_status = 0 '; $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') '; $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))'; diff --git a/sql/indices.src.sql b/sql/indices.src.sql index 9a9c3793..73ba662b 100644 --- a/sql/indices.src.sql +++ b/sql/indices.src.sql @@ -14,7 +14,7 @@ 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_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_reverse_geometry ON placex USING gist (geometry) {ts:search-index} where rank_search != 28 and (name is not null or housenumber is not null) and class not in ('waterway','railway','tunnel','bridge'); +CREATE INDEX idx_placex_reverse_geometry ON placex USING gist (geometry) {ts:search-index} where rank_search != 28 and (name is not null or housenumber is not null) and class not in ('waterway','railway','tunnel','bridge','man_made'); CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id) {ts:address-index}; CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid) {ts:address-index}; -- 2.45.1