[styles] Fix showing ruins icon when castles are also ruins

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
Yannik Bloscheck
2025-10-26 16:12:03 +01:00
committed by Yannik Bloscheck
parent 2b5930dff8
commit 7bd8f8064a
4 changed files with 51 additions and 23 deletions

View File

@@ -451,28 +451,44 @@ node|z16[historic=castle],
node|z17-[historic=fort],
node|z17-[historic=castle],
{icon-image: remains-m.svg;}
node|z17-[historic=ruins][name],
{icon-image: remains-m.svg;}
node|z12-14[historic=castle][castle_type=castrum]
node|z12-14[historic=castle][castle_type=defensive]
node|z12-14[historic=castle][castle_type=fortified_church]
node|z12-14[historic=castle][castle_type=fortress]
node|z12-14[historic=castle][castle_type=hillfort]
node|z12-14[historic=castle][castle_type=kremlin]
node|z12-14[historic=castle][castle_type=shiro]
node|z12-14[historic=fort]
node|z12-14[historic=castle][castle_type=castrum],
node|z12-14[historic=castle][castle_type=defensive],
node|z12-14[historic=castle][castle_type=fortified_church],
node|z12-14[historic=castle][castle_type=fortress],
node|z12-14[historic=castle][castle_type=hillfort],
node|z12-14[historic=castle][castle_type=kremlin],
node|z12-14[historic=castle][castle_type=shiro],
node|z12-14[historic=fort],
{icon-image: castle-s.svg;}
node|z15-[historic=castle][castle_type=castrum]
node|z15-[historic=castle][castle_type=defensive]
node|z15-[historic=castle][castle_type=fortified_church]
node|z15-[historic=castle][castle_type=fortress]
node|z15-[historic=castle][castle_type=hillfort]
node|z15-[historic=castle][castle_type=kremlin]
node|z15-[historic=castle][castle_type=shiro]
node|z15-[historic=castle][castle_type=castrum],
node|z15-[historic=castle][castle_type=defensive],
node|z15-[historic=castle][castle_type=fortified_church],
node|z15-[historic=castle][castle_type=fortress],
node|z15-[historic=castle][castle_type=hillfort],
node|z15-[historic=castle][castle_type=kremlin],
node|z15-[historic=castle][castle_type=shiro],
node|z15-[historic=fort]
{icon-image: castle-m.svg;}
node|z12-14[historic=ruins][castle_type=castrum],
node|z12-14[historic=ruins][castle_type=defensive],
node|z12-14[historic=ruins][castle_type=fortified_church],
node|z12-14[historic=ruins][castle_type=fortress],
node|z12-14[historic=ruins][castle_type=hillfort],
node|z12-14[historic=ruins][castle_type=kremlin],
node|z12-14[historic=ruins][castle_type=shiro],
{icon-image: remains-s.svg;}
node|z15-[historic=ruins][castle_type=castrum],
node|z15-[historic=ruins][castle_type=defensive],
node|z15-[historic=ruins][castle_type=fortified_church],
node|z15-[historic=ruins][castle_type=fortress],
node|z15-[historic=ruins][castle_type=hillfort],
node|z15-[historic=ruins][castle_type=kremlin],
node|z15-[historic=ruins][castle_type=shiro],
node|z17-[historic=ruins][name],
{icon-image: remains-m.svg;}
node|z17-[historic=archaeological_site],
{icon-image: archaeological-site-m.svg;}

View File

@@ -114,6 +114,9 @@ natural-water-reservoir # caption z10- (also has are
barrier-toll_booth # icon z12- (also has caption(optional) z14-)
=== 6600
historic-ruins # icon z17- (also has caption(optional) z17-)
=== 6551
historic-castle # icon z12- (also has caption(optional) z12-)
historic-castle-castrum # icon z12- (also has caption(optional) z12-)
historic-castle-defensive # icon z12- (also has caption(optional) z12-)
@@ -1143,7 +1146,6 @@ amenity-prison # icon z17- (also has captio
amenity-social_facility # icon z17- (also has caption(optional) z17-, area z15-)
amenity-waste_transfer_station # icon z17- (also has caption(optional) z18-, area z13-)
highway-ladder # icon z17- and pathtext z17- (also has line z15-)
historic-ruins # icon z17- (also has caption(optional) z17-)
landuse-farmland # caption z15- (also has area z10-)
landuse-garages # caption z15- (also has area z13-)
landuse-orchard # caption z15- (also has area z12-)
@@ -1368,6 +1370,9 @@ leisure-swimming_pool-private # icon z17- (also has captio
# barrier-toll_booth # caption(optional) z14- (also has icon z12-)
# === -3400
# historic-ruins # caption(optional) z17- (also has icon z17-)
# === -3449
# historic-castle # caption(optional) z12- (also has icon z12-)
# historic-castle-castrum # caption(optional) z12- (also has icon z12-)
# historic-castle-defensive # caption(optional) z12- (also has icon z12-)
@@ -2142,7 +2147,6 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-prison # caption(optional) z17- (also has icon z17-, area z12-)
# amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-)
# amenity-waste_transfer_station # caption(optional) z18- (also has icon z17-, area z13-)
# historic-ruins # caption(optional) z17- (also has icon z17-)
# leisure-ice_rink # caption(optional) z17- (also has icon z17-)
# leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-)
# man_made-chimney # caption(optional) z18- (also has icon z16-)