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

Consistent capitalisation on sub-categories/labels

Browse Source
This commit is contained in:
Mike Simpson 2023-05-17 15:46:48 +01:00
parent fdecc457c4
commit 13cd09c727
6 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
){ ){
return ( return (
<Fragment> <Fragment>
<DataEntryGroup name="Building Age"> <DataEntryGroup name="Building age">
<YearDataEntry <YearDataEntry
year={props.building.date_year} year={props.building.date_year}
upper={props.building.date_upper} upper={props.building.date_upper}
@ -118,25 +118,25 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
This section is under development. This section is under development.
</InfoBox> </InfoBox>
<DataEntry <DataEntry
title="Cladding Date" title="Cladding date"
slug="" slug=""
value="" value=""
mode='view' mode='view'
/> />
<DataEntry <DataEntry
title="Date of Significant Extensions" title="Date of significant extensions"
slug="" slug=""
value="" value=""
mode='view' mode='view'
/> />
<DataEntry <DataEntry
title="Date of Significant Retrofits" title="Date of significant retrofits"
slug="" slug=""
value="" value=""
mode='view' mode='view'
/> />
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Lifespan and Site History" collapsed={true} > <DataEntryGroup name="Lifespan and site history">
<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>
@ -226,7 +226,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
Please let us know your suggestions on the <a href="https://discuss.colouring.london/t/dynamics-category-discussion/107">discussion forum</a>! (external link - save your edits first) Please let us know your suggestions on the <a href="https://discuss.colouring.london/t/dynamics-category-discussion/107">discussion forum</a>! (external link - save your edits first)
</InfoBox> </InfoBox>
</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>
Can you help us create a map that shows how many buildings in London have survived since the 1890s? 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. Choose a colour to indicate whether the building has survived.

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

@ -87,7 +87,7 @@ const ConstructionView: React.FunctionComponent<CategoryViewProps> = (props) =>
verified_count={props.building.verified.construction_roof_covering} verified_count={props.building.verified.construction_roof_covering}
/> />
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Construction Sectors"> <DataEntryGroup name="Construction sectors">
<DataEntry <DataEntry
title="Construction system type" title="Construction system type"
slug="" slug=""

10
app/src/frontend/building/data-containers/location.tsx
View File

@ -17,7 +17,7 @@ const locationNumberPattern = "[1-9]\\d*[a-z]?(-([1-9]\\d*))?"; ///[1-9]\d*[a-z]
const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => ( const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
<Fragment> <Fragment>
<DataEntryGroup name="Address Data"> <DataEntryGroup name="Address data">
<DataEntry <DataEntry
title={dataFields.location_name.title} title={dataFields.location_name.title}
slug="location_name" slug="location_name"
@ -38,7 +38,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
verified_count={props.building.verified.location_name} verified_count={props.building.verified.location_name}
/> />
<DataEntry <DataEntry
title="Building Name (Domestic)" title="Building name (domestic)"
slug="" slug=""
value="" value=""
mode='view' mode='view'
@ -53,7 +53,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
verified_count={props.building.verified.location_name} verified_count={props.building.verified.location_name}
/> />
<DataEntry <DataEntry
title="Building Name Source" title="Source"
slug="" slug=""
value="" value=""
mode='view' mode='view'
@ -148,14 +148,14 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
verified_count={props.building.verified.location_postcode} verified_count={props.building.verified.location_postcode}
/> />
<DataEntry <DataEntry
title="Address Source" title="Source"
slug="" slug=""
value="" value=""
mode='view' mode='view'
tooltip="Coming Soon" tooltip="Coming Soon"
/> />
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Property/Footprint IDs and Coordinate Data"> <DataEntryGroup name="Property/footprint IDs and coordinate data">
<DataEntry <DataEntry
title={dataFields.ref_toid.title} title={dataFields.ref_toid.title}
slug="ref_toid" slug="ref_toid"

8
app/src/frontend/building/data-containers/resilience.tsx
View File

@ -23,7 +23,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
const [ endDate, setEndDate ] = useState(null); const [ endDate, setEndDate ] = useState(null);
return (<> return (<>
<DataEntryGroup name="Building Damage Assessment Tool" collapsed={true} > <DataEntryGroup name="Building damage assessment tool" collapsed={true} >
<InfoBox> <InfoBox>
This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters. This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters.
It is intended to help support emergency services, to record damage, and to aid reconstruction programmes. It is intended to help support emergency services, to record damage, and to aid reconstruction programmes.
@ -31,7 +31,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
<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 disaster maps':'Click here to show disaster maps'} {(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
</button> </button>
<p>Date of Disaster</p> <p>Date of disaster</p>
<div> <div>
<DatePicker <DatePicker
showIcon showIcon
@ -42,7 +42,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
title={dataFields.disaster_start_date.title} title={dataFields.disaster_start_date.title}
//value={props.building.disaster_start_date} //value={props.building.disaster_start_date}
isClearable isClearable
placeholderText="Select Start Date" placeholderText="Select start date"
maxDate={new Date()} maxDate={new Date()}
/> />
</div> </div>
@ -56,7 +56,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
title={dataFields.disaster_end_date.title} title={dataFields.disaster_end_date.title}
//value={props.building.disaster_end_date} //value={props.building.disaster_end_date}
isClearable isClearable
placeholderText="Select End Date" placeholderText="Select end date"
maxDate={new Date()} maxDate={new Date()}
/> />
</div> </div>

4
app/src/frontend/building/data-containers/typology.tsx
View File

@ -24,7 +24,7 @@ const AttachmentFormOptions = [
const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => { const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
return ( return (
<Fragment> <Fragment>
<DataEntryGroup name="Adjacency and Building Use Data"> <DataEntryGroup name="Adjacency and building use data">
<SelectDataEntry <SelectDataEntry
title={dataFields.building_attachment_form.title} title={dataFields.building_attachment_form.title}
slug="building_attachment_form" slug="building_attachment_form"
@ -91,7 +91,7 @@ const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
tooltip="Coming Soon" tooltip="Coming Soon"
/> />
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Building Typology and Classification Data"> <DataEntryGroup name="Building typology and classification data">
<DataEntry <DataEntry
title="Local typology/architectural style" title="Local typology/architectural style"
slug="" slug=""

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

@ -129,7 +129,7 @@ export const buildingUserFields = {
export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
location_name: { location_name: {
category: Category.Location, category: Category.Location,
title: "Building Name (Non-domestic)", title: "Building name (non-domestic)",
tooltip: "Link to a website with the name of the building.<br/><br/>(For security reasons, we currently only collect the names of well-known public buildings.)", tooltip: "Link to a website with the name of the building.<br/><br/>(For security reasons, we currently only collect the names of well-known public buildings.)",
example: "https://en.wikipedia.org/wiki/Palace_of_Westminster", example: "https://en.wikipedia.org/wiki/Palace_of_Westminster",
}, },
@ -153,7 +153,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
}, },
location_town: { location_town: {
category: Category.Location, category: Category.Location,
title: "Town/City", title: "Town/city",
example: "London", example: "London",
//tooltip: , //tooltip: ,
}, },
@ -165,7 +165,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
}, },
ref_toid: { ref_toid: {
category: Category.Location, category: Category.Location,
title: "Building Footprint ID", title: "Building footprint ID",
tooltip: "Ordnance Survey Topography Layer ID (TOID) [<a href='https://www.ordnancesurvey.co.uk/business-government/products/open-toid'>link</a>]", tooltip: "Ordnance Survey Topography Layer ID (TOID) [<a href='https://www.ordnancesurvey.co.uk/business-government/products/open-toid'>link</a>]",
example: "", example: "",
}, },
@ -199,14 +199,14 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
}, },
location_latitude: { location_latitude: {
category: Category.Location, category: Category.Location,
title: "Centroid Latitude", title: "Centroid latitude",
tooltip: "Latitude of Building Centroid", tooltip: "Latitude of building centroid",
example: 12.4564, example: 12.4564,
}, },
location_longitude: { location_longitude: {
category: Category.Location, category: Category.Location,
title: "Centroid Longitude", title: "Centroid longitude",
tooltip: "Longitude of Building Centroid", tooltip: "Longitude of building centroid",
example: 0.12124, example: 0.12124,
}, },
current_landuse_group: { current_landuse_group: {
@ -244,7 +244,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
}, },
current_landuse_link: { current_landuse_link: {
category: Category.LandUse, category: Category.LandUse,
title: "Source Links", title: "Source links",
tooltip: "URL for current land use reference", tooltip: "URL for current land use reference",
example: ["", "", ""], example: ["", "", ""],
}, },
@ -255,7 +255,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
}, },
building_attachment_form: { building_attachment_form: {
category: Category.Typology, category: Category.Typology,
title: "Attachment type/Adjacency", title: "Attachment type/adjacency",
tooltip: "We have prepopulated these based on their current attachment. A building can either be detached, semi-detached or part of a terrace (middle or end)", tooltip: "We have prepopulated these based on their current attachment. A building can either be detached, semi-detached or part of a terrace (middle or end)",
example: "", example: "",
}, },
@ -301,7 +301,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
}, },
facade_year: { facade_year: {
category: Category.Age, category: Category.Age,
title: "Date of Front of Building", title: "Date of front of building",
tooltip: "Best estimate", tooltip: "Best estimate",
example: 1900, example: 1900,
}, },
@ -342,19 +342,19 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
size_storeys_core: { size_storeys_core: {
category: Category.Size, category: Category.Size,
title: "Core Number of Floors", title: "Core number of floors",
tooltip: "How many floors are there between the pavement and start of roof?", tooltip: "How many floors are there between the pavement and start of roof?",
example: 10, example: 10,
}, },
size_storeys_attic: { size_storeys_attic: {
category: Category.Size, category: Category.Size,
title: "Number of Floors within Roof Space", title: "Number of floors within roof space",
tooltip: "How many floors above start of roof?", tooltip: "How many floors above start of roof?",
example: 1, example: 1,
}, },
size_storeys_basement: { size_storeys_basement: {
category: Category.Size, category: Category.Size,
title: "Number of Floors beneath Ground Level", title: "Number of floors beneath ground Level",
tooltip: "How many floors below pavement level?", tooltip: "How many floors below pavement level?",
example: 1, example: 1,
}, },
@ -384,7 +384,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
}, },
size_width_frontage: { size_width_frontage: {
category: Category.Size, category: Category.Size,
title: "Frontage Width (m)", title: "Frontage width (m)",
example: 12.2, example: 12.2,
//tooltip: , //tooltip: ,
}, },
@ -411,28 +411,28 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
construction_core_material: { construction_core_material: {
category: Category.Construction, category: Category.Construction,
title: "Core Material", title: "Core material",
tooltip:"The main structural material", tooltip:"The main structural material",
example: "", example: "",
}, },
construction_secondary_materials: { construction_secondary_materials: {
category: Category.Construction, category: Category.Construction,
title: "Main Secondary Construction Material/s", title: "Main secondary construction material/s",
tooltip:"Other construction materials", tooltip:"Other construction materials",
example: "", example: "",
}, },
construction_roof_covering: { construction_roof_covering: {
category: Category.Construction, category: Category.Construction,
title: "Main Roof Covering", title: "Main roof covering",
tooltip:'Main roof covering material', tooltip:'Main roof covering material',
example: "", example: "",
}, },
sust_breeam_rating: { sust_breeam_rating: {
category: Category.EnergyPerformance, category: Category.EnergyPerformance,
title: "Official Environmental Quality Rating", title: "Official environmental quality rating",
tooltip: ccconfig.energy_rating, tooltip: ccconfig.energy_rating,
example: "", example: "",
}, },