safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Only link polygons on admin_centre is not already found a label AND if exactl search_rank match

Browse Source
This commit is contained in:
Brian Quinion
2012-04-02 12:48:51 +01:00
parent 5e167f49d2
commit e62e75f1a7
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sql/functions.sql
View File

@@ -1484,29 +1484,33 @@ BEGIN
END LOOP; END LOOP;
FOR relMember IN select get_osm_rel_members(relation_members,ARRAY['admin_center','admin_centre']) as member LOOP IF NEW.centroid IS NULL THEN
select * from placex where osm_type = upper(substring(relMember.member,1,1)) FOR relMember IN select get_osm_rel_members(relation_members,ARRAY['admin_center','admin_centre']) as member LOOP
and osm_id = substring(relMember.member,2,10000)::integer order by rank_search desc limit 1 into linkedPlacex;
IF NEW.name->'name' = linkedPlacex.name->'name' THEN select * from placex where osm_type = upper(substring(relMember.member,1,1))
-- If we don't already have one use this as the centre point of the geometry and osm_id = substring(relMember.member,2,10000)::integer order by rank_search desc limit 1 into linkedPlacex;
IF NEW.centroid IS NULL THEN
NEW.centroid := coalesce(linkedPlacex.centroid,st_centroid(linkedPlacex.geometry)); IF NEW.name->'name' = linkedPlacex.name->'name' 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 NEW.centroid IS NULL THEN
NEW.centroid := coalesce(linkedPlacex.centroid,st_centroid(linkedPlacex.geometry));
END IF;
-- merge in the name, re-init word vector
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;
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 END IF;
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;
END IF;
END LOOP;
-- not found one yet? how about doing a name search -- not found one yet? how about doing a name search
IF NEW.centroid IS NULL THEN IF NEW.centroid IS NULL THEN