@powercalc/power-router 1.0.39 → 1.0.42

package/src/router/services/CommonTimestamps.ts

@@ -1,68 +1,94 @@
 import { DateTime, Duration } from "luxon";
-import { AllInResulotions, DataPoint, DataPointResolutions } from "./ParseEdifact";
+import {
+  AllInResulotions,
+  DataPoint,
+  DataPointResolutions,
+} from "./ParseEdifact";
 
 export interface Result {
-  [key: string]: (number | null)[]
+  [key: string]: (number | null)[];
 }
 
 export class CommonTimestamps {
-  static transform(all: AllInResulotions, startMonth: string, endMonth: string): Result {
+  static transform(
+    all: AllInResulotions,
+    startMonth: string,
+    endMonth: string
+  ): Result {
     const best = this.bestResolution(all);
-    const time = this.makeTimeArray(startMonth, endMonth, best)
+    const time = this.makeTimeArray(startMonth, endMonth, best);
     const result: Result = {
-      time: time
-    }
-    Object.keys(all).forEach(key => {
+      time: time,
+    };
+    Object.keys(all).forEach((key) => {
       const item = all[key];
       const interpolated = this.makeCommonTimeBase(item, time, best);
       if (interpolated) {
-        result[key] = interpolated
+        result[key] = interpolated;
+      }
+      if (key === "price") {
+        if (item["PT15M"] && item["PT60M"]) {
+          result["price15m"] = result['price'];
+          delete item['PT15M'];
+          const price60 = this.makeCommonTimeBase(item, time, best);
+          if (price60) {
+            result['price'] = price60;
+          }
+        }
       }
-    })
+    });
+    // console.log(Object.keys(result))
     return result;
   }
-  static makeCommonTimeBase(all: DataPointResolutions, newTimes: number[], best: string): (number | null)[] | undefined {
+  static makeCommonTimeBase(
+    all: DataPointResolutions,
+    newTimes: number[],
+    best: string
+  ): (number | null)[] | undefined {
     const haveToMerge = this.shouldMerge(all);
     if (haveToMerge) {
-      const all2: DataPointResolutions = {}
-      all2[best] = []
+      const all2: DataPointResolutions = {};
+      all2[best] = [];
       const keys = Object.keys(all);
-      keys.forEach(key => {
-        all2[best] = all2[best].concat(all[key])
-      })
-      all2[best] = all2[best].sort((a, b) => a.time - b.time)
-      return this.interpolate(all2, newTimes)
+      keys.forEach((key) => {
+        all2[best] = all2[best].concat(all[key]);
+      });
+      all2[best] = all2[best].sort((a, b) => a.time - b.time);
+      return this.interpolate(all2, newTimes);
     }
-    const data = all[best]
+    const data = all[best];
     if (data) {
-      return this.makeNumbers(data, newTimes)
+      return this.makeNumbers(data, newTimes);
     } else {
-      return this.interpolate(all, newTimes)
+      return this.interpolate(all, newTimes);
     }
   }
   static shouldMerge(all: DataPointResolutions): boolean {
     let start = 0;
     let end = 0;
-    const keys = Object.keys(all)
+    const keys = Object.keys(all);
     if (keys.length < 2) {
       return false;
     }
     let shouldMerge = true;
-    keys.forEach(key => {
-      const times = all[key].map(item => item.time);
+    keys.forEach((key) => {
+      const times = all[key].map((item) => item.time);
       if (start && end && start > times[0] && end < times[times.length - 1]) {
         shouldMerge = false;
       }
-      start = times[0]
-      end = times[times.length - 1]
-    })
+      start = times[0];
+      end = times[times.length - 1];
+    });
     return shouldMerge;
   }
-  static interpolate(all: DataPointResolutions, newTimes: number[]): (number | null)[] | undefined {
+  static interpolate(
+    all: DataPointResolutions,
+    newTimes: number[]
+  ): (number | null)[] | undefined {
     const best = this.best(all);
-    const dur = Duration.fromISO(best).as('milliseconds');
+    const dur = Duration.fromISO(best).as("milliseconds");
     const data: DataPoint[] = all[best];
-    const sourceTimes = data.map(item => item.time);
+    const sourceTimes = data.map((item) => item.time);
     /*
     console.log('all', new Date(all[best][0].time))
     console.log('data', new Date(data[0].time), new Date(data[data.length -1].time))
@@ -81,12 +107,13 @@ export class CommonTimestamps {
       const delta = hi.value - lo.value;
       const timeDelta = hi.time - lo.time;
       const timeFactor = (time - lo.time) / timeDelta;
-      if (timeDelta > 3600000 && dur * 1.5 < timeDelta) {   // interpolate everything that's smaller than 61 minutes
+      if (timeDelta > 3600000 && dur * 1.5 < timeDelta) {
+        // interpolate everything that's smaller than 61 minutes
         result[i] = null;
       } else {
-        result[i] = lo.value + delta * timeFactor
+        result[i] = lo.value + delta * timeFactor;
       }
-    })
+    });
     return result;
   }
 
@@ -94,13 +121,13 @@ export class CommonTimestamps {
     let lo = 0;
     let hi = arr.length - 1;
     if (arr.length === 1) {
-      return [0, 0]
+      return [0, 0];
     }
     if (arr[lo] > num) {
-      return [lo, lo + 1]
+      return [lo, lo + 1];
     }
     if (arr[hi] < num) {
-      return [hi - 1, hi]
+      return [hi - 1, hi];
     }
     while (hi - lo > 1) {
       const mid = Math.trunc((lo + hi) / 2);
@@ -109,19 +136,22 @@ export class CommonTimestamps {
       } else {
         hi = mid;
       }
-
     }
-    return [lo, hi]
+    return [lo, hi];
   }
   static makeNumbers(all: DataPoint[], newTimes: number[]): (number | null)[] {
     const result: (number | null)[] = [];
-    newTimes.forEach(time => {
-      const num = all.find(item => item.time === time)?.value || null;
-      result.push(num)
-    })
+    newTimes.forEach((time) => {
+      const num = all.find((item) => item.time === time)?.value || null;
+      result.push(num);
+    });
     return result;
   }
-  static makeTimeArray(startIsoString: string, endIsoString: string, resolution: string): number[] {
+  static makeTimeArray(
+    startIsoString: string,
+    endIsoString: string,
+    resolution: string
+  ): number[] {
     const duration = Duration.fromISO(resolution).toMillis();
     const localStartTime = DateTime.fromISO(startIsoString);
     const localEndTime = DateTime.fromISO(endIsoString);
@@ -133,7 +163,13 @@ export class CommonTimestamps {
     // Calculate time distance in milliseconds
     const timeDistance = utcEndTime.toMillis() - utcStartTime.toMillis();
     if (timeDistance < duration) {
-      console.log('timeDistance', timeDistance, duration, startIsoString, endIsoString)
+      console.log(
+        "timeDistance",
+        timeDistance,
+        duration,
+        startIsoString,
+        endIsoString
+      );
     }
     // Create an array with time distance duration in UTC time using Luxon
     const timeSteps: number[] = [];
@@ -149,12 +185,12 @@ export class CommonTimestamps {
 
   static best(all: any): string {
     let min = Infinity;
-    let minPeriod = '';
+    let minPeriod = "";
     const keys = Object.keys(all);
-    keys.forEach(period => {
+    keys.forEach((period) => {
       const dur = Duration.fromISO(period);
-      if (dur.as('minutes') < min) {
-        min = dur.as('minutes');
+      if (dur.as("minutes") < min) {
+        min = dur.as("minutes");
         minPeriod = period;
       }
     });
@@ -162,16 +198,16 @@ export class CommonTimestamps {
   }
   static bestResolution(all: any): string {
     let min = Infinity;
-    let minPeriod = '';
+    let minPeriod = "";
     Object.keys(all).forEach((key: string) => {
-      Object.keys(all[key]).forEach(period => {
+      Object.keys(all[key]).forEach((period) => {
         const dur = Duration.fromISO(period);
-        if (dur.as('minutes') < min) {
-          min = dur.as('minutes');
+        if (dur.as("minutes") < min) {
+          min = dur.as("minutes");
           minPeriod = period;
         }
-      })
-    })
+      });
+    });
     return minPeriod;
   }
-}
+}

package/src/router/services/Eurostat.ts

@@ -72,16 +72,16 @@ export class EurostatAPI {
             const select = `${chartType}/${freq}.${nrg_bal}.${siec}.${unit}`;
             const rest = `?format=JSON&lang=en&startPeriod=2015-01&endPeriod=2050-12`;
             const url = `${baseUrl}${select}${geo}${rest}`;
-            console.log(url)
+            // console.log(url)
             promises.push(this.fetchData(url, type, unit))
         }
         const res = await Promise.all(promises)
-        console.log('---res---', res)
+        // console.log('---res---', res)
         let merged: any = {};
         res.forEach(item => {
             merged = { ...merged, ...item };
         })
-        console.log('---merged----', merged)
+        // console.log('---merged----', merged)
         return merged; // this.removeElGas(merged);
     }
 }

package/src/router/services/Loader.ts

@@ -78,15 +78,13 @@ export class EntsoeLoader {
     const price = `${this.config.entsoeDomain}/api?documentType=A44&in_Domain=${priceCountryCode}&out_Domain=${priceCountryCode}&periodStart=${periodStart}&periodEnd=${periodEnd}`
     const consumption = `${this.config.entsoeDomain}/api?documentType=A65&processType=A16&in_Domain=${countryCode}&outBiddingZone_Domain=${countryCode}&periodStart=${periodStart}&periodEnd=${periodEnd}`
     const hydroFill = `${this.config.entsoeDomain}/api?documentType=A72&processType=A16&in_Domain=${countryCode}&periodStart=${hydroPeriodStart}&periodEnd=${hydroPeriodEnd}`
-    console.log(generation);
-    console.log(hydroFill);
+    //const crossBorder = `${this.config.entsoeDomain}/api?documentType=A88&acquiring_Domain=10YCZ-CEPS-----N&connecting_Domain=10YSK-SEPS-----K&periodStart=${periodStart}&periodEnd=${periodEnd}`
     const urls = {
       generation,
       price,
       consumption,
-      hydroFill,
+      hydroFill
     }
-
     const filteredUrls = this.filterURLs(urls, wanted);
     return filteredUrls;
   }
@@ -100,7 +98,6 @@ export class EntsoeLoader {
       const installed = `${this.config.entsoeDomain}/api?documentType=A68&processType=A33&in_Domain=${countryCode}&periodStart=${periodStart}&periodEnd=${periodEnd}`;
       urls.push(installed)
     }
-    console.log(urls);
     const allJsons = await this.fetchAndMakeJson(Object.values(urls), reload);
     return allJsons;
   }