fix scene making scripts and add building-parallel-road scene

[nominatim.git] / sql / functions.sql

diff --git a/sql/functions.sql b/sql/functions.sql
index 80763eaae53c90855d96e18523b12baf2a2b76f3..34a27da755ebd192ca4bdba8a4eca2299b1fd490 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -693,15 +693,10 @@ BEGIN
 
   FOR nodeidpos in 1..array_upper(waynodes, 1) LOOP
 
 
   FOR nodeidpos in 1..array_upper(waynodes, 1) LOOP
 

-    -- If there is a place of a type other than place/house, use that because
-    -- it is guaranteed to be the original node. For place/house types use the
-    -- one with the smallest id because the original node was created first.
-    -- Ignore all nodes marked for deletion. (Might happen when the type changes.)
-    select * from placex where osm_type = 'N' and osm_id = waynodes[nodeidpos]::BIGINT
-                               and indexed_status < 100 and housenumber is not NULL
-                         order by (type = 'address'),place_id limit 1 INTO nextnode;
+    select * from place where osm_type = 'N' and osm_id = waynodes[nodeidpos]::BIGINT
+                               and housenumber is not NULL limit 1 INTO nextnode;

     --RAISE NOTICE 'Nextnode.place_id: %s', nextnode.place_id;
     --RAISE NOTICE 'Nextnode.place_id: %s', nextnode.place_id;

-    IF nextnode.place_id IS NOT NULL THEN
+    IF nextnode.osm_id IS NOT NULL THEN

       --RAISE NOTICE 'place_id is not null';
       IF nodeidpos > 1 and nodeidpos < array_upper(waynodes, 1) THEN
         -- Make sure that the point is actually on the line. That might
       --RAISE NOTICE 'place_id is not null';
       IF nodeidpos > 1 and nodeidpos < array_upper(waynodes, 1) THEN
         -- Make sure that the point is actually on the line. That might


@@ -725,18 +720,11 @@ BEGIN
           startnumber := housenum;
           sectiongeo := ST_Reverse(sectiongeo);
         END IF;
           startnumber := housenum;
           sectiongeo := ST_Reverse(sectiongeo);
         END IF;

-        
-        -- a correction for odd/even is NOT necessary anymore (e.g. if interpolationtype=even, but start/endnumber != even)
-        -- see PlaceLookup.php

 
 

-        -- keep for compatibility with previous versions
-        delete from placex where osm_type = 'N' and osm_id = prevnode.osm_id
-                             and place_id != prevnode.place_id and class = 'place'
-                             and type = 'house';

         insert into location_property_osmline
         insert into location_property_osmline

-          values (sectiongeo, nextval('seq_place'), partition, wayid, NULL, startnumber, endnumber, interpolationtype, prevnode.admin_level,
-           street, coalesce(prevnode.postcode, defpostalcode),
-           calculated_country_code, geometry_sector, 2, now());
+          values (sectiongeo, nextval('seq_place'), partition, wayid, NULL, startnumber, endnumber, 
+          interpolationtype, street, coalesce(prevnode.postcode, defpostalcode),
+          calculated_country_code, geometry_sector, 2, now());

       END IF;
 
       -- early break if we are out of line string,
       END IF;
 
       -- early break if we are out of line string,


@@ -1090,13 +1078,12 @@ BEGIN
   END IF;
   
   IF OLD.indexed_status = 2 and NEW.indexed_status=0 THEN
   END IF;
   
   IF OLD.indexed_status = 2 and NEW.indexed_status=0 THEN

-    -- do the reparenting: (finally here, so that ALL places in placex, that are needed for reparenting, are up to date)
+    -- do the reparenting: (finally here, because ALL places in placex, that are needed for reparenting, need to be up to date)

     -- (the osm interpolationline in location_property_osmline was marked for reparenting in placex_insert/placex_delete with index_status = 2 
     -- => index.c: sets index_status back to 0
     -- => triggers this function)
     place_centroid := ST_PointOnSurface(NEW.linegeo);
     -- (the osm interpolationline in location_property_osmline was marked for reparenting in placex_insert/placex_delete with index_status = 2 
     -- => index.c: sets index_status back to 0
     -- => triggers this function)
     place_centroid := ST_PointOnSurface(NEW.linegeo);

-    -- mark descendants for reparenting
-    UPDATE placex SET indexed_status = 2 WHERE parent_place_id = OLD.place_id;
+    -- marking descendants for reparenting is not needed, because there are actually no descendants for interpolation lines

     NEW.parent_place_id = get_interpolation_parent(NEW.osm_id, NEW.street, null, NEW.partition, place_centroid, NEW.linegeo); -- addr_place (3rd param) is not necessarily needed
     return NEW;
   END IF;
     NEW.parent_place_id = get_interpolation_parent(NEW.osm_id, NEW.street, null, NEW.partition, place_centroid, NEW.linegeo); -- addr_place (3rd param) is not necessarily needed
     return NEW;
   END IF;


@@ -1156,14 +1143,6 @@ BEGIN
   END IF;
 
   IF NEW.indexed_status != 0 OR OLD.indexed_status = 0 THEN
   END IF;
 
   IF NEW.indexed_status != 0 OR OLD.indexed_status = 0 THEN

-  
-    -- if a node(=>house), which is part of a interpolation line, changes (e.g. the street attribute) => mark this line for reparenting 
-    -- (already here, because interpolation lines are reindexed before nodes, so in the second call it would be too late)
-    -- needed for test case features/db/import: Scenario: addr:street added to housenumbers
-    IF NEW.osm_type='N' and NEW.class='place' and NEW.type='house' THEN
-        -- Is this node part of an interpolation line? search for it in location_property_osmline and mark the interpolation line for reparenting
-        update location_property_osmline p set indexed_status = 2 from planet_osm_ways w where p.linegeo && NEW.geometry and p.osm_id = w.id and NEW.osm_id = any(w.nodes);
-    END IF;

     RETURN NEW;
   END IF;
 
     RETURN NEW;
   END IF;
 


@@ -1906,7 +1885,7 @@ BEGIN
   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;
 
   -- interpolations are special
   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;
 
   -- interpolations are special

-  IF OLD.class = 'place' and OLD.type = 'houses' THEN
+  IF OLD.osm_type='W' and OLD.class = 'place' and OLD.type = 'houses' THEN

     UPDATE location_property_osmline set indexed_status = 100 where osm_id = OLD.osm_id; -- osm_id = wayid (=old.osm_id)
   END IF;
 
     UPDATE location_property_osmline set indexed_status = 100 where osm_id = OLD.osm_id; -- osm_id = wayid (=old.osm_id)
   END IF;
 


@@ -1931,7 +1910,6 @@ BEGIN
 
   --DEBUG: RAISE WARNING '-----------------------------------------------------------------------------------';
   --DEBUG: RAISE WARNING 'place_insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,st_area(NEW.geometry);
 
   --DEBUG: RAISE WARNING '-----------------------------------------------------------------------------------';
   --DEBUG: RAISE WARNING 'place_insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,st_area(NEW.geometry);

-  RAISE WARNING 'X3366 - place_isnert';

   -- filter wrong tupels
   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, 
   -- filter wrong tupels
   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, 


@@ -1960,12 +1938,6 @@ BEGIN
     
     -- To paraphrase, if there isn't an existing item
     IF existingline.osm_id IS NULL THEN
     
     -- To paraphrase, if there isn't an existing item
     IF existingline.osm_id IS NULL THEN

-      IF existing.osm_type IS NOT NULL THEN
-        -- pathological case caused by the triggerless copy into place during initial import
-        -- force delete even for large areas, it will be reinserted later
-        UPDATE place set geometry = ST_SetSRID(ST_Point(0,0), 4326) where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type;
-        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;

       -- insert new line into location_property_osmline, use function insert_osmline
       i = insert_osmline(NEW.osm_id, NEW.housenumber, NEW.street, NEW.addr_place, NEW.postcode, NEW.country_code, NEW.geometry);
       RETURN NEW;
       -- insert new line into location_property_osmline, use function insert_osmline
       i = insert_osmline(NEW.osm_id, NEW.housenumber, NEW.street, NEW.addr_place, NEW.postcode, NEW.country_code, NEW.geometry);
       RETURN NEW;


@@ -2002,7 +1974,6 @@ BEGIN
     
     -- for interpolations invalidate all nodes on the line
     update placex p set indexed_status = 2 from planet_osm_ways w where w.id = NEW.osm_id and p.osm_type = 'N' and p.osm_id = any(w.nodes);
     
     -- for interpolations invalidate all nodes on the line
     update placex p set indexed_status = 2 from planet_osm_ways w where w.id = NEW.osm_id and p.osm_type = 'N' and p.osm_id = any(w.nodes);

-    RAISE WARNING 'X3399 - updated nodes of interpolation line';

     RETURN NULL;
   
   ELSE -- insert to placex
     RETURN NULL;
   
   ELSE -- insert to placex


@@ -2170,6 +2141,7 @@ BEGIN
         admin_level = NEW.admin_level,
         geometry = NEW.geometry
         where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type;
         admin_level = NEW.admin_level,
         geometry = NEW.geometry
         where osm_type = NEW.osm_type and osm_id = NEW.osm_id and class = NEW.class and type = NEW.type;

+        

 
       IF NEW.class in ('place','boundary') AND NEW.type in ('postcode','postal_code') THEN
           IF NEW.postcode IS NULL THEN
 
       IF NEW.class in ('place','boundary') AND NEW.type in ('postcode','postal_code') THEN
           IF NEW.postcode IS NULL THEN


@@ -2195,6 +2167,14 @@ BEGIN
         indexed_status = 2,    
         geometry = NEW.geometry
         where place_id = existingplacex.place_id;
         indexed_status = 2,    
         geometry = NEW.geometry
         where place_id = existingplacex.place_id;

+        
+      -- if a node(=>house), which is part of a interpolation line, changes (e.g. the street attribute) => mark this line for reparenting 
+      -- (already here, because interpolation lines are reindexed before nodes, so in the second call it would be too late)
+      -- needed for test case features/db/import: Scenario: addr:street added to housenumbers
+      IF NEW.osm_type='N' and NEW.class='place' and NEW.type='house' THEN
+          -- Is this node part of an interpolation line? search for it in location_property_osmline and mark the interpolation line for reparenting
+          update location_property_osmline p set indexed_status = 2 from planet_osm_ways w where p.linegeo && NEW.geometry and p.osm_id = w.id and NEW.osm_id = any(w.nodes);
+      END IF;

 
     END IF;
 
 
     END IF;
 


@@ -2202,7 +2182,7 @@ BEGIN
     RETURN NULL;
   END IF;
 
     RETURN NULL;
   END IF;
 

-END; 
+END;

 $$ LANGUAGE plpgsql;
 
 
 $$ LANGUAGE plpgsql;