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

app/src/frontend/building/data-containers/planning.tsx

@@ -268,6 +268,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     verified_count={props.building.verified.planning_in_apa_url}
                     />
             </DataEntryGroup>
+        </DataEntryGroup>
         <DataEntryGroup name="Other types of zoning" collapsed={false} >
             <CheckboxDataEntry
             title="Is the building inside a flood zone?"
@@ -346,6 +347,31 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 />
             */}
         </DataEntryGroup>
+        <DataEntryGroup name="Land parcel ownership" collapsed={false} >
+                <SelectDataEntry
+                    slug='community_public_ownership'
+                    title={"What type of owner owns this land parcel? "}
+                    value={props.building.community_public_ownership}
+                    options={[
+                        'Government-owned',
+                        'Charity-owned',
+                        'Community-owned/cooperative',
+                        'Owned by other non-profit body',
+                        'Not in public/community ownership',
+                    ]}
+
+                    onChange={props.onChange}
+                    mode={props.mode}
+                    copy={props.copy}
+                />
+                <Verification
+                    slug="community_public_ownership"
+                    allow_verify={props.user !== undefined && props.building.community_public_ownership !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("community_public_ownership")}
+                    user_verified_as={props.user_verified.community_public_ownership}
+                    verified_count={props.building.verified.community_public_ownership}
+                />
         </DataEntryGroup>
     </Fragment>
 )};