From 4a61f1910386f130a2bd326edbdddb40b0ad7adc Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Tue, 24 Jan 2023 10:34:39 +0100 Subject: [PATCH 1/5] Revert "unroll layer option on using buttons" This reverts commit 5a5981523436488fe12b366f6fed2ef423738dc9. --- .../frontend/displayPreferences-context.tsx | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/app/src/frontend/displayPreferences-context.tsx b/app/src/frontend/displayPreferences-context.tsx index 6694c943..01a0ff3b 100644 --- a/app/src/frontend/displayPreferences-context.tsx +++ b/app/src/frontend/displayPreferences-context.tsx @@ -176,7 +176,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newVista = (vista === 'enabled')? 'disabled' : 'enabled'; setVista(newVista); - setShowLayerSelection('enabled') }, [vista], ) @@ -185,7 +184,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newVista = (vista === 'enabled')? 'disabled' : 'enabled'; setVista(newVista); - setShowLayerSelection('enabled') } const floodSwitch = useCallback( @@ -193,7 +191,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newFlood = (flood === 'enabled')? 'disabled' : 'enabled'; setFlood(newFlood); - setShowLayerSelection('enabled') }, [flood], ) @@ -202,7 +199,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newFlood = (flood === 'enabled')? 'disabled' : 'enabled'; setFlood(newFlood); - setShowLayerSelection('enabled') } const housingSwitch = useCallback( @@ -210,7 +206,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newHousing = (housing === 'enabled')? 'disabled' : 'enabled'; setHousing(newHousing); - setShowLayerSelection('enabled') }, [housing], ) @@ -219,7 +214,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newHousing = (housing === 'enabled')? 'disabled' : 'enabled'; setHousing(newHousing); - setShowLayerSelection('enabled') } const creativeSwitch = useCallback( @@ -227,7 +221,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newCreative = (creative === 'enabled')? 'disabled' : 'enabled'; setCreative(newCreative); - setShowLayerSelection('enabled') }, [creative], ) @@ -236,7 +229,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newCreative = (creative === 'enabled')? 'disabled' : 'enabled'; setCreative(newCreative); - setShowLayerSelection('enabled') } const boroughSwitch = useCallback( @@ -252,9 +244,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newBorough = (borough === 'enabled')? 'disabled' : 'enabled'; setBorough(newBorough); - if(newBorough === 'enabled') { - setShowLayerSelection('enabled') - } } const parcelSwitch = useCallback( @@ -270,9 +259,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newParcel = (parcel === 'enabled')? 'disabled' : 'enabled'; setParcel(newParcel); - if(newParcel === 'enabled') { - setShowLayerSelection('enabled') - } } const conservationSwitch = useCallback( @@ -288,9 +274,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newConservation = (conservation === 'enabled')? 'disabled' : 'enabled'; setConservation(newConservation); - if(newConservation === 'enabled') { - setShowLayerSelection('enabled') - } } const historicDataSwitch = useCallback( @@ -306,9 +289,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => { e.preventDefault(); const newHistoric = (historicData === 'enabled')? 'disabled' : 'enabled'; setHistoricData(newHistoric); - if(newHistoric === 'enabled') { - setShowLayerSelection('enabled') - } } const darkLightThemeSwitch = useCallback( From ad51f3433ecbe2f96eb1eb3a98fa9f0decdad313 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Tue, 24 Jan 2023 10:34:58 +0100 Subject: [PATCH 2/5] new wording for active application info --- app/src/frontend/building/data-containers/planning.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx index 1b1c6933..d9ea3d30 100644 --- a/app/src/frontend/building/data-containers/planning.tsx +++ b/app/src/frontend/building/data-containers/planning.tsx @@ -68,7 +68,7 @@ const PlanningView: React.FunctionComponent = (props) => { - This section lists active applications. Active applications are defined here as ones with a decision date less than year ago and time with a registration date less than year ago. + This section provides data on active applications. We define these as applications with any activity in the last year.
To comment on an application follow the application link if provided, or visit the relevant local authority's planning page. From 418b03ada1a54381fbf67a023419a93971ec42b3 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Tue, 24 Jan 2023 10:43:21 +0100 Subject: [PATCH 3/5] new Withdrawn styling --- app/map_styles/polygon.xml | 17 ++++++----------- app/src/frontend/config/category-maps-config.ts | 6 +++--- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml index 525b0436..bb44ad10 100644 --- a/app/map_styles/polygon.xml +++ b/app/map_styles/polygon.xml @@ -389,13 +389,8 @@ [status] = "Withdrawn" - - - - - [status] = "Withdrawn" - - + + [status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" @@ -426,8 +421,8 @@ [status] = "Withdrawn" and [days_since_registered_with_local_authority_date] < 366 - - + + [status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" and [days_since_registered_with_local_authority_date] < 366 @@ -458,8 +453,8 @@ [status] = "Withdrawn" and [days_since_registered_with_local_authority_date] <= 30 - - + + [status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" and [days_since_registered_with_local_authority_date] <= 30 diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts index 89c040f7..2cfba648 100644 --- a/app/src/frontend/config/category-maps-config.ts +++ b/app/src/frontend/config/category-maps-config.ts @@ -181,7 +181,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = { color: '#fff200', text: 'Appeal In Progress' }, { color: '#16cf15', text: 'Approved' }, { color: '#e31d23', text: 'Rejected' }, - { color: '#999999', text: 'Withdrawn' }, + { color: '#546083', text: 'Withdrawn' }, { color: '#eacad0', text: 'Other' }, ] } @@ -196,7 +196,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = { color: '#fff200', text: 'Appeal In Progress' }, { color: '#16cf15', text: 'Approved' }, { color: '#e31d23', text: 'Rejected' }, - { color: '#999999', text: 'Withdrawn' }, + { color: '#546083', text: 'Withdrawn' }, { color: '#eacad0', text: 'Other' }, ] } @@ -211,7 +211,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = { color: '#fff200', text: 'Appeal In Progress' }, { color: '#16cf15', text: 'Approved' }, { color: '#e31d23', text: 'Rejected' }, - { color: '#999999', text: 'Withdrawn' }, + { color: '#546083', text: 'Withdrawn' }, { color: '#eacad0', text: 'Other' }, ] } From cec81583acd5787dcd2db8cb88a123dac46edb58 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Tue, 24 Jan 2023 10:56:09 +0100 Subject: [PATCH 4/5] new colouring for Withdrawn --- app/map_styles/polygon.xml | 12 ++++++------ app/src/frontend/config/category-maps-config.ts | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml index bb44ad10..88555fe1 100644 --- a/app/map_styles/polygon.xml +++ b/app/map_styles/polygon.xml @@ -389,8 +389,8 @@ [status] = "Withdrawn" - - + + [status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" @@ -421,8 +421,8 @@ [status] = "Withdrawn" and [days_since_registered_with_local_authority_date] < 366 - - + + [status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" and [days_since_registered_with_local_authority_date] < 366 @@ -453,8 +453,8 @@ [status] = "Withdrawn" and [days_since_registered_with_local_authority_date] <= 30 - - + + [status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" and [days_since_registered_with_local_authority_date] <= 30 diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts index 2cfba648..f49c3b51 100644 --- a/app/src/frontend/config/category-maps-config.ts +++ b/app/src/frontend/config/category-maps-config.ts @@ -181,7 +181,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = { color: '#fff200', text: 'Appeal In Progress' }, { color: '#16cf15', text: 'Approved' }, { color: '#e31d23', text: 'Rejected' }, - { color: '#546083', text: 'Withdrawn' }, + { color: '#7a84a0', text: 'Withdrawn' }, { color: '#eacad0', text: 'Other' }, ] } @@ -196,7 +196,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = { color: '#fff200', text: 'Appeal In Progress' }, { color: '#16cf15', text: 'Approved' }, { color: '#e31d23', text: 'Rejected' }, - { color: '#546083', text: 'Withdrawn' }, + { color: '#7a84a0', text: 'Withdrawn' }, { color: '#eacad0', text: 'Other' }, ] } @@ -211,7 +211,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = { color: '#fff200', text: 'Appeal In Progress' }, { color: '#16cf15', text: 'Approved' }, { color: '#e31d23', text: 'Rejected' }, - { color: '#546083', text: 'Withdrawn' }, + { color: '#7a84a0', text: 'Withdrawn' }, { color: '#eacad0', text: 'Other' }, ] } From b8349a391c942810ba7da481f0fd59c22776947b Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Tue, 24 Jan 2023 12:00:08 +0100 Subject: [PATCH 5/5] be less optimistic --- app/src/frontend/config/category-maps-config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts index f49c3b51..cef1d550 100644 --- a/app/src/frontend/config/category-maps-config.ts +++ b/app/src/frontend/config/category-maps-config.ts @@ -236,7 +236,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = mapStyle: 'planning_combined', legend: { title: 'Designation/protection (official and crowdsourced data)', - disclaimer: 'All data relating to designated buildings should be checked against the National Heritage List for England and local authority websites. Designation data is currently incomplete. We are aiming for 100% coverage by April 2023.', + disclaimer: 'All data relating to designated buildings should be checked against the National Heritage List for England and local authority websites. Designation data is currently incomplete. We are aiming for 100% coverage by December 2023.', elements: [ { color: '#95beba', text: 'In Conservation Area'}, { color: '#c72e08', text: 'Grade I Listed'},