X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6415c9cf95f24811744d3af91ab99d996faf4738..db3991af74f63828d5668cf45d1afc92e9ee07c2:/lib-sql/functions/utils.sql diff --git a/lib-sql/functions/utils.sql b/lib-sql/functions/utils.sql index 1445be54..534beb58 100644 --- a/lib-sql/functions/utils.sql +++ b/lib-sql/functions/utils.sql @@ -175,18 +175,18 @@ $$ LANGUAGE plpgsql STABLE; -CREATE OR REPLACE FUNCTION get_country_code(place_centre geometry) +CREATE OR REPLACE FUNCTION get_country_code(place geometry) RETURNS TEXT AS $$ DECLARE nearcountry RECORD; countries TEXT[]; BEGIN --- RAISE WARNING 'get_country_code, start: %', ST_AsText(place_centre); +-- RAISE WARNING 'get_country_code, start: %', ST_AsText(place); -- Try for a OSM polygon SELECT array_agg(country_code) FROM location_area_country - WHERE country_code is not null and st_covers(geometry, place_centre) + WHERE country_code is not null and st_covers(geometry, place) INTO countries; IF array_length(countries, 1) = 1 THEN @@ -197,7 +197,7 @@ BEGIN -- 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) + WHERE ST_Covers(geometry, place) AND country_code = ANY(countries) ORDER BY area ASC LOOP RETURN nearcountry.country_code; @@ -217,18 +217,18 @@ BEGIN RETURN countries[1]; END IF; --- RAISE WARNING 'osm fallback: %', ST_AsText(place_centre); +-- RAISE WARNING 'osm fallback: %', ST_AsText(place); -- Try for OSM fallback data -- The order is to deal with places like HongKong that are 'states' within another polygon FOR nearcountry IN SELECT country_code from country_osm_grid - WHERE st_covers(geometry, place_centre) order by area asc limit 1 + WHERE st_covers(geometry, place) order by area asc limit 1 LOOP RETURN nearcountry.country_code; END LOOP; --- RAISE WARNING 'near osm fallback: %', ST_AsText(place_centre); +-- RAISE WARNING 'near osm fallback: %', ST_AsText(place); RETURN NULL; END; @@ -348,8 +348,6 @@ CREATE OR REPLACE FUNCTION add_location(place_id BIGINT, country_code varchar(2) RETURNS BOOLEAN AS $$ DECLARE - locationid INTEGER; - secgeo GEOMETRY; postcode TEXT; BEGIN PERFORM deleteLocationArea(partition, place_id, rank_search); @@ -360,18 +358,19 @@ BEGIN postcode := upper(trim (in_postcode)); END IF; - IF ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') THEN - FOR secgeo IN select split_geometry(geometry) AS geom LOOP - PERFORM insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, false, postcode, centroid, secgeo); - END LOOP; - - ELSEIF ST_GeometryType(geometry) = 'ST_Point' THEN - secgeo := place_node_fuzzy_area(geometry, rank_search); - PERFORM insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, true, postcode, centroid, secgeo); + IF ST_Dimension(geometry) = 2 THEN + RETURN insertLocationAreaLarge(partition, place_id, country_code, keywords, + rank_search, rank_address, false, postcode, + centroid, geometry); + END IF; + IF ST_Dimension(geometry) = 0 THEN + RETURN insertLocationAreaLarge(partition, place_id, country_code, keywords, + rank_search, rank_address, true, postcode, + centroid, place_node_fuzzy_area(geometry, rank_search)); END IF; - RETURN true; + RETURN false; END; $$ LANGUAGE plpgsql; @@ -394,19 +393,21 @@ DECLARE geo RECORD; area FLOAT; remainingdepth INTEGER; - added INTEGER; BEGIN - -- RAISE WARNING 'quad_split_geometry: maxarea=%, depth=%',maxarea,maxdepth; - IF (ST_GeometryType(geometry) not in ('ST_Polygon','ST_MultiPolygon') OR NOT ST_IsValid(geometry)) THEN + IF not ST_IsValid(geometry) THEN + RETURN; + END IF; + + IF ST_Dimension(geometry) != 2 OR maxdepth <= 1 THEN RETURN NEXT geometry; RETURN; END IF; remainingdepth := maxdepth - 1; area := ST_AREA(geometry); - IF remainingdepth < 1 OR area < maxarea THEN + IF area < maxarea THEN RETURN NEXT geometry; RETURN; END IF; @@ -426,7 +427,6 @@ BEGIN xmid := (xmin+xmax)/2; ymid := (ymin+ymax)/2; - added := 0; FOR seg IN 1..4 LOOP IF seg = 1 THEN @@ -442,16 +442,13 @@ BEGIN secbox := ST_SetSRID(ST_MakeBox2D(ST_Point(xmid,ymid),ST_Point(xmax,ymax)),4326); END IF; - 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 - FOR geo IN select quad_split_geometry(secgeo, maxarea, remainingdepth) as geom LOOP - IF NOT ST_IsEmpty(geo.geom) AND ST_GeometryType(geo.geom) in ('ST_Polygon','ST_MultiPolygon') THEN - added := added + 1; - RETURN NEXT geo.geom; - END IF; - END LOOP; - END IF; + secgeo := st_intersection(geometry, secbox); + IF NOT ST_IsEmpty(secgeo) AND ST_Dimension(secgeo) = 2 THEN + FOR geo IN SELECT quad_split_geometry(secgeo, maxarea, remainingdepth) as geom LOOP + IF NOT ST_IsEmpty(geo.geom) AND ST_Dimension(geo.geom) = 2 THEN + RETURN NEXT geo.geom; + END IF; + END LOOP; END IF; END LOOP; @@ -467,10 +464,22 @@ CREATE OR REPLACE FUNCTION split_geometry(geometry GEOMETRY) DECLARE geo RECORD; BEGIN - -- 10000000000 is ~~ 1x1 degree - FOR geo IN select quad_split_geometry(geometry, 0.25, 20) as geom LOOP - RETURN NEXT geo.geom; - END LOOP; + IF ST_GeometryType(geometry) = 'ST_MultiPolygon' + and ST_Area(geometry) * 10 > ST_Area(Box2D(geometry)) + THEN + FOR geo IN + SELECT quad_split_geometry(g, 0.25, 20) as geom + FROM (SELECT (ST_Dump(geometry)).geom::geometry(Polygon, 4326) AS g) xx + LOOP + RETURN NEXT geo.geom; + END LOOP; + ELSE + FOR geo IN + SELECT quad_split_geometry(geometry, 0.25, 20) as geom + LOOP + RETURN NEXT geo.geom; + END LOOP; + END IF; RETURN; END; $$