Merge pull request #1424 from colouring-cities/minor-tweaks-oct-24

Fixes to Construction Year fields
colouring-cities · Oct 23, 2024 · 71135d1 · 71135d1
2 parents 5c37503 + f2ced57
commit 71135d1
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 26 deletions.
diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
@@ -135,6 +135,10 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true,
     },
+    date_year_completed: {
+        edit: true,
+        verify: true,
+    },
     date_lower: {
         edit: true,
         verify: true,

diff --git a/app/src/frontend/building/data-containers/age-history.tsx b/app/src/frontend/building/data-containers/age-history.tsx
@@ -68,16 +68,17 @@ const AgeHistoryView: React.FunctionComponent<CategoryViewProps> = (props) => {
 
     let construction_length = null;
 
-    if (props.building.date_year != null && props.building.date_lower != null) {
-        construction_length += props.building.date_year - props.building.date_lower;
+    if (props.building.date_year != null && props.building.date_year_completed != null) {
+        construction_length = props.building.date_year_completed - props.building.date_year;
+        construction_length = Math.max(construction_length, 1);
     }
 
     const queryParameters = new URLSearchParams(window.location.search);
     const subcat = queryParameters.get("sc");
 
     return (
         <Fragment>
-            <DataEntryGroup name="Architectural style/historial period" collapsed={subcat==null || subcat!="2"}>
+            <DataEntryGroup name="Architectural style/historical period" collapsed={subcat==null || subcat!="2"}>
                 {(props.mapColourScale != "typology_style_period") ? 
                     <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark key-button`} onClick={switchToStylePeriodMapStyle}>
                         Click to show architectural style.
@@ -142,44 +143,44 @@ const AgeHistoryView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     <></>
                 }
                 <NumericDataEntry
-                    title={dataFields.date_lower.title}
-                    slug="date_lower"
-                    value={props.building.date_lower}
+                    title={dataFields.date_year.title}
+                    slug="date_year"
+                    value={props.building.date_year}
                     mode={props.mode}
                     copy={props.copy}
                     onChange={props.onChange}
                     step={1}
                     min={1}
-                    max={currentYear}
-                    tooltip={dataFields.date_lower.tooltip}
+                    max={props.building.date_year_completed}
+                    tooltip={dataFields.date_year.tooltip}
                     />
                 <Verification
-                    slug="date_lower"
-                    allow_verify={props.user !== undefined && props.building.date_lower !== null && !props.edited}
+                    slug="date_year"
+                    allow_verify={props.user !== undefined && props.building.date_year !== null && !props.edited}
                     onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("date_lower")}
-                    user_verified_as={props.user_verified.date_lower}
-                    verified_count={props.building.verified.date_lower}
+                    user_verified={props.user_verified.hasOwnProperty("date_year")}
+                    user_verified_as={props.user_verified.date_year}
+                    verified_count={props.building.verified.date_year}
                     />
                 <NumericDataEntry
-                    title={dataFields.date_year.title}
-                    slug="date_year"
-                    value={props.building.date_year}
+                    title={dataFields.date_year_completed.title}
+                    slug="date_year_completed"
+                    value={props.building.date_year_completed}
                     mode={props.mode}
                     copy={props.copy}
                     onChange={props.onChange}
                     step={1}
-                    min={1}
+                    min={props.building.date_year}
                     max={currentYear}
-                    tooltip={dataFields.date_year.tooltip}
+                    tooltip={dataFields.date_year_completed.tooltip}
                     />
                 <Verification
-                    slug="date_year"
-                    allow_verify={props.user !== undefined && props.building.date_year !== null && !props.edited}
+                    slug="date_year_completed"
+                    allow_verify={props.user !== undefined && props.building.date_year_completed !== null && !props.edited}
                     onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("date_year")}
-                    user_verified_as={props.user_verified.date_year}
-                    verified_count={props.building.verified.date_year}
+                    user_verified={props.user_verified.hasOwnProperty("date_year_completed")}
+                    user_verified_as={props.user_verified.date_year_completed}
+                    verified_count={props.building.verified.date_year_completed}
                     />
                 <NumericDataEntry
                     title="Estimated duration of construction (years)"

diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
@@ -524,10 +524,16 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     date_year: {
         category: Category.AgeHistory,
-        title: "Year of construction completed (best estimate)",
-        tooltip: "Best estimate for the year that construction of main body of the building was completed.",
+        title: "Year construction started (best estimate)",
+        tooltip: "Best estimate for the year that construction began on this building.",
         example: 1924,
     },
+    date_year_completed: {
+        category: Category.AgeHistory,
+        title: "Year construction completed (best estimate)",
+        tooltip: "Best estimate for the year that construction completed on this building.",
+        example: 1925,
+    },
     date_lower: {
         category: Category.AgeHistory,
         title: "Year construction started (best estimate)",
@@ -556,7 +562,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     date_source_links: {
         category: Category.AgeHistory,
         title: "Alternative Source link(s)",
-        tooltip: "URL(s) for historial data source(s) - Alternative data source(s)",
+        tooltip: "URL(s) for historical data source(s) - Alternative data source(s)",
         example: ["", "", ""],
     },
     size_storeys_core: {

diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
@@ -43,6 +43,13 @@ const LAYER_QUERIES = {
         FROM
             buildings
         WHERE date_year IS NOT NULL`,
+    date_year_completed: `
+        SELECT
+            geometry_id,
+            date_year_completed
+        FROM
+            buildings
+        WHERE date_year_completed IS NOT NULL`,
     size_storeys: `
         SELECT
             geometry_id,

diff --git a/migrations/054.building_age.down.sql b/migrations/054.building_age.down.sql
@@ -0,0 +1 @@
+ALTER TABLE buildings DROP COLUMN IF EXISTS date_year_completed;
diff --git a/migrations/054.building_age.up.sql b/migrations/054.building_age.up.sql
@@ -0,0 +1 @@
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS date_year_completed integer NULL;