X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8c3a0efe8b75a06279998e66a932d8a56c483961..8a8e23ef3cb3e7ffb937c75ab1bdeee9ef5b3bf0:/sql/functions/utils.sql?ds=sidebyside diff --git a/sql/functions/utils.sql b/sql/functions/utils.sql index 61033fb4..6697ff97 100644 --- a/sql/functions/utils.sql +++ b/sql/functions/utils.sql @@ -237,7 +237,7 @@ BEGIN IF word_ids is not null THEN parent_place_id := getNearestNamedRoadPlaceId(partition, centroid, word_ids); IF parent_place_id is not null THEN - --DEBUG: RAISE WARNING 'Get parent form addr:street: %', parent.place_id; + --DEBUG: RAISE WARNING 'Get parent form addr:street: %', parent_place_id; RETURN parent_place_id; END IF; END IF; @@ -249,7 +249,7 @@ BEGIN IF word_ids is not null THEN parent_place_id := getNearestNamedPlacePlaceId(partition, centroid, word_ids); IF parent_place_id is not null THEN - --DEBUG: RAISE WARNING 'Get parent form addr:place: %', parent.place_id; + --DEBUG: RAISE WARNING 'Get parent form addr:place: %', parent_place_id; RETURN parent_place_id; END IF; END IF; @@ -272,6 +272,25 @@ END; $$ LANGUAGE plpgsql; +CREATE OR REPLACE FUNCTION near_feature_rank_distance(rank_search INTEGER) + RETURNS FLOAT + AS $$ +BEGIN + IF rank_search <= 16 THEN -- city + RETURN 7500; + ELSIF rank_search <= 18 THEN -- town + RETURN 4000; + ELSIF rank_search <= 19 THEN -- village + RETURN 2000; + ELSIF rank_search <= 20 THEN -- hamlet + RETURN 1000; + END IF; + + RETURN 500; +END; +$$ +LANGUAGE plpgsql IMMUTABLE; + CREATE OR REPLACE FUNCTION add_location(place_id BIGINT, country_code varchar(2), partition INTEGER, keywords INTEGER[], @@ -282,18 +301,11 @@ CREATE OR REPLACE FUNCTION add_location(place_id BIGINT, country_code varchar(2) DECLARE locationid INTEGER; centroid GEOMETRY; - diameter FLOAT; - x BOOLEAN; - splitGeom RECORD; + radius FLOAT; secgeo GEOMETRY; postcode TEXT; BEGIN - - IF rank_search > 25 THEN - RAISE EXCEPTION 'Adding location with rank > 25 (% rank %)', place_id, rank_search; - END IF; - - x := deleteLocationArea(partition, place_id, rank_search); + PERFORM deleteLocationArea(partition, place_id, rank_search); -- add postcode only if it contains a single entry, i.e. ignore postcode lists postcode := NULL; @@ -305,32 +317,18 @@ BEGIN centroid := ST_Centroid(geometry); FOR secgeo IN select split_geometry(geometry) AS geom LOOP - x := insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, false, postcode, centroid, secgeo); + PERFORM insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, false, postcode, centroid, secgeo); END LOOP; - ELSE - - diameter := 0.02; - IF rank_address = 0 THEN - diameter := 0.02; - ELSEIF rank_search <= 14 THEN - diameter := 1.2; - ELSEIF rank_search <= 15 THEN - diameter := 1; - ELSEIF rank_search <= 16 THEN - diameter := 0.5; - ELSEIF rank_search <= 17 THEN - diameter := 0.2; - ELSEIF rank_search <= 21 THEN - diameter := 0.05; - ELSEIF rank_search = 25 THEN - diameter := 0.005; - END IF; - --- RAISE WARNING 'adding % diameter %', place_id, diameter; + ELSEIF ST_GeometryType(geometry) = 'ST_Point' THEN + radius := near_feature_rank_distance(rank_search); + --DEBUG: RAISE WARNING 'adding % radius %', place_id, radius; - secgeo := ST_Buffer(geometry, diameter); - x := insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, true, postcode, ST_Centroid(geometry), secgeo); + -- Create a bounding box with an extent computed from the radius (in meters). + secgeo := ST_Envelope(ST_Collect( + ST_Project(geometry, radius, 0.785398)::geometry, + ST_Project(geometry, radius, 3.9269908)::geometry)); + PERFORM insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, true, postcode, geometry, secgeo); END IF; @@ -431,7 +429,7 @@ DECLARE geo RECORD; BEGIN -- 10000000000 is ~~ 1x1 degree - FOR geo IN select quad_split_geometry(geometry, 0.25, 20) as geom LOOP + FOR geo IN select quad_split_geometry(geometry, 0.01, 20) as geom LOOP RETURN NEXT geo.geom; END LOOP; RETURN; @@ -469,7 +467,7 @@ DECLARE placegeom GEOMETRY; geom GEOMETRY; diameter FLOAT; - rank INTEGER; + rank SMALLINT; BEGIN UPDATE placex SET indexed_status = 2 WHERE place_id = placeid; SELECT geometry, rank_search FROM placex WHERE place_id = placeid INTO placegeom, rank;