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

Merge pull request #1070 from matkoniecz/fix/again

Browse Source 
Group of changes based on feedback from meeting preparations
This commit is contained in:
Mike Simpson 2023-02-02 12:29:22 +00:00 committed by GitHub
commit 994d9de0ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/map_styles/polygon.xml
View File

@ -389,13 +389,8 @@
</Rule> </Rule>
<Rule> <Rule>
<Filter>[status] = "Withdrawn"</Filter> <Filter>[status] = "Withdrawn"</Filter>
<PolygonSymbolizer fill="#999999"/> <PolygonSymbolizer fill="#7a84a0"/>
<LineSymbolizer stroke="#999999" stroke-width="1.75" /> <LineSymbolizer stroke="#7a84a0" stroke-width="1.75" />
</Rule>
<Rule>
<Filter>[status] = "Withdrawn"</Filter>
<PolygonSymbolizer fill="#262626"/>
<LineSymbolizer stroke="#262626" stroke-width="1.75" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn"</Filter> <Filter>[status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn"</Filter>
@ -426,8 +421,8 @@
</Rule> </Rule>
<Rule> <Rule>
<Filter>[status] = "Withdrawn" and [days_since_registered_with_local_authority_date] &lt; 366</Filter> <Filter>[status] = "Withdrawn" and [days_since_registered_with_local_authority_date] &lt; 366</Filter>
<PolygonSymbolizer fill="#999999"/> <PolygonSymbolizer fill="#7a84a0"/>
<LineSymbolizer stroke="#999999" stroke-width="1.75" /> <LineSymbolizer stroke="#7a84a0" stroke-width="1.75" />
</Rule> </Rule>
<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> <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>
@ -458,8 +453,8 @@
</Rule> </Rule>
<Rule> <Rule>
<Filter>[status] = "Withdrawn" and [days_since_registered_with_local_authority_date] &lt;= 30</Filter> <Filter>[status] = "Withdrawn" and [days_since_registered_with_local_authority_date] &lt;= 30</Filter>
<PolygonSymbolizer fill="#999999"/> <PolygonSymbolizer fill="#7a84a0"/>
<LineSymbolizer stroke="#999999" stroke-width="1.75" /> <LineSymbolizer stroke="#7a84a0" stroke-width="1.75" />
</Rule> </Rule>
<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;= 30</Filter> <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;= 30</Filter>

2
app/src/frontend/building/data-containers/planning.tsx
View File

@ -68,7 +68,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
<DataEntryGroup name="Planning application information" collapsed={true} > <DataEntryGroup name="Planning application information" collapsed={true} >
<DataEntryGroup name="Current/active applications (official data)" collapsed={false} > <DataEntryGroup name="Current/active applications (official data)" collapsed={false} >
<InfoBox> <InfoBox>
This section lists active applications. Active applications are defined here as ones with a decision date less than year ago <i>and</i> 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.
<br /> <br />
To comment on an application follow the application link if provided, or visit the relevant local authority's planning page. To comment on an application follow the application link if provided, or visit the relevant local authority's planning page.
</InfoBox> </InfoBox>

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

@ -181,7 +181,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
{ color: '#fff200', text: 'Appeal In Progress' }, { color: '#fff200', text: 'Appeal In Progress' },
{ color: '#16cf15', text: 'Approved' }, { color: '#16cf15', text: 'Approved' },
{ color: '#e31d23', text: 'Rejected' }, { color: '#e31d23', text: 'Rejected' },
{ color: '#999999', text: 'Withdrawn' }, { color: '#7a84a0', text: 'Withdrawn' },
{ color: '#eacad0', text: 'Other' }, { color: '#eacad0', text: 'Other' },
] ]
} }
@ -196,7 +196,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
{ color: '#fff200', text: 'Appeal In Progress' }, { color: '#fff200', text: 'Appeal In Progress' },
{ color: '#16cf15', text: 'Approved' }, { color: '#16cf15', text: 'Approved' },
{ color: '#e31d23', text: 'Rejected' }, { color: '#e31d23', text: 'Rejected' },
{ color: '#999999', text: 'Withdrawn' }, { color: '#7a84a0', text: 'Withdrawn' },
{ color: '#eacad0', text: 'Other' }, { color: '#eacad0', text: 'Other' },
] ]
} }
@ -211,7 +211,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
{ color: '#fff200', text: 'Appeal In Progress' }, { color: '#fff200', text: 'Appeal In Progress' },
{ color: '#16cf15', text: 'Approved' }, { color: '#16cf15', text: 'Approved' },
{ color: '#e31d23', text: 'Rejected' }, { color: '#e31d23', text: 'Rejected' },
{ color: '#999999', text: 'Withdrawn' }, { color: '#7a84a0', text: 'Withdrawn' },
{ color: '#eacad0', text: 'Other' }, { color: '#eacad0', text: 'Other' },
] ]
} }
@ -236,7 +236,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
mapStyle: 'planning_combined', mapStyle: 'planning_combined',
legend: { legend: {
title: 'Designation/protection (official and crowdsourced data)', 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: [ elements: [
{ color: '#95beba', text: 'In Conservation Area'}, { color: '#95beba', text: 'In Conservation Area'},
{ color: '#c72e08', text: 'Grade I Listed'}, { color: '#c72e08', text: 'Grade I Listed'},

20
app/src/frontend/displayPreferences-context.tsx
View File

@ -176,7 +176,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newVista = (vista === 'enabled')? 'disabled' : 'enabled'; const newVista = (vista === 'enabled')? 'disabled' : 'enabled';
setVista(newVista); setVista(newVista);
setShowLayerSelection('enabled')
}, },
[vista], [vista],
) )
@ -185,7 +184,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newVista = (vista === 'enabled')? 'disabled' : 'enabled'; const newVista = (vista === 'enabled')? 'disabled' : 'enabled';
setVista(newVista); setVista(newVista);
setShowLayerSelection('enabled')
} }
const floodSwitch = useCallback( const floodSwitch = useCallback(
@ -193,7 +191,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newFlood = (flood === 'enabled')? 'disabled' : 'enabled'; const newFlood = (flood === 'enabled')? 'disabled' : 'enabled';
setFlood(newFlood); setFlood(newFlood);
setShowLayerSelection('enabled')
}, },
[flood], [flood],
) )
@ -202,7 +199,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newFlood = (flood === 'enabled')? 'disabled' : 'enabled'; const newFlood = (flood === 'enabled')? 'disabled' : 'enabled';
setFlood(newFlood); setFlood(newFlood);
setShowLayerSelection('enabled')
} }
const housingSwitch = useCallback( const housingSwitch = useCallback(
@ -210,7 +206,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newHousing = (housing === 'enabled')? 'disabled' : 'enabled'; const newHousing = (housing === 'enabled')? 'disabled' : 'enabled';
setHousing(newHousing); setHousing(newHousing);
setShowLayerSelection('enabled')
}, },
[housing], [housing],
) )
@ -219,7 +214,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newHousing = (housing === 'enabled')? 'disabled' : 'enabled'; const newHousing = (housing === 'enabled')? 'disabled' : 'enabled';
setHousing(newHousing); setHousing(newHousing);
setShowLayerSelection('enabled')
} }
const creativeSwitch = useCallback( const creativeSwitch = useCallback(
@ -227,7 +221,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newCreative = (creative === 'enabled')? 'disabled' : 'enabled'; const newCreative = (creative === 'enabled')? 'disabled' : 'enabled';
setCreative(newCreative); setCreative(newCreative);
setShowLayerSelection('enabled')
}, },
[creative], [creative],
) )
@ -236,7 +229,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newCreative = (creative === 'enabled')? 'disabled' : 'enabled'; const newCreative = (creative === 'enabled')? 'disabled' : 'enabled';
setCreative(newCreative); setCreative(newCreative);
setShowLayerSelection('enabled')
} }
const boroughSwitch = useCallback( const boroughSwitch = useCallback(
@ -252,9 +244,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newBorough = (borough === 'enabled')? 'disabled' : 'enabled'; const newBorough = (borough === 'enabled')? 'disabled' : 'enabled';
setBorough(newBorough); setBorough(newBorough);
if(newBorough === 'enabled') {
setShowLayerSelection('enabled')
}
} }
const parcelSwitch = useCallback( const parcelSwitch = useCallback(
@ -270,9 +259,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newParcel = (parcel === 'enabled')? 'disabled' : 'enabled'; const newParcel = (parcel === 'enabled')? 'disabled' : 'enabled';
setParcel(newParcel); setParcel(newParcel);
if(newParcel === 'enabled') {
setShowLayerSelection('enabled')
}
} }
const conservationSwitch = useCallback( const conservationSwitch = useCallback(
@ -288,9 +274,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newConservation = (conservation === 'enabled')? 'disabled' : 'enabled'; const newConservation = (conservation === 'enabled')? 'disabled' : 'enabled';
setConservation(newConservation); setConservation(newConservation);
if(newConservation === 'enabled') {
setShowLayerSelection('enabled')
}
} }
const historicDataSwitch = useCallback( const historicDataSwitch = useCallback(
@ -306,9 +289,6 @@ export const DisplayPreferencesProvider: React.FC<{}> = ({children}) => {
e.preventDefault(); e.preventDefault();
const newHistoric = (historicData === 'enabled')? 'disabled' : 'enabled'; const newHistoric = (historicData === 'enabled')? 'disabled' : 'enabled';
setHistoricData(newHistoric); setHistoricData(newHistoric);
if(newHistoric === 'enabled') {
setShowLayerSelection('enabled')
}
} }
const darkLightThemeSwitch = useCallback( const darkLightThemeSwitch = useCallback(