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] 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',