From 68ae627901abc5f0d1fbdae87a26ff20b0032a8f Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Sun, 16 Feb 2020 20:44:45 +0000
Subject: [PATCH] Add outline to listed bldgs in conservation area

---
 app/map_styles/polygon.xml      | 18 ++++++++++++------
 app/src/tiles/dataDefinition.ts |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index df2ff116..41fce2f7 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -181,24 +181,30 @@
     </Style>
     <Style name="planning_combined">
         <Rule>
-            <Filter>[planning_type] = "Grade I Listed"</Filter>
+            <Filter>[planning_in_conservation_area] = true</Filter>
+            <PolygonSymbolizer fill="#95beba"/>
+        </Rule>
+        <Rule>
+            <Filter>[listing_type] = "Grade I Listed"</Filter>
             <PolygonSymbolizer fill="#c72e08"/>
         </Rule>
         <Rule>
-            <Filter>[planning_type] = "Grade II* Listed"</Filter>
+            <Filter>[listing_type] = "Grade II* Listed"</Filter>
             <PolygonSymbolizer fill="#e75b42"/>
         </Rule>
         <Rule>
-            <Filter>[planning_type] = "Grade II Listed"</Filter>
+            <Filter>[listing_type] = "Grade II Listed"</Filter>
             <PolygonSymbolizer fill="#ffbea1"/>
         </Rule>
         <Rule>
-            <Filter>[planning_type] = "Locally Listed"</Filter>
+            <Filter>[listing_type] = "Locally Listed"</Filter>
             <PolygonSymbolizer fill="#858ed4"/>
         </Rule>
         <Rule>
-            <Filter>[planning_type] = "In Conservation Area"</Filter>
-            <PolygonSymbolizer fill="#95beba"/>
+            <Filter>[listing_type] != "None" and [planning_in_conservation_area] = true</Filter>
+            <MaxScaleDenominator>68200</MaxScaleDenominator>
+            <MinScaleDenominator>0</MinScaleDenominator>
+            <LineSymbolizer stroke="#95beba" stroke-width="2.5"/>
         </Rule>
     </Style>
     <Style name="sust_dec">
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index 148f6d79..9f8a4181 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -96,10 +96,10 @@ const BUILDING_LAYER_DEFINITIONS = {
                     WHEN b.planning_list_cat = 'Listed Building' and b.planning_list_grade = 'II*' THEN 'Grade II* Listed'
                     WHEN b.planning_list_cat = 'Listed Building' and b.planning_list_grade = 'II' THEN 'Grade II Listed'
                     WHEN b.planning_in_local_list THEN 'Locally Listed'
-                    WHEN b.planning_in_conservation_area THEN 'In Conservation Area'
                     ELSE 'None'
                 END
-            ) as planning_type
+            ) as listing_type,
+            b.planning_in_conservation_area
         FROM geometries as g
         JOIN buildings as b
         ON g.geometry_id = b.geometry_id