From b168a0b331da6eb3baab3adeeabb1c7c5e06f974 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 7 Feb 2020 15:57:44 +0000
Subject: [PATCH 01/14] Adjust age map colours

---
 app/map_styles/polygon.xml      | 40 +++++----------------------------
 app/src/frontend/map/legend.tsx | 17 +++++---------
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 963f5fd2..a34ae1c7 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -154,55 +154,27 @@
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1880 and [date_year] &lt; 1900</Filter>
-            <PolygonSymbolizer fill="#bb859b" />
+            <PolygonSymbolizer fill="#961259" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1860 and [date_year] &lt; 1880</Filter>
-            <PolygonSymbolizer fill="#8b3654" />
+            <PolygonSymbolizer fill="#4855a6" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1840 and [date_year] &lt; 1860</Filter>
             <PolygonSymbolizer fill="#8f5385" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1820 and [date_year] &lt; 1840</Filter>
-            <PolygonSymbolizer fill="#56619b" />
-        </Rule>
-        <Rule>
-            <Filter>[date_year] &gt;= 1800 and [date_year] &lt; 1820</Filter>
-            <PolygonSymbolizer fill="#6793b2" />
-        </Rule>
-        <Rule>
-            <Filter>[date_year] &gt;= 1780 and [date_year] &lt; 1800</Filter>
+            <Filter>[date_year] &gt;= 1800 and [date_year] &lt; 1840</Filter>
             <PolygonSymbolizer fill="#83c3b3" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1760 and [date_year] &lt; 1780</Filter>
+            <Filter>[date_year] &gt;= 1700 and [date_year] &lt; 1800</Filter>
             <PolygonSymbolizer fill="#adc88f" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1740 and [date_year] &lt; 1760</Filter>
-            <PolygonSymbolizer fill="#83a663" />
-        </Rule>
-        <Rule>
-            <Filter>[date_year] &gt;= 1720 and [date_year] &lt; 1740</Filter>
-            <PolygonSymbolizer fill="#77852d" />
-        </Rule>
-        <Rule>
-            <Filter>[date_year] &gt;= 1700 and [date_year] &lt; 1720</Filter>
-            <PolygonSymbolizer fill="#69814e" />
-        </Rule>
-        <Rule>
-            <Filter>[date_year] &gt;= 1680 and [date_year] &lt; 1700</Filter>
-            <PolygonSymbolizer fill="#d0c291" />
-        </Rule>
-        <Rule>
-            <Filter>[date_year] &gt;= 1660 and [date_year] &lt; 1680</Filter>
-            <PolygonSymbolizer fill="#918158" />
-        </Rule>
-        <Rule>
-            <Filter>[date_year] &lt; 1660</Filter>
-            <PolygonSymbolizer fill="#7a5732" />
+            <Filter>[date_year] &lt; 1700</Filter>
+            <PolygonSymbolizer fill="#ffffff" />
         </Rule>
     </Style>
     <Style name="conservation_area">
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index 64712384..0984e351 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -51,19 +51,12 @@ const LEGEND_CONFIG = {
             { color: '#e6711d', text: '1940–1960' },
             { color: '#d73d3a', text: '1920–1940' },
             { color: '#ba221c', text: '1900–1920' },
-            { color: '#bb859b', text: '1880–1900' },
-            { color: '#8b3654', text: '1860–1880' },
+            { color: '#961259', text: '1880–1900' },
+            { color: '#4855a6', text: '1860–1880' },
             { color: '#8f5385', text: '1840–1860' },
-            { color: '#56619b', text: '1820–1840' },
-            { color: '#6793b2', text: '1800–1820' },
-            { color: '#83c3b3', text: '1780–1800' },
-            { color: '#adc88f', text: '1760–1780' },
-            { color: '#83a663', text: '1740–1760' },
-            { color: '#77852d', text: '1720–1740' },
-            { color: '#69814e', text: '1700–1720' },
-            { color: '#d0c291', text: '1680–1700' },
-            { color: '#918158', text: '1660–1680' },
-            { color: '#7a5732', text: '<1660' },
+            { color: '#83c3b3', text: '1800–1840' },
+            { color: '#adc88f', text: '1700–1800' },
+            { color: '#ffffff', text: '<1700' },
         ]
     },
     size: {

From 3c157f079fa5cfd3dd4e24fb2e050bd09ff1dcd7 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Sun, 9 Feb 2020 22:51:03 +0000
Subject: [PATCH 02/14] Add listed buildings to planning map and legend

---
 app/map_styles/polygon.xml      | 27 +++++++++++++++++++++++++++
 app/src/frontend/map/legend.tsx |  9 +++++++--
 app/src/frontend/map/map.tsx    |  2 +-
 app/src/tiles/dataDefinition.ts | 22 ++++++++++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index da299b0d..39e5df44 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -206,6 +206,33 @@
             <PolygonSymbolizer fill="#73ebaf" />
         </Rule>
     </Style>
+    <Style name="planning_combined">
+        <Rule>
+            <Filter>[planning_type] = "Grade I Listed"</Filter>
+            <PolygonSymbolizer fill="#c72e08"/>
+        </Rule>
+        <Rule>
+            <Filter>[planning_type] = "Grade II* Listed"</Filter>
+            <PolygonSymbolizer fill="#e69800"/>
+        </Rule>
+        <Rule>
+            <Filter>[planning_type] = "Grade II Listed"</Filter>
+            <PolygonSymbolizer fill="#9ebbc9"/>
+        </Rule>
+        <Rule>
+            <Filter>[planning_type] = "Locally Listed"</Filter>
+            <PolygonSymbolizer fill="#ffbea1"/>
+        </Rule>
+        <Rule>
+            <Filter>[planning_type] = "Scheduled Monument"</Filter>
+            <PolygonSymbolizer fill="#ffffff"/>
+            <LineSymbolizer />
+        </Rule>
+        <Rule>
+            <Filter>[planning_type] = "In Conservation Area"</Filter>
+            <PolygonSymbolizer fill="#aaaaaa"/>
+        </Rule>
+    </Style>
     <Style name="sust_dec">
         <Rule>
             <Filter>[sust_dec] = A</Filter>
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index 52eb01db..bc8e7a93 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -107,7 +107,12 @@ const LEGEND_CONFIG = {
     planning: {
         title: 'Planning',
         elements: [
-            { color: '#73ebaf', text: 'within conservation area' },
+            { color: '#c72e08', text: 'Grade I listed'}, 
+            { color: '#e69800', text: 'Grade II* listed'}, 
+            { color: '#9ebbc9', text: 'Grade II listed'}, 
+            { color: '#ffbea1', text: 'Locally listed'}, 
+            { color: '#ffffff', border: '1px solid #000000', text: 'Scheduled monument'}, 
+            { color: '#aaaaaa', text: 'In conservation area'}
         ]
     },
     community: {
@@ -206,7 +211,7 @@ class Legend extends React.Component<LegendProps, LegendState> {
                                 elements.map((item) => (
 
                                        <li key={item.color} >
-                                            <span className="key" style={ { background: item.color } }>-</span>
+                                            <span className="key" style={ { background: item.color, border: item.border } }>-</span>
                                             { item.text }
                                        </li>
 
diff --git a/app/src/frontend/map/map.tsx b/app/src/frontend/map/map.tsx
index 483a7ce5..5e69166e 100644
--- a/app/src/frontend/map/map.tsx
+++ b/app/src/frontend/map/map.tsx
@@ -133,7 +133,7 @@ class ColouringMap extends Component<ColouringMapProps, ColouringMapState> {
             size: 'size_height',
             location: 'location',
             like: 'likes',
-            planning: 'conservation_area',
+            planning: 'planning_combined',
             sustainability: 'sust_dec',
             type: 'building_attachment_form',
             use: 'landuse'
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index 6e557eaf..66f1933b 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -87,6 +87,28 @@ const BUILDING_LAYER_DEFINITIONS = {
             g.geometry_id = b.geometry_id
             AND b.likes_total > 0
     ) as likes`,
+    planning_combined: `(
+        SELECT
+            g.geometry_geom,
+            (
+                CASE
+                    WHEN b.planning_list_cat = 'Listed Building' and b.planning_list_grade = 'I' THEN 'Grade I Listed'
+                    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_list_cat = 'Scheduled Monument' THEN 'Scheduled Monument'
+                    WHEN b.planning_in_conservation_area THEN 'In Conservation Area'
+                    ELSE 'None'
+                END
+            ) as planning_type
+        FROM geometries as g
+        JOIN buildings as b
+        ON g.geometry_id = b.geometry_id
+        WHERE
+            b.planning_in_conservation_area
+            OR b.planning_in_local_list
+            OR b.planning_list_cat is not null
+    ) as planning_combined`,
     conservation_area: `(
         SELECT
             g.geometry_geom

From 213819859a6d627969f8ef5444c76dfe4db4e69b Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Sun, 9 Feb 2020 22:51:59 +0000
Subject: [PATCH 03/14] Disable Historic England entries in planning

---
 app/src/frontend/building/data-containers/planning.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx
index 366ac1eb..730e459a 100644
--- a/app/src/frontend/building/data-containers/planning.tsx
+++ b/app/src/frontend/building/data-containers/planning.tsx
@@ -22,7 +22,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
             copy={props.copy}
             onChange={props.onChange}
             />
-        <DataEntryGroup name="Listing and protections" >
+        <DataEntryGroup name="Listing and protections" collapsed={false} >
             <CheckboxDataEntry
                 title={dataFields.planning_in_conservation_area.title}
                 slug="planning_in_conservation_area"
@@ -44,6 +44,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 slug="planning_in_list"
                 value={props.building.planning_in_list}
                 mode={props.mode}
+                disabled={true}
                 copy={props.copy}
                 onChange={props.onChange}
                 />
@@ -52,6 +53,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 slug="planning_list_id"
                 value={props.building.planning_list_id}
                 mode={props.mode}
+                disabled={true}
                 copy={props.copy}
                 onChange={props.onChange}
                 />
@@ -60,6 +62,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 slug="planning_list_cat"
                 value={props.building.planning_list_cat}
                 mode={props.mode}
+                disabled={true}
                 copy={props.copy}
                 onChange={props.onChange}
                 options={[
@@ -75,6 +78,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 slug="planning_list_grade"
                 value={props.building.planning_list_grade}
                 mode={props.mode}
+                disabled={true}
                 copy={props.copy}
                 onChange={props.onChange}
                 options={[

From d6e86951402454e84cc13919f845a88afdc79eae Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 10 Feb 2020 18:10:00 +0000
Subject: [PATCH 04/14] Swap scheduled monument, conservation area colours

---
 app/map_styles/polygon.xml      | 7 ++++---
 app/src/frontend/map/legend.tsx | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 39e5df44..7f8fa9c4 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -225,12 +225,13 @@
         </Rule>
         <Rule>
             <Filter>[planning_type] = "Scheduled Monument"</Filter>
-            <PolygonSymbolizer fill="#ffffff"/>
-            <LineSymbolizer />
+            <PolygonSymbolizer fill="#aaaaaa"/>
+            <LineSymbolizer stroke="#eeeeee" />
         </Rule>
         <Rule>
             <Filter>[planning_type] = "In Conservation Area"</Filter>
-            <PolygonSymbolizer fill="#aaaaaa"/>
+            <PolygonSymbolizer fill="#ffffff"/>
+            <LineSymbolizer />
         </Rule>
     </Style>
     <Style name="sust_dec">
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index bc8e7a93..2e62e75d 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -111,8 +111,8 @@ const LEGEND_CONFIG = {
             { color: '#e69800', text: 'Grade II* listed'}, 
             { color: '#9ebbc9', text: 'Grade II listed'}, 
             { color: '#ffbea1', text: 'Locally listed'}, 
-            { color: '#ffffff', border: '1px solid #000000', text: 'Scheduled monument'}, 
-            { color: '#aaaaaa', text: 'In conservation area'}
+            { color: '#aaaaaa', border: '1px solid #ffffff', text: 'Scheduled monument'}, 
+            { color: '#eeeeee', border: '1px solid #000000', text: 'In conservation area'}
         ]
     },
     community: {

From 78315ed9861cb4bf39438e61f6876a4a9e3ea704 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 10 Feb 2020 21:09:03 +0000
Subject: [PATCH 05/14] Update age map colour progression

---
 app/map_styles/polygon.xml      |  9 +++++----
 app/src/frontend/map/legend.tsx | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index b60ececd..aa6bf2e6 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -146,19 +146,19 @@
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1900 and [date_year] &lt; 1920</Filter>
-            <PolygonSymbolizer fill="#ba221c" />
+            <PolygonSymbolizer fill="#8f5385" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1880 and [date_year] &lt; 1900</Filter>
-            <PolygonSymbolizer fill="#961259" />
+            <PolygonSymbolizer fill="#56619b" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1860 and [date_year] &lt; 1880</Filter>
-            <PolygonSymbolizer fill="#4855a6" />
+            <PolygonSymbolizer fill="#5591d4" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1840 and [date_year] &lt; 1860</Filter>
-            <PolygonSymbolizer fill="#8f5385" />
+            <PolygonSymbolizer fill="#6793b2" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1800 and [date_year] &lt; 1840</Filter>
@@ -171,6 +171,7 @@
         <Rule>
             <Filter>[date_year] &lt; 1700</Filter>
             <PolygonSymbolizer fill="#ffffff" />
+            <LineSymbolizer stroke="#888888" />
         </Rule>
     </Style>
     <Style name="conservation_area">
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index db5e1359..ba3d452f 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -50,13 +50,13 @@ const LEGEND_CONFIG = {
             { color: '#fbaf27', text: '1960–1980' },
             { color: '#e6711d', text: '1940–1960' },
             { color: '#d73d3a', text: '1920–1940' },
-            { color: '#ba221c', text: '1900–1920' },
-            { color: '#961259', text: '1880–1900' },
-            { color: '#4855a6', text: '1860–1880' },
-            { color: '#8f5385', text: '1840–1860' },
-            { color: '#83c3b3', text: '1800–1840' },
+            { color: '#8F5385', text: '1900–1920' },
+            { color: '#56619B', text: '1880–1900' },
+            { color: '#5591d4', text: '1860–1880' },
+            { color: '#6793B2', text: '1840–1860' },
+            { color: '#83c3b3', text: '1800–1840' }, 
             { color: '#adc88f', text: '1700–1800' },
-            { color: '#ffffff', text: '<1700' },
+            { color: '#ffffff', border: '1px solid #888888', text: '<1700' },
         ]
     },
     size: {

From 63c6c7779608402a11675757b2b70894ced218e7 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 10 Feb 2020 21:11:42 +0000
Subject: [PATCH 06/14] Update age legend labels

---
 app/src/frontend/map/legend.tsx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index ba3d452f..8cc961f7 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -46,16 +46,16 @@ const LEGEND_CONFIG = {
         title: 'Age',
         elements: [
             { color: '#f0eaba', text: '≥2000' },
-            { color: '#fae269', text: '1980–2000' },
-            { color: '#fbaf27', text: '1960–1980' },
-            { color: '#e6711d', text: '1940–1960' },
-            { color: '#d73d3a', text: '1920–1940' },
-            { color: '#8F5385', text: '1900–1920' },
-            { color: '#56619B', text: '1880–1900' },
-            { color: '#5591d4', text: '1860–1880' },
-            { color: '#6793B2', text: '1840–1860' },
-            { color: '#83c3b3', text: '1800–1840' }, 
-            { color: '#adc88f', text: '1700–1800' },
+            { color: '#fae269', text: '1980–1999' },
+            { color: '#fbaf27', text: '1960–1979' },
+            { color: '#e6711d', text: '1940–1959' },
+            { color: '#d73d3a', text: '1920–1939' },
+            { color: '#8F5385', text: '1900–1919' },
+            { color: '#56619B', text: '1880–1899' },
+            { color: '#5591d4', text: '1860–1879' },
+            { color: '#6793B2', text: '1840–1859' },
+            { color: '#83c3b3', text: '1800–1839' }, 
+            { color: '#adc88f', text: '1700–1799' },
             { color: '#ffffff', border: '1px solid #888888', text: '<1700' },
         ]
     },

From 84e4d80b3eb48386ee66e7cbba58794a2b02756b Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 10 Feb 2020 22:51:22 +0000
Subject: [PATCH 07/14] Add test colours for planning

---
 app/map_styles/polygon.xml      | 16 +++++++---------
 app/src/frontend/map/legend.tsx | 10 +++++-----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index aa6bf2e6..9e8c26e5 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -186,25 +186,23 @@
         </Rule>
         <Rule>
             <Filter>[planning_type] = "Grade II* Listed"</Filter>
-            <PolygonSymbolizer fill="#e69800"/>
+            <PolygonSymbolizer fill="#e75b42"/>
         </Rule>
         <Rule>
             <Filter>[planning_type] = "Grade II Listed"</Filter>
-            <PolygonSymbolizer fill="#9ebbc9"/>
-        </Rule>
-        <Rule>
-            <Filter>[planning_type] = "Locally Listed"</Filter>
             <PolygonSymbolizer fill="#ffbea1"/>
         </Rule>
+        <Rule>
+            <Filter>[planning_type] = "Locally Listed"</Filter>
+            <PolygonSymbolizer fill="#858ed4"/>
+        </Rule>
         <Rule>
             <Filter>[planning_type] = "Scheduled Monument"</Filter>
-            <PolygonSymbolizer fill="#aaaaaa"/>
-            <LineSymbolizer stroke="#eeeeee" />
+            <PolygonSymbolizer fill="#ffe59b"/>
         </Rule>
         <Rule>
             <Filter>[planning_type] = "In Conservation Area"</Filter>
-            <PolygonSymbolizer fill="#ffffff"/>
-            <LineSymbolizer />
+            <PolygonSymbolizer fill="#95beba"/>
         </Rule>
     </Style>
     <Style name="sust_dec">
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index 8cc961f7..078be3f7 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -101,11 +101,11 @@ const LEGEND_CONFIG = {
         title: 'Planning',
         elements: [
             { color: '#c72e08', text: 'Grade I listed'}, 
-            { color: '#e69800', text: 'Grade II* listed'}, 
-            { color: '#9ebbc9', text: 'Grade II listed'}, 
-            { color: '#ffbea1', text: 'Locally listed'}, 
-            { color: '#aaaaaa', border: '1px solid #ffffff', text: 'Scheduled monument'}, 
-            { color: '#eeeeee', border: '1px solid #000000', text: 'In conservation area'}
+            { color: '#e75b42', text: 'Grade II* listed'}, 
+            { color: '#ffbea1', text: 'Grade II listed'}, 
+            { color: '#ffe59b', text: 'Scheduled monument'}, 
+            { color: '#858ed4', text: 'Locally listed'}, 
+            { color: '#95beba', text: 'In conservation area'}
         ]
     },
     community: {

From 48de4fd645fcb283f1b8c55d839d6abea5c164c5 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 10 Feb 2020 23:38:46 +0000
Subject: [PATCH 08/14] Add disclaimer to legend

---
 app/src/frontend/map/legend.css | 8 +++++++-
 app/src/frontend/map/legend.tsx | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/frontend/map/legend.css b/app/src/frontend/map/legend.css
index f1fbbc7e..cae69b33 100644
--- a/app/src/frontend/map/legend.css
+++ b/app/src/frontend/map/legend.css
@@ -7,7 +7,8 @@
     right: 10px;
     z-index: 1000;
 
-    min-width: 12rem;
+    min-width: 14rem;
+    max-width: 14rem;
     max-height: 60%;
     
     display: flex;
@@ -63,6 +64,11 @@
 .map-legend p {
     margin: 0.25rem 0 0.5rem;
 }
+
+.map-legend .legend-disclaimer {
+    font-size: 0.8em;
+    padding:0;
+}
 .data-legend {
     overflow: auto;
     list-style: none;
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index 078be3f7..a859cb11 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -99,6 +99,7 @@ const LEGEND_CONFIG = {
     },
     planning: {
         title: 'Planning',
+        disclaimer: 'All data relating to designated buildings should be checked on the National Heritage List for England or local authority websites where used for planning or development purposes',
         elements: [
             { color: '#c72e08', text: 'Grade I listed'}, 
             { color: '#e75b42', text: 'Grade II* listed'}, 
@@ -200,6 +201,10 @@ class Legend extends React.Component<LegendProps, LegendState> {
                 {
                     elements.length?
                         <ul className={this.state.collapseList ? 'collapse data-legend' : 'data-legend'} >
+                            {
+                                details.disclaimer &&
+                                    <p className='legend-disclaimer'>{details.disclaimer}</p>
+                            }
                             {
                                 elements.map((item) => (
 

From a5556670fa49cbcaea627628088d8729af1cd645 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 10 Feb 2020 23:39:51 +0000
Subject: [PATCH 09/14] Move/rename sections in Planning

---
 .../building/data-containers/planning.tsx     | 84 ++++++++++++-------
 1 file changed, 54 insertions(+), 30 deletions(-)

diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx
index 730e459a..6a063749 100644
--- a/app/src/frontend/building/data-containers/planning.tsx
+++ b/app/src/frontend/building/data-containers/planning.tsx
@@ -1,5 +1,6 @@
 import React, { Fragment } from 'react';
 
+import InfoBox from '../../components/info-box';
 import { dataFields } from '../../data_fields';
 import CheckboxDataEntry from '../data-components/checkbox-data-entry';
 import DataEntry from '../data-components/data-entry';
@@ -22,7 +23,59 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
             copy={props.copy}
             onChange={props.onChange}
             />
-        <DataEntryGroup name="Listing and protections" collapsed={false} >
+        <DataEntryGroup name="Planning Status">
+            <CheckboxDataEntry
+                title="Is a planning application live for this site?"
+                slug="planning_live_application"
+                value={null}
+                disabled={true}
+                />
+            <CheckboxDataEntry
+                title={dataFields.planning_demolition_proposed.title}
+                slug="planning_demolition_proposed"
+                value={props.building.planning_demolition_proposed}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                disabled={true}
+                />
+            <CheckboxDataEntry
+                title="Has this application recently been been approved/refused?"
+                slug="planning_recent_outcome"
+                value={null}
+                disabled={true}
+                />
+            <CheckboxDataEntry
+                title="Has the work been carried out?"
+                slug="planning_carried_out"
+                value={null}
+                disabled={true}
+                />
+            <InfoBox msg="For historical planning applications see Planning Portal link" />
+            {/* 
+                Move to Demolition:
+
+                <CheckboxDataEntry
+                title={dataFields.planning_demolition_complete.title}
+                slug="planning_demolition_complete"
+                value={props.building.planning_demolition_complete}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                disabled={true}
+                />
+            <DataEntry
+                title={dataFields.planning_demolition_history.title}
+                slug="planning_demolition_history"
+                value={props.building.planning_demolition_history}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                disabled={true}
+                />
+            */}
+        </DataEntryGroup>
+        <DataEntryGroup name="Designation and Protection" collapsed={false} >
             <CheckboxDataEntry
                 title={dataFields.planning_in_conservation_area.title}
                 slug="planning_in_conservation_area"
@@ -177,35 +230,6 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 onChange={props.onChange}
                 />
         </DataEntryGroup>
-        <DataEntryGroup name="Demolition and demolition history">
-            <CheckboxDataEntry
-                title={dataFields.planning_demolition_proposed.title}
-                slug="planning_demolition_proposed"
-                value={props.building.planning_demolition_proposed}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                disabled={true}
-                />
-            <CheckboxDataEntry
-                title={dataFields.planning_demolition_complete.title}
-                slug="planning_demolition_complete"
-                value={props.building.planning_demolition_complete}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                disabled={true}
-                />
-            <DataEntry
-                title={dataFields.planning_demolition_history.title}
-                slug="planning_demolition_history"
-                value={props.building.planning_demolition_history}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                disabled={true}
-                />
-        </DataEntryGroup>
     </Fragment>
 );
 const PlanningContainer = withCopyEdit(PlanningView);

From 20ceb7af0a479478990e089ef3df1ccd79ff645f Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Sun, 16 Feb 2020 18:04:08 +0000
Subject: [PATCH 10/14] Clean up planning legend and map

---
 app/map_styles/polygon.xml      | 4 ----
 app/src/frontend/map/legend.tsx | 5 ++---
 app/src/tiles/dataDefinition.ts | 3 +--
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 9e8c26e5..df2ff116 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -196,10 +196,6 @@
             <Filter>[planning_type] = "Locally Listed"</Filter>
             <PolygonSymbolizer fill="#858ed4"/>
         </Rule>
-        <Rule>
-            <Filter>[planning_type] = "Scheduled Monument"</Filter>
-            <PolygonSymbolizer fill="#ffe59b"/>
-        </Rule>
         <Rule>
             <Filter>[planning_type] = "In Conservation Area"</Filter>
             <PolygonSymbolizer fill="#95beba"/>
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index a859cb11..66590d48 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -101,12 +101,11 @@ const LEGEND_CONFIG = {
         title: 'Planning',
         disclaimer: 'All data relating to designated buildings should be checked on the National Heritage List for England or local authority websites where used for planning or development purposes',
         elements: [
+            { color: '#95beba', text: 'In conservation area'},
             { color: '#c72e08', text: 'Grade I listed'}, 
             { color: '#e75b42', text: 'Grade II* listed'}, 
-            { color: '#ffbea1', text: 'Grade II listed'}, 
-            { color: '#ffe59b', text: 'Scheduled monument'}, 
+            { color: '#ffbea1', text: 'Grade II listed'},
             { color: '#858ed4', text: 'Locally listed'}, 
-            { color: '#95beba', text: 'In conservation area'}
         ]
     },
     community: {
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index 66f1933b..148f6d79 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -96,7 +96,6 @@ 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_list_cat = 'Scheduled Monument' THEN 'Scheduled Monument'
                     WHEN b.planning_in_conservation_area THEN 'In Conservation Area'
                     ELSE 'None'
                 END
@@ -108,7 +107,7 @@ const BUILDING_LAYER_DEFINITIONS = {
             b.planning_in_conservation_area
             OR b.planning_in_local_list
             OR b.planning_list_cat is not null
-    ) as planning_combined`,
+    ) as planning_combined`, 
     conservation_area: `(
         SELECT
             g.geometry_geom

From aebd90a7880edf33066a6a2b14ad213e7e9fabf1 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Sun, 16 Feb 2020 18:33:40 +0000
Subject: [PATCH 11/14] Update legend title for Planning

---
 app/src/frontend/map/legend.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index 66590d48..711fa127 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -98,7 +98,7 @@ const LEGEND_CONFIG = {
         elements: []
     },
     planning: {
-        title: 'Planning',
+        title: 'Statutory protections',
         disclaimer: 'All data relating to designated buildings should be checked on the National Heritage List for England or local authority websites where used for planning or development purposes',
         elements: [
             { color: '#95beba', text: 'In conservation area'},

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 12/14] 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

From ff703709a5cbf6ee21b1aff9ca7a81948d569903 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 17 Feb 2020 00:09:20 +0000
Subject: [PATCH 13/14] Gradate stroke width for conservation area

---
 app/map_styles/polygon.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 41fce2f7..3b17f61d 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -200,9 +200,23 @@
             <Filter>[listing_type] = "Locally Listed"</Filter>
             <PolygonSymbolizer fill="#858ed4"/>
         </Rule>
+
+        <!-- Conservation area outline -->
         <Rule>
             <Filter>[listing_type] != "None" and [planning_in_conservation_area] = true</Filter>
-            <MaxScaleDenominator>68200</MaxScaleDenominator>
+            <MaxScaleDenominator>34100</MaxScaleDenominator>
+            <MinScaleDenominator>17061</MinScaleDenominator>
+            <LineSymbolizer stroke="#95beba" stroke-width="0.5"/>
+        </Rule>
+        <Rule>
+            <Filter>[listing_type] != "None" and [planning_in_conservation_area] = true</Filter>
+            <MaxScaleDenominator>17061</MaxScaleDenominator>
+            <MinScaleDenominator>8530</MinScaleDenominator>
+            <LineSymbolizer stroke="#95beba" stroke-width="1.0"/>
+        </Rule>
+        <Rule>
+            <Filter>[listing_type] != "None" and [planning_in_conservation_area] = true</Filter>
+            <MaxScaleDenominator>8530</MaxScaleDenominator>
             <MinScaleDenominator>0</MinScaleDenominator>
             <LineSymbolizer stroke="#95beba" stroke-width="2.5"/>
         </Rule>

From 4c7edee2711aaa232886ae347df6be607f9dc5cf Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 6 Mar 2020 14:12:23 +0000
Subject: [PATCH 14/14] Update Age colours to latest style

---
 app/map_styles/polygon.xml      | 41 +++++++++++++++++++++------------
 app/src/frontend/map/legend.tsx | 27 ++++++++++++----------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 3b17f61d..e0a58044 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -125,24 +125,28 @@
     </Style>
     <Style name="date_year">
         <Rule>
-            <Filter>[date_year] &gt;= 2000</Filter>
-            <PolygonSymbolizer fill="#f0eaba" />
+            <Filter>[date_year] &gt;= 2020</Filter>
+            <PolygonSymbolizer fill="#fff9b8" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1980 and [date_year] &lt; 2000</Filter>
+            <Filter>[date_year] &gt;= 2000 and [date_year] &lt; 2020</Filter>
             <PolygonSymbolizer fill="#fae269" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1960 and [date_year] &lt; 1980</Filter>
+            <Filter>[date_year] &gt;= 1980 and [date_year] &lt; 2000</Filter>
             <PolygonSymbolizer fill="#fbaf27" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1940 and [date_year] &lt; 1960</Filter>
+            <Filter>[date_year] &gt;= 1960 and [date_year] &lt; 1980</Filter>
             <PolygonSymbolizer fill="#e6711d" />
         </Rule>
+        <Rule>
+            <Filter>[date_year] &gt;= 1940 and [date_year] &lt; 1960</Filter>
+            <PolygonSymbolizer fill="#cc1212" />
+        </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1920 and [date_year] &lt; 1940</Filter>
-            <PolygonSymbolizer fill="#d73d3a" />
+            <PolygonSymbolizer fill="#8f0303" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1900 and [date_year] &lt; 1920</Filter>
@@ -150,28 +154,35 @@
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1880 and [date_year] &lt; 1900</Filter>
-            <PolygonSymbolizer fill="#56619b" />
+            <PolygonSymbolizer fill="#c3e1eb" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1860 and [date_year] &lt; 1880</Filter>
-            <PolygonSymbolizer fill="#5591d4" />
+            <PolygonSymbolizer fill="#6a9dba" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1840 and [date_year] &lt; 1860</Filter>
-            <PolygonSymbolizer fill="#6793b2" />
+            <PolygonSymbolizer fill="#3b74a3" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1800 and [date_year] &lt; 1840</Filter>
-            <PolygonSymbolizer fill="#83c3b3" />
+            <Filter>[date_year] &gt;= 1820 and [date_year] &lt; 1840</Filter>
+            <PolygonSymbolizer fill="#95ded8" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1700 and [date_year] &lt; 1800</Filter>
-            <PolygonSymbolizer fill="#adc88f" />
+            <Filter>[date_year] &gt;= 1800 and [date_year] &lt; 1820</Filter>
+            <PolygonSymbolizer fill="#68aba5" />
+        </Rule>
+        <Rule>
+            <Filter>[date_year] &gt;= 1750 and [date_year] &lt; 1800</Filter>
+            <PolygonSymbolizer fill="#acc98f" />
+        </Rule>
+        <Rule>
+            <Filter>[date_year] &gt;= 1700 and [date_year] &lt; 1750</Filter>
+            <PolygonSymbolizer fill="#6d8a51" />
         </Rule>
         <Rule>
             <Filter>[date_year] &lt; 1700</Filter>
-            <PolygonSymbolizer fill="#ffffff" />
-            <LineSymbolizer stroke="#888888" />
+            <PolygonSymbolizer fill="#d0c291" />
         </Rule>
     </Style>
     <Style name="conservation_area">
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index 711fa127..17fcca17 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -45,18 +45,21 @@ const LEGEND_CONFIG = {
     age: {
         title: 'Age',
         elements: [
-            { color: '#f0eaba', text: '≥2000' },
-            { color: '#fae269', text: '1980–1999' },
-            { color: '#fbaf27', text: '1960–1979' },
-            { color: '#e6711d', text: '1940–1959' },
-            { color: '#d73d3a', text: '1920–1939' },
-            { color: '#8F5385', text: '1900–1919' },
-            { color: '#56619B', text: '1880–1899' },
-            { color: '#5591d4', text: '1860–1879' },
-            { color: '#6793B2', text: '1840–1859' },
-            { color: '#83c3b3', text: '1800–1839' }, 
-            { color: '#adc88f', text: '1700–1799' },
-            { color: '#ffffff', border: '1px solid #888888', text: '<1700' },
+            { color: '#fff9b8', text: '>2020' },
+            { color: '#fae269', text: '2000-2019' },
+            { color: '#fbaf27', text: '1980-1999' },
+            { color: '#e6711d', text: '1960-1979' },
+            { color: '#cc1212', text: '1940-1959' },
+            { color: '#8f0303', text: '1920-1939' },
+            { color: '#8f5385', text: '1900-1919' },
+            { color: '#c3e1eb', text: '1880-1899' },
+            { color: '#6a9dba', text: '1860-1879' },
+            { color: '#3b74a3', text: '1840-1859' },
+            { color: '#95ded8', text: '1820-1839' },
+            { color: '#68aba5', text: '1800-1819' },
+            { color: '#acc98f', text: '1750-1799' },
+            { color: '#6d8a51', text: '1700-1749' },
+            { color: '#d0c291', text: '<1700' },
         ]
     },
     size: {