From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 9 Feb 2014 07:33:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~554
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/25db5f271addc4ff5aa2d3b32f1582c48dca3405

Merge remote-tracking branch 'upstream/master'
---

25db5f271addc4ff5aa2d3b32f1582c48dca3405
diff --cc sql/functions.sql
index 6c9e092e,62847e39..839d086c
--- a/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;