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

Merge branch 'master' into feature/display-of-planning-data

Browse Source
This commit is contained in:
Mateusz Konieczny 2022-11-30 15:05:09 +01:00
commit 7039c0cefa
2 changed files with 232 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import NumericDataEntry from '../data-components/numeric-data-entry';
import UserOpinionEntry from '../data-components/user-opinion-data-entry';
import DataEntry from '../data-components/data-entry';
import { LogicalDataEntry } from '../data-components/logical-data-entry/logical-data-entry';
import { DataEntryGroup } from '../data-components/data-entry-group';
import SelectDataEntry from '../data-components/select-data-entry';
import Verification from '../data-components/verification';
@ -138,8 +139,91 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
<InfoBox type='danger'>To also add your opinion on how well this building works for the community, visit <Link to={communityLinkUrl}>Community</Link> section.</InfoBox>
</DataEntryGroup>
</DataEntryGroup>
<DataEntryGroup name="Planning contraints and building protection" collapsed={true} >
<DataEntryGroup name="Building protection" collapsed={false} >
<DataEntryGroup name="Planning zones" collapsed={true} >
<InfoBox type='success'>
Data in this section comes from the Greater London Authority's Planning London Datahub. Please check the original GLA source when using for planning purposes.
</InfoBox>
<LogicalDataEntry
title="Is the building inside a flood zone?"
slug="planning_live_application"
value={null}
disabled={true}
/>
{/*
<form className={`layer-switcher-inline`}>
<button className="btn btn-outline btn-outline-dark"
type="submit">
Click to see the data mapped
</button>
</form>
*/}
<LogicalDataEntry
title="Is the building in a strategic development zone for housing?"
slug="planning_live_application"
value={null}
disabled={true}
/>
{/*
<form className={`layer-switcher-inline`}>
<button className="btn btn-outline btn-outline-dark"
type="submit">
Click to see the data mapped
</button>
</form>
*/}
<LogicalDataEntry
title="Is the building in a strategic development zone for commerce or industry?"
slug="planning_live_application"
value={null}
disabled={true}
/>
{/*
<form className={`layer-switcher-inline`}>
<button className="btn btn-outline btn-outline-dark"
type="submit">
Click to see the data mapped
</button>
</form>
*/}
<LogicalDataEntry
title="Is the building within a protected sightline?"
slug="planning_live_application"
value={null}
disabled={true}
/>
{/*
<form className={`layer-switcher-inline`}>
<button className="btn btn-outline btn-outline-dark"
type="submit">
Click to see the data mapped
</button>
</form>
*/}
{/*
<DataEntry
title={dataFields.planning_glher_url.title}
slug="planning_glher_url"
value={props.building.planning_glher_url}
mode={props.mode}
copy={props.copy}
onChange={props.onChange}
isUrl={true}
placeholder="Please add relevant link here"
/>
<Verification
slug="planning_glher_url"
allow_verify={props.user !== undefined && props.building.planning_glher_url !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("planning_glher_url")}
user_verified_as={props.user_verified.planning_glher_url}
verified_count={props.building.verified.planning_glher_url}
/>
*/}
</DataEntryGroup>
<DataEntryGroup name="Building protection" collapsed={true} >
<InfoBox type='success'>
This section provides information on heritage assets and building protection. To produce the most accurate spatial map possible we need to combine official data with crowdsourced data. Help us create this map together by checking, verifying and adding information.
</InfoBox>
<NumericDataEntryWithFormattedLink
title={dataFields.planning_list_id.title}
slug="planning_list_id"
@ -237,8 +321,8 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
user_verified_as={props.user_verified.planning_local_list_url}
verified_count={props.building.verified.planning_local_list_url}
/>
</DataEntryGroup>
<DataEntryGroup name="Area protection" collapsed={false} >
{/*
<DataEntry
title={dataFields.planning_in_conservation_area_id.title}
slug="planning_in_conservation_area_id"
@ -256,6 +340,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
user_verified_as={props.user_verified.planning_in_conservation_area_url}
verified_count={props.building.verified.planning_in_conservation_area_url}
/>
*/}
<DataEntry
title={dataFields.planning_in_conservation_area_url.title}
slug="planning_in_conservation_area_url"
@ -266,6 +351,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
isUrl={true}
placeholder="Please add CA appraisal link here"
/>
{/*
<DataEntry
title={dataFields.planning_conservation_area_name.title}
slug="planning_conservation_area_name"
@ -282,6 +368,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
user_verified_as={props.user_verified.planning_conservation_area_name}
verified_count={props.building.verified.planning_conservation_area_name}
/>
*/}
<DataEntry
title={dataFields.planning_historic_area_assessment_url.title}
slug="planning_historic_area_assessment_url"
@ -319,86 +406,10 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
verified_count={props.building.verified.planning_in_apa_url}
/>
</DataEntryGroup>
</DataEntryGroup>
<DataEntryGroup name="Other types of zoning" collapsed={true} >
<CheckboxDataEntry
title="Is the building inside a flood zone?"
slug="planning_live_application"
value={null}
disabled={true}
/>
<Verification
slug="dummy"
allow_verify={false}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("dummy")}
user_verified_as={props.user_verified.planning_in_apa_url}
verified_count={props.building.verified.planning_in_apa_url}
/>
<CheckboxDataEntry
title="Is the building in a strategic development zone for housing?"
slug="planning_live_application"
value={null}
disabled={true}
/>
<Verification
slug="dummy"
allow_verify={false}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("dummy")}
user_verified_as={props.user_verified.planning_in_apa_url}
verified_count={props.building.verified.planning_in_apa_url}
/>
<CheckboxDataEntry
title="Is the building in a strategic development zone for commerce or industry?"
slug="planning_live_application"
value={null}
disabled={true}
/>
<Verification
slug="dummy"
allow_verify={false}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("dummy")}
user_verified_as={props.user_verified.planning_in_apa_url}
verified_count={props.building.verified.planning_in_apa_url}
/>
<CheckboxDataEntry
title="Is the building within a protected sightline?"
slug="planning_live_application"
value={null}
disabled={true}
/>
<Verification
slug="dummy"
allow_verify={false}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("dummy")}
user_verified_as={props.user_verified.planning_in_apa_url}
verified_count={props.building.verified.planning_in_apa_url}
/>
{/*
<DataEntry
title={dataFields.planning_glher_url.title}
slug="planning_glher_url"
value={props.building.planning_glher_url}
mode={props.mode}
copy={props.copy}
onChange={props.onChange}
isUrl={true}
placeholder="Please add relevant link here"
/>
<Verification
slug="planning_glher_url"
allow_verify={props.user !== undefined && props.building.planning_glher_url !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("planning_glher_url")}
user_verified_as={props.user_verified.planning_glher_url}
verified_count={props.building.verified.planning_glher_url}
/>
*/}
</DataEntryGroup>
<DataEntryGroup name="Land parcel ownership" collapsed={true} >
<DataEntryGroup name="Land ownership type" collapsed={true} >
<InfoBox type='success'>
This section is designed to provide information on land parcels and their ownership type. Can you help us to crowdsource this information?
</InfoBox>
<SelectDataEntry
slug='community_public_ownership'
title={"What type of owner owns this land parcel? "}

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

@ -546,7 +546,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
},
planning_historic_area_assessment_url: {
category: Category.Planning,
title: "Does it have any other type of <a href=\"https://historicengland.org.uk/images-books/publications/understanding-place-historic-area-assessments/\" target=\"_blank\">Historic Area Assessment</a>?",
title: "Does it have an <a href=\"https://historicengland.org.uk/images-books/publications/understanding-place-historic-area-assessments/\" target=\"_blank\">Historic Area Assessment</a>?",
example: "",
//tooltip: ,
},