hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

force countries into partitions as determined by country code

Browse Source 
Avoids to a certain extent propagation of misassignment of
partitions when a country is expanded so far into another
that the centroid ends up in this other country.
This commit is contained in:
Sarah Hoffmann
2014-04-10 22:55:49 +02:00
parent 346da9bc0d
commit 589bad809e
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sql/functions.sql
View File

@@ -582,10 +582,9 @@ END;
$$ $$
LANGUAGE plpgsql IMMUTABLE; LANGUAGE plpgsql IMMUTABLE;
CREATE OR REPLACE FUNCTION get_partition(place geometry, in_country_code VARCHAR(10)) RETURNS INTEGER CREATE OR REPLACE FUNCTION get_partition(in_country_code VARCHAR(10)) RETURNS INTEGER
AS $$ AS $$
DECLARE DECLARE
place_centre GEOMETRY;
nearcountry RECORD; nearcountry RECORD;
BEGIN BEGIN
FOR nearcountry IN select partition from country_name where country_code = in_country_code FOR nearcountry IN select partition from country_name where country_code = in_country_code
@@ -953,7 +952,7 @@ BEGIN
NEW.calculated_country_code := lower(get_country_code(NEW.geometry)); NEW.calculated_country_code := lower(get_country_code(NEW.geometry));
NEW.partition := get_partition(NEW.geometry, NEW.calculated_country_code); NEW.partition := get_partition(NEW.calculated_country_code);
NEW.geometry_sector := geometry_sector(NEW.partition, NEW.geometry); NEW.geometry_sector := geometry_sector(NEW.partition, NEW.geometry);
-- copy 'name' to or from the default language (if there is a default language) -- copy 'name' to or from the default language (if there is a default language)
@@ -1328,12 +1327,26 @@ BEGIN
NEW.centroid := null; NEW.centroid := null;
-- reclaculate country and partition -- reclaculate country and partition
IF NEW.rank_search >= 4 THEN IF NEW.rank_search = 4 THEN
NEW.calculated_country_code := lower(get_country_code(place_centroid)); -- for countries, believe the mapped country code,
-- so that we remain in the right partition if the boundaries
-- suddenly expand.
NEW.partition := get_partition(lower(NEW.country_code));
IF NEW.partition = 0 THEN
NEW.calculated_country_code := lower(get_country_code(place_centroid));
NEW.partition := get_partition(NEW.calculated_country_code);
ELSE
NEW.calculated_country_code := lower(NEW.country_code);
END IF;
ELSE ELSE
NEW.calculated_country_code := NULL; IF NEW.rank_search > 4 THEN
--NEW.calculated_country_code := lower(get_country_code(NEW.geometry, NEW.country_code));
NEW.calculated_country_code := lower(get_country_code(place_centroid));
ELSE
NEW.calculated_country_code := NULL;
END IF;
NEW.partition := get_partition(NEW.calculated_country_code);
END IF; END IF;
NEW.partition := get_partition(place_centroid, NEW.calculated_country_code);
NEW.geometry_sector := geometry_sector(NEW.partition, place_centroid); NEW.geometry_sector := geometry_sector(NEW.partition, place_centroid);
-- Adding ourselves to the list simplifies address calculations later -- Adding ourselves to the list simplifies address calculations later
@@ -2788,7 +2801,7 @@ DECLARE
BEGIN BEGIN
place_centroid := ST_Centroid(pointgeo); place_centroid := ST_Centroid(pointgeo);
out_partition := get_partition(place_centroid, in_countrycode); out_partition := get_partition(in_countrycode);
out_parent_place_id := null; out_parent_place_id := null;
address_street_word_id := get_name_id(make_standard_name(in_street)); address_street_word_id := get_name_id(make_standard_name(in_street));