Merge pull request #617 from openclimatefix/staging

🚀 Quartz Solar v0.5.8 → Production (/pvlive/all sort order)

Author: braddf

apps/nowcasting-app/components/charts/gsp-pv-remix-chart/index.tsx

@@ -80,10 +80,12 @@ const GspPvRemixChart: FC<{
   //
 
   // get the latest Actual pv value in GW
-  const latestPvActualInMW = KWtoMW(pvRealDataIn?.[0]?.solarGenerationKw || 0);
+  const latestPvActualInMW = KWtoMW(
+    pvRealDataIn?.[pvRealDataIn.length - 1]?.solarGenerationKw || 0
+  );
 
   // get pv time
-  const latestPvActualDatetime = pvRealDataIn?.[0]?.datetimeUtc || timeNow;
+  const latestPvActualDatetime = pvRealDataIn?.[pvRealDataIn.length - 1]?.datetimeUtc || timeNow;
 
   // Use the same time for the Forecast historic
   const pvForecastDatetime = formatISODateString(latestPvActualDatetime);

apps/nowcasting-app/components/charts/gsp-pv-remix-chart/use-get-gsp-data.ts

@@ -8,13 +8,20 @@ import { useLoadDataFromApi } from "../../hooks/useLoadDataFromApi";
 import { NationalAggregation } from "../../map/types";
 import { components } from "../../../types/quartz-api";
 import { getEarliestForecastTimestamp } from "../../helpers/data";
+import * as Sentry from "@sentry/react";
 
 const aggregateTruthData = (
   pvDataRaw: components["schemas"]["GSPYieldGroupByDatetime"][] | undefined,
   gspIds: number[],
   key: string
 ) => {
   if (!pvDataRaw?.length) return [];
+
+  if (pvDataRaw[0].datetimeUtc > pvDataRaw[pvDataRaw.length - 1].datetimeUtc) {
+    // If the data is not in chronological order, i.e. oldest first, reverse it
+    Sentry.captureMessage("Reversing pvDataRaw order in aggregateTruthData", "info");
+    pvDataRaw = pvDataRaw.reverse();
+  }
   return pvDataRaw?.map((d) => {
     return {
       datetimeUtc: d.datetimeUtc,

apps/nowcasting-app/data/dno_gsp_groupings.json

@@ -1,5 +1,5 @@
 {
-  "WPD (South West)": [
+  "NGED (South West)": [
     1,
     8,
     13,
@@ -74,7 +74,7 @@
     311,
     313
   ],
-  "WPD (South Wales)": [
+  "NGED (South Wales)": [
     3,
     7,
     55,
@@ -235,7 +235,7 @@
     258,
     315
   ],
-  "WPD (East Midlands)": [
+  "NGED (East Midlands)": [
     23,
     24,
     66,
@@ -265,7 +265,7 @@
     292,
     316
   ],
-  "WPD (Midlands)": [
+  "NGED (Midlands)": [
     26,
     48,
     49,

apps/nowcasting-app/data/dno_license_areas_20200506.json

@@ -3578,7 +3578,7 @@
     },
     {
       "type": "Feature",
-      "properties": { "ID": 11, "Name": "_B", "LongName": "WPD (East Midlands)" },
+      "properties": { "ID": 11, "Name": "_B", "LongName": "NGED (East Midlands)" },
       "geometry": {
         "type": "MultiPolygon",
         "coordinates": [
@@ -14505,7 +14505,7 @@
     },
     {
       "type": "Feature",
-      "properties": { "ID": 14, "Name": "_E", "LongName": "WPD (Midlands)" },
+      "properties": { "ID": 14, "Name": "_E", "LongName": "NGED (Midlands)" },
       "geometry": {
         "type": "MultiPolygon",
         "coordinates": [
@@ -43401,7 +43401,7 @@
     },
     {
       "type": "Feature",
-      "properties": { "ID": 21, "Name": "_K", "LongName": "WPD (South Wales)" },
+      "properties": { "ID": 21, "Name": "_K", "LongName": "NGED (South Wales)" },
       "geometry": {
         "type": "MultiPolygon",
         "coordinates": [
@@ -46208,7 +46208,7 @@
     },
     {
       "type": "Feature",
-      "properties": { "ID": 22, "Name": "_L", "LongName": "WPD (South West)" },
+      "properties": { "ID": 22, "Name": "_L", "LongName": "NGED (South West)" },
       "geometry": {
         "type": "MultiPolygon",
         "coordinates": [

apps/nowcasting-app/data/dno_regions_lat_long_converted.json

@@ -14246,7 +14246,7 @@
       "properties": {
         "ID": 11,
         "Name": "_B",
-        "LongName": "WPD (East Midlands)"
+        "LongName": "NGED (East Midlands)"
       },
       "geometry": {
         "type": "MultiPolygon",
@@ -57831,7 +57831,7 @@
       "properties": {
         "ID": 14,
         "Name": "_E",
-        "LongName": "WPD (Midlands)"
+        "LongName": "NGED (Midlands)"
       },
       "geometry": {
         "type": "MultiPolygon",
@@ -171992,7 +171992,7 @@
       "properties": {
         "ID": 21,
         "Name": "_K",
-        "LongName": "WPD (South Wales)"
+        "LongName": "NGED (South Wales)"
       },
       "geometry": {
         "type": "MultiPolygon",
@@ -183113,7 +183113,7 @@
       "properties": {
         "ID": 22,
         "Name": "_L",
-        "LongName": "WPD (South West)"
+        "LongName": "NGED (South West)"
       },
       "geometry": {
         "type": "MultiPolygon",

apps/nowcasting-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclimatefix/nowcasting-app",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "private": true,
   "scripts": {
     "dev": "next dev -p 3002",

apps/nowcasting-app/pages/index.tsx

@@ -75,7 +75,9 @@ export default function Home({ dashboardModeServer }: { dashboardModeServer: str
   const [, setSitesLoadingState] = useGlobalState("sitesLoadingState");
   const [, setLoadingState] = useGlobalState("loadingState");
   const [nHourForecast] = useGlobalState("nHourForecast");
-  const [nationalAggregationLevel] = useGlobalState("nationalAggregationLevel");
+  const [nationalAggregationLevel, setNationalAggregationLevel] = useGlobalState(
+    "nationalAggregationLevel"
+  );
   const [, setClickedGspId] = useGlobalState("clickedGspId");
 
   const [forecastLastFetch30MinISO, setForecastLastFetch30MinISO] = useState(get30MinNow(-30));
@@ -112,11 +114,15 @@ export default function Home({ dashboardModeServer }: { dashboardModeServer: str
     setArraySettingInCookieStorage(CookieStorageKeys.VISIBLE_LINES, visibleLines);
   }, [visibleLines]);
 
-  // On view change, unset the clicked "GSP" if the aggregation is not GSP
+  // On view change, unset the clicked region if the aggregation is not GSP,
+  // and set the national aggregation level to GSP if we're now on Delta view
   useEffect(() => {
     if (nationalAggregationLevel !== NationalAggregation.GSP) {
       setClickedGspId(undefined);
     }
+    if (view === VIEWS.DELTA) {
+      setNationalAggregationLevel(NationalAggregation.GSP);
+    }
   }, [view]);
 
   const currentView = (v: VIEWS) => v === view;