X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c3788d765ed4e7ddf00794085af757714bc102cf..b5a6d7a4a66e132f294cd8caa97c80d64cd2e039:/lib-sql/functions/utils.sql diff --git a/lib-sql/functions/utils.sql b/lib-sql/functions/utils.sql index d7fdae3d..50116566 100644 --- a/lib-sql/functions/utils.sql +++ b/lib-sql/functions/utils.sql @@ -73,6 +73,26 @@ END; $$ LANGUAGE plpgsql IMMUTABLE; + +CREATE OR REPLACE FUNCTION get_rel_node_members(members JSONB, memberLabels TEXT[]) + RETURNS SETOF BIGINT + AS $$ +DECLARE + member JSONB; +BEGIN + FOR member IN SELECT * FROM jsonb_array_elements(members) + LOOP + IF member->>'type' = 'N' and member->>'role' = ANY(memberLabels) THEN + RETURN NEXT (member->>'ref')::bigint; + END IF; + END LOOP; + + RETURN; +END; +$$ +LANGUAGE plpgsql IMMUTABLE; + + -- Copy 'name' to or from the default language. -- -- \param country_code Country code of the object being named. @@ -144,18 +164,44 @@ CREATE OR REPLACE FUNCTION get_country_code(place geometry) DECLARE place_centre GEOMETRY; nearcountry RECORD; + countries TEXT[]; BEGIN place_centre := ST_PointOnSurface(place); -- 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 st_covers(geometry, place_centre) limit 1 - LOOP - RETURN nearcountry.country_code; - END LOOP; + SELECT array_agg(country_code) FROM location_area_country + WHERE country_code is not null and st_covers(geometry, place_centre) + INTO countries; + + IF array_length(countries, 1) = 1 THEN + RETURN countries[1]; + END IF; + + IF array_length(countries, 1) > 1 THEN + -- more than one country found, confirm against the fallback data what to choose + FOR nearcountry IN + SELECT country_code FROM country_osm_grid + WHERE ST_Covers(geometry, place_centre) AND country_code = ANY(countries) + ORDER BY area ASC + LOOP + RETURN nearcountry.country_code; + END LOOP; + -- Still nothing? Choose the country code with the smallest partition number. + -- And failing that, just go by the alphabet. + FOR nearcountry IN + SELECT cc, + (SELECT partition FROM country_name WHERE country_code = cc) as partition + FROM unnest(countries) cc + ORDER BY partition, cc + LOOP + RETURN nearcountry.cc; + END LOOP; + + -- Should never be reached. + RETURN countries[1]; + END IF; -- RAISE WARNING 'osm fallback: %', ST_AsText(place_centre); @@ -170,15 +216,6 @@ BEGIN -- RAISE WARNING 'near osm fallback: %', ST_AsText(place_centre); - -- - FOR nearcountry IN - SELECT country_code from country_osm_grid - WHERE st_dwithin(geometry, place_centre, 0.5) - ORDER BY st_distance(geometry, place_centre) asc, area asc limit 1 - LOOP - RETURN nearcountry.country_code; - END LOOP; - RETURN NULL; END; $$ @@ -282,8 +319,8 @@ BEGIN END IF; RETURN ST_Envelope(ST_Collect( - ST_Project(geom, radius, 0.785398)::geometry, - ST_Project(geom, radius, 3.9269908)::geometry)); + ST_Project(geom::geography, radius, 0.785398)::geometry, + ST_Project(geom::geography, radius, 3.9269908)::geometry)); END; $$ LANGUAGE plpgsql IMMUTABLE; @@ -425,6 +462,20 @@ END; $$ LANGUAGE plpgsql IMMUTABLE; +CREATE OR REPLACE FUNCTION simplify_large_polygons(geometry GEOMETRY) + RETURNS GEOMETRY + AS $$ +BEGIN + IF ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') + and ST_MemSize(geometry) > 3000000 + THEN + geometry := ST_SimplifyPreserveTopology(geometry, 0.0001); + END IF; + RETURN geometry; +END; +$$ +LANGUAGE plpgsql IMMUTABLE; + CREATE OR REPLACE FUNCTION place_force_delete(placeid BIGINT) RETURNS BOOLEAN @@ -438,9 +489,10 @@ BEGIN SELECT osm_type, osm_id, class, type FROM placex WHERE place_id = placeid INTO osmtype, osmid, pclass, ptype; DELETE FROM import_polygon_delete where osm_type = osmtype and osm_id = osmid and class = pclass and type = ptype; DELETE FROM import_polygon_error where osm_type = osmtype and osm_id = osmid and class = pclass and type = ptype; - -- force delete from place/placex by making it a very small geometry - UPDATE place set geometry = ST_SetSRID(ST_Point(0,0), 4326) where osm_type = osmtype and osm_id = osmid and class = pclass and type = ptype; - DELETE FROM place where osm_type = osmtype and osm_id = osmid and class = pclass and type = ptype; + -- force delete by directly entering it into the to-be-deleted table + INSERT INTO place_to_be_deleted (osm_type, osm_id, class, type, deferred) + VALUES(osmtype, osmid, pclass, ptype, false); + PERFORM flush_deleted_places(); RETURN TRUE; END; @@ -495,3 +547,56 @@ BEGIN END; $$ LANGUAGE plpgsql; + +CREATE OR REPLACE FUNCTION flush_deleted_places() + RETURNS INTEGER + AS $$ +BEGIN + -- deleting large polygons can have a massive effect on the system - require manual intervention to let them through + INSERT INTO import_polygon_delete (osm_type, osm_id, class, type) + SELECT osm_type, osm_id, class, type FROM place_to_be_deleted WHERE deferred; + + -- delete from place table + ALTER TABLE place DISABLE TRIGGER place_before_delete; + DELETE FROM place USING place_to_be_deleted + WHERE place.osm_type = place_to_be_deleted.osm_type + and place.osm_id = place_to_be_deleted.osm_id + and place.class = place_to_be_deleted.class + and place.type = place_to_be_deleted.type + and not deferred; + ALTER TABLE place ENABLE TRIGGER place_before_delete; + + -- Mark for delete in the placex table + UPDATE placex SET indexed_status = 100 FROM place_to_be_deleted + WHERE placex.osm_type = 'N' and place_to_be_deleted.osm_type = 'N' + and placex.osm_id = place_to_be_deleted.osm_id + and placex.class = place_to_be_deleted.class + and placex.type = place_to_be_deleted.type + and not deferred; + UPDATE placex SET indexed_status = 100 FROM place_to_be_deleted + WHERE placex.osm_type = 'W' and place_to_be_deleted.osm_type = 'W' + and placex.osm_id = place_to_be_deleted.osm_id + and placex.class = place_to_be_deleted.class + and placex.type = place_to_be_deleted.type + and not deferred; + UPDATE placex SET indexed_status = 100 FROM place_to_be_deleted + WHERE placex.osm_type = 'R' and place_to_be_deleted.osm_type = 'R' + and placex.osm_id = place_to_be_deleted.osm_id + and placex.class = place_to_be_deleted.class + and placex.type = place_to_be_deleted.type + and not deferred; + + -- Mark for delete in interpolations + UPDATE location_property_osmline SET indexed_status = 100 FROM place_to_be_deleted + WHERE place_to_be_deleted.osm_type = 'W' + and place_to_be_deleted.class = 'place' + and place_to_be_deleted.type = 'houses' + and location_property_osmline.osm_id = place_to_be_deleted.osm_id + and not deferred; + + -- Clear todo list. + TRUNCATE TABLE place_to_be_deleted; + + RETURN NULL; +END; +$$ LANGUAGE plpgsql;