From cee0c16edf03d566e334c0eddde2f6a05af2b0a8 Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Tue, 7 Feb 2023 10:11:43 +0100
Subject: [PATCH] add new map style for domestic status

---
 app/map_styles/polygon.xml                    | 24 +++++++
 .../frontend/config/category-maps-config.ts   | 70 +++++++++++++------
 app/src/frontend/config/tileserver-config.ts  |  1 +
 app/src/tiles/dataDefinition.ts               |  8 +++
 4 files changed, 80 insertions(+), 23 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 88555fe1..e0fd9c36 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -599,6 +599,30 @@
             <LineSymbolizer stroke="#888" stroke-width="2.0"/>
         </Rule>
     </Style>
+    <Style name="is_domestic">
+        <Rule>
+            <Filter>[is_domestic] = "yes"</Filter>
+            <PolygonSymbolizer fill="#f7ec25" />
+        </Rule>
+        <Rule>
+            <Filter>[is_domestic] = "mixed"</Filter>
+            <PolygonSymbolizer fill="#fc9b2a" />
+        </Rule>
+        <Rule>
+            <Filter>[is_domestic] = "no"</Filter>
+            <PolygonSymbolizer fill="#ff2121" />
+        </Rule>
+        <Rule>
+            <MaxScaleDenominator>17061</MaxScaleDenominator>
+            <MinScaleDenominator>4264</MinScaleDenominator>
+            <LineSymbolizer stroke="#888" stroke-width="1.0"/>
+        </Rule>
+        <Rule>
+            <MaxScaleDenominator>4264</MaxScaleDenominator>
+            <MinScaleDenominator>0</MinScaleDenominator>
+            <LineSymbolizer stroke="#888" stroke-width="3.0"/>
+        </Rule>
+    </Style>
     <Style name="likes">
         <Rule>
             <Filter>[likes] &gt;= 100</Filter>
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 2a9c74ba..2a16e905 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -108,6 +108,17 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
         },
     }],
     [Category.Community]: [
+        {
+            mapStyle: 'is_domestic',
+            legend: {
+                title: 'Is domestic building?',
+                elements: [
+                    { color: '#f7ec25', text: 'Domestic' },
+                    { color: '#fc9b2a', text: 'Mixed' },
+                    { color: '#ff2121', text: 'Non-domestic' },
+                ]
+            }
+        },
         {
             mapStyle: 'likes',
             legend: {
@@ -278,29 +289,42 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             ]
         },
     }],
-    [Category.LandUse]: [{
-        mapStyle: 'landuse',
-        legend: {
-            title: 'Land Use',
-            elements: [
-                { color: '#e5050d', text: 'Mixed Use' },
-                { subtitle: 'Single use:'},
-                { color: '#252aa6', text: 'Residential (unverified)' },
-                { color: '#7025a6', text: 'Residential (verified)' },
-                { color: '#ff8c00', text: 'Retail' },
-                { color: '#f5f58f', text: 'Industry & Business' },
-                { color: '#fa667d', text: 'Community Services' },
-                { color: '#ffbfbf', text: 'Recreation & Leisure' },
-                { color: '#b3de69', text: 'Transport' },
-                { color: '#cccccc', text: 'Utilities & Infrastructure' },
-                { color: '#898944', text: 'Defence' },
-                { color: '#73ccd1', text: 'Agriculture' },
-                { color: '#45cce3', text: 'Minerals' },
-                { color: '#ffffff', text: 'Vacant & Derelict' },
-                { color: '#6c6f8e', text: 'Unclassified, presumed non-residential' }
-            ]
-        },
-    }],
+    [Category.LandUse]: [
+        {
+            mapStyle: 'is_domestic',
+            legend: {
+                title: 'Is domestic building?',
+                elements: [
+                    { color: '#f7ec25', text: 'Domestic' },
+                    { color: '#fc9b2a', text: 'Mixed' },
+                    { color: '#ff2121', text: 'Non-domestic' },
+                ]
+            }
+        }, 
+        {
+            mapStyle: 'landuse',
+            legend: {
+                title: 'Land Use',
+                elements: [
+                    { color: '#e5050d', text: 'Mixed Use' },
+                    { subtitle: 'Single use:'},
+                    { color: '#252aa6', text: 'Residential (unverified)' },
+                    { color: '#7025a6', text: 'Residential (verified)' },
+                    { color: '#ff8c00', text: 'Retail' },
+                    { color: '#f5f58f', text: 'Industry & Business' },
+                    { color: '#fa667d', text: 'Community Services' },
+                    { color: '#ffbfbf', text: 'Recreation & Leisure' },
+                    { color: '#b3de69', text: 'Transport' },
+                    { color: '#cccccc', text: 'Utilities & Infrastructure' },
+                    { color: '#898944', text: 'Defence' },
+                    { color: '#73ccd1', text: 'Agriculture' },
+                    { color: '#45cce3', text: 'Minerals' },
+                    { color: '#ffffff', text: 'Vacant & Derelict' },
+                    { color: '#6c6f8e', text: 'Unclassified, presumed non-residential' }
+                ]
+            },
+        }
+    ],
     [Category.Streetscape]: [{
         mapStyle: undefined,
         legend: {
diff --git a/app/src/frontend/config/tileserver-config.ts b/app/src/frontend/config/tileserver-config.ts
index d4e636ac..fd57d954 100644
--- a/app/src/frontend/config/tileserver-config.ts
+++ b/app/src/frontend/config/tileserver-config.ts
@@ -7,6 +7,7 @@ export type BuildingMapTileset = 'date_year' |
     'size_height' |
     'construction_core_material' |
     'location' |
+    'is_domestic' |
     'likes' |
     'community_local_significance_total' |
     'community_expected_planning_application_total' |
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index 26e2eab5..d399a08d 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -109,6 +109,14 @@ const LAYER_QUERIES = {
             ) AS team_info_count
         FROM
             buildings`,
+    is_domestic: `
+        SELECT
+            geometry_id,
+            is_domestic
+        FROM
+            buildings
+        WHERE
+            is_domestic IS NOT NULL`,
     likes: `
         SELECT
             geometry_id,