From 8418b5f6c03e3e41b00b6afb993ac1128a2eebd5 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 5 Apr 2023 15:13:48 +0100
Subject: [PATCH 1/5] WIP - Survival Status data saving

Activate Survival Status drop down box on Age and History category. Allow it to be set, saved and visualised.
---
 app/map_styles/polygon.xml                    | 28 ++++++
 app/src/api/config/dataFields.ts              |  4 +
 .../frontend/building/data-containers/age.tsx | 69 ++++++++------
 .../frontend/config/category-maps-config.ts   | 90 +++++++++++--------
 app/src/frontend/config/data-fields-config.ts | 31 ++++++-
 app/src/frontend/config/tileserver-config.ts  |  3 +-
 app/src/tiles/dataDefinition.ts               |  8 ++
 .../extract_data/export_attributes.sql        |  3 +-
 8 files changed, 167 insertions(+), 69 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index af6e0e0e..020a1052 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -623,6 +623,34 @@
             <LineSymbolizer stroke="#888" stroke-width="3.0"/>
         </Rule>
     </Style>
+    <Style name="survival_status">
+        <Rule>
+            <Filter>[survival_status] = "Same as Historical Map (Unchanged)"</Filter>
+            <PolygonSymbolizer fill="#6ded45" />
+        </Rule>
+        <Rule>
+            <Filter>[survival_status] = "Similar to Historical Map (Some Changes)"</Filter>
+            <PolygonSymbolizer fill="#f7c725" />
+        </Rule>
+        <Rule>
+            <Filter>[survival_status] = "Historical Building Demolished"</Filter>
+            <PolygonSymbolizer fill="#ff2121" />
+        </Rule>
+        <Rule>
+            <Filter>[survival_status] = "Current Building on Previous Green Space"</Filter>
+            <PolygonSymbolizer fill="#CF26DF" />
+        </Rule>
+        <Rule>
+            <MaxScaleDenominator>17061</MaxScaleDenominator>
+            <MinScaleDenominator>4264</MinScaleDenominator>
+            <LineSymbolizer stroke="#888" stroke-width="1.0"/>
+        </Rule>
+        <Rule>
+            <MaxScaleDenominator>4264</MaxScaleDenominator>
+            <MinScaleDenominator>0</MinScaleDenominator>
+            <LineSymbolizer stroke="#888" stroke-width="3.0"/>
+        </Rule>
+    </Style>
     <Style name="likes">
         <Rule>
             <Filter>[likes] &gt;= 100</Filter>
diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index f4fd0f57..681bb467 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -296,6 +296,10 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
+    survival_status: {
+        edit: true,
+        verify: true
+    },
     likes_total: {
         edit: false,
         derivedEdit: true,
diff --git a/app/src/frontend/building/data-containers/age.tsx b/app/src/frontend/building/data-containers/age.tsx
index 16afcb52..4c70bd7a 100644
--- a/app/src/frontend/building/data-containers/age.tsx
+++ b/app/src/frontend/building/data-containers/age.tsx
@@ -20,10 +20,11 @@ import { CategoryViewProps } from './category-view-props';
 import { LogicalDataEntry } from '../data-components/logical-data-entry/logical-data-entry';
 import { useDisplayPreferences } from '../../displayPreferences-context';
 
-const HistoricalStatusOptions = [
-    'The current footprint matches/almost exactly matches the historical map beneath, and/or is known to have been built before the map was made',
-    'The building core is the same as the historical map but has had multiple additions/changes',
-    'The building no longer exists',
+const SurvivalStatusOptions = [
+    'Same as Historical Map (Unchanged)',
+    'Similar to Historical Map (Some Changes)',
+    'Historical Building Demolished',
+    'Current Building on Previous Green Space'
 ];
 
 /**
@@ -227,27 +228,33 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
             </DataEntryGroup>
             <DataEntryGroup name="Survival and Loss tracked using Historical Maps" collapsed={true} >
                 <InfoBox>
-                    This section is under development.
+                    Can you help us create a map that shows how many buildings in London have survived since the 1890s? 
+                    Choose a colour to indicate whether the building has survived.
                 </InfoBox>
                 <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                     {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
                 <SelectDataEntry
-                    title={dataFields.historical_status.title}
-                    slug="historical_status"
-                    value={""}
-                    tooltip={dataFields.historical_status.tooltip}
-                    options={HistoricalStatusOptions}
+                    title={dataFields.survival_status.title}
+                    slug="survival_status"
+                    value={props.building.survival_status}
+                    tooltip={dataFields.survival_status.tooltip}
+                    options={SurvivalStatusOptions}
                     mode={props.mode}
                     copy={props.copy}
                     onChange={props.onChange}
                 />
-                <DataEntry
-                    title="Historical land use change"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
+                <SelectDataEntry
+                    title={dataFields.survival_source.title}
+                    slug="survival_source"
+                    value={props.building.survival_source}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.survival_source.tooltip}
+                    placeholder={dataFields.survival_source.example}
+                    options={dataFields.survival_source.items}
+                    />
             </DataEntryGroup>
           </Fragment>
         );
@@ -496,27 +503,33 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
             </DataEntryGroup>
             <DataEntryGroup name="Survival and Loss tracked using Historical Maps" collapsed={true} >
                 <InfoBox>
-                    This section is under development.
+                    Can you help us create a map that shows how many buildings in London have survived since the 1890s? 
+                    Choose a colour to indicate whether the building has survived.
                 </InfoBox>
-                <button className={`map-switcher-inline ${historicData} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
+                <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                     {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
                 <SelectDataEntry
-                    title={dataFields.historical_status.title}
-                    slug="historical_status"
+                    title={dataFields.survival_status.title}
+                    slug="survival_status"
                     value={""}
-                    tooltip={dataFields.historical_status.tooltip}
-                    options={HistoricalStatusOptions}
+                    tooltip={dataFields.survival_status.tooltip}
+                    options={SurvivalStatusOptions}
                     mode={props.mode}
                     copy={props.copy}
                     onChange={props.onChange}
                 />
-                <DataEntry
-                    title="Historical land use change"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
+                <SelectDataEntry
+                    title={dataFields.survival_source.title}
+                    slug="survival_source"
+                    value={props.building.survival_source}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.survival_source.tooltip}
+                    placeholder={dataFields.survival_source.example}
+                    options={dataFields.survival_source.items}
+                    />
             </DataEntryGroup>
         </Fragment>
     );
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 79022f5d..15792762 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -24,45 +24,61 @@ export interface CategoryMapDefinition {
 export const defaultMapCategory = Category.Age;
 
 export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = {
-    [Category.Age]: [{
-        mapStyle: 'date_year',
-        legend: {
-            title: 'Age',
-            elements: [
-                { 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' },
-            ]
+    [Category.Age]: [
+        {
+            mapStyle: 'date_year',
+            legend: {
+                title: 'Age',
+                elements: [
+                    { 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' },
+                ]
+            },
         },
-    }],
-    [Category.Size]: [{
-        mapStyle: 'size_height',
-        legend: {
-            title: 'Height to apex',
-            elements: [
-                { color: '#f7f4f9', text: '0-5.55'},
-                { color: '#e7e1ef', text: '5.55-7.73'},
-                { color: '#d4b9da', text: '7.73-11.38'},
-                { color: '#c994c7', text: '11.38-18.45'},
-                { color: '#df65b0', text: '18.45-35.05'},
-                { color: '#e7298a', text: '35.05-89.30'},
-                { color: '#ce1256', text: '89.30-152'},
-                { color: '#980043', text: '≥152'}
-            ]
+        {
+            mapStyle: 'survival_status',
+            legend: {
+                title: 'Survival status',
+                elements: [
+                    { color: '#6ded45', text: 'Same as Historical Map (Unchanged)' },
+                    { color: '#f7c725', text: 'Similar to Historical Map (Some Changes)' },
+                    { color: '#ff2121', text: 'Historical Building Demolished' },
+                    { color: '#CF26DF', text: 'Current Building on Previous Green Space' },
+                ]
+            }
         },
-    }],
+    ],
+    [Category.Size]: [
+        {
+            mapStyle: 'size_height',
+            legend: {
+                title: 'Height to apex',
+                elements: [
+                    { color: '#f7f4f9', text: '0-5.55'},
+                    { color: '#e7e1ef', text: '5.55-7.73'},
+                    { color: '#d4b9da', text: '7.73-11.38'},
+                    { color: '#c994c7', text: '11.38-18.45'},
+                    { color: '#df65b0', text: '18.45-35.05'},
+                    { color: '#e7298a', text: '35.05-89.30'},
+                    { color: '#ce1256', text: '89.30-152'},
+                    { color: '#980043', text: '≥152'}
+                ]
+            },
+        }
+    ],
     [Category.Team]: [{
         mapStyle: 'team',
         legend: {
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 85838c43..f3d14402 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -460,10 +460,37 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         //tooltip: ,
     },
 
-    historical_status: {
+    survival_status: {
         category: Category.Age,
-        title: "Historical Status",
+        title: "Survival status",
         tooltip: "Survival and Loss tracked using Historical Maps",
+        items: [
+            "Same as Historical Map (Unchanged)",
+            "Similar to Historical Map (Some Changes)",
+            "Historical Building Demolished",
+            "Current Building on Previous Green Space"
+        ],
+        example: "",
+    },
+
+    survival_source: {
+        category: Category.Age,
+        title: "Source of survival information",
+        tooltip: "Source for the survival status",
+        items: [
+            "Matched by comparing maps",
+            "Checked using streetview images",
+            "Historical publication or archive document",
+            "Other"
+        ],
+        example: "",
+    },
+
+    survival_link: {
+        category: Category.Age,
+        title: "Please add any additional text or image links providing historical information on this building",
+        tooltip: "URL for age and date reference",
+        example: ["", "", ""],
     },
 
     edit_history: {
diff --git a/app/src/frontend/config/tileserver-config.ts b/app/src/frontend/config/tileserver-config.ts
index fe747581..68605511 100644
--- a/app/src/frontend/config/tileserver-config.ts
+++ b/app/src/frontend/config/tileserver-config.ts
@@ -21,7 +21,8 @@ export type BuildingMapTileset = 'date_year' |
     'building_attachment_form' |
     'landuse' |
     'dynamics_demolished_count' |
-    'team';
+    'team' |
+    'survival_status';
 
 export type SpecialMapTileset = 'base_light' | 'base_night' | 'base_night_outlines' | 'highlight' | 'number_labels' | 'base_boroughs';
 
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index d0dbfc0c..d8ef75d7 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -125,6 +125,14 @@ const LAYER_QUERIES = {
             buildings
         WHERE
             is_domestic IS NOT NULL`,
+    survival_status: `
+        SELECT
+            geometry_id,
+            survival_status
+        FROM
+            buildings
+        WHERE
+        survival_status IS NOT NULL`,
     likes: `
         SELECT
             geometry_id,
diff --git a/maintenance/extract_data/export_attributes.sql b/maintenance/extract_data/export_attributes.sql
index 4368838f..49082140 100644
--- a/maintenance/extract_data/export_attributes.sql
+++ b/maintenance/extract_data/export_attributes.sql
@@ -56,7 +56,8 @@ COPY (SELECT
     planning_historic_area_assessment_url,
     is_domestic,
     community_type_worth_keeping_total,
-    likes_total
+    likes_total,
+    survival_status
 FROM buildings)
 TO '/tmp/building_attributes.csv'
 WITH CSV HEADER

From d92456cdae3fb8a4b93df10895d49a47baa3949b Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Thu, 6 Apr 2023 15:21:41 +0100
Subject: [PATCH 2/5] Big Fix for Survival Status on some buildings

---
 app/src/frontend/building/data-containers/age.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/building/data-containers/age.tsx b/app/src/frontend/building/data-containers/age.tsx
index 4c70bd7a..e8b8d4a7 100644
--- a/app/src/frontend/building/data-containers/age.tsx
+++ b/app/src/frontend/building/data-containers/age.tsx
@@ -512,7 +512,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 <SelectDataEntry
                     title={dataFields.survival_status.title}
                     slug="survival_status"
-                    value={""}
+                    value={props.building.survival_status}
                     tooltip={dataFields.survival_status.tooltip}
                     options={SurvivalStatusOptions}
                     mode={props.mode}

From 07cb6b4846cbe390c7bc017c417a55a8e122aebc Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Thu, 6 Apr 2023 15:21:59 +0100
Subject: [PATCH 3/5] Add Survival Source

---
 app/src/api/config/dataFields.ts               | 4 ++++
 app/src/tiles/dataDefinition.ts                | 8 ++++++++
 maintenance/extract_data/export_attributes.sql | 3 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index 681bb467..f3158851 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -300,6 +300,10 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
+    survival_source: {
+        edit: true,
+        verify: true
+    },
     likes_total: {
         edit: false,
         derivedEdit: true,
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index d8ef75d7..4b5bd732 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -133,6 +133,14 @@ const LAYER_QUERIES = {
             buildings
         WHERE
         survival_status IS NOT NULL`,
+    survival_source: `
+        SELECT
+            geometry_id,
+            survival_source
+        FROM
+            buildings
+        WHERE
+        survival_source IS NOT NULL`,
     likes: `
         SELECT
             geometry_id,
diff --git a/maintenance/extract_data/export_attributes.sql b/maintenance/extract_data/export_attributes.sql
index 49082140..561ac7f2 100644
--- a/maintenance/extract_data/export_attributes.sql
+++ b/maintenance/extract_data/export_attributes.sql
@@ -57,7 +57,8 @@ COPY (SELECT
     is_domestic,
     community_type_worth_keeping_total,
     likes_total,
-    survival_status
+    survival_status,
+    survival_source
 FROM buildings)
 TO '/tmp/building_attributes.csv'
 WITH CSV HEADER

From 90af39dfafede35846414d6ab8c1f36d541e5bac Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Thu, 6 Apr 2023 15:22:15 +0100
Subject: [PATCH 4/5] Update historic maps to show Survival Status

---
 app/src/frontend/map/layers/historic-data-layer.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/frontend/map/layers/historic-data-layer.tsx b/app/src/frontend/map/layers/historic-data-layer.tsx
index 328b7a61..5d5169ea 100644
--- a/app/src/frontend/map/layers/historic-data-layer.tsx
+++ b/app/src/frontend/map/layers/historic-data-layer.tsx
@@ -3,14 +3,19 @@ import { TileLayer } from 'react-leaflet';
 import { LayerEnablementState } from '../../config/map-config';
 import { BuildingBaseLayerAllZoom } from './building-base-layer-all-zoom';
 import { useDisplayPreferences } from '../../displayPreferences-context';
+import { BuildingDataLayer } from './building-data-layer';
 
 export function HistoricDataLayer({}) {
     const { historicData } = useDisplayPreferences();
     if(historicData == "enabled") {
-        return <><TileLayer
-            url="https://mapseries-tilesets.s3.amazonaws.com/london_1890s/{z}/{x}/{y}.png"
-            attribution='&copy; CC BY 4.0 - Reproduced with the permission of the <a href="https://maps.nls.uk/">National Library of Scotland</a>'
-        /><BuildingBaseLayerAllZoom theme="night_outlines" /></>
+        return <>
+                <TileLayer
+                    url="https://mapseries-tilesets.s3.amazonaws.com/london_1890s/{z}/{x}/{y}.png"
+                    attribution='&copy; CC BY 4.0 - Reproduced with the permission of the <a href="https://maps.nls.uk/">National Library of Scotland</a>'
+                />
+                <BuildingBaseLayerAllZoom theme="night_outlines" />
+                <BuildingDataLayer tileset={'survival_status'} revisionId={''} />
+            </>
 	} else {
         return null;
     }

From f0d6d2816997ae4272bf4fdfb6eebf3d025acfe2 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Thu, 6 Apr 2023 15:43:55 +0100
Subject: [PATCH 5/5] Add Survival Status migrations

---
 migrations/038.survival_status.down.sql | 2 ++
 migrations/038.survival_status.up.sql   | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 migrations/038.survival_status.down.sql
 create mode 100644 migrations/038.survival_status.up.sql

diff --git a/migrations/038.survival_status.down.sql b/migrations/038.survival_status.down.sql
new file mode 100644
index 00000000..abb4ce65
--- /dev/null
+++ b/migrations/038.survival_status.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE buildings DROP COLUMN IF EXISTS survival_status;
+ALTER TABLE buildings DROP COLUMN IF EXISTS survival_source;
\ No newline at end of file
diff --git a/migrations/038.survival_status.up.sql b/migrations/038.survival_status.up.sql
new file mode 100644
index 00000000..7d2775e4
--- /dev/null
+++ b/migrations/038.survival_status.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS survival_status text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS survival_source text;
\ No newline at end of file