Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions.sql
index 72e52130c9baf76a67a80ba6b3b192ae04bea7e8,bc2d6a63fb18e2d335636c890608342fe04fc8b8..4aef74d1d28089f63a96fcc0dcaac6bc607d4351
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -922,11 -922,6 +922,11 @@@ DECLAR
  BEGIN
    --DEBUG: RAISE WARNING '% %',NEW.osm_type,NEW.osm_id;
  
 +  -- remove operator tag for most places, messes too much with search_name indexes
 +  IF NEW.class not in ('amenity', 'shop') THEN
 +    NEW.name := delete(NEW.name, 'operator');
 +  END IF;
 +
    -- just block these
    IF NEW.class in ('landuse','natural') and NEW.name is null THEN
  --    RAISE WARNING 'empty landuse %',NEW.osm_id;
@@@ -1112,7 -1107,11 +1112,11 @@@
        END IF;
      ELSEIF NEW.class = 'landuse' AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') THEN
        NEW.rank_search := 22;
-       NEW.rank_address := NEW.rank_search;
+       IF NEW.type in ('residential', 'farm', 'farmyard', 'industrial', 'commercial', 'allotments', 'retail') THEN
+         NEW.rank_address := NEW.rank_search;
+       ELSE
+         NEW.rank_address := 0;
+       END IF;
      ELSEIF NEW.class = 'natural' and NEW.type in ('peak','volcano','mountain_range') THEN
        NEW.rank_search := 18;
        NEW.rank_address := 0;
@@@ -2060,11 -2059,6 +2064,11 @@@ BEGI
      --DEBUG: RAISE WARNING '%', existingplacex;
    END IF;
  
 +  -- remove operator tag for most places, messes too much with search_name indexes
 +  IF NEW.class not in ('amenity', 'shop') THEN
 +    NEW.name := delete(NEW.name, 'operator');
 +  END IF;
 +
    -- Just block these - lots and pointless
    IF NEW.class in ('landuse','natural') and NEW.name is null THEN
      -- if the name tag was removed, older versions might still be lurking in the place table
@@@ -2255,12 -2249,6 +2259,12 @@@
  
    END IF;
  
 +  -- refuse to update multiplpoygons with too many objects, too much of a performance hit
 +  IF ST_NumGeometries(NEW.geometry) > 2000 THEN
 +    RAISE WARNING 'Dropping update of % % because of geometry complexity.', NEW.osm_type, NEW.osm_id;
 +    RETURN NULL;
 +  END IF;
 +
    IF coalesce(existing.name::text, '') != coalesce(NEW.name::text, '')
       OR coalesce(existing.extratags::text, '') != coalesce(NEW.extratags::text, '')
       OR coalesce(existing.housenumber, '') != coalesce(NEW.housenumber, '')

diff --combined sql/indices.src.sql
index 37d53a052f936aece5fcc3e8a8e092cd01d09aa1,6e9c293e96f58cab4f99e16b87f4d6ee4ce51453..4685ae2f7d5ac3b71f6e653932a099f661ddf425
--- 1/sql/indices.src.sql
--- 2/sql/indices.src.sql
+++ b/sql/indices.src.sql
@@@ -1,30 -1,33 +1,33 @@@
  -- Indices used only during search and update.
  -- These indices are created only after the indexing process is done.
  
 -CREATE INDEX idx_word_word_id on word USING BTREE (word_id);
 +CREATE INDEX idx_word_word_id on word USING BTREE (word_id) TABLESPACE ssd;
  
 -CREATE INDEX idx_search_name_nameaddress_vector ON search_name USING GIN (nameaddress_vector) WITH (fastupdate = off);
 -CREATE INDEX idx_search_name_name_vector ON search_name USING GIN (name_vector) WITH (fastupdate = off);
 -CREATE INDEX idx_search_name_centroid ON search_name USING GIST (centroid);
 +CREATE INDEX idx_search_name_nameaddress_vector ON search_name USING GIN (nameaddress_vector) WITH (fastupdate = off) TABLESPACE ssd;
 +CREATE INDEX idx_search_name_name_vector ON search_name USING GIN (name_vector) WITH (fastupdate = off) TABLESPACE ssd;
 +CREATE INDEX idx_search_name_centroid ON search_name USING GIST (centroid) TABLESPACE ssd;
  
 -CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING BTREE (address_place_id);
 +CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING BTREE (address_place_id) TABLESPACE ssd;
  
 -CREATE INDEX idx_place_boundingbox_place_id on place_boundingbox USING BTREE (place_id);
 -CREATE INDEX idx_place_boundingbox_outline ON place_boundingbox USING GIST (outline);
 +CREATE INDEX idx_place_boundingbox_place_id on place_boundingbox USING BTREE (place_id) TABLESPACE ssd;
 +CREATE INDEX idx_place_boundingbox_outline ON place_boundingbox USING GIST (outline) TABLESPACE ssd;
  
  DROP INDEX IF EXISTS idx_placex_rank_search;
 -CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search);
 -CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address);
 -CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometry_sector) where indexed_status > 0;
 -CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) where parent_place_id IS NOT NULL;
 -CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) where indexed_status > 0 and class='place' and type='houses';
 -CREATE INDEX idx_placex_reverse_geometry ON placex USING gist (geometry) 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_location_area_country_place_id ON location_area_country USING BTREE (place_id);
 +CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search) TABLESPACE ssd;
 +CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address) TABLESPACE ssd;
 +CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometry_sector) TABLESPACE ssd where indexed_status > 0;
 +CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) TABLESPACE ssd where parent_place_id IS NOT NULL;
 +CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) TABLESPACE ssd where indexed_status > 0 and class='place' and type='houses';
 +CREATE INDEX idx_placex_reverse_geometry ON placex USING gist (geometry) TABLESPACE ssd 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_location_area_country_place_id ON location_area_country USING BTREE (place_id) TABLESPACE ssd;
  
 -CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid);
 +CREATE INDEX idx_search_name_country_centroid ON search_name_country USING GIST (centroid) TABLESPACE ssd;
  
  -- start
 -CREATE INDEX idx_location_property_-partition-_centroid ON location_property_-partition- USING GIST (centroid);
 +CREATE INDEX idx_location_property_-partition-_centroid ON location_property_-partition- USING GIST (centroid) TABLESPACE ssd;
  -- end
  
  CREATE UNIQUE INDEX idx_place_osm_unique on place using btree(osm_id,osm_type,class,type);
+ 
+ 
+ CREATE INDEX idx_gb_postcode_postcode ON gb_postcode USING BTREE (postcode);