From 1de8bdaafe3309c9358e05fc28084461bbf4dc73 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 21 Jan 2023 11:16:08 +0100
Subject: [PATCH] exclude names ending in :wikipedia from indexing

The wikipedia prefix is used for referencing a wikipedia article
for the given tag, not the object, so not useful to search.
---
 settings/import-address.lua   | 4 ++--
 settings/import-admin.lua     | 4 ++--
 settings/import-extratags.lua | 1 +
 settings/import-full.lua      | 1 +
 settings/import-street.lua    | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/settings/import-address.lua b/settings/import-address.lua
index 2bd92535..d18fbe1f 100644
--- a/settings/import-address.lua
+++ b/settings/import-address.lua
@@ -24,7 +24,7 @@ flex.set_main_tags{
 
 flex.set_prefilters{delete_keys = {'building', 'source',
                                    'source', '*source', 'type',
-                                   'is_in:postcode', '*:wikidata',
+                                   'is_in:postcode', '*:wikidata', '*:wikipedia',
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'name:etymology', 'name:signed', 'name:botanical',
                                    'addr:street:name', 'addr:street:type'},
@@ -44,7 +44,7 @@ flex.set_name_tags{main = {'name', 'name:*',
                           'alt_name', 'alt_name:*', 'alt_name_*',
                           'official_name', 'official_name:*',
                           'place_name', 'place_name:*',
-                          'short_name', 'short_name:*', 'brand'},
+                          'short_name', 'short_name:*'},
                    extra = {'ref', 'int_ref', 'nat_ref', 'reg_ref',
                             'loc_ref', 'old_ref',
                             'iata', 'icao', 'pcode', 'pcode:*', 'ISO3166-2'},
diff --git a/settings/import-admin.lua b/settings/import-admin.lua
index c593c34a..e4d1ee0c 100644
--- a/settings/import-admin.lua
+++ b/settings/import-admin.lua
@@ -9,7 +9,7 @@ flex.set_main_tags{
 flex.set_prefilters{delete_keys = {'building', 'source', 'highway',
                                    'addr:housenumber', 'addr:street', 'addr:city',
                                    'source', '*source', 'type',
-                                   'is_in:postcode', '*:wikidata',
+                                   'is_in:postcode', '*:wikidata', '*:wikipedia',
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'name:etymology', 'name:signed', 'name:botanical',
                                    'addr:street:name', 'addr:street:type'},
@@ -27,7 +27,7 @@ flex.set_name_tags{main = {'name', 'name:*',
                           'alt_name', 'alt_name:*', 'alt_name_*',
                           'official_name', 'official_name:*',
                           'place_name', 'place_name:*',
-                          'short_name', 'short_name:*', 'brand'},
+                          'short_name', 'short_name:*'},
                    extra = {'ref', 'int_ref', 'nat_ref', 'reg_ref',
                             'loc_ref', 'old_ref',
                             'iata', 'icao', 'pcode', 'pcode:*', 'ISO3166-2'}
diff --git a/settings/import-extratags.lua b/settings/import-extratags.lua
index 22c3d9c8..a8263973 100644
--- a/settings/import-extratags.lua
+++ b/settings/import-extratags.lua
@@ -77,6 +77,7 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                     extratag_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                'name:etymology', 'name:signed', 'name:botanical',
                                'wikidata', '*:wikidata',
+                               '*:wikipedia', 'brand:wikipedia:*',
                                'addr:street:name', 'addr:street:type'}
                    }
 
diff --git a/settings/import-full.lua b/settings/import-full.lua
index e00313ce..bcc4c398 100644
--- a/settings/import-full.lua
+++ b/settings/import-full.lua
@@ -77,6 +77,7 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                     extratag_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                'name:etymology', 'name:signed', 'name:botanical',
                                'wikidata', '*:wikidata',
+                               '*:wikipedia', 'brand:wikipedia:*',
                                'addr:street:name', 'addr:street:type'}
                    }
 
diff --git a/settings/import-street.lua b/settings/import-street.lua
index 34bff572..5d771c6f 100644
--- a/settings/import-street.lua
+++ b/settings/import-street.lua
@@ -24,7 +24,7 @@ flex.set_main_tags{
 flex.set_prefilters{delete_keys = {'building', 'source',
                                    'addr:housenumber', 'addr:street',
                                    'source', '*source', 'type',
-                                   'is_in:postcode', '*:wikidata',
+                                   'is_in:postcode', '*:wikidata', '*:wikipedia',
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'name:etymology', 'name:signed', 'name:botanical',
                                    'addr:street:name', 'addr:street:type'},
@@ -44,7 +44,7 @@ flex.set_name_tags{main = {'name', 'name:*',
                           'alt_name', 'alt_name:*', 'alt_name_*',
                           'official_name', 'official_name:*',
                           'place_name', 'place_name:*',
-                          'short_name', 'short_name:*', 'brand'},
+                          'short_name', 'short_name:*'},
                    extra = {'ref', 'int_ref', 'nat_ref', 'reg_ref',
                             'loc_ref', 'old_ref',
                             'iata', 'icao', 'pcode', 'pcode:*', 'ISO3166-2'}
-- 
2.39.5