From 1445468a0cd36b311fc6d1e8bb7d83c3fa6fb7e0 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Tue, 30 Nov 2021 12:50:53 +0300
Subject: [PATCH] [search] Add @waterbody group; minor fixes

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/categories.txt | 71 +++++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 31 deletions(-)

diff --git a/data/categories.txt b/data/categories.txt
index cd9f337787..4b5469fca6 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -13,6 +13,9 @@
 # en:Supermarket
 # ---
 #
+# Categories match their sub-categories, e.g. a search term defined for historic-memorial
+# will also match historic-memorial-statue, historic-memorial-plaque, etc.
+#
 # Syntax:
 # @   - indicates the beginning of the group of searh terms translations
 # :   - used to separate the name of the language and translated search synonims.
@@ -5999,7 +6002,7 @@ fa:شیر آب قابل شرب
 man_made-water_tap|@water
 en:Water Tap
 ru:Водопроводный кран
-be:Вада кран
+be:Вадаправодны кран
 bg:кран за вода|чешмяна вода
 ar:حنفية مياه
 cs:Vodovodní kohoutek
@@ -6031,10 +6034,13 @@ zh-Hans:水龙头
 zh-Hant:水龍頭
 fa:شیراب
 
-# Do not add the "water" search term
+# Do not add the "water" search term,
 # use terms like at https://www.wikidata.org/wiki/Q15324#sitelinks-wikipedia
-natural-water
-en:Water body|body of water|water surface
+#
+# Bigger bodies of water like lakes, ponds, rivers etc. should not be included in "water" search
+# as they are quite big and obvious terrain features on the map anyway.
+@waterbody
+en:Water body|water surface
 ru:Водоём
 ar:مسطح مائي
 be:Вадаём
@@ -6056,16 +6062,18 @@ pl:Akwen
 pt:Corpo de água
 pt-BR:Corpo de água
 th:แหล่งน้ำ
-uk:Водоймище
+uk:Водоймище|водойма
 vi:Thủy vực
 zh-Hans:水體
 zh-Hant:水體
 
+natural-water|@waterbody
+
 # Do not add the "water" search term
-natural-water-basin|landuse-basin
+natural-water-basin|landuse-basin|@waterbody
 en:Basin
-be:Вадаём|рэзервуар
-ru:Водоём|резервуар
+be:Рэзервуар
+ru:Резервуар
 bg:Резервоар
 ar:حوض المياه
 cs:Vodní nádrž
@@ -6094,19 +6102,19 @@ sv:Vattenbassäng
 sw:Bonde la Maji
 th:อ่างน้ำ
 tr:Bir su havzası
-uk:Водоймище|резервуар|басейн
+uk:Резервуар|басейн
 vi:Một chậu nước
 zh-Hans:水盆地
 zh-Hant:水庫|盆地
 
 # Do not add the "water" search term
-natural-water-pond
+natural-water-pond|@waterbody
 en:Pond
-ru:Пруд|водоём
-be:Сажалка|вадаём
+ru:Пруд
+be:Сажалка
 bg:локва|езерце|басейн
 ar:بركة|مياه
-cs:Rybník|vodní nádrž
+cs:Rybník
 da:Dam|vandhul
 nl:Plas
 fi:Lampi
@@ -6126,23 +6134,23 @@ es:Estanque
 sv:Damm
 th:1บ่อ|น้ำ
 tr:Gölet
-uk:Ставок|водоймище
+uk:Ставок
 vi:Ao
 zh-Hans:1池塘
 zh-Hant:潭|池塘
 el:Δεξαμενή
-sk:Rybník|vodná nádrž
+sk:Rybník
 sw:Bwawa
 fa:تالاب
 
 # Do not add the "water" search term
-natural-water-lake
+natural-water-lake|@waterbody
 en:Lake
-ru:Озеро|водоём
+ru:Озеро
 be:Возера
 bg:Езеро
 ar:بحيرة|مياه
-cs:Jezero|vodní nádrž
+cs:Jezero
 da:1Sø
 nl:Meer
 fi:Järvi
@@ -6154,28 +6162,28 @@ it:Lago|bacino
 ja:湖|池
 ko:호수
 nb:Innsjø
-pl:3Jezioro|akwen
+pl:Jezioro
 pt:Lago
 pt-BR:Lago
 ro:Lac
 es:Lago
 sv:Sjö
-th:2ทะเลสาบ|น้ำ
+th:ทะเลสาบ
 tr:Göl
-uk:Озеро|водоймище
+uk:Озеро
 vi:Hồ
 zh-Hans:湖|水
-zh-Hant:1湖泊|湖
+zh-Hant:湖泊|湖
 el:Λίμνη
-sk:Jazero|vodná nádrž
+sk:Jazero
 sw:Ziwa
 fa:دریاچه
 
 # Do not add the "water" search term
-natural-water-reservoir|landuse-reservoir
+natural-water-reservoir|landuse-reservoir|@waterbody
 en:Reservoir
-ru:Водохранилище|водоём
-be:Вадасховішча|вадаём
+ru:Водохранилище
+be:Вадасховішча
 ar:خزان
 bg:Резервоар
 cs:Nádrž
@@ -6202,16 +6210,17 @@ sv:Reservoar
 sw:Hifadhi
 th:อ่างเก็บน้ำ
 tr:Rezervuar
-uk:Водосховище|водоймище
+uk:Водосховище
 vi:Hồ chứa
 zh-Hans:水库
 zh-Hant:水庫
 
 # Do not add the "water" search term
 waterway-river|waterway-stream|waterway-riverbank|natural-water-river
-en:River|stream|creek
-ru:Река
-bg:река|течение
+en:River|stream|creek|brook
+ru:Река|ручей
+be:Рака|ручай
+bg:река|течение|рекичка
 ar:نهر
 cs:Řeka
 da:Flod
@@ -6233,7 +6242,7 @@ es:Río
 sv:Flod
 th:แม่น้ำ
 tr:Nehir
-uk:Річка
+uk:Річка|струмок
 vi:Sông
 zh-Hans:河
 zh-Hant:1河流|河