X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/80f7392fb1eff5c6b26e5f85b6873bb133576275..ca680fc9fc9cdf265479925b681b179611f1df41:/sql/functions/placex_triggers.sql diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index d74ac1c9..8c9cfae1 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -31,7 +31,6 @@ BEGIN LOOP FOR i IN 1..array_upper(location.members, 1) BY 2 LOOP IF location.members[i+1] = 'street' THEN - --DEBUG: RAISE WARNING 'node in relation %',relation; FOR parent IN SELECT place_id from placex WHERE osm_type = 'W' and osm_id = substring(location.members[i],2)::bigint @@ -93,18 +92,29 @@ BEGIN END IF; IF fallback THEN - IF ST_Area(bbox) < 0.01 THEN + IF addr_street is null and addr_place is not null THEN + -- The address is attached to a place we don't know. + -- Instead simply use the containing area with the largest rank. + FOR location IN + SELECT place_id FROM placex + WHERE bbox @ geometry AND _ST_Covers(geometry, ST_Centroid(bbox)) + AND rank_address between 5 and 25 + ORDER BY rank_address desc + LOOP + RETURN location.place_id; + END LOOP; + ELSEIF ST_Area(bbox) < 0.005 THEN -- for smaller features get the nearest road SELECT getNearestRoadPlaceId(poi_partition, bbox) INTO parent_place_id; --DEBUG: RAISE WARNING 'Checked for nearest way (%)', parent_place_id; ELSE -- for larger features simply find the area with the largest rank that - -- contains the bbox + -- contains the bbox, only use addressable features FOR location IN SELECT place_id FROM placex WHERE bbox @ geometry AND _ST_Covers(geometry, ST_Centroid(bbox)) - AND rank_search between 5 and 25 - ORDER BY rank_search desc + AND rank_address between 5 and 25 + ORDER BY rank_address desc LOOP RETURN location.place_id; END LOOP; @@ -225,7 +235,7 @@ LANGUAGE plpgsql STABLE; -- \param maxrank Rank of the place. All address features must have -- a search rank lower than the given rank. -- \param address Address terms for the place. --- \param geoemtry Geometry to which the address objects should be close. +-- \param geometry Geometry to which the address objects should be close. -- -- \retval parent_place_id Place_id of the address object that is the direct -- ancestor. @@ -282,23 +292,6 @@ BEGIN END IF; END IF; END LOOP; - - IF address ? 'is_in' THEN - -- is_in items need splitting - isin := regexp_split_to_array(address->'is_in', E'[;,]'); - IF array_upper(isin, 1) IS NOT NULL THEN - FOR i IN 1..array_upper(isin, 1) LOOP - isin_tokens := array_merge(isin_tokens, - word_ids_from_name(isin[i])); - - -- merge word into address vector - IF NOT %REVERSE-ONLY% THEN - nameaddress_vector := array_merge(nameaddress_vector, - addr_ids_from_name(isin[i])); - END IF; - END LOOP; - END IF; - END IF; END IF; IF NOT %REVERSE-ONLY% THEN nameaddress_vector := array_merge(nameaddress_vector, isin_tokens); @@ -418,7 +411,12 @@ BEGIN NEW.name := hstore('ref', NEW.address->'postcode'); - ELSEIF NEW.class = 'boundary' AND NOT is_area THEN + ELSEIF NEW.class = 'highway' AND is_area AND NEW.name is null + AND NEW.extratags ? 'area' AND NEW.extratags->'area' = 'yes' + THEN + RETURN NULL; + ELSEIF NEW.class = 'boundary' AND NOT is_area + THEN RETURN NULL; ELSEIF NEW.class = 'boundary' AND NEW.type = 'administrative' AND NEW.admin_level <= 4 AND NEW.osm_type = 'W' @@ -454,11 +452,16 @@ 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, 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 or (NEW.rank_search >= 16 and address ? 'place')); - 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 or (NEW.rank_search >= 16 and address ? 'place')); + UPDATE placex SET indexed_status = 2 + WHERE ST_Intersects(NEW.geometry, placex.geometry) + and indexed_status = 0 + and ((rank_address = 0 and rank_search > NEW.rank_address) + or rank_address > NEW.rank_address + or (class = 'place' and osm_type = 'N') + ) + and (rank_search < 28 + or name is not null + or (NEW.rank_address >= 16 and address ? 'place')); END IF; ELSE -- mark nearby items for re-indexing, where 'nearby' depends on the features rank_search and is a complete guess :( @@ -535,12 +538,16 @@ DECLARE centroid GEOMETRY; parent_address_level SMALLINT; + place_address_level SMALLINT; addr_street TEXT; addr_place TEXT; name_vector INTEGER[]; nameaddress_vector INTEGER[]; + addr_nameaddress_vector INTEGER[]; + + inherited_address HSTORE; linked_node_id BIGINT; linked_importance FLOAT; @@ -574,11 +581,28 @@ BEGIN where linked_place_id = NEW.place_id; -- update not necessary for osmline, cause linked_place_id does not exist + NEW.extratags := NEW.extratags - 'linked_place'::TEXT; + NEW.address := NEW.address - '_unlisted_place'::TEXT; + IF NEW.linked_place_id is not null THEN --DEBUG: RAISE WARNING 'place already linked to %', NEW.linked_place_id; RETURN NEW; END IF; + -- Postcodes are just here to compute the centroids. They are not searchable + -- unless they are a boundary=postal_code. + -- There was an error in the style so that boundary=postal_code used to be + -- imported as place=postcode. That's why relations are allowed to pass here. + -- This can go away in a couple of versions. + IF NEW.class = 'place' and NEW.type = 'postcode' and NEW.osm_type != 'R' THEN + RETURN NEW; + END IF; + + -- Speed up searches - just use the centroid of the feature + -- cheaper but less acurate + NEW.centroid := ST_PointOnSurface(NEW.geometry); + --DEBUG: RAISE WARNING 'Computing preliminary centroid at %',ST_AsText(NEW.centroid); + -- recompute the ranks, they might change when linking changes SELECT * INTO NEW.rank_search, NEW.rank_address FROM compute_place_rank(NEW.country_code, @@ -588,7 +612,36 @@ BEGIN NEW.class, NEW.type, NEW.admin_level, (NEW.extratags->'capital') = 'yes', NEW.address->'postcode'); - + -- We must always increase the address level relative to the admin boundary. + IF NEW.class = 'boundary' and NEW.type = 'administrative' + and NEW.osm_type = 'R' and NEW.rank_address > 0 + THEN + parent_address_level := get_parent_address_level(NEW.centroid, NEW.admin_level); + IF parent_address_level >= NEW.rank_address THEN + IF parent_address_level >= 24 THEN + NEW.rank_address := 25; + ELSE + NEW.rank_address := parent_address_level + 2; + END IF; + END IF; + -- If a place node is contained in a admin boundary with the same address level + -- and has not been linked, then make the node a subpart by increasing the + -- address rank (city level and above). + ELSEIF NEW.class = 'place' and NEW.osm_type = 'N' + and NEW.rank_address between 16 and 23 + THEN + FOR location IN + SELECT rank_address FROM placex + WHERE osm_type = 'R' and class = 'boundary' and type = 'administrative' + and rank_address = NEW.rank_address + and geometry && NEW.centroid and _ST_Covers(geometry, NEW.centroid) + LIMIT 1 + LOOP + NEW.rank_address = NEW.rank_address + 2; + END LOOP; + ELSE + parent_address_level := 3; + END IF; --DEBUG: RAISE WARNING 'Copy over address tags'; -- housenumber is a computed field, so start with an empty value @@ -613,16 +666,11 @@ BEGIN addr_street := NEW.address->'street'; addr_place := NEW.address->'place'; - IF NEW.address ? 'postcode' and NEW.address->'postcode' not similar to '%(,|;)%' THEN + IF NEW.address ? 'postcode' and NEW.address->'postcode' not similar to '%(:|,|;)%' THEN i := getorcreate_postcode_id(NEW.address->'postcode'); END IF; END IF; - -- Speed up searches - just use the centroid of the feature - -- cheaper but less acurate - NEW.centroid := ST_PointOnSurface(NEW.geometry); - --DEBUG: RAISE WARNING 'Computing preliminary centroid at %',ST_AsText(NEW.centroid); - NEW.postcode := null; -- recalculate country and partition @@ -661,7 +709,7 @@ BEGIN UPDATE placex SET linked_place_id = NEW.place_id WHERE place_id = linked_node_id; IF NOT %REVERSE-ONLY% THEN DELETE FROM search_name WHERE place_id = linked_node_id; - END IF; + END IF; END LOOP; END IF; END LOOP; @@ -678,13 +726,14 @@ BEGIN -- --------------------------------------------------------------------------- -- For low level elements we inherit from our parent road - IF (NEW.rank_search > 27 OR (NEW.type = 'postcode' AND NEW.rank_search = 25)) THEN + IF NEW.rank_search > 27 THEN --DEBUG: RAISE WARNING 'finding street for % %', NEW.osm_type, NEW.osm_id; NEW.parent_place_id := null; -- if we have a POI and there is no address information, -- see if we can get it from a surrounding building + inherited_address := ''::HSTORE; IF NEW.osm_type = 'N' AND addr_street IS NULL AND addr_place IS NULL AND NEW.housenumber IS NULL THEN FOR location IN @@ -699,7 +748,7 @@ BEGIN NEW.housenumber := location.address->'housenumber'; addr_street := location.address->'street'; addr_place := location.address->'place'; - --DEBUG: RAISE WARNING 'Found surrounding building % %', location.osm_type, location.osm_id; + inherited_address := location.address; END LOOP; END IF; @@ -714,9 +763,18 @@ BEGIN IF NEW.parent_place_id is not null THEN -- Get the details of the parent road - SELECT p.country_code, p.postcode FROM placex p + SELECT p.country_code, p.postcode, p.name FROM placex p WHERE p.place_id = NEW.parent_place_id INTO location; + IF addr_street is null and addr_place is not null THEN + -- Check if the addr:place tag is part of the parent name + SELECT count(*) INTO i + FROM svals(location.name) AS pname WHERE pname = addr_place; + IF i = 0 THEN + NEW.address = NEW.address || hstore('_unlisted_place', addr_place); + END IF; + END IF; + NEW.country_code := location.country_code; --DEBUG: RAISE WARNING 'Got parent details from search name'; @@ -730,33 +788,26 @@ BEGIN NEW.postcode := get_nearest_postcode(NEW.country_code, NEW.geometry); END IF; - -- If there is no name it isn't searchable, don't bother to create a search record - IF NEW.name is NULL THEN - --DEBUG: RAISE WARNING 'Not a searchable place % %', NEW.osm_type, NEW.osm_id; - return NEW; - END IF; + IF NEW.name is not NULL THEN + NEW.name := add_default_place_name(NEW.country_code, NEW.name); + name_vector := make_keywords(NEW.name); - NEW.name := add_default_place_name(NEW.country_code, NEW.name); - name_vector := make_keywords(NEW.name); + IF NEW.rank_search <= 25 and NEW.rank_address > 0 THEN + result := add_location(NEW.place_id, NEW.country_code, NEW.partition, + name_vector, NEW.rank_search, NEW.rank_address, + upper(trim(NEW.address->'postcode')), NEW.geometry); + --DEBUG: RAISE WARNING 'Place added to location table'; + END IF; - -- 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 - IF NEW.rank_search <= 25 and NEW.rank_address > 0 THEN - result := add_location(NEW.place_id, NEW.country_code, NEW.partition, name_vector, NEW.rank_search, NEW.rank_address, upper(trim(NEW.address->'postcode')), NEW.geometry); - --DEBUG: RAISE WARNING 'Place added to location table'; END IF; - result := insertSearchName(NEW.partition, NEW.place_id, name_vector, - NEW.rank_search, NEW.rank_address, NEW.geometry); - IF NOT %REVERSE-ONLY% THEN - -- Merge address from parent - SELECT array_merge(s.name_vector, s.nameaddress_vector) - INTO nameaddress_vector - FROM search_name s - WHERE s.place_id = NEW.parent_place_id; + SELECT * INTO name_vector, nameaddress_vector + FROM create_poi_search_terms(NEW.parent_place_id, + inherited_address || NEW.address, + NEW.housenumber, name_vector); + IF array_length(name_vector, 1) is not NULL THEN INSERT INTO search_name (place_id, search_rank, address_rank, importance, country_code, name_vector, nameaddress_vector, centroid) @@ -765,8 +816,9 @@ BEGIN nameaddress_vector, NEW.centroid); --DEBUG: RAISE WARNING 'Place added to search table'; END IF; + END IF; - return NEW; + RETURN NEW; END IF; END IF; @@ -785,8 +837,6 @@ BEGIN NEW.centroid := centroid; END IF; - -- Use the address rank of the linked place, if it has one - parent_address_level := get_parent_address_level(NEW.geometry, NEW.admin_level); --DEBUG: RAISE WARNING 'parent address: % rank address: %', parent_address_level, location.rank_address; IF location.rank_address > parent_address_level and location.rank_address < 26 @@ -811,6 +861,7 @@ BEGIN IF NOT %REVERSE-ONLY% THEN DELETE FROM search_name WHERE place_id = location.place_id; END IF; + PERFORM deleteLocationArea(NEW.partition, location.place_id, NEW.rank_search); SELECT wikipedia, importance FROM compute_importance(location.extratags, NEW.country_code, @@ -823,6 +874,18 @@ BEGIN THEN NEW.importance = linked_importance; END IF; + ELSE + -- No linked place? As a last resort check if the boundary is tagged with + -- a place type and adapt the rank address. + IF NEW.rank_address > 0 and NEW.extratags ? 'place' THEN + SELECT address_rank INTO place_address_level + FROM compute_place_rank(NEW.country_code, 'A', 'place', + NEW.extratags->'place', 0::SMALLINT, False, null); + IF place_address_level > parent_address_level and + place_address_level < 26 THEN + NEW.rank_address := place_address_level; + END IF; + END IF; END IF; -- Initialise the name vector using our name @@ -839,7 +902,9 @@ BEGIN END IF; SELECT * FROM insert_addresslines(NEW.place_id, NEW.partition, - NEW.rank_search, NEW.address, + CASE WHEN NEW.rank_address = 0 + THEN NEW.rank_search ELSE NEW.rank_address END, + NEW.address, CASE WHEN NEW.rank_search >= 26 AND NEW.rank_search < 30 THEN NEW.geometry ELSE NEW.centroid END) @@ -901,10 +966,14 @@ DECLARE BEGIN -- RAISE WARNING 'placex_delete % %',OLD.osm_type,OLD.osm_id; - update placex set linked_place_id = null, indexed_status = 2 where linked_place_id = OLD.place_id and indexed_status = 0; - --DEBUG: RAISE WARNING 'placex_delete:01 % %',OLD.osm_type,OLD.osm_id; - update placex set linked_place_id = null where linked_place_id = OLD.place_id; - --DEBUG: RAISE WARNING 'placex_delete:02 % %',OLD.osm_type,OLD.osm_id; + IF OLD.linked_place_id is null THEN + update placex set linked_place_id = null, indexed_status = 2 where linked_place_id = OLD.place_id and indexed_status = 0; + --DEBUG: RAISE WARNING 'placex_delete:01 % %',OLD.osm_type,OLD.osm_id; + update placex set linked_place_id = null where linked_place_id = OLD.place_id; + --DEBUG: RAISE WARNING 'placex_delete:02 % %',OLD.osm_type,OLD.osm_id; + ELSE + update placex set indexed_status = 2 where place_id = OLD.linked_place_id and indexed_status = 0; + END IF; IF OLD.rank_address < 30 THEN