From e63f42df1d0748d7faa36cbc8ed7308da90c4455 Mon Sep 17 00:00:00 2001
From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Fri, 17 Apr 2020 00:59:49 +0200
Subject: [PATCH] Use correct icon for historic=castle && ruins=yes

castle.png was used instead of castle_ruins.png

The existing rule further down wasn't used for this tagging because it
already matched with the first castle-only rule.
---
 mapnik/styles-otm/symbols-1.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mapnik/styles-otm/symbols-1.xml b/mapnik/styles-otm/symbols-1.xml
index 813ce127..b504524c 100644
--- a/mapnik/styles-otm/symbols-1.xml
+++ b/mapnik/styles-otm/symbols-1.xml
@@ -2,13 +2,13 @@
 	<Rule>
 		&maxscale_zoom13;
 		&minscale_zoom15;
-		<Filter>[historic] = 'castle'</Filter>
+		<Filter>([historic] = 'castle') and ([ruins] != 'yes')</Filter>
 		<MarkersSymbolizer placement="point" file="symbols-otm/castle_z13.png" transform="translate(0 -3)"/>
 	</Rule>
 	<Rule>
 		&maxscale_zoom16;
 		&minscale_zoom17;
-		<Filter>[historic] = 'castle'</Filter>
+		<Filter>([historic] = 'castle') and ([ruins] != 'yes')</Filter>
 		<MarkersSymbolizer placement="point" file="symbols-otm/castle.png" transform="translate(0 -3)"/>
 		<TextSymbolizer fontset-name="sans-oblique" size="10" fill="black" halo-radius="2" halo-fill="rgba(255,255,255,0.9)" placement="point" dy="6" wrap-width="100" wrap-before="true">[name]</TextSymbolizer>
 	</Rule>