Changes for #1165

colouring-cities · May 31, 2023 · 439e415 · 439e415
1 parent 79918c7
commit 439e415
Show file tree

Hide file tree

Showing 13 changed files with 1,174 additions and 461 deletions.
diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
@@ -214,6 +214,42 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true,
     },
+    size_far_ratio: {
+        edit: true,
+        verify: true,
+    },
+    size_far_ratio_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_far_ratio_source_links: {
+        edit: true,
+        verify: true,
+    },
+    size_plot_area_total: {
+        edit: true,
+        verify: true,
+    },
+    size_plot_area_total_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_plot_area_total_source_links: {
+        edit: true,
+        verify: true,
+    },
+    size_parcel_geometry: {
+        edit: true,
+        verify: true,
+    },
+    size_parcel_geometry_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_parcel_geometry_source_links: {
+        edit: true,
+        verify: true,
+    },
     construction_core_material: {
         edit: true,
         verify: true,
@@ -533,6 +569,86 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
     disaster_end_date : {
         edit: true,
         verify: true
+    },
+    context_front_garden : {
+        edit: true,
+        verify: true
+    },
+    context_back_garden : {
+        edit: true,
+        verify: true
+    },
+    context_flats_garden : {
+        edit: true,
+        verify: true
+    },
+    context_garden_source_type : {
+        edit: true,
+        verify: true
+    },
+    context_garden_source_links : {
+        edit: true,
+        verify: true
+    },
+    context_street_width : {
+        edit: true,
+        verify: true
+    },
+    context_street_width_source_type : {
+        edit: true,
+        verify: true
+    },
+    context_street_width_source_links : {
+        edit: true,
+        verify: true
+    },
+    context_pavement_width : {
+        edit: true,
+        verify: true
+    },
+    context_pavement_width_source_type : {
+        edit: true,
+        verify: true
+    },
+    context_pavement_width_source_links : {
+        edit: true,
+        verify: true
+    },
+    context_street_geometry : {
+        edit: true,
+        verify: true
+    },
+    context_street_geometry_source_type : {
+        edit: true,
+        verify: true
+    },
+    context_street_geometry_source_links : {
+        edit: true,
+        verify: true
+    },
+    context_green_space_distance : {
+        edit: true,
+        verify: true
+    },
+    context_green_space_distance_source_type : {
+        edit: true,
+        verify: true
+    },
+    context_green_space_distance_source_links : {
+        edit: true,
+        verify: true
+    },
+    context_tree_distance : {
+        edit: true,
+        verify: true
+    },
+    context_tree_distance_source_type : {
+        edit: true,
+        verify: true
+    },
+    ccontext_tree_distance_source_links : {
+        edit: true,
+        verify: true
     }
 });
 

diff --git a/app/src/frontend/building/data-containers/community.tsx b/app/src/frontend/building/data-containers/community.tsx
@@ -43,7 +43,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
         <DataEntryGroup name="Community views on building types">
         <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
             <i>
-            Note: We are not currently collecting data on domestic/privately owned properties, only on public buildings.
+                Note: We are currently only collecting data on non-residential buildings.
             </i>
         </div>
         <div className='community-opinion-pane'>
@@ -201,14 +201,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
             slug='community_public_ownership'
             title={dataFields.community_public_ownership.title}
             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',
-            ]}
-
+            options={dataFields.community_public_ownership.items}
             onChange={props.onChange}
             mode={props.mode}
             copy={props.copy}

diff --git a/app/src/frontend/building/data-containers/land-use.tsx b/app/src/frontend/building/data-containers/land-use.tsx
@@ -25,10 +25,10 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const { darkLightTheme } = useDisplayPreferences();
       return (
           <Fragment>
-                <DataEntryGroup name="Domestic/non-domestic use data">
+                <DataEntryGroup name="Residential/non-residential land use data (general)">
                     <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
                         <i>
-                            93% of properties in UK are residential dwellings so we have set 'residential' as the default value. Can you help us identify non-residential and mixed use buildings (and verify residential buildings too)?
+                            The vast majority of properties are residential (93% in the UK), so we have set 'residential' as the default value. Can you help us identify non-residential and mixed use buildings (and verify residential buildings too)?
                         </i>
                     </div>
                     <button className={`map-switcher-inline ${props.mapColourScale == "is_domestic" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToIsDomesticMapStyle}>