raain-model 2.4.6 → 2.4.7
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CartesianValue.js","sourceRoot":"","sources":["../../src/cartesian/CartesianValue.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,MAAa,cAAe,SAAQ,eAAM;IAItC,YAAY,IAIC;QAET,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAC5B,CAAC;IAED,MAAM;
|
|
1
|
+
{"version":3,"file":"CartesianValue.js","sourceRoot":"","sources":["../../src/cartesian/CartesianValue.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,MAAa,cAAe,SAAQ,eAAM;IAItC,YAAY,IAIC;QAET,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAC5B,CAAC;IAED,MAAM;QAKF,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAS,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAvBD,wCAuBC"}
|
package/package.json
CHANGED
|
@@ -26,6 +26,8 @@ export declare class RainComputationMap extends RainComputationAbstract {
|
|
|
26
26
|
radars?: Link[] | RaainNode[];
|
|
27
27
|
});
|
|
28
28
|
toJSON(): any;
|
|
29
|
-
setMapData(mapData: RainMeasure[] | string
|
|
29
|
+
setMapData(mapData: RainMeasure[] | string, options?: {
|
|
30
|
+
mergeCartesian: boolean;
|
|
31
|
+
}): void;
|
|
30
32
|
getMapData(): RainMeasure[];
|
|
31
33
|
}
|
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RainComputationMap = void 0;
|
|
4
4
|
const RainComputationAbstract_1 = require("./RainComputationAbstract");
|
|
5
|
+
const RainMeasure_1 = require("./RainMeasure");
|
|
6
|
+
const CartesianValue_1 = require("../cartesian/CartesianValue");
|
|
7
|
+
const RainCartesianMeasureValue_1 = require("../cartesian/RainCartesianMeasureValue");
|
|
8
|
+
const LatLng_1 = require("../cartesian/LatLng");
|
|
9
|
+
const QualityTools_1 = require("../quality/tools/QualityTools");
|
|
10
|
+
const CartesianMeasureValue_1 = require("../cartesian/CartesianMeasureValue");
|
|
5
11
|
/**
|
|
6
12
|
* api/rains/:id/computations/:computationId?format=map&...
|
|
7
13
|
* or with
|
|
@@ -20,10 +26,38 @@ class RainComputationMap extends RainComputationAbstract_1.RainComputationAbstra
|
|
|
20
26
|
}
|
|
21
27
|
return json;
|
|
22
28
|
}
|
|
23
|
-
setMapData(mapData) {
|
|
29
|
+
setMapData(mapData, options = { mergeCartesian: false }) {
|
|
24
30
|
if (!mapData) {
|
|
25
31
|
return;
|
|
26
32
|
}
|
|
33
|
+
if (typeof (mapData) !== 'string' && (options === null || options === void 0 ? void 0 : options.mergeCartesian)) {
|
|
34
|
+
const rainMeasures = mapData;
|
|
35
|
+
let rainMeasuresMerged = [];
|
|
36
|
+
const cartesianValuesMerged = [];
|
|
37
|
+
let cartesianPixelWidth = new LatLng_1.LatLng({ lat: QualityTools_1.QualityTools.DEFAULT_SCALE, lng: QualityTools_1.QualityTools.DEFAULT_SCALE });
|
|
38
|
+
for (const rainMeasure of rainMeasures) {
|
|
39
|
+
for (const value of rainMeasure.values) {
|
|
40
|
+
if (typeof value['cartesianValues'] !== 'undefined' && typeof value['cartesianPixelWidth'] !== 'undefined') {
|
|
41
|
+
const cartesianMeasureValue = new CartesianMeasureValue_1.CartesianMeasureValue(value);
|
|
42
|
+
const cartesianValues = cartesianMeasureValue.getCartesianValues();
|
|
43
|
+
cartesianPixelWidth = cartesianMeasureValue.getCartesianPixelWidth();
|
|
44
|
+
for (const cartesianValue of cartesianValues) {
|
|
45
|
+
const alreadyExist = cartesianValuesMerged.filter(v => cartesianValue.equals(v));
|
|
46
|
+
if (alreadyExist.length === 1) {
|
|
47
|
+
alreadyExist[0].value += cartesianValue.value;
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
cartesianValuesMerged.push(new CartesianValue_1.CartesianValue(cartesianValue.toJSON()));
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
const rm = new RainMeasure_1.RainMeasure(rainMeasure.toJSON());
|
|
56
|
+
rm.values = [new RainCartesianMeasureValue_1.RainCartesianMeasureValue({ cartesianValues: cartesianValuesMerged, cartesianPixelWidth })];
|
|
57
|
+
rainMeasuresMerged = [rm];
|
|
58
|
+
}
|
|
59
|
+
mapData = rainMeasuresMerged;
|
|
60
|
+
}
|
|
27
61
|
let map = mapData;
|
|
28
62
|
try {
|
|
29
63
|
if (typeof (mapData) !== 'string') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RainComputationMap.js","sourceRoot":"","sources":["../../src/rain/RainComputationMap.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;
|
|
1
|
+
{"version":3,"file":"RainComputationMap.js","sourceRoot":"","sources":["../../src/rain/RainComputationMap.ts"],"names":[],"mappings":"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"}
|