remove linked places also from the location_area_large tables

We don't want linked places to show up in addresses either,
so remove them from the address lookup table.

diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql
index d74ac1c963aaec6e40352975892c9fe33278f3b3..b84a2d6d7879eb57959f8ce73ae61de4709c9fb8 100644 (file)
--- a/sql/functions/placex_triggers.sql
+++ b/sql/functions/placex_triggers.sql
@@ -661,7 +661,7 @@ BEGIN
                   UPDATE placex SET linked_place_id = NEW.place_id WHERE place_id = linked_node_id;
                   IF NOT %REVERSE-ONLY% THEN
                     DELETE FROM search_name WHERE place_id = linked_node_id;
                   UPDATE placex SET linked_place_id = NEW.place_id WHERE place_id = linked_node_id;
                   IF NOT %REVERSE-ONLY% THEN
                     DELETE FROM search_name WHERE place_id = linked_node_id;

-                 END IF;
+                  END IF;

                 END LOOP;
               END IF;
           END LOOP;
                 END LOOP;
               END IF;
           END LOOP;


@@ -811,6 +811,7 @@ BEGIN
     IF NOT %REVERSE-ONLY% THEN
       DELETE FROM search_name WHERE place_id = location.place_id;
     END IF;
     IF NOT %REVERSE-ONLY% THEN
       DELETE FROM search_name WHERE place_id = location.place_id;
     END IF;

+    PERFORM deleteLocationArea(NEW.partition, location.place_id, NEW.rank_search);

 
     SELECT wikipedia, importance
       FROM compute_importance(location.extratags, NEW.country_code,
 
     SELECT wikipedia, importance
       FROM compute_importance(location.extratags, NEW.country_code,