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

WIP - Survival Status data saving

Browse Source 
Activate Survival Status drop down box on Age and History category. Allow it to be set, saved and visualised.
This commit is contained in:
Mike Simpson 2023-04-05 15:13:48 +01:00
parent ecb8f6b262
commit 8418b5f6c0
8 changed files with 167 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/map_styles/polygon.xml
View File

@ -623,6 +623,34 @@
<LineSymbolizer stroke="#888" stroke-width="3.0"/> <LineSymbolizer stroke="#888" stroke-width="3.0"/>
</Rule> </Rule>
</Style> </Style>
<Style name="survival_status">
<Rule>
<Filter>[survival_status] = "Same as Historical Map (Unchanged)"</Filter>
<PolygonSymbolizer fill="#6ded45" />
</Rule>
<Rule>
<Filter>[survival_status] = "Similar to Historical Map (Some Changes)"</Filter>
<PolygonSymbolizer fill="#f7c725" />
</Rule>
<Rule>
<Filter>[survival_status] = "Historical Building Demolished"</Filter>
<PolygonSymbolizer fill="#ff2121" />
</Rule>
<Rule>
<Filter>[survival_status] = "Current Building on Previous Green Space"</Filter>
<PolygonSymbolizer fill="#CF26DF" />
</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"> <Style name="likes">
<Rule> <Rule>
<Filter>[likes] &gt;= 100</Filter> <Filter>[likes] &gt;= 100</Filter>

4
app/src/api/config/dataFields.ts
View File

@ -296,6 +296,10 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
edit: true, edit: true,
verify: true verify: true
}, },
survival_status: {
edit: true,
verify: true
},
likes_total: { likes_total: {
edit: false, edit: false,
derivedEdit: true, derivedEdit: true,

69
app/src/frontend/building/data-containers/age.tsx
View File

@ -20,10 +20,11 @@ import { CategoryViewProps } from './category-view-props';
import { LogicalDataEntry } from '../data-components/logical-data-entry/logical-data-entry'; import { LogicalDataEntry } from '../data-components/logical-data-entry/logical-data-entry';
import { useDisplayPreferences } from '../../displayPreferences-context'; import { useDisplayPreferences } from '../../displayPreferences-context';
const HistoricalStatusOptions = [ const SurvivalStatusOptions = [
'The current footprint matches/almost exactly matches the historical map beneath, and/or is known to have been built before the map was made', 'Same as Historical Map (Unchanged)',
'The building core is the same as the historical map but has had multiple additions/changes', 'Similar to Historical Map (Some Changes)',
'The building no longer exists', 'Historical Building Demolished',
'Current Building on Previous Green Space'
]; ];
/** /**
@ -227,27 +228,33 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Survival and Loss tracked using Historical Maps" collapsed={true} > <DataEntryGroup name="Survival and Loss tracked using Historical Maps" collapsed={true} >
<InfoBox> <InfoBox>
This section is under development. Can you help us create a map that shows how many buildings in London have survived since the 1890s?
Choose a colour to indicate whether the building has survived.
</InfoBox> </InfoBox>
<button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}>
{(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'} {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
</button> </button>
<SelectDataEntry <SelectDataEntry
title={dataFields.historical_status.title} title={dataFields.survival_status.title}
slug="historical_status" slug="survival_status"
value={""} value={props.building.survival_status}
tooltip={dataFields.historical_status.tooltip} tooltip={dataFields.survival_status.tooltip}
options={HistoricalStatusOptions} options={SurvivalStatusOptions}
mode={props.mode} mode={props.mode}
copy={props.copy} copy={props.copy}
onChange={props.onChange} onChange={props.onChange}
/> />
<DataEntry <SelectDataEntry
title="Historical land use change" title={dataFields.survival_source.title}
slug="" slug="survival_source"
value="" value={props.building.survival_source}
mode='view' mode={props.mode}
/> copy={props.copy}
onChange={props.onChange}
tooltip={dataFields.survival_source.tooltip}
placeholder={dataFields.survival_source.example}
options={dataFields.survival_source.items}
/>
</DataEntryGroup> </DataEntryGroup>
</Fragment> </Fragment>
); );
@ -496,27 +503,33 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Survival and Loss tracked using Historical Maps" collapsed={true} > <DataEntryGroup name="Survival and Loss tracked using Historical Maps" collapsed={true} >
<InfoBox> <InfoBox>
This section is under development. Can you help us create a map that shows how many buildings in London have survived since the 1890s?
Choose a colour to indicate whether the building has survived.
</InfoBox> </InfoBox>
<button className={`map-switcher-inline ${historicData} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}>
{(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'} {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
</button> </button>
<SelectDataEntry <SelectDataEntry
title={dataFields.historical_status.title} title={dataFields.survival_status.title}
slug="historical_status" slug="survival_status"
value={""} value={""}
tooltip={dataFields.historical_status.tooltip} tooltip={dataFields.survival_status.tooltip}
options={HistoricalStatusOptions} options={SurvivalStatusOptions}
mode={props.mode} mode={props.mode}
copy={props.copy} copy={props.copy}
onChange={props.onChange} onChange={props.onChange}
/> />
<DataEntry <SelectDataEntry
title="Historical land use change" title={dataFields.survival_source.title}
slug="" slug="survival_source"
value="" value={props.building.survival_source}
mode='view' mode={props.mode}
/> copy={props.copy}
onChange={props.onChange}
tooltip={dataFields.survival_source.tooltip}
placeholder={dataFields.survival_source.example}
options={dataFields.survival_source.items}
/>
</DataEntryGroup> </DataEntryGroup>
</Fragment> </Fragment>
); );

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

@ -24,45 +24,61 @@ export interface CategoryMapDefinition {
export const defaultMapCategory = Category.Age; export const defaultMapCategory = Category.Age;
export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = { export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = {
[Category.Age]: [{ [Category.Age]: [
mapStyle: 'date_year', {
legend: { mapStyle: 'date_year',
title: 'Age', legend: {
elements: [ title: 'Age',
{ color: '#fff9b8', text: '>2020' }, elements: [
{ color: '#fae269', text: '2000-2019' }, { color: '#fff9b8', text: '>2020' },
{ color: '#fbaf27', text: '1980-1999' }, { color: '#fae269', text: '2000-2019' },
{ color: '#e6711d', text: '1960-1979' }, { color: '#fbaf27', text: '1980-1999' },
{ color: '#cc1212', text: '1940-1959' }, { color: '#e6711d', text: '1960-1979' },
{ color: '#8f0303', text: '1920-1939' }, { color: '#cc1212', text: '1940-1959' },
{ color: '#8f5385', text: '1900-1919' }, { color: '#8f0303', text: '1920-1939' },
{ color: '#c3e1eb', text: '1880-1899' }, { color: '#8f5385', text: '1900-1919' },
{ color: '#6a9dba', text: '1860-1879' }, { color: '#c3e1eb', text: '1880-1899' },
{ color: '#3b74a3', text: '1840-1859' }, { color: '#6a9dba', text: '1860-1879' },
{ color: '#95ded8', text: '1820-1839' }, { color: '#3b74a3', text: '1840-1859' },
{ color: '#68aba5', text: '1800-1819' }, { color: '#95ded8', text: '1820-1839' },
{ color: '#acc98f', text: '1750-1799' }, { color: '#68aba5', text: '1800-1819' },
{ color: '#6d8a51', text: '1700-1749' }, { color: '#acc98f', text: '1750-1799' },
{ color: '#d0c291', text: '<1700' }, { color: '#6d8a51', text: '1700-1749' },
] { color: '#d0c291', text: '<1700' },
]
},
}, },
}], {
[Category.Size]: [{ mapStyle: 'survival_status',
mapStyle: 'size_height', legend: {
legend: { title: 'Survival status',
title: 'Height to apex', elements: [
elements: [ { color: '#6ded45', text: 'Same as Historical Map (Unchanged)' },
{ color: '#f7f4f9', text: '0-5.55'}, { color: '#f7c725', text: 'Similar to Historical Map (Some Changes)' },
{ color: '#e7e1ef', text: '5.55-7.73'}, { color: '#ff2121', text: 'Historical Building Demolished' },
{ color: '#d4b9da', text: '7.73-11.38'}, { color: '#CF26DF', text: 'Current Building on Previous Green Space' },
{ color: '#c994c7', text: '11.38-18.45'}, ]
{ color: '#df65b0', text: '18.45-35.05'}, }
{ color: '#e7298a', text: '35.05-89.30'},
{ color: '#ce1256', text: '89.30-152'},
{ color: '#980043', text: '≥152'}
]
}, },
}], ],
[Category.Size]: [
{
mapStyle: 'size_height',
legend: {
title: 'Height to apex',
elements: [
{ color: '#f7f4f9', text: '0-5.55'},
{ color: '#e7e1ef', text: '5.55-7.73'},
{ color: '#d4b9da', text: '7.73-11.38'},
{ color: '#c994c7', text: '11.38-18.45'},
{ color: '#df65b0', text: '18.45-35.05'},
{ color: '#e7298a', text: '35.05-89.30'},
{ color: '#ce1256', text: '89.30-152'},
{ color: '#980043', text: '≥152'}
]
},
}
],
[Category.Team]: [{ [Category.Team]: [{
mapStyle: 'team', mapStyle: 'team',
legend: { legend: {

31
app/src/frontend/config/data-fields-config.ts
View File

@ -460,10 +460,37 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
//tooltip: , //tooltip: ,
}, },
historical_status: { survival_status: {
category: Category.Age, category: Category.Age,
title: "Historical Status", title: "Survival status",
tooltip: "Survival and Loss tracked using Historical Maps", tooltip: "Survival and Loss tracked using Historical Maps",
items: [
"Same as Historical Map (Unchanged)",
"Similar to Historical Map (Some Changes)",
"Historical Building Demolished",
"Current Building on Previous Green Space"
],
example: "",
},
survival_source: {
category: Category.Age,
title: "Source of survival information",
tooltip: "Source for the survival status",
items: [
"Matched by comparing maps",
"Checked using streetview images",
"Historical publication or archive document",
"Other"
],
example: "",
},
survival_link: {
category: Category.Age,
title: "Please add any additional text or image links providing historical information on this building",
tooltip: "URL for age and date reference",
example: ["", "", ""],
}, },
edit_history: { edit_history: {

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

@ -21,7 +21,8 @@ export type BuildingMapTileset = 'date_year' |
'building_attachment_form' | 'building_attachment_form' |
'landuse' | 'landuse' |
'dynamics_demolished_count' | 'dynamics_demolished_count' |
'team'; 'team' |
'survival_status';
export type SpecialMapTileset = 'base_light' | 'base_night' | 'base_night_outlines' | 'highlight' | 'number_labels' | 'base_boroughs'; export type SpecialMapTileset = 'base_light' | 'base_night' | 'base_night_outlines' | 'highlight' | 'number_labels' | 'base_boroughs';

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

@ -125,6 +125,14 @@ const LAYER_QUERIES = {
buildings buildings
WHERE WHERE
is_domestic IS NOT NULL`, is_domestic IS NOT NULL`,
survival_status: `
SELECT
geometry_id,
survival_status
FROM
buildings
WHERE
survival_status IS NOT NULL`,
likes: ` likes: `
SELECT SELECT
geometry_id, geometry_id,

3
maintenance/extract_data/export_attributes.sql
View File

@ -56,7 +56,8 @@ COPY (SELECT
planning_historic_area_assessment_url, planning_historic_area_assessment_url,
is_domestic, is_domestic,
community_type_worth_keeping_total, community_type_worth_keeping_total,
likes_total likes_total,
survival_status
FROM buildings) FROM buildings)
TO '/tmp/building_attributes.csv' TO '/tmp/building_attributes.csv'
WITH CSV HEADER WITH CSV HEADER