From e1253b6758aa28129a03be8dae6cc48574f95861 Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Sat, 4 Nov 2023 12:08:51 +0100 Subject: [PATCH] [generator] Add fee=yes, fee=no types Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- data/mapcss-mapping.csv | 4 +- data/strings/types_strings.txt | 79 ++++++++++++++++++++++++++++++++++ indexer/feature_data.cpp | 1 + indexer/feature_visibility.cpp | 3 +- 4 files changed, 84 insertions(+), 3 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 81542c501a..6fd43a19bb 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -576,8 +576,8 @@ waterway|fish_pass;496; waterway|fish_pass|tunnel;[waterway=fish_pass][tunnel?];;name;int_name;497; natural|water|lock;[natural=water][water=lock];;name;int_name;498; deprecated:waterway|lock:06.2022;499;waterway|canal -deprecated|deprecated;500;x -deprecated|deprecated;501;x +fee|yes;[fee?];;name;int_name;500; +fee|no;[fee=no];;name;int_name;501; deprecated|deprecated;502;x highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503; deprecated|deprecated;504;x diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index afbb7470d2..2d6e146377 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -10910,6 +10910,85 @@ zh-Hans = 退出 zh-Hant = 出口 + [type.fee.yes] + en = Paid + ar = مدفوعة + be = Платна + bg = Платено + ca = De pagament + cs = Placené + da = Betalt + de = Kostenpflichtig + el = Επί πληρωμή + es = De pago + et = Tasuline + eu = Ordaindua + fa = پولی + fi = Maksullinen + fr = Payant + he = בתשלום + hu = Fizetős + id = Berbayar + it = A pagamento + ja = 有料 + ko = 유료 + mr = सशुल्क + nb = Betalt + nl = Betaald + pl = Płatne + pt = Pago + ro = Plătit + ru = Платно + sk = Platené + sv = Betalt + sw = Kulipwa + th = จ่าย + tr = Ücretli + uk = Платно + vi = Trả phí + zh-Hans = 付费 + zh-Hant = 付費 + + [type.fee.no] + en = Free + ar = مجانية + be = бясплатна + bg = Безплатно + ca = Gratuït + cs = Zdarma + da = Gratis + de = Kostenlos + el = Δωρεάν + es = Gratis + et = Tasuta + eu = Doan + fa = رایگان + fi = Ilmainen + fr = Gratuit + he = חינם + hu = Ingyenes + id = Gratis + it = Gratuito + ja = 無料 + ko = 무료 + lt = Nemokama + mr = विनामूल्य + nb = Gratis + nl = Gratis + pl = Bezpłatne + pt = Gratuito + ro = Gratuit + ru = Бесплатно + sk = Zadarmo + sv = Gratis + sw = Bila + th = ฟรี + tr = Ücretsiz + uk = Безкоштовно + vi = Miễn phí + zh-Hans = 免费 + zh-Hant = 免費 + [type.healthcare.laboratory] en = Medical Laboratory af = Mediese laboratorium diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp index 72e79bd106..87b4bc8485 100644 --- a/indexer/feature_data.cpp +++ b/indexer/feature_data.cpp @@ -137,6 +137,7 @@ private: {"cuisine"}, {"recycling"}, {"area:highway"}, + {"fee"}, }; Classificator const & c = classif(); diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp index a80fd9f6da..654adccaed 100644 --- a/indexer/feature_visibility.cpp +++ b/indexer/feature_visibility.cpp @@ -194,7 +194,8 @@ namespace static uint32_t const arrTypes[] = { cl.GetTypeByPath({"wheelchair"}), - cl.GetTypeByPath({"cuisine"}) + cl.GetTypeByPath({"cuisine"}), + cl.GetTypeByPath({"fee"}), }; return base::IsExist(arrTypes, type); }