From 60a82aed257f3edb1826a97ca6484ab0fae213c1 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Fri, 28 Oct 2022 14:46:21 +0300 Subject: [PATCH] [styles] Add historic gallows, pillory; memorial cross, stolperstein and war_memorial Signed-off-by: Lukas Kronberger Signed-off-by: Viktor Govako --- data/categories.txt | 224 ++++++++++++++++++ data/mapcss-mapping.csv | 10 +- data/replaced_tags.txt | 16 +- data/strings/types_strings.txt | 195 ++++++++++++++- data/styles/clear/include/Icons.mapcss | 74 +++--- .../clear/style-clear/symbols/cross-m.svg | 62 +++++ .../clear/style-night/symbols/cross-m.svg | 62 +++++ data/styles/vehicle/include/Icons.mapcss | 50 ++-- indexer/indexer_tests/categories_test.cpp | 4 +- 9 files changed, 636 insertions(+), 61 deletions(-) create mode 100644 data/styles/clear/style-clear/symbols/cross-m.svg create mode 100644 data/styles/clear/style-night/symbols/cross-m.svg diff --git a/data/categories.txt b/data/categories.txt index 0da78bacf0..b72c62bd07 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -3063,6 +3063,43 @@ uk:Форт zh-Hans:历史要塞 zh-Hant:歷史要塞 +historic-gallows|@tourism +en:Gallows +ar:مشنقة +be:Шыбеніца +bg:Бесилка +cs:Šibenice +da:Galge +de:3Galgen +el:Αγχόνη +es:Horca +eu:Urkamendi +fa:چوبه دار +fi:Sappeja +fr:Potence +he:גרדום +hu:Akasztófa +id:Tiang gantungan +it:Forca +ja:絞首台 +ko:교수대 +mr:फाशी +nb:Galge +nl:Galg +pl:Szubienica +pt:Forca +pt-BR:Galo +ro:Spânzurătoare +ru:Виселица +sk:Šibenica +sv:Galge +sw:Kunyongea +tr:Darağacı +uk:Шибениця +vi:Giá treo cổ +zh-Hans:绞架 +zh-Hant:絞架 + historic-memorial|@tourism en:4Memorial|monument|U+1F5FC|U+1F5FD|U+1F5FF ru:4Памятник|4мемориал @@ -3099,6 +3136,156 @@ sk:4Pomník|pamiatka|atrakcia|zaujímavosť sw:Makumbusho|kumbukumbu ya kihistoria|kivutio|utalii fa:یادبود تاریخی +historic-memorial-cross +en:Memorial cross +ar:الصليب التذكاري +be:Памятны крыж +bg:Мемориален кръст +cs:Pamětní kříž +da:Mindesmærkekors +de:Gedenkkreuz +el:Σταυρός μνήμης +es:Cruz conmemorativa +eu:Oroimenezko gurutzea +fa:صلیب یادبود +fi:Muistoristi +fr:Croix commémorative +he:צלב זיכרון +hu:Emlékkereszt +id:Salib peringatan +it:Croce commemorativa +ja:メモリアルクロス +ko:기념 십자가 +mr:मेमोरियल क्रॉस +nb:Minnekors +nl:Herdenkingskruis +pl:Krzyż pomnikowy +pt:Cruz memorial +pt-BR:Cruz de memorial +ro:Cruce comemorativă +ru:Памятный крест +sk:Pamätný kríž +sv:Kors till minne +sw:Msalaba wa kumbukumbu +th:อนุสรณ์สถานข้าม +tr:Anıt haç +uk:Пам'ятний хрест +vi:Thánh giá tưởng niệm +zh-Hans:纪念十字架 +zh-Hant:紀念十字架 + +historic-memorial-plaque +en:Commemorative plaque +ar:لوحة تذكارية +be:Памятная дошка +bg:Паметна плоча +cs:Pomník +da:Mindesmærke +de:3Gedenktafel +el:Μνημείο +es:Placa conmemorativa +eu:Oroitzapenezko plaka +fa:گردشگری +fi:Muistomerkki +fr:Plaque commémorative +he:לוחית זיכרון +hu:Emlékmű +id:Tugu peringatan +it:Memoriale +ja:銘板 +ko:기념비 +mr:फलक +nb:Minnesmerke +nl:Gedenkplaat +pl:Tablica pamiątkowa +pt:Placa comemorativa +pt-BR:Placa comemorativa +ro:Comemorare +ru:Памятная доска +sk:Pomník +sv:Minnesmärke +sw:Plaque +th:ที่ระลึก +tr:Hatıra Plaketi +uk:Дошка пам'яті +vi:Đài tưởng niệm +zh-Hans:纪念牌匾 +zh-Hant:紀念牌匾 + +historic-memorial-stolperstein +en:Stolperstein +ar:حجر عثرة +be:Камяні спатыкнення +bg:Cпънка +cs:Stolperstein +da:Stolpersten +de:3Stolperstein +el:Λίθοι Μνήμης +es:Stolperstein +eu:Stolperstein +fa:سنگ مانع +fi:Kompastuskivet +fr:Stolperstein +he:אבן נגף +hu:Botlatókő +id:Stolperstein +it:Pietre d'inciampo +ja:ストルパーシュタイン +ko:장애물 +mr:अडथळा +nb:Snublesteiner +nl:Stolperstein +pl:Kamień pamięci +pt:Stolperstein +ro:Blocaj de poticnire +ru:Камни преткновения +sk:Kameň úrazu +sv:Snubbelsten +sw:Kikwazo +th:อุปสรรค์ +tr:Tökezleyen Taşlar +uk:Камені спотикання +vi:Vấp ngã +zh-Hans:绊脚石 +zh-Hant:絆腳石 + +historic-memorial-war_memorial|@tourism +en:War memorial +ar:نصب حرب +be:Ваенны мемарыял +bg:Военен паметник +cs:Válečný památník +da:Krigsmindesmærke +de:Kriegerdenkmal +el:Μνημείο του Αγνώστου Στρατιώτη +es:Monumento a la guerra +eu:Gerra memoriala +fa:رزم‌یاد +fi:Sotamuistomerkki +fr:Monument aux morts +he:אנדרטת מלחמה +hu:Háborús emlékmű +id:Tugu peringatan perang +it:Monumento ai caduti +ja:戦争記念施設 +ko:전쟁기념관 +mr:युद्ध स्मारक +nb:Krigsminnesmerke +nl:Oorlogsmonument +pl:Pomnik wojenny +pt:Memorial de guerra +ro:Memorial de război +ru:Военный мемориал +sk:Vojnový pamätník +sv:Krigsmonument +sw:Kumbukumbu ya vita +th:อนุสรณ์สถานสงคราม +tr:Savaş anıtı +uk:Військовий меморіал +vi:Đài tưởng niệm chiến tranh +zh-Hans:战争纪念建筑 +zh-Hant:戰爭紀念建築 + historic-monument|@tourism en:4Monument|U+1F5FD|U+1F5FF ru:4Монумент @@ -3135,6 +3322,43 @@ sk:Zaujímavosť|pomník|pamiatka sw:Makumbusho|kivutio|utalii fa:بنای تاریخی +historic-pillory|@tourism +en:Pillory +ar:مشهرة +be:Пазорны слуп +bg:Позорен стълб +cs:Pranýř +da:Kag +de:Pranger +el:Κύφωνας +es:Picota +eu:Urkabe +fa:تخته‌بند +fi:Häpeäpaalu +fr:Pilori +he:עמוד הקלון +hu:Pellengér +id:Pilar +it:Gogna +ja:さらし台 +ko:칼 +mr:पिलोरी +nb:Pilry +nl:Schandpaal +pl:Pręgierz +pt:Pelourinho +ro:Stâlpul infamiei +ru:Позорный столб +sk:Pranier +sv:Skampåle +sw:Pillory +th:ประจาน +tr:Boyunduruk +uk:Ганебний стовп +vi:Thuốc viên +zh-Hans:刑柱 +zh-Hant:刑柱 + historic-ruins|@tourism en:3Ruins|U+1F5FF ru:3Руины|развалины diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 6903416c9b..6eeb9b488b 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -889,11 +889,11 @@ railway|subway|green;[railway=subway][colour=green];x;name;int_name;889;railway| railway|subway|brown;[railway=subway][colour=brown];x;name;int_name;890;railway|subway|tunnel railway|subway|yellow;[railway=subway][colour=yellow];x;name;int_name;891;railway|subway|tunnel railway|subway|purple;[railway=subway][colour=purple];x;name;int_name;892;railway|subway|tunnel -deprecated|deprecated;893;x -deprecated|deprecated;894;x -deprecated|deprecated;895;x -deprecated|deprecated;896;x -deprecated|deprecated;897;x +historic|memorial|stolperstein;[historic=memorial][memorial=stolperstein],[historic=memorial][memorial:type=stolperstein];;name;int_name;893; +historic|memorial|war_memorial;[historic=memorial][memorial=war_memorial],[historic=memorial][memorial:type=war_memorial];;name;int_name;894; +historic|memorial|cross;[historic=memorial][memorial=cross];;name;int_name;895; +historic|gallows;[historic=gallows];;name;int_name;896; +historic|pillory;[historic=pillory];;name;int_name;897; deprecated|deprecated;898;x deprecated|deprecated;899;x railway|subway|darkgreen;[railway=subway][colour=darkgreen];x;name;int_name;900;railway|subway|tunnel diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 3d52c4d4ef..5438825626 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -112,7 +112,21 @@ ruins=yes : historic=ruins historic=cannon : historic=memorial historic=technical_monument : historic=memorial historic=shield : historic=memorial -historic=war_memorial : historic=memorial + +memorial=blue_plaque : memorial=plaque +memorial=stele : memorial=sculpture +memorial=obelisk : memorial=sculpture +memorial=stone : memorial=sculpture +memorial=bust : memorial=statue +memorial=person : memorial=statue +memorial:type=plate : memorial:type=plaque + +artwork_type=mural : artwork_type=painting +artwork_type=mural_painting : artwork_type=painting +artwork_type=graffiti : artwork_type=painting +artwork_type=stone : artwork_type=sculpture +artwork_type=installation : artwork_type=sculpture +artwork_type=bust : artwork_type=statue place=allotments : place=neighbourhood diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 2d8d7e25d5..0820580c50 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -10927,6 +10927,43 @@ zh-Hans = 历史要塞 zh-Hant = 歷史要塞 + [type.historic.gallows] + en = Gallows + ar = مشنقة + be = Шыбеніца + bg = Бесилка + cs = Šibenice + da = Galge + de = Galgen + el = Αγχόνη + es = Horca + eu = Urkamendi + fa = چوبه دار + fi = Sappeja + fr = Potence + he = גרדום + hu = Akasztófa + id = Tiang gantungan + it = Forca + ja = 絞首台 + ko = 교수대 + mr = फाशी + nb = Galge + nl = Galg + pl = Szubienica + pt = Forca + pt-BR = Galo + ro = Spânzurătoare + ru = Виселица + sk = Šibenica + sv = Galge + sw = Kunyongea + tr = Darağacı + uk = Шибениця + vi = Giá treo cổ + zh-Hans = 绞架 + zh-Hant = 絞架 + [type.historic.memorial] en = Memorial ar = نصب تذكاري @@ -10959,23 +10996,67 @@ zh-Hans = 纪念物 zh-Hant = 紀念館 + [type.historic.memorial.cross] + en = Memorial cross + ar = الصليب التذكاري + be = Памятны крыж + bg = Мемориален кръст + cs = Pamětní kříž + da = Mindesmærkekors + de = Gedenkkreuz + el = Σταυρός μνήμης + es = Cruz conmemorativa + eu = Oroimenezko gurutzea + fa = صلیب یادبود + fi = Muistoristi + fr = Croix commémorative + he = צלב זיכרון + hu = Emlékkereszt + id = Salib peringatan + it = Croce commemorativa + ja = メモリアルクロス + ko = 기념 십자가 + mr = मेमोरियल क्रॉस + nb = Minnekors + nl = Herdenkingskruis + pl = Krzyż pomnikowy + pt = Cruz memorial + pt-BR = Cruz de memorial + ro = Cruce comemorativă + ru = Памятный крест + sk = Pamätný kríž + sv = Kors till minne + sw = Msalaba wa kumbukumbu + th = อนุสรณ์สถานข้าม + tr = Anıt haç + uk = Пам'ятний хрест + vi = Thánh giá tưởng niệm + zh-Hans = 纪念十字架 + zh-Hant = 紀念十字架 + [type.historic.memorial.plaque] en = Commemorative plaque ar = لوحة تذكارية + be = Памятная дошка + bg = Паметна плоча cs = Pomník da = Mindesmærke de = Gedenktafel el = Μνημείο + es = Placa conmemorativa + eu = Oroitzapenezko plaka fa = گردشگری fi = Muistomerkki fr = Plaque commémorative + he = לוחית זיכרון hu = Emlékmű id = Tugu peringatan it = Memoriale ja = 銘板 ko = 기념비 + mr = फलक nb = Minnesmerke - nl = Plaquette + nl = Gedenkplaat pl = Tablica pamiątkowa pt = Placa comemorativa pt-BR = Placa comemorativa @@ -10983,6 +11064,7 @@ ru = Памятная доска sk = Pomník sv = Minnesmärke + sw = Plaque th = ที่ระลึก tr = Hatıra Plaketi uk = Дошка пам'яті @@ -11054,6 +11136,80 @@ zh-Hans = 塑像 zh-Hant = 塑像 + [type.historic.memorial.stolperstein] + en = Stolperstein + ar = حجر عثرة + be = Камяні спатыкнення + bg = Cпънка + cs = Stolperstein + da = Stolpersten + de = Stolperstein + el = Λίθοι Μνήμης + es = Stolperstein + eu = Stolperstein + fa = سنگ مانع + fi = Kompastuskivet + fr = Stolperstein + he = אבן נגף + hu = Botlatókő + id = Stolperstein + it = Pietre d'inciampo + ja = ストルパーシュタイン + ko = 장애물 + mr = अडथळा + nb = Snublesteiner + nl = Stolperstein + pl = Kamień pamięci + pt = Stolperstein + ro = Blocaj de poticnire + ru = Камни преткновения + sk = Kameň úrazu + sv = Snubbelsten + sw = Kikwazo + th = อุปสรรค์ + tr = Tökezleyen Taşlar + uk = Камені спотикання + vi = Vấp ngã + zh-Hans = 绊脚石 + zh-Hant = 絆腳石 + + [type.historic.memorial.war_memorial] + en = War memorial + ar = نصب حرب + be = Ваенны мемарыял + bg = Военен паметник + cs = Válečný památník + da = Krigsmindesmærke + de = Kriegerdenkmal + el = Μνημείο του Αγνώστου Στρατιώτη + es = Monumento a la guerra + eu = Gerra memoriala + fa = رزم‌یاد + fi = Sotamuistomerkki + fr = Monument aux morts + he = אנדרטת מלחמה + hu = Háborús emlékmű + id = Tugu peringatan perang + it = Monumento ai caduti + ja = 戦争記念施設 + ko = 전쟁기념관 + mr = युद्ध स्मारक + nb = Krigsminnesmerke + nl = Oorlogsmonument + pl = Pomnik wojenny + pt = Memorial de guerra + ro = Memorial de război + ru = Военный мемориал + sk = Vojnový pamätník + sv = Krigsmonument + sw = Kumbukumbu ya vita + th = อนุสรณ์สถานสงคราม + tr = Savaş anıtı + uk = Військовий меморіал + vi = Đài tưởng niệm chiến tranh + zh-Hans = 战争纪念建筑 + zh-Hant = 戰爭紀念建築 + [type.historic.monument] en = Monument ar = صرح @@ -11083,6 +11239,43 @@ zh-Hans = 纪念堂 zh-Hant = 紀念碑 + [type.historic.pillory] + en = Pillory + ar = مشهرة + be = Пазорны слуп + bg = Позорен стълб + cs = Pranýř + da = Kag + de = Pranger + el = Κύφωνας + es = Picota + eu = Urkabe + fa = تخته‌بند + fi = Häpeäpaalu + fr = Pilori + he = עמוד הקלון + hu = Pellengér + id = Pilar + it = Gogna + ja = さらし台 + ko = 칼 + mr = पिलोरी + nb = Pilry + nl = Schandpaal + pl = Pręgierz + pt = Pelourinho + ro = Stâlpul infamiei + ru = Позорный столб + sk = Pranier + sv = Skampåle + sw = Pillory + th = ประจาน + tr = Boyunduruk + uk = Ганебний стовп + vi = Thuốc viên + zh-Hans = 刑柱 + zh-Hant = 刑柱 + [type.historic.ruins] en = Ruins ar = آثار diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 9cf26b40d3..2897d52aed 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -344,8 +344,6 @@ area[leisure=nature_reserve] node[tourism=artwork], area[tourism=artwork], -node[historic=memorial][memorial=plaque], -area[historic=memorial][memorial=plaque], node[tourism=attraction][attraction=animal], area[tourism=attraction][attraction=animal], {z-index: 2760;} @@ -385,6 +383,12 @@ node|z17-[tourism=artwork][artwork_type=sculpture], area|z17-[tourism=artwork][artwork_type=sculpture] {z-index: 2800;} +/* Decrease _plaque_ priority from defaults */ +node[historic=memorial][memorial=plaque], +area[historic=memorial][memorial=plaque], +node[historic=memorial][memorial=stolperstein], +area[historic=memorial][memorial=stolperstein], +{z-index: 2760;} /* OSM Hotel */ @@ -448,6 +452,8 @@ node|z17-[tourism=artwork][artwork_type=statue], area|z17-[tourism=artwork][artwork_type=statue], node|z18-[historic=memorial][memorial=plaque], area|z18-[historic=memorial][memorial=plaque], +node|z19-[historic=memorial][memorial=stolperstein], +area|z19-[historic=memorial][memorial=stolperstein], node|z18-[tourism=artwork][artwork_type=painting], area|z18-[tourism=artwork][artwork_type=painting] {z-index: 2880;} @@ -1010,6 +1016,10 @@ node|z17-[historic=wayside_shrine], area|z17-[historic=wayside_shrine], node|z17-[historic=archaeological_site], area|z17-[historic=archaeological_site], +node|z17-[historic=gallows], +area|z17-[historic=gallows], +node|z17-[historic=pillory], +area|z17-[historic=pillory], node|z17-[amenity=arts_centre], area|z17-[amenity=arts_centre], {text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-optional: true;} @@ -1060,12 +1070,23 @@ node|z16-[historic=memorial], area|z16-[historic=memorial], {icon-image: monument-m.svg;icon-min-distance: 12;} -node|z15-[historic=memorial][memorial=plaque], -area|z15-[historic=memorial][memorial=plaque], +/* Zero previous params to redefine below */ +node|z15-17[historic=memorial][memorial=plaque], +area|z15-17[historic=memorial][memorial=plaque], +node|z15-18[historic=memorial][memorial=stolperstein], +area|z15-18[historic=memorial][memorial=stolperstein], +node|z15-16[historic=memorial][memorial=cross], +area|z15-16[historic=memorial][memorial=cross], {icon-image: zero-icon.svg;text: none;} + node|z18-[historic=memorial][memorial=plaque], -area|z18-[historic=memorial][memorial=plaque] -{icon-image: plaque.svg;icon-min-distance: 12;} +area|z18-[historic=memorial][memorial=plaque], +node|z19-[historic=memorial][memorial=stolperstein], +area|z19-[historic=memorial][memorial=stolperstein], +{icon-image: plaque.svg;} +node|z17-[historic=memorial][memorial=cross], +area|z17-[historic=memorial][memorial=cross], +{icon-image: cross-m.svg;icon-min-distance: 12;} node|z13-14[historic=city_gate], area|z13-14[historic=city_gate] @@ -1126,35 +1147,24 @@ node|z16-[tourism=information][information=guidepost] node|z16-[tourism=information][information=map] {icon-image: map.svg;text-offset: 1;icon-min-distance: 10;} - -node|z16[historic=boundary_stone], -area|z16[historic=boundary_stone], -node|z16[historic=wayside_cross], -area|z16[historic=wayside_cross] +node|z16-[historic=boundary_stone], +area|z16-[historic=boundary_stone], +node|z16-[historic=gallows], +area|z16-[historic=gallows], +node|z16-[historic=pillory], +area|z16-[historic=pillory], {icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;} -node|z16[historic=ship], -area|z16[historic=ship] +node|z16-[historic=wayside_cross], +area|z16-[historic=wayside_cross], +{icon-image: cross-m.svg;font-size: 11;icon-min-distance: 8;} +node|z16-[historic=ship], +area|z16-[historic=ship], {icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;} -node|z16[historic=tomb], -area|z16[historic=tomb] +node|z16-[historic=tomb], +area|z16-[historic=tomb], {icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;} -node|z16[historic=wayside_shrine], -area|z16[historic=wayside_shrine] -{icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;} - -node|z17-[historic=boundary_stone], -area|z17-[historic=boundary_stone], -node|z17-[historic=wayside_cross], -area|z17-[historic=wayside_cross] -{icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;} -node|z17-[historic=ship], -area|z17-[historic=ship] -{icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;} -node|z17-[historic=tomb], -area|z17-[historic=tomb] -{icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;} -node|z17-[historic=wayside_shrine], -area|z17-[historic=wayside_shrine] +node|z16-[historic=wayside_shrine], +area|z16-[historic=wayside_shrine], {icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;} node|z15[tourism=artwork], diff --git a/data/styles/clear/style-clear/symbols/cross-m.svg b/data/styles/clear/style-clear/symbols/cross-m.svg new file mode 100644 index 0000000000..4bef2caebd --- /dev/null +++ b/data/styles/clear/style-clear/symbols/cross-m.svg @@ -0,0 +1,62 @@ + + + + + christian-m + + + + + + + + + christian-m + + + + diff --git a/data/styles/clear/style-night/symbols/cross-m.svg b/data/styles/clear/style-night/symbols/cross-m.svg new file mode 100644 index 0000000000..95103b06e2 --- /dev/null +++ b/data/styles/clear/style-night/symbols/cross-m.svg @@ -0,0 +1,62 @@ + + + + + christian-m + + + + + + + + + christian-m + + + + diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index bcb048150b..bb427ddc93 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -389,6 +389,10 @@ node|z16-[historic=boundary_stone], area|z16-[historic=boundary_stone], node|z16-[historic=wayside_cross], area|z16-[historic=wayside_cross], +node|z16-[historic=gallows], +area|z16-[historic=gallows], +node|z16-[historic=pillory], +area|z16-[historic=pillory], node|z16-[historic=ship], area|z16-[historic=ship], node|z16-[historic=tomb], @@ -435,18 +439,31 @@ area|z19-[historic=ruins][!name], {icon-image: remains-m.svg;} node|z13-14[historic=monument], -area|z13-14[historic=monument] +area|z13-14[historic=monument], {icon-image: monument-m.svg;} node|z15[historic=monument], area|z15[historic=monument], node|z15[historic=memorial], -area|z15[historic=memorial] -{icon-image: monument-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +area|z15[historic=memorial], +{icon-image: monument-m.svg;icon-min-distance: 24;} node|z16-[historic=monument], area|z16-[historic=monument], 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;} +{icon-image: monument-m.svg;icon-min-distance: 12;} + +/* Zero previous params to redefine below */ +node|z15-[historic=memorial][memorial=plaque], +area|z15-[historic=memorial][memorial=plaque], +node|z15-[historic=memorial][memorial=stolperstein], +area|z15-[historic=memorial][memorial=stolperstein], +node|z15-16[historic=memorial][memorial=cross], +area|z15-16[historic=memorial][memorial=cross], +{icon-image: zero-icon.svg; text: none;} + +node|z17-[historic=memorial][memorial=cross], +area|z17-[historic=memorial][memorial=cross], +{icon-image: cross-m.svg; icon-min-distance: 12;} node|z13-14[historic=city_gate], area|z13-14[historic=city_gate] @@ -458,19 +475,6 @@ 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;} -node|z16[historic=memorial][memorial=plaque], -area|z16[historic=memorial][memorial=plaque], -{icon-image: zero-icon.svg;text: none;} -node|z17[historic=memorial][memorial=plaque], -area|z17[historic=memorial][memorial=plaque] -{icon-image: zero-icon.svg;text: none;} -node|z18-[historic=memorial][memorial=plaque], -area|z18-[historic=memorial][memorial=plaque] -{icon-image: plaque.svg;icon-min-distance: 12;} - node|z15[tourism=museum], area|z15[tourism=museum] {icon-image: museum-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} @@ -505,7 +509,11 @@ node|z15-[tourism=viewpoint] node|z16[historic=boundary_stone], area|z16[historic=boundary_stone], node|z16[historic=wayside_cross], -area|z16[historic=wayside_cross] +area|z16[historic=wayside_cross], +node|z16[historic=gallows], +area|z16[historic=gallows], +node|z16[historic=pillory], +area|z16[historic=pillory] {icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;} node|z16[historic=ship], area|z16[historic=ship] @@ -520,7 +528,11 @@ area|z16[historic=wayside_shrine] node|z17-[historic=boundary_stone], area|z17-[historic=boundary_stone], node|z17-[historic=wayside_cross], -area|z17-[historic=wayside_cross] +area|z17-[historic=wayside_cross], +node|z17-[historic=gallows], +area|z17-[historic=gallows], +node|z17-[historic=pillory], +area|z17-[historic=pillory], {icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;} node|z17-[historic=ship], area|z17-[historic=ship] diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp index 2d44ffb433..58e9195c55 100644 --- a/indexer/indexer_tests/categories_test.cpp +++ b/indexer/indexer_tests/categories_test.cpp @@ -317,9 +317,7 @@ UNIT_TEST(CategoriesIndex_AllCategories) LOG(LINFO, ("Number of nodes in the CategoriesIndex trie:", index.GetNumTrieNodes())); TEST_LESS(index.GetNumTrieNodes(), 600000, ()); } -#endif -#ifdef DEBUG // A check that this data structure is not too heavy. UNIT_TEST(CategoriesIndex_AllCategoriesEnglishName) { @@ -328,6 +326,6 @@ UNIT_TEST(CategoriesIndex_AllCategoriesEnglishName) CategoriesIndex index; index.AddAllCategoriesInLang(CategoriesHolder::MapLocaleToInteger("en")); - TEST_LESS(index.GetNumTrieNodes(), 9000, ()); + TEST_LESS(index.GetNumTrieNodes(), 10000, ()); } #endif