Merge remote-tracking branch 'upstream/master'

diff --cc sql/functions.sql
index 6c9e092e1f3afac9d782dcc4b5f5dc526ff4b157,62847e39a1b79dc1f8399e8ce8d97207ad7dba95..839d086c5b78b0b577d4ed7bd9e3c243a5beec0a
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -2061,13 -2043,10 +2061,15 @@@ 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
+     DELETE FROM place where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type;
      RETURN null;
    END IF;