From 79adb2d49d59fe8081382cf58142fa06349cdb50 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 25 Jul 2023 17:05:20 +0100
Subject: [PATCH 01/12] New Keys for Typology category

- Keys for all subcategories (except original building use)
- Buttons to change key/visible layer

Re: Issue #1212
---
 app/map_styles/polygon.xml                    | 151 ++++++++++++++++++
 .../building/data-containers/typology.tsx     |  56 +++++++
 .../frontend/config/category-maps-config.ts   |  76 +++++++--
 app/src/frontend/config/data-fields-config.ts |   2 +-
 app/src/frontend/config/tileserver-config.ts  |   5 +-
 app/src/tiles/dataDefinition.ts               |  21 +++
 6 files changed, 298 insertions(+), 13 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 652f698d..d90205d5 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -973,4 +973,155 @@
             <PolygonSymbolizer fill="#ffe8a9" />
         </Rule>
     </Style>
+    <Style name="typology_classification">
+        <Rule>
+            <Filter>[typology_classification] = "Low-rise: Not part of a group/cluster (1-3 core floors- excluding extensions)"</Filter>
+            <PolygonSymbolizer fill="#F2E5FF" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_classification] = "Low-rise: Part of dense block/row/terrace"</Filter>
+            <PolygonSymbolizer fill="#CBABEA" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_classification] = "Low-rise: Part of group of widely spaced blocks (includes semi-detached houses)"</Filter>
+            <PolygonSymbolizer fill="#A272D4" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_classification] = "Mid-rise: Not part of a group/cluster (4-7 core floors)"</Filter>
+            <PolygonSymbolizer fill="#7939BE" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_classification] = "Mid-rise: Part of group of densely spaced blocks"</Filter>
+            <PolygonSymbolizer fill="#5000A8" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_classification] = "Mid-rise: Part of group of widely spaced blocks"</Filter>
+            <PolygonSymbolizer fill="#3F0086" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_classification] = "High rise: Not part of a group/cluster"</Filter>
+            <PolygonSymbolizer fill="#2E0062" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_classification] = "High-rise: Part of group of densely spaced blocks (8 + core floors)"</Filter>
+            <PolygonSymbolizer fill="#1D003E" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_classification] = "High-rise: Part of group of widely spaced blocks"</Filter>
+            <PolygonSymbolizer fill="#0C001A" />
+        </Rule>
+
+        <Rule>
+            <MaxScaleDenominator>17061</MaxScaleDenominator>
+            <MinScaleDenominator>4264</MinScaleDenominator>
+            <LineSymbolizer stroke="#888" stroke-width="0.8"/>
+        </Rule>
+        <Rule>
+            <MaxScaleDenominator>4264</MaxScaleDenominator>
+            <MinScaleDenominator>0</MinScaleDenominator>
+            <LineSymbolizer stroke="#888" stroke-width="2.0"/>
+        </Rule>
+    </Style>
+    <Style name="typology_style_period">
+        <Rule>
+            <Filter>[typology_style_period] = "Roman (43AD-410)"</Filter>
+            <PolygonSymbolizer fill="#00B2CB" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "Early Medieval (410-1066)"</Filter>
+            <PolygonSymbolizer fill="#00A9C6" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "Mid-Late Medieval (1066-1485)"</Filter>
+            <PolygonSymbolizer fill="#00A0C1" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "Tudor (1485-1603)"</Filter>
+            <PolygonSymbolizer fill="#0097BC" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "Stuart (1603 -1714)"</Filter>
+            <PolygonSymbolizer fill="#008EB7" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "Georgian/William IV (1714-1837)"</Filter>
+            <PolygonSymbolizer fill="#0085B2" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "Victorian (1837-1901)"</Filter>
+            <PolygonSymbolizer fill="#007CAD" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "Edwardian (1901-1914)"</Filter>
+            <PolygonSymbolizer fill="#0073A8" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "World War I (1914-18)"</Filter>
+            <PolygonSymbolizer fill="#006AA3" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "Interwar (1918-39)"</Filter>
+            <PolygonSymbolizer fill="#00619E" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "World War II (1939-45)"</Filter>
+            <PolygonSymbolizer fill="#005899" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "Post war (1945-1975)"</Filter>
+            <PolygonSymbolizer fill="#004F94" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "Postmodern (1975-1990)"</Filter>
+            <PolygonSymbolizer fill="#00468F" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "1990s"</Filter>
+            <PolygonSymbolizer fill="#003D8A" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "2000s/2010s"</Filter>
+            <PolygonSymbolizer fill="#003485" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_style_period] = "2020s"</Filter>
+            <PolygonSymbolizer fill="#002C7C" />
+        </Rule>
+
+        <Rule>
+            <MaxScaleDenominator>17061</MaxScaleDenominator>
+            <MinScaleDenominator>4264</MinScaleDenominator>
+            <LineSymbolizer stroke="#888" stroke-width="0.8"/>
+        </Rule>
+        <Rule>
+            <MaxScaleDenominator>4264</MaxScaleDenominator>
+            <MinScaleDenominator>0</MinScaleDenominator>
+            <LineSymbolizer stroke="#888" stroke-width="2.0"/>
+        </Rule>
+    </Style>
+    <Style name="typology_dynamic_classification">
+        <Rule>
+            <Filter>[typology_dynamic_classification] = "Small fairly regular plot part of repetitive domestic streets"</Filter>
+            <PolygonSymbolizer fill="#F2E5FF" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_dynamic_classification] = "Irregular shaped plots built along the edge of long established routes (e.g high streets)"</Filter>
+            <PolygonSymbolizer fill="#CBABEA" />
+        </Rule>
+        <Rule>
+            <Filter>[typology_dynamic_classification] = "Large plot with internal access roads (e.g. infrastructure hubs/large institution such as hospitals/universities/airports)"</Filter>
+            <PolygonSymbolizer fill="#A272D4" />
+        </Rule>
+
+        <Rule>
+            <MaxScaleDenominator>17061</MaxScaleDenominator>
+            <MinScaleDenominator>4264</MinScaleDenominator>
+            <LineSymbolizer stroke="#888" stroke-width="0.8"/>
+        </Rule>
+        <Rule>
+            <MaxScaleDenominator>4264</MaxScaleDenominator>
+            <MinScaleDenominator>0</MinScaleDenominator>
+            <LineSymbolizer stroke="#888" stroke-width="2.0"/>
+        </Rule>
+    </Style>
 </Map>
diff --git a/app/src/frontend/building/data-containers/typology.tsx b/app/src/frontend/building/data-containers/typology.tsx
index 3a8e33e0..430943db 100644
--- a/app/src/frontend/building/data-containers/typology.tsx
+++ b/app/src/frontend/building/data-containers/typology.tsx
@@ -11,6 +11,7 @@ import { CategoryViewProps } from './category-view-props';
 import InfoBox from '../../components/info-box';
 import { DataEntryGroup } from '../data-components/data-entry-group';
 import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-entry';
+import { useDisplayPreferences } from '../../displayPreferences-context';
 
 const AttachmentFormOptions = [
     "Detached",
@@ -23,9 +24,37 @@ const AttachmentFormOptions = [
 * Type view/edit section
 */
 const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
+    const { darkLightTheme } = useDisplayPreferences();
+
+    const switchToClassificationMapStyle = (e) => {
+        e.preventDefault();
+        props.onMapColourScale('typology_classification')
+    }
+    const switchToStylePeriodMapStyle = (e) => {
+        e.preventDefault();
+        props.onMapColourScale('typology_style_period')
+    }
+    const switchToDynamicClassificationMapStyle = (e) => {
+        e.preventDefault();
+        props.onMapColourScale('typology_dynamic_classification')
+    }
+    const switchToAttachmentMapStyle = (e) => {
+        e.preventDefault();
+        props.onMapColourScale('building_attachment_form')
+    }
+
     return (
         <Fragment>
             <DataEntryGroup name="Basic typology classification">
+                {(props.mapColourScale == "typology_classification") ? 
+                    <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToStylePeriodMapStyle}>
+                        {'Click here to change map to show architectural style/historical period.'}
+                    </button>
+                :
+                    <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToClassificationMapStyle}>
+                        {"Click to change map to show typology classification."}
+                    </button>
+                }
                 <SelectDataEntry
                     title={dataFields.typology_classification.title}
                     slug="typology_classification"
@@ -75,6 +104,15 @@ const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 }
             </DataEntryGroup>
             <DataEntryGroup name="Architectural style/Historical period">
+                {(props.mapColourScale == "typology_style_period") ? 
+                    <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToClassificationMapStyle}>
+                        {'Click to change map to show typology classification.'}
+                    </button>
+                :
+                    <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToStylePeriodMapStyle}>
+                        {"Click here to change map to show architectural style/historical period."}
+                    </button>
+                }
                 <SelectDataEntry
                     title={dataFields.typology_style_period.title}
                     slug="typology_style_period"
@@ -124,6 +162,15 @@ const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 }
             </DataEntryGroup>
             <DataEntryGroup name="Dynamic classification">
+                {(props.mapColourScale == "typology_dynamic_classification") ? 
+                    <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToClassificationMapStyle}>
+                        {'Click to change map to show typology classification.'}
+                    </button>
+                :
+                    <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToDynamicClassificationMapStyle}>
+                        {"Click here to change map to show dynamic classification."}
+                    </button>
+                }
                 <SelectDataEntry
                     title={dataFields.typology_dynamic_classification.title}
                     slug="typology_dynamic_classification"
@@ -226,6 +273,15 @@ const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 }
             </DataEntryGroup>
             <DataEntryGroup name="Attachment/Adjacency">
+                {(props.mapColourScale == "building_attachment_form") ? 
+                    <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToClassificationMapStyle}>
+                        {'Click to change map to show typology classification.'}
+                    </button>
+                :
+                    <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToAttachmentMapStyle}>
+                        {"Click here to change map to show attachment/adjacency."}
+                    </button>
+                }
                 <SelectDataEntry
                     title={dataFields.building_attachment_form.title}
                     slug="building_attachment_form"
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 319fb57c..d9d575dd 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -299,18 +299,72 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             ]
         },
     }],
-    [Category.Typology]: [{
-        mapStyle: 'building_attachment_form',
-        legend: {
-            title: 'Adjacency/Configuration',
-            elements: [
-                { color: "#f2a2b9", text: "Detached" },
-                { color: "#ab8fb0", text: "Semi-Detached" },
-                { color: "#3891d1", text: "End-Terrace" },
-                { color: "#226291", text: "Mid-Terrace" }
-            ]
+    [Category.Typology]: [
+        {
+            mapStyle: 'typology_classification',
+            legend: {
+                title: 'Typology classification',
+                elements: [
+                    { color: '#F2E5FF', text: 'Low-rise: Not part of a group/cluster (1-3 core floors- excluding extensions)' },
+                    { color: '#CBABEA', text: 'Low-rise: Part of dense block/row/terrace' },
+                    { color: '#A272D4', text: 'Low-rise: Part of group of widely spaced blocks (includes semi-detached houses)' },
+                    { color: '#7939BE', text: 'Mid-rise: Not part of a group/cluster (4-7 core floors)' },
+                    { color: '#5000A8', text: 'Mid-rise: Part of group of densely spaced blocks' },
+                    { color: '#3F0086', text: 'Mid-rise: Part of group of widely spaced blocks' },
+                    { color: '#2E0062', text: 'High rise: Not part of a group/cluster' },
+                    { color: '#1D003E', text: 'High-rise: Part of group of densely spaced blocks (8 + core floors)' },
+                    { color: '#0C001A', text: 'High-rise: Part of group of widely spaced blocks' },
+                ]
+            }
         },
-    }],
+        {
+            mapStyle: 'typology_style_period',
+            legend: {
+                title: 'Architectural style',
+                elements: [
+                    { color: '#00B2CB', text: 'Roman (43AD-410)' },
+                    { color: '#00A9C6', text: 'Early Medieval (410-1066)' },
+                    { color: '#00A0C1', text: 'Mid-Late Medieval (1066-1485)' },
+                    { color: '#0097BC', text: 'Tudor (1485-1603)' },
+                    { color: '#008EB7', text: 'Stuart (1603 -1714)' },
+                    { color: '#0085B2', text: 'Georgian/William IV (1714-1837)' },
+                    { color: '#007CAD', text: 'Victorian (1837-1901)' },
+                    { color: '#0073A8', text: 'Edwardian (1901-1914)' },
+                    { color: '#006AA3', text: 'World War I (1914-18)' },
+                    { color: '#00619E', text: 'Interwar (1918-39)' },
+                    { color: '#005899', text: 'World War II (1939-45)' },
+                    { color: '#004F94', text: 'Post war (1945-1975)' },
+                    { color: '#00468F', text: 'Postmodern (1975-1990)' },
+                    { color: '#003D8A', text: '1990s' },
+                    { color: '#003485', text: '2000s/2010s' },
+                    { color: '#002C7C', text: '2020s' },
+                ]
+            }
+        },
+        {
+            mapStyle: 'typology_dynamic_classification',
+            legend: {
+                title: 'Dynamic classification',
+                elements: [
+                    { color: '#F2E5FF', text: 'Small fairly regular plot part of repetitive domestic streets' },
+                    { color: '#CBABEA', text: 'Irregular shaped plots built along the edge of long established routes (e.g high streets)' },
+                    { color: '#A272D4', text: 'Large plot with internal access roads (e.g. infrastructure hubs/large institution such as hospitals/universities/airports)' },
+                ]
+            }
+        },
+        {
+            mapStyle: 'building_attachment_form',
+            legend: {
+                title: 'Attachment/Adjacency',
+                elements: [
+                    { color: "#f2a2b9", text: "Detached" },
+                    { color: "#ab8fb0", text: "Semi-Detached" },
+                    { color: "#3891d1", text: "End-Terrace" },
+                    { color: "#226291", text: "Mid-Terrace" }
+                ]
+            },
+        },
+    ],
     [Category.LandUse]: [
         {
             mapStyle: 'landuse',
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index ebd235c0..d90e16ce 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -1502,7 +1502,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         items: [
             'Roman (43AD-410)',
             'Early Medieval (410-1066)',
-            'Mid- Late Medieval (1066-1485)',
+            'Mid-Late Medieval (1066-1485)',
             'Tudor (1485-1603)',
             'Stuart (1603 -1714)',
             'Georgian/William IV (1714-1837)',
diff --git a/app/src/frontend/config/tileserver-config.ts b/app/src/frontend/config/tileserver-config.ts
index 990536ef..73c2d4b7 100644
--- a/app/src/frontend/config/tileserver-config.ts
+++ b/app/src/frontend/config/tileserver-config.ts
@@ -24,7 +24,10 @@ export type BuildingMapTileset =
     'dynamics_demolished_count' |
     'disaster_severity' |
     'team' |
-    'survival_status';
+    'survival_status'|
+    'typology_classification'|
+    'typology_style_period' |
+    'typology_dynamic_classification';
 
 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 b440ca5d..a10cff9f 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -281,6 +281,27 @@ const LAYER_QUERIES = {
         FROM
             buildings
         WHERE jsonb_array_length(demolished_buildings) > 0 OR dynamics_has_demolished_buildings = FALSE`,
+    typology_classification: `
+        SELECT
+            geometry_id,
+            typology_classification
+        FROM
+            buildings
+        WHERE typology_classification IS NOT NULL`,
+    typology_style_period: `
+        SELECT
+            geometry_id,
+            typology_style_period
+        FROM
+            buildings
+        WHERE typology_style_period IS NOT NULL`,
+        typology_dynamic_classification: `
+        SELECT
+            geometry_id,
+            typology_dynamic_classification
+        FROM
+            buildings
+        WHERE typology_dynamic_classification IS NOT NULL`,
 };
 
 const GEOMETRY_FIELD = 'geometry_geom';

From b9e9db4bc2de30fb43cb6f1ba50c6e179e72d715 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 25 Jul 2023 17:06:38 +0100
Subject: [PATCH 02/12] Tweak key text size

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

diff --git a/app/src/frontend/map/legend.css b/app/src/frontend/map/legend.css
index 2b95cfbe..e412cace 100644
--- a/app/src/frontend/map/legend.css
+++ b/app/src/frontend/map/legend.css
@@ -57,7 +57,7 @@
     padding: 0.5rem 0.25rem;
     margin: 0.25rem 0.5rem;
     width: auto;
-    font-size: 18px;
+    font-size: 17px;
     border: 1px solid;
     border-radius: 4px;
 }

From 5e1db5a5890e7988c531cc1ee0d4582beb675b0c Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 26 Jul 2023 13:34:32 +0100
Subject: [PATCH 03/12] Changes to Architectural Styles

as requested in #1212
---
 app/map_styles/polygon.xml                    | 24 ++++---------------
 .../frontend/config/category-maps-config.ts   | 12 ++++------
 app/src/frontend/config/data-fields-config.ts | 12 ++++------
 3 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index d90205d5..20bb9c0c 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -1028,13 +1028,9 @@
             <PolygonSymbolizer fill="#00B2CB" />
         </Rule>
         <Rule>
-            <Filter>[typology_style_period] = "Early Medieval (410-1066)"</Filter>
+            <Filter>[typology_style_period] = "Medieval (410-1485)"</Filter>
             <PolygonSymbolizer fill="#00A9C6" />
         </Rule>
-        <Rule>
-            <Filter>[typology_style_period] = "Mid-Late Medieval (1066-1485)"</Filter>
-            <PolygonSymbolizer fill="#00A0C1" />
-        </Rule>
         <Rule>
             <Filter>[typology_style_period] = "Tudor (1485-1603)"</Filter>
             <PolygonSymbolizer fill="#0097BC" />
@@ -1044,7 +1040,7 @@
             <PolygonSymbolizer fill="#008EB7" />
         </Rule>
         <Rule>
-            <Filter>[typology_style_period] = "Georgian/William IV (1714-1837)"</Filter>
+            <Filter>[typology_style_period] = "Georgian (1714-1837)"</Filter>
             <PolygonSymbolizer fill="#0085B2" />
         </Rule>
         <Rule>
@@ -1056,17 +1052,9 @@
             <PolygonSymbolizer fill="#0073A8" />
         </Rule>
         <Rule>
-            <Filter>[typology_style_period] = "World War I (1914-18)"</Filter>
+            <Filter>[typology_style_period] = "WWI - WWII (1914-45)"</Filter>
             <PolygonSymbolizer fill="#006AA3" />
         </Rule>
-        <Rule>
-            <Filter>[typology_style_period] = "Interwar (1918-39)"</Filter>
-            <PolygonSymbolizer fill="#00619E" />
-        </Rule>
-        <Rule>
-            <Filter>[typology_style_period] = "World War II (1939-45)"</Filter>
-            <PolygonSymbolizer fill="#005899" />
-        </Rule>
         <Rule>
             <Filter>[typology_style_period] = "Post war (1945-1975)"</Filter>
             <PolygonSymbolizer fill="#004F94" />
@@ -1080,13 +1068,9 @@
             <PolygonSymbolizer fill="#003D8A" />
         </Rule>
         <Rule>
-            <Filter>[typology_style_period] = "2000s/2010s"</Filter>
+            <Filter>[typology_style_period] = "2000s"</Filter>
             <PolygonSymbolizer fill="#003485" />
         </Rule>
-        <Rule>
-            <Filter>[typology_style_period] = "2020s"</Filter>
-            <PolygonSymbolizer fill="#002C7C" />
-        </Rule>
 
         <Rule>
             <MaxScaleDenominator>17061</MaxScaleDenominator>
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index d9d575dd..19815c58 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -323,21 +323,17 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
                 title: 'Architectural style',
                 elements: [
                     { color: '#00B2CB', text: 'Roman (43AD-410)' },
-                    { color: '#00A9C6', text: 'Early Medieval (410-1066)' },
-                    { color: '#00A0C1', text: 'Mid-Late Medieval (1066-1485)' },
+                    { color: '#00A9C6', text: 'Medieval (410-1485)' },
                     { color: '#0097BC', text: 'Tudor (1485-1603)' },
                     { color: '#008EB7', text: 'Stuart (1603 -1714)' },
-                    { color: '#0085B2', text: 'Georgian/William IV (1714-1837)' },
+                    { color: '#0085B2', text: 'Georgian (1714-1837)' },
                     { color: '#007CAD', text: 'Victorian (1837-1901)' },
                     { color: '#0073A8', text: 'Edwardian (1901-1914)' },
-                    { color: '#006AA3', text: 'World War I (1914-18)' },
-                    { color: '#00619E', text: 'Interwar (1918-39)' },
-                    { color: '#005899', text: 'World War II (1939-45)' },
+                    { color: '#006AA3', text: 'WWI - WWII (1914-45)' },
                     { color: '#004F94', text: 'Post war (1945-1975)' },
                     { color: '#00468F', text: 'Postmodern (1975-1990)' },
                     { color: '#003D8A', text: '1990s' },
-                    { color: '#003485', text: '2000s/2010s' },
-                    { color: '#002C7C', text: '2020s' },
+                    { color: '#003485', text: '2000s' },
                 ]
             }
         },
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index d90e16ce..91ddb459 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -1501,21 +1501,17 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         example: "High rise: Not part of a group/cluster",
         items: [
             'Roman (43AD-410)',
-            'Early Medieval (410-1066)',
-            'Mid-Late Medieval (1066-1485)',
+            'Medieval (410-1485)',
             'Tudor (1485-1603)',
             'Stuart (1603 -1714)',
-            'Georgian/William IV (1714-1837)',
+            'Georgian (1714-1837)',
             'Victorian (1837-1901)',
             'Edwardian (1901-1914)',
-            'World War I (1914-18)',
-            'Interwar (1918-39)',
-            'World War II (1939-45)',
+            'WWI - WWII (1914-45)',,
             'Post war (1945-1975)',
             'Postmodern (1975-1990)',
             '1990s',
-            '2000s/2010s',
-            '2020s',
+            '2000s',
         ]
     },
     typology_style_period_source_type: {

From b55617aaae118cbd97d9addcafcdc83851522e7f Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 26 Jul 2023 13:46:31 +0100
Subject: [PATCH 04/12] Add label pointing to Age data

#1212
---
 app/src/frontend/building/data-containers/typology.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/frontend/building/data-containers/typology.tsx b/app/src/frontend/building/data-containers/typology.tsx
index 430943db..4180df45 100644
--- a/app/src/frontend/building/data-containers/typology.tsx
+++ b/app/src/frontend/building/data-containers/typology.tsx
@@ -131,6 +131,9 @@ const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     user_verified_as={props.user_verified.typology_style_period}
                     verified_count={props.building.verified.typology_style_period}
                 />
+                <div className={`alert alert-dark`} role="alert" style={{ fontSize: 14, backgroundColor: "#f6f8f9" }}>
+                    <i className="source-url">For building age by year see <a href={"http://localhost:8080/edit/age/"+props.building.building_id}>Age & History</a>.</i>
+                </div>
                 <SelectDataEntry
                     title={dataFields.typology_style_period_source_type.title}
                     slug="typology_style_period_source_type"

From 214b82c465866b45810168e48a3c2e8deb68038b Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 26 Jul 2023 13:54:57 +0100
Subject: [PATCH 05/12] Changes to Dynamic classification subcategory

---
 app/map_styles/polygon.xml                             | 6 +++---
 app/src/frontend/building/data-containers/typology.tsx | 2 +-
 app/src/frontend/config/category-maps-config.ts        | 6 +++---
 app/src/frontend/config/data-fields-config.ts          | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 20bb9c0c..b472d134 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -1085,15 +1085,15 @@
     </Style>
     <Style name="typology_dynamic_classification">
         <Rule>
-            <Filter>[typology_dynamic_classification] = "Small fairly regular plot part of repetitive domestic streets"</Filter>
+            <Filter>[typology_dynamic_classification] = "Repetitive small, domestic plots"</Filter>
             <PolygonSymbolizer fill="#F2E5FF" />
         </Rule>
         <Rule>
-            <Filter>[typology_dynamic_classification] = "Irregular shaped plots built along the edge of long established routes (e.g high streets)"</Filter>
+            <Filter>[typology_dynamic_classification] = "High streets/linear non-domestic"</Filter>
             <PolygonSymbolizer fill="#CBABEA" />
         </Rule>
         <Rule>
-            <Filter>[typology_dynamic_classification] = "Large plot with internal access roads (e.g. infrastructure hubs/large institution such as hospitals/universities/airports)"</Filter>
+            <Filter>[typology_dynamic_classification] = "Large plots with internal roads"</Filter>
             <PolygonSymbolizer fill="#A272D4" />
         </Rule>
 
diff --git a/app/src/frontend/building/data-containers/typology.tsx b/app/src/frontend/building/data-containers/typology.tsx
index 4180df45..7ccc6854 100644
--- a/app/src/frontend/building/data-containers/typology.tsx
+++ b/app/src/frontend/building/data-containers/typology.tsx
@@ -164,7 +164,7 @@ const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     </>
                 }
             </DataEntryGroup>
-            <DataEntryGroup name="Dynamic classification">
+            <DataEntryGroup name="Dynamic tissue classification">
                 {(props.mapColourScale == "typology_dynamic_classification") ? 
                     <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToClassificationMapStyle}>
                         {'Click to change map to show typology classification.'}
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 19815c58..257dda7b 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -342,9 +342,9 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             legend: {
                 title: 'Dynamic classification',
                 elements: [
-                    { color: '#F2E5FF', text: 'Small fairly regular plot part of repetitive domestic streets' },
-                    { color: '#CBABEA', text: 'Irregular shaped plots built along the edge of long established routes (e.g high streets)' },
-                    { color: '#A272D4', text: 'Large plot with internal access roads (e.g. infrastructure hubs/large institution such as hospitals/universities/airports)' },
+                    { color: '#F2E5FF', text: 'Repetitive small, domestic plots' },
+                    { color: '#CBABEA', text: 'High streets/linear non-domestic' },
+                    { color: '#A272D4', text: 'Large plots with internal roads' },
                 ]
             }
         },
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 91ddb459..01b681e7 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -1533,9 +1533,9 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "HINT: Based on a dynamic classification system for urban tissue developed by Brenda Case Scheer. For further information see: <a href=\"https://www.researchgate.net/publication/242150847_The_Anatomy_of_Sprawl\">https://www.researchgate.net/publication/242150847_The_Anatomy_of_Sprawl</a>.",
         example: "High rise: Not part of a group/cluster",
         items: [
-            'Small fairly regular plot part of repetitive domestic streets',
-            'Irregular shaped plots built along the edge of long established routes (e.g high streets)',
-            'Large plot with internal access roads (e.g. infrastructure hubs/large institution such as hospitals/universities/airports)',
+            'Repetitive small, domestic plots',
+            'High streets/linear non-domestic',
+            'Large plots with internal roads',
         ]
     },
     typology_dynamic_classification_source_type: {

From 5018a8e9ef1e7c7a91e01247674b9f566640a574 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 26 Jul 2023 14:05:04 +0100
Subject: [PATCH 06/12] Changes to Basic Typology Classification

#1212
---
 app/map_styles/polygon.xml                    | 36 +++++++++----------
 .../frontend/config/category-maps-config.ts   | 18 +++++-----
 app/src/frontend/config/data-fields-config.ts | 24 ++++++-------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index b472d134..5499d0b1 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -975,40 +975,40 @@
     </Style>
     <Style name="typology_classification">
         <Rule>
-            <Filter>[typology_classification] = "Low-rise: Not part of a group/cluster (1-3 core floors- excluding extensions)"</Filter>
-            <PolygonSymbolizer fill="#F2E5FF" />
+            <Filter>[typology_classification] = "1-3 storeys: Detached"</Filter>
+            <PolygonSymbolizer fill="#002C7C" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "Low-rise: Part of dense block/row/terrace"</Filter>
-            <PolygonSymbolizer fill="#CBABEA" />
+            <Filter>[typology_classification] = "1-3 storeys: Tightly grouped"</Filter>
+            <PolygonSymbolizer fill="#006FA4" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "Low-rise: Part of group of widely spaced blocks (includes semi-detached houses)"</Filter>
-            <PolygonSymbolizer fill="#A272D4" />
+            <Filter>[typology_classification] = "1-3 storeys: Loosely grouped"</Filter>
+            <PolygonSymbolizer fill="#00B2CB" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "Mid-rise: Not part of a group/cluster (4-7 core floors)"</Filter>
-            <PolygonSymbolizer fill="#7939BE" />
+            <Filter>[typology_classification] = "4-7 storeys: Detached"</Filter>
+            <PolygonSymbolizer fill="#FF5D00" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "Mid-rise: Part of group of densely spaced blocks"</Filter>
-            <PolygonSymbolizer fill="#5000A8" />
+            <Filter>[typology_classification] = "4-7 storeys: Tightly grouped"</Filter>
+            <PolygonSymbolizer fill="#FF8000" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "Mid-rise: Part of group of widely spaced blocks"</Filter>
-            <PolygonSymbolizer fill="#3F0086" />
+            <Filter>[typology_classification] = "4-7 storeys: Loosely grouped"</Filter>
+            <PolygonSymbolizer fill="#FFA200" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "High rise: Not part of a group/cluster"</Filter>
-            <PolygonSymbolizer fill="#2E0062" />
+            <Filter>[typology_classification] = "8+ storeys: Detached"</Filter>
+            <PolygonSymbolizer fill="#580C04" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "High-rise: Part of group of densely spaced blocks (8 + core floors)"</Filter>
-            <PolygonSymbolizer fill="#1D003E" />
+            <Filter>[typology_classification] = "8+ storeys: Tightly grouped"</Filter>
+            <PolygonSymbolizer fill="#AA1E0E" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "High-rise: Part of group of widely spaced blocks"</Filter>
-            <PolygonSymbolizer fill="#0C001A" />
+            <Filter>[typology_classification] = "8+ storeys: Loosely grouped"</Filter>
+            <PolygonSymbolizer fill="#FB2F18" />
         </Rule>
 
         <Rule>
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 257dda7b..38fa1b4d 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -305,15 +305,15 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             legend: {
                 title: 'Typology classification',
                 elements: [
-                    { color: '#F2E5FF', text: 'Low-rise: Not part of a group/cluster (1-3 core floors- excluding extensions)' },
-                    { color: '#CBABEA', text: 'Low-rise: Part of dense block/row/terrace' },
-                    { color: '#A272D4', text: 'Low-rise: Part of group of widely spaced blocks (includes semi-detached houses)' },
-                    { color: '#7939BE', text: 'Mid-rise: Not part of a group/cluster (4-7 core floors)' },
-                    { color: '#5000A8', text: 'Mid-rise: Part of group of densely spaced blocks' },
-                    { color: '#3F0086', text: 'Mid-rise: Part of group of widely spaced blocks' },
-                    { color: '#2E0062', text: 'High rise: Not part of a group/cluster' },
-                    { color: '#1D003E', text: 'High-rise: Part of group of densely spaced blocks (8 + core floors)' },
-                    { color: '#0C001A', text: 'High-rise: Part of group of widely spaced blocks' },
+                    { color: '#002C7C', text: '1-3 storeys: Detached' },
+                    { color: '#006FA4', text: '1-3 storeys: Tightly grouped' },
+                    { color: '#00B2CB', text: '1-3 storeys: Loosely grouped' },
+                    { color: '#FF5D00', text: '4-7 storeys: Detached' },
+                    { color: '#FF8000', text: '4-7 storeys: Tightly grouped' },
+                    { color: '#FFA200', text: '4-7 storeys: Loosely grouped' },
+                    { color: '#580C04', text: '8+ storeys: Detached' },
+                    { color: '#AA1E0E', text: '8+ storeys: Tightly grouped' },
+                    { color: '#FB2F18', text: '8+ storeys: Loosely grouped' },
                 ]
             }
         },
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 01b681e7..1c7530b4 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -1468,17 +1468,17 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         category: Category.Typology,
         title: "Which description best suits the building and its context?",
         tooltip: "HINT: Adapted from building type classifications developed in urban morphology. See <a href=\"https://www.smog.chalmers.se/\">https://www.smog.chalmers.se/</a> 'Space Matrix' for further information.",
-        example: "High rise: Not part of a group/cluster",
+        example: "8+ storeys: Detached",
         items: [
-            'Low-rise: Not part of a group/cluster (1-3 core floors- excluding extensions)',
-            'Low-rise: Part of dense block/row/terrace',
-            'Low-rise: Part of group of widely spaced blocks (includes semi-detached houses)',
-            'Mid-rise: Not part of a group/cluster (4-7 core floors)',
-            'Mid-rise: Part of group of densely spaced blocks',
-            'Mid-rise: Part of group of widely spaced blocks',
-            'High rise: Not part of a group/cluster',
-            'High-rise: Part of group of densely spaced blocks (8 + core floors)',
-            'High-rise: Part of group of widely spaced blocks',
+            '1-3 storeys: Detached',
+            '1-3 storeys: Tightly grouped',
+            '1-3 storeys: Loosely grouped',
+            '4-7 storeys: Detached',
+            '4-7 storeys: Tightly grouped',
+            '4-7 storeys: Loosely grouped',
+            '8+ storeys: Detached',
+            '8+ storeys: Tightly grouped',
+            '8+ storeys: Loosely grouped',
         ]
     },
     typology_classification_source_type: {
@@ -1498,7 +1498,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         category: Category.Typology,
         title: "Which description best suits the building's architectural style/historical period?",
         tooltip: "",
-        example: "High rise: Not part of a group/cluster",
+        example: "Georgian (1714-1837)",
         items: [
             'Roman (43AD-410)',
             'Medieval (410-1485)',
@@ -1531,7 +1531,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         category: Category.Typology,
         title: "Which description best suits the building's plot?",
         tooltip: "HINT: Based on a dynamic classification system for urban tissue developed by Brenda Case Scheer. For further information see: <a href=\"https://www.researchgate.net/publication/242150847_The_Anatomy_of_Sprawl\">https://www.researchgate.net/publication/242150847_The_Anatomy_of_Sprawl</a>.",
-        example: "High rise: Not part of a group/cluster",
+        example: "Large plots with internal roads",
         items: [
             'Repetitive small, domestic plots',
             'High streets/linear non-domestic',

From 75fe7dda4c274a47a51002bf6eb789d9e85405c8 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 26 Jul 2023 14:41:34 +0100
Subject: [PATCH 07/12] Remove 'under development' text

---
 app/src/frontend/config/categories-config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/config/categories-config.ts b/app/src/frontend/config/categories-config.ts
index 06906091..dd021270 100644
--- a/app/src/frontend/config/categories-config.ts
+++ b/app/src/frontend/config/categories-config.ts
@@ -98,7 +98,7 @@ export const categoriesConfig: {[key in Category]: CategoryDefinition} = {
         slug: 'typology',
         name: 'Typology',
         aboutUrl: 'https://pages.colouring.london/buildingtypology',
-        intro: 'Note: This section is currently under development, we are working to activate it as soon as possible. This section provides open data on the typology of the building.',
+        intro: 'This section provides open data on the typology of the building.',
     },
     [Category.LandUse]: {
         slug: 'land-use',

From 06de97145e43129d9b7c9c4f08263d53bdffdf95 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 26 Jul 2023 15:30:56 +0100
Subject: [PATCH 08/12] Revert changes to Basic Typology Classification

Key to be different from dropdown text
---
 app/map_styles/polygon.xml                     | 18 +++++++++---------
 .../frontend/config/category-maps-config.ts    | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 5499d0b1..ce8124d7 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -975,39 +975,39 @@
     </Style>
     <Style name="typology_classification">
         <Rule>
-            <Filter>[typology_classification] = "1-3 storeys: Detached"</Filter>
+            <Filter>[typology_classification] = "Low-rise: Not part of a group/cluster (1-3 core floors- excluding extensions)"</Filter>
             <PolygonSymbolizer fill="#002C7C" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "1-3 storeys: Tightly grouped"</Filter>
+            <Filter>[typology_classification] = "Low-rise: Part of dense block/row/terrace"</Filter>
             <PolygonSymbolizer fill="#006FA4" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "1-3 storeys: Loosely grouped"</Filter>
+            <Filter>[typology_classification] = "Low-rise: Part of group of widely spaced blocks (includes semi-detached houses)"</Filter>
             <PolygonSymbolizer fill="#00B2CB" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "4-7 storeys: Detached"</Filter>
+            <Filter>[typology_classification] = "Mid-rise: Not part of a group/cluster (4-7 core floors)"</Filter>
             <PolygonSymbolizer fill="#FF5D00" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "4-7 storeys: Tightly grouped"</Filter>
+            <Filter>[typology_classification] = "Mid-rise: Part of group of densely spaced blocks"</Filter>
             <PolygonSymbolizer fill="#FF8000" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "4-7 storeys: Loosely grouped"</Filter>
+            <Filter>[typology_classification] = "Mid-rise: Part of group of widely spaced blocks"</Filter>
             <PolygonSymbolizer fill="#FFA200" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "8+ storeys: Detached"</Filter>
+            <Filter>[typology_classification] = "High rise: Not part of a group/cluster"</Filter>
             <PolygonSymbolizer fill="#580C04" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "8+ storeys: Tightly grouped"</Filter>
+            <Filter>[typology_classification] = "High-rise: Part of group of densely spaced blocks (8 + core floors)"</Filter>
             <PolygonSymbolizer fill="#AA1E0E" />
         </Rule>
         <Rule>
-            <Filter>[typology_classification] = "8+ storeys: Loosely grouped"</Filter>
+            <Filter>[typology_classification] = "High-rise: Part of group of widely spaced blocks"</Filter>
             <PolygonSymbolizer fill="#FB2F18" />
         </Rule>
 
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 38fa1b4d..58898d20 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -305,15 +305,15 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             legend: {
                 title: 'Typology classification',
                 elements: [
-                    { color: '#002C7C', text: '1-3 storeys: Detached' },
-                    { color: '#006FA4', text: '1-3 storeys: Tightly grouped' },
-                    { color: '#00B2CB', text: '1-3 storeys: Loosely grouped' },
-                    { color: '#FF5D00', text: '4-7 storeys: Detached' },
-                    { color: '#FF8000', text: '4-7 storeys: Tightly grouped' },
-                    { color: '#FFA200', text: '4-7 storeys: Loosely grouped' },
-                    { color: '#580C04', text: '8+ storeys: Detached' },
-                    { color: '#AA1E0E', text: '8+ storeys: Tightly grouped' },
-                    { color: '#FB2F18', text: '8+ storeys: Loosely grouped' },
+                    { color: '#002C7C', text: 'Low-rise: Not part of a group/cluster (1-3 core floors- excluding extensions)' },
+                    { color: '#006FA4', text: 'Low-rise: Part of dense block/row/terrace' },
+                    { color: '#00B2CB', text: 'Low-rise: Part of group of widely spaced blocks (includes semi-detached houses)' },
+                    { color: '#FF5D00', text: 'Mid-rise: Not part of a group/cluster (4-7 core floors)' },
+                    { color: '#FF8000', text: 'Mid-rise: Part of group of densely spaced blocks' },
+                    { color: '#FFA200', text: 'Mid-rise: Part of group of widely spaced blocks' },
+                    { color: '#580C04', text: 'High rise: Not part of a group/cluster' },
+                    { color: '#AA1E0E', text: 'High-rise: Part of group of densely spaced blocks (8 + core floors)' },
+                    { color: '#FB2F18', text: 'High-rise: Part of group of widely spaced blocks' },
                 ]
             }
         },

From 81072ff1c900c0e7acd7a7d695a59cea65bca089 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 26 Jul 2023 15:31:45 +0100
Subject: [PATCH 09/12] Land Uses in Alphabetical Order

Temporary partial fix for #1194
---
 app/src/api/services/autofill.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/api/services/autofill.ts b/app/src/api/services/autofill.ts
index f0e1c285..32bd43f9 100644
--- a/app/src/api/services/autofill.ts
+++ b/app/src/api/services/autofill.ts
@@ -21,6 +21,7 @@ function getLanduseGroupOptions(value: string, all: boolean = false) {
                 landuse_id AS id,
                 description AS value
             FROM reference_tables.buildings_landuse_group
+            ORDER BY description
             `
         );
     }

From 30300a76cb35f6b96c694d02aca0c3168dee7787 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 26 Jul 2023 15:36:01 +0100
Subject: [PATCH 10/12] Changed in the wrong file!

---
 .../frontend/config/category-maps-config.ts    | 18 +++++++++---------
 app/src/frontend/config/data-fields-config.ts  | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 58898d20..38fa1b4d 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -305,15 +305,15 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             legend: {
                 title: 'Typology classification',
                 elements: [
-                    { color: '#002C7C', text: 'Low-rise: Not part of a group/cluster (1-3 core floors- excluding extensions)' },
-                    { color: '#006FA4', text: 'Low-rise: Part of dense block/row/terrace' },
-                    { color: '#00B2CB', text: 'Low-rise: Part of group of widely spaced blocks (includes semi-detached houses)' },
-                    { color: '#FF5D00', text: 'Mid-rise: Not part of a group/cluster (4-7 core floors)' },
-                    { color: '#FF8000', text: 'Mid-rise: Part of group of densely spaced blocks' },
-                    { color: '#FFA200', text: 'Mid-rise: Part of group of widely spaced blocks' },
-                    { color: '#580C04', text: 'High rise: Not part of a group/cluster' },
-                    { color: '#AA1E0E', text: 'High-rise: Part of group of densely spaced blocks (8 + core floors)' },
-                    { color: '#FB2F18', text: 'High-rise: Part of group of widely spaced blocks' },
+                    { color: '#002C7C', text: '1-3 storeys: Detached' },
+                    { color: '#006FA4', text: '1-3 storeys: Tightly grouped' },
+                    { color: '#00B2CB', text: '1-3 storeys: Loosely grouped' },
+                    { color: '#FF5D00', text: '4-7 storeys: Detached' },
+                    { color: '#FF8000', text: '4-7 storeys: Tightly grouped' },
+                    { color: '#FFA200', text: '4-7 storeys: Loosely grouped' },
+                    { color: '#580C04', text: '8+ storeys: Detached' },
+                    { color: '#AA1E0E', text: '8+ storeys: Tightly grouped' },
+                    { color: '#FB2F18', text: '8+ storeys: Loosely grouped' },
                 ]
             }
         },
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 1c7530b4..b096a26b 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -1470,15 +1470,15 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "HINT: Adapted from building type classifications developed in urban morphology. See <a href=\"https://www.smog.chalmers.se/\">https://www.smog.chalmers.se/</a> 'Space Matrix' for further information.",
         example: "8+ storeys: Detached",
         items: [
-            '1-3 storeys: Detached',
-            '1-3 storeys: Tightly grouped',
-            '1-3 storeys: Loosely grouped',
-            '4-7 storeys: Detached',
-            '4-7 storeys: Tightly grouped',
-            '4-7 storeys: Loosely grouped',
-            '8+ storeys: Detached',
-            '8+ storeys: Tightly grouped',
-            '8+ storeys: Loosely grouped',
+            'Low-rise: Not part of a group/cluster (1-3 core floors- excluding extensions)',
+            'Low-rise: Part of dense block/row/terrace',
+            'Low-rise: Part of group of widely spaced blocks (includes semi-detached houses)',
+            'Mid-rise: Not part of a group/cluster (4-7 core floors)',
+            'Mid-rise: Part of group of densely spaced blocks',
+            'Mid-rise: Part of group of widely spaced blocks',
+            'High rise: Not part of a group/cluster',
+            'High-rise: Part of group of densely spaced blocks (8 + core floors)',
+            'High-rise: Part of group of widely spaced blocks',
         ]
     },
     typology_classification_source_type: {

From 348971257f60132d0514fd28e2570c63cbb75244 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 26 Jul 2023 15:39:13 +0100
Subject: [PATCH 11/12] Brighter colours

Concerned that the darker colours were not bright enough to stand out against the black background
---
 app/map_styles/polygon.xml                      | 12 ++++++------
 app/src/frontend/config/category-maps-config.ts | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index ce8124d7..ea24d75a 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -976,15 +976,15 @@
     <Style name="typology_classification">
         <Rule>
             <Filter>[typology_classification] = "Low-rise: Not part of a group/cluster (1-3 core floors- excluding extensions)"</Filter>
-            <PolygonSymbolizer fill="#002C7C" />
+            <PolygonSymbolizer fill="#0311AB" />
         </Rule>
         <Rule>
             <Filter>[typology_classification] = "Low-rise: Part of dense block/row/terrace"</Filter>
-            <PolygonSymbolizer fill="#006FA4" />
+            <PolygonSymbolizer fill="#3845D4" />
         </Rule>
         <Rule>
             <Filter>[typology_classification] = "Low-rise: Part of group of widely spaced blocks (includes semi-detached houses)"</Filter>
-            <PolygonSymbolizer fill="#00B2CB" />
+            <PolygonSymbolizer fill="#6D79FD" />
         </Rule>
         <Rule>
             <Filter>[typology_classification] = "Mid-rise: Not part of a group/cluster (4-7 core floors)"</Filter>
@@ -1000,15 +1000,15 @@
         </Rule>
         <Rule>
             <Filter>[typology_classification] = "High rise: Not part of a group/cluster"</Filter>
-            <PolygonSymbolizer fill="#580C04" />
+            <PolygonSymbolizer fill="#AB1303" />
         </Rule>
         <Rule>
             <Filter>[typology_classification] = "High-rise: Part of group of densely spaced blocks (8 + core floors)"</Filter>
-            <PolygonSymbolizer fill="#AA1E0E" />
+            <PolygonSymbolizer fill="#D43A29" />
         </Rule>
         <Rule>
             <Filter>[typology_classification] = "High-rise: Part of group of widely spaced blocks"</Filter>
-            <PolygonSymbolizer fill="#FB2F18" />
+            <PolygonSymbolizer fill="#FC604F" />
         </Rule>
 
         <Rule>
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 38fa1b4d..cea2dbee 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -305,15 +305,15 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             legend: {
                 title: 'Typology classification',
                 elements: [
-                    { color: '#002C7C', text: '1-3 storeys: Detached' },
-                    { color: '#006FA4', text: '1-3 storeys: Tightly grouped' },
-                    { color: '#00B2CB', text: '1-3 storeys: Loosely grouped' },
+                    { color: '#0311AB', text: '1-3 storeys: Detached' },
+                    { color: '#3845D4', text: '1-3 storeys: Tightly grouped' },
+                    { color: '#6D79FD', text: '1-3 storeys: Loosely grouped' },
                     { color: '#FF5D00', text: '4-7 storeys: Detached' },
                     { color: '#FF8000', text: '4-7 storeys: Tightly grouped' },
                     { color: '#FFA200', text: '4-7 storeys: Loosely grouped' },
-                    { color: '#580C04', text: '8+ storeys: Detached' },
-                    { color: '#AA1E0E', text: '8+ storeys: Tightly grouped' },
-                    { color: '#FB2F18', text: '8+ storeys: Loosely grouped' },
+                    { color: '#AB1303', text: '8+ storeys: Detached' },
+                    { color: '#D43A29', text: '8+ storeys: Tightly grouped' },
+                    { color: '#FC604F', text: '8+ storeys: Loosely grouped' },
                 ]
             }
         },

From ff4299e677d710543ef103825269088ab6b8016e Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 26 Jul 2023 15:43:49 +0100
Subject: [PATCH 12/12] Changes to Dynamic Classification

---
 app/map_styles/polygon.xml                      | 6 +++++-
 app/src/frontend/config/category-maps-config.ts | 3 ++-
 app/src/frontend/config/data-fields-config.ts   | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index ea24d75a..eba544a0 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -1089,13 +1089,17 @@
             <PolygonSymbolizer fill="#F2E5FF" />
         </Rule>
         <Rule>
-            <Filter>[typology_dynamic_classification] = "High streets/linear non-domestic"</Filter>
+            <Filter>[typology_dynamic_classification] = "Linear non-domestic, i.e. high streets"</Filter>
             <PolygonSymbolizer fill="#CBABEA" />
         </Rule>
         <Rule>
             <Filter>[typology_dynamic_classification] = "Large plots with internal roads"</Filter>
             <PolygonSymbolizer fill="#A272D4" />
         </Rule>
+        <Rule>
+            <Filter>[typology_dynamic_classification] = "Other"</Filter>
+            <PolygonSymbolizer fill="#EEEEEE" />
+        </Rule>
 
         <Rule>
             <MaxScaleDenominator>17061</MaxScaleDenominator>
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index cea2dbee..6f37301b 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -343,8 +343,9 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
                 title: 'Dynamic classification',
                 elements: [
                     { color: '#F2E5FF', text: 'Repetitive small, domestic plots' },
-                    { color: '#CBABEA', text: 'High streets/linear non-domestic' },
+                    { color: '#CBABEA', text: 'Linear non-domestic, i.e. high streets' },
                     { color: '#A272D4', text: 'Large plots with internal roads' },
+                    { color: '#EEEEEE', text: 'Other' },
                 ]
             }
         },
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index b096a26b..275f96d1 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -1534,8 +1534,9 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         example: "Large plots with internal roads",
         items: [
             'Repetitive small, domestic plots',
-            'High streets/linear non-domestic',
+            'Linear non-domestic, i.e. high streets',
             'Large plots with internal roads',
+            'Other'
         ]
     },
     typology_dynamic_classification_source_type: {