From 4c7edee2711aaa232886ae347df6be607f9dc5cf Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 6 Mar 2020 14:12:23 +0000
Subject: [PATCH] Update Age colours to latest style

---
 app/map_styles/polygon.xml      | 41 +++++++++++++++++++++------------
 app/src/frontend/map/legend.tsx | 27 ++++++++++++----------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 3b17f61d..e0a58044 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -125,24 +125,28 @@
     </Style>
     <Style name="date_year">
         <Rule>
-            <Filter>[date_year] &gt;= 2000</Filter>
-            <PolygonSymbolizer fill="#f0eaba" />
+            <Filter>[date_year] &gt;= 2020</Filter>
+            <PolygonSymbolizer fill="#fff9b8" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1980 and [date_year] &lt; 2000</Filter>
+            <Filter>[date_year] &gt;= 2000 and [date_year] &lt; 2020</Filter>
             <PolygonSymbolizer fill="#fae269" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1960 and [date_year] &lt; 1980</Filter>
+            <Filter>[date_year] &gt;= 1980 and [date_year] &lt; 2000</Filter>
             <PolygonSymbolizer fill="#fbaf27" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1940 and [date_year] &lt; 1960</Filter>
+            <Filter>[date_year] &gt;= 1960 and [date_year] &lt; 1980</Filter>
             <PolygonSymbolizer fill="#e6711d" />
         </Rule>
+        <Rule>
+            <Filter>[date_year] &gt;= 1940 and [date_year] &lt; 1960</Filter>
+            <PolygonSymbolizer fill="#cc1212" />
+        </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1920 and [date_year] &lt; 1940</Filter>
-            <PolygonSymbolizer fill="#d73d3a" />
+            <PolygonSymbolizer fill="#8f0303" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1900 and [date_year] &lt; 1920</Filter>
@@ -150,28 +154,35 @@
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1880 and [date_year] &lt; 1900</Filter>
-            <PolygonSymbolizer fill="#56619b" />
+            <PolygonSymbolizer fill="#c3e1eb" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1860 and [date_year] &lt; 1880</Filter>
-            <PolygonSymbolizer fill="#5591d4" />
+            <PolygonSymbolizer fill="#6a9dba" />
         </Rule>
         <Rule>
             <Filter>[date_year] &gt;= 1840 and [date_year] &lt; 1860</Filter>
-            <PolygonSymbolizer fill="#6793b2" />
+            <PolygonSymbolizer fill="#3b74a3" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1800 and [date_year] &lt; 1840</Filter>
-            <PolygonSymbolizer fill="#83c3b3" />
+            <Filter>[date_year] &gt;= 1820 and [date_year] &lt; 1840</Filter>
+            <PolygonSymbolizer fill="#95ded8" />
         </Rule>
         <Rule>
-            <Filter>[date_year] &gt;= 1700 and [date_year] &lt; 1800</Filter>
-            <PolygonSymbolizer fill="#adc88f" />
+            <Filter>[date_year] &gt;= 1800 and [date_year] &lt; 1820</Filter>
+            <PolygonSymbolizer fill="#68aba5" />
+        </Rule>
+        <Rule>
+            <Filter>[date_year] &gt;= 1750 and [date_year] &lt; 1800</Filter>
+            <PolygonSymbolizer fill="#acc98f" />
+        </Rule>
+        <Rule>
+            <Filter>[date_year] &gt;= 1700 and [date_year] &lt; 1750</Filter>
+            <PolygonSymbolizer fill="#6d8a51" />
         </Rule>
         <Rule>
             <Filter>[date_year] &lt; 1700</Filter>
-            <PolygonSymbolizer fill="#ffffff" />
-            <LineSymbolizer stroke="#888888" />
+            <PolygonSymbolizer fill="#d0c291" />
         </Rule>
     </Style>
     <Style name="conservation_area">
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index 711fa127..17fcca17 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -45,18 +45,21 @@ const LEGEND_CONFIG = {
     age: {
         title: 'Age',
         elements: [
-            { color: '#f0eaba', text: '≥2000' },
-            { color: '#fae269', text: '1980–1999' },
-            { color: '#fbaf27', text: '1960–1979' },
-            { color: '#e6711d', text: '1940–1959' },
-            { color: '#d73d3a', text: '1920–1939' },
-            { color: '#8F5385', text: '1900–1919' },
-            { color: '#56619B', text: '1880–1899' },
-            { color: '#5591d4', text: '1860–1879' },
-            { color: '#6793B2', text: '1840–1859' },
-            { color: '#83c3b3', text: '1800–1839' }, 
-            { color: '#adc88f', text: '1700–1799' },
-            { color: '#ffffff', border: '1px solid #888888', text: '<1700' },
+            { 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' },
         ]
     },
     size: {