@powercalc/power-router 1.1.23 → 1.1.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/controllers/Resample.d.ts +9 -0
- package/dist/controllers/Resample.js +76 -0
- package/dist/controllers/Resample.js.map +1 -0
- package/dist/controllers/Router.js +7 -2
- package/dist/controllers/Router.js.map +1 -1
- package/dist/services/EnergyCharts.js +1 -0
- package/dist/services/EnergyCharts.js.map +1 -1
- package/dist/services/ParseEdifact.d.ts +3 -3
- package/dist/services/ParseEdifact.js +39 -29
- package/dist/services/ParseEdifact.js.map +1 -1
- package/package.json +1 -1
- package/src/router/controllers/Resample.ts +83 -0
- package/src/router/controllers/Router.ts +7 -2
- package/src/router/services/EnergyCharts.ts +1 -0
- package/src/router/services/ParseEdifact.ts +88 -63
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Resample = void 0;
|
|
4
|
+
class Resample {
|
|
5
|
+
// Static method to change time resolution
|
|
6
|
+
static changeTimeResolution(data, intervalMs) {
|
|
7
|
+
var _a;
|
|
8
|
+
const result = { time: [] };
|
|
9
|
+
// Initialize arrays in result for each key in the input data (except `time`)
|
|
10
|
+
for (const key in data) {
|
|
11
|
+
if (key !== 'time') {
|
|
12
|
+
result[key] = [];
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
const tempData = {};
|
|
16
|
+
let startInterval = data.time[0];
|
|
17
|
+
let endInterval = startInterval + intervalMs;
|
|
18
|
+
// Initialize temp arrays for each key in data
|
|
19
|
+
for (const key in data) {
|
|
20
|
+
if (key !== 'time') {
|
|
21
|
+
tempData[key] = [];
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
data.time.forEach((timestamp, index) => {
|
|
25
|
+
if (timestamp < endInterval) {
|
|
26
|
+
// Collect data for each key within the current interval
|
|
27
|
+
for (const key in data) {
|
|
28
|
+
if (key !== 'time') {
|
|
29
|
+
tempData[key].push(data[key][index]);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
// Calculate average for each key and push to result
|
|
35
|
+
for (const key in tempData) {
|
|
36
|
+
result[key].push(this.average(tempData[key]));
|
|
37
|
+
}
|
|
38
|
+
result.time.push(startInterval);
|
|
39
|
+
// Reset for the next interval
|
|
40
|
+
startInterval = endInterval;
|
|
41
|
+
endInterval += intervalMs;
|
|
42
|
+
// Clear tempData and start collecting new interval data
|
|
43
|
+
for (const key in tempData) {
|
|
44
|
+
tempData[key] = [data[key][index]];
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
// Push the last interval's averages
|
|
49
|
+
if ((_a = tempData.price) === null || _a === void 0 ? void 0 : _a.length) {
|
|
50
|
+
for (const key in tempData) {
|
|
51
|
+
result[key].push(this.average(tempData[key]));
|
|
52
|
+
}
|
|
53
|
+
result.time.push(startInterval);
|
|
54
|
+
}
|
|
55
|
+
return result;
|
|
56
|
+
}
|
|
57
|
+
// Static helper function to calculate average, ignoring nulls
|
|
58
|
+
static average(arr) {
|
|
59
|
+
const filtered = arr.filter((value) => value !== null);
|
|
60
|
+
return filtered.length > 0 ? filtered.reduce((sum, val) => sum + val, 0) / filtered.length : 0;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
exports.Resample = Resample;
|
|
64
|
+
/*
|
|
65
|
+
// Example Usage
|
|
66
|
+
const chartData: ChartData = {
|
|
67
|
+
price: [30.02, 29.85, 22.14, 22.49, 22.97, 23.05],
|
|
68
|
+
solar: [null, null, null, 7, 71, 157],
|
|
69
|
+
wind: [15, null, 10, null, 35, 45],
|
|
70
|
+
time: [1522540800000, 1522544400000, 1522548000000, 1522551600000, 1522555200000, 1522558800000]
|
|
71
|
+
};
|
|
72
|
+
|
|
73
|
+
const hourlyData = ChartDataProcessor.changeTimeResolution(chartData, 60 * 60 * 1000); // 1-hour interval
|
|
74
|
+
console.log(hourlyData);
|
|
75
|
+
*/
|
|
76
|
+
//# sourceMappingURL=Resample.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Resample.js","sourceRoot":"","sources":["../../src/router/controllers/Resample.ts"],"names":[],"mappings":";;;AAKA,MAAc,QAAQ;IAClB,0CAA0C;IAC1C,MAAM,CAAC,oBAAoB,CAAC,IAAe,EAAE,UAAkB;;QAC7D,MAAM,MAAM,GAAc,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAEvC,6EAA6E;QAC7E,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,GAAG,KAAK,MAAM,EAAE;gBAClB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;aAClB;SACF;QAED,MAAM,QAAQ,GAAyC,EAAE,CAAC;QAC1D,IAAI,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,WAAW,GAAG,aAAa,GAAG,UAAU,CAAC;QAE7C,8CAA8C;QAC9C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,GAAG,KAAK,MAAM,EAAE;gBAClB,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;aACpB;SACF;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YACrC,IAAI,SAAS,GAAG,WAAW,EAAE;gBAC3B,wDAAwD;gBACxD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;oBACtB,IAAI,GAAG,KAAK,MAAM,EAAE;wBAClB,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;qBACtC;iBACF;aACF;iBAAM;gBACL,oDAAoD;gBACpD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;oBAC1B,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAC/C;gBACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAEhC,8BAA8B;gBAC9B,aAAa,GAAG,WAAW,CAAC;gBAC5B,WAAW,IAAI,UAAU,CAAC;gBAE1B,wDAAwD;gBACxD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;oBAC1B,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;iBACpC;aACF;QACH,CAAC,CAAC,CAAC;QAEH,oCAAoC;QACpC,IAAI,MAAA,QAAQ,CAAC,KAAK,0CAAE,MAAM,EAAE;YAC1B,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;gBAC1B,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAC/C;YACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACjC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,8DAA8D;IACtD,MAAM,CAAC,OAAO,CAAC,GAAsB;QAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;QACxE,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACjG,CAAC;CACF;AAjEH,4BAiEG;AACF;;;;;;;;;;;EAWE"}
|
|
@@ -9,6 +9,7 @@ const node_buffer_1 = require("node:buffer");
|
|
|
9
9
|
const fs_1 = require("fs");
|
|
10
10
|
const LoadAndParse_1 = require("./LoadAndParse");
|
|
11
11
|
const path_1 = require("path");
|
|
12
|
+
const Resample_1 = require("./Resample");
|
|
12
13
|
class PowerRouter {
|
|
13
14
|
static init(config) {
|
|
14
15
|
//console.log('init', config)
|
|
@@ -93,7 +94,11 @@ class PowerRouter {
|
|
|
93
94
|
// if no cache hit, load data and store in cache
|
|
94
95
|
if (!cacheData) {
|
|
95
96
|
// LOAD THE DATA FROM SOURCE
|
|
96
|
-
|
|
97
|
+
let body = await entsoeLoader.get(req, type);
|
|
98
|
+
// by default go with 60 min interval
|
|
99
|
+
if (!req.query.fullres) {
|
|
100
|
+
body = Resample_1.Resample.changeTimeResolution(body, 60 * 60 * 1000);
|
|
101
|
+
}
|
|
97
102
|
const buf = node_buffer_1.Buffer.from(JSON.stringify(body), 'utf-8');
|
|
98
103
|
const cacheDataBuffer = (0, zlib_1.gzipSync)(buf);
|
|
99
104
|
if (Object.keys(body).length > 1) {
|
|
@@ -109,7 +114,7 @@ class PowerRouter {
|
|
|
109
114
|
}
|
|
110
115
|
}
|
|
111
116
|
catch (e) {
|
|
112
|
-
console.log(req.originalUrl, 'failed');
|
|
117
|
+
console.log(req.originalUrl, 'failed', e);
|
|
113
118
|
res.sendStatus(500);
|
|
114
119
|
}
|
|
115
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../src/router/controllers/Router.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AACpD,mCAAoC;AACpC,0CAA+D;AAC/D,+BAAgC;AAChC,6CAAqC;AACrC,2BAAkD;AAClD,iDAA8C;AAC9C,+BAAqC;
|
|
1
|
+
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../src/router/controllers/Router.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnergyCharts.js","sourceRoot":"","sources":["../../src/router/services/EnergyCharts.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"EnergyCharts.js","sourceRoot":"","sources":["../../src/router/services/EnergyCharts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Entsoe, TimeSeries } from
|
|
2
|
-
import { Types } from
|
|
3
|
-
import { AllEntsoe } from
|
|
1
|
+
import { Entsoe, TimeSeries } from '../interfaces/entsoe';
|
|
2
|
+
import { Types } from '../interfaces/types';
|
|
3
|
+
import { AllEntsoe } from './Loader';
|
|
4
4
|
export interface DataPoint {
|
|
5
5
|
time: number;
|
|
6
6
|
value: number;
|
|
@@ -12,10 +12,10 @@ class EdifactParser {
|
|
|
12
12
|
}
|
|
13
13
|
parseAll(all) {
|
|
14
14
|
const flat = {};
|
|
15
|
-
Object.keys(all).forEach(key => {
|
|
15
|
+
Object.keys(all).forEach((key) => {
|
|
16
16
|
const parsed = this.parse(all[key], key);
|
|
17
17
|
if (parsed) {
|
|
18
|
-
Object.keys(parsed).forEach(type => {
|
|
18
|
+
Object.keys(parsed).forEach((type) => {
|
|
19
19
|
flat[type] = parsed[type];
|
|
20
20
|
});
|
|
21
21
|
}
|
|
@@ -23,23 +23,24 @@ class EdifactParser {
|
|
|
23
23
|
return flat;
|
|
24
24
|
}
|
|
25
25
|
parse(json, key) {
|
|
26
|
-
var _a, _b;
|
|
27
|
-
const timeSeries = ((_a = json.GL_MarketDocument) === null || _a === void 0 ? void 0 : _a.TimeSeries) ||
|
|
26
|
+
var _a, _b, _c, _d, _e, _f;
|
|
27
|
+
const timeSeries = ((_a = json.GL_MarketDocument) === null || _a === void 0 ? void 0 : _a.TimeSeries) ||
|
|
28
|
+
((_b = json.Publication_MarketDocument) === null || _b === void 0 ? void 0 : _b.TimeSeries);
|
|
28
29
|
if (!timeSeries) {
|
|
29
30
|
return;
|
|
30
31
|
}
|
|
31
32
|
let name = 'what';
|
|
32
33
|
const all = {};
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
34
|
+
/*
|
|
35
|
+
const sortedTimeSeries = timeSeries.sort((a,b)=>{
|
|
36
|
+
const x=a.Period[0].timeInterval[0].start[0]
|
|
37
|
+
const y =b.Period[0].timeInterval[0].start[0]
|
|
38
|
+
if(x<y)return -1
|
|
39
|
+
if(x>y)return 1
|
|
40
|
+
return 0
|
|
41
|
+
})
|
|
42
|
+
*/
|
|
43
|
+
timeSeries.forEach((timeSerie, i) => {
|
|
43
44
|
var _a, _b;
|
|
44
45
|
const psrType = ((_b = (_a = timeSerie === null || timeSerie === void 0 ? void 0 : timeSerie.MktPSRType) === null || _a === void 0 ? void 0 : _a[0].psrType) === null || _b === void 0 ? void 0 : _b[0]) || 'unknow';
|
|
45
46
|
name = this.psrName[psrType] || key;
|
|
@@ -54,18 +55,26 @@ class EdifactParser {
|
|
|
54
55
|
all[name][resolution] = all[name][resolution].concat(parsed[1]);
|
|
55
56
|
});
|
|
56
57
|
const result = {};
|
|
57
|
-
Object.keys(all).forEach(type => {
|
|
58
|
-
Object.keys(all[type]).forEach(res => {
|
|
58
|
+
Object.keys(all).forEach((type) => {
|
|
59
|
+
Object.keys(all[type]).forEach((res) => {
|
|
60
|
+
all[type][res] = all[type][res]
|
|
61
|
+
.filter((item) => item.time)
|
|
62
|
+
.sort((a, b) => a.time - b.time);
|
|
59
63
|
all[type][res] = this.mergeEqualTimeStamps(all[type][res]);
|
|
60
|
-
all[type][res] = all[type][res].sort((a, b) => a.time - b.time);
|
|
61
64
|
});
|
|
62
65
|
result[type] = all[type];
|
|
63
66
|
});
|
|
67
|
+
// Austria sept 2018 workaroung
|
|
68
|
+
const price60length = (_d = (_c = result['price']) === null || _c === void 0 ? void 0 : _c['PT60M']) === null || _d === void 0 ? void 0 : _d.length;
|
|
69
|
+
const price15length = (_f = (_e = result['price']) === null || _e === void 0 ? void 0 : _e['PT15M']) === null || _f === void 0 ? void 0 : _f.length;
|
|
70
|
+
if (price60length && price15length && price60length * 5 < price15length) {
|
|
71
|
+
delete result['price']['PT60M'];
|
|
72
|
+
}
|
|
64
73
|
return result;
|
|
65
74
|
}
|
|
66
75
|
parseTimeSeries(timeSerie, name) {
|
|
67
76
|
if (timeSerie.Period.length > 1) {
|
|
68
|
-
throw new Error('There is more than one Period in timeSeries')
|
|
77
|
+
//throw new Error('There is more than one Period in timeSeries')
|
|
69
78
|
}
|
|
70
79
|
const startEndResolution = this.getStartEndResolution(timeSerie);
|
|
71
80
|
const timeArray = this.makeTimeArray(startEndResolution.startIsoString, startEndResolution.endIsoString, startEndResolution.resolution, timeSerie);
|
|
@@ -87,10 +96,11 @@ class EdifactParser {
|
|
|
87
96
|
points.forEach((point, i) => {
|
|
88
97
|
var _a, _b;
|
|
89
98
|
const pos = parseInt(point.position[0]) - 1;
|
|
90
|
-
const val = parseFloat(((_a = point.quantity) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = point['price.amount']) === null || _b === void 0 ? void 0 : _b[0]) || '0') ||
|
|
99
|
+
const val = parseFloat(((_a = point.quantity) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = point['price.amount']) === null || _b === void 0 ? void 0 : _b[0]) || '0') ||
|
|
100
|
+
0;
|
|
91
101
|
result.push({
|
|
92
102
|
time: timeArray[pos],
|
|
93
|
-
value: val * sign
|
|
103
|
+
value: val * sign,
|
|
94
104
|
});
|
|
95
105
|
});
|
|
96
106
|
return [startEndResolution.resolution, result];
|
|
@@ -122,9 +132,9 @@ class EdifactParser {
|
|
|
122
132
|
if (!Array.isArray(timeSeries)) {
|
|
123
133
|
timeSeries = [timeSeries];
|
|
124
134
|
}
|
|
125
|
-
timeSeries === null || timeSeries === void 0 ? void 0 : timeSeries.forEach(series => {
|
|
135
|
+
timeSeries === null || timeSeries === void 0 ? void 0 : timeSeries.forEach((series) => {
|
|
126
136
|
var _a;
|
|
127
|
-
(_a = series.Period) === null || _a === void 0 ? void 0 : _a.forEach(period => {
|
|
137
|
+
(_a = series.Period) === null || _a === void 0 ? void 0 : _a.forEach((period) => {
|
|
128
138
|
resolution = period.resolution[0];
|
|
129
139
|
if (resolution && resolution !== period.resolution[0]) {
|
|
130
140
|
console.log('big problem', resolution, period.resolution[0]);
|
|
@@ -139,22 +149,22 @@ class EdifactParser {
|
|
|
139
149
|
});
|
|
140
150
|
});
|
|
141
151
|
//console.log(startIsoString, endIsoString, resolution)
|
|
142
|
-
return
|
|
152
|
+
return {
|
|
143
153
|
startIsoString,
|
|
144
154
|
endIsoString,
|
|
145
|
-
resolution
|
|
146
|
-
}
|
|
155
|
+
resolution,
|
|
156
|
+
};
|
|
147
157
|
}
|
|
148
158
|
mergeEqualTimeStamps(data) {
|
|
149
|
-
const timeStamps = data.map(item => item.time);
|
|
159
|
+
const timeStamps = data.map((item) => item.time);
|
|
150
160
|
const uniqueTimeStamps = [...new Set(timeStamps)];
|
|
151
|
-
const result = uniqueTimeStamps.map(time => {
|
|
161
|
+
const result = uniqueTimeStamps.map((time) => {
|
|
152
162
|
return {
|
|
153
163
|
time: time,
|
|
154
|
-
value: 0
|
|
164
|
+
value: 0,
|
|
155
165
|
};
|
|
156
166
|
});
|
|
157
|
-
data.forEach(item => {
|
|
167
|
+
data.forEach((item) => {
|
|
158
168
|
const pos = uniqueTimeStamps.indexOf(item.time);
|
|
159
169
|
result[pos].value += item.value;
|
|
160
170
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParseEdifact.js","sourceRoot":"","sources":["../../src/router/services/ParseEdifact.ts"],"names":[],"mappings":";;;AAEA,iCAA2C;AAc3C,MAAa,aAAa;IAIxB,YAAoB,
|
|
1
|
+
{"version":3,"file":"ParseEdifact.js","sourceRoot":"","sources":["../../src/router/services/ParseEdifact.ts"],"names":[],"mappings":";;;AAEA,iCAA2C;AAc3C,MAAa,aAAa;IAIxB,YAAoB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;QAHxB,YAAO,GAEX,EAAE,CAAC;QAEL,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAChD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;SACnC;IACH,CAAC;IACD,QAAQ,CAAC,GAAc;QACrB,MAAM,IAAI,GAAqB,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;YACzC,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACnC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC5B,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,IAAY,EAAE,GAAW;;QAC7B,MAAM,UAAU,GACd,CAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,UAAU;aAClC,MAAA,IAAI,CAAC,0BAA0B,0CAAE,UAAU,CAAA,CAAC;QAC9C,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QACD,IAAI,IAAI,GAAG,MAAM,CAAC;QAClB,MAAM,GAAG,GAAqB,EAAE,CAAC;QACjC;;;;;;;;aAQK;QACL,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE;;YAClC,MAAM,OAAO,GAAG,CAAA,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,0CAAG,CAAC,EAAE,OAAO,0CAAG,CAAC,CAAC,KAAI,QAAQ,CAAC;YACpE,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC;YACpC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACrD,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACd,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;aAChB;YACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,EAAE;gBAC1B,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;aAC5B;YACD,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAChC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACrC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;qBAC5B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;qBAC3B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;gBACnC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,+BAA+B;QAC/B,MAAM,aAAa,GAAG,MAAA,MAAA,MAAM,CAAC,OAAO,CAAC,0CAAG,OAAO,CAAC,0CAAE,MAAM,CAAC;QACzD,MAAM,aAAa,GAAG,MAAA,MAAA,MAAM,CAAC,OAAO,CAAC,0CAAG,OAAO,CAAC,0CAAE,MAAM,CAAC;QACzD,IAAI,aAAa,IAAI,aAAa,IAAI,aAAa,GAAG,CAAC,GAAG,aAAa,EAAE;YACvE,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;SACjC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,eAAe,CAAC,SAAqB,EAAE,IAAY;QACjD,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,gEAAgE;SACjE;QACD,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAClC,kBAAkB,CAAC,cAAc,EACjC,kBAAkB,CAAC,YAAY,EAC/B,kBAAkB,CAAC,UAAU,EAC7B,SAAS,CACV,CAAC;QACF,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACzC,IAAI,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE;YACpC,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,gCAAgC;SACnE;QACD,IAAI,SAAS,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE;YACtC,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,wBAAwB,SAAS,CAAC,MAAM,oBAAoB,MAAM,CAAC,MAAM,EAAE,CACnF,CAAC;SACH;QACD,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,IAAI,SAAS,CAAC,4BAA4B,CAAC,EAAE;YAC3C,IAAI,GAAG,CAAC,CAAC,CAAC;SACX;QACD,IAAI,IAAI,KAAK,aAAa,EAAE;YAC1B,IAAI,GAAG,CAAC,CAAC;SACV;QACD,MAAM,MAAM,GAAgB,EAAE,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;;YAC1B,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,GAAG,GACP,UAAU,CAAC,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAG,CAAC,CAAC,MAAI,MAAA,KAAK,CAAC,cAAc,CAAC,0CAAG,CAAC,CAAC,CAAA,IAAI,GAAG,CAAC;gBACpE,CAAC,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;gBACpB,KAAK,EAAE,GAAG,GAAG,IAAI;aAClB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;IACD,aAAa,CACX,cAAsB,EACtB,YAAoB,EACpB,UAAkB,EAClB,SAAqB;QAErB,MAAM,QAAQ,GAAG,gBAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzD,MAAM,cAAc,GAAG,gBAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,gBAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEpD,qDAAqD;QACrD,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;QAExC,0CAA0C;QAC1C,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,EAAE,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QACrE,sEAAsE;QACtE,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC,IAAI,QAAQ,EAAE;YAChD,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;YACnD,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,CAAC;SAC5C;QACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,SAAS,CAAC,GAAG,EAAE,CAAC;SACjB;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,qBAAqB,CAAC,UAAqC;QACzD,IAAI,cAAc,GAAQ,IAAI,CAAC;QAC/B,IAAI,YAAY,GAAQ,IAAI,CAAC;QAC7B,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC9B,UAAU,GAAG,CAAC,UAAU,CAAC,CAAC;SAC3B;QACD,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YAC7B,MAAA,MAAM,CAAC,MAAM,0CAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBAChC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBAClC,IAAI,UAAU,IAAI,UAAU,KAAK,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;oBACrD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC9D;gBACD,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBAC5C,IAAI,CAAC,cAAc,IAAI,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;oBAC7D,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBACxC;gBACD,IAAI,CAAC,YAAY,IAAI,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;oBACvD,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBACpC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,uDAAuD;QACvD,OAAO;YACL,cAAc;YACd,YAAY;YACZ,UAAU;SACX,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,IAAiB;QACpC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3C,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,CAAC;aACT,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACpB,MAAM,GAAG,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAxLD,sCAwLC"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
type ChartData = {
|
|
2
|
+
[key: string]: (number | null)[];
|
|
3
|
+
time: number[];
|
|
4
|
+
};
|
|
5
|
+
|
|
6
|
+
export class Resample {
|
|
7
|
+
// Static method to change time resolution
|
|
8
|
+
static changeTimeResolution(data: ChartData, intervalMs: number): ChartData {
|
|
9
|
+
const result: ChartData = { time: [] };
|
|
10
|
+
|
|
11
|
+
// Initialize arrays in result for each key in the input data (except `time`)
|
|
12
|
+
for (const key in data) {
|
|
13
|
+
if (key !== 'time') {
|
|
14
|
+
result[key] = [];
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
const tempData: { [key: string]: (number | null)[] } = {};
|
|
19
|
+
let startInterval = data.time[0];
|
|
20
|
+
let endInterval = startInterval + intervalMs;
|
|
21
|
+
|
|
22
|
+
// Initialize temp arrays for each key in data
|
|
23
|
+
for (const key in data) {
|
|
24
|
+
if (key !== 'time') {
|
|
25
|
+
tempData[key] = [];
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
data.time.forEach((timestamp, index) => {
|
|
30
|
+
if (timestamp < endInterval) {
|
|
31
|
+
// Collect data for each key within the current interval
|
|
32
|
+
for (const key in data) {
|
|
33
|
+
if (key !== 'time') {
|
|
34
|
+
tempData[key].push(data[key][index]);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
} else {
|
|
38
|
+
// Calculate average for each key and push to result
|
|
39
|
+
for (const key in tempData) {
|
|
40
|
+
result[key].push(this.average(tempData[key]));
|
|
41
|
+
}
|
|
42
|
+
result.time.push(startInterval);
|
|
43
|
+
|
|
44
|
+
// Reset for the next interval
|
|
45
|
+
startInterval = endInterval;
|
|
46
|
+
endInterval += intervalMs;
|
|
47
|
+
|
|
48
|
+
// Clear tempData and start collecting new interval data
|
|
49
|
+
for (const key in tempData) {
|
|
50
|
+
tempData[key] = [data[key][index]];
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
// Push the last interval's averages
|
|
56
|
+
if (tempData.price?.length) {
|
|
57
|
+
for (const key in tempData) {
|
|
58
|
+
result[key].push(this.average(tempData[key]));
|
|
59
|
+
}
|
|
60
|
+
result.time.push(startInterval);
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
return result;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
// Static helper function to calculate average, ignoring nulls
|
|
67
|
+
private static average(arr: (number | null)[]): number {
|
|
68
|
+
const filtered = arr.filter((value): value is number => value !== null);
|
|
69
|
+
return filtered.length > 0 ? filtered.reduce((sum, val) => sum + val, 0) / filtered.length : 0;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
/*
|
|
73
|
+
// Example Usage
|
|
74
|
+
const chartData: ChartData = {
|
|
75
|
+
price: [30.02, 29.85, 22.14, 22.49, 22.97, 23.05],
|
|
76
|
+
solar: [null, null, null, 7, 71, 157],
|
|
77
|
+
wind: [15, null, 10, null, 35, 45],
|
|
78
|
+
time: [1522540800000, 1522544400000, 1522548000000, 1522551600000, 1522555200000, 1522558800000]
|
|
79
|
+
};
|
|
80
|
+
|
|
81
|
+
const hourlyData = ChartDataProcessor.changeTimeResolution(chartData, 60 * 60 * 1000); // 1-hour interval
|
|
82
|
+
console.log(hourlyData);
|
|
83
|
+
*/
|
|
@@ -7,6 +7,7 @@ import { ReadStream, createReadStream } from 'fs';
|
|
|
7
7
|
import { LoadAndParse } from './LoadAndParse';
|
|
8
8
|
import { dirname, join } from 'path';
|
|
9
9
|
import { Config } from '../interfaces/config';
|
|
10
|
+
import { Resample } from './Resample';
|
|
10
11
|
|
|
11
12
|
export class PowerRouter {
|
|
12
13
|
static init(config: Config): Router {
|
|
@@ -98,7 +99,11 @@ export class PowerRouter {
|
|
|
98
99
|
// if no cache hit, load data and store in cache
|
|
99
100
|
if (!cacheData) {
|
|
100
101
|
// LOAD THE DATA FROM SOURCE
|
|
101
|
-
|
|
102
|
+
let body = await entsoeLoader.get(req, type);
|
|
103
|
+
// by default go with 60 min interval
|
|
104
|
+
if(!req.query.fullres){
|
|
105
|
+
body = Resample.changeTimeResolution(body, 60*60*1000)
|
|
106
|
+
}
|
|
102
107
|
const buf = Buffer.from(JSON.stringify(body), 'utf-8');
|
|
103
108
|
const cacheDataBuffer = gzipSync(buf);
|
|
104
109
|
if (Object.keys(body).length > 1) {
|
|
@@ -112,7 +117,7 @@ export class PowerRouter {
|
|
|
112
117
|
res.send(cacheDataBuffer);
|
|
113
118
|
}
|
|
114
119
|
} catch (e) {
|
|
115
|
-
console.log(req.originalUrl, 'failed');
|
|
120
|
+
console.log(req.originalUrl, 'failed',e);
|
|
116
121
|
res.sendStatus(500);
|
|
117
122
|
}
|
|
118
123
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Entsoe, TimeSeries } from
|
|
2
|
-
import { Types } from
|
|
3
|
-
import { DateTime, Duration } from
|
|
4
|
-
import { AllEntsoe } from
|
|
1
|
+
import { Entsoe, TimeSeries } from '../interfaces/entsoe';
|
|
2
|
+
import { Types } from '../interfaces/types';
|
|
3
|
+
import { DateTime, Duration } from 'luxon';
|
|
4
|
+
import { AllEntsoe } from './Loader';
|
|
5
5
|
|
|
6
6
|
export interface DataPoint {
|
|
7
7
|
time: number;
|
|
@@ -16,33 +16,36 @@ export interface AllInResulotions {
|
|
|
16
16
|
|
|
17
17
|
export class EdifactParser {
|
|
18
18
|
private psrName: {
|
|
19
|
-
[key: string]: string
|
|
20
|
-
} = {}
|
|
21
|
-
constructor(private types:Types) {
|
|
19
|
+
[key: string]: string;
|
|
20
|
+
} = {};
|
|
21
|
+
constructor(private types: Types) {
|
|
22
22
|
for (const [key, value] of Object.entries(types)) {
|
|
23
23
|
this.psrName[value.psrType] = key;
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
parseAll(all: AllEntsoe):AllInResulotions {
|
|
27
|
-
const flat: AllInResulotions = {}
|
|
28
|
-
Object.keys(all).forEach(key => {
|
|
29
|
-
const parsed = this.parse(all[key], key)
|
|
26
|
+
parseAll(all: AllEntsoe): AllInResulotions {
|
|
27
|
+
const flat: AllInResulotions = {};
|
|
28
|
+
Object.keys(all).forEach((key) => {
|
|
29
|
+
const parsed = this.parse(all[key], key);
|
|
30
30
|
if (parsed) {
|
|
31
|
-
Object.keys(parsed).forEach(type => {
|
|
31
|
+
Object.keys(parsed).forEach((type) => {
|
|
32
32
|
flat[type] = parsed[type];
|
|
33
|
-
})
|
|
33
|
+
});
|
|
34
34
|
}
|
|
35
|
-
})
|
|
35
|
+
});
|
|
36
36
|
|
|
37
37
|
return flat;
|
|
38
38
|
}
|
|
39
|
-
parse(json: Entsoe, key: string):AllInResulotions|undefined {
|
|
40
|
-
const timeSeries =
|
|
39
|
+
parse(json: Entsoe, key: string): AllInResulotions | undefined {
|
|
40
|
+
const timeSeries =
|
|
41
|
+
json.GL_MarketDocument?.TimeSeries ||
|
|
42
|
+
json.Publication_MarketDocument?.TimeSeries;
|
|
41
43
|
if (!timeSeries) {
|
|
42
44
|
return;
|
|
43
45
|
}
|
|
44
46
|
let name = 'what';
|
|
45
|
-
const all: AllInResulotions = {}
|
|
47
|
+
const all: AllInResulotions = {};
|
|
48
|
+
/*
|
|
46
49
|
const sortedTimeSeries = timeSeries.sort((a,b)=>{
|
|
47
50
|
const x=a.Period[0].timeInterval[0].start[0]
|
|
48
51
|
const y =b.Period[0].timeInterval[0].start[0]
|
|
@@ -50,42 +53,57 @@ export class EdifactParser {
|
|
|
50
53
|
if(x>y)return 1
|
|
51
54
|
return 0
|
|
52
55
|
})
|
|
53
|
-
|
|
56
|
+
*/
|
|
57
|
+
timeSeries.forEach((timeSerie, i) => {
|
|
54
58
|
const psrType = timeSerie?.MktPSRType?.[0].psrType?.[0] || 'unknow';
|
|
55
59
|
name = this.psrName[psrType] || key;
|
|
56
|
-
const parsed = this.parseTimeSeries(timeSerie, name)
|
|
60
|
+
const parsed = this.parseTimeSeries(timeSerie, name);
|
|
57
61
|
const resolution = parsed[0];
|
|
58
62
|
if (!all[name]) {
|
|
59
|
-
all[name] = {}
|
|
63
|
+
all[name] = {};
|
|
60
64
|
}
|
|
61
65
|
if (!all[name][resolution]) {
|
|
62
|
-
all[name][resolution] = []
|
|
66
|
+
all[name][resolution] = [];
|
|
63
67
|
}
|
|
64
|
-
all[name][resolution] = all[name][resolution].concat(parsed[1])
|
|
65
|
-
})
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
68
|
+
all[name][resolution] = all[name][resolution].concat(parsed[1]);
|
|
69
|
+
});
|
|
70
|
+
const result: AllInResulotions = {};
|
|
71
|
+
Object.keys(all).forEach((type) => {
|
|
72
|
+
Object.keys(all[type]).forEach((res) => {
|
|
73
|
+
all[type][res] = all[type][res]
|
|
74
|
+
.filter((item) => item.time)
|
|
75
|
+
.sort((a, b) => a.time - b.time);
|
|
76
|
+
all[type][res] = this.mergeEqualTimeStamps(all[type][res]);
|
|
77
|
+
});
|
|
73
78
|
result[type] = all[type];
|
|
74
|
-
})
|
|
79
|
+
});
|
|
80
|
+
// Austria sept 2018 workaroung
|
|
81
|
+
const price60length = result['price']?.['PT60M']?.length;
|
|
82
|
+
const price15length = result['price']?.['PT15M']?.length;
|
|
83
|
+
if (price60length && price15length && price60length * 5 < price15length) {
|
|
84
|
+
delete result['price']['PT60M'];
|
|
85
|
+
}
|
|
75
86
|
return result;
|
|
76
87
|
}
|
|
77
88
|
parseTimeSeries(timeSerie: TimeSeries, name: string): [string, DataPoint[]] {
|
|
78
89
|
if (timeSerie.Period.length > 1) {
|
|
79
|
-
throw new Error('There is more than one Period in timeSeries')
|
|
90
|
+
//throw new Error('There is more than one Period in timeSeries')
|
|
80
91
|
}
|
|
81
|
-
const startEndResolution = this.getStartEndResolution(timeSerie)
|
|
82
|
-
const timeArray = this.makeTimeArray(
|
|
92
|
+
const startEndResolution = this.getStartEndResolution(timeSerie);
|
|
93
|
+
const timeArray = this.makeTimeArray(
|
|
94
|
+
startEndResolution.startIsoString,
|
|
95
|
+
startEndResolution.endIsoString,
|
|
96
|
+
startEndResolution.resolution,
|
|
97
|
+
timeSerie
|
|
98
|
+
);
|
|
83
99
|
const points = timeSerie.Period[0].Point;
|
|
84
|
-
if(timeArray.length > points.length) {
|
|
85
|
-
timeArray.length = points.length;
|
|
100
|
+
if (timeArray.length > points.length) {
|
|
101
|
+
timeArray.length = points.length; //winter, summer time workaround
|
|
86
102
|
}
|
|
87
103
|
if (timeArray.length !== points.length) {
|
|
88
|
-
throw new Error(
|
|
104
|
+
throw new Error(
|
|
105
|
+
`${name}: time array length: ${timeArray.length}, points length: ${points.length}`
|
|
106
|
+
);
|
|
89
107
|
}
|
|
90
108
|
let sign = 1;
|
|
91
109
|
if (timeSerie['outBiddingZone_Domain.mRID']) {
|
|
@@ -94,18 +112,25 @@ export class EdifactParser {
|
|
|
94
112
|
if (name === 'consumption') {
|
|
95
113
|
sign = 1;
|
|
96
114
|
}
|
|
97
|
-
const result: DataPoint[] = []
|
|
115
|
+
const result: DataPoint[] = [];
|
|
98
116
|
points.forEach((point, i) => {
|
|
99
117
|
const pos = parseInt(point.position[0]) - 1;
|
|
100
|
-
const val =
|
|
118
|
+
const val =
|
|
119
|
+
parseFloat(point.quantity?.[0] || point['price.amount']?.[0] || '0') ||
|
|
120
|
+
0;
|
|
101
121
|
result.push({
|
|
102
122
|
time: timeArray[pos],
|
|
103
|
-
value: val * sign
|
|
104
|
-
})
|
|
105
|
-
})
|
|
106
|
-
return [startEndResolution.resolution, result]
|
|
123
|
+
value: val * sign,
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
return [startEndResolution.resolution, result];
|
|
107
127
|
}
|
|
108
|
-
makeTimeArray(
|
|
128
|
+
makeTimeArray(
|
|
129
|
+
startIsoString: string,
|
|
130
|
+
endIsoString: string,
|
|
131
|
+
resolution: string,
|
|
132
|
+
timeSerie: TimeSeries
|
|
133
|
+
): number[] {
|
|
109
134
|
const duration = Duration.fromISO(resolution).toMillis();
|
|
110
135
|
const localStartTime = DateTime.fromISO(startIsoString);
|
|
111
136
|
const localEndTime = DateTime.fromISO(endIsoString);
|
|
@@ -134,43 +159,43 @@ export class EdifactParser {
|
|
|
134
159
|
if (!Array.isArray(timeSeries)) {
|
|
135
160
|
timeSeries = [timeSeries];
|
|
136
161
|
}
|
|
137
|
-
timeSeries?.forEach(series => {
|
|
138
|
-
series.Period?.forEach(period => {
|
|
162
|
+
timeSeries?.forEach((series) => {
|
|
163
|
+
series.Period?.forEach((period) => {
|
|
139
164
|
resolution = period.resolution[0];
|
|
140
165
|
if (resolution && resolution !== period.resolution[0]) {
|
|
141
|
-
console.log('big problem', resolution, period.resolution[0])
|
|
166
|
+
console.log('big problem', resolution, period.resolution[0]);
|
|
142
167
|
}
|
|
143
168
|
const timeInterval = period.timeInterval[0];
|
|
144
169
|
if (!startIsoString || startIsoString > timeInterval.start[0]) {
|
|
145
|
-
startIsoString = timeInterval.start[0]
|
|
170
|
+
startIsoString = timeInterval.start[0];
|
|
146
171
|
}
|
|
147
172
|
if (!endIsoString || endIsoString < timeInterval.end[0]) {
|
|
148
|
-
endIsoString = timeInterval.end[0]
|
|
173
|
+
endIsoString = timeInterval.end[0];
|
|
149
174
|
}
|
|
150
|
-
})
|
|
151
|
-
})
|
|
175
|
+
});
|
|
176
|
+
});
|
|
152
177
|
|
|
153
178
|
//console.log(startIsoString, endIsoString, resolution)
|
|
154
|
-
return
|
|
179
|
+
return {
|
|
155
180
|
startIsoString,
|
|
156
181
|
endIsoString,
|
|
157
|
-
resolution
|
|
158
|
-
}
|
|
182
|
+
resolution,
|
|
183
|
+
};
|
|
159
184
|
}
|
|
160
185
|
|
|
161
186
|
mergeEqualTimeStamps(data: DataPoint[]): DataPoint[] {
|
|
162
|
-
const timeStamps = data.map(item => item.time);
|
|
187
|
+
const timeStamps = data.map((item) => item.time);
|
|
163
188
|
const uniqueTimeStamps = [...new Set(timeStamps)];
|
|
164
|
-
const result = uniqueTimeStamps.map(time => {
|
|
189
|
+
const result = uniqueTimeStamps.map((time) => {
|
|
165
190
|
return {
|
|
166
191
|
time: time,
|
|
167
|
-
value: 0
|
|
168
|
-
}
|
|
169
|
-
})
|
|
170
|
-
data.forEach(item => {
|
|
192
|
+
value: 0,
|
|
193
|
+
};
|
|
194
|
+
});
|
|
195
|
+
data.forEach((item) => {
|
|
171
196
|
const pos = uniqueTimeStamps.indexOf(item.time);
|
|
172
|
-
result[pos].value += item.value
|
|
173
|
-
})
|
|
197
|
+
result[pos].value += item.value;
|
|
198
|
+
});
|
|
174
199
|
return result;
|
|
175
200
|
}
|
|
176
|
-
}
|
|
201
|
+
}
|