@powercalc/power-router 1.1.0 → 1.1.5
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/config/types.json +12 -2
- package/dist/services/LoadService.js +7 -2
- package/dist/services/LoadService.js.map +1 -1
- package/dist/services/Loader.js +2 -2
- package/dist/services/Loader.js.map +1 -1
- package/dist/services/ParseInstalled.js +2 -1
- package/dist/services/ParseInstalled.js.map +1 -1
- package/package.json +2 -2
- package/src/router/config/types.json +12 -2
- package/src/router/services/LoadService.ts +4 -0
- package/src/router/services/Loader.ts +2 -2
- package/src/router/services/ParseInstalled.ts +2 -1
package/dist/config/types.json
CHANGED
|
@@ -26,6 +26,16 @@
|
|
|
26
26
|
"stack": "stack2",
|
|
27
27
|
"type": "consumption"
|
|
28
28
|
},
|
|
29
|
+
"totalConsumption": {
|
|
30
|
+
"name": "TotalConsumption",
|
|
31
|
+
"psrType": "T05",
|
|
32
|
+
"co2Footprint": 0,
|
|
33
|
+
"color": "#c3c3c3",
|
|
34
|
+
"abbr": "TC",
|
|
35
|
+
"stack": "stack2",
|
|
36
|
+
"type": "consumption"
|
|
37
|
+
},
|
|
38
|
+
|
|
29
39
|
"diesel": {
|
|
30
40
|
"name": "Diesel",
|
|
31
41
|
"psrType": "F2",
|
|
@@ -224,7 +234,7 @@
|
|
|
224
234
|
"hydroPumpedStorageCharge": {
|
|
225
235
|
"name": "Hydro Pumped Storage Charge",
|
|
226
236
|
"psrType": "C10",
|
|
227
|
-
"co2Footprint":
|
|
237
|
+
"co2Footprint": 0,
|
|
228
238
|
"color": "blue",
|
|
229
239
|
"abbr": "PC",
|
|
230
240
|
"type": "dispatchablegreen"
|
|
@@ -232,7 +242,7 @@
|
|
|
232
242
|
"hydroPumpedStorageDischarge": {
|
|
233
243
|
"name": "Hydro Pumped Storage Discharge",
|
|
234
244
|
"psrType": "C10",
|
|
235
|
-
"co2Footprint":
|
|
245
|
+
"co2Footprint": 0,
|
|
236
246
|
"color": "blue",
|
|
237
247
|
"abbr": "PD",
|
|
238
248
|
"type": "dispatchablegreen"
|
|
@@ -31,8 +31,13 @@ class LoadService {
|
|
|
31
31
|
const startMonth = new Date(Date.UTC(year, month - 1)).toISOString();
|
|
32
32
|
const endMonth = new Date(Date.UTC(year, month)).toISOString();
|
|
33
33
|
const energyCharts = new EnergyCharts_1.EnergyCharts();
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
try {
|
|
35
|
+
const power = await energyCharts.load(countryCode, startMonth, endMonth, queryOptions);
|
|
36
|
+
return power;
|
|
37
|
+
}
|
|
38
|
+
catch (e) {
|
|
39
|
+
console.error(e);
|
|
40
|
+
}
|
|
36
41
|
}
|
|
37
42
|
async getPower(countryCode, year, month, queryOptions) {
|
|
38
43
|
const startMonth = new Date(Date.UTC(year, month - 1)).toISOString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoadService.js","sourceRoot":"","sources":["../../src/router/services/LoadService.ts"],"names":[],"mappings":";;;AAAA,2BAAkC;AAClC,+BAA4B;AAC5B,qCAAsD;AACtD,iDAA0D;AAC1D,qDAAkD;AAClD,yDAAsD;AACtD,yCAAyC;AAEzC,6DAAkE;AAClE,uDAAqD;AAErD,iDAA8C;AAC9C,6CAA0C;AAE1C,MAAa,WAAW;IAMtB,YAAoB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QAL9C,YAAO,GAAG,EAAE,CAAC;QAMX,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAC,mCAAmC;QAC9F,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,SAAS,EAAE,MAAM,CAAC,CAAU,CAAC,CAAC,iCAAiC;QAErG,IAAI,CAAC,MAAM,GAAG,IAAI,qBAAY,CAAC,YAAY,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,GAAG,IAAI,4BAAa,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IACD,KAAK,CAAC,wBAAwB,CAC5B,WAAmB,EACnB,YAA0B;QAE1B,MAAM,YAAY,GAAG,IAAI,2BAAY,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAC1E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,WAAmB,EACnB,IAAY,EACZ,KAAa,EACb,YAA0B;QAE1B,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACrE,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAC/D,MAAM,YAAY,GAAG,IAAI,2BAAY,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,CACnC,WAAW,EACX,UAAU,EACV,QAAQ,EACR,YAAY,CACb,CAAC;
|
|
1
|
+
{"version":3,"file":"LoadService.js","sourceRoot":"","sources":["../../src/router/services/LoadService.ts"],"names":[],"mappings":"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"}
|
package/dist/services/Loader.js
CHANGED
|
@@ -78,8 +78,8 @@ class EntsoeLoader {
|
|
|
78
78
|
const currentYear = (new Date()).getFullYear();
|
|
79
79
|
const urls = [];
|
|
80
80
|
for (let year = 2015; year <= currentYear; year++) {
|
|
81
|
-
const periodStart = `${year}12302200`;
|
|
82
|
-
const periodEnd = `${year
|
|
81
|
+
const periodStart = `${year - 2}12302200`;
|
|
82
|
+
const periodEnd = `${year}01020400`;
|
|
83
83
|
const installed = `${this.config.entsoeDomain}/api?documentType=A68&processType=A33&in_Domain=${countryCode}&periodStart=${periodStart}&periodEnd=${periodEnd}`;
|
|
84
84
|
urls.push(installed);
|
|
85
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Loader.js","sourceRoot":"","sources":["../../src/router/services/Loader.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Loader.js","sourceRoot":"","sources":["../../src/router/services/Loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,8 @@ class ParseInstalled {
|
|
|
15
15
|
};
|
|
16
16
|
json.forEach((year, i) => {
|
|
17
17
|
var _a, _b;
|
|
18
|
-
const
|
|
18
|
+
const timeSeries = (_a = year.GL_MarketDocument) === null || _a === void 0 ? void 0 : _a.TimeSeries.pop();
|
|
19
|
+
const time = timeSeries === null || timeSeries === void 0 ? void 0 : timeSeries.Period[0].timeInterval[0].start[0];
|
|
19
20
|
const timeStamp = new Date(time || 0).getTime();
|
|
20
21
|
all.time.push(timeStamp);
|
|
21
22
|
(_b = year.GL_MarketDocument) === null || _b === void 0 ? void 0 : _b.TimeSeries.forEach(timeSeries => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParseInstalled.js","sourceRoot":"","sources":["../../src/router/services/ParseInstalled.ts"],"names":[],"mappings":";;;AAGA,MAAa,cAAc;IAIvB,YAAoB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;QAHxB,YAAO,GAEX,EAAE,CAAA;QAEF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC9C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;SACrC;IACL,CAAC;IACD,KAAK,CAAC,IAAc;QAChB,MAAM,GAAG,GAAQ;YACb,IAAI,EAAE,EAAE;SACX,CAAA;QACD,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;;YACrB,MAAM,
|
|
1
|
+
{"version":3,"file":"ParseInstalled.js","sourceRoot":"","sources":["../../src/router/services/ParseInstalled.ts"],"names":[],"mappings":";;;AAGA,MAAa,cAAc;IAIvB,YAAoB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;QAHxB,YAAO,GAEX,EAAE,CAAA;QAEF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC9C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;SACrC;IACL,CAAC;IACD,KAAK,CAAC,IAAc;QAChB,MAAM,GAAG,GAAQ;YACb,IAAI,EAAE,EAAE;SACX,CAAA;QACD,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;;YACrB,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,iBAAiB,0CAAE,UAAU,CAAC,GAAG,EAAE,CAAC;YAC5D,MAAM,IAAI,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5D,MAAM,SAAS,GAAI,IAAI,IAAI,CAAC,IAAI,IAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YAC/C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACzB,MAAA,IAAI,CAAC,iBAAiB,0CAAE,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;;gBACpD,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,0CAAG,CAAC,CAAC,CAAC;gBACjD,IAAI,CAAC,OAAO,EAAE;oBACV,OAAO,CAAC,UAAU;iBACrB;gBACD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;gBAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBACZ,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;iBAClB;gBACD,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;;oBAC/B,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,0CAAG,CAAC,CAAC,CAAC;oBAC5C,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,GAAC,EAAE,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IACD,UAAU,CAAC,UAAsB;;QAC7B,OAAO,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,0CAAG,CAAC,EAAE,OAAO,CAAC;IAC/C,CAAC;CACJ;AAtCD,wCAsCC"}
|
package/package.json
CHANGED
|
@@ -26,6 +26,16 @@
|
|
|
26
26
|
"stack": "stack2",
|
|
27
27
|
"type": "consumption"
|
|
28
28
|
},
|
|
29
|
+
"totalConsumption": {
|
|
30
|
+
"name": "TotalConsumption",
|
|
31
|
+
"psrType": "T05",
|
|
32
|
+
"co2Footprint": 0,
|
|
33
|
+
"color": "#c3c3c3",
|
|
34
|
+
"abbr": "TC",
|
|
35
|
+
"stack": "stack2",
|
|
36
|
+
"type": "consumption"
|
|
37
|
+
},
|
|
38
|
+
|
|
29
39
|
"diesel": {
|
|
30
40
|
"name": "Diesel",
|
|
31
41
|
"psrType": "F2",
|
|
@@ -224,7 +234,7 @@
|
|
|
224
234
|
"hydroPumpedStorageCharge": {
|
|
225
235
|
"name": "Hydro Pumped Storage Charge",
|
|
226
236
|
"psrType": "C10",
|
|
227
|
-
"co2Footprint":
|
|
237
|
+
"co2Footprint": 0,
|
|
228
238
|
"color": "blue",
|
|
229
239
|
"abbr": "PC",
|
|
230
240
|
"type": "dispatchablegreen"
|
|
@@ -232,7 +242,7 @@
|
|
|
232
242
|
"hydroPumpedStorageDischarge": {
|
|
233
243
|
"name": "Hydro Pumped Storage Discharge",
|
|
234
244
|
"psrType": "C10",
|
|
235
|
-
"co2Footprint":
|
|
245
|
+
"co2Footprint": 0,
|
|
236
246
|
"color": "blue",
|
|
237
247
|
"abbr": "PD",
|
|
238
248
|
"type": "dispatchablegreen"
|
|
@@ -44,6 +44,7 @@ export class LoadService {
|
|
|
44
44
|
const startMonth = new Date(Date.UTC(year, month - 1)).toISOString();
|
|
45
45
|
const endMonth = new Date(Date.UTC(year, month)).toISOString();
|
|
46
46
|
const energyCharts = new EnergyCharts();
|
|
47
|
+
try{
|
|
47
48
|
const power = await energyCharts.load(
|
|
48
49
|
countryCode,
|
|
49
50
|
startMonth,
|
|
@@ -51,6 +52,9 @@ export class LoadService {
|
|
|
51
52
|
queryOptions
|
|
52
53
|
);
|
|
53
54
|
return power;
|
|
55
|
+
}catch(e){
|
|
56
|
+
console.error(e);
|
|
57
|
+
}
|
|
54
58
|
}
|
|
55
59
|
async getPower(
|
|
56
60
|
countryCode: string,
|
|
@@ -113,8 +113,8 @@ export class EntsoeLoader {
|
|
|
113
113
|
const currentYear = (new Date()).getFullYear() ;
|
|
114
114
|
const urls = []
|
|
115
115
|
for (let year = 2015; year <= currentYear; year++) {
|
|
116
|
-
const periodStart = `${year}12302200`
|
|
117
|
-
const periodEnd = `${year
|
|
116
|
+
const periodStart = `${year -2}12302200`
|
|
117
|
+
const periodEnd = `${year }01020400`
|
|
118
118
|
const installed = `${this.config.entsoeDomain}/api?documentType=A68&processType=A33&in_Domain=${countryCode}&periodStart=${periodStart}&periodEnd=${periodEnd}`;
|
|
119
119
|
urls.push(installed)
|
|
120
120
|
}
|
|
@@ -15,7 +15,8 @@ export class ParseInstalled {
|
|
|
15
15
|
time: []
|
|
16
16
|
}
|
|
17
17
|
json.forEach((year, i) => {
|
|
18
|
-
const
|
|
18
|
+
const timeSeries = year.GL_MarketDocument?.TimeSeries.pop();
|
|
19
|
+
const time = timeSeries?.Period[0].timeInterval[0].start[0];
|
|
19
20
|
const timeStamp = new Date(time||0).getTime();
|
|
20
21
|
all.time.push(timeStamp);
|
|
21
22
|
year.GL_MarketDocument?.TimeSeries.forEach(timeSeries => {
|