a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop unwanted layers

Browse Source
This commit is contained in:
Mateusz Konieczny 2022-12-02 15:28:50 +01:00
parent 7b8da1f6cb
commit 5c3139ff6f
5 changed files with 4 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
app/map_styles/polygon.xml
View File

@ -352,68 +352,6 @@
<LineSymbolizer stroke="#eacad0" stroke-width="1.75" /> <LineSymbolizer stroke="#eacad0" stroke-width="1.75" />
</Rule> </Rule>
</Style> </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"> <Style name="planning_applications_status_recent">
<Rule> <Rule>
<Filter>[status] = "Submitted" and [days_since_registered_with_local_authority_date] &lt; 366</Filter> <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" /> <LineSymbolizer stroke="#eacad0" stroke-width="1.75" />
</Rule> </Rule>
</Style> </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"> <Style name="planning_combined">
<Rule> <Rule>
<Filter>[planning_in_conservation_area] = true</Filter> <Filter>[planning_in_conservation_area] = true</Filter>

28
app/src/frontend/config/category-maps-config.ts
View File

@ -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', mapStyle: 'community_expected_planning_application_total',
legend: { legend: {

2
app/src/frontend/config/tileserver-config.ts
View File

@ -14,8 +14,6 @@ export type BuildingMapTileset = 'date_year' |
'planning_applications_status_all' | 'planning_applications_status_all' |
'planning_applications_status_recent' | 'planning_applications_status_recent' |
'planning_applications_status_very_recent' | 'planning_applications_status_very_recent' |
'planning_applications_status' |
'planning_applications_status_secretary_of_state' |
'planning_combined' | 'planning_combined' |
'empty_map' | 'empty_map' |
'sust_dec' | 'sust_dec' |

13
app/src/tiles/dataDefinition.ts
View File

@ -155,19 +155,6 @@ const LAYER_QUERIES = {
FROM building_properties FROM building_properties
INNER JOIN planning_data ON building_properties.uprn = planning_data.uprn INNER JOIN planning_data ON building_properties.uprn = planning_data.uprn
INNER JOIN buildings ON building_properties.building_id = buildings.building_id`, 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: ` planning_combined: `
SELECT SELECT
geometry_id, geometry_id,

6
etl/planning_data/README.MD
View File

@ -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 # querying API to obtain data & loading data into Colouring database
python3 obtain_livestream_data_and_load_into_database.py 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 # 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/* -rf 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 As loading into databases expects environment variables to be set, one option to actually schedule it in a cron is something like