Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions.sql
index 577e02bfdacdc360128bc187394e252e87ce5f2c,fc83f9a171c257d1e5ee949622c502847b6605b7..b4ecdad84c33c2146e079243c166f54c33c230d6
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -474,31 -474,6 +474,6 @@@ END
  $$
  LANGUAGE plpgsql IMMUTABLE;
  
- CREATE OR REPLACE FUNCTION get_word_score(wordscores wordscore[], words text[]) RETURNS integer
-   AS $$
- DECLARE
-   idxword integer;
-   idxscores integer;
-   result integer;
- BEGIN
-   IF (wordscores is null OR words is null) THEN
-     RETURN 0;
-   END IF;
- 
-   result := 0;
-   FOR idxword in 1 .. array_upper(words, 1) LOOP
-     FOR idxscores in 1 .. array_upper(wordscores, 1) LOOP
-       IF wordscores[idxscores].word = words[idxword] THEN
-         result := result + wordscores[idxscores].score;
-       END IF;
-     END LOOP;
-   END LOOP;
- 
-   RETURN result;
- END;
- $$
- LANGUAGE plpgsql IMMUTABLE;
- 
  CREATE OR REPLACE FUNCTION get_country_code(place geometry) RETURNS TEXT
    AS $$
  DECLARE
@@@ -911,11 -886,6 +886,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;
@@@ -1253,8 -1223,6 +1228,6 @@@ DECLAR
    search_maxdistance FLOAT[];
    search_mindistance FLOAT[];
    address_havelevel BOOLEAN[];
- --  search_scores wordscore[];
- --  search_scores_pos INTEGER;
  
    i INTEGER;
    iMax FLOAT;
@@@ -2052,11 -2020,6 +2025,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
@@@ -2247,12 -2210,6 +2220,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, '')
@@@ -2337,29 -2294,6 +2310,6 @@@ END
  $$
  LANGUAGE plpgsql IMMUTABLE;
  
- --CREATE OR REPLACE FUNCTION get_connected_ways(way_ids INTEGER[]) RETURNS SETOF planet_osm_ways
- --  AS $$
- --DECLARE
- --  searchnodes INTEGER[];
- --  location RECORD;
- --  j INTEGER;
- --BEGIN
- --
- --  searchnodes := '{}';
- --  FOR j IN 1..array_upper(way_ids, 1) LOOP
- --    FOR location IN
- --      select nodes from planet_osm_ways where id = way_ids[j] LIMIT 1
- --    LOOP
- --      IF not (ARRAY[location.nodes] <@ searchnodes) THEN
- --        searchnodes := searchnodes || location.nodes;
- --      END IF;
- --    END LOOP;
- --  END LOOP;
- --
- --  RETURN QUERY select * from planet_osm_ways where nodes && searchnodes and NOT ARRAY[id] <@ way_ids;
- --END;
- --$$
- --LANGUAGE plpgsql IMMUTABLE;
  
  CREATE OR REPLACE FUNCTION get_address_postcode(for_place_id BIGINT) RETURNS TEXT
    AS $$