From 32bfb490bef6be9eca15ab185601a95aafcc832d Mon Sep 17 00:00:00 2001
From: MeldaS <meldasalhab@gmail.com>
Date: Wed, 1 Apr 2020 12:18:44 +0100
Subject: [PATCH] Modify files for adding colouring map attribute

---
 app/map_styles/polygon.xml      | 34 +++++++++++++++++++++++++++++++++
 app/src/frontend/map/legend.tsx | 11 ++++++++++-
 app/src/frontend/map/map.tsx    |  1 +
 app/src/tiles/dataDefinition.ts |  9 +++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 0e23cc7c..33903b3c 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -123,6 +123,40 @@
             <PolygonSymbolizer fill="#980043" />
         </Rule>
     </Style>
+    <Style name="construction_core_material">
+        <Rule>
+            <Filter>[construction_core_material] = "Wood"</Filter>
+            <PolygonSymbolizer fill="#96613b" />
+        </Rule>
+        <Rule>
+            <Filter>[construction_core_material] = "Stone"</Filter>
+            <PolygonSymbolizer fill="#ffffe3" />
+        </Rule>
+        <Rule>
+            <Filter>[construction_core_material] = "Brick"</Filter>
+            <PolygonSymbolizer fill="#f5d96b" />
+        </Rule>
+        <Rule>
+            <Filter>[construction_core_material] = "Steel"</Filter>
+            <PolygonSymbolizer fill="#beffe8" />
+        </Rule>
+        <Rule>
+            <Filter>[construction_core_material] = "Reinforced Concrete"</Filter>
+            <PolygonSymbolizer fill="#fca89d" />
+        </Rule>
+        <Rule>
+            <Filter>[construction_core_material] = "Other Metal"</Filter>
+            <PolygonSymbolizer fill="#5c8970" />
+        </Rule>
+        <Rule>
+            <Filter>[construction_core_material] = "Other Natural Material"</Filter>
+            <PolygonSymbolizer fill="#b5a859" />
+        </Rule>
+        <Rule>
+            <Filter>[construction_core_material] = "Other Man-Made Material"</Filter>
+            <PolygonSymbolizer fill="#c48a85" />
+        </Rule>
+    </Style>
     <Style name="date_year">
         <Rule>
             <Filter>[date_year] &gt;= 2000</Filter>
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index 226c490a..d9066fe2 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -81,7 +81,16 @@ const LEGEND_CONFIG = {
     },
     construction: {
         title: 'Construction',
-        elements: []
+        elements: [
+            { color: "#96613b", text: "Wood" },
+            { color: "#ffffe3", text: "Stone" },
+            { color: "#f5d96b", text: "Brick" },
+            { color: "#beffe8", text: "Steel" },
+            { color: "#fca89d", text: "Reinforced Concrete" },
+            { color: "#5c8970", text: "Other Metal" },
+            { color: "#b5a859", text: "Other Natural Material" },
+            { color: "#c48a85", text: "Other Man-Made Material" }
+        ]
     },
     team: {
         title: 'Team',
diff --git a/app/src/frontend/map/map.tsx b/app/src/frontend/map/map.tsx
index 483a7ce5..ccd3c3b5 100644
--- a/app/src/frontend/map/map.tsx
+++ b/app/src/frontend/map/map.tsx
@@ -131,6 +131,7 @@ class ColouringMap extends Component<ColouringMapProps, ColouringMapState> {
         const tilesetByCat = {
             age: 'date_year',
             size: 'size_height',
+            construction: 'construction_core_material',
             location: 'location',
             like: 'likes',
             planning: 'conservation_area',
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index 6e557eaf..521ec432 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -55,6 +55,15 @@ const BUILDING_LAYER_DEFINITIONS = {
             buildings as b
         WHERE g.geometry_id = b.geometry_id
     ) as size_height`,
+    construction_core_material: `(
+        SELECT
+            b.core_materials,
+            g.geometry_geom
+        FROM
+            geometries as g,
+            buildings as b
+        WHERE g.geometry_id = b.geometry_id
+    ) as core_materials`,
     location: `(
         SELECT
             (