Merge pull request #615 from openclimatefix/development

✨ Quartz Solar v0.5.8 → Staging

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/package.json

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