add DNO aggregation to map

openclimatefix · Nov 25, 2024 · b609b05 · b609b05
1 parent 87afcb4
commit b609b05
Show file tree

Hide file tree

Showing 5 changed files with 383 additions and 12 deletions.
diff --git a/apps/nowcasting-app/components/helpers/data.ts b/apps/nowcasting-app/components/helpers/data.ts
@@ -1,8 +1,10 @@
 import { components } from "../../types/quartz-api";
-import { CombinedData, GspDeltaValue, MapFeatureObject } from "../types";
+import { CombinedData, GspDeltaValue, GspZoneGroupings, MapFeatureObject } from "../types";
 import { Feature, FeatureCollection, GeoJsonProperties, Geometry, Position } from "geojson";
 import gspShapeData from "../../data/gsp_regions_20220314.json";
+import dnoShapeData from "../../data/dno_regions_lat_long_converted.json";
 import ngGSPZoneGroupings from "../../data/ng_gsp_zone_groupings.json";
+import dnoGspGroupings from "../../data/dno_gsp_groupings.json";
 import ngZones from "../../data/ng_zones.json";
 import { formatISODateString, getOpacityValueFromPVNormalized, getRoundedPv } from "./utils";
 import { get30MinNow } from "./globalState";
@@ -133,29 +135,32 @@ const mapGspFeatures: (
 // TODO BRAD: map/aggregate all the GSP data to the zone level
 const mapZoneFeatures: (
   features: Feature[],
+  gspZoneGroupings: GspZoneGroupings,
   combinedData?: CombinedData,
   gspForecastsDataByTimestamp?: components["schemas"]["OneDatetimeManyForecastValues"][],
   targetTime?: string,
-  gspDeltas?: Map<string, GspDeltaValue>
+  gspDeltas?: Map<string, GspDeltaValue>,
+  idKey?: string
 ) => Feature[] = (
   features,
+  gspZoneGroupings,
   combinedData,
   gspForecastsDataByTimestamp = [],
   targetTime,
-  gspDeltas
+  gspDeltas,
+  idKey = "id"
 ) => {
   if (!targetTime) return [];
   // Loop through ng_zones data and aggregate the forecast and actuals
   const newFeatures: Feature[] = features.map((feature) => {
-    if (!feature.properties?.id) return feature;
-    if (!ngGSPZoneGroupings[feature.properties.id as keyof typeof ngGSPZoneGroupings])
-      return feature;
+    const zoneId = feature.properties?.[idKey as keyof typeof gspZoneGroupings];
+    if (!zoneId) return feature;
+    const zoneGspIds: number[] = gspZoneGroupings[zoneId as keyof typeof gspZoneGroupings];
+    if (!zoneGspIds) return feature;
     let zoneForecastTotal = 0;
     let zoneActualTotal = 0;
     let zoneInstalledCapacity = 0;
-    const gspIds: number[] =
-      ngGSPZoneGroupings[feature.properties.id as keyof typeof ngGSPZoneGroupings];
-    gspIds.forEach((gsp: number) => {
+    zoneGspIds.forEach((gsp: number) => {
       zoneForecastTotal +=
         gspForecastsDataByTimestamp.find(
           (fc) => fc.datetimeUtc.slice(0, 16) === formatISODateString(targetTime)
@@ -171,11 +176,11 @@ const mapZoneFeatures: (
     });
     return {
       ...feature,
-      id: feature.properties.id,
+      id: zoneId,
       type: "Feature" as "Feature",
       properties: setFeatureObjectProps(
         feature.properties,
-        { regionName: feature.properties.id, installedCapacityMw: zoneInstalledCapacity },
+        { regionName: zoneId, installedCapacityMw: zoneInstalledCapacity },
         zoneForecastTotal,
         zoneActualTotal
       )
@@ -232,10 +237,22 @@ export const generateGeoJsonForecastData: (
     console.log("aggregating to zone");
     features = mapZoneFeatures(
       ngZones.features as Feature<Geometry, GeoJsonProperties>[],
+      ngGSPZoneGroupings,
       combinedData,
       gspForecastsDataByTimestamp,
       targetTime
     );
+  } else if (aggregation === NationalAggregation.DNO) {
+    console.log("aggregating to DNO");
+    features = mapZoneFeatures(
+      dnoShapeData.features as Feature<Geometry, GeoJsonProperties>[],
+      dnoGspGroupings,
+      combinedData,
+      gspForecastsDataByTimestamp,
+      targetTime,
+      undefined,
+      "LongName"
+    );
   }
   const forecastGeoJson = {
     type: "FeatureCollection" as "FeatureCollection",

diff --git a/apps/nowcasting-app/components/map/measuringUnit.tsx b/apps/nowcasting-app/components/map/measuringUnit.tsx
@@ -102,6 +102,14 @@ const MeasuringUnit = ({
             text={"NG Zones"}
             value={NationalAggregation.zone}
           />
+          <MapUIButton<NationalAggregation>
+            id={"GroupButtonZones"}
+            active={nationalAggregation === NationalAggregation.DNO}
+            isLoading={isLoading}
+            onToggle={onToggleAggregation}
+            text={"DNO"}
+            value={NationalAggregation.DNO}
+          />
         </div>
       </div>
     </>

diff --git a/apps/nowcasting-app/components/map/types.ts b/apps/nowcasting-app/components/map/types.ts
@@ -8,7 +8,8 @@ export enum ActiveUnit {
 
 export enum NationalAggregation {
   GSP = "GSP",
-  zone = "Zone"
+  zone = "Zone",
+  DNO = "DNO"
 }
 
 export enum SelectedData {

diff --git a/apps/nowcasting-app/components/types.d.ts b/apps/nowcasting-app/components/types.d.ts
@@ -311,3 +311,7 @@ export type MapFeatureObject = {
   id?: string | number | undefined;
   bbox?: BBox | undefined;
 };
+
+export type GspZoneGroupings = {
+  [key]: number[];
+};