diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index af55bb0959..61c36db3a0 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -822,7 +822,7 @@ barrier|cattle_grid;747;
barrier|ditch;748;
barrier|kissing_gate;749;
barrier|turnstile;750;
-deprecated|deprecated;751;x
+landuse|industrial|mine;[landuse=industrial][industrial=mine];;name;int_name;751;
deprecated|deprecated;752;x
deprecated|deprecated;753;x
deprecated|deprecated;754;x
@@ -1647,3 +1647,12 @@ leisure|amusement_arcade;1571;
amenity|place_of_worship|christian|mormon;[amenity=place_of_worship][religion=christian][denomination=mormon];;name;int_name;1572;
amenity|public_bath;1573;
amenity|vehicle_inspection;1574;
+historic|cannon;1575;
+historic|anchor;1576;
+historic|stone;1577;
+historic|aircraft;1578;
+historic|tank;1579;
+historic|mine;1580;
+historic|wreck;1581;
+historic|locomotive;1582;
+
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index 1f834e7816..08f84eb583 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -113,10 +113,15 @@ diet:vegan=only : cuisine=vegan
diet=vegan : cuisine=vegan
ruins=yes : historic=ruins
-historic=cannon : historic=memorial
historic=technical_monument : historic=memorial
historic=shield : historic=memorial
historic=fountain : amenity=fountain | u
+historic=milestone : historic=stone
+historic=rune_stone : historic=stone
+historic=ogham_stone : historic=stone
+historic=standing_stone : historic=stone
+historic=aircraft_wreck : historic=aircraft
+historic=windmill : man_made=windmill
memorial=blue_plaque : memorial=plaque
memorial=stele : memorial=sculpture
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index e77813346b..c421ffc3b5 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -12507,6 +12507,88 @@
zh-Hans = 历史地点
zh-Hant = 歷史地點
+ [type.historic.aircraft]
+ en = Historic Aircraft
+ ar = الطائرات التاريخية
+ be = Гістарычныя самалёты
+ bg = Исторически самолет
+ ca = Avions Històrics
+ cs = Historická letadla
+ da = Historiske fly
+ de = Historisches Flugzeug
+ el = Ιστορικό αεροσκάφος
+ es = Avión histórico
+ et = Ajalooline lennuk
+ eu = Hegazkin historikoa
+ fa = هواپیمای تاریخی
+ fi = Historiallinen lentokone
+ fr = Avion historique
+ he = מטוס היסטורי
+ hu = Történelmi Repülőgép
+ id = Pesawat Bersejarah
+ it = Aerei storici
+ ja = 歴史的な航空機
+ ko = "역사적인 항공기"
+ lt = Istorinis lėktuvas
+ mr = ऐतिहासिक विमान
+ nb = Historisk fly
+ nl = Historische vliegtuigen
+ pl = Historyczny samolot
+ pt = Aeronaves Históricas
+ pt-BR = Aeronaves Históricas
+ ro = Avioane istorice
+ ru = Исторический самолет
+ sk = Historické lietadlo
+ sv = Historiska flygplan
+ sw = Ndege ya kihistoria
+ th = เครื่องบินประวัติศาสตร์
+ tr = Tarihi Uçak
+ uk = Історичний літак
+ vi = Máy bay lịch sử
+ zh-Hans = 历史悠久的飞机
+ zh-Hant = 歷史悠久的飛機
+
+ [type.historic.anchor]
+ en = Historic Anchor
+ ar = مرساة تاريخية
+ be = Гістарычны якар
+ bg = Историческа котва
+ ca = Àncora històrica
+ cs = Historická kotva
+ da = Historisk anker
+ de = Historischer Anker
+ el = Ιστορική Άγκυρα
+ es = Ancla histórica
+ et = Ajalooline ankur
+ eu = Aingura Historikoa
+ fa = لنگر تاریخی
+ fi = Historiallinen ankkuri
+ fr = Ancre historique
+ he = עוגן היסטורי
+ hu = Történelmi horgony
+ id = Jangkar Bersejarah
+ it = Ancora storica
+ ja = 歴史的なアンカー
+ ko = 역사적인 앵커
+ lt = Istorinis inkaras
+ mr = ऐतिहासिक अँकर
+ nb = Historisk anker
+ nl = Historisch anker
+ pl = Historyczna kotwica
+ pt = Âncora Histórica
+ pt-BR = Âncora Histórica
+ ro = Ancoră istorică
+ ru = Исторический якорь
+ sk = Historická kotva
+ sv = Historiskt ankare
+ sw = Nanga ya kihistoria
+ th = ผู้ประกาศข่าวประวัติศาสตร์
+ tr = Tarihi Çapa
+ uk = Історичний якір
+ vi = Mỏ Neo lịch sử
+ zh-Hans = 历史锚
+ zh-Hant = 歷史錨
+
[type.historic.archaeological_site]
en = Archaeological Site
af = Argeologiese terrein
@@ -12624,6 +12706,47 @@
zh-Hans = 界碑
zh-Hant = 界碑
+ [type.historic.cannon]
+ en = Cannon
+ ar = مدفع
+ be = Гармата
+ bg = Оръдие
+ ca = Canó
+ cs = Dělo
+ da = Kanon
+ de = Kanone
+ el = Κανόνι
+ es = Cañón
+ et = Kahur
+ eu = Kanoia
+ fa = توپ
+ fi = Tykki
+ fr = Canon
+ he = תוֹתָח
+ hu = Ágyú
+ id = Meriam
+ it = Cannone
+ ja = 大砲
+ ko = 대포
+ lt = Patranka
+ mr = तोफ
+ nb = Kanon
+ nl = Kanon
+ pl = Armata
+ pt = Canhão
+ pt-BR = Canhão
+ ro = Tun
+ ru = Пушка
+ sk = Cannon
+ sv = Kanon
+ sw = Kanuni
+ th = ปืนใหญ่
+ tr = Top
+ uk = Гармата
+ vi = Pháo
+ zh-Hans = 大炮
+ zh-Hant = 大砲
+
[type.historic.castle]
en = Castle
af = Kasteel
@@ -13210,6 +13333,47 @@
zh-Hans = 绞架
zh-Hant = 絞架
+ [type.historic.locomotive]
+ en = Historic Locomotive
+ ar = قاطرة تاريخية
+ be = Гістарычны паравоз
+ bg = Исторически Локомотив
+ ca = Locomotora històrica
+ cs = Historická lokomotiva
+ da = Historisk lokomotiv
+ de = Historische Lokomotive
+ el = Ιστορική Ατμομηχανή
+ es = Locomotora histórica
+ et = Ajalooline vedur
+ eu = Lokomotora historikoa
+ fa = لوکوموتیو تاریخی
+ fi = Historiallinen veturi
+ fr = Locomotive historique
+ he = קטר היסטורי
+ hu = Történelmi mozdony
+ id = Lokomotif Bersejarah
+ it = Locomotiva storica
+ ja = 歴史的な機関車
+ ko = 역사적인 기관차
+ lt = Istorinis lokomotyvas
+ mr = ऐतिहासिक लोकोमोटिव्ह
+ nb = Historisk lokomotiv
+ nl = Historische locomotief
+ pl = Zabytkowa lokomotywa
+ pt = Locomotiva Histórica
+ pt-BR = Locomotiva Histórica
+ ro = Locomotiva istorică
+ ru = Исторический локомотив
+ sk = Historická lokomotíva
+ sv = Historiskt lok
+ sw = Locomotive ya kihistoria
+ th = หัวรถจักรประวัติศาสตร์
+ tr = Tarihi Lokomotif
+ uk = Історичний паровоз
+ vi = Đầu máy lịch sử
+ zh-Hans = 历史悠久的机车
+ zh-Hant = 歷史悠久的機車
+
[type.historic.memorial]
en = Memorial
af = Gedenkteken
@@ -13445,6 +13609,47 @@
zh-Hans = 绊脚石
zh-Hant = 絆腳石
+ [type.historic.stone]
+ en = Historic Stone
+ ar = الحجر التاريخي
+ be = Гістарычны камень
+ bg = Исторически камък
+ ca = Pedra Històrica
+ cs = Historický kámen
+ da = Historisk sten
+ de = Historischer Stein
+ el = Ιστορική Πέτρα
+ es = Piedra histórica
+ et = Ajalooline kivi
+ eu = Harri historikoa
+ fa = سنگ تاریخی
+ fi = Historiallinen kivi
+ fr = Pierre historique
+ he = אבן היסטורית
+ hu = Történelmi kő
+ id = Batu Bersejarah
+ it = Pietra storica
+ ja = 歴史的な石
+ ko = 역사적인 돌
+ lt = Istorinis akmuo
+ mr = ऐतिहासिक दगड
+ nb = Historisk stein
+ nl = Historische steen
+ pl = Historyczny kamień
+ pt = Pedra Histórica
+ pt-BR = Pedra Histórica
+ ro = Piatra istorica
+ ru = Исторический камень
+ sk = Historický kameň
+ sv = Historisk sten
+ sw = Jiwe la Kihistoria
+ th = หินประวัติศาสตร์
+ tr = Tarihi Taş
+ uk = Історичний камінь
+ vi = Đá lịch sử
+ zh-Hans = 历史之石
+ zh-Hant = 歷史之石
+
[type.historic.memorial.war_memorial]
en = War Memorial
af = Oorlogsgedenkteken
@@ -13484,6 +13689,47 @@
zh-Hans = 战争纪念建筑
zh-Hant = 戰爭紀念建築
+ [type.historic.mine]
+ en = Historic Mine
+ ar = منجم تاريخي
+ be = Гістарычная шахта
+ bg = Историческа мина
+ ca = Mina Històrica
+ cs = Historický důl
+ da = Historisk mine
+ de = Historische Mine
+ el = Ιστορικό Ορυχείο
+ es = Mina histórica
+ et = Ajalooline kaevandus
+ eu = Meategi historikoa
+ fa = معدن تاریخی
+ fi = Historiallinen kaivos
+ fr = Mine historique
+ he = מכרה היסטורי
+ hu = Történelmi Bánya
+ id = Tambang Bersejarah
+ it = Miniera storica
+ ja = 歴史ある鉱山
+ ko = 역사적인 광산
+ lt = Istorinė kasykla
+ mr = ऐतिहासिक खाण
+ nb = Historisk gruve
+ nl = Historische mijn
+ pl = Kopalnia Historyczna
+ pt = Mina Histórica
+ pt-BR = Mina Histórica
+ ro = Mina istorică
+ ru = Историческая шахта
+ sk = Historická baňa
+ sv = Historisk gruva
+ sw = Mgodi wa Kihistoria
+ th = เหมืองประวัติศาสตร์
+ tr = Tarihi Maden
+ uk = Історична шахта
+ vi = Mỏ lịch sử
+ zh-Hans = 历史矿山
+ zh-Hant = 歷史礦山
+
[type.historic.monument]
en = Monument
af = Monument
@@ -13639,6 +13885,47 @@
zh-Hans = 历史船
zh-Hant = 歷史船
+ [type.historic.tank]
+ en = Historic Tank
+ ar = الخزان التاريخي
+ be = Гістарычны танк
+ bg = Исторически танк
+ ca = Tanc històric
+ cs = Historický tank
+ da = Historisk tank
+ de = Historischer Panzer
+ el = Ιστορική δεξαμενή
+ es = Tanque histórico
+ et = Ajalooline tank
+ eu = Depositu historikoa
+ fa = تانک تاریخی
+ fi = Historiallinen tankki
+ fr = Char historique
+ he = טנק היסטורי
+ hu = Történelmi Tank
+ id = Tangki Bersejarah
+ it = Carro armato storico
+ ja = 歴史的な戦車
+ ko = 역사적인 탱크
+ lt = Istorinis tankas
+ mr = ऐतिहासिक टाकी
+ nb = Historisk tank
+ nl = Historische tank
+ pl = Historyczny czołg
+ pt = Tanque Histórico
+ pt-BR = Tanque Histórico
+ ro = Tanc istoric
+ ru = Исторический танк
+ sk = Historický tank
+ sv = Historisk tank
+ sw = Tangi ya kihistoria
+ th = รถถังประวัติศาสตร์
+ tr = Tarihi Tank
+ uk = Історичний танк
+ vi = Xe tăng lịch sử
+ zh-Hans = 历史悠久的坦克
+ zh-Hant = 歷史悠久的坦克
+
[type.historic.tomb]
en = Tomb
af = Graftombe
@@ -13756,6 +14043,47 @@
zh-Hans = 路旁神龛
zh-Hant = 路旁神龕
+ [type.historic.wreck]
+ en = Shipwreck
+ ar = حطام سفينة
+ be = Караблекрушэнне
+ bg = корабокрушение
+ ca = Naufragi
+ cs = Vrak
+ da = Forlis
+ de = Schiffswrack
+ el = Ναυάγιο
+ es = Naufragio
+ et = Laevahukk
+ eu = Naufragioa
+ fa = غرق کشتی
+ fi = Haaksirikko
+ fr = Naufrage
+ he = לְנַפֵּץ
+ hu = Hajótörés
+ id = Kecelakaan kapal
+ it = Naufragio
+ ja = 難破船
+ ko = 난파선
+ lt = Laivo avarija
+ mr = जहाजाचा नाश
+ nb = Skipsvrak
+ nl = Schipbreuk
+ pl = Wrak statku
+ pt = Naufrágio
+ pt-BR = Naufrágio
+ ro = Naufragiu
+ ru = Кораблекрушение
+ sk = Stroskotanie lode
+ sv = Förlisning
+ sw = Ajali ya meli
+ th = ซากเรืออัปปาง
+ tr = Gemi enkazı
+ uk = Корабельна аварія
+ vi = Sự chìm tàu
+ zh-Hans = 沉船
+ zh-Hant = 沉船
+
[type.hwtag]
en = hwtag
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 611f77ea6f..3dfb1fed5c 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -469,6 +469,7 @@ node|z15-[amenity=community_centre],
area|z15-[amenity=community_centre],
node|z15-[historic=memorial],
area|z15-[historic=memorial],
+node|z15-[historic=mine],
node|z15-[historic=battlefield],
area|z15-[historic=battlefield],
node|z15-[tourism=gallery],
@@ -476,13 +477,16 @@ area|z15-[tourism=gallery],
node|z15-[tourism=artwork],
node|z15-[tourism=information][information=office],
node|z15-[tourism=information][information=visitor_centre],
+node|z15-[historic=ship],
node|z16-[tourism=information],
+node|z16-[historic=aircraft],
+node|z16-[historic=tank],
+node|z16-[historic=wreck],
+node|z16-[historic=locomotive],
node|z16-[historic=boundary_stone],
area|z16-[historic=boundary_stone],
node|z16-[historic=wayside_cross],
area|z16-[historic=wayside_cross],
-node|z16-[historic=ship],
-area|z16-[historic=ship],
node|z16-[historic=tomb],
area|z16-[historic=tomb],
node|z16-[tourism=aquarium],
@@ -499,6 +503,9 @@ node|z17-[historic=pillory],
area|z17-[historic=pillory],
node|z17-[amenity=arts_centre],
area|z17-[amenity=arts_centre],
+node|z18-[historic=anchor],
+node|z18-[historic=cannon],
+node|z18-[historic=stone],
{text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
node|z12-14[historic=fort],
@@ -528,11 +535,34 @@ node|z17-[historic=archaeological_site],
area|z17-[historic=archaeological_site]
{icon-image: archaeological-site-m.svg;}
-
node|z19-[historic=ruins][!name],
area|z19-[historic=ruins][!name],
{icon-image: remains-m.svg;}
+node|z15-[historic=mine],
+{icon-image: mine-m.svg;}
+
+node|z16-[historic=aircraft],
+{icon-image: aircraft-m.svg;}
+
+node|z16-[historic=tank],
+{icon-image: tank-m.svg;}
+
+node|z16-[historic=wreck],
+{icon-image: wreck-m.svg;}
+
+node|z16-[historic=locomotive],
+{icon-image: locomotive-m.svg;}
+
+node|z18-[historic=cannon],
+{icon-image: cannon-m.svg;}
+
+node|z18-[historic=anchor],
+{icon-image: anchor-m.svg;}
+
+node|z18-[historic=stone],
+{icon-image: stone-m.svg;}
+
node|z13-14[historic=monument],
area|z13-14[historic=monument]
{icon-image: monument-s.svg;text-offset: 1;icon-min-distance: 12;}
@@ -644,8 +674,7 @@ area|z16-[historic=pillory],
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],
+node|z15-[historic=ship],
{icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;}
node|z16-[historic=tomb],
area|z16-[historic=tomb],
@@ -873,6 +902,10 @@ area|z14-[man_made=lighthouse],
node|z15-[amenity=hospital],
node|z15-[landuse=landfill],
area|z15-[landuse=landfill],
+node|z15-[landuse=quarry],
+area|z15-[landuse=quarry],
+node|z15-[landuse=industrial][industrial=mine],
+area|z15-[landuse=industrial][industrial=mine],
node|z15-[barrier=border_control],
node|z16-[building=hospital],
area|z16-[building=hospital],
@@ -1448,6 +1481,12 @@ node|z15-[landuse=landfill],
area|z15-[landuse=landfill]
{icon-image: waste-basket-m.svg;text-offset: 1;font-size: 10;}
+node|z15-[landuse=quarry],
+area|z15-[landuse=quarry],
+node|z15-[landuse=industrial][industrial=mine],
+area|z15-[landuse=industrial][industrial=mine]
+{icon-image: mine-m.svg;text-offset: 1;font-size: 10;}
+
node|z16-[leisure=water_park],
area|z16-[leisure=water_park]
{icon-image: swimming-m.svg;icon-min-distance: 30;}
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 de98571a70..3d79096912 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
@@ -128,7 +128,8 @@ landuse-forest-mixed # area z10- (also has icon z
landuse-churchyard # area z15-
landuse-construction # area z15- (also has caption z15-)
landuse-industrial # area z15- (also has caption z15-)
-landuse-quarry # area z15- (also has caption z15-)
+landuse-industrial-mine # area z15- (also has icon z15-, caption(optional) z15-)
+landuse-quarry # area z15- (also has icon z15-, caption(optional) z15-)
landuse-railway # area z15- (also has caption z15-)
=== 50
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 86b56dd99c..349874fd0b 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -365,6 +365,21 @@ leisure-park-permissive # icon z14- (also has captio
natural-cave_entrance # icon z11- (also has caption(optional) z11-)
=== 5050
+historic-aircraft # icon z16- (also has caption(optional) z16-)
+historic-battlefield # icon z15- (also has caption(optional) z15-)
+historic-locomotive # icon z16- (also has caption(optional) z16-)
+historic-memorial-sculpture # icon z15- (also has caption(optional) z15-)
+historic-memorial-statue # icon z15- (also has caption(optional) z15-)
+historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-)
+historic-tank # icon z16- (also has caption(optional) z16-)
+historic-wreck # icon z16- (also has caption(optional) z16-)
+tourism-artwork # icon z15- (also has caption(optional) z15-)
+tourism-artwork-architecture # icon z15- (also has caption(optional) z15-)
+tourism-artwork-painting # icon z15- (also has caption(optional) z15-)
+tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-)
+tourism-artwork-statue # icon z15- (also has caption(optional) z15-)
+=== 5025
+
tourism-attraction # icon z14- (also has caption(optional) z14-)
=== 5000
@@ -425,18 +440,7 @@ tourism-information-office # icon z15- (also has captio
tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-)
=== 4300
-historic-battlefield # icon z15- (also has caption(optional) z15-)
historic-memorial # icon z15- (also has caption(optional) z15-)
-historic-memorial-sculpture # icon z15- (also has caption(optional) z15-)
-historic-memorial-statue # icon z15- (also has caption(optional) z15-)
-historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-)
-tourism-artwork # icon z15- (also has caption(optional) z15-)
-tourism-artwork-architecture # icon z15- (also has caption(optional) z15-)
-tourism-artwork-painting # icon z15- (also has caption(optional) z15-)
-tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-)
-tourism-artwork-statue # icon z15- (also has caption(optional) z15-)
-=== 4250
-
tourism-attraction-animal # icon z14- (also has caption(optional) z14-)
tourism-attraction-specified # icon z14- (also has caption(optional) z14-)
=== 4200
@@ -716,7 +720,8 @@ highway-tertiary_link-bridge # pathtext z18- (also has li
highway-tertiary_link-tunnel # pathtext z18- (also has line z15-, line(casing) z16-)
=== 2950
-historic-ship # icon z16- (also has caption(optional) z16-)
+historic-mine # icon z15- (also has caption(optional) z15-)
+historic-ship # icon z15- (also has caption(optional) z15-)
natural-water-basin # caption z10- (also has area z1-)
natural-water-ditch # caption z17- (also has area z13-)
natural-water-drain # caption z17- (also has area z13-)
@@ -956,8 +961,9 @@ leisure-park-private # icon z14- (also has captio
landuse-construction # caption z15- (also has area z15-)
landuse-farmyard # caption z15- (also has area z10-)
landuse-industrial # caption z15- (also has area z15-)
+landuse-industrial-mine # icon z15- (also has caption(optional) z15-, area z15-)
landuse-landfill # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-quarry # caption z15- (also has area z15-)
+landuse-quarry # icon z15- (also has caption(optional) z15-, area z15-)
landuse-railway # caption z15- (also has area z15-)
=== 1800
@@ -1166,9 +1172,6 @@ leisure-recreation_ground # caption z17-
leisure-slipway # caption z17-
=== 650
-historic-memorial-plaque # icon z18- (also has caption(optional) z18-)
-=== 600
-
amenity-atm # icon z18- (also has caption(optional) z18-)
amenity-brothel # icon z18- (also has caption(optional) z18-)
amenity-car_rental # icon z18- (also has caption(optional) z18-)
@@ -1251,6 +1254,15 @@ building-garage # caption z16- (also has are
building-has_parts # caption z16- (also has area z14-)
=== 230
+entrance-main # icon z18- (also has caption(optional) z18-)
+=== 220
+
+historic-anchor # icon z18- (also has caption(optional) z18-)
+historic-cannon # icon z18- (also has caption(optional) z18-)
+historic-memorial-plaque # icon z18- (also has caption(optional) z18-)
+historic-stone # icon z18- (also has caption(optional) z18-)
+=== 210
+
amenity-post_box # icon z18- (also has caption(optional) z18-)
amenity-recycling-container # icon z17- (also has caption(optional) z19-)
building-address # caption z16-
@@ -1258,9 +1270,6 @@ historic-memorial-stolperstein # icon z19- (also has captio
leisure-garden-residential # caption z18- (also has area z12-)
=== 200
-entrance-main # icon z18- (also has caption(optional) z18-)
-=== 170
-
amenity-parking-fee-lane # icon z18- (also has caption(optional) z18-, area z17-)
amenity-parking-fee-street_side # icon z18- (also has caption(optional) z18-, area z17-)
amenity-parking-lane # icon z18- (also has caption(optional) z18-, area z17-)
@@ -1509,6 +1518,21 @@ amenity-parking-private # icon z18- (also has captio
# natural-cave_entrance # caption(optional) z11- (also has icon z11-)
# === -4950
+# historic-aircraft # caption(optional) z16- (also has icon z16-)
+# historic-battlefield # caption(optional) z15- (also has icon z15-)
+# historic-locomotive # caption(optional) z16- (also has icon z16-)
+# historic-memorial-sculpture # caption(optional) z15- (also has icon z15-)
+# historic-memorial-statue # caption(optional) z15- (also has icon z15-)
+# historic-memorial-war_memorial # caption(optional) z15- (also has icon z15-)
+# historic-tank # caption(optional) z16- (also has icon z16-)
+# historic-wreck # caption(optional) z16- (also has icon z16-)
+# tourism-artwork # caption(optional) z15- (also has icon z15-)
+# tourism-artwork-architecture # caption(optional) z15- (also has icon z15-)
+# tourism-artwork-painting # caption(optional) z15- (also has icon z15-)
+# tourism-artwork-sculpture # caption(optional) z15- (also has icon z15-)
+# tourism-artwork-statue # caption(optional) z15- (also has icon z15-)
+# === -4975
+
# tourism-attraction # caption(optional) z14- (also has icon z14-)
# === -5000
@@ -1545,18 +1569,7 @@ amenity-parking-private # icon z18- (also has captio
# tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-)
# === -5700
-# historic-battlefield # caption(optional) z15- (also has icon z15-)
# historic-memorial # caption(optional) z15- (also has icon z15-)
-# historic-memorial-sculpture # caption(optional) z15- (also has icon z15-)
-# historic-memorial-statue # caption(optional) z15- (also has icon z15-)
-# historic-memorial-war_memorial # caption(optional) z15- (also has icon z15-)
-# tourism-artwork # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-architecture # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-painting # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-sculpture # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-statue # caption(optional) z15- (also has icon z15-)
-# === -5750
-
# tourism-attraction-animal # caption(optional) z14- (also has icon z14-)
# tourism-attraction-specified # caption(optional) z14- (also has icon z14-)
# === -5800
@@ -1726,7 +1739,8 @@ amenity-parking-private # icon z18- (also has captio
# amenity-fountain # caption(optional) z16- (also has icon z16-, area z16-)
# === -6950
-# historic-ship # caption(optional) z16- (also has icon z16-)
+# historic-mine # caption(optional) z15- (also has icon z15-)
+# historic-ship # caption(optional) z15- (also has icon z15-)
# === -7100
# amenity-shelter # caption(optional) z16- (also has icon z16-)
@@ -1891,7 +1905,9 @@ amenity-parking-private # icon z18- (also has captio
# leisure-park-private # caption(optional) z14- (also has icon z14-, area z10-)
# === -8150
+# landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z15-)
# landuse-landfill # caption(optional) z15- (also has icon z15-, area z15-)
+# landuse-quarry # caption(optional) z15- (also has icon z15-, area z15-)
# === -8200
# historic-memorial-cross # caption(optional) z17- (also has icon z17-)
@@ -2043,9 +2059,6 @@ amenity-parking-private # icon z18- (also has captio
# leisure-sports_centre # caption(optional) z17- (also has icon z17-)
# === -9150
-# historic-memorial-plaque # caption(optional) z18- (also has icon z18-)
-# === -9400
-
# amenity-atm # caption(optional) z18- (also has icon z18-)
# amenity-brothel # caption(optional) z18- (also has icon z18-)
# amenity-car_rental # caption(optional) z18- (also has icon z18-)
@@ -2123,14 +2136,20 @@ amenity-parking-private # icon z18- (also has captio
# amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-)
# === -9750
+# entrance-main # caption(optional) z18- (also has icon z18-)
+# === -9780
+
+# historic-anchor # caption(optional) z18- (also has icon z18-)
+# historic-cannon # caption(optional) z18- (also has icon z18-)
+# historic-memorial-plaque # caption(optional) z18- (also has icon z18-)
+# historic-stone # caption(optional) z18- (also has icon z18-)
+# === -9790
+
# amenity-post_box # caption(optional) z18- (also has icon z18-)
# amenity-recycling-container # caption(optional) z19- (also has icon z17-)
# historic-memorial-stolperstein # caption(optional) z19- (also has icon z19-)
# === -9800
-# entrance-main # caption(optional) z18- (also has icon z18-)
-# === -9830
-
# amenity-parking-fee-lane # caption(optional) z18- (also has icon z18-, area z17-)
# amenity-parking-fee-street_side # caption(optional) z18- (also has icon z18-, area z17-)
# amenity-parking-lane # caption(optional) z18- (also has icon z18-, area z17-)
diff --git a/data/styles/clear/style-clear/symbols/aircraft-m.svg b/data/styles/clear/style-clear/symbols/aircraft-m.svg
new file mode 100644
index 0000000000..f2605ee2db
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/aircraft-m.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/clear/style-clear/symbols/anchor-m.svg b/data/styles/clear/style-clear/symbols/anchor-m.svg
new file mode 100644
index 0000000000..b18c529ccc
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/anchor-m.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/clear/style-clear/symbols/cannon-m.svg b/data/styles/clear/style-clear/symbols/cannon-m.svg
new file mode 100644
index 0000000000..da5c703499
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/cannon-m.svg
@@ -0,0 +1,15 @@
+
+
diff --git a/data/styles/clear/style-clear/symbols/locomotive-m.svg b/data/styles/clear/style-clear/symbols/locomotive-m.svg
new file mode 100644
index 0000000000..bf6bfba053
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/locomotive-m.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/clear/style-clear/symbols/mine-m.svg b/data/styles/clear/style-clear/symbols/mine-m.svg
new file mode 100644
index 0000000000..e860f8e242
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/mine-m.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/data/styles/clear/style-clear/symbols/stone-m.svg b/data/styles/clear/style-clear/symbols/stone-m.svg
new file mode 100644
index 0000000000..62e0cd3ad4
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/stone-m.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/clear/style-clear/symbols/tank-m.svg b/data/styles/clear/style-clear/symbols/tank-m.svg
new file mode 100644
index 0000000000..86d934696a
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/tank-m.svg
@@ -0,0 +1,16 @@
+
+
diff --git a/data/styles/clear/style-clear/symbols/wreck-m.svg b/data/styles/clear/style-clear/symbols/wreck-m.svg
new file mode 100644
index 0000000000..3db0d0ea72
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/wreck-m.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/aircraft-m.svg b/data/styles/clear/style-night/symbols/aircraft-m.svg
new file mode 100644
index 0000000000..7ed4bedb69
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/aircraft-m.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/anchor-m.svg b/data/styles/clear/style-night/symbols/anchor-m.svg
new file mode 100644
index 0000000000..068bf5293a
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/anchor-m.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/cannon-m.svg b/data/styles/clear/style-night/symbols/cannon-m.svg
new file mode 100644
index 0000000000..6d9cb7878d
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/cannon-m.svg
@@ -0,0 +1,15 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/locomotive-m.svg b/data/styles/clear/style-night/symbols/locomotive-m.svg
new file mode 100644
index 0000000000..6fce9a8827
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/locomotive-m.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/mine-m.svg b/data/styles/clear/style-night/symbols/mine-m.svg
new file mode 100644
index 0000000000..1579d0ad29
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/mine-m.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/stone-m.svg b/data/styles/clear/style-night/symbols/stone-m.svg
new file mode 100644
index 0000000000..9b0f39859b
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/stone-m.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/tank-m.svg b/data/styles/clear/style-night/symbols/tank-m.svg
new file mode 100644
index 0000000000..2867941e2a
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/tank-m.svg
@@ -0,0 +1,16 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/wreck-m.svg b/data/styles/clear/style-night/symbols/wreck-m.svg
new file mode 100644
index 0000000000..455ddc4bcf
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/wreck-m.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
index 0ae66b9c05..a341566415 100644
--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -86,6 +86,7 @@ landuse-forest-mixed # area z10- (also has icon z
landuse-churchyard # area z15-
landuse-construction # area z15-
landuse-industrial # area z15-
+landuse-industrial-mine # area z15-
landuse-landfill # area z15- (also has caption z15-)
landuse-quarry # area z15- (also has caption z15-)
landuse-railway # area z15- (also has caption z15-)