From 5c3139ff6f57c4f07a8aa317c10b0fcc0cb7ad3a Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Fri, 2 Dec 2022 15:28:50 +0100
Subject: [PATCH] drop unwanted layers

---
 app/map_styles/polygon.xml                    | 99 -------------------
 .../frontend/config/category-maps-config.ts   | 28 ------
 app/src/frontend/config/tileserver-config.ts  |  2 -
 app/src/tiles/dataDefinition.ts               | 13 ---
 etl/planning_data/README.MD                   |  6 +-
 5 files changed, 4 insertions(+), 144 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 954d3231..8f75b0b4 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -352,68 +352,6 @@
             <LineSymbolizer stroke="#eacad0" stroke-width="1.75" />
         </Rule>
     </Style>
-    <Style name="planning_applications_status">
-        <Rule>
-            <Filter>[status] = "Submitted" and [days_since_registered_with_local_authority_date] &lt; 366</Filter>
-            <PolygonSymbolizer fill="#53f5dd"/>
-            <LineSymbolizer stroke="#53f5dd" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Submitted" and [days_since_registered_with_local_authority_date] &gt;= 366</Filter>
-            <PolygonSymbolizer fill="#467c74"/>
-            <LineSymbolizer stroke="#467c74" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Approved" and [days_since_decision_date] &lt; 366</Filter>
-            <PolygonSymbolizer fill="#16cf15"/>
-            <LineSymbolizer stroke="#16cf15" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Approved" and [days_since_decision_date] &gt;= 366</Filter>
-            <PolygonSymbolizer fill="#021102"/>
-            <LineSymbolizer stroke="#021102" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Appeal In Progress" and [days_since_decision_date] &lt; 366</Filter>
-            <PolygonSymbolizer fill="#fff200"/>
-            <LineSymbolizer stroke="#fff200" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Appeal In Progress" and [days_since_decision_date] &gt;= 366</Filter>
-            <PolygonSymbolizer fill="#807b2b"/>
-            <LineSymbolizer stroke="#807b2b" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Rejected" and [days_since_decision_date] &lt; 366</Filter>
-            <PolygonSymbolizer fill="#e31d23"/>
-            <LineSymbolizer stroke="#e31d23" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Rejected" and [days_since_decision_date] &gt;= 366</Filter>
-            <PolygonSymbolizer fill="#763436"/>
-            <LineSymbolizer stroke="#763436" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Withdrawn" and [days_since_registered_with_local_authority_date] &lt; 366</Filter>
-            <PolygonSymbolizer fill="#999999"/>
-            <LineSymbolizer stroke="#999999" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Withdrawn" and [days_since_registered_with_local_authority_date] &gt;= 366</Filter>
-            <PolygonSymbolizer fill="#262626"/>
-            <LineSymbolizer stroke="#262626" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" and [days_since_registered_with_local_authority_date] &lt; 366</Filter>
-            <PolygonSymbolizer fill="#eacad0"/>
-            <LineSymbolizer stroke="#eacad0" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" and [days_since_registered_with_local_authority_date] &gt;= 366</Filter>
-            <PolygonSymbolizer fill="#2f282a"/>
-            <LineSymbolizer stroke="#2f282a" stroke-width="1.75" />
-        </Rule>
-    </Style>
     <Style name="planning_applications_status_recent">
         <Rule>
             <Filter>[status] = "Submitted" and [days_since_registered_with_local_authority_date] &lt; 366</Filter>
@@ -478,43 +416,6 @@
             <LineSymbolizer stroke="#eacad0" stroke-width="1.75" />
         </Rule>
     </Style>
-    <Style name="planning_applications_status_secretary_of_state">
-        <Rule>
-            <Filter>[status] = "Submitted"</Filter>
-            <PolygonSymbolizer fill="#53f5dd"/>
-            <LineSymbolizer stroke="#53f5dd" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Approved"</Filter>
-            <PolygonSymbolizer fill="#16cf15"/>
-            <LineSymbolizer stroke="#16cf15" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Appeal In Progress"</Filter>
-            <PolygonSymbolizer fill="#fff200"/>
-            <LineSymbolizer stroke="#fff200" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Rejected"</Filter>
-            <PolygonSymbolizer fill="#e31d23"/>
-            <LineSymbolizer stroke="#e31d23" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Withdrawn"</Filter>
-            <PolygonSymbolizer fill="#999999"/>
-            <LineSymbolizer stroke="#999999" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] = "Withdrawn"</Filter>
-            <PolygonSymbolizer fill="#262626"/>
-            <LineSymbolizer stroke="#262626" stroke-width="1.75" />
-        </Rule>
-        <Rule>
-            <Filter>[status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn"</Filter>
-            <PolygonSymbolizer fill="#eacad0"/>
-            <LineSymbolizer stroke="#eacad0" stroke-width="1.75" />
-        </Rule>
-    </Style>
     <Style name="planning_combined">
         <Rule>
             <Filter>[planning_in_conservation_area] = true</Filter>
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 755f430d..ed408026 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -215,34 +215,6 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
                 ]
             }
         },
-        {
-            mapStyle: 'planning_applications_status_secretary_of_state',
-            legend: {
-                title: 'Called in by Secretary of State',
-                elements: [
-                    { color: '#53f5dd', text: 'Submitted, awaiting decision' },
-                    { color: '#fff200', text: 'Appeal In Progress' },
-                    { color: '#16cf15', text: 'Approved' },
-                    { color: '#e31d23', text: 'Rejected' },
-                    { color: '#999999', text: 'Withdrawn' },
-                    { color: '#eacad0', text: 'Other' },
-                ]
-            }
-        },
-        {
-            mapStyle: 'planning_applications_status',
-            legend: {
-                title: 'All planning applications, old ones with a dark styling',
-                elements: [
-                    { color: '#53f5dd', text: 'Submitted, awaiting decision' },
-                    { color: '#fff200', text: 'Appeal In Progress' },
-                    { color: '#16cf15', text: 'Approved' },
-                    { color: '#e31d23', text: 'Rejected' },
-                    { color: '#999999', text: 'Withdrawn' },
-                    { color: '#eacad0', text: 'Other' },
-                ]
-            }
-        },
         {
             mapStyle: 'community_expected_planning_application_total',
             legend: {
diff --git a/app/src/frontend/config/tileserver-config.ts b/app/src/frontend/config/tileserver-config.ts
index 60353801..290e3099 100644
--- a/app/src/frontend/config/tileserver-config.ts
+++ b/app/src/frontend/config/tileserver-config.ts
@@ -14,8 +14,6 @@ export type BuildingMapTileset = 'date_year' |
     'planning_applications_status_all' |
     'planning_applications_status_recent' |
     'planning_applications_status_very_recent' |
-    'planning_applications_status' |
-    'planning_applications_status_secretary_of_state' |
     'planning_combined' |
     'empty_map' |
     'sust_dec' |
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index b41dbe53..8a8bd5f2 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -155,19 +155,6 @@ const LAYER_QUERIES = {
         FROM building_properties
         INNER JOIN planning_data ON building_properties.uprn = planning_data.uprn
         INNER JOIN buildings ON building_properties.building_id = buildings.building_id`,
-    planning_applications_status_secretary_of_state: `SELECT 
-        buildings.geometry_id, building_properties.uprn, building_properties.building_id, planning_data.status AS status, planning_data.uprn
-        FROM building_properties
-        INNER JOIN planning_data ON building_properties.uprn = planning_data.uprn
-        INNER JOIN buildings ON building_properties.building_id = buildings.building_id
-        WHERE status_before_aliasing = 'Called in by Secretary of State'`,
-    planning_applications_status: `SELECT 
-        buildings.geometry_id, building_properties.uprn, building_properties.building_id, planning_data.status AS status, planning_data.uprn, 
-        EXTRACT(epoch FROM age(decision_date))/3600/24 AS days_since_decision_date,
-        EXTRACT(epoch FROM age(registered_with_local_authority_date))/3600/24 AS days_since_registered_with_local_authority_date
-        FROM building_properties
-        INNER JOIN planning_data ON building_properties.uprn = planning_data.uprn
-        INNER JOIN buildings ON building_properties.building_id = buildings.building_id`,
     planning_combined: `
         SELECT
             geometry_id,
diff --git a/etl/planning_data/README.MD b/etl/planning_data/README.MD
index 21ff70e7..32a0fb20 100644
--- a/etl/planning_data/README.MD
+++ b/etl/planning_data/README.MD
@@ -8,8 +8,10 @@ Following scripts should be scheduled to run regularly to load livestream data i
 # querying API to obtain data & loading data into Colouring database
 python3 obtain_livestream_data_and_load_into_database.py
 
-# removing tile cache for planning_applications_status layer - note that location of cache depends on your configuration
-rm /srv/colouring-london/tilecache/planning_applications_status/* -rf
+# removing tile cache for planning applications status layers - note that location of cache depends on your configuration
+rm /srv/colouring-london/tilecache/planning_applications_status_all/* -rf
+rm /srv/colouring-london/tilecache/planning_applications_status_recent/* -rf
+rm /srv/colouring-london/tilecache/planning_applications_status_very_recent/* -rf
 ```
 
 As loading into databases expects environment variables to be set, one option to actually schedule it in a cron is something like