X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/23d303124e903e58e5c95890868de8c62304946f..5f941407b356fade1cec9671ea04853f7cfdc837:/sql/functions.sql?ds=inline

diff --git a/sql/functions.sql b/sql/functions.sql
index e0d0897f..ab965893 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -495,6 +495,12 @@ BEGIN
 
 --DEBUG: RAISE WARNING 'get_country_code, start: %', ST_AsText(place_centre);
 
+  -- Try for a OSM polygon
+  FOR nearcountry IN select country_code from location_area_country where country_code is not null and not isguess and st_covers(geometry, place_centre) limit 1
+  LOOP
+    RETURN nearcountry.country_code;
+  END LOOP;
+
 --DEBUG: RAISE WARNING 'osm fallback: %', ST_AsText(place_centre);
 
   -- Try for OSM fallback data
@@ -504,12 +510,6 @@ BEGIN
     RETURN nearcountry.country_code;
   END LOOP;
 
-  -- Try for a OSM polygon
-  FOR nearcountry IN select country_code from location_area_country where country_code is not null and not isguess and st_covers(geometry, place_centre) limit 1
-  LOOP
-    RETURN nearcountry.country_code;
-  END LOOP;
-
 --DEBUG: RAISE WARNING 'natural earth: %', ST_AsText(place_centre);
 
   -- Natural earth data
@@ -823,9 +823,13 @@ BEGIN
 
       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;
+        -- 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 place_id from placex where osm_type = 'N' and osm_id = waynodes[nodeidpos]::BIGINT and indexed_status < 100 order by (type = 'house'),place_id limit 1 INTO search_place_id;
         IF search_place_id IS NULL THEN
-          -- null record of right type
+          -- if no such node exists, create a record of the right type
           select * from placex where osm_type = 'N' and osm_id = waynodes[nodeidpos]::BIGINT 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;
           IF nextnode.geometry IS NULL THEN
@@ -888,9 +892,9 @@ 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
-                insert into placex (osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode,
+                insert into placex (osm_type, osm_id, class, type, admin_level, housenumber, street, addr_place, 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),
+                  values ('N',prevnode.osm_id, 'place', 'house', prevnode.admin_level, housenum, prevnode.street, prevnode.addr_place, 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;
@@ -1090,10 +1094,10 @@ BEGIN
       ELSEIF NEW.type in ('national_park') THEN
         NEW.rank_search := 18;
         NEW.rank_address := 18;
-      ELSEIF NEW.type in ('suburb','croft','subdivision') THEN
+      ELSEIF NEW.type in ('suburb','croft','subdivision','isolated_dwelling') THEN
         NEW.rank_search := 20;
         NEW.rank_address := NEW.rank_search;
-      ELSEIF NEW.type in ('farm','locality','islet','isolated_dwelling','mountain_pass') THEN
+      ELSEIF NEW.type in ('farm','locality','islet','mountain_pass') THEN
         NEW.rank_search := 20;
         NEW.rank_address := 0;
         -- Irish townlands, tagged as place=locality and locality=townland
@@ -1196,9 +1200,9 @@ BEGIN
 
       -- work around bug in postgis, this may have been fixed in 2.0.0 (see http://trac.osgeo.org/postgis/ticket/547)
       update placex set indexed_status = 2 where (st_covers(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);
+       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 or (NEW.rank_search >= 16 and addr_place is not null));
       update placex set indexed_status = 2 where (st_covers(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);
+       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 or (NEW.rank_search >= 16 and addr_place 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 :(
@@ -1226,6 +1230,9 @@ BEGIN
       IF NEW.rank_search >= 26 THEN
         -- roads may cause reparenting for >27 rank places
         update placex set indexed_status = 2 where indexed_status = 0 and rank_search > NEW.rank_search and ST_DWithin(placex.geometry, NEW.geometry, diameter);
+      ELSEIF NEW.rank_search >= 16 THEN
+        -- up to rank 16, street-less addresses may need reparenting
+        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 or addr_place is not null);
       ELSE
         -- for all other places the search terms may change as well
         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);
@@ -1461,13 +1468,18 @@ BEGIN
           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 NEW.street IS NULL AND NEW.addr_place IS NULL AND location.street IS NOT NULL THEN
 --RAISE WARNING 'node in way that has a streetname %',location;
             NEW.street := location.street;
           END IF;
 
+          -- IF the way contains an explicit name of a place copy it
+          IF NEW.addr_place IS NULL AND NEW.street IS NULL AND location.addr_place IS NOT NULL THEN
+            NEW.addr_place := location.addr_place;
+          END IF;
+
           -- If this way is a street interpolation line then it is probably as good as we are going to get
-          IF NEW.parent_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 NEW.addr_place 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
@@ -1508,9 +1520,18 @@ BEGIN
 --RAISE WARNING 'x3 %',NEW.parent_place_id;
 
       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));
         IF address_street_word_id IS NOT NULL THEN
           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 IF;
+
+      IF NEW.parent_place_id IS NULL AND NEW.addr_place IS NOT NULL THEN
+        address_street_word_id := get_name_id(make_standard_name(NEW.addr_place));
+        IF address_street_word_id IS NOT NULL THEN
+          FOR location IN SELECT * from getNearestNamedPlaceFeature(NEW.partition, place_centroid, address_street_word_id) LOOP
             NEW.parent_place_id := location.place_id;
           END LOOP;
         END IF;
@@ -1655,6 +1676,11 @@ BEGIN
         END IF;
       END IF;
 
+    END IF;
+
+    -- Name searches can be done for ways as well as relations
+    IF NEW.osm_type in ('W','R') AND NEW.rank_search < 26 THEN
+
       -- not found one yet? how about doing a name search
       IF NEW.centroid IS NULL AND (NEW.name->'name') is not null and make_standard_name(NEW.name->'name') != '' THEN
 
@@ -2074,7 +2100,7 @@ BEGIN
 
     -- No - process it as a new insertion (hopefully of low rank or it will be slow)
     insert into placex (osm_type, osm_id, class, type, name, admin_level, housenumber, 
-      street, isin, postcode, country_code, extratags, geometry)
+      street, addr_place, isin, postcode, country_code, extratags, geometry)
       values (NEW.osm_type
         ,NEW.osm_id
         ,NEW.class
@@ -2083,6 +2109,7 @@ BEGIN
         ,NEW.admin_level
         ,NEW.housenumber
         ,NEW.street
+        ,NEW.addr_place
         ,NEW.isin
         ,NEW.postcode
         ,NEW.country_code
@@ -2108,6 +2135,9 @@ BEGIN
     IF coalesce(existing.street, '') != coalesce(NEW.street, '') THEN
       RAISE WARNING 'update details, street: % % % %',NEW.osm_type,NEW.osm_id,existing.street,NEW.street;
     END IF;
+    IF coalesce(existing.addr_place, '') != coalesce(NEW.addr_place, '') THEN
+      RAISE WARNING 'update details, street: % % % %',NEW.osm_type,NEW.osm_id,existing.addr_place,NEW.addr_place;
+    END IF;
     IF coalesce(existing.isin, '') != coalesce(NEW.isin, '') THEN
       RAISE WARNING 'update details, isin: % % % %',NEW.osm_type,NEW.osm_id,existing.isin,NEW.isin;
     END IF;
@@ -2150,6 +2180,7 @@ BEGIN
   IF FALSE AND existingplacex.rank_search < 26
      AND coalesce(existing.housenumber, '') = coalesce(NEW.housenumber, '')
      AND coalesce(existing.street, '') = coalesce(NEW.street, '')
+     AND coalesce(existing.addr_place, '') = coalesce(NEW.addr_place, '')
      AND coalesce(existing.isin, '') = coalesce(NEW.isin, '')
      AND coalesce(existing.postcode, '') = coalesce(NEW.postcode, '')
      AND coalesce(existing.country_code, '') = coalesce(NEW.country_code, '')
@@ -2172,6 +2203,7 @@ BEGIN
     IF coalesce(existing.name::text, '') != coalesce(NEW.name::text, '')
         OR coalesce(existing.housenumber, '') != coalesce(NEW.housenumber, '')
         OR coalesce(existing.street, '') != coalesce(NEW.street, '')
+        OR coalesce(existing.addr_place, '') != coalesce(NEW.addr_place, '')
         OR coalesce(existing.isin, '') != coalesce(NEW.isin, '')
         OR coalesce(existing.postcode, '') != coalesce(NEW.postcode, '')
         OR coalesce(existing.country_code, '') != coalesce(NEW.country_code, '') THEN
@@ -2190,6 +2222,7 @@ BEGIN
      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.addr_place, '') != coalesce(NEW.addr_place, '')
      OR coalesce(existing.isin, '') != coalesce(NEW.isin, '')
      OR coalesce(existing.postcode, '') != coalesce(NEW.postcode, '')
      OR coalesce(existing.country_code, '') != coalesce(NEW.country_code, '')
@@ -2201,10 +2234,12 @@ BEGIN
       name = NEW.name,
       housenumber  = NEW.housenumber,
       street = NEW.street,
+      addr_place = NEW.addr_place,
       isin = NEW.isin,
       postcode = NEW.postcode,
       country_code = NEW.country_code,
       extratags = NEW.extratags,
+      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;
 
@@ -2212,11 +2247,13 @@ BEGIN
       name = NEW.name,
       housenumber = NEW.housenumber,
       street = NEW.street,
+      addr_place = NEW.addr_place,
       isin = NEW.isin,
       postcode = NEW.postcode,
       country_code = NEW.country_code,
       parent_place_id = null,
       extratags = NEW.extratags,
+      admin_level = NEW.admin_level,
       indexed_status = 2,    
       geometry = NEW.geometry
       where place_id = existingplacex.place_id;
@@ -2595,6 +2632,7 @@ BEGIN
       name = place.name,
       housenumber = place.housenumber,
       street = place.street,
+      addr_place = place.addr_place,
       isin = place.isin,
       postcode = place.postcode,
       country_code = place.country_code,
@@ -3031,9 +3069,9 @@ BEGIN
     IF ST_GeometryType(placegeom) in ('ST_Polygon','ST_MultiPolygon') THEN
       FOR geom IN select split_geometry(placegeom) FROM placex WHERE place_id = placeid LOOP
         update placex set indexed_status = 2 where (st_covers(geom, placex.geometry) OR ST_Intersects(geom, placex.geometry)) 
-        AND rank_search > rank and indexed_status = 0 and ST_geometrytype(placex.geometry) = 'ST_Point' and (rank_search < 28 or name is not null);
+        AND rank_search > rank and indexed_status = 0 and ST_geometrytype(placex.geometry) = 'ST_Point' and (rank_search < 28 or name is not null or (rank >= 16 and addr_place is not null));
         update placex set indexed_status = 2 where (st_covers(geom, placex.geometry) OR ST_Intersects(geom, placex.geometry)) 
-        AND rank_search > rank and indexed_status = 0 and ST_geometrytype(placex.geometry) != 'ST_Point' and (rank_search < 28 or name is not null);
+        AND rank_search > rank and indexed_status = 0 and ST_geometrytype(placex.geometry) != 'ST_Point' and (rank_search < 28 or name is not null or (rank >= 16 and addr_place is not null));
       END LOOP;
     ELSE
         diameter := 0;
@@ -3053,7 +3091,16 @@ BEGIN
           diameter := 0.001; -- 50 to 100 meters
         END IF;
         IF diameter > 0 THEN
-          update placex set indexed_status = 2 where indexed_status = 0 and rank_search > rank and ST_DWithin(placex.geometry, placegeom, diameter) and (rank_search < 28 or name is not null);
+          IF rank >= 26 THEN
+            -- roads may cause reparenting for >27 rank places
+            update placex set indexed_status = 2 where indexed_status = 0 and rank_search > rank and ST_DWithin(placex.geometry, placegeom, diameter);
+          ELSEIF rank >= 16 THEN
+            -- up to rank 16, street-less addresses may need reparenting
+            update placex set indexed_status = 2 where indexed_status = 0 and rank_search > rank and ST_DWithin(placex.geometry, placegeom, diameter) and (rank_search < 28 or name is not null or addr_place is not null);
+          ELSE
+            -- for all other places the search terms may change as well
+            update placex set indexed_status = 2 where indexed_status = 0 and rank_search > rank and ST_DWithin(placex.geometry, placegeom, diameter) and (rank_search < 28 or name is not null);
+          END IF;
         END IF;
     END IF;
     RETURN TRUE;
