@powercalc/power-router 1.1.30 → 1.1.32

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.
Files changed (6) hide show
  1. package/dist/config/types.json +41 -1
  2. package/dist/services/Eurostat.js +5 -1
  3. package/dist/services/Eurostat.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/router/config/types.json +41 -1
  6. package/src/router/services/Eurostat.ts +5 -1
package/dist/config/types.json CHANGED
@@ -35,7 +35,45 @@
35
35
  "stack": "stack2",
36
36
  "type": "consumption"
37
37
  },
38
+ "batteryStorageCost": {
39
+ "name": "Battery Storage Cost",
40
+ "psrType": "C99",
41
+ "co2Footprint": null,
42
+ "color": "#C21E56",
43
+ "abbr": "BK",
44
+ "yAxis": "y",
45
+ "type": "cost"
46
+ },
47
+ "P2GCost": {
48
+ "name": "Electrolyzer Cost",
49
+ "psrType": "C97",
50
+ "co2Footprint": null,
51
+ "color": "purple",
52
+ "abbr": "EK",
53
+ "yAxis": "y",
54
+ "type": "cost"
55
+ },
56
+ "H2PeakerCost": {
57
+ "name": "H2 Gas Plant",
58
+ "psrType": "C97",
59
+ "co2Footprint": null,
60
+ "color": "#720e9e",
61
+ "abbr": "PK",
62
+ "yAxis": "y",
63
+ "type": "cost"
64
+ },
38
65
 
66
+ "H2StorageCost": {
67
+ "name": "H2 Storage Cost",
68
+ "psrType": "C97",
69
+ "co2Footprint": null,
70
+ "color": "#4B0082",
71
+ "abbr": "HK",
72
+ "yAxis": "y",
73
+ "type": "cost"
74
+ },
75
+
76
+
39
77
  "diesel": {
40
78
  "name": "Diesel",
41
79
  "psrType": "F2",
@@ -210,7 +248,7 @@
210
248
  "other": {
211
249
  "name": "Other",
212
250
  "psrType": "B20",
213
- "co2Footprint": null,
251
+ "co2Footprint": 1000,
214
252
  "color": "#c3c3c3",
215
253
  "abbr": "OT",
216
254
  "type": "fossil"
@@ -402,6 +440,8 @@
402
440
  "yAxis": "hydroFill",
403
441
  "type": "storage"
404
442
  },
443
+
444
+
405
445
  "crossBorder": {
406
446
  "name": "Cross Border",
407
447
  "psrType": "H49",
package/dist/services/Eurostat.js CHANGED
@@ -77,7 +77,10 @@ class EurostatAPI {
77
77
  }
78
78
  async load(countryCode, queryOptions) {
79
79
  var _a;
80
- const countryShort = (_a = this.countries.find((item) => item.code === countryCode)) === null || _a === void 0 ? void 0 : _a.short;
80
+ let countryShort = (_a = this.countries.find((item) => item.code === countryCode)) === null || _a === void 0 ? void 0 : _a.short;
81
+ if (countryShort === 'GR') {
82
+ countryShort = 'EL';
83
+ }
81
84
  const baseUrl = 'https://ec.europa.eu/eurostat/api/dissemination/sdmx/2.1/data/';
82
85
  const geo = `.${countryShort}`;
83
86
  const urls = [];
@@ -90,6 +93,7 @@ class EurostatAPI {
90
93
  urls.push(url);
91
94
  promises.push(this.fetchData(url, type, unit));
92
95
  }
96
+ console.log(urls);
93
97
  if (queryOptions.format === queryoptions_1.Format.SOURCES) {
94
98
  return urls;
95
99
  }
package/dist/services/Eurostat.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Eurostat.js","sourceRoot":"","sources":["../../src/router/services/Eurostat.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Eurostat.js","sourceRoot":"","sources":["../../src/router/services/Eurostat.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@powercalc/power-router",
3
- "version": "1.1.30",
3
+ "version": "1.1.32",
4
4
  "description": "a",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/router/config/types.json CHANGED
@@ -35,7 +35,45 @@
35
35
  "stack": "stack2",
36
36
  "type": "consumption"
37
37
  },
38
+ "batteryStorageCost": {
39
+ "name": "Battery Storage Cost",
40
+ "psrType": "C99",
41
+ "co2Footprint": null,
42
+ "color": "#C21E56",
43
+ "abbr": "BK",
44
+ "yAxis": "y",
45
+ "type": "cost"
46
+ },
47
+ "P2GCost": {
48
+ "name": "Electrolyzer Cost",
49
+ "psrType": "C97",
50
+ "co2Footprint": null,
51
+ "color": "purple",
52
+ "abbr": "EK",
53
+ "yAxis": "y",
54
+ "type": "cost"
55
+ },
56
+ "H2PeakerCost": {
57
+ "name": "H2 Gas Plant",
58
+ "psrType": "C97",
59
+ "co2Footprint": null,
60
+ "color": "#720e9e",
61
+ "abbr": "PK",
62
+ "yAxis": "y",
63
+ "type": "cost"
64
+ },
38
65
 
66
+ "H2StorageCost": {
67
+ "name": "H2 Storage Cost",
68
+ "psrType": "C97",
69
+ "co2Footprint": null,
70
+ "color": "#4B0082",
71
+ "abbr": "HK",
72
+ "yAxis": "y",
73
+ "type": "cost"
74
+ },
75
+
76
+
39
77
  "diesel": {
40
78
  "name": "Diesel",
41
79
  "psrType": "F2",
@@ -210,7 +248,7 @@
210
248
  "other": {
211
249
  "name": "Other",
212
250
  "psrType": "B20",
213
- "co2Footprint": null,
251
+ "co2Footprint": 1000,
214
252
  "color": "#c3c3c3",
215
253
  "abbr": "OT",
216
254
  "type": "fossil"
@@ -402,6 +440,8 @@
402
440
  "yAxis": "hydroFill",
403
441
  "type": "storage"
404
442
  },
443
+
444
+
405
445
  "crossBorder": {
406
446
  "name": "Cross Border",
407
447
  "psrType": "H49",
package/src/router/services/Eurostat.ts CHANGED
@@ -97,9 +97,12 @@ export class EurostatAPI {
97
97
  }
98
98
 
99
99
  async load(countryCode: string, queryOptions: QueryOptions): Promise<any> {
100
- const countryShort = this.countries.find(
100
+ let countryShort = this.countries.find(
101
101
  (item) => item.code === countryCode
102
102
  )?.short
103
+ if(countryShort === 'GR'){
104
+ countryShort = 'EL'
105
+ }
103
106
  const baseUrl =
104
107
  'https://ec.europa.eu/eurostat/api/dissemination/sdmx/2.1/data/'
105
108
  const geo = `.${countryShort}`
@@ -113,6 +116,7 @@ export class EurostatAPI {
113
116
  urls.push(url)
114
117
  promises.push(this.fetchData(url, type, unit))
115
118
  }
119
+ console.log(urls);
116
120
  if(queryOptions.format === Format.SOURCES){
117
121
  return urls;
118
122
  }