From 1d17dfa2918fa8808c196c78dc36900e551c4826 Mon Sep 17 00:00:00 2001 From: Abby Vath Meyer Date: Tue, 4 Feb 2025 18:58:57 +0000 Subject: [PATCH] Add offshore solutions to priority areas report --- project/datasources.json | 15 +++++++++++++++ project/metrics.json | 2 +- project/precalc.json | 16 ++++++++++++++++ src/components/PriorityAreas.tsx | 7 ++++++- src/components/RenewableEnergy.tsx | 5 ----- 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/project/datasources.json b/project/datasources.json index 0bddb58..c698b67 100644 --- a/project/datasources.json +++ b/project/datasources.json @@ -1074,5 +1074,20 @@ "created": "2024-10-24T20:02:03.953Z", "lastUpdated": "2024-10-24T20:02:03.953Z", "src": "data/src/Analytics/SiteSuitability/wave_energy1.tif" + }, + { + "src": "data/src/Analytics/PriorityModel/prioritySolutionsEEZ.fgb", + "layerName": "prioritySolutionsEEZ", + "geo_type": "vector", + "datasourceId": "prioritySolutionsEEZ", + "formats": [ + "fgb" + ], + "classKeys": [], + "created": "2025-02-04T18:27:41.558Z", + "lastUpdated": "2025-02-04T18:27:41.558Z", + "propertiesToKeep": [], + "explodeMulti": true, + "precalc": true } ] diff --git a/project/metrics.json b/project/metrics.json index 9e4ed53..0923878 100644 --- a/project/metrics.json +++ b/project/metrics.json @@ -124,7 +124,7 @@ { "classId": "priorityAreas", "display": "Priority Areas", - "datasourceId": "priorityModel" + "datasourceId": "prioritySolutionsEEZ" } ] }, diff --git a/project/precalc.json b/project/precalc.json index d05bdb0..4b7c5e4 100644 --- a/project/precalc.json +++ b/project/precalc.json @@ -471,6 +471,14 @@ "groupId": null, "value": 411369085.8030003 }, + { + "geographyId": "world", + "metricId": "area", + "classId": "prioritySolutionsEEZ-total", + "sketchId": null, + "groupId": null, + "value": 96890475499.21095 + }, { "geographyId": "world", "metricId": "area", @@ -1095,6 +1103,14 @@ "groupId": null, "value": 645 }, + { + "geographyId": "world", + "metricId": "count", + "classId": "prioritySolutionsEEZ-total", + "sketchId": null, + "groupId": null, + "value": 648 + }, { "geographyId": "world", "metricId": "count", diff --git a/src/components/PriorityAreas.tsx b/src/components/PriorityAreas.tsx index 5a4b1f1..9440d15 100644 --- a/src/components/PriorityAreas.tsx +++ b/src/components/PriorityAreas.tsx @@ -75,7 +75,12 @@ export const PriorityAreas: React.FunctionComponent = (props) => {

+ + {isCollection ? genNetwork(data) : genSingle(data, userAttributes)} diff --git a/src/components/RenewableEnergy.tsx b/src/components/RenewableEnergy.tsx index bb34163..8c1995f 100644 --- a/src/components/RenewableEnergy.tsx +++ b/src/components/RenewableEnergy.tsx @@ -5,17 +5,12 @@ import { Collapse, ReportError, ResultsCard, - SketchClassTable, useSketchProperties, } from "@seasketch/geoprocessing/client-ui"; import { GeogProp, - Metric, - MetricGroup, ReportResult, - flattenBySketchAllClass, metricsWithSketchId, - toNullSketchArray, toPercentMetric, } from "@seasketch/geoprocessing/client-core"; import project from "../../project/projectClient.js";