From 178ba3d4b5425a580151b6ed19652e42fb6693b1 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 2 Aug 2023 16:04:01 +0100
Subject: [PATCH] Changes to Style/period category, key and colours

---
 app/map_styles/polygon.xml                    | 30 ++++++++-----------
 .../frontend/config/category-maps-config.ts   | 23 +++++++-------
 app/src/frontend/config/data-fields-config.ts |  5 ++--
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index b4fb4163..40fb04db 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -1025,51 +1025,47 @@
     <Style name="typology_style_period">
         <Rule>
             <Filter>[typology_style_period] = "Roman (43AD-410)"</Filter>
-            <PolygonSymbolizer fill="#a35" />
+            <PolygonSymbolizer fill="#FFF739" />
         </Rule>
         <Rule>
             <Filter>[typology_style_period] = "Medieval (410-1485)"</Filter>
-            <PolygonSymbolizer fill="#c66" />
+            <PolygonSymbolizer fill="#C5BD00" />
         </Rule>
         <Rule>
             <Filter>[typology_style_period] = "Tudor (1485-1603)"</Filter>
-            <PolygonSymbolizer fill="#e94" />
+            <PolygonSymbolizer fill="#FF9A39" />
         </Rule>
         <Rule>
             <Filter>[typology_style_period] = "Stuart (1603 -1714)"</Filter>
-            <PolygonSymbolizer fill="#ed0" />
+            <PolygonSymbolizer fill="#C56000" />
         </Rule>
         <Rule>
             <Filter>[typology_style_period] = "Georgian (1714-1837)"</Filter>
-            <PolygonSymbolizer fill="#9d5" />
+            <PolygonSymbolizer fill="#EA8072" />
         </Rule>
         <Rule>
             <Filter>[typology_style_period] = "Victorian (1837-1901)"</Filter>
-            <PolygonSymbolizer fill="#4d8" />
+            <PolygonSymbolizer fill="#A71200" />
         </Rule>
         <Rule>
             <Filter>[typology_style_period] = "Edwardian (1901-1914)"</Filter>
-            <PolygonSymbolizer fill="#2cb" />
+            <PolygonSymbolizer fill="#A272D4" />
         </Rule>
         <Rule>
             <Filter>[typology_style_period] = "WWI - WWII (1914-45)"</Filter>
-            <PolygonSymbolizer fill="#0bc" />
+            <PolygonSymbolizer fill="#3988C5" />
         </Rule>
         <Rule>
             <Filter>[typology_style_period] = "Post war (1945-1975)"</Filter>
-            <PolygonSymbolizer fill="#09c" />
+            <PolygonSymbolizer fill="#5ADFA2" />
         </Rule>
         <Rule>
-            <Filter>[typology_style_period] = "Postmodern (1975-1990)"</Filter>
-            <PolygonSymbolizer fill="#36b" />
+            <Filter>[typology_style_period] = "Late 20th Century (1975-2000)"</Filter>
+            <PolygonSymbolizer fill="#C2F47A" />
         </Rule>
         <Rule>
-            <Filter>[typology_style_period] = "1990s"</Filter>
-            <PolygonSymbolizer fill="#639" />
-        </Rule>
-        <Rule>
-            <Filter>[typology_style_period] = "2000s"</Filter>
-            <PolygonSymbolizer fill="#949" />
+            <Filter>[typology_style_period] = "Early 21st Century (2000-Present)"</Filter>
+            <PolygonSymbolizer fill="#6FB40A" />
         </Rule>
 
         <Rule>
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 61ee2d5e..42d387c1 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -322,18 +322,17 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             legend: {
                 title: 'Architectural style',
                 elements: [
-                    { color: '#a35', text: 'Roman (43AD-410)' },
-                    { color: '#c66', text: 'Medieval (410-1485)' },
-                    { color: '#e94', text: 'Tudor (1485-1603)' },
-                    { color: '#ed0', text: 'Stuart (1603 -1714)' },
-                    { color: '#9d5', text: 'Georgian (1714-1837)' },
-                    { color: '#4d8', text: 'Victorian (1837-1901)' },
-                    { color: '#2cb', text: 'Edwardian (1901-1914)' },
-                    { color: '#0bc', text: 'WWI - WWII (1914-45)' },
-                    { color: '#09c', text: 'Post war (1945-1975)' },
-                    { color: '#36b', text: 'Postmodern (1975-1990)' },
-                    { color: '#639', text: '1990s' },
-                    { color: '#949', text: '2000s' },
+                    { color: '#FFF739', text: 'Roman (43AD-410)' },
+                    { color: '#C5BD00', text: 'Medieval (410-1485)' },
+                    { color: '#FF9A39', text: 'Tudor (1485-1603)' },
+                    { color: '#C56000', text: 'Stuart (1603 -1714)' },
+                    { color: '#EA8072', text: 'Georgian (1714-1837)' },
+                    { color: '#A71200', text: 'Victorian (1837-1901)' },
+                    { color: '#A272D4', text: 'Edwardian (1901-1914)' },
+                    { color: '#3988C5', text: 'WWI - WWII (1914-45)' },
+                    { color: '#5ADFA2', text: 'Post war (1945-1975)' },
+                    { color: '#C2F47A', text: 'Late C20th (1975-2000)' },
+                    { color: '#6FB40A', text: 'Early C21st (2000- )' },
                 ]
             }
         },
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 26909d0c..4333ad59 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -1777,9 +1777,8 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
             'Edwardian (1901-1914)',
             'WWI - WWII (1914-45)',,
             'Post war (1945-1975)',
-            'Postmodern (1975-1990)',
-            '1990s',
-            '2000s',
+            'Late 20th Century (1975-2000)',
+            'Early 21st Century (2000-Present)',
         ]
     },
     typology_style_period_source_type: {