From c3e45d9cefe59343229ce0c529469a83070bdf2e Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Sat, 3 Sep 2022 17:52:26 +0300 Subject: [PATCH] [styles] Added castle_type castrum, fortified_church, fortress, hillfort, kremlin, manor, palace & shiro Signed-off-by: Lukas Kronberger Signed-off-by: Viktor Govako --- data/categories.txt | 121 +++++-- data/mapcss-mapping.csv | 18 +- data/strings/types_strings.txt | 409 +++++++++++++++++++++-- data/styles/clear/include/Icons.mapcss | 12 + data/styles/vehicle/include/Icons.mapcss | 14 + 5 files changed, 500 insertions(+), 74 deletions(-) diff --git a/data/categories.txt b/data/categories.txt index 9b8d3e3c83..22510cf2f2 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -2972,39 +2972,94 @@ sw:Machimbo ya kihistoria|kivutio|utalii fa:سایت باستان شناسی historic-castle|@tourism -en:4Castle|4Palace|4Fortress|U+1F3EF|U+1F3F0|U+1F451|U+1F478 -ru:3Замок|4Дворец|4Крепость -bg:3Замък|4Дворец|4крепост -ar:قلعة|سياحة|أماكن جذابة|مناظر -cs:3Zámek|zajímavost -da:Slot|borg -nl:4Kasteel|burcht|attractie -fi:Linna -fr:4Château|4Forteresse|4Palais -de:Burg|Schloss|Festung -hu:Vár|Katély|Erőd|Palota -id:4Kastel -it:4Castello -ja:城|お城|砦|城砦 -ko:성|궁전|성채|요새 -nb:Slott -pl:3Zamek -pt:4Castelo|4Palácio|4Fortaleza -pt-BR:4Castelo -ro:4Castel -es:4Castillo -eu:4Gaztelua -sv:Slott -th:ปราสาท|การท่องเที่ยว -tr:Kale|Saray -uk:3Замок|4фортеця|мури -vi:Pháo đài -zh-Hans:城堡|景点|旅游 -zh-Hant:城堡|堡|古蹟|歷史|旅遊景點 -el:Κάστρο|θέαμα|τουρισμός|αξιοθέατα -sk:3Zámok|atrakcia -sw:Ngome|kivutio|utalii -fa:قلعه تاریخی +en:4Castle|4Palace|4Fortress|U+1F3EF|U+1F3F0|U+1F451|U+1F478|Hillfort|Kremlin|Manor house +ar:قلعة|سياحة|أماكن جذابة|مناظر|كاسترا|الكنيسة المحصنة|حصون التلال|كرملين|قصر مالك العزبة|قصر|شاتو +be:Замак|Каструм|Крэпасць|Гарадзішча|Крэмль|Сядзіба|Палац +bg:3Замък|4Дворец|4крепост|Каструм|Градище|Кремъл|Усадба +cs:3Zámek|zajímavost|Hrad|Castrum|Pevnost|Hradiště|Kreml|Panský dům|Palác +da:Slot|borg|Fæstningsværk|Voldsted|Kreml|Herregård|Palads +de:Burg|Schloss|Festung|Palast|Wallburg|Kreml|Herrenhaus|Palais|Ruine +el:Κάστρο|θέαμα|τουρισμός|αξιοθέατα|Ρωμαϊκό κάστρο|Οχυρωμένη εκκλησία|Φρούριο|Κρεμλίνο|Αρχοντικό|Παλάτι +es:4Castillo|Castrum|Iglesia fortificada|Fortaleza|Castro|Kremlin|Casa solariega|Palacio +eu:4Gaztelua|Castrum|Eliza-gotorleku|Gotorlekua|Kastro|Kremlina|Jauregitxo|Jauregi +fa:قلعه تاریخی|قلعه رومی|کلیسای مستحکم|تپه‌قلعه|کرملین|خانه ارباب یا صاحب تیول|کاخ|گردشگری +fi:Linna|Castra|Linnoitus|Linnavuori|Kreml|Kartano|Palatsi +fr:4Château|4Forteresse|4Palais|Église fortifiée|Colline fortifiée|Kremlin|Manoir +he:טירה|קסטרום|כנסייה מבוצרת|מִבצָר|מבצר גבעה|קרמלין|אחוזה|ארמון|שאטו +hu:Vár|Kastély|Erőd|Palota|Castrum|Erősített templom|Erődrendszer|Földvár|Kreml|Udvarház +id:4Kastel|Benteng Romawi|Gereja yang dibentengi|Benteng|Benteng bukit|Kremlin|Rumah bangsawan|Istana +it:4Castello|Castra|Chiesa fortificata|Fortezza di collina|Cremlino|Maniero|Palazzo +ja:城|お城|砦|城砦|カストラ|要塞化された教会|要塞|ヒルフォート|クレムリ|マナー・ハウス|宮殿 +ko:성|궁전|성채|요새|로마 요새|요새화된 교회|요새|힐포트|크렘린|매너하우스|궁전 +mr:गढी|रोमन किल्ला|तटबंदी असलेले चर्च|किल्ला|हिलफोर्ट|क्रेमलिन|मनोर घर|राजवाडा|किल्ला +nb:Slott|Borg|Festning|Bygdeborg|Kreml|Herregård|Palass +nl:4Kasteel|burcht|attractie|Castra|Weerkerk|Vesting|Heuvelfort|Kremlin|Manoir|Paleis +pl:3Zamek|Castrum Romanum|Kościół obronny|Twierdza|Grodzisko|Kreml|Manoir|Pałac +pt:4Castelo|4Palácio|4Fortaleza|Castro|Igreja fortificada|Kremlin|Solar|Château +ro:4Castel|Castru|Biserică fortificată|Cetate|Castrul de deal|Kremlin|Conac|Palat +ru:3Замок|4Дворец|4Крепость|Каструм|Городище|Кремль|Усадьба|Шато +sk:3Zámok|atrakcia|Hrad|Kastrum|Opevnený kostol|Pevnosť|Hradisko|Kremeľ|Kaštieľ|Palác +sv:Slott|Borg|Castrum|Försvarskyrka|Fästning|Fornborg|Kreml|Herrgård|Palats +sw:Ngome|kivutio|utalii|Kanisa lililoimarishwa|Kremlin|Nyumba ya manor|Ikulu +th:ปราสาท|การท่องเที่ยว|ป้อมโรมัน|โบสถ์เสริมความแข็งแกร่ง|ป้อม|ป้อมเนิน|เครมลิน|คฤหาสน์|วัง|ปราสาท +tr:Kale|Saray|Müstahkem şato|Castra|Müstahkem şato|Müstahkem kilise|Tepe Kalesi|Kremlin|Malikane|Şato +uk:3Замок|4фортеця|мури|Каструм|Фортеця|Городище|Кремль|Садиба|Палац|Шато +vi:Pháo đài|Lâu đài|Pháo đài La mã|Nhà thờ kiên cố|Trang viên|Cung điện| +zh-Hans:城堡|古罗马兵营|坚固的教堂|要塞|丘堡|克里姆林|庄园大屋|宮殿|法式城堡 +zh-Hant:城堡|堡|古蹟|歷史|古羅馬兵營|堅固的教堂|要塞|丘堡|克里姆林|莊園大屋|宮殿|法式城堡 + +historic-city_gate|@tourism +en:City gate +ar:بوابة مدينة +be:Гарадская брама +bg:Градска порта +cs:Městská brána +da:Byport +de:Stadttor +el:Πύλη της πόλης +es:Puerta de la ciudad +eu:Portale +fa:دروازه شهر +fi:Kaupungin portti +fr:Porte de ville +he:שער העיר +hu:Városi kapu +id:Gerbang kota +it:Porta cittadina +ja:城門 +ko:성문 +mr:शहराचा दरवाजा +nb:Byport +nl:Stadspoort +pl:Brama miejska +pt:Portas da cidade|Portão da cidade +ro:Poarta orașului +ru:Городские ворота +sk:Mestská brána +sv:Stadsport +sw:Lango la jiji +th:ประตูเมือง +tr:Şehir kapısı +uk:Міська брама +vi:Cổng thành +zh-Hans:城门 +zh-Hant:城門 + +historic-fort|@tourism +en = Fort +ar = قلعة +de = Festung +fr = Fort militaire +ja = 歴史的な要塞 +mr = दुर्ग +pl = Historyczny fort +pt = Forte histórico +pt-BR = Forte histórico +ru = Форт +tr = Hisar +uk = Форт +zh-Hans = 历史要塞 +zh-Hant = 歷史要塞 historic-memorial|@tourism en:4Memorial|monument|U+1F5FC|U+1F5FD|U+1F5FF diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 745816c37e..08886545a2 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1130,21 +1130,21 @@ amenity|vending_machine|sweets;[amenity=vending_machine][vending=sweets];;name;i deprecated|deprecated;1132;x deprecated|deprecated;1133;x deprecated|deprecated;1134;x -deprecated|deprecated;1135;x +historic|city_gate;1135; sport|padel;1136; sport|futsal;1137; sport|ice_hockey;1138; sport|field_hockey;1139; sport|badminton;1140; sport|pelota;1141; -deprecated|deprecated;1142;x -deprecated|deprecated;1143;x -deprecated|deprecated;1144;x -deprecated|deprecated;1145;x -deprecated|deprecated;1146;x -deprecated|deprecated;1147;x -deprecated|deprecated;1148;x -deprecated|deprecated;1149;x +historic|castle|castrum;[historic=castle][castle_type=castrum];;name;int_name;1142; +historic|castle|fortified_church;[historic=castle][castle_type=fortified_church];;name;int_name;1143; +historic|castle|fortress;[historic=castle][castle_type=fortress],[historic=fortress];;name;int_name;1144; +historic|castle|hillfort;[historic=castle][castle_type=hillfort];;name;int_name;1145; +historic|castle|kremlin;[historic=castle][castle_type=kremlin];;name;int_name;1146; +historic|castle|manor;[historic=castle][castle_type=manor],[historic=manor];;name;int_name;1147; +historic|castle|palace;[historic=castle][castle_type=palace];;name;int_name;1148; +historic|castle|shiro;[historic=castle][castle_type=shiro];;name;int_name;1149; hwtag|yescar;1150; hwtag|nocar;1151; tourism|gallery;1152; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 00f4878ec1..4323332af6 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -9998,72 +9998,378 @@ [type.historic.castle] en = Castle ar = قلعة - cs = Zámek + be = Замак + bg = Замък + cs = Hrad da = Slot de = Burg el = Κάστρο es = Castillo - eu = Gaztelua - fa = گردشگری + eu = Gaztelu + fa = قلعه fi = Linna - fr = Château + fr = Château fort + he = טירה hu = Kastély id = Kastel it = Castello ja = 城 ko = 성 - nb = Slott - nl = Kasteel + mr = गढी + nb = Borg + nl = Burcht pl = Zamek pt = Castelo - pt-BR = Castelo ro = Castel ru = Замок - sk = Zámok - sv = Slott + sk = Hrad + sv = Borg + sw = Ngome th = ปราสาท - tr = Kale + tr = Müstahkem şato uk = Замок - vi = Pháo đài + vi = Lâu đài zh-Hans = 城堡 zh-Hant = 城堡 + [type.historic.castle.castrum] + en = Roman fort + ar = كاسترا + be = Каструм + bg = Каструм + cs = Castrum + da = Romersk fort + de = Römisches Militärlager + el = Ρωμαϊκό κάστρο + es = Castrum + eu = Castrum + fa = قلعه رومی + fi = Castra + fr = Camp romain + he = קסטרום + hu = Castrum + id = Benteng Romawi + it = Castra + ja = カストラ + ko = 로마 요새 + mr = रोमन किल्ला + nb = Romersk fort + nl = Castra + pl = Castrum Romanum + pt = Castro + ro = Castru + ru = Каструм + sk = Kastrum + sv = Castrum + sw = Ngome ya Kirumi + th = ป้อมโรมัน + tr = Castra + uk = Каструм + vi = Pháo đài La mã + zh-Hans = 古罗马兵营 + zh-Hant = 古羅馬兵營 + [type.historic.castle.defensive] en = Castle - ar = قلعة دفاعية - cs = Zámek + ar = قلعة + be = Замак + bg = Замък + cs = Hrad da = Slot de = Burg el = Κάστρο es = Castillo - eu = Gaztelua - fa = گردشگری + eu = Gaztelu + fa = قلعه fi = Linna - fr = Château + fr = Château fort + he = טירה hu = Kastély id = Kastel it = Castello ja = 城 ko = 성 - nb = Slott - nl = Kasteel - pl = Zamek obronny - pt = Castelo defensivo - pt-BR = Castelo defensivo + mr = गढी + nb = Borg + nl = Burcht + pl = Zamek + pt = Castelo ro = Castel ru = Замок - sk = Zámok - sv = Slott + sk = Hrad + sv = Borg + sw = Ngome th = ปราสาท - tr = Kale + tr = Müstahkem şato uk = Замок - vi = Pháo đài + vi = Lâu đài zh-Hans = 城堡 zh-Hant = 城堡 + [type.historic.castle.fortified_church] + en = Fortified church + ar = الكنيسة المحصنة + be = Абарончы храм + bg = Укрепена църква + cs = Opevněný kostel + da = Befæstet kirke + de = Wehrkirche + el = Οχυρωμένη εκκλησία + es = Iglesia fortificada + eu = Eliza-gotorleku + fa = کلیسای مستحکم + fi = Linnoitettu kirkko + fr = Église fortifiée + he = כנסייה מבוצרת + hu = Erősített templom + id = Gereja yang dibentengi + it = Chiesa fortificata + ja = 要塞化された教会 + ko = 요새화된 교회 + mr = तटबंदी असलेले चर्च + nb = Befestet kirke + nl = Weerkerk + pl = Kościół obronny + pt = Igreja fortificada + ro = Biserică fortificată + ru = Укреплённая церковь + sk = Opevnený kostol + sv = Försvarskyrka + sw = Kanisa lililoimarishwa + th = โบสถ์เสริมความแข็งแกร่ง + tr = Müstahkem kilise + uk = Оборонний храм + vi = Nhà thờ kiên cố + zh-Hans = 坚固的教堂 + zh-Hant = 堅固的教堂 + + [type.historic.castle.fortress] + en = Fortress + ar = قلعة + be = Крэпасць + bg = Крепост + cs = Pevnost + da = Fæstningsværk + de = Festung + el = Φρούριο + es = Fortaleza + eu = Gotorlekua + fa = قلعه + fi = Linnoitus + fr = Forteresse + he = מִבצָר + hu = Erődrendszer + id = Benteng + it = Fortezza + ja = 要塞 + ko = 요새 + mr = किल्ला + nb = Festning + nl = Vesting + pl = Twierdza + pt = Fortaleza + ro = Cetate + ru = Крепость + sk = Pevnosť + sv = Fästning + sw = Ngome + th = ป้อม + tr = Kale + uk = Фортеця + vi = Pháo đài + zh-Hans = 要塞 + zh-Hant = 要塞 + + [type.historic.castle.hillfort] + en = Hillfort + ar = حصون التلال + be = Гарадзішча + bg = Градище + cs = Hradiště + da = Voldsted + de = Wallburg + el = Φρούριο + es = Castro + eu = Kastro + fa = تپه‌قلعه + fi = Linnavuori + fr = Colline fortifiée + he = מבצר גבעה + hu = Földvár + id = Benteng bukit + it = Fortezza di collina + ja = ヒルフォート + ko = 힐포트 + mr = हिलफोर्ट + nb = Bygdeborg + nl = Heuvelfort + pl = Grodzisko + pt = Castro + ro = Castrul de deal + ru = Городище + sk = Hradisko + sv = Fornborg + sw = Hillfort + th = ป้อมเนิน + tr = Tepe Kalesi + uk = Городище + vi = Hillfort + zh-Hans = 丘堡 + zh-Hant = 丘堡 + + [type.historic.castle.kremlin] + en = Kremlin + ar = كرملين + be = Крэмль + bg = Кремъл + cs = Kreml + da = Kreml + de = Kreml + el = Κρεμλίνο + es = Kremlin + eu = Kremlina + fa = کرملین + fi = Kreml + fr = Kremlin + he = קרמלין + hu = Kreml + id = Kremlin + it = Cremlino + ja = クレムリ + ko = 크렘린 + mr = क्रेमलिन + nb = Kreml + nl = Kremlin + pl = Kreml + pt = Kremlin + ro = Kremlin + ru = Кремль + sk = Kremeľ + sv = Kreml + sw = Kremlin + th = เครมลิน + tr = Kremlin + uk = Кремль + vi = Kremli + zh-Hans = 克里姆林 + zh-Hant = 克里姆林 + + [type.historic.castle.manor] + en = Manor house + ar = قصر مالك العزبة + be = Сядзіба + bg = Усадба + cs = Panský dům + da = Herregård + de = Herrenhaus + el = Αρχοντικό + es = Casa solariega + eu = Jauregitxo + fa = خانه ارباب یا صاحب تیول + fi = Kartano + fr = Manoir + he = אחוזה + hu = Udvarház + id = Rumah bangsawan + it = Maniero + ja = マナー・ハウス + ko = 매너하우스 + mr = मनोर घर + nb = Herregård + nl = Manoir + pl = Manoir + pt = Solar + ro = Conac + ru = Усадьба + sk = Kaštieľ + sv = Herrgård + sw = Nyumba ya manor + th = คฤหาสน์ + tr = Malikane + uk = Садиба + vi = Trang viên + zh-Hans = 庄园大屋 + zh-Hant = 莊園大屋 + + [type.historic.castle.palace] + en = Palace + ar = قصر + be = Палац + bg = Дворец + cs = Palác + da = Palads + de = Palais + el = Παλάτι + es = Palacio + eu = Jauregi + fa = کاخ + fi = Palatsi + fr = Palais + he = ארמון + hu = Palota + id = Istana + it = Palazzo + ja = 宮殿 + ko = 궁전 + mr = राजवाडा + nb = Palass + nl = Paleis + pl = Pałac + pt = Palácio + ro = Palat + ru = Дворец + sk = Palác + sv = Palats + sw = Ikulu + th = วัง + tr = Saray + uk = Палац + vi = Cung điện + zh-Hans = 宮殿 + zh-Hant = 宮殿 + + [type.historic.castle.shiro] + en = Japanese castle + ar = قلعة يابانية + be = Японскі замак + bg = Японски замък + cs = Japonský hrad + da = Japansk slot + de = Japanische Burg + el = Ιαπωνικό κάστρο + es = Castillo japonés + eu = Japoniar gaztelu + fa = قلعه ژاپنی + fi = Japanilainen linna + fr = Château japonais + he = טירה יפנית + hu = Japán várkastélyai + id = Istana Jepang + it = Castello giapponese + ja = 日本の城 + ko = 일본의 성 + mr = जपानी किल्ला + nb = Japanske borger + nl = Japans kasteel + pl = Japoński zamek + pt = Castelo japonês + ro = Castelul japonez + ru = Замки Японии + sk = Japonský hrad + sv = Japanskt slott + sw = Ngome ya Kijapani + th = ปราสาทญี่ปุ่น + tr = Japon kalesi + uk = Японський замок + vi = Lâu đài nhật bản + zh-Hans = 城 + zh-Hant = 城 + [type.historic.castle.stately] en = Castle - ar = قلعة + ar = شاتو + be = Замак + bg = Замък cs = Zámek da = Slot de = Schloss @@ -10073,26 +10379,65 @@ fa = گردشگری fi = Linna fr = Château + he = שאטו hu = Kastély id = Kastel it = Castello ja = 城 ko = 성 + mr = किल्ला nb = Slott nl = Kasteel pl = Zamek pt = Château - pt-BR = Château ro = Castel - ru = Замок + ru = Шато sk = Zámok sv = Slott + sw = Ngome th = ปราสาท - tr = Kale - uk = Замок + tr = Şato + uk = Шато vi = Pháo đài - zh-Hans = 宫殿 - zh-Hant = 宮殿 + zh-Hans = 法式城堡 + zh-Hant = 法式城堡 + + [type.historic.city_gate] + en = City gate + ar = بوابة مدينة + be = Гарадская брама + bg = Градска порта + cs = Městská brána + da = Byport + de = Stadttor + el = Πύλη της πόλης + es = Puerta de la ciudad + eu = Portale + fa = دروازه شهر + fi = Kaupungin portti + fr = Porte de ville + he = שער העיר + hu = Városi kapu + id = Gerbang kota + it = Porta cittadina + ja = 城門 + ko = 성문 + mr = शहराचा दरवाजा + nb = Byport + nl = Stadspoort + pl = Brama miejska + pt = Portas da cidade + ro = Poarta orașului + ru = Городские ворота + sk = Mestská brána + sv = Stadsport + sw = Lango la jiji + th = ประตูเมือง + tr = Şehir kapısı + uk = Міська брама + vi = Cổng thành + zh-Hans = 城门 + zh-Hant = 城門 [type.historic.citywalls] en = City Wall diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 4d69166c66..98be67ba63 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -1002,6 +1002,8 @@ node|z12-[historic=fort], area|z12-[historic=fort], node|z12-[historic=castle], area|z12-[historic=castle], +node|z13-[historic=city_gate], +area|z13-[historic=city_gate], node|z13-[historic=monument], area|z13-[historic=monument], node|z13-[tourism=museum], @@ -1092,6 +1094,16 @@ node|z18-[historic=memorial][memorial=plaque], area|z18-[historic=memorial][memorial=plaque] {icon-image: plaque.svg;icon-min-distance: 12;} +node|z13-14[historic=city_gate], +area|z13-14[historic=city_gate] +{icon-image: remains-s.svg;text-offset: 1;icon-min-distance: 12;} +node|z15[historic=city_gate], +area|z15[historic=city_gate], +{icon-image: remains-m.svg;icon-min-distance: 24;} +node|z16-[historic=city_gate], +area|z16-[historic=city_gate], +{icon-image: remains-m.svg;icon-min-distance: 12;} + node|z13-14[tourism=museum], area|z13-14[tourism=museum] {icon-image: museum-s.svg;icon-min-distance: 16;} diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 5fa68106a9..c739f891e6 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -107,6 +107,8 @@ node[tourism=attraction], area[tourism=attraction], node[historic=monument], area[historic=monument], +node[historic=city_gate], +area[historic=city_gate], node[historic=memorial], area[historic=memorial], node[tourism=theme_park], @@ -406,6 +408,8 @@ node|z15-[historic=castle], area|z15-[historic=castle], node|z15-[historic=monument], area|z15-[historic=monument], +node|z15-[historic=city_gate], +area|z15-[historic=city_gate], node|z15-[tourism=museum], area|z15-[tourism=museum], node|z15-[tourism=zoo], @@ -485,6 +489,16 @@ node|z16-[historic=memorial], area|z16-[historic=memorial], {icon-image: monument-m.svg;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +node|z13-14[historic=city_gate], +area|z13-14[historic=city_gate] +{icon-image: remains-m.svg;} +node|z15[historic=city_gate], +area|z15[historic=city_gate], +{icon-image: remains-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +node|z16-[historic=city_gate], +area|z16-[historic=city_gate], +{icon-image: remains-m.svg;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} + node|z15-[historic=memorial][memorial=plaque], area|z15-[historic=memorial][memorial=plaque], {icon-image: zero-icon.svg;text: none;}