Fixed some cuisines duplication.

3 files changed, 5 insertions, 130 deletions

diff --git a/data/cuisines.txt b/data/cuisines.txt
index 553a862f04..de6a0c113a 100644
--- a/data/cuisines.txt
+++ b/data/cuisines.txt
@@ -1375,38 +1375,6 @@
     ar = مطبخ لبناني
     he = מטבח לבנוני
 
-  [steak]
-    tags = android, ios
-    en = Steak
-    ru = Стейк-хаус
-    uk = Стейки
-    tr = Biftek
-    es = Filetes
-    sv = Biff
-    sk = Steak
-    pt = Bife
-    ro = Friptură
-    pl = Steki
-    ko = 스테이크
-    id = Steik
-    hu = Steak
-    de = Steak
-    fr = Steak
-    nl = Steak
-    fi = Pihvi
-    da = Bøf
-    cs = Steak
-    it = Bistecche
-    nb = Steak
-    zh-Hant = 牛排
-    zh-Hans = 牛排
-    vi = Bít tết
-    th = สเต๊ก
-    ja = ステーキ
-    el = µπριζόλα
-    ar = شريحة لحم
-    he = סטייק
-
   [local]
     tags = android, ios
     en = Local
@@ -1951,38 +1919,6 @@
     ar = مطبخ أفريقي
     he = מטבח אפריקאי
 
-  [doughnut]
-    tags = android, ios
-    en = Doughnut
-    ru = Пончики
-    uk = Пончики
-    tr = Doughnut
-    es = Rosquillas
-    sv = Munk
-    sk = Šišky
-    pt = Donut
-    ro = Gogoașă
-    pl = Pączki
-    ko = 도너츠
-    id = Donat
-    hu = Fánk
-    de = Donuts
-    fr = Donuts
-    nl = Donuts
-    fi = Donitsi
-    da = Doughnuts
-    cs = Kobliha
-    it = Ciambelle
-    nb = Smultring
-    zh-Hant = 甜甜圈
-    zh-Hans = 甜甜圈
-    vi = Bánh rán
-    th = โดนัท
-    ja = ドーナッツ
-    el = Λουκουμάς
-    ar = دونت
-    he = דונאט
-
   [georgian]
     tags = android, ios
     en = Georgian
diff --git a/generator/osm2meta.cpp b/generator/osm2meta.cpp
index 30281987e3..040ed4da16 100644
--- a/generator/osm2meta.cpp
+++ b/generator/osm2meta.cpp
@@ -193,8 +193,13 @@ string MetadataTagProcessorImpl::ValidateAndFormat_cuisine(string v) const
     strings::Trim(normalized, " ");
     CollapseMultipleConsecutiveCharsIntoOne(' ', normalized);
     replace(normalized.begin(), normalized.end(), ' ', '_');
+    // Avoid duplication for some cuisines.
     if (normalized == "bbq" || normalized == "barbeque")
       normalized = "barbecue";
+    if (normalized == "doughnut")
+      normalized = "donut";
+    if (normalized == "steak")
+      normalized = "steak_house";
     collector(normalized);
     ++iter;
   }
diff --git a/strings.txt b/strings.txt
index 62033851e0..067047cb02 100644
--- a/strings.txt
+++ b/strings.txt
@@ -10264,39 +10264,6 @@
     ar = مطبخ لبناني
     he = מטבח לבנוני
 
-  [cuisine_steak]
-    tags = android, ios
-    comment = Cuisine
-    en = steak
-    ru = стейк-хаус
-    uk = стейки
-    tr = biftek
-    es = filetes
-    sv = biff
-    sk = steak
-    pt = bife
-    ro = friptură
-    pl = steki
-    ko = 스테이크
-    id = steik
-    hu = steak
-    de = Steak
-    fr = steak
-    nl = steak
-    fi = pihvi
-    da = bøf
-    cs = steak
-    it = bistecche
-    nb = steak
-    zh-Hant = 牛排
-    zh-Hans = 牛排
-    vi = bít tết
-    th = สเต๊ก
-    ja = ステーキ
-    el = μπριζόλα
-    ar = شريحة لحم
-    he = סטייק
-
   [cuisine_local]
     tags = android, ios
     comment = Cuisine
@@ -10858,39 +10825,6 @@
     ar = مطبخ أفريقي
     he = מטבח אפריקאי
 
-  [cuisine_doughnut]
-    tags = android, ios
-    comment = Cuisine
-    en = doughnut
-    ru = пончики
-    uk = пончики
-    tr = doughnut
-    es = rosquillas
-    sv = munk
-    sk = šišky
-    pt = donut
-    ro = gogoașă
-    pl = pączki
-    ko = 도너츠
-    id = donat
-    hu = fánk
-    de = Donuts
-    fr = donuts
-    nl = donuts
-    fi = donitsi
-    da = doughnuts
-    cs = kobliha
-    it = ciambelle
-    nb = smultring
-    zh-Hant = 甜甜圈
-    zh-Hans = 甜甜圈
-    vi = bánh rán
-    th = โดนัท
-    ja = ドーナッツ
-    el = λουκουμάς
-    ar = دونت
-    he = דונאט
-
   [cuisine_georgian]
     tags = android, ios
     comment = Cuisine