From 809623084426fbe0b4c54b00130125b01e666b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Brzozowski?= Date: Sun, 8 Oct 2023 01:26:33 +0200 Subject: [PATCH] [styles][strings] Added Kingdom Hall of Jehovah's Witnesses as a generic place of worship icon They do not use a cross. Cf. openstreetmap-carto, OsmAnd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Brzozowski --- data/mapcss-mapping.csv | 1 + data/strings/types_strings.txt | 39 +++++++++++++++++++ data/styles/clear/include/Icons.mapcss | 6 +++ .../include/priorities_1_BG-by-size.prio.txt | 1 + .../include/priorities_4_overlays.prio.txt | 2 + data/styles/vehicle/include/Icons.mapcss | 6 +++ .../include/priorities_4_overlays.prio.txt | 2 + 7 files changed, 57 insertions(+) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 5f2aa57ef5..24d2cae2b3 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1660,3 +1660,4 @@ craft|grinding_mill;1584; leisure|outdoor_seating;1585; railway|station|light_rail|london;[railway=station][station=light_rail][city=london];;name;int_name;1586; railway|station|light_rail|porto;[railway=station][station=light_rail][city=porto];;name;int_name;1587; +amenity|place_of_worship|christian|jehovahs_witness;[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness];;name;int_name;1588; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index ce80b9216c..824a42d774 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -3251,6 +3251,45 @@ zh-Hans = 耶稣基督后期圣徒教会 zh-Hant = 耶穌基督後期聖徒教會 + [type.amenity.place_of_worship.christian.jehovahs_witness] + en = Jehovah's Witnesses Kingdom Hall + ar = قاعة مملكة شهود يهوه + be = Зала царства Сведкаў Іегавы + bg = Зала на царството на Свидетелите на Йехова + ca = Sala del Regne dels Testimonis de Jehovà + cs = Sál Království Jehovových svědků + da = Jehovas Vidner Rigssal + de = Königreichssaal der Zeugen Jehovas + el = Αίθουσα Βασιλείας των Μαρτύρων του Ιεχωβά + es = Salón del Reino de los Testigos de Jehová + et = Jehoova tunnistajate kuningriigi saal + eu = Jehovaren Testiguen Erresumaren aretoa + fa = سال مملکت شاهدان یهوه + fi = Jehovan todistajien valtakunnansali + fr = Salle du Royaume des Témoins de Jéhovah + he = בית הכנסת של עדי יהוה + hu = Jehova Tanúinak Királysága terem + id = Aula Kerajaan Saksi-Saksi Yehuwa + it = Sala del Regno dei Testimoni di Geova + ja = イエホバの証人の王国ホール + ko = 예수 그리스도의 후기 성도 국회당 + mr = यहोवा साक्षींचे राज्य सभा + nb = Jehovas vitners Rikets sal + nl = Koninkrijkszaal van Jehovah's Getuigen + pl = Sala Królestwa Świadków Jehowy + pt = Salão do Reino das Testemunhas de Jeová + ro = Sala Împărăției Martorilor lui Iehova + ru = Зала Царства Свидетелей Иеговы + sk = Kráľovstvo Jehovových svedkov + sv = Jehovas vittnen Rikets sal + sw = Ukumbi wa Ufalme wa Mashahidi wa Yehova + th = ห้องราชอาณาจักรของพยานเยโฮวา + tr = Jehova'nın Şahitlerinin Krallık Salonu + uk = Зала Царства Свідків Єгови + vi = Nhà Đấng Sứ Quân của Nhân Chứng của Y-hô-va + zh-Hans = 耶和华见证人王国大厅 + zh-Hant = 耶和華見證人王國大廳 + [type.amenity.place_of_worship.hindu] en = Hindu Temple af = Hindoe-tempel diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 26389b2a3f..40e267964e 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -1413,6 +1413,9 @@ area|z14[amenity=place_of_worship][religion=taoist] node|z14-[amenity=place_of_worship][religion=christian][denomination=mormon], area|z14-[amenity=place_of_worship][religion=christian][denomination=mormon], {icon-image: mormon-s.svg;text-offset: 1;icon-min-distance: 12;} +node|z14-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], +area|z14-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], +{icon-image: place-of-worship-s.svg;text-offset: 1;icon-min-distance: 12;} node|z15-[amenity=place_of_worship], area|z15-[amenity=place_of_worship] @@ -1441,6 +1444,9 @@ area|z15-[amenity=place_of_worship][religion=taoist] node|z15-[amenity=place_of_worship][religion=christian][denomination=mormon], area|z15-[amenity=place_of_worship][religion=christian][denomination=mormon], {icon-image: mormon-m.svg;} +node|z15-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], +area|z15-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], +{icon-image: place-of-worship-m.svg;} /* 5.5 Others */ diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt index 11d222beb3..3140b398ba 100644 --- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt @@ -20,6 +20,7 @@ leisure-stadium # area z15- (also has icon z amenity-place_of_worship # area z16- (also has icon z14-, caption(optional) z14-) amenity-place_of_worship-buddhist # area z16- (also has icon z14-, caption(optional) z14-) amenity-place_of_worship-christian # area z16- (also has icon z14-, caption(optional) z14-) +amenity-place_of_worship-christian-jehovahs_witness # area z16- (also has icon z14-, caption(optional) z14-) amenity-place_of_worship-christian-mormon # area z16- (also has icon z14-, caption(optional) z14-) amenity-place_of_worship-hindu # area z16- (also has icon z14-, caption(optional) z14-) amenity-place_of_worship-jewish # area z16- (also has icon z14-, caption(optional) z14-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 53f524e76e..3de725336f 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -391,6 +391,7 @@ tourism-viewpoint # icon z14- (also has captio amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z16-) amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z16-) +amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z16-) amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z16-) amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z16-) amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z16-) @@ -1547,6 +1548,7 @@ amenity-parking-private # icon z18- (also has captio # amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z16-) # amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z16-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z16-) # amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z16-) # amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z16-) # amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z16-) diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 8a2e6f42c4..a1fbd101a2 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -585,6 +585,9 @@ area|z16-[amenity=place_of_worship][religion=hindu] node|z16-[amenity=place_of_worship][religion=christian][denomination=mormon], area|z16-[amenity=place_of_worship][religion=christian][denomination=mormon], {icon-image: mormon-m.svg;font-size: 13;} +node|z16-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], +area|z16-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], +{icon-image: place-of-worship-m.svg;font-size: 13;} node|z18-[amenity=place_of_worship], @@ -605,6 +608,9 @@ area|z18-[amenity=place_of_worship][religion=hindu] node|z18-[amenity=place_of_worship][religion=christian][denomination=mormon], area|z18-[amenity=place_of_worship][religion=christian][denomination=mormon], {icon-image: mormon-m.svg;font-size: 14.5;} +node|z18-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], +area|z18-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness], +{icon-image: place-of-worship-m.svg;font-size: 14.5;} /* 5.5 Others */ diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index fdc7e87aaf..d50b88bb4b 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -532,6 +532,7 @@ railway-rail-tourism-tunnel # pathtext z16- (also has li amenity-place_of_worship # icon z16- (also has caption(optional) z17-) amenity-place_of_worship-buddhist # icon z16- (also has caption(optional) z17-) amenity-place_of_worship-christian # icon z16- (also has caption(optional) z17-) +amenity-place_of_worship-christian-jehovahs_witness # icon z16- (also has caption(optional) z17-) amenity-place_of_worship-christian-mormon # icon z16- (also has caption(optional) z17-) amenity-place_of_worship-hindu # icon z16- (also has caption(optional) z17-) amenity-place_of_worship-jewish # icon z16- (also has caption(optional) z17-) @@ -997,6 +998,7 @@ entrance-main # icon z18- (also has captio # amenity-place_of_worship # caption(optional) z17- (also has icon z16-) # amenity-place_of_worship-buddhist # caption(optional) z17- (also has icon z16-) # amenity-place_of_worship-christian # caption(optional) z17- (also has icon z16-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z17- (also has icon z16-) # amenity-place_of_worship-christian-mormon # caption(optional) z17- (also has icon z16-) # amenity-place_of_worship-hindu # caption(optional) z17- (also has icon z16-) # amenity-place_of_worship-jewish # caption(optional) z17- (also has icon z16-)