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