Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / indices.src.sql

diff --git a/sql/indices.src.sql b/sql/indices.src.sql
index dd16affb97531305492bc9ca46bfed9dd58deb8e..7fcd965f4eb14d61a4bd5ed1366804a697f8504e 100644 (file)
--- a/sql/indices.src.sql
+++ b/sql/indices.src.sql
@@ -8,14 +8,8 @@ CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING B
 DROP INDEX IF EXISTS idx_placex_rank_search;
 CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search) {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_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_lookupPolygon
   ON placex USING gist (geometry) {ts:search-index}
   WHERE St_GeometryType(geometry) in ('ST_Polygon', 'ST_MultiPolygon')
@@ -29,13 +23,8 @@ CREATE INDEX idx_placex_geometry_reverse_placeNode
 
 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_osmline_parent_place_id ON location_property_osmline USING BTREE (parent_place_id) {ts:search-index};
-
-DROP INDEX IF EXISTS place_id_idx;
-CREATE UNIQUE INDEX idx_place_osm_unique on place using btree(osm_id,osm_type,class,type) {ts:address-index};
-
+CREATE INDEX idx_osmline_parent_osm_id ON location_property_osmline USING BTREE (osm_id) {ts:search-index};
 
 CREATE UNIQUE INDEX idx_postcode_id ON location_postcode USING BTREE (place_id) {ts:search-index};
 CREATE INDEX idx_postcode_postcode ON location_postcode USING BTREE (postcode) {ts:search-index};