timezone trouble

[nominatim.git] / sql / functions.sql

diff --git a/sql/functions.sql b/sql/functions.sql
index 75ab479790c25f046b0039ef2b5268d960584607..1411f300461b91707e4e82d52faa7a4849dd140e 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -46,7 +46,7 @@ END;
 $$
 LANGUAGE plpgsql IMMUTABLE;
 
 $$
 LANGUAGE plpgsql IMMUTABLE;
 

-CREATE OR REPLACE FUNCTION geometry_sector(place geometry) RETURNS INTEGER
+CREATE OR REPLACE FUNCTION geometry_sector(partition INTEGER, place geometry) RETURNS INTEGER

   AS $$
 DECLARE
   NEWgeometry geometry;
   AS $$
 DECLARE
   NEWgeometry geometry;


@@ -59,7 +59,7 @@ BEGIN
       RETURN 0;
     END IF;
   END IF;
       RETURN 0;
     END IF;
   END IF;

-  RETURN (500-ST_X(ST_Centroid(NEWgeometry))::integer)*1000 + (500-ST_Y(ST_Centroid(NEWgeometry))::integer);
+  RETURN (partition*1000000) + (500-ST_X(ST_Centroid(NEWgeometry))::integer)*1000 + (500-ST_Y(ST_Centroid(NEWgeometry))::integer);

 END;
 $$
 LANGUAGE plpgsql IMMUTABLE;
 END;
 $$
 LANGUAGE plpgsql IMMUTABLE;


@@ -85,32 +85,12 @@ END;
 $$
 LANGUAGE plpgsql IMMUTABLE;
 
 $$
 LANGUAGE plpgsql IMMUTABLE;
 

-CREATE OR REPLACE FUNCTION geometry_index(place geometry,indexed BOOLEAN,name keyvalue[]) RETURNS INTEGER
-  AS $$
-BEGIN
-IF indexed THEN RETURN NULL; END IF;
-IF name is null THEN RETURN NULL; END IF;
-RETURN geometry_sector(place);
-END;
-$$
-LANGUAGE plpgsql IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION geometry_index(sector integer, indexed BOOLEAN, name keyvalue[]) RETURNS INTEGER
-  AS $$
-BEGIN
-IF indexed THEN RETURN NULL; END IF;
-IF name is null THEN RETURN NULL; END IF;
-RETURN sector;
-END;
-$$
-LANGUAGE plpgsql IMMUTABLE;
-

 CREATE OR REPLACE FUNCTION transliteration(text) RETURNS text
 CREATE OR REPLACE FUNCTION transliteration(text) RETURNS text

-  AS '/home/brian/nominatim/live/osm2pgsql/gazetteer/gazetteer.so', 'transliteration'
+  AS '{modulepath}/nominatim.so', 'transliteration'

 LANGUAGE c IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION gettokenstring(text) RETURNS text
 LANGUAGE c IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION gettokenstring(text) RETURNS text

-  AS '/home/brian/nominatim/live/osm2pgsql/gazetteer/gazetteer.so', 'gettokenstring'
+  AS '{modulepath}/nominatim.so', 'gettokenstring'

 LANGUAGE c IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION make_standard_name(name TEXT) RETURNS TEXT
 LANGUAGE c IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION make_standard_name(name TEXT) RETURNS TEXT


@@ -239,7 +219,7 @@ BEGIN
   SELECT min(word_id) FROM word WHERE word_token = lookup_token and class=lookup_class and type = lookup_type and operator = op into return_word_id;
   IF return_word_id IS NULL THEN
     return_word_id := nextval('seq_word');
   SELECT min(word_id) FROM word WHERE word_token = lookup_token and class=lookup_class and type = lookup_type and operator = op into return_word_id;
   IF return_word_id IS NULL THEN
     return_word_id := nextval('seq_word');

-    INSERT INTO word VALUES (return_word_id, lookup_token, null, null, lookup_class, lookup_type, null, 0, null, op);
+    INSERT INTO word VALUES (return_word_id, lookup_token, null, null, lookup_class, lookup_type, null, 0, op, null);

   END IF;
   RETURN return_word_id;
 END;
   END IF;
   RETURN return_word_id;
 END;


@@ -322,38 +302,7 @@ BEGIN
   END IF;
   r := a;
   FOR i IN 1..array_upper(b, 1) LOOP  
   END IF;
   r := a;
   FOR i IN 1..array_upper(b, 1) LOOP  

-    IF NOT (ARRAY[b[i]] && r) THEN
-      r := r || b[i];
-    END IF;
-  END LOOP;
-  RETURN r;
-END;
-$$
-LANGUAGE plpgsql IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION add_keywords(a keyvalue[], b keyvalue[]) RETURNS keyvalue[]
-  AS $$
-DECLARE
-  i INTEGER;
-  j INTEGER;
-  f BOOLEAN;
-  r keyvalue[];
-BEGIN
-  IF array_upper(a, 1) IS NULL THEN
-    RETURN b;
-  END IF;
-  IF array_upper(b, 1) IS NULL THEN
-    RETURN a;
-  END IF;
-  r := a;
-  FOR i IN 1..array_upper(b, 1) LOOP  
-    f := false;
-    FOR j IN 1..array_upper(a, 1) LOOP  
-      IF (a[j].key = b[i].key) THEN
-        f := true;
-      END IF; 
-    END LOOP;
-    IF NOT f THEN
+    IF NOT (ARRAY[b[i]] <@ r) THEN

       r := r || b[i];
     END IF;
   END LOOP;
       r := r || b[i];
     END IF;
   END LOOP;


@@ -379,15 +328,18 @@ BEGIN
     s := make_standard_name(item.value);
 
     w := getorcreate_name_id(s, item.value);
     s := make_standard_name(item.value);
 
     w := getorcreate_name_id(s, item.value);

-    result := result | w;
+
+    IF not(ARRAY[w] <@ result) THEN
+      result := result || w;
+    END IF;

 
     words := string_to_array(s, ' ');
     IF array_upper(words, 1) IS NOT NULL THEN
       FOR j IN 1..array_upper(words, 1) LOOP
         IF (words[j] != '') THEN
           w = getorcreate_word_id(words[j]);
 
     words := string_to_array(s, ' ');
     IF array_upper(words, 1) IS NOT NULL THEN
       FOR j IN 1..array_upper(words, 1) LOOP
         IF (words[j] != '') THEN
           w = getorcreate_word_id(words[j]);

-          IF NOT (ARRAY[w] && result) THEN
-            result := result | w;
+          IF NOT (ARRAY[w] <@ result) THEN
+            result := result || w;

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


@@ -399,8 +351,8 @@ BEGIN
         s := make_standard_name(words[j]);
         IF s != '' THEN
           w := getorcreate_word_id(s);
         s := make_standard_name(words[j]);
         IF s != '' THEN
           w := getorcreate_word_id(s);

-          IF NOT (ARRAY[w] && result) THEN
-            result := result | w;
+          IF NOT (ARRAY[w] <@ result) THEN
+            result := result || w;

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


@@ -411,8 +363,8 @@ BEGIN
       s := make_standard_name(s);
       IF s != '' THEN
         w := getorcreate_name_id(s, item.value);
       s := make_standard_name(s);
       IF s != '' THEN
         w := getorcreate_name_id(s, item.value);

-        IF NOT (ARRAY[w] && result) THEN
-          result := result | w;
+        IF NOT (ARRAY[w] <@ result) THEN
+          result := result || w;

         END IF;
       END IF;
     END IF;
         END IF;
       END IF;
     END IF;


@@ -439,7 +391,7 @@ BEGIN
   s := make_standard_name(src);
   w := getorcreate_name_id(s);
 
   s := make_standard_name(src);
   w := getorcreate_name_id(s);
 

-  IF NOT (ARRAY[w] && result) THEN
+  IF NOT (ARRAY[w] <@ result) THEN

     result := result || w;
   END IF;
 
     result := result || w;
   END IF;
 


@@ -448,7 +400,7 @@ BEGIN
     FOR j IN 1..array_upper(words, 1) LOOP
       IF (words[j] != '') THEN
         w = getorcreate_word_id(words[j]);
     FOR j IN 1..array_upper(words, 1) LOOP
       IF (words[j] != '') THEN
         w = getorcreate_word_id(words[j]);

-        IF NOT (ARRAY[w] && result) THEN
+        IF NOT (ARRAY[w] <@ result) THEN

           result := result || w;
         END IF;
       END IF;
           result := result || w;
         END IF;
       END IF;


@@ -493,23 +445,37 @@ DECLARE
 BEGIN
   place_centre := ST_Centroid(place);
 
 BEGIN
   place_centre := ST_Centroid(place);
 

+--RAISE WARNING 'start: %', ST_AsText(place_centre);
+

   -- Try for a OSM polygon first
   -- Try for a OSM polygon first

-  FOR nearcountry IN select country_code from location_area where st_contains(area, place_centre) limit 1
+  FOR nearcountry IN select country_code from location_area_country where country_code is not null and not isguess and st_contains(geometry, place_centre) limit 1

   LOOP
     RETURN nearcountry.country_code;
   END LOOP;
 
   LOOP
     RETURN nearcountry.country_code;
   END LOOP;
 

-  -- Try for an OSM polygon first, grid is faster
+--RAISE WARNING 'osm fallback: %', ST_AsText(place_centre);
+
+  -- Try for OSM fallback data

   FOR nearcountry IN select country_code from country_osm_grid where st_contains(geometry, place_centre) limit 1
   LOOP
     RETURN nearcountry.country_code;
   END LOOP;
 
   FOR nearcountry IN select country_code from country_osm_grid where st_contains(geometry, place_centre) limit 1
   LOOP
     RETURN nearcountry.country_code;
   END LOOP;
 

+--RAISE WARNING 'natural earth: %', ST_AsText(place_centre);
+

   -- Natural earth data (first fallback)
   -- Natural earth data (first fallback)

---  FOR nearcountry IN select country_code from country_naturalearthdata where st_contains(geometry, place_centre) limit 1
---  LOOP
---    RETURN nearcountry.country_code;
---  END LOOP;
+  FOR nearcountry IN select country_code from country_naturalearthdata where st_contains(geometry, place_centre) limit 1
+  LOOP
+    RETURN nearcountry.country_code;
+  END LOOP;
+
+  -- Natural earth data (first fallback)
+  FOR nearcountry IN select country_code from country_naturalearthdata where st_distance(geometry, place_centre) < 0.5 limit 1
+  LOOP
+    RETURN nearcountry.country_code;
+  END LOOP;
+
+--RAISE WARNING 'in country: %', ST_AsText(place_centre);

 
   -- WorldBoundaries data (second fallback - think there might be something broken in this data)
   FOR nearcountry IN select country_code from country where st_contains(geometry, place_centre) limit 1
 
   -- WorldBoundaries data (second fallback - think there might be something broken in this data)
   FOR nearcountry IN select country_code from country where st_contains(geometry, place_centre) limit 1


@@ -517,6 +483,8 @@ BEGIN
     RETURN nearcountry.country_code;
   END LOOP;
 
     RETURN nearcountry.country_code;
   END LOOP;
 

+--RAISE WARNING 'near country: %', ST_AsText(place_centre);
+

   -- Still not in a country - try nearest within ~12 miles of a country
   FOR nearcountry IN select country_code from country where st_distance(geometry, place_centre) < 0.5 
     order by st_distance(geometry, place) limit 1
   -- Still not in a country - try nearest within ~12 miles of a country
   FOR nearcountry IN select country_code from country where st_distance(geometry, place_centre) < 0.5 
     order by st_distance(geometry, place) limit 1


@@ -529,12 +497,26 @@ END;
 $$
 LANGUAGE plpgsql IMMUTABLE;
 
 $$
 LANGUAGE plpgsql IMMUTABLE;
 

+CREATE OR REPLACE FUNCTION get_country_code(place geometry, in_country_code VARCHAR(2)) RETURNS TEXT
+  AS $$
+DECLARE
+  nearcountry RECORD;
+BEGIN
+  FOR nearcountry IN select country_code from country_name where country_code = lower(in_country_code)
+  LOOP
+    RETURN nearcountry.country_code;
+  END LOOP;
+  RETURN get_country_code(place);
+END;
+$$
+LANGUAGE plpgsql IMMUTABLE;
+

 CREATE OR REPLACE FUNCTION get_country_language_code(search_country_code VARCHAR(2)) RETURNS TEXT
   AS $$
 DECLARE
   nearcountry RECORD;
 BEGIN
 CREATE OR REPLACE FUNCTION get_country_language_code(search_country_code VARCHAR(2)) RETURNS TEXT
   AS $$
 DECLARE
   nearcountry RECORD;
 BEGIN

-  FOR nearcountry IN select distinct country_default_language_code from country where country_code = search_country_code limit 1
+  FOR nearcountry IN select distinct country_default_language_code from country_name where country_code = search_country_code limit 1

   LOOP
     RETURN lower(nearcountry.country_default_language_code);
   END LOOP;
   LOOP
     RETURN lower(nearcountry.country_default_language_code);
   END LOOP;


@@ -543,6 +525,21 @@ END;
 $$
 LANGUAGE plpgsql IMMUTABLE;
 
 $$
 LANGUAGE plpgsql IMMUTABLE;
 

+CREATE OR REPLACE FUNCTION get_partition(place geometry, in_country_code VARCHAR(10)) RETURNS INTEGER
+  AS $$
+DECLARE
+  place_centre GEOMETRY;
+  nearcountry RECORD;
+BEGIN
+  FOR nearcountry IN select partition from country_name where country_code = in_country_code
+  LOOP
+    RETURN nearcountry.partition;
+  END LOOP;
+  RETURN 0;
+END;
+$$
+LANGUAGE plpgsql IMMUTABLE;
+

 CREATE OR REPLACE FUNCTION delete_location(OLD_place_id BIGINT) RETURNS BOOLEAN
   AS $$
 DECLARE
 CREATE OR REPLACE FUNCTION delete_location(OLD_place_id BIGINT) RETURNS BOOLEAN
   AS $$
 DECLARE


@@ -556,8 +553,9 @@ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION add_location(
     place_id BIGINT,
 
 CREATE OR REPLACE FUNCTION add_location(
     place_id BIGINT,

-    place_country_code varchar(2),
-    name keyvalue[],
+    country_code varchar(2),
+    partition INTEGER,
+    keywords INTEGER[],

     rank_search INTEGER,
     rank_address INTEGER,
     geometry GEOMETRY
     rank_search INTEGER,
     rank_address INTEGER,
     geometry GEOMETRY


@@ -565,8 +563,6 @@ CREATE OR REPLACE FUNCTION add_location(
   RETURNS BOOLEAN
   AS $$
 DECLARE
   RETURNS BOOLEAN
   AS $$
 DECLARE

-  keywords INTEGER[];
-  country_code VARCHAR(2);

   locationid INTEGER;
   isarea BOOLEAN;
   xmin INTEGER;
   locationid INTEGER;
   isarea BOOLEAN;
   xmin INTEGER;


@@ -575,142 +571,95 @@ DECLARE
   ymax INTEGER;
   lon INTEGER;
   lat INTEGER;
   ymax INTEGER;
   lon INTEGER;
   lat INTEGER;

+  centroid GEOMETRY;

   secgeo GEOMETRY;
   secgeo GEOMETRY;

+  secbox GEOMETRY;

   diameter FLOAT;
   diameter FLOAT;

+  x BOOLEAN;

 BEGIN
 
 BEGIN
 

-  -- Allocate all tokens ids - prevents multi-processor race condition later on at cost of slowing down import
-  keywords := make_keywords(name);
+  IF rank_search > 25 THEN
+    RAISE EXCEPTION 'Adding location with rank > 25 (% rank %)', place_id, rank_search;
+  END IF;

 
 

-  -- 26 = street/highway
-  IF rank_search <= 26 THEN
-    IF place_country_code IS NULL THEN
-      country_code := get_country_code(geometry);
-    END IF;
-    country_code := lower(place_country_code);
+--  RAISE WARNING 'Adding location with rank > 25 (% rank %)', place_id, rank_search;
+
+  x := deleteLocationArea(partition, place_id);

 
 

-    isarea := false;
-    IF (ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AND ST_IsValid(geometry)) THEN
+  isarea := false;
+  IF (ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AND ST_IsValid(geometry)) THEN

 
 

-      isArea := true;
+    isArea := true;
+    centroid := ST_Centroid(geometry);

 
 

-      xmin := floor(st_xmin(geometry));
-      xmax := ceil(st_xmax(geometry));
-      ymin := floor(st_ymin(geometry));
-      ymax := ceil(st_ymax(geometry));
+    xmin := floor(st_xmin(geometry));
+    xmax := ceil(st_xmax(geometry));
+    ymin := floor(st_ymin(geometry));
+    ymax := ceil(st_ymax(geometry));

 
 

-      IF xmin = xmax OR ymin = ymax OR (xmax-xmin < 2 AND ymax-ymin < 2) THEN
-        INSERT INTO location_area values (place_id, country_code, name, keywords,
-          rank_search, rank_address, false, ST_Centroid(geometry), geometry);
-      ELSE
-        FOR lon IN xmin..(xmax-1) LOOP
-          FOR lat IN ymin..(ymax-1) LOOP
-            secgeo := st_intersection(geometry, ST_SetSRID(ST_MakeBox2D(ST_Point(lon,lat),ST_Point(lon+1,lat+1)),4326));
+    IF xmin = xmax OR ymin = ymax OR (xmax-xmin < 2 AND ymax-ymin < 2) THEN
+      x := insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, false, centroid, geometry);
+    ELSE
+--      RAISE WARNING 'Spliting geometry: % to %, % to %', xmin, xmax, ymin, ymax;
+      FOR lon IN xmin..(xmax-1) LOOP
+        FOR lat IN ymin..(ymax-1) LOOP
+          secbox := ST_SetSRID(ST_MakeBox2D(ST_Point(lon,lat),ST_Point(lon+1,lat+1)),4326);
+          IF st_intersects(geometry, secbox) THEN
+            secgeo := st_intersection(geometry, secbox);

             IF NOT ST_IsEmpty(secgeo) AND ST_GeometryType(secgeo) in ('ST_Polygon','ST_MultiPolygon') THEN
             IF NOT ST_IsEmpty(secgeo) AND ST_GeometryType(secgeo) in ('ST_Polygon','ST_MultiPolygon') THEN

-              INSERT INTO location_area values (place_id, country_code, name, keywords,
-                rank_search, rank_address, false, ST_Centroid(geometry),
-                st_intersection(geometry, ST_SetSRID(ST_MakeBox2D(ST_Point(lon,lat),ST_Point(lon+1,lat+1)),4326))
-                );
+              x := insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, false, centroid, secgeo);

             END IF;
             END IF;

-          END LOOP;
+          END IF;

         END LOOP;
         END LOOP;

-      END IF;
+      END LOOP;
+    END IF;

 
 

-    ELSE
+  ELSEIF rank_search < 26 THEN

 
 

+    diameter := 0.02;
+    IF rank_address = 0 THEN

       diameter := 0.02;
       diameter := 0.02;

-      IF rank_search = 14 THEN
-        diameter := 1;
-      ELSEIF rank_search = 15 THEN
-        diameter := 0.5;
-      ELSEIF rank_search = 16 THEN
-        diameter := 0.15;
-      ELSEIF rank_search = 17 THEN
-        diameter := 0.05;
-      ELSEIF rank_search = 25 THEN
-        diameter := 0.005;
-      ELSEIF rank_search = 26 THEN
-        diameter := 0.001;
-      END IF;
+    ELSEIF rank_search <= 14 THEN
+      diameter := 1.2;
+    ELSEIF rank_search <= 15 THEN
+      diameter := 1;
+    ELSEIF rank_search <= 16 THEN
+      diameter := 0.5;
+    ELSEIF rank_search <= 17 THEN
+      diameter := 0.2;
+    ELSEIF rank_search <= 21 THEN
+      diameter := 0.05;
+    ELSEIF rank_search = 25 THEN
+      diameter := 0.005;
+    END IF;

 
 

-      secgeo := ST_Buffer(geometry, diameter);
-      INSERT INTO location_area values (place_id, country_code, name, keywords,
-        rank_search, rank_address, true, ST_Centroid(geometry), secgeo);
+--    RAISE WARNING 'adding % diameter %', place_id, diameter;

 
 

-    END IF;
+    secgeo := ST_Buffer(geometry, diameter);
+    x := insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, true, ST_Centroid(geometry), secgeo);

 
 

-    INSERT INTO location_point values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
+  ELSE

 
 

-    RETURN true;
+    -- ~ 20meters
+    secgeo := ST_Buffer(geometry, 0.0002);
+    x := insertLocationAreaRoadNear(partition, place_id, country_code, keywords, rank_search, rank_address, true, ST_Centroid(geometry), secgeo);
+
+    -- ~ 100meters
+    secgeo := ST_Buffer(geometry, 0.001);
+    x := insertLocationAreaRoadFar(partition, place_id, country_code, keywords, rank_search, rank_address, true, ST_Centroid(geometry), secgeo);

 
 

-    IF not isarea THEN
-    IF rank_search < 26 THEN
-      INSERT INTO location_point_26 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 25 THEN
-      INSERT INTO location_point_25 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 24 THEN
-      INSERT INTO location_point_24 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 23 THEN
-      INSERT INTO location_point_23 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 22 THEN
-      INSERT INTO location_point_22 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 21 THEN
-      INSERT INTO location_point_21 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 20 THEN
-      INSERT INTO location_point_20 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 19 THEN
-      INSERT INTO location_point_19 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 18 THEN
-      INSERT INTO location_point_18 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 17 THEN
-      INSERT INTO location_point_17 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 16 THEN
-      INSERT INTO location_point_16 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 15 THEN
-      INSERT INTO location_point_15 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 14 THEN
-      INSERT INTO location_point_14 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 13 THEN
-      INSERT INTO location_point_13 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 12 THEN
-      INSERT INTO location_point_12 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 11 THEN
-      INSERT INTO location_point_11 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 10 THEN
-      INSERT INTO location_point_10 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 9 THEN
-      INSERT INTO location_point_9 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 8 THEN
-      INSERT INTO location_point_8 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 7 THEN
-      INSERT INTO location_point_7 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 6 THEN
-      INSERT INTO location_point_6 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 5 THEN
-      INSERT INTO location_point_5 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 4 THEN
-      INSERT INTO location_point_4 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 3 THEN
-      INSERT INTO location_point_3 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 2 THEN
-      INSERT INTO location_point_2 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    IF rank_search < 1 THEN
-      INSERT INTO location_point_1 values (place_id,country_code,name,keywords,rank_search,rank_address,isarea,ST_Centroid(geometry));
-    END IF;END IF;END IF;END IF;END IF;END IF;END IF;END IF;END IF;END IF;
-    END IF;END IF;END IF;END IF;END IF;END IF;END IF;END IF;END IF;END IF;
-    END IF;END IF;END IF;END IF;END IF;END IF;END IF;
-    RETURN true;

   END IF;
 
   END IF;
 

-  RETURN false;
+  RETURN true;

 END;
 $$
 LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION update_location(
 END;
 $$
 LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION update_location(

+    partition INTEGER,

     place_id BIGINT,
     place_country_code varchar(2),
     place_id BIGINT,
     place_country_code varchar(2),

-    name keyvalue[],
+    name hstore,

     rank_search INTEGER,
     rank_address INTEGER,
     geometry GEOMETRY
     rank_search INTEGER,
     rank_address INTEGER,
     geometry GEOMETRY


@@ -720,7 +669,8 @@ CREATE OR REPLACE FUNCTION update_location(
 DECLARE
   b BOOLEAN;
 BEGIN
 DECLARE
   b BOOLEAN;
 BEGIN

-  b := delete_location(place_id);
+  b := deleteLocationArea(partition, place_id);
+--  result := add_location(NEW.place_id, NEW.country_code, NEW.partition, name_vector, NEW.rank_search, NEW.rank_address, NEW.geometry);

   RETURN add_location(place_id, place_country_code, name, rank_search, rank_address, geometry);
 END;
 $$
   RETURN add_location(place_id, place_country_code, name, rank_search, rank_address, geometry);
 END;
 $$


@@ -743,9 +693,11 @@ BEGIN
       and search_name.place_id = place_addressline.place_id
   LOOP
     delete from search_name where place_id = childplace.place_id;
       and search_name.place_id = place_addressline.place_id
   LOOP
     delete from search_name where place_id = childplace.place_id;

-    childplace.nameaddress_vector := uniq(sort_asc(childplace.nameaddress_vector + to_add));
-    IF childplace.place_id = parent_place_id THEN
-      childplace.name_vector := uniq(sort_asc(childplace.name_vector + to_add));
+    IF not (ARRAY[to_add] <@ childplace.nameaddress_vector) THEN
+      childplace.nameaddress_vector := childplace.nameaddress_vector || to_add;
+    END IF;
+    IF childplace.place_id = parent_place_id and not (ARRAY[to_add] <@ childplace.name_vector) THEN
+      childplace.name_vector := childplace.name_vector || to_add;

     END IF;
     insert into search_name (place_id, search_rank, address_rank, country_code, name_vector, nameaddress_vector, centroid) 
       values (childplace.place_id, childplace.search_rank, childplace.address_rank, childplace.country_code, 
     END IF;
     insert into search_name (place_id, search_rank, address_rank, country_code, name_vector, nameaddress_vector, centroid) 
       values (childplace.place_id, childplace.search_rank, childplace.address_rank, childplace.country_code, 


@@ -757,7 +709,7 @@ END;
 $$
 LANGUAGE plpgsql;
 
 $$
 LANGUAGE plpgsql;
 

-CREATE OR REPLACE FUNCTION update_location_nameonly(OLD_place_id BIGINT, name keyvalue[]) RETURNS BOOLEAN
+CREATE OR REPLACE FUNCTION update_location_nameonly(partition INTEGER, OLD_place_id BIGINT, name hstore) RETURNS BOOLEAN

   AS $$
 DECLARE
   newkeywords INTEGER[];
   AS $$
 DECLARE
   newkeywords INTEGER[];


@@ -784,42 +736,13 @@ BEGIN
   END IF;
 
   UPDATE location_area set keywords = newkeywords where place_id = OLD_place_id;
   END IF;
 
   UPDATE location_area set keywords = newkeywords where place_id = OLD_place_id;

-  UPDATE location_point set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_0 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_1 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_2 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_3 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_4 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_5 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_6 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_7 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_8 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_9 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_10 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_11 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_12 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_13 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_14 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_15 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_16 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_17 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_18 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_19 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_20 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_21 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_22 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_23 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_24 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_25 set keywords = newkeywords where place_id = OLD_place_id;
-  UPDATE location_point_26 set keywords = newkeywords where place_id = OLD_place_id;
-

   RETURN search_name_add_words(OLD_place_id, addedkeywords);
 END;
 $$
 LANGUAGE plpgsql;
 
 
   RETURN search_name_add_words(OLD_place_id, addedkeywords);
 END;
 $$
 LANGUAGE plpgsql;
 
 

-CREATE OR REPLACE FUNCTION create_interpolation(wayid BIGINT, interpolationtype TEXT) RETURNS INTEGER
+CREATE OR REPLACE FUNCTION create_interpolation(wayid INTEGER, interpolationtype TEXT) RETURNS INTEGER

   AS $$
 DECLARE
   
   AS $$
 DECLARE
   


@@ -835,7 +758,8 @@ DECLARE
   originalnumberrange INTEGER;
   housenum INTEGER;
   linegeo GEOMETRY;
   originalnumberrange INTEGER;
   housenum INTEGER;
   linegeo GEOMETRY;

-  search_place_id INTEGER;
+  search_place_id BIGINT;
+  defpostalcode TEXT;

 
   havefirstpoint BOOLEAN;
   linestr TEXT;
 
   havefirstpoint BOOLEAN;
   linestr TEXT;


@@ -843,6 +767,7 @@ BEGIN
   newpoints := 0;
   IF interpolationtype = 'odd' OR interpolationtype = 'even' OR interpolationtype = 'all' THEN
 
   newpoints := 0;
   IF interpolationtype = 'odd' OR interpolationtype = 'even' OR interpolationtype = 'all' THEN
 

+    select postcode from placex where osm_type = 'W' and osm_id = wayid INTO defpostalcode;

     select nodes from planet_osm_ways where id = wayid INTO waynodes;
 --RAISE WARNING 'interpolation % % %',wayid,interpolationtype,waynodes;
     IF array_upper(waynodes, 1) IS NOT NULL THEN
     select nodes from planet_osm_ways where id = wayid INTO waynodes;
 --RAISE WARNING 'interpolation % % %',wayid,interpolationtype,waynodes;
     IF array_upper(waynodes, 1) IS NOT NULL THEN


@@ -851,10 +776,10 @@ BEGIN
 
       FOR nodeidpos in 1..array_upper(waynodes, 1) LOOP
 
 
       FOR nodeidpos in 1..array_upper(waynodes, 1) LOOP
 

-        select min(place_id) from placex where osm_type = 'N' and osm_id = waynodes[nodeidpos]::bigint and type = 'house' INTO search_place_id;
+        select min(place_id) from placex where osm_type = 'N' and osm_id = waynodes[nodeidpos]::INTEGER and type = 'house' INTO search_place_id;

         IF search_place_id IS NULL THEN
           -- null record of right type
         IF search_place_id IS NULL THEN
           -- null record of right type

-          select * from placex where osm_type = 'N' and osm_id = waynodes[nodeidpos]::bigint and type = 'house' limit 1 INTO nextnode;
+          select * from placex where osm_type = 'N' and osm_id = waynodes[nodeidpos]::INTEGER and type = 'house' limit 1 INTO nextnode;

           select ST_SetSRID(ST_Point(lon::float/10000000,lat::float/10000000),4326) from planet_osm_nodes where id = waynodes[nodeidpos] INTO nextnode.geometry;
         ELSE
           select * from placex where place_id = search_place_id INTO nextnode;
           select ST_SetSRID(ST_Point(lon::float/10000000,lat::float/10000000),4326) from planet_osm_nodes where id = waynodes[nodeidpos] INTO nextnode.geometry;
         ELSE
           select * from placex where place_id = search_place_id INTO nextnode;


@@ -868,7 +793,7 @@ BEGIN
           linestr := linestr||','||ST_X(nextnode.geometry)||' '||ST_Y(nextnode.geometry);
           endnumber := ('0'||substring(nextnode.housenumber,'[0-9]+'))::integer;
 
           linestr := linestr||','||ST_X(nextnode.geometry)||' '||ST_Y(nextnode.geometry);
           endnumber := ('0'||substring(nextnode.housenumber,'[0-9]+'))::integer;
 

-          IF startnumber IS NOT NULL and startnumber > 0 AND endnumber IS NOT NULL and endnumber > 0 THEN
+          IF startnumber IS NOT NULL and startnumber > 0 AND endnumber IS NOT NULL and endnumber > 0 AND @(startnumber - endnumber) < 1000 THEN

 
 --RAISE WARNING 'interpolation end % % ',nextnode.place_id,endnumber;
 
 
 --RAISE WARNING 'interpolation end % % ',nextnode.place_id,endnumber;
 


@@ -909,7 +834,10 @@ BEGIN
               FOR housenum IN startnumber..endnumber BY stepsize LOOP
                 -- this should really copy postcodes but it puts a huge burdon on the system for no big benefit
                 -- ideally postcodes should move up to the way
               FOR housenum IN startnumber..endnumber BY stepsize LOOP
                 -- this should really copy postcodes but it puts a huge burdon on the system for no big benefit
                 -- ideally postcodes should move up to the way

-                insert into placex values (null,'N',prevnode.osm_id,prevnode.class,prevnode.type,NULL,prevnode.admin_level,housenum,prevnode.street,prevnode.isin,null,prevnode.country_code,prevnode.street_place_id,prevnode.rank_address,prevnode.rank_search,false,ST_Line_Interpolate_Point(linegeo, (housenum::float-orginalstartnumber::float)/originalnumberrange::float));
+                insert into placex (osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode,
+                  country_code, parent_place_id, rank_address, rank_search, indexed_status, geometry)
+                  values ('N',prevnode.osm_id, prevnode.class, prevnode.type, prevnode.admin_level, housenum, prevnode.street, prevnode.isin, coalesce(prevnode.postcode, defpostalcode),
+                  prevnode.country_code, prevnode.parent_place_id, prevnode.rank_address, prevnode.rank_search, 1, ST_Line_Interpolate_Point(linegeo, (housenum::float-orginalstartnumber::float)/originalnumberrange::float));

                 newpoints := newpoints + 1;
 --RAISE WARNING 'interpolation number % % ',prevnode.place_id,housenum;
               END LOOP;
                 newpoints := newpoints + 1;
 --RAISE WARNING 'interpolation number % % ',prevnode.place_id,housenum;
               END LOOP;


@@ -945,22 +873,25 @@ DECLARE
   postcode TEXT;
   result BOOLEAN;
   country_code VARCHAR(2);
   postcode TEXT;
   result BOOLEAN;
   country_code VARCHAR(2);

+  default_language VARCHAR(10);

   diameter FLOAT;
   diameter FLOAT;

+  classtable TEXT;

 BEGIN
 BEGIN

---  RAISE WARNING '%',NEW.osm_id;

 --  RAISE WARNING '%',NEW.osm_id;
 
   -- just block these
   IF NEW.class = 'highway' and NEW.type in ('turning_circle','traffic_signals','mini_roundabout','noexit','crossing') THEN
 --  RAISE WARNING '%',NEW.osm_id;
 
   -- just block these
   IF NEW.class = 'highway' and NEW.type in ('turning_circle','traffic_signals','mini_roundabout','noexit','crossing') THEN

+--    RAISE WARNING 'bad highway %',NEW.osm_id;

     RETURN null;
   END IF;
   IF NEW.class in ('landuse','natural') and NEW.name is null THEN
     RETURN null;
   END IF;
   IF NEW.class in ('landuse','natural') and NEW.name is null THEN

+--    RAISE WARNING 'empty landuse %',NEW.osm_id;

     RETURN null;
   END IF;
 
     RETURN null;
   END IF;
 

---  RAISE WARNING '%',NEW.osm_id;

   IF ST_IsEmpty(NEW.geometry) OR NOT ST_IsValid(NEW.geometry) OR ST_X(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') OR ST_Y(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') THEN  
     -- block all invalid geometary - just not worth the risk.  seg faults are causing serious problems.
   IF ST_IsEmpty(NEW.geometry) OR NOT ST_IsValid(NEW.geometry) OR ST_X(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') OR ST_Y(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') THEN  
     -- block all invalid geometary - just not worth the risk.  seg faults are causing serious problems.

+--    RAISE WARNING 'invalid geometry %',NEW.osm_id;

     RETURN NULL;
 
     -- Dead code
     RETURN NULL;
 
     -- Dead code


@@ -970,15 +901,29 @@ BEGIN
     END IF;
     NEW.geometry := ST_buffer(NEW.geometry,0);
     IF ST_IsEmpty(NEW.geometry) OR NOT ST_IsValid(NEW.geometry) OR ST_X(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') OR ST_Y(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') THEN  
     END IF;
     NEW.geometry := ST_buffer(NEW.geometry,0);
     IF ST_IsEmpty(NEW.geometry) OR NOT ST_IsValid(NEW.geometry) OR ST_X(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') OR ST_Y(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') THEN  

-      RAISE WARNING 'Invalid geometary, rejecting: % %', NEW.osm_type, NEW.osm_id;
+--      RAISE WARNING 'Invalid geometary, rejecting: % %', NEW.osm_type, NEW.osm_id;

       RETURN NULL;
     END IF;
   END IF;
 
   NEW.place_id := nextval('seq_place');
       RETURN NULL;
     END IF;
   END IF;
 
   NEW.place_id := nextval('seq_place');

-  NEW.indexed := false;
-  NEW.country_code := lower(NEW.country_code);
-  NEW.geometry_sector := geometry_sector(NEW.geometry);
+  NEW.indexed_status := 1; --STATUS_NEW
+
+  NEW.country_code := lower(get_country_code(NEW.geometry, NEW.country_code));
+  NEW.partition := get_partition(NEW.geometry, NEW.country_code);
+  NEW.geometry_sector := geometry_sector(NEW.partition, NEW.geometry);
+
+  -- copy 'name' to or from the default language (if there is a default language)
+  IF NEW.name is not null AND array_upper(%#NEW.name,1) > 1 THEN
+    default_language := get_country_language_code(NEW.country_code);
+    IF default_language IS NOT NULL THEN
+      IF NEW.name ? 'name' AND NOT NEW.name ? ('name:'||default_language) THEN
+        NEW.name := NEW.name || (('name:'||default_language) => (NEW.name -> 'name'));
+      ELSEIF NEW.name ? ('name:'||default_language) AND NOT NEW.name ? 'name' THEN
+        NEW.name := NEW.name || ('name' => (NEW.name -> 'name:'||default_language));
+      END IF;
+    END IF;
+  END IF;

 
   IF NEW.admin_level > 15 THEN
     NEW.admin_level := 15;
 
   IF NEW.admin_level > 15 THEN
     NEW.admin_level := 15;


@@ -1021,11 +966,11 @@ BEGIN
         NEW.rank_search := 17;
         NEW.rank_address := 0;
       ELSEIF NEW.type in ('town') THEN
         NEW.rank_search := 17;
         NEW.rank_address := 0;
       ELSEIF NEW.type in ('town') THEN

-        NEW.rank_search := 17;
-        NEW.rank_address := NEW.rank_search;
-      ELSEIF NEW.type in ('village','hamlet','municipality','district','unincorporated_area','borough') THEN

         NEW.rank_search := 18;
         NEW.rank_search := 18;

-        NEW.rank_address := 17;
+        NEW.rank_address := 16;
+      ELSEIF NEW.type in ('village','hamlet','municipality','district','unincorporated_area','borough') THEN
+        NEW.rank_search := 19;
+        NEW.rank_address := 16;

       ELSEIF NEW.type in ('airport') AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') THEN
         NEW.rank_search := 18;
         NEW.rank_address := 17;
       ELSEIF NEW.type in ('airport') AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') THEN
         NEW.rank_search := 18;
         NEW.rank_address := 17;


@@ -1041,7 +986,7 @@ BEGIN
       ELSEIF NEW.type in ('suburb','croft','subdivision') THEN
         NEW.rank_search := 20;
         NEW.rank_address := NEW.rank_search;
       ELSEIF NEW.type in ('suburb','croft','subdivision') THEN
         NEW.rank_search := 20;
         NEW.rank_address := NEW.rank_search;

-      ELSEIF NEW.type in ('farm','locality','islet') THEN
+      ELSEIF NEW.type in ('farm','locality','islet','isolated_dwelling') THEN

         NEW.rank_search := 20;
         NEW.rank_address := 0;
       ELSEIF NEW.type in ('hall_of_residence','neighbourhood','housing_estate','nature_reserve') THEN
         NEW.rank_search := 20;
         NEW.rank_address := 0;
       ELSEIF NEW.type in ('hall_of_residence','neighbourhood','housing_estate','nature_reserve') THEN


@@ -1049,33 +994,24 @@ BEGIN
         NEW.rank_address := 22;
       ELSEIF NEW.type in ('postcode') THEN
 
         NEW.rank_address := 22;
       ELSEIF NEW.type in ('postcode') THEN
 

-        -- Postcode processing is very country dependant
-        IF NEW.country_code IS NULL THEN
-          NEW.country_code := get_country_code(NEW.geometry);
-        END IF;
-
-        NEW.name := ARRAY[ROW('ref',NEW.postcode)::keyvalue];
+        NEW.name := 'ref'=>NEW.postcode;

 
         IF NEW.country_code = 'gb' THEN
 
           IF NEW.postcode ~ '^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9][A-Z][A-Z])$' THEN
             NEW.rank_search := 25;
             NEW.rank_address := 5;
 
         IF NEW.country_code = 'gb' THEN
 
           IF NEW.postcode ~ '^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9][A-Z][A-Z])$' THEN
             NEW.rank_search := 25;
             NEW.rank_address := 5;

-            NEW.name := ARRAY[ROW('ref',NEW.postcode)::keyvalue];

           ELSEIF NEW.postcode ~ '^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9])$' THEN
             NEW.rank_search := 23;
             NEW.rank_address := 5;
           ELSEIF NEW.postcode ~ '^([A-Z][A-Z]?[0-9][0-9A-Z]? [0-9])$' THEN
             NEW.rank_search := 23;
             NEW.rank_address := 5;

-            NEW.name := ARRAY[ROW('ref',NEW.postcode)::keyvalue];

           ELSEIF NEW.postcode ~ '^([A-Z][A-Z]?[0-9][0-9A-Z])$' THEN
             NEW.rank_search := 21;
             NEW.rank_address := 5;
           ELSEIF NEW.postcode ~ '^([A-Z][A-Z]?[0-9][0-9A-Z])$' THEN
             NEW.rank_search := 21;
             NEW.rank_address := 5;

-            NEW.name := ARRAY[ROW('ref',NEW.postcode)::keyvalue];

           END IF;
 
         ELSEIF NEW.country_code = 'de' THEN
 
           IF NEW.postcode ~ '^([0-9]{5})$' THEN
           END IF;
 
         ELSEIF NEW.country_code = 'de' THEN
 
           IF NEW.postcode ~ '^([0-9]{5})$' THEN

-            NEW.name := ARRAY[ROW('ref',NEW.postcode)::keyvalue];

             NEW.rank_search := 21;
             NEW.rank_address := 11;
           END IF;
             NEW.rank_search := 21;
             NEW.rank_address := 11;
           END IF;


@@ -1083,7 +1019,6 @@ BEGIN
         ELSE
           -- Guess at the postcode format and coverage (!)
           IF upper(NEW.postcode) ~ '^[A-Z0-9]{1,5}$' THEN -- Probably too short to be very local
         ELSE
           -- Guess at the postcode format and coverage (!)
           IF upper(NEW.postcode) ~ '^[A-Z0-9]{1,5}$' THEN -- Probably too short to be very local

-            NEW.name := ARRAY[ROW('ref',NEW.postcode)::keyvalue];

             NEW.rank_search := 21;
             NEW.rank_address := 11;
           ELSE
             NEW.rank_search := 21;
             NEW.rank_address := 11;
           ELSE


@@ -1091,15 +1026,9 @@ BEGIN
             postcode := substring(upper(NEW.postcode) from '^([- :A-Z0-9]+)([- :][A-Z0-9]+)$');
 
             IF postcode IS NOT NULL THEN
             postcode := substring(upper(NEW.postcode) from '^([- :A-Z0-9]+)([- :][A-Z0-9]+)$');
 
             IF postcode IS NOT NULL THEN

-
-              -- TODO: insert new line into location instead
-              --result := add_location(NEW.place_id,NEW.country_code,ARRAY[ROW('ref',postcode)::keyvalue],21,11,NEW.geometry);
-
-              NEW.name := ARRAY[ROW('ref',NEW.postcode)::keyvalue];

               NEW.rank_search := 25;
               NEW.rank_address := 11;
             ELSEIF NEW.postcode ~ '^[- :A-Z0-9]{6,}$' THEN
               NEW.rank_search := 25;
               NEW.rank_address := 11;
             ELSEIF NEW.postcode ~ '^[- :A-Z0-9]{6,}$' THEN

-              NEW.name := ARRAY[ROW('ref',NEW.postcode)::keyvalue];

               NEW.rank_search := 21;
               NEW.rank_address := 11;
             END IF;
               NEW.rank_search := 21;
               NEW.rank_address := 11;
             END IF;


@@ -1110,17 +1039,20 @@ BEGIN
         NEW.rank_search := 26;
         NEW.rank_address := NEW.rank_search;
       ELSEIF NEW.type in ('house','building') THEN
         NEW.rank_search := 26;
         NEW.rank_address := NEW.rank_search;
       ELSEIF NEW.type in ('house','building') THEN

-        NEW.rank_search := 28;
+        NEW.rank_search := 30;

         NEW.rank_address := NEW.rank_search;
       ELSEIF NEW.type in ('houses') THEN
         -- can't guarantee all required nodes loaded yet due to caching in osm2pgsql
         -- insert new point into place for each derived building
         --i := create_interpolation(NEW.osm_id, NEW.housenumber);
         NEW.rank_address := NEW.rank_search;
       ELSEIF NEW.type in ('houses') THEN
         -- can't guarantee all required nodes loaded yet due to caching in osm2pgsql
         -- insert new point into place for each derived building
         --i := create_interpolation(NEW.osm_id, NEW.housenumber);

+        NEW.rank_search := 28;
+        NEW.rank_address := 0;

       END IF;
 
     ELSEIF NEW.class = 'boundary' THEN
       END IF;
 
     ELSEIF NEW.class = 'boundary' THEN

-      IF NEW.country_code is null THEN
-        NEW.country_code := get_country_code(NEW.geometry);
+      IF ST_GeometryType(NEW.geometry) NOT IN ('ST_Polygon','ST_MultiPolygon') THEN
+--        RAISE WARNING 'invalid boundary %',NEW.osm_id;
+        return NULL;

       END IF;
       NEW.rank_search := NEW.admin_level * 2;
       NEW.rank_address := NEW.rank_search;
       END IF;
       NEW.rank_search := NEW.admin_level * 2;
       NEW.rank_address := NEW.rank_search;


@@ -1133,6 +1065,7 @@ BEGIN
       NEW.rank_address := NEW.rank_search;
     ELSEIF NEW.class = 'highway' AND NEW.name is NULL AND 
            NEW.type in ('service','cycleway','path','footway','steps','bridleway','track','byway','motorway_link','primary_link','trunk_link','secondary_link','tertiary_link') THEN
       NEW.rank_address := NEW.rank_search;
     ELSEIF NEW.class = 'highway' AND NEW.name is NULL AND 
            NEW.type in ('service','cycleway','path','footway','steps','bridleway','track','byway','motorway_link','primary_link','trunk_link','secondary_link','tertiary_link') THEN

+--      RAISE WARNING 'unnamed minor feature %',NEW.osm_id;

       RETURN NULL;
     ELSEIF NEW.class = 'railway' AND NEW.type in ('rail') THEN
       RETURN NULL;
       RETURN NULL;
     ELSEIF NEW.class = 'railway' AND NEW.type in ('rail') THEN
       RETURN NULL;


@@ -1166,17 +1099,16 @@ BEGIN
     NEW.rank_address := 30;
   END IF;
 
     NEW.rank_address := 30;
   END IF;
 

+  IF (NEW.extratags -> 'capital') = 'yes' THEN
+    NEW.rank_search := NEW.rank_search -1;
+  END IF;
+

 -- Block import below rank 22
 --  IF NEW.rank_search > 22 THEN
 --    RETURN NULL;
 --  END IF;
 
 -- Block import below rank 22
 --  IF NEW.rank_search > 22 THEN
 --    RETURN NULL;
 --  END IF;
 

-  IF array_upper(NEW.name, 1) is not null THEN
-    result := add_location(NEW.place_id,NEW.country_code,NEW.name,NEW.rank_search,NEW.rank_address,NEW.geometry);
-  END IF;
-
-  --RETURN NEW;
-  -- The following is not needed until doing diff updates, and slows the main index process down
+--  RETURN NEW;  -- The following is not needed until doing diff updates, and slows the main index process down

 
   IF (ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') AND ST_IsValid(NEW.geometry)) THEN
     -- Performance: We just can't handle re-indexing for country level changes
 
   IF (ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') AND ST_IsValid(NEW.geometry)) THEN
     -- Performance: We just can't handle re-indexing for country level changes


@@ -1184,17 +1116,17 @@ BEGIN
       -- mark items within the geometry for re-indexing
 --    RAISE WARNING 'placex poly insert: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
 -- work around bug in postgis
       -- mark items within the geometry for re-indexing
 --    RAISE WARNING 'placex poly insert: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
 -- work around bug in postgis

-      update placex set indexed = false where indexed and (ST_Contains(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry)) 
-       AND rank_search > NEW.rank_search and ST_geometrytype(placex.geometry) = 'ST_Point';
-      update placex set indexed = false where indexed and (ST_Contains(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry)) 
-       AND rank_search > NEW.rank_search and ST_geometrytype(placex.geometry) != 'ST_Point';
+      update placex set indexed_status = 2 where (ST_Contains(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry)) 
+       AND rank_search > NEW.rank_search and indexed_status = 0 and ST_geometrytype(placex.geometry) = 'ST_Point' and (rank_search < 28 or name is not null);
+      update placex set indexed_status = 2 where (ST_Contains(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry)) 
+       AND rank_search > NEW.rank_search and indexed_status = 0 and ST_geometrytype(placex.geometry) != 'ST_Point' and (rank_search < 28 or name is not null);

     END IF;
   ELSE
     -- mark nearby items for re-indexing, where 'nearby' depends on the features rank_search and is a complete guess :(
     diameter := 0;
     -- 16 = city, anything higher than city is effectively ignored (polygon required!)
     IF NEW.type='postcode' THEN
     END IF;
   ELSE
     -- mark nearby items for re-indexing, where 'nearby' depends on the features rank_search and is a complete guess :(
     diameter := 0;
     -- 16 = city, anything higher than city is effectively ignored (polygon required!)
     IF NEW.type='postcode' THEN

-      diameter := 0.001;
+      diameter := 0.05;

     ELSEIF NEW.rank_search < 16 THEN
       diameter := 0;
     ELSEIF NEW.rank_search < 18 THEN
     ELSEIF NEW.rank_search < 16 THEN
       diameter := 0;
     ELSEIF NEW.rank_search < 18 THEN


@@ -1212,11 +1144,22 @@ BEGIN
     END IF;
     IF diameter > 0 THEN
 --      RAISE WARNING 'placex point insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,diameter;
     END IF;
     IF diameter > 0 THEN
 --      RAISE WARNING 'placex point insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,diameter;

-      update placex set indexed = false where indexed and rank_search > NEW.rank_search and ST_DWithin(placex.geometry, NEW.geometry, diameter);
+      update placex set indexed_status = 2 where indexed_status = 0 and rank_search > NEW.rank_search and ST_DWithin(placex.geometry, NEW.geometry, diameter) and (rank_search < 28 or name is not null);

     END IF;
 
   END IF;
 
     END IF;
 
   END IF;
 

+   -- add to tables for special search
+   -- Note: won't work on initial import because the classtype tables
+   -- do not yet exist. It won't hurt either.
+  classtable := 'place_classtype_' || NEW.class || '_' || NEW.type;
+  SELECT count(*)>0 FROM pg_tables WHERE tablename = classtable INTO result;
+  IF result THEN
+    EXECUTE 'INSERT INTO ' || classtable::regclass || ' (place_id, centroid) VALUES ($1,$2)' 
+    USING NEW.place_id, ST_Centroid(NEW.geometry);
+  END IF;
+
+

 --  IF NEW.rank_search < 26 THEN
 --    RAISE WARNING 'placex insert: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
 --  END IF;
 --  IF NEW.rank_search < 26 THEN
 --    RAISE WARNING 'placex insert: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
 --  END IF;


@@ -1233,38 +1176,40 @@ TRIGGER
 DECLARE
 
   place_centroid GEOMETRY;
 DECLARE
 
   place_centroid GEOMETRY;

-  place_geometry_text TEXT;

 
   search_maxdistance FLOAT[];
   search_mindistance FLOAT[];
   address_havelevel BOOLEAN[];
 --  search_scores wordscore[];
 --  search_scores_pos INTEGER;
 
   search_maxdistance FLOAT[];
   search_mindistance FLOAT[];
   address_havelevel BOOLEAN[];
 --  search_scores wordscore[];
 --  search_scores_pos INTEGER;

-  search_country_code_conflict BOOLEAN;

 
   i INTEGER;
   iMax FLOAT;
   location RECORD;
 
   i INTEGER;
   iMax FLOAT;
   location RECORD;

+  way RECORD;

   relation RECORD;
   search_diameter FLOAT;
   search_prevdiameter FLOAT;
   search_maxrank INTEGER;
   address_maxrank INTEGER;
   address_street_word_id INTEGER;
   relation RECORD;
   search_diameter FLOAT;
   search_prevdiameter FLOAT;
   search_maxrank INTEGER;
   address_maxrank INTEGER;
   address_street_word_id INTEGER;

-  street_place_id_count INTEGER;
+  parent_place_id_rank BIGINT;
+  

   isin TEXT[];
   isin TEXT[];

-  tagpairid INTEGER;
+  isin_tokens INT[];
+
+  location_rank_search INTEGER;
+  location_distance FLOAT;

 
 

-  bPointCountryCode BOOLEAN;
+  tagpairid INTEGER;

 
   name_vector INTEGER[];
   nameaddress_vector INTEGER[];
 
   result BOOLEAN;
 
   name_vector INTEGER[];
   nameaddress_vector INTEGER[];
 
   result BOOLEAN;

-

 BEGIN
 
 BEGIN
 

---  RAISE WARNING '%',NEW.place_id;
+--RAISE WARNING '%',NEW.place_id;

 --RAISE WARNING '%', NEW;
 
   IF NEW.class = 'place' AND NEW.type = 'postcodearea' THEN
 --RAISE WARNING '%', NEW;
 
   IF NEW.class = 'place' AND NEW.type = 'postcodearea' THEN


@@ -1272,91 +1217,48 @@ BEGIN
     RETURN NEW;
   END IF;
 
     RETURN NEW;
   END IF;
 

-  NEW.country_code := lower(NEW.country_code);
+  -- deferred delete
+  IF OLD.indexed_status = 100 THEN
+    delete from placex where place_id = OLD.place_id;
+    RETURN NULL;
+  END IF;
+
+  IF NEW.indexed_status = 0 and OLD.indexed_status != 0 THEN

 
 

-  IF NEW.indexed and NOT OLD.indexed THEN
+    NEW.indexed_date = now();

 
     IF NEW.class = 'place' AND NEW.type = 'houses' THEN
       i := create_interpolation(NEW.osm_id, NEW.housenumber);
       RETURN NEW;
     END IF;
 
 
     IF NEW.class = 'place' AND NEW.type = 'houses' THEN
       i := create_interpolation(NEW.osm_id, NEW.housenumber);
       RETURN NEW;
     END IF;
 

---RAISE WARNING 'PROCESSING: % %', NEW.place_id, NEW.name;
+    IF OLD.indexed_status > 1 THEN
+      result := deleteSearchName(NEW.partition, NEW.place_id);
+      DELETE FROM place_addressline WHERE place_id = NEW.place_id;
+      DELETE FROM place_boundingbox where place_id = NEW.place_id;
+      result := deleteRoad(NEW.partition, NEW.place_id);
+      result := deleteLocationArea(NEW.partition, NEW.place_id);
+    END IF;

 
 

-    search_country_code_conflict := false;
-
-    DELETE FROM search_name WHERE place_id = NEW.place_id;
---RAISE WARNING 'x1';
-    DELETE FROM place_addressline WHERE place_id = NEW.place_id;
---RAISE WARNING 'x2';
-    DELETE FROM place_boundingbox where place_id = NEW.place_id;
+    -- reclaculate country and partition (should probably have a country_code and calculated_country_code as seperate fields)
+    SELECT country_code from place where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type INTO NEW.country_code;
+    NEW.country_code := lower(get_country_code(NEW.geometry, NEW.country_code));
+    NEW.partition := get_partition(NEW.geometry, NEW.country_code);
+    NEW.geometry_sector := geometry_sector(NEW.partition, NEW.geometry);

 
     -- Adding ourselves to the list simplifies address calculations later
     INSERT INTO place_addressline VALUES (NEW.place_id, NEW.place_id, true, true, 0, NEW.rank_address); 
 
     -- Adding ourselves to the list simplifies address calculations later
     INSERT INTO place_addressline VALUES (NEW.place_id, NEW.place_id, true, true, 0, NEW.rank_address); 

---RAISE WARNING 'x3';

 
     -- What level are we searching from
     search_maxrank := NEW.rank_search;
 
 
     -- What level are we searching from
     search_maxrank := NEW.rank_search;
 

-    -- Default max/min distances to look for a location
-    FOR i IN 1..28 LOOP
-      search_maxdistance[i] := 1;
-      search_mindistance[i] := 0.0;
-      address_havelevel[i] := false;
-    END LOOP;
-    -- Minimum size to search, can be larger but don't let it shink below this
-    search_mindistance[14] := 0.2;
-    search_mindistance[15] := 0.1;
-    search_mindistance[16] := 0.05;
-    search_mindistance[17] := 0.03;
-    search_mindistance[18] := 0.015;
-    search_mindistance[19] := 0.008;
-    search_mindistance[20] := 0.006;
-    search_mindistance[21] := 0.004;
-    search_mindistance[22] := 0.003;
-    search_mindistance[23] := 0.002;
-    search_mindistance[24] := 0.002;
-    search_mindistance[25] := 0.001;
-    search_mindistance[26] := 0.001;
-
-    search_maxdistance[14] := 1;
-    search_maxdistance[15] := 0.5;
-    search_maxdistance[16] := 0.15;
-    search_maxdistance[17] := 0.05;
-    search_maxdistance[18] := 0.02;
-    search_maxdistance[19] := 0.02;
-    search_maxdistance[20] := 0.02;
-    search_maxdistance[21] := 0.02;
-    search_maxdistance[22] := 0.02;
-    search_maxdistance[23] := 0.02;
-    search_maxdistance[24] := 0.02;
-    search_maxdistance[25] := 0.02;
-    search_maxdistance[26] := 0.02;
-

     -- Speed up searches - just use the centroid of the feature
     -- cheaper but less acurate
     place_centroid := ST_Centroid(NEW.geometry);
     -- Speed up searches - just use the centroid of the feature
     -- cheaper but less acurate
     place_centroid := ST_Centroid(NEW.geometry);

-    place_geometry_text := 'ST_GeomFromText('''||ST_AsText(NEW.geometry)||''','||ST_SRID(NEW.geometry)||')';
-
-    -- copy the building number to the name
-    -- done here rather than on insert to avoid initial indexing
-    -- TODO: This might be a silly thing to do
-    --IF (NEW.name IS NULL OR array_upper(NEW.name,1) IS NULL) AND NEW.housenumber IS NOT NULL THEN
-    --  NEW.name := ARRAY[ROW('ref',NEW.housenumber)::keyvalue];
-    --END IF;
-
-    --Temp hack to prevent need to re-index
-    IF NEW.name::text = '{"(ref,'||NEW.housenumber||')"}' THEN
-      NEW.name := NULL;
-    END IF;

 
 

-    --IF (NEW.name IS NULL OR array_upper(NEW.name,1) IS NULL) AND NEW.type IS NOT NULL THEN
-    --  NEW.name := ARRAY[ROW('type',NEW.type)::keyvalue];
-    --END IF;
-
-    -- Initialise the name and address vectors using our name
+    -- Initialise the name vector using our name

     name_vector := make_keywords(NEW.name);
     name_vector := make_keywords(NEW.name);

-    nameaddress_vector := name_vector;
+    nameaddress_vector := '{}'::int[];

 
     -- some tag combinations add a special id for search
     tagpairid := get_tagpair(NEW.class,NEW.type);
 
     -- some tag combinations add a special id for search
     tagpairid := get_tagpair(NEW.class,NEW.type);


@@ -1364,6 +1266,10 @@ BEGIN
       name_vector := name_vector + tagpairid;
     END IF;
 
       name_vector := name_vector + tagpairid;
     END IF;
 

+    FOR i IN 1..28 LOOP
+      address_havelevel[i] := false;
+    END LOOP;
+

 --RAISE WARNING '% %', NEW.place_id, NEW.rank_search;
 
     -- For low level elements we inherit from our parent road
 --RAISE WARNING '% %', NEW.place_id, NEW.rank_search;
 
     -- For low level elements we inherit from our parent road


@@ -1371,12 +1277,12 @@ BEGIN
 
 --RAISE WARNING 'finding street for %', NEW;
 
 
 --RAISE WARNING 'finding street for %', NEW;
 

-      NEW.street_place_id := null;
+      NEW.parent_place_id := null;

 
       -- to do that we have to find our parent road
       -- Copy data from linked items (points on ways, addr:street links, relations)
       -- Note that addr:street links can only be indexed once the street itself is indexed
 
       -- to do that we have to find our parent road
       -- Copy data from linked items (points on ways, addr:street links, relations)
       -- Note that addr:street links can only be indexed once the street itself is indexed

-      IF NEW.street_place_id IS NULL AND NEW.osm_type = 'N' THEN
+      IF NEW.parent_place_id IS NULL AND NEW.osm_type = 'N' THEN

 
         -- Is this node part of a relation?
         FOR relation IN select * from planet_osm_rels where parts @> ARRAY[NEW.osm_id::integer] and members @> ARRAY['n'||NEW.osm_id]
 
         -- Is this node part of a relation?
         FOR relation IN select * from planet_osm_rels where parts @> ARRAY[NEW.osm_id::integer] and members @> ARRAY['n'||NEW.osm_id]


@@ -1384,10 +1290,10 @@ BEGIN
           -- At the moment we only process one type of relation - associatedStreet
           IF relation.tags @> ARRAY['associatedStreet'] AND array_upper(relation.members, 1) IS NOT NULL THEN
             FOR i IN 1..array_upper(relation.members, 1) BY 2 LOOP
           -- At the moment we only process one type of relation - associatedStreet
           IF relation.tags @> ARRAY['associatedStreet'] AND array_upper(relation.members, 1) IS NOT NULL THEN
             FOR i IN 1..array_upper(relation.members, 1) BY 2 LOOP

-              IF NEW.street_place_id IS NULL AND relation.members[i+1] = 'street' THEN
+              IF NEW.parent_place_id IS NULL AND relation.members[i+1] = 'street' THEN

 --RAISE WARNING 'node in relation %',relation;
                 SELECT place_id from placex where osm_type='W' and osm_id = substring(relation.members[i],2,200)::integer 
 --RAISE WARNING 'node in relation %',relation;
                 SELECT place_id from placex where osm_type='W' and osm_id = substring(relation.members[i],2,200)::integer 

-                  and rank_search = 26 INTO NEW.street_place_id;
+                  and rank_search = 26 INTO NEW.parent_place_id;

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


@@ -1395,30 +1301,33 @@ BEGIN
 
 --RAISE WARNING 'x1';
         -- Is this node part of a way?
 
 --RAISE WARNING 'x1';
         -- Is this node part of a way?

-        FOR location IN select * from placex where osm_type = 'W' 
-          and osm_id in (select id from planet_osm_ways where nodes && ARRAY[NEW.osm_id::integer])
+        FOR way IN select id from planet_osm_ways where nodes @> ARRAY[NEW.osm_id::integer] LOOP
+--RAISE WARNING '%', way;
+        FOR location IN select * from placex where osm_type = 'W' and osm_id = way.id

         LOOP
 --RAISE WARNING '%', location;
           -- Way IS a road then we are on it - that must be our road
         LOOP
 --RAISE WARNING '%', location;
           -- Way IS a road then we are on it - that must be our road

-          IF location.rank_search = 26 AND NEW.street_place_id IS NULL THEN
+          IF location.rank_search = 26 AND NEW.parent_place_id IS NULL THEN

 --RAISE WARNING 'node in way that is a street %',location;
 --RAISE WARNING 'node in way that is a street %',location;

-            NEW.street_place_id := location.place_id;
+            NEW.parent_place_id := location.place_id;

           END IF;
 
           -- Is the WAY part of a relation
           END IF;
 
           -- Is the WAY part of a relation

-          FOR relation IN select * from planet_osm_rels where parts @> ARRAY[location.osm_id::integer] and members @> ARRAY['w'||location.osm_id]
-          LOOP
-            -- At the moment we only process one type of relation - associatedStreet
-            IF relation.tags @> ARRAY['associatedStreet'] AND array_upper(relation.members, 1) IS NOT NULL THEN
-              FOR i IN 1..array_upper(relation.members, 1) BY 2 LOOP
-                IF NEW.street_place_id IS NULL AND relation.members[i+1] = 'street' THEN
---RAISE WARNING 'node in way that is in a relation %',relation;
-                  SELECT place_id from placex where osm_type='W' and osm_id = substring(relation.members[i],2,200)::integer 
-                    and rank_search = 26 INTO NEW.street_place_id;
+          IF NEW.parent_place_id IS NULL THEN
+              FOR relation IN select * from planet_osm_rels where parts @> ARRAY[location.osm_id::integer] and members @> ARRAY['w'||location.osm_id]
+              LOOP
+                -- At the moment we only process one type of relation - associatedStreet
+                IF relation.tags @> ARRAY['associatedStreet'] AND array_upper(relation.members, 1) IS NOT NULL THEN
+                  FOR i IN 1..array_upper(relation.members, 1) BY 2 LOOP
+                    IF NEW.parent_place_id IS NULL AND relation.members[i+1] = 'street' THEN
+    --RAISE WARNING 'node in way that is in a relation %',relation;
+                      SELECT place_id from placex where osm_type='W' and osm_id = substring(relation.members[i],2,200)::integer 
+                        and rank_search = 26 INTO NEW.parent_place_id;
+                    END IF;
+                  END LOOP;

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

-            END IF;
-          END LOOP;
+          END IF;    

           
           -- If the way contains an explicit name of a street copy it
           IF NEW.street IS NULL AND location.street IS NOT NULL THEN
           
           -- If the way contains an explicit name of a street copy it
           IF NEW.street IS NULL AND location.street IS NOT NULL THEN


@@ -1427,108 +1336,80 @@ BEGIN
           END IF;
 
           -- If this way is a street interpolation line then it is probably as good as we are going to get
           END IF;
 
           -- If this way is a street interpolation line then it is probably as good as we are going to get

-          IF NEW.street_place_id IS NULL AND NEW.street IS NULL AND location.class = 'place' and location.type='houses' THEN
+          IF NEW.parent_place_id IS NULL AND NEW.street IS NULL AND location.class = 'place' and location.type='houses' THEN

             -- Try and find a way that is close roughly parellel to this line
             FOR relation IN SELECT place_id FROM placex
               WHERE ST_DWithin(location.geometry, placex.geometry, 0.001) and placex.rank_search = 26
             -- Try and find a way that is close roughly parellel to this line
             FOR relation IN SELECT place_id FROM placex
               WHERE ST_DWithin(location.geometry, placex.geometry, 0.001) and placex.rank_search = 26

+                and st_geometrytype(location.geometry) in ('ST_LineString')

               ORDER BY (ST_distance(placex.geometry, ST_Line_Interpolate_Point(location.geometry,0))+
                         ST_distance(placex.geometry, ST_Line_Interpolate_Point(location.geometry,0.5))+
                         ST_distance(placex.geometry, ST_Line_Interpolate_Point(location.geometry,1))) ASC limit 1
             LOOP
 --RAISE WARNING 'using nearest street to address interpolation line,0.001 %',relation;
               ORDER BY (ST_distance(placex.geometry, ST_Line_Interpolate_Point(location.geometry,0))+
                         ST_distance(placex.geometry, ST_Line_Interpolate_Point(location.geometry,0.5))+
                         ST_distance(placex.geometry, ST_Line_Interpolate_Point(location.geometry,1))) ASC limit 1
             LOOP
 --RAISE WARNING 'using nearest street to address interpolation line,0.001 %',relation;

-              NEW.street_place_id := relation.place_id;
+              NEW.parent_place_id := relation.place_id;

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

+        END LOOP;

                 
       END IF;
 
 --RAISE WARNING 'x2';
 
                 
       END IF;
 
 --RAISE WARNING 'x2';
 

-      IF NEW.street_place_id IS NULL AND NEW.osm_type = 'W' THEN
+      IF NEW.parent_place_id IS NULL AND NEW.osm_type = 'W' THEN

         -- Is this way part of a relation?
         FOR relation IN select * from planet_osm_rels where parts @> ARRAY[NEW.osm_id::integer] and members @> ARRAY['w'||NEW.osm_id]
         LOOP
           -- At the moment we only process one type of relation - associatedStreet
           IF relation.tags @> ARRAY['associatedStreet'] AND array_upper(relation.members, 1) IS NOT NULL THEN
             FOR i IN 1..array_upper(relation.members, 1) BY 2 LOOP
         -- Is this way part of a relation?
         FOR relation IN select * from planet_osm_rels where parts @> ARRAY[NEW.osm_id::integer] and members @> ARRAY['w'||NEW.osm_id]
         LOOP
           -- At the moment we only process one type of relation - associatedStreet
           IF relation.tags @> ARRAY['associatedStreet'] AND array_upper(relation.members, 1) IS NOT NULL THEN
             FOR i IN 1..array_upper(relation.members, 1) BY 2 LOOP

-              IF NEW.street_place_id IS NULL AND relation.members[i+1] = 'street' THEN
+              IF NEW.parent_place_id IS NULL AND relation.members[i+1] = 'street' THEN

 --RAISE WARNING 'way that is in a relation %',relation;
                 SELECT place_id from placex where osm_type='W' and osm_id = substring(relation.members[i],2,200)::integer
 --RAISE WARNING 'way that is in a relation %',relation;
                 SELECT place_id from placex where osm_type='W' and osm_id = substring(relation.members[i],2,200)::integer

-                  and rank_search = 26 INTO NEW.street_place_id;
+                  and rank_search = 26 INTO NEW.parent_place_id;

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

---RAISE WARNING 'x3';
+--RAISE WARNING 'x3 %',NEW.parent_place_id;

 
 

-      IF NEW.street_place_id IS NULL AND NEW.street IS NOT NULL THEN
+      IF NEW.parent_place_id IS NULL AND NEW.street IS NOT NULL THEN

        address_street_word_id := get_name_id(make_standard_name(NEW.street));
        address_street_word_id := get_name_id(make_standard_name(NEW.street));

---RAISE WARNING 'street: % %', NEW.street, address_street_word_id;

         IF address_street_word_id IS NOT NULL THEN
         IF address_street_word_id IS NOT NULL THEN

-          FOR location IN SELECT place_id,ST_distance(NEW.geometry, search_name.centroid) as distance 
-            FROM search_name WHERE search_name.name_vector @> ARRAY[address_street_word_id]
-            AND ST_DWithin(NEW.geometry, search_name.centroid, 0.01) and search_rank between 22 and 27
-            ORDER BY ST_distance(NEW.geometry, search_name.centroid) ASC limit 1
-          LOOP
---RAISE WARNING 'streetname found nearby %',location;
-            NEW.street_place_id := location.place_id;
+          FOR location IN SELECT * from getNearestNamedRoadFeature(NEW.partition, place_centroid, address_street_word_id) LOOP
+            NEW.parent_place_id := location.place_id;

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

-        -- Failed, fall back to nearest - don't just stop
-        IF NEW.street_place_id IS NULL THEN
---RAISE WARNING 'unable to find streetname nearby % %',NEW.street,address_street_word_id;
---          RETURN null;
-        END IF;

       END IF;
 
       END IF;
 

---RAISE WARNING 'x4';
-
-<<<<<<< .mine
-      IF NEW.street_place_id IS NULL THEN
-        FOR location IN SELECT place_id
-          FROM location_area
-          WHERE ST_Contains(area, place_centroid) and location_area.rank_search = 26
-          ORDER BY ST_Distance(place_centroid, centroid) ASC limit 1
-=======
-      search_diameter := 0.00005;
-      WHILE NEW.street_place_id IS NULL AND search_diameter < 0.1 LOOP
---RAISE WARNING '% %', search_diameter,ST_AsText(ST_Centroid(NEW.geometry));
-        FOR location IN SELECT place_id FROM placex
-          WHERE ST_DWithin(place_centroid, placex.geometry, search_diameter) and rank_search between 22 and 27
-          ORDER BY ST_distance(NEW.geometry, placex.geometry) ASC limit 1
->>>>>>> .r23726
-        LOOP
---RAISE WARNING 'using nearest street,% % %',search_diameter,NEW.street,location;
-          NEW.street_place_id := location.place_id;
+--RAISE WARNING 'x4 %',NEW.parent_place_id;
+      -- Still nothing, just use the nearest road
+      IF NEW.parent_place_id IS NULL THEN
+        FOR location IN SELECT place_id FROM getNearestRoadFeature(NEW.partition, place_centroid) LOOP
+          NEW.parent_place_id := location.place_id;

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

---RAISE WARNING 'x6 %',NEW.street_place_id;
+--return NEW;
+--RAISE WARNING 'x6 %',NEW.parent_place_id;

 
       -- If we didn't find any road fallback to standard method
 
       -- If we didn't find any road fallback to standard method

-      IF NEW.street_place_id IS NOT NULL THEN
-
-        -- Some unnamed roads won't have been indexed, index now if needed
-        select count(*) from place_addressline where place_id = NEW.street_place_id INTO street_place_id_count;
-        IF street_place_id_count = 0 THEN
-          UPDATE placex set indexed = true where indexed = false and place_id = NEW.street_place_id;
-        END IF;
+      IF NEW.parent_place_id IS NOT NULL THEN

 
         -- Add the street to the address as zero distance to force to front of list
 
         -- Add the street to the address as zero distance to force to front of list

-        INSERT INTO place_addressline VALUES (NEW.place_id, NEW.street_place_id, true, true, 0, 26);
+--        INSERT INTO place_addressline VALUES (NEW.place_id, NEW.parent_place_id, true, true, 0, 26);

         address_havelevel[26] := true;
 
         -- Import address details from parent, reclculating distance in process
         address_havelevel[26] := true;
 
         -- Import address details from parent, reclculating distance in process

-        INSERT INTO place_addressline select NEW.place_id, x.address_place_id, x.fromarea, x.isaddress, ST_distance(NEW.geometry, placex.geometry), placex.rank_address
-          from place_addressline as x join placex on (address_place_id = placex.place_id)
-          where x.place_id = NEW.street_place_id and x.address_place_id != NEW.street_place_id;
+--        INSERT INTO place_addressline select NEW.place_id, x.address_place_id, x.fromarea, x.isaddress, ST_distance(NEW.geometry, placex.geometry), placex.rank_address
+--          from place_addressline as x join placex on (address_place_id = placex.place_id)
+--          where x.place_id = NEW.parent_place_id and x.address_place_id != NEW.parent_place_id;

 
         -- Get the details of the parent road
 
         -- Get the details of the parent road

-        select * from search_name where place_id = NEW.street_place_id INTO location;
+        select * from search_name where place_id = NEW.parent_place_id INTO location;

         NEW.country_code := location.country_code;
 
 --RAISE WARNING '%', NEW.name;
         NEW.country_code := location.country_code;
 
 --RAISE WARNING '%', NEW.name;


@@ -1539,191 +1420,150 @@ BEGIN
 
         -- Merge address from parent
         nameaddress_vector := array_merge(nameaddress_vector, location.nameaddress_vector);
 
         -- Merge address from parent
         nameaddress_vector := array_merge(nameaddress_vector, location.nameaddress_vector);

-
+--return NEW;

         -- Performance, it would be more acurate to do all the rest of the import process but it takes too long
         -- Just be happy with inheriting from parent road only
         -- Performance, it would be more acurate to do all the rest of the import process but it takes too long
         -- Just be happy with inheriting from parent road only

-        INSERT INTO search_name values (NEW.place_id, NEW.rank_search, NEW.rank_address, NEW.country_code,
-          name_vector, nameaddress_vector, place_centroid);
+
+        IF NEW.rank_search <= 25 THEN
+          result := add_location(NEW.place_id, NEW.country_code, NEW.partition, name_vector, NEW.rank_search, NEW.rank_address, NEW.geometry);
+        END IF;
+
+        result := insertSearchName(NEW.partition, NEW.place_id, NEW.country_code, name_vector, nameaddress_vector, NEW.rank_search, NEW.rank_address, NEW.importance, place_centroid);

 
         return NEW;
       END IF;
 
     END IF;
 
 
         return NEW;
       END IF;
 
     END IF;
 

---RAISE WARNING '  INDEXING: %',NEW;
-
-    -- Process area matches (tend to be better quality)
-    FOR location IN SELECT
-      place_id,
-      name,
-      keywords,
-      country_code,
-      rank_address,
-      rank_search,
-      ST_Distance(place_centroid, centroid) as distance
-      FROM location_area
-      WHERE ST_Contains(area, place_centroid) and location_area.rank_search < search_maxrank
-      ORDER BY ST_Distance(place_centroid, centroid) ASC
-    LOOP
+-- RAISE WARNING '  INDEXING: %',NEW;

 
 

---RAISE WARNING '  AREA: % % %',location.keywords,NEW.country_code,location.country_code;
+    NEW.parent_place_id = 0;
+    parent_place_id_rank = 0;

 
 

-      IF NEW.country_code IS NULL THEN
-        NEW.country_code := location.country_code;
-      ELSEIF NEW.country_code != location.country_code and location.rank_search > 3 THEN
-        search_country_code_conflict := true;
+    -- convert isin to array of tokenids
+    isin_tokens := '{}'::int[];
+    IF NEW.isin IS NOT NULL THEN
+      isin := regexp_split_to_array(NEW.isin, E'[;,]');
+      IF array_upper(isin, 1) IS NOT NULL THEN
+        FOR i IN 1..array_upper(isin, 1) LOOP
+          address_street_word_id := get_name_id(make_standard_name(isin[i]));
+          IF address_street_word_id IS NOT NULL AND NOT(ARRAY[address_street_word_id] <@ isin_tokens) THEN
+            isin_tokens := isin_tokens || address_street_word_id;
+          END IF;
+        END LOOP;

       END IF;
       END IF;

+    END IF;
+    IF NEW.postcode IS NOT NULL THEN
+      isin := regexp_split_to_array(NEW.postcode, E'[;,]');
+      IF array_upper(isin, 1) IS NOT NULL THEN
+        FOR i IN 1..array_upper(isin, 1) LOOP
+          address_street_word_id := get_name_id(make_standard_name(isin[i]));
+          IF address_street_word_id IS NOT NULL AND NOT(ARRAY[address_street_word_id] <@ isin_tokens) THEN
+            isin_tokens := isin_tokens || address_street_word_id;
+          END IF;
+        END LOOP;
+      END IF;
+    END IF;
+--RAISE WARNING 'ISIN: %', isin_tokens;

 
 

-      -- Add it to the list of search terms
-      nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]);
-      INSERT INTO place_addressline VALUES (NEW.place_id, location.place_id, true, NOT address_havelevel[location.rank_address], location.distance, location.rank_address); 
-      address_havelevel[location.rank_address] := true;
+    -- Process area matches
+    location_rank_search := 100;
+    location_distance := 0;
+--RAISE WARNING '  getNearFeatures(%,''%'',%,''%'')',NEW.partition, place_centroid, search_maxrank, isin_tokens;
+    FOR location IN SELECT * from getNearFeatures(NEW.partition, place_centroid, search_maxrank, isin_tokens) LOOP

 
 

-    END LOOP;
+--RAISE WARNING '  AREA: %',location;

 
 

-    -- try using the isin value to find parent places
-    address_maxrank := search_maxrank;
-    IF NEW.isin IS NOT NULL THEN
-      -- Doing isin without a country code seems to be dangerous
-      IF NEW.country_code is null THEN
-        NEW.country_code := get_country_code(place_centroid);
+      IF location.rank_search < location_rank_search THEN
+        location_rank_search := location.rank_search;
+        location_distance := location.distance * 1.5;

       END IF;
       END IF;

-      isin := regexp_split_to_array(NEW.isin, E'[;,]');
-      FOR i IN 1..array_upper(isin, 1) LOOP
-        address_street_word_id := get_name_id(make_standard_name(isin[i]));
-        IF address_street_word_id IS NOT NULL THEN
---RAISE WARNING '  search: %',address_street_word_id;
-          FOR location IN SELECT place_id,keywords,rank_search,location_point.country_code,rank_address,
-            ST_Distance(place_centroid, search_name.centroid) as distance
-            FROM search_name join location_point using (place_id)
-            WHERE search_name.name_vector @> ARRAY[address_street_word_id]
-            AND rank_search < NEW.rank_search
-            AND (NEW.country_code IS NULL OR search_name.country_code = NEW.country_code OR search_name.address_rank < 4)
-            ORDER BY ST_distance(NEW.geometry, search_name.centroid) ASC limit 1
-          LOOP
-
-            IF NEW.country_code IS NULL THEN
-              NEW.country_code := location.country_code;
-            ELSEIF NEW.country_code != location.country_code and location.rank_search > 3 THEN
-              search_country_code_conflict := true;
-            END IF;

 
 

---RAISE WARNING '  found: %',location.place_id;
-            nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]);
-            INSERT INTO place_addressline VALUES (NEW.place_id, location.place_id, false, NOT address_havelevel[location.rank_address], location.distance, location.rank_address);
+      IF location.distance < location_distance OR NOT location.isguess THEN

 
 

-            IF address_maxrank > location.rank_address THEN
-              address_maxrank := location.rank_address;
-            END IF;
-          END LOOP;
+        -- Add it to the list of search terms
+        nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]);
+        INSERT INTO place_addressline VALUES (NEW.place_id, location.place_id, true, NOT address_havelevel[location.rank_address], location.distance, location.rank_address); 
+        address_havelevel[location.rank_address] := true;
+
+--RAISE WARNING '  Terms: (%) %',location, nameaddress_vector;
+
+        IF location.rank_address > parent_place_id_rank THEN
+          NEW.parent_place_id = location.place_id;
+          parent_place_id_rank = location.rank_address;

         END IF;
         END IF;

-      END LOOP;
-      FOR i IN address_maxrank..28 LOOP
-        address_havelevel[i] := true;
-      END LOOP;
-    END IF;

 
 

-    -- If we have got a consistent country code from the areas and/or isin then we don't care about points (too inacurate)
-    bPointCountryCode := NEW.country_code IS NULL;
+      END IF;

 
 

-    IF true THEN
-    -- full search using absolute position
+    END LOOP;

 
 

-    search_diameter := 0;
-    -- 16 = city, anything larger tends to be an area so don't continue
-    WHILE FALSE AND search_diameter < 1 AND search_maxrank > 16 LOOP
+    -- try using the isin value to find parent places
+    IF array_upper(isin_tokens, 1) IS NOT NULL THEN
+      FOR i IN 1..array_upper(isin_tokens, 1) LOOP
+--RAISE WARNING '  getNearestNamedFeature: % % % %',NEW.partition, place_centroid, search_maxrank, isin_tokens[i];

 
 

---      RAISE WARNING 'Nearest: % %', search_diameter, search_maxrank;
+        FOR location IN SELECT * from getNearestNamedFeature(NEW.partition, place_centroid, search_maxrank, isin_tokens[i]) LOOP

 
 

-      search_prevdiameter := search_diameter;
-      IF search_diameter = 0 THEN
-        search_diameter := 0.001;
-      ELSE
-        search_diameter := search_diameter * 2;
-      END IF;
+--RAISE WARNING '  ISIN: %',location;

 
 

---RAISE WARNING '%', 'SELECT place_id, name, keywords, country_code, rank_address, rank_search,'||
---        'ST_Distance('||place_geometry_text||', centroid) as distance,'||
---        'ST_Distance('||place_geometry_text||', centroid) as maxdistance'|| -- this version of postgis doesnt have maxdistance !
---        ' FROM location_point_'||(case when search_maxrank > 26 THEN 26 ELSE search_maxrank end)||
---        ' WHERE ST_DWithin('||place_geometry_text||', centroid, '||search_diameter||') '||
---        '  AND ST_Distance('||place_geometry_text||', centroid) > '||search_prevdiameter||
---        ' ORDER BY ST_Distance('||place_geometry_text||', centroid) ASC';
-
-      -- Try nearest
-      FOR location IN EXECUTE 'SELECT place_id, name, keywords, country_code, rank_address, rank_search,'||
-        'ST_Distance('||place_geometry_text||', centroid) as distance,'||
-        'ST_Distance('||place_geometry_text||', centroid) as maxdistance'|| -- this version of postgis doesnt have maxdistance !
-        ' FROM location_point_'||(case when search_maxrank > 26 THEN 26 ELSE search_maxrank end)||
-        ' WHERE ST_DWithin('||place_geometry_text||', centroid, '||search_diameter||') '||
-        '  AND ST_Distance('||place_geometry_text||', centroid) >= '||search_prevdiameter||
-        ' ORDER BY ST_Distance('||place_geometry_text||', centroid) ASC'
-      LOOP
-
-        IF bPointCountryCode THEN      
-          IF NEW.country_code IS NULL THEN
-            NEW.country_code := location.country_code;
-          ELSEIF NEW.country_code != location.country_code THEN
-            search_country_code_conflict := true;
+          nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]);
+          INSERT INTO place_addressline VALUES (NEW.place_id, location.place_id, false, NOT address_havelevel[location.rank_address], location.distance, location.rank_address);
+          address_havelevel[location.rank_address] := true;
+
+          IF location.rank_address > parent_place_id_rank THEN
+            NEW.parent_place_id = location.place_id;
+            parent_place_id_rank = location.rank_address;

           END IF;
           END IF;

+
+        END LOOP;
+
+      END LOOP;
+    END IF;
+
+    -- for long ways we should add search terms for the entire length
+    IF st_length(NEW.geometry) > 0.05 THEN
+
+      location_rank_search := 100;
+      location_distance := 0;
+
+      FOR location IN SELECT * from getNearFeatures(NEW.partition, NEW.geometry, search_maxrank, isin_tokens) LOOP
+
+        IF location.rank_search < location_rank_search THEN
+          location_rank_search := location.rank_search;
+          location_distance := location.distance * 1.5;

         END IF;
         END IF;

-    
-        -- Find search words
---RAISE WARNING 'IF % % % %', location.name, location.distance, location.rank_search, search_maxdistance;
---RAISE WARNING '  POINT: % % % % %', location.name, location.rank_search, location.place_id, location.distance, search_maxdistance[location.rank_search];
-        IF (location.distance < search_maxdistance[location.rank_search]) THEN
---RAISE WARNING '  adding';     
-          -- Add it to the list of search terms, de-duplicate
+
+        IF location.distance < location_distance THEN
+
+          -- Add it to the list of search terms

           nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]);
           nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]);

-    
-          iMax := (location.maxdistance*1.5)::float;
-          FOR i IN location.rank_search..28 LOOP
-            IF iMax < search_maxdistance[i] THEN
---RAISE WARNING '  setting % to %',i,iMax;     
-              IF iMax > search_mindistance[i] THEN
-                search_maxdistance[i] := iMax;
-              ELSE
-                search_maxdistance[i] := search_mindistance[i];
-              END IF;
-            END IF;
-          END LOOP;
+          INSERT INTO place_addressline VALUES (NEW.place_id, location.place_id, true, false, location.distance, location.rank_address); 

 
 

-          INSERT INTO place_addressline VALUES (NEW.place_id, location.place_id, false, NOT address_havelevel[location.rank_address], location.distance, location.rank_address); 
-          address_havelevel[location.rank_address] := true;
-  
-        ELSE
---RAISE WARNING '  Stopped: % % % %', location.rank_search, location.distance, search_maxdistance[location.rank_search], location.name;
-          IF search_maxrank > location.rank_search THEN
-            search_maxrank := location.rank_search;
-          END IF;

         END IF;
         END IF;

-    
+

       END LOOP;
       END LOOP;

-  
---RAISE WARNING '  POINT LOCATIONS, % %', search_maxrank, search_diameter;
-  
-    END LOOP; --WHILE

 
 

-    ELSE
-      -- Cascading search using nearest parent

     END IF;
 
     END IF;
 

-    IF search_country_code_conflict OR NEW.country_code IS NULL THEN
-      NEW.country_code := get_country_code(place_centroid);
-    END IF;
+    -- if we have a name add this to the name search table
+    IF NEW.name IS NOT NULL THEN

 
 

-    INSERT INTO search_name values (NEW.place_id, NEW.rank_search, NEW.rank_search, NEW.country_code, 
-      name_vector, nameaddress_vector, place_centroid);
+      IF NEW.rank_search <= 25 THEN
+        result := add_location(NEW.place_id, NEW.country_code, NEW.partition, name_vector, NEW.rank_search, NEW.rank_address, NEW.geometry);
+      END IF;
+
+      IF NEW.rank_search between 26 and 27 and NEW.class = 'highway' THEN
+        result := insertLocationRoad(NEW.partition, NEW.place_id, NEW.country_code, NEW.geometry);
+      END IF;

 
 

-    IF NEW.country_code IS NOT NULL THEN
-      DELETE FROM place_addressline WHERE place_id = NEW.place_id and address_place_id in (
-        select address_place_id from place_addressline join placex on (address_place_id = placex.place_id)
-          where place_addressline.place_id = NEW.place_id and placex.country_code != NEW.country_code and cached_rank_address >= 4);
+      result := insertSearchName(NEW.partition, NEW.place_id, NEW.country_code, name_vector, nameaddress_vector, NEW.rank_search, NEW.rank_address, NEW.importance, place_centroid);
+
+--      INSERT INTO search_name values (NEW.place_id, NEW.rank_search, NEW.rank_search, 0, NEW.country_code, name_vector, nameaddress_vector, place_centroid);

     END IF;
 
   END IF;
 
     END IF;
 
   END IF;
 

-  return NEW;
+  RETURN NEW;

 END;
 $$
 LANGUAGE plpgsql;
 END;
 $$
 LANGUAGE plpgsql;


@@ -1731,48 +1571,40 @@ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION placex_delete() RETURNS TRIGGER
   AS $$
 DECLARE
 CREATE OR REPLACE FUNCTION placex_delete() RETURNS TRIGGER
   AS $$
 DECLARE

+  b BOOLEAN;
+  classtable TEXT;

 BEGIN
 
 BEGIN
 

---IF OLD.rank_search < 26 THEN
---RAISE WARNING 'delete % % % % %',OLD.place_id,OLD.osm_type,OLD.osm_id,OLD.class,OLD.type;
---END IF;
-
-  -- mark everything linked to this place for re-indexing
-  UPDATE placex set indexed = false from place_addressline where address_place_id = OLD.place_id and placex.place_id = place_addressline.place_id and indexed;
-
-  -- do the actual delete
-  DELETE FROM location_area where place_id = OLD.place_id;
-  DELETE FROM location_point where place_id = OLD.place_id;
-  DELETE FROM location_point_0 where place_id = OLD.place_id;
-  DELETE FROM location_point_1 where place_id = OLD.place_id;
-  DELETE FROM location_point_2 where place_id = OLD.place_id;
-  DELETE FROM location_point_3 where place_id = OLD.place_id;
-  DELETE FROM location_point_4 where place_id = OLD.place_id;
-  DELETE FROM location_point_5 where place_id = OLD.place_id;
-  DELETE FROM location_point_6 where place_id = OLD.place_id;
-  DELETE FROM location_point_7 where place_id = OLD.place_id;
-  DELETE FROM location_point_8 where place_id = OLD.place_id;
-  DELETE FROM location_point_9 where place_id = OLD.place_id;
-  DELETE FROM location_point_10 where place_id = OLD.place_id;
-  DELETE FROM location_point_11 where place_id = OLD.place_id;
-  DELETE FROM location_point_12 where place_id = OLD.place_id;
-  DELETE FROM location_point_13 where place_id = OLD.place_id;
-  DELETE FROM location_point_14 where place_id = OLD.place_id;
-  DELETE FROM location_point_15 where place_id = OLD.place_id;
-  DELETE FROM location_point_16 where place_id = OLD.place_id;
-  DELETE FROM location_point_17 where place_id = OLD.place_id;
-  DELETE FROM location_point_18 where place_id = OLD.place_id;
-  DELETE FROM location_point_19 where place_id = OLD.place_id;
-  DELETE FROM location_point_20 where place_id = OLD.place_id;
-  DELETE FROM location_point_21 where place_id = OLD.place_id;
-  DELETE FROM location_point_22 where place_id = OLD.place_id;
-  DELETE FROM location_point_23 where place_id = OLD.place_id;
-  DELETE FROM location_point_24 where place_id = OLD.place_id;
-  DELETE FROM location_point_25 where place_id = OLD.place_id;
-  DELETE FROM location_point_26 where place_id = OLD.place_id;
-  DELETE FROM search_name where place_id = OLD.place_id;
+  IF OLD.rank_address < 30 THEN
+
+    -- mark everything linked to this place for re-indexing
+    UPDATE placex set indexed_status = 2 from place_addressline where address_place_id = OLD.place_id 
+      and placex.place_id = place_addressline.place_id and indexed_status = 0;
+
+    DELETE FROM place_addressline where address_place_id = OLD.place_id;
+
+    b := deleteRoad(OLD.partition, OLD.place_id);
+
+    update placex set indexed_status = 2 where parent_place_id = OLD.place_id and indexed_status = 0;
+
+  END IF;
+
+  IF OLD.rank_address < 26 THEN
+    b := deleteLocationArea(OLD.partition, OLD.place_id);
+  END IF;
+
+  IF OLD.name is not null THEN
+    b := deleteSearchName(OLD.partition, OLD.place_id);
+  END IF;
+

   DELETE FROM place_addressline where place_id = OLD.place_id;
   DELETE FROM place_addressline where place_id = OLD.place_id;

-  DELETE FROM place_addressline where address_place_id = OLD.place_id;
+
+  -- remove from tables for special search
+  classtable := 'place_classtype_' || OLD.class || '_' || OLD.type;
+  SELECT count(*)>0 FROM pg_tables WHERE tablename = classtable INTO b;
+  IF b THEN
+    EXECUTE 'DELETE FROM ' || classtable::regclass || ' WHERE place_id = $1' USING OLD.place_id;
+  END IF;

 
   RETURN OLD;
 
 
   RETURN OLD;
 


@@ -1783,11 +1615,21 @@ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION place_delete() RETURNS TRIGGER
   AS $$
 DECLARE
 CREATE OR REPLACE FUNCTION place_delete() RETURNS TRIGGER
   AS $$
 DECLARE

-  placeid INTEGER;
+  placeid BIGINT;

 BEGIN
 
 --  RAISE WARNING 'delete: % % % %',OLD.osm_type,OLD.osm_id,OLD.class,OLD.type;
 BEGIN
 
 --  RAISE WARNING 'delete: % % % %',OLD.osm_type,OLD.osm_id,OLD.class,OLD.type;

-  delete from placex where osm_type = OLD.osm_type and osm_id = OLD.osm_id and class = OLD.class and type = OLD.type;
+
+  -- deleting large polygons can have a massive effect ont he system - require manual intervention to let them through
+  IF st_area(OLD.geometry) > 2 THEN
+    insert into import_polygon_delete values (OLD.osm_type,OLD.osm_id,OLD.class,OLD.type);
+    RETURN NULL;
+  END IF;
+
+  -- mark for delete
+  UPDATE placex set indexed_status = 100 where osm_type = OLD.osm_type and osm_id = OLD.osm_id and class = OLD.class and type = OLD.type;
+
+--  delete from placex where osm_type = OLD.osm_type and osm_id = OLD.osm_id and class = OLD.class and type = OLD.type;

   RETURN OLD;
 
 END;
   RETURN OLD;
 
 END;


@@ -1801,11 +1643,12 @@ DECLARE
   existing RECORD;
   existingplacex RECORD;
   existinggeometry GEOMETRY;
   existing RECORD;
   existingplacex RECORD;
   existinggeometry GEOMETRY;

-  existingplace_id bigint;
+  existingplace_id BIGINT;

   result BOOLEAN;
   result BOOLEAN;

+  partition INTEGER;

 BEGIN
 
 BEGIN
 

-  IF FALSE AND NEW.osm_type = 'R' THEN
+  IF FALSE and NEW.osm_type = 'R' THEN

     RAISE WARNING '-----------------------------------------------------------------------------------';
     RAISE WARNING 'place_insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,st_area(NEW.geometry);
     select * from placex where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type INTO existingplacex;
     RAISE WARNING '-----------------------------------------------------------------------------------';
     RAISE WARNING 'place_insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,st_area(NEW.geometry);
     select * from placex where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type INTO existingplacex;


@@ -1821,14 +1664,15 @@ BEGIN
   END IF;
 
   IF ST_IsEmpty(NEW.geometry) OR NOT ST_IsValid(NEW.geometry) OR ST_X(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') OR ST_Y(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') THEN  
   END IF;
 
   IF ST_IsEmpty(NEW.geometry) OR NOT ST_IsValid(NEW.geometry) OR ST_X(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') OR ST_Y(ST_Centroid(NEW.geometry))::text in ('NaN','Infinity','-Infinity') THEN  

+    INSERT INTO import_polygon_error values (NEW.osm_type, NEW.osm_id, NEW.class, NEW.type, NEW.name, NEW.country_code, 
+      now(), ST_IsValidReason(NEW.geometry), null, NEW.geometry);

 --    RAISE WARNING 'Invalid Geometry: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
     RETURN null;
   END IF;
 
   -- Patch in additional country names
 --    RAISE WARNING 'Invalid Geometry: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
     RETURN null;
   END IF;
 
   -- Patch in additional country names

-  -- adminitrative (with typo) is unfortunately hard codes - this probably won't get fixed until v2
-  IF NEW.admin_level = 2 AND NEW.type = 'adminitrative' AND NEW.country_code is not null THEN
-    select add_keywords(NEW.name, country_name.name) from country_name where country_name.country_code = lower(NEW.country_code) INTO NEW.name;
+  IF NEW.admin_level = 2 AND NEW.type = 'administrative' AND NEW.country_code is not null THEN
+    select country_name.name || NEW.name from country_name where country_name.country_code = lower(NEW.country_code) INTO NEW.name;

   END IF;
     
   -- Have we already done this place?
   END IF;
     
   -- Have we already done this place?


@@ -1838,20 +1682,34 @@ BEGIN
   select * from placex where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type INTO existingplacex;
 
   -- Handle a place changing type by removing the old data
   select * from placex where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type INTO existingplacex;
 
   -- Handle a place changing type by removing the old data

-  -- My generated 'place' types are causing havok because they overlap with real tags
-  -- TODO: move them to their own special purpose tag to avoid collisions
+  -- My generated 'place' types are causing havok because they overlap with real keys
+  -- TODO: move them to their own special purpose key/class to avoid collisions

   IF existing.osm_type IS NULL AND (NEW.type not in ('postcode','house','houses')) THEN
     DELETE FROM place where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type not in ('postcode','house','houses');
   END IF;
 
 --  RAISE WARNING 'Existing: %',existing.place_id;
 
   IF existing.osm_type IS NULL AND (NEW.type not in ('postcode','house','houses')) THEN
     DELETE FROM place where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type not in ('postcode','house','houses');
   END IF;
 
 --  RAISE WARNING 'Existing: %',existing.place_id;
 

+  -- Log and discard 
+  IF existing.geometry is not null AND st_isvalid(existing.geometry) 
+    AND st_area(existing.geometry) > 0.02
+    AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon')
+    AND st_area(NEW.geometry) < st_area(existing.geometry)*0.5
+    THEN
+    INSERT INTO import_polygon_error values (NEW.osm_type, NEW.osm_id, NEW.class, NEW.type, NEW.name, NEW.country_code, now(), 
+      'Area reduced from '||st_area(existing.geometry)||' to '||st_area(NEW.geometry), existing.geometry, NEW.geometry);
+    RETURN null;
+  END IF;
+
+  DELETE from import_polygon_error where osm_type = NEW.osm_type and osm_id = NEW.osm_id;
+  DELETE from import_polygon_delete where osm_type = NEW.osm_type and osm_id = NEW.osm_id;
+

   -- To paraphrase, if there isn't an existing item, OR if the admin level has changed, OR if it is a major change in geometry
   IF existing.osm_type IS NULL 
      OR existingplacex.osm_type IS NULL
      OR coalesce(existing.admin_level, 100) != coalesce(NEW.admin_level, 100) 
   -- To paraphrase, if there isn't an existing item, OR if the admin level has changed, OR if it is a major change in geometry
   IF existing.osm_type IS NULL 
      OR existingplacex.osm_type IS NULL
      OR coalesce(existing.admin_level, 100) != coalesce(NEW.admin_level, 100) 

---     OR coalesce(existing.country_code, '') != coalesce(NEW.country_code, '')
-     OR (existing.geometry != NEW.geometry AND ST_Distance(ST_Centroid(existing.geometry),ST_Centroid(NEW.geometry)) > 0.01 AND NOT
+     OR coalesce(existing.country_code, '') != coalesce(NEW.country_code, '')
+     OR (existing.geometry::text != NEW.geometry::text AND ST_Distance(ST_Centroid(existing.geometry),ST_Centroid(NEW.geometry)) > 0.01 AND NOT

      (ST_GeometryType(existing.geometry) in ('ST_Polygon','ST_MultiPolygon') AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon')))
      THEN
 
      (ST_GeometryType(existing.geometry) in ('ST_Polygon','ST_MultiPolygon') AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon')))
      THEN
 


@@ -1862,22 +1720,19 @@ BEGIN
 --    RAISE WARNING 'no existing placex %', existingplacex;
 --  END IF;
 
 --    RAISE WARNING 'no existing placex %', existingplacex;
 --  END IF;
 

-

 --    RAISE WARNING 'delete and replace';
 
     IF existing.osm_type IS NOT NULL THEN
 --      RAISE WARNING 'insert delete % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,ST_Distance(ST_Centroid(existing.geometry),ST_Centroid(NEW.geometry)),existing;
 --    RAISE WARNING 'delete and replace';
 
     IF existing.osm_type IS NOT NULL THEN
 --      RAISE WARNING 'insert delete % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,ST_Distance(ST_Centroid(existing.geometry),ST_Centroid(NEW.geometry)),existing;

-      IF existing.rank_search < 26 THEN
---        RAISE WARNING 'replace placex % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
-      END IF;

       DELETE FROM place where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type;
     END IF;   
 
 --    RAISE WARNING 'delete and replace2';
 
     -- No - process it as a new insertion (hopefully of low rank or it will be slow)
       DELETE FROM place where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type;
     END IF;   
 
 --    RAISE WARNING 'delete and replace2';
 
     -- No - process it as a new insertion (hopefully of low rank or it will be slow)

-    insert into placex values (NEW.place_id
-        ,NEW.osm_type
+    insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, 
+      street, isin, postcode, country_code, extratags, geometry)
+      values (NEW.osm_type

         ,NEW.osm_id
         ,NEW.class
         ,NEW.type
         ,NEW.osm_id
         ,NEW.class
         ,NEW.type


@@ -1888,10 +1743,7 @@ BEGIN
         ,NEW.isin
         ,NEW.postcode
         ,NEW.country_code
         ,NEW.isin
         ,NEW.postcode
         ,NEW.country_code

-        ,NEW.street_place_id
-        ,NEW.rank_address
-        ,NEW.rank_search
-        ,NEW.indexed
+        ,NEW.extratags

         ,NEW.geometry
         );
 
         ,NEW.geometry
         );
 


@@ -1903,7 +1755,7 @@ BEGIN
   -- Various ways to do the update
 
   -- Debug, what's changed?
   -- Various ways to do the update
 
   -- Debug, what's changed?

-  IF FALSE AND existing.rank_search < 26 THEN
+  IF FALSE THEN

     IF coalesce(existing.name::text, '') != coalesce(NEW.name::text, '') THEN
       RAISE WARNING 'update details, name: % % % %',NEW.osm_type,NEW.osm_id,existing.name::text,NEW.name::text;
     END IF;
     IF coalesce(existing.name::text, '') != coalesce(NEW.name::text, '') THEN
       RAISE WARNING 'update details, name: % % % %',NEW.osm_type,NEW.osm_id,existing.name::text,NEW.name::text;
     END IF;


@@ -1925,38 +1777,34 @@ BEGIN
   END IF;
 
   -- Special case for polygon shape changes because they tend to be large and we can be a bit clever about how we handle them
   END IF;
 
   -- Special case for polygon shape changes because they tend to be large and we can be a bit clever about how we handle them

-  IF existing.geometry != NEW.geometry 
+  IF existing.geometry::text != NEW.geometry::text 

      AND ST_GeometryType(existing.geometry) in ('ST_Polygon','ST_MultiPolygon')
      AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') 
      THEN 
 
      AND ST_GeometryType(existing.geometry) in ('ST_Polygon','ST_MultiPolygon')
      AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') 
      THEN 
 

---    IF existing.rank_search < 26 THEN
---      RAISE WARNING 'existing polygon change % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
---    END IF;
-

     -- Get the version of the geometry actually used (in placex table)
     select geometry from placex where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type into existinggeometry;
 
     -- Performance limit
     -- Get the version of the geometry actually used (in placex table)
     select geometry from placex where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type into existinggeometry;
 
     -- Performance limit

-    IF st_area(NEW.geometry) < 1 AND st_area(existinggeometry) < 1 THEN
+    IF st_area(NEW.geometry) < 0.000000001 AND st_area(existinggeometry) < 1 THEN

 
       -- re-index points that have moved in / out of the polygon, could be done as a single query but postgres gets the index usage wrong
 
       -- re-index points that have moved in / out of the polygon, could be done as a single query but postgres gets the index usage wrong

-      update placex set indexed = false where indexed and 
+      update placex set indexed_status = 2 where indexed_status = 0 and 

           (ST_Contains(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry))
           AND NOT (ST_Contains(existinggeometry, placex.geometry) OR ST_Intersects(existinggeometry, placex.geometry))
           (ST_Contains(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry))
           AND NOT (ST_Contains(existinggeometry, placex.geometry) OR ST_Intersects(existinggeometry, placex.geometry))

-          AND rank_search > NEW.rank_search;
+          AND rank_search > existingplacex.rank_search AND (rank_search < 28 or name is not null);

 
 

-      update placex set indexed = false where indexed and 
+      update placex set indexed_status = 2 where indexed_status = 0 and 

           (ST_Contains(existinggeometry, placex.geometry) OR ST_Intersects(existinggeometry, placex.geometry))
           AND NOT (ST_Contains(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry))
           (ST_Contains(existinggeometry, placex.geometry) OR ST_Intersects(existinggeometry, placex.geometry))
           AND NOT (ST_Contains(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry))

-          AND rank_search > NEW.rank_search;
+          AND rank_search > existingplacex.rank_search AND (rank_search < 28 or name is not null);

 
     END IF;
 
   END IF;
 
   -- Special case - if we are just adding extra words we hack them into the search_name table rather than reindexing
 
     END IF;
 
   END IF;
 
   -- Special case - if we are just adding extra words we hack them into the search_name table rather than reindexing

-  IF existingplacex.rank_search < 26
+  IF FALSE AND existingplacex.rank_search < 26

      AND coalesce(existing.housenumber, '') = coalesce(NEW.housenumber, '')
      AND coalesce(existing.street, '') = coalesce(NEW.street, '')
      AND coalesce(existing.isin, '') = coalesce(NEW.isin, '')
      AND coalesce(existing.housenumber, '') = coalesce(NEW.housenumber, '')
      AND coalesce(existing.street, '') = coalesce(NEW.street, '')
      AND coalesce(existing.isin, '') = coalesce(NEW.isin, '')


@@ -1965,15 +1813,12 @@ BEGIN
      AND coalesce(existing.name::text, '') != coalesce(NEW.name::text, '') 
      THEN
 
      AND coalesce(existing.name::text, '') != coalesce(NEW.name::text, '') 
      THEN
 

---    IF existing.rank_search < 26 THEN
---      RAISE WARNING 'name change only % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
---    END IF;
-

     IF NOT update_location_nameonly(existingplacex.place_id, NEW.name) THEN
 
       IF st_area(NEW.geometry) < 0.5 THEN
     IF NOT update_location_nameonly(existingplacex.place_id, NEW.name) THEN
 
       IF st_area(NEW.geometry) < 0.5 THEN

-        UPDATE placex set indexed = false from place_addressline where address_place_id = existingplacex.place_id 
-          and placex.place_id = place_addressline.place_id and indexed;
+        UPDATE placex set indexed_status = 2 from place_addressline where address_place_id = existingplacex.place_id 
+          and placex.place_id = place_addressline.place_id and indexed_status = 0
+          and (rank_search < 28 or name is not null);

       END IF;
 
     END IF;
       END IF;
 
     END IF;


@@ -1988,14 +1833,10 @@ BEGIN
         OR coalesce(existing.postcode, '') != coalesce(NEW.postcode, '')
         OR coalesce(existing.country_code, '') != coalesce(NEW.country_code, '') THEN
 
         OR coalesce(existing.postcode, '') != coalesce(NEW.postcode, '')
         OR coalesce(existing.country_code, '') != coalesce(NEW.country_code, '') THEN
 

---      IF existing.rank_search < 26 THEN
---        RAISE WARNING 'other change % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;
---      END IF;
-

       -- performance, can't take the load of re-indexing a whole country / huge area
       IF st_area(NEW.geometry) < 0.5 THEN
       -- performance, can't take the load of re-indexing a whole country / huge area
       IF st_area(NEW.geometry) < 0.5 THEN

-        UPDATE placex set indexed = false from place_addressline where address_place_id = existingplacex.place_id 
-          and placex.place_id = place_addressline.place_id and indexed;
+--        UPDATE placex set indexed_status = 2 from place_addressline where address_place_id = existingplacex.place_id 
+--          and placex.place_id = place_addressline.place_id and indexed_status = 0;

       END IF;
 
     END IF;
       END IF;
 
     END IF;


@@ -2003,12 +1844,13 @@ BEGIN
   END IF;
 
   IF coalesce(existing.name::text, '') != coalesce(NEW.name::text, '')
   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, '')
      OR coalesce(existing.street, '') != coalesce(NEW.street, '')
      OR coalesce(existing.isin, '') != coalesce(NEW.isin, '')
      OR coalesce(existing.postcode, '') != coalesce(NEW.postcode, '')
      OR coalesce(existing.country_code, '') != coalesce(NEW.country_code, '')
      OR coalesce(existing.housenumber, '') != coalesce(NEW.housenumber, '')
      OR coalesce(existing.street, '') != coalesce(NEW.street, '')
      OR coalesce(existing.isin, '') != coalesce(NEW.isin, '')
      OR coalesce(existing.postcode, '') != coalesce(NEW.postcode, '')
      OR coalesce(existing.country_code, '') != coalesce(NEW.country_code, '')

-     OR existing.geometry != NEW.geometry
+     OR existing.geometry::text != NEW.geometry::text

      THEN
 
     update place set 
      THEN
 
     update place set 


@@ -2018,7 +1860,7 @@ BEGIN
       isin = NEW.isin,
       postcode = NEW.postcode,
       country_code = NEW.country_code,
       isin = NEW.isin,
       postcode = NEW.postcode,
       country_code = NEW.country_code,

-      street_place_id = null,
+      extratags = NEW.extratags,

       geometry = NEW.geometry
       where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type;
 
       geometry = NEW.geometry
       where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type;
 


@@ -2029,12 +1871,15 @@ BEGIN
       isin = NEW.isin,
       postcode = NEW.postcode,
       country_code = NEW.country_code,
       isin = NEW.isin,
       postcode = NEW.postcode,
       country_code = NEW.country_code,

-      street_place_id = null,
-      indexed = false,
+      parent_place_id = null,
+      extratags = NEW.extratags,
+      indexed_status = 2,    

       geometry = NEW.geometry
       where place_id = existingplacex.place_id;
 
       geometry = NEW.geometry
       where place_id = existingplacex.place_id;
 

-    result := update_location(existingplacex.place_id, existingplacex.country_code, NEW.name, existingplacex.rank_search, existingplacex.rank_address, NEW.geometry);
+-- now done as part of insert
+--    partition := get_partition(NEW.geometry, existingplacex.country_code);
+--    result := update_location(partition, existingplacex.place_id, existingplacex.country_code, NEW.name, existingplacex.rank_search, existingplacex.rank_address, NEW.geometry);

 
   END IF;
 
 
   END IF;
 


@@ -2044,25 +1889,23 @@ BEGIN
 END; 
 $$ LANGUAGE plpgsql;
 
 END; 
 $$ LANGUAGE plpgsql;
 

-CREATE OR REPLACE FUNCTION get_name_by_language(name keyvalue[], languagepref TEXT[]) RETURNS TEXT
+CREATE OR REPLACE FUNCTION get_name_by_language(name hstore, languagepref TEXT[]) RETURNS TEXT

   AS $$
 DECLARE
   search TEXT[];
   found BOOLEAN;
 BEGIN
 
   AS $$
 DECLARE
   search TEXT[];
   found BOOLEAN;
 BEGIN
 

-  IF (array_upper(name, 1) is null) THEN
-    return null;
+  IF name is null THEN
+    RETURN null;

   END IF;
 
   search := languagepref;
 
   FOR j IN 1..array_upper(search, 1) LOOP
   END IF;
 
   search := languagepref;
 
   FOR j IN 1..array_upper(search, 1) LOOP

-    FOR k IN 1..array_upper(name, 1) LOOP
-      IF (name[k].key = search[j] AND trim(name[k].value) != '') THEN
-        return trim(name[k].value);
-      END IF;
-    END LOOP;
+    IF name ? search[j] AND trim(name->search[j]) != '' THEN
+      return trim(name->search[j]);
+    END IF;

   END LOOP;
 
   RETURN null;
   END LOOP;
 
   RETURN null;


@@ -2083,7 +1926,9 @@ BEGIN
     FOR location IN 
       select nodes from planet_osm_ways where id = way_ids[j] LIMIT 1
     LOOP
     FOR location IN 
       select nodes from planet_osm_ways where id = way_ids[j] LIMIT 1
     LOOP

-      searchnodes := searchnodes | location.nodes;
+      IF not (ARRAY[location.nodes] <@ searchnodes) THEN
+        searchnodes := searchnodes || location.nodes;
+      END IF;

     END LOOP;
   END LOOP;
 
     END LOOP;
   END LOOP;
 


@@ -2106,8 +1951,6 @@ BEGIN
   search := ARRAY['ref'];
   result := '{}';
 
   search := ARRAY['ref'];
   result := '{}';
 

-  UPDATE placex set indexed = true where indexed = false and place_id = for_place_id;
-

   select postcode from placex where place_id = for_place_id limit 1 into for_postcode;
 
   FOR location IN 
   select postcode from placex where place_id = for_place_id limit 1 into for_postcode;
 
   FOR location IN 


@@ -2119,7 +1962,7 @@ BEGIN
     IF array_upper(search, 1) IS NOT NULL AND array_upper(location.name, 1) IS NOT NULL THEN
       FOR j IN 1..array_upper(search, 1) LOOP
         FOR k IN 1..array_upper(location.name, 1) LOOP
     IF array_upper(search, 1) IS NOT NULL AND array_upper(location.name, 1) IS NOT NULL THEN
       FOR j IN 1..array_upper(search, 1) LOOP
         FOR k IN 1..array_upper(location.name, 1) LOOP

-          IF (found > location.rank_address AND location.name[k].key = search[j] AND location.name[k].value != '') AND NOT result && ARRAY[trim(location.name[k].value)] AND (for_postcode IS NULL OR location.name[k].value ilike for_postcode||'%') THEN
+          IF (found > location.rank_address AND location.name[k].key = search[j] AND location.name[k].value != '') AND NOT result @> ARRAY[trim(location.name[k].value)] AND (for_postcode IS NULL OR location.name[k].value ilike for_postcode||'%') THEN

             result[(100 - location.rank_address)] := trim(location.name[k].value);
             found := location.rank_address;
           END IF;
             result[(100 - location.rank_address)] := trim(location.name[k].value);
             found := location.rank_address;
           END IF;


@@ -2137,124 +1980,194 @@ CREATE OR REPLACE FUNCTION get_address_by_language(for_place_id BIGINT, language
   AS $$
 DECLARE
   result TEXT[];
   AS $$
 DECLARE
   result TEXT[];

-  search TEXT[];
-  found INTEGER;
+  currresult TEXT;
+  prevresult TEXT;

   location RECORD;
   location RECORD;

-  searchcountrycode varchar(2);
-  searchhousenumber TEXT;
-  searchrankaddress INTEGER;

 BEGIN
 
 BEGIN
 

-  found := 1000;
-  search := languagepref;

   result := '{}';
   result := '{}';

+  prevresult := '';

 
 

---  UPDATE placex set indexed = false where indexed = true and place_id = for_place_id;
-  UPDATE placex set indexed = true where indexed = false and place_id = for_place_id;
-
-  select country_code,housenumber,rank_address from placex where place_id = for_place_id into searchcountrycode,searchhousenumber,searchrankaddress;
-
-  FOR location IN 
-    select CASE WHEN address_place_id = for_place_id AND rank_address = 0 THEN 100 ELSE rank_address END as rank_address,
-      CASE WHEN type = 'postcode' THEN ARRAY[ROW('name',postcode)::keyvalue] ELSE name END as name,
-      distance,length(name::text) as namelength 
-      from place_addressline join placex on (address_place_id = placex.place_id) 
-      where place_addressline.place_id = for_place_id and ((rank_address > 0 AND rank_address < searchrankaddress) OR address_place_id = for_place_id)
-      and (placex.country_code IS NULL OR searchcountrycode IS NULL OR placex.country_code = searchcountrycode OR rank_address < 4)
-      order by rank_address desc,fromarea desc,distance asc,rank_search desc,namelength desc
-  LOOP
-    IF array_upper(search, 1) IS NOT NULL AND array_upper(location.name, 1) IS NOT NULL THEN
-      FOR j IN 1..array_upper(search, 1) LOOP
-        FOR k IN 1..array_upper(location.name, 1) LOOP
-          IF (found > location.rank_address AND location.name[k].key = search[j] AND location.name[k].value != '') AND NOT result && ARRAY[trim(location.name[k].value)] THEN
-            result[(100 - location.rank_address)] := trim(location.name[k].value);
-            found := location.rank_address;
-          END IF;
-        END LOOP;
-      END LOOP;
+  FOR location IN select * from get_addressdata(for_place_id) where isaddress order by rank_address desc LOOP
+    currresult := trim(get_name_by_language(location.name, languagepref));
+    IF currresult != prevresult AND currresult IS NOT NULL THEN
+      result[(100 - location.rank_address)] := trim(get_name_by_language(location.name, languagepref));
+      prevresult := currresult;

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

-  IF searchhousenumber IS NOT NULL AND COALESCE(result[(100 - 28)],'') != searchhousenumber THEN
-    IF result[(100 - 28)] IS NOT NULL THEN
-      result[(100 - 29)] := result[(100 - 28)];
-    END IF;
-    result[(100 - 28)] := searchhousenumber;
-  END IF;
-
-  -- No country polygon - add it from the country_code
-  IF found > 4 THEN
-    select get_name_by_language(country_name.name,languagepref) as name from placex join country_name using (country_code) 
-      where place_id = for_place_id limit 1 INTO location;
-    IF location IS NOT NULL THEN
-      result[(100 - 4)] := trim(location.name);
-    END IF;
-  END IF;
-

   RETURN array_to_string(result,', ');
 END;
 $$
 LANGUAGE plpgsql;
 
   RETURN array_to_string(result,', ');
 END;
 $$
 LANGUAGE plpgsql;
 

-CREATE OR REPLACE FUNCTION get_addressdata_by_language(for_place_id BIGINT, languagepref TEXT[]) RETURNS TEXT[]
+DROP TYPE addressline CASCADE;
+create type addressline as (
+  place_id BIGINT,
+  osm_type CHAR(1),
+  osm_id INTEGER,
+  name HSTORE,
+  class TEXT,
+  type TEXT,
+  admin_level INTEGER,
+  fromarea BOOLEAN,  
+  isaddress BOOLEAN,  
+  rank_address INTEGER,
+  distance FLOAT
+);
+
+CREATE OR REPLACE FUNCTION get_addressdata(in_place_id BIGINT) RETURNS setof addressline 

   AS $$
 DECLARE
   AS $$
 DECLARE

+  for_place_id BIGINT;

   result TEXT[];
   search TEXT[];
   found INTEGER;
   location RECORD;
   result TEXT[];
   search TEXT[];
   found INTEGER;
   location RECORD;

+  countrylocation RECORD;

   searchcountrycode varchar(2);
   searchhousenumber TEXT;
   searchcountrycode varchar(2);
   searchhousenumber TEXT;

+  searchhousename HSTORE;
+  searchrankaddress INTEGER;
+  searchpostcode TEXT;
+  searchclass TEXT;
+  searchtype TEXT;
+  countryname HSTORE;
+  hadcountry BOOLEAN;

 BEGIN
 
 BEGIN
 

-  found := 1000;
-  search := languagepref;
-  result := '{}';
+  select parent_place_id,'us', housenumber, 30, postcode, null, 'place', 'house' from location_property_tiger 
+    WHERE place_id = in_place_id 
+    INTO for_place_id,searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode, searchhousename, searchclass, searchtype;

 
 

---  UPDATE placex set indexed = false where indexed = true and place_id = for_place_id;
-  UPDATE placex set indexed = true where indexed = false and place_id = for_place_id;
+  IF for_place_id IS NULL THEN
+    select parent_place_id,'us', housenumber, 30, postcode, null, 'place', 'house' from location_property_aux
+      WHERE place_id = in_place_id 
+      INTO for_place_id,searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode, searchhousename, searchclass, searchtype;
+  END IF;

 
 

-  select country_code,housenumber from placex where place_id = for_place_id into searchcountrycode,searchhousenumber;
+  IF for_place_id IS NULL THEN
+    select parent_place_id, country_code, housenumber, rank_address, postcode, name, class, type from placex 
+      WHERE place_id = in_place_id and rank_address = 30 
+      INTO for_place_id, searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode, searchhousename, searchclass, searchtype;
+  END IF;
+
+  IF for_place_id IS NULL THEN
+    for_place_id := in_place_id;
+    select country_code, housenumber, rank_address, postcode, null from placex where place_id = for_place_id 
+      INTO searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode, searchhousename;
+  END IF;

 
 

+--RAISE WARNING '% % % %',searchcountrycode, searchhousenumber, searchrankaddress, searchpostcode;
+
+  found := 1000;
+  hadcountry := false;

   FOR location IN 
   FOR location IN 

-    select CASE WHEN address_place_id = for_place_id AND rank_address = 0 THEN 100 ELSE rank_address END as rank_address,
-      name,distance,length(name::text) as namelength 
+    select placex.place_id, osm_type, osm_id,
+      CASE WHEN class = 'place' and type = 'postcode' THEN 'name' => postcode ELSE name END as name,
+      class, type, admin_level, true as fromarea, true as isaddress,
+      CASE WHEN rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
+      0 as distance, country_code
+      from placex
+      where place_id = for_place_id 
+  LOOP
+--RAISE WARNING '%',location;
+    IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN
+      searchcountrycode := location.country_code;
+    END IF;
+    IF searchpostcode IS NOT NULL and location.type = 'postcode' THEN
+      location.isaddress := FALSE;
+    END IF;
+    IF location.rank_address = 4 AND location.isaddress THEN
+      hadcountry := true;
+    END IF;
+    IF location.rank_address < 4 AND NOT hadcountry THEN
+      select name from country_name where country_code = searchcountrycode limit 1 INTO countryname;
+      IF countryname IS NOT NULL THEN
+        countrylocation := ROW(null, null, null, countryname, 'place', 'country', null, true, true, 4, 0)::addressline;
+        RETURN NEXT countrylocation;
+      END IF;
+    END IF;
+    countrylocation := ROW(location.place_id, location.osm_type, location.osm_id, location.name, location.class, 
+                           location.type, location.admin_level, location.fromarea, location.isaddress, location.rank_address, 
+                           location.distance)::addressline;
+    RETURN NEXT countrylocation;
+    found := location.rank_address;
+  END LOOP;
+
+  FOR location IN 
+    select placex.place_id, osm_type, osm_id,
+      CASE WHEN class = 'place' and type = 'postcode' THEN 'name' => postcode ELSE name END as name,
+      class, type, admin_level, fromarea, isaddress,
+      CASE WHEN address_place_id = for_place_id AND rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
+      distance,country_code

       from place_addressline join placex on (address_place_id = placex.place_id) 
       from place_addressline join placex on (address_place_id = placex.place_id) 

-      where place_addressline.place_id = for_place_id and (rank_address > 0 OR address_place_id = for_place_id)
+      where place_addressline.place_id = for_place_id 
+      and (cached_rank_address > 0 AND cached_rank_address < searchrankaddress)
+      and address_place_id != for_place_id

       and (placex.country_code IS NULL OR searchcountrycode IS NULL OR placex.country_code = searchcountrycode OR rank_address < 4)
       and (placex.country_code IS NULL OR searchcountrycode IS NULL OR placex.country_code = searchcountrycode OR rank_address < 4)

-      order by rank_address desc,fromarea desc,distance asc,rank_search desc,namelength desc
+      order by rank_address desc,isaddress desc,fromarea desc,distance asc,rank_search desc

   LOOP
   LOOP

-    IF array_upper(search, 1) IS NOT NULL AND array_upper(location.name, 1) IS NOT NULL THEN
-      FOR j IN 1..array_upper(search, 1) LOOP
-        FOR k IN 1..array_upper(location.name, 1) LOOP
-          IF (found > location.rank_address AND location.name[k].key = search[j] AND location.name[k].value != '') AND NOT result && ARRAY[trim(location.name[k].value)] THEN
-            result[(100 - location.rank_address)] := trim(location.name[k].value);
-            found := location.rank_address;
-          END IF;
-        END LOOP;
-      END LOOP;
+--RAISE WARNING '%',location;
+    IF searchcountrycode IS NULL AND location.country_code IS NOT NULL THEN
+      searchcountrycode := location.country_code;

     END IF;
     END IF;

+    IF searchpostcode IS NOT NULL and location.type = 'postcode' THEN
+      location.isaddress := FALSE;
+    END IF;
+    IF location.rank_address = 4 AND location.isaddress THEN
+      hadcountry := true;
+    END IF;
+    IF location.rank_address < 4 AND NOT hadcountry THEN
+      select name from country_name where country_code = searchcountrycode limit 1 INTO countryname;
+      IF countryname IS NOT NULL THEN
+        countrylocation := ROW(null, null, null, countryname, 'place', 'country', null, true, true, 4, 0)::addressline;
+        RETURN NEXT countrylocation;
+      END IF;
+    END IF;
+    countrylocation := ROW(location.place_id, location.osm_type, location.osm_id, location.name, location.class, 
+                           location.type, location.admin_level, location.fromarea, location.isaddress, location.rank_address, 
+                           location.distance)::addressline;
+    RETURN NEXT countrylocation;
+    found := location.rank_address;

   END LOOP;
 
   END LOOP;
 

-  IF searchhousenumber IS NOT NULL AND result[(100 - 28)] IS NULL THEN
-    result[(100 - 28)] := searchhousenumber;
-  END IF;
-
-  -- No country polygon - add it from the country_code

   IF found > 4 THEN
   IF found > 4 THEN

-    select get_name_by_language(country_name.name,languagepref) as name from placex join country_name using (country_code) 
-      where place_id = for_place_id limit 1 INTO location;
-    IF location IS NOT NULL THEN
-      result[(100 - 4)] := trim(location.name);
+    select name from country_name where country_code = searchcountrycode limit 1 INTO countryname;
+--RAISE WARNING '% % %',found,searchcountrycode,countryname;
+    IF countryname IS NOT NULL THEN
+      location := ROW(null, null, null, countryname, 'place', 'country', null, true, true, 4, 0)::addressline;
+      RETURN NEXT location;

     END IF;
   END IF;
 
     END IF;
   END IF;
 

-  RETURN result;
+  IF searchcountrycode IS NOT NULL THEN
+    location := ROW(null, null, null, 'ref'=>searchcountrycode, 'place', 'country_code', null, true, false, 4, 0)::addressline;
+    RETURN NEXT location;
+  END IF;
+
+  IF searchhousename IS NOT NULL THEN
+    location := ROW(in_place_id, null, null, searchhousename, searchclass, searchtype, null, true, true, 29, 0)::addressline;
+--    location := ROW(in_place_id, null, null, searchhousename, 'place', 'house_name', null, true, true, 29, 0)::addressline;
+    RETURN NEXT location;
+  END IF;
+
+  IF searchhousenumber IS NOT NULL THEN
+    location := ROW(in_place_id, null, null, 'ref'=>searchhousenumber, 'place', 'house_number', null, true, true, 28, 0)::addressline;
+    RETURN NEXT location;
+  END IF;
+
+  IF searchpostcode IS NOT NULL THEN
+    location := ROW(null, null, null, 'ref'=>searchpostcode, 'place', 'postcode', null, true, true, 5, 0)::addressline;
+    RETURN NEXT location;
+  END IF;
+
+  RETURN;

 END;
 $$
 LANGUAGE plpgsql;
 
 END;
 $$
 LANGUAGE plpgsql;
 

-CREATE OR REPLACE FUNCTION get_place_boundingbox(search_place_id INTEGER) RETURNS place_boundingbox
+CREATE OR REPLACE FUNCTION get_place_boundingbox(search_place_id BIGINT) RETURNS place_boundingbox

   AS $$
 DECLARE
   result place_boundingbox;
   AS $$
 DECLARE
   result place_boundingbox;


@@ -2265,10 +2178,10 @@ BEGIN
 -- remove  isaddress = true because if there is a matching polygon it always wins
     select count(*) from place_addressline where address_place_id = search_place_id into numfeatures;
     insert into place_boundingbox select place_id,
 -- remove  isaddress = true because if there is a matching polygon it always wins
     select count(*) from place_addressline where address_place_id = search_place_id into numfeatures;
     insert into place_boundingbox select place_id,

-             ST_Y(ST_PointN(ExteriorRing(ST_Box2D(area)),4)),ST_Y(ST_PointN(ExteriorRing(ST_Box2D(area)),2)),
-             ST_X(ST_PointN(ExteriorRing(ST_Box2D(area)),1)),ST_X(ST_PointN(ExteriorRing(ST_Box2D(area)),3)),
-             numfeatures, ST_Area(area),
-             area from location_area where place_id = search_place_id;
+             ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),4)),ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),2)),
+             ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),1)),ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),3)),
+             numfeatures, ST_Area(geometry),
+             geometry as area from location_area where place_id = search_place_id;

     select * from place_boundingbox into result where place_id = search_place_id;
   END IF;
   IF result.place_id IS NULL THEN
     select * from place_boundingbox into result where place_id = search_place_id;
   END IF;
   IF result.place_id IS NULL THEN


@@ -2291,7 +2204,7 @@ $$
 LANGUAGE plpgsql;
 
 -- don't do the operation if it would be slow
 LANGUAGE plpgsql;
 
 -- don't do the operation if it would be slow

-CREATE OR REPLACE FUNCTION get_place_boundingbox_quick(search_place_id INTEGER) RETURNS place_boundingbox
+CREATE OR REPLACE FUNCTION get_place_boundingbox_quick(search_place_id BIGINT) RETURNS place_boundingbox

   AS $$
 DECLARE
   result place_boundingbox;
   AS $$
 DECLARE
   result place_boundingbox;


@@ -2302,10 +2215,10 @@ BEGIN
   IF result IS NULL AND rank > 14 THEN
     select count(*) from place_addressline where address_place_id = search_place_id and isaddress = true into numfeatures;
     insert into place_boundingbox select place_id,
   IF result IS NULL AND rank > 14 THEN
     select count(*) from place_addressline where address_place_id = search_place_id and isaddress = true into numfeatures;
     insert into place_boundingbox select place_id,

-             ST_Y(ST_PointN(ExteriorRing(ST_Box2D(area)),4)),ST_Y(ST_PointN(ExteriorRing(ST_Box2D(area)),2)),
-             ST_X(ST_PointN(ExteriorRing(ST_Box2D(area)),1)),ST_X(ST_PointN(ExteriorRing(ST_Box2D(area)),3)),
-             numfeatures, ST_Area(area),
-             area from location_area where place_id = search_place_id;
+             ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),4)),ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),2)),
+             ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),1)),ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),3)),
+             numfeatures, ST_Area(geometry),
+             geometry as area from location_area where place_id = search_place_id;

     select * from place_boundingbox into result where place_id = search_place_id;
   END IF;
   IF result IS NULL THEN
     select * from place_boundingbox into result where place_id = search_place_id;
   END IF;
   IF result IS NULL THEN


@@ -2330,32 +2243,7 @@ END;
 $$
 LANGUAGE plpgsql;
 
 $$
 LANGUAGE plpgsql;
 

-CREATE OR REPLACE FUNCTION update_place(search_place_id INTEGER) RETURNS BOOLEAN
-  AS $$
-DECLARE
-  result place_boundingbox;
-  numfeatures integer;
-BEGIN
-  update placex set 
-      name = place.name,
-      housenumber = place.housenumber,
-      street = place.street,
-      isin = place.isin,
-      postcode = place.postcode,
-      country_code = place.country_code,
-      street_place_id = null,
-      indexed = false      
-      from place
-      where placex.place_id = search_place_id 
-        and place.osm_type = placex.osm_type and place.osm_id = placex.osm_id
-        and place.class = placex.class and place.type = placex.type;
-  update placex set indexed = true where place_id = search_place_id and indexed = false;
-  return true;
-END;
-$$
-LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION update_place(search_place_id INTEGER) RETURNS BOOLEAN
+CREATE OR REPLACE FUNCTION update_place(search_place_id BIGINT) RETURNS BOOLEAN

   AS $$
 DECLARE
   result place_boundingbox;
   AS $$
 DECLARE
   result place_boundingbox;


@@ -2368,13 +2256,13 @@ BEGIN
       isin = place.isin,
       postcode = place.postcode,
       country_code = place.country_code,
       isin = place.isin,
       postcode = place.postcode,
       country_code = place.country_code,

-      street_place_id = null,
-      indexed = false      
+      parent_place_id = null

       from place
       where placex.place_id = search_place_id 
         and place.osm_type = placex.osm_type and place.osm_id = placex.osm_id
         and place.class = placex.class and place.type = placex.type;
       from place
       where placex.place_id = search_place_id 
         and place.osm_type = placex.osm_type and place.osm_id = placex.osm_id
         and place.class = placex.class and place.type = placex.type;

-  update placex set indexed = true where place_id = search_place_id and indexed = false;
+  update placex set indexed_status = 2 where place_id = search_place_id;
+  update placex set indexed_status = 0 where place_id = search_place_id;

   return true;
 END;
 $$
   return true;
 END;
 $$


@@ -2506,11 +2394,139 @@ END;
 $$
 LANGUAGE plpgsql;
 
 $$
 LANGUAGE plpgsql;
 

-CREATE AGGREGATE array_agg(INT[])
-(
-    sfunc = array_cat,
-    stype = INT[],
-    initcond = '{}'
-);
+CREATE OR REPLACE FUNCTION tigger_create_interpolation(linegeo GEOMETRY, in_startnumber INTEGER, 
+  in_endnumber INTEGER, interpolationtype TEXT, 
+  in_street TEXT, in_isin TEXT, in_postcode TEXT) RETURNS INTEGER
+  AS $$
+DECLARE
+  
+  startnumber INTEGER;
+  endnumber INTEGER;
+  stepsize INTEGER;
+  housenum INTEGER;
+  newpoints INTEGER;
+  numberrange INTEGER;
+  rangestartnumber INTEGER;
+  place_centroid GEOMETRY;
+  partition INTEGER;
+  parent_place_id BIGINT;
+  location RECORD;
+  address_street_word_id INTEGER;  

 
 

+BEGIN

 
 

+  IF in_endnumber > in_startnumber THEN
+    startnumber = in_startnumber;
+    endnumber = in_endnumber;
+  ELSE
+    startnumber = in_endnumber;
+    endnumber = in_startnumber;
+  END IF;
+
+  numberrange := endnumber - startnumber;
+  rangestartnumber := startnumber;
+
+  IF (interpolationtype = 'odd' AND startnumber%2 = 0) OR (interpolationtype = 'even' AND startnumber%2 = 1) THEN
+    startnumber := startnumber + 1;
+    stepsize := 2;
+  ELSE
+    IF (interpolationtype = 'odd' OR interpolationtype = 'even') THEN
+      stepsize := 2;
+    ELSE -- everything else assumed to be 'all'
+      stepsize := 1;
+    END IF;
+  END IF;
+
+  -- Filter out really broken tiger data
+  IF numberrange > 0 AND (numberrange::float/stepsize::float > 500) 
+                    AND ST_length(linegeo)/(numberrange::float/stepsize::float) < 0.000001 THEN
+    RAISE WARNING 'Road too short for number range % to % on %, % (%)',startnumber,endnumber,in_street,in_isin,
+                  ST_length(linegeo)/(numberrange::float/stepsize::float);    
+    RETURN 0;
+  END IF;
+
+  place_centroid := ST_Centroid(linegeo);
+  partition := get_partition(place_centroid, 'us');
+  parent_place_id := null;
+
+  address_street_word_id := get_name_id(make_standard_name(in_street));
+  IF address_street_word_id IS NOT NULL THEN
+    FOR location IN SELECT * from getNearestNamedRoadFeature(partition, place_centroid, address_street_word_id) LOOP
+      parent_place_id := location.place_id;
+    END LOOP;
+  END IF;
+
+  IF parent_place_id IS NULL THEN
+    FOR location IN SELECT place_id FROM getNearestParellelRoadFeature(partition, linegeo) LOOP
+      parent_place_id := location.place_id;
+    END LOOP;    
+  END IF;
+
+  IF parent_place_id IS NULL THEN
+    FOR location IN SELECT place_id FROM getNearestRoadFeature(partition, place_centroid) LOOP
+      parent_place_id := location.place_id;
+    END LOOP;    
+  END IF;
+
+  newpoints := 0;
+  FOR housenum IN startnumber..endnumber BY stepsize LOOP
+    insert into location_property_tiger (place_id, partition, parent_place_id, housenumber, postcode, centroid)
+    values (nextval('seq_place'), partition, parent_place_id, housenum, in_postcode,
+      ST_Line_Interpolate_Point(linegeo, (housenum::float-rangestartnumber::float)/numberrange::float));
+    newpoints := newpoints + 1;
+  END LOOP;
+
+  RETURN newpoints;
+END;
+$$
+LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION aux_create_property(pointgeo GEOMETRY, in_housenumber TEXT, 
+  in_street TEXT, in_isin TEXT, in_postcode TEXT, in_countrycode char(2)) RETURNS INTEGER
+  AS $$
+DECLARE
+
+  newpoints INTEGER;
+  place_centroid GEOMETRY;
+  partition INTEGER;
+  out_parent_place_id BIGINT;
+  location RECORD;
+  address_street_word_id INTEGER;  
+  out_postcode TEXT;
+
+BEGIN
+
+  place_centroid := ST_Centroid(pointgeo);
+  partition := get_partition(place_centroid, in_countrycode);
+  out_parent_place_id := null;
+
+  address_street_word_id := get_name_id(make_standard_name(in_street));
+  IF address_street_word_id IS NOT NULL THEN
+    FOR location IN SELECT * from getNearestNamedRoadFeature(partition, place_centroid, address_street_word_id) LOOP
+      out_parent_place_id := location.place_id;
+    END LOOP;
+  END IF;
+
+  IF out_parent_place_id IS NULL THEN
+    FOR location IN SELECT place_id FROM getNearestRoadFeature(partition, place_centroid) LOOP
+      out_parent_place_id := location.place_id;
+    END LOOP;    
+  END IF;
+
+  out_postcode := in_postcode;
+  IF out_postcode IS NULL THEN
+    SELECT postcode from placex where place_id = out_parent_place_id INTO out_postcode;
+  END IF;
+  IF out_postcode IS NULL THEN
+    out_postcode := getNearestPostcode(partition, place_centroid);
+  END IF;
+
+  newpoints := 0;
+  insert into location_property_aux (place_id, partition, parent_place_id, housenumber, postcode, centroid)
+    values (nextval('seq_place'), partition, out_parent_place_id, in_housenumber, out_postcode, place_centroid);
+  newpoints := newpoints + 1;
+
+  RETURN newpoints;
+END;
+$$
+LANGUAGE plpgsql;