From ce4892bee49daa5281d74d1dcf113759616e0af7 Mon Sep 17 00:00:00 2001
From: Martin-dJ <m.dejode@ucl.ac.uk>
Date: Tue, 16 Apr 2019 14:33:07 +0000
Subject: [PATCH] Fix for issue #144 Reduce number of classes for 'Number of
 storeys' legend

---
 app/map_styles/polygon.xml | 26 +++++---------------------
 app/src/frontend/legend.js | 14 +++++---------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index fc82ec8b..659fc4da 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -63,39 +63,23 @@
     </Style>
     <Style name="size_storeys">
         <Rule>
-            <Filter>[size_storeys] &gt;= 20</Filter>
+            <Filter>[size_storeys] &gt;= 40</Filter>
             <PolygonSymbolizer fill="#ffffcc" />
         </Rule>
         <Rule>
-            <Filter>[size_storeys] &gt;= 15 and [size_storeys] &lt; 20</Filter>
-            <PolygonSymbolizer fill="#ffeda0" />
-        </Rule>
-        <Rule>
-            <Filter>[size_storeys] &gt;= 10 and [size_storeys] &lt; 15</Filter>
+            <Filter>[size_storeys] &gt;= 20 and [size_storeys] &lt; 40</Filter>
             <PolygonSymbolizer fill="#fed976" />
         </Rule>
         <Rule>
-            <Filter>[size_storeys] &gt;= 6 and [size_storeys] &lt; 10</Filter>
-            <PolygonSymbolizer fill="#feb24c" />
-        </Rule>
-        <Rule>
-            <Filter>[size_storeys] = 5</Filter>
+            <Filter>[size_storeys] &gt;= 10 and [size_storeys] &lt; 20</Filter>
             <PolygonSymbolizer fill="#fd8d3c" />
         </Rule>
         <Rule>
-            <Filter>[size_storeys] = 4</Filter>
-            <PolygonSymbolizer fill="#fc4e2a" />
-        </Rule>
-        <Rule>
-            <Filter>[size_storeys] = 3</Filter>
+            <Filter>[size_storeys] &gt;= 6 and [size_storeys] &lt; 10</Filter>
             <PolygonSymbolizer fill="#e31a1c" />
         </Rule>
         <Rule>
-            <Filter>[size_storeys] = 2</Filter>
-            <PolygonSymbolizer fill="#bd0026" />
-        </Rule>
-        <Rule>
-            <Filter>[size_storeys] = 1</Filter>
+            <Filter>[size_storeys] &gt;= 1 and [size_storeys] &lt; 6</Filter>
             <PolygonSymbolizer fill="#800026" />
         </Rule>
     </Style>
diff --git a/app/src/frontend/legend.js b/app/src/frontend/legend.js
index 7180040e..41957669 100644
--- a/app/src/frontend/legend.js
+++ b/app/src/frontend/legend.js
@@ -42,15 +42,11 @@ const LEGEND_CONFIG = {
     size: {
         title: "Number of storeys",
         elements: [
-        { color: '#ffffcc', text: '≥20' },
-        { color: '#ffeda0', text: '15-20' },
-        { color: '#fed976', text: '10–15' },
-        { color: '#feb24c', text: '6–10' },
-        { color: '#fd8d3c', text: '5' },
-        { color: '#fc4e2a', text: '4' },
-        { color: '#e31a1c', text: '3' },
-        { color: '#bd0026', text: '2' },
-        { color: '#800026', text: '1' },
+        { color: '#ffffcc', text: '≥40' },
+        { color: '#fed976', text: '20–39' },
+        { color: '#fd8d3c', text: '10-19' },
+        { color: '#e31a1c', text: '6-9' },
+        { color: '#800026', text: '1-5' },
         ]
     },
     like: {