osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-23 13:06:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix edge cases when linking nodes

Browse Source 
edge cases are: missing node in placex, empty name, empty extratags
This commit is contained in:
Sarah Hoffmann 2012-09-23 18:06:41 +02:00
parent 6b65b9086b
commit 2b8a563b52
1 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
sql/functions.sql
View File

@ -1504,23 +1504,29 @@ BEGIN
-- RAISE WARNING 'get_osm_rel_members, label'; -- RAISE WARNING 'get_osm_rel_members, label';
FOR relMember IN select get_osm_rel_members(relation_members,ARRAY['label']) as member LOOP FOR relMember IN select get_osm_rel_members(relation_members,ARRAY['label']) as member LOOP
select * from placex where osm_type = upper(substring(relMember.member,1,1))::char(1) FOR linkedPlacex IN select * from placex where osm_type = upper(substring(relMember.member,1,1))::char(1)
and osm_id = substring(relMember.member,2,10000)::bigint order by rank_search desc limit 1 into linkedPlacex; and osm_id = substring(relMember.member,2,10000)::bigint order by rank_search desc limit 1 LOOP
-- If we don't already have one use this as the centre point of the geometry -- If we don't already have one use this as the centre point of the geometry
IF NEW.centroid IS NULL THEN IF NEW.centroid IS NULL THEN
NEW.centroid := coalesce(linkedPlacex.centroid,st_centroid(linkedPlacex.geometry)); NEW.centroid := coalesce(linkedPlacex.centroid,st_centroid(linkedPlacex.geometry));
END IF; END IF;
-- merge in the label name, re-init word vector -- merge in the label name, re-init word vector
NEW.name := linkedPlacex.name || NEW.name; IF NOT linkedPlacex.name IS NULL THEN
name_vector := make_keywords(NEW.name); NEW.name := linkedPlacex.name || NEW.name;
name_vector := make_keywords(NEW.name);
END IF;
-- merge in extra tags -- merge in extra tags
NEW.extratags := linkedPlacex.extratags || NEW.extratags; IF NOT linkedPlacex.extratags IS NULL THEN
NEW.extratags := linkedPlacex.extratags || NEW.extratags;
END IF;
-- mark the linked place (excludes from search results) -- mark the linked place (excludes from search results)
UPDATE placex set linked_place_id = NEW.place_id where place_id = linkedPlacex.place_id; UPDATE placex set linked_place_id = NEW.place_id where place_id = linkedPlacex.place_id;
END LOOP;
END LOOP; END LOOP;
@ -1528,33 +1534,39 @@ BEGIN
FOR relMember IN select get_osm_rel_members(relation_members,ARRAY['admin_center','admin_centre']) as member LOOP FOR relMember IN select get_osm_rel_members(relation_members,ARRAY['admin_center','admin_centre']) as member LOOP
select * from placex where osm_type = upper(substring(relMember.member,1,1))::char(1) FOR linkedPlacex IN select * from placex where osm_type = upper(substring(relMember.member,1,1))::char(1)
and osm_id = substring(relMember.member,2,10000)::bigint order by rank_search desc limit 1 into linkedPlacex; and osm_id = substring(relMember.member,2,10000)::bigint order by rank_search desc limit 1 LOOP
-- For an admin centre we also want a name match - still not perfect, for example 'new york, new york' -- For an admin centre we also want a name match - still not perfect, for example 'new york, new york'
-- But that can be fixed by explicitly setting the label in the data -- But that can be fixed by explicitly setting the label in the data
IF make_standard_name(NEW.name->'name') = make_standard_name(linkedPlacex.name->'name') IF make_standard_name(NEW.name->'name') = make_standard_name(linkedPlacex.name->'name')
AND NEW.rank_search = linkedPlacex.rank_search THEN AND NEW.rank_search = linkedPlacex.rank_search THEN
-- If we don't already have one use this as the centre point of the geometry -- If we don't already have one use this as the centre point of the geometry
IF NEW.centroid IS NULL THEN IF NEW.centroid IS NULL THEN
NEW.centroid := coalesce(linkedPlacex.centroid,st_centroid(linkedPlacex.geometry)); NEW.centroid := coalesce(linkedPlacex.centroid,st_centroid(linkedPlacex.geometry));
END IF;
-- merge in the name, re-init word vector
IF NOT linkedPlacex.name IS NULL THEN
NEW.name := linkedPlacex.name || NEW.name;
name_vector := make_keywords(NEW.name);
END IF;
-- merge in extra tags
IF NOT linkedPlacex.extratags IS NULL THEN
NEW.extratags := linkedPlacex.extratags || NEW.extratags;
END IF;
-- mark the linked place (excludes from search results)
UPDATE placex set linked_place_id = NEW.place_id where place_id = linkedPlacex.place_id;
-- keep a note of the node id in case we need it for wikipedia in a bit
linked_node_id := linkedPlacex.osm_id;
END IF; END IF;
-- merge in the name, re-init word vector END LOOP;
NEW.name := linkedPlacex.name || NEW.name;
name_vector := make_keywords(NEW.name);
-- merge in extra tags
NEW.extratags := linkedPlacex.extratags || NEW.extratags;
-- mark the linked place (excludes from search results)
UPDATE placex set linked_place_id = NEW.place_id where place_id = linkedPlacex.place_id;
-- keep a note of the node id in case we need it for wikipedia in a bit
linked_node_id := linkedPlacex.osm_id;
END IF;
END LOOP; END LOOP;