From 2535780282ee3635df6e4857a864301624f1dadd Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 16 Dec 2024 10:44:37 +0100 Subject: [PATCH] exclude more tourism=information types --- lib-lua/themes/nominatim/presets.lua | 7 +++++-- test/bdd/osm2pgsql/import/tags.feature | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib-lua/themes/nominatim/presets.lua b/lib-lua/themes/nominatim/presets.lua index 7afb204a7..aa51ac14c 100644 --- a/lib-lua/themes/nominatim/presets.lua +++ b/lib-lua/themes/nominatim/presets.lua @@ -190,7 +190,10 @@ module.MAIN_TAGS_POIS = function (group) historic = {'always', yes = group, no = group}, - information = {include_when_tag_present('tourism', 'information')}, + information = {include_when_tag_present('tourism', 'information'), + yes = 'delete', + route_marker = 'never', + trail_blaze = 'never'}, junction = {'fallback', no = group}, leisure = {'always', @@ -228,7 +231,7 @@ module.MAIN_TAGS_POIS = function (group) tourism = {'always', no = group, yes = group, - information = 'fallback'}, + information = exclude_when_key_present('information')}, tunnel = {'named_with_key', no = group} } end diff --git a/test/bdd/osm2pgsql/import/tags.feature b/test/bdd/osm2pgsql/import/tags.feature index f4ebe7adf..69238e797 100644 --- a/test/bdd/osm2pgsql/import/tags.feature +++ b/test/bdd/osm2pgsql/import/tags.feature @@ -232,15 +232,19 @@ Feature: Tag evaluation n101 Ttourism=information,name=Generic n102 Ttourism=information,information=guidepost n103 Thighway=information,information=house + n104 Ttourism=information,information=yes,name=Something + n105 Ttourism=information,information=route_marker,name=3 """ Then place contains exactly | object | type | + | N100:tourism | information | | N101:tourism | information | | N102:information | guidepost | | N103:highway | information | + | N104:tourism | information | - Scenario: Water feautures + Scenario: Water features When loading osm data """ n20 Tnatural=water