From: Sarah Hoffmann Date: Sat, 29 Mar 2014 00:16:08 +0000 (+0100) Subject: remove special handling for place tag values that have fallen out of use X-Git-Tag: v2.3.0~61 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/49fa768f67aecf023d6175fe1b26f214fb3f95eb remove special handling for place tag values that have fallen out of use --- diff --git a/sql/functions.sql b/sql/functions.sql index 45681610..f90b42d1 100644 --- a/sql/functions.sql +++ b/sql/functions.sql @@ -1064,18 +1064,6 @@ BEGIN ELSEIF NEW.type in ('village','hamlet','municipality','district','unincorporated_area','borough') THEN NEW.rank_search := 19; NEW.rank_address := 16; - ELSEIF NEW.type in ('airport') AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') THEN - NEW.rank_search := 18; - NEW.rank_address := 17; - ELSEIF NEW.type in ('moor') AND ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') THEN - NEW.rank_search := 17; - NEW.rank_address := 18; - ELSEIF NEW.type in ('moor') THEN - NEW.rank_search := 17; - NEW.rank_address := 0; - ELSEIF NEW.type in ('national_park') THEN - NEW.rank_search := 18; - NEW.rank_address := 18; ELSEIF NEW.type in ('suburb','croft','subdivision','isolated_dwelling') THEN NEW.rank_search := 20; NEW.rank_address := NEW.rank_search; @@ -1086,12 +1074,9 @@ BEGIN IF (NEW.extratags -> 'locality') = 'townland' THEN NEW.rank_address := 20; END IF; - ELSEIF NEW.type in ('hall_of_residence','neighbourhood','housing_estate','nature_reserve') THEN + ELSEIF NEW.type in ('neighbourhood') THEN NEW.rank_search := 22; NEW.rank_address := 22; - ELSEIF NEW.type in ('airport','street') THEN - NEW.rank_search := 26; - NEW.rank_address := NEW.rank_search; ELSEIF NEW.type in ('house','building') THEN NEW.rank_search := 30; NEW.rank_address := NEW.rank_search;