raain-model 2.6.1 → 2.6.2
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/cartesian/CartesianTools.d.ts +1 -5
- package/cartesian/CartesianTools.js.map +1 -1
- package/cartesian/EarthMap.d.ts +5 -0
- package/cartesian/EarthMap.js +3 -0
- package/cartesian/EarthMap.js.map +1 -0
- package/cartesian/RainCartesianMeasureValue.d.ts +1 -1
- package/cartesian/index.d.ts +8 -0
- package/cartesian/index.js +25 -0
- package/cartesian/index.js.map +1 -0
- package/gauge/GaugeMeasure.d.ts +3 -3
- package/gauge/GaugeMeasure.js +2 -2
- package/gauge/GaugeMeasure.js.map +1 -1
- package/gauge/GaugeNode.d.ts +1 -3
- package/gauge/GaugeNode.js +2 -2
- package/gauge/GaugeNode.js.map +1 -1
- package/gauge/GaugeNodeMap.d.ts +1 -3
- package/gauge/GaugeNodeMap.js.map +1 -1
- package/gauge/index.d.ts +3 -0
- package/gauge/index.js +20 -0
- package/gauge/index.js.map +1 -0
- package/index.d.ts +7 -41
- package/index.js +7 -41
- package/index.js.map +1 -1
- package/organization/Measure.d.ts +2 -2
- package/organization/index.d.ts +7 -0
- package/organization/index.js +24 -0
- package/organization/index.js.map +1 -0
- package/package.json +1 -1
- package/polar/RainPolarMeasureValue.d.ts +1 -1
- package/polar/index.d.ts +8 -0
- package/polar/index.js +25 -0
- package/polar/index.js.map +1 -0
- package/quality/SpeedMatrixContainer.d.ts +1 -1
- package/quality/index.d.ts +9 -0
- package/quality/index.js +26 -0
- package/quality/index.js.map +1 -0
- package/radar/RadarMeasure.d.ts +3 -3
- package/radar/RadarMeasure.js +2 -2
- package/radar/RadarMeasure.js.map +1 -1
- package/radar/RadarNode.d.ts +1 -3
- package/radar/RadarNode.js +2 -2
- package/radar/RadarNode.js.map +1 -1
- package/radar/RadarNodeMap.d.ts +1 -3
- package/radar/RadarNodeMap.js.map +1 -1
- package/radar/index.d.ts +3 -0
- package/radar/index.js +20 -0
- package/radar/index.js.map +1 -0
- package/rain/MergeStrategy.d.ts +13 -0
- package/rain/MergeStrategy.js +11 -0
- package/rain/MergeStrategy.js.map +1 -0
- package/rain/RainComputation.d.ts +5 -7
- package/rain/RainComputation.js +6 -6
- package/rain/RainComputation.js.map +1 -1
- package/rain/RainComputationAbstract.d.ts +3 -18
- package/rain/RainComputationAbstract.js +20 -32
- package/rain/RainComputationAbstract.js.map +1 -1
- package/rain/RainComputationMap.d.ts +4 -5
- package/rain/RainComputationMap.js +3 -2
- package/rain/RainComputationMap.js.map +1 -1
- package/rain/RainComputationQuality.d.ts +2 -3
- package/rain/RainComputationQuality.js +2 -2
- package/rain/RainComputationQuality.js.map +1 -1
- package/rain/RainMeasure.d.ts +3 -3
- package/rain/RainMeasure.js +2 -2
- package/rain/RainMeasure.js.map +1 -1
- package/rain/RainNode.d.ts +4 -6
- package/rain/RainNode.js +22 -23
- package/rain/RainNode.js.map +1 -1
- package/rain/index.d.ts +6 -0
- package/rain/index.js +23 -0
- package/rain/index.js.map +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadarNodeMap.js","sourceRoot":"","sources":["../../src/radar/RadarNodeMap.ts"],"names":[],"mappings":";;;AACA,2CAAsC;
|
|
1
|
+
{"version":3,"file":"RadarNodeMap.js","sourceRoot":"","sources":["../../src/radar/RadarNodeMap.ts"],"names":[],"mappings":";;;AACA,2CAAsC;AAGtC;;GAEG;AACH,MAAa,YAAa,SAAQ,qBAAS;IAKvC,YAAY,IAYX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU,CAAC,OAAgC;QAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO;QACX,CAAC;QAED,IAAI,GAAG,GAAG,OAAO,CAAC;QAClB,IAAI,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAChC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;QACb,CAAC;QACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAEM,UAAU;QACb,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;CACJ;AArDD,oCAqDC"}
|
package/radar/index.d.ts
ADDED
package/radar/index.js
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./RadarMeasure"), exports);
|
|
18
|
+
__exportStar(require("./RadarNodeMap"), exports);
|
|
19
|
+
__exportStar(require("./RadarNode"), exports);
|
|
20
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/radar/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,iDAA+B;AAC/B,8CAA4B"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { LatLng } from '../cartesian';
|
|
2
|
+
export declare enum MergeStrategy {
|
|
3
|
+
NONE = "none",
|
|
4
|
+
SUM = "sum",
|
|
5
|
+
AVERAGE = "average",
|
|
6
|
+
MAX = "max"
|
|
7
|
+
}
|
|
8
|
+
export interface MergeLatLng {
|
|
9
|
+
sum: number;
|
|
10
|
+
max: number;
|
|
11
|
+
count: number;
|
|
12
|
+
latLng: LatLng;
|
|
13
|
+
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MergeStrategy = void 0;
|
|
4
|
+
var MergeStrategy;
|
|
5
|
+
(function (MergeStrategy) {
|
|
6
|
+
MergeStrategy["NONE"] = "none";
|
|
7
|
+
MergeStrategy["SUM"] = "sum";
|
|
8
|
+
MergeStrategy["AVERAGE"] = "average";
|
|
9
|
+
MergeStrategy["MAX"] = "max";
|
|
10
|
+
})(MergeStrategy || (exports.MergeStrategy = MergeStrategy = {}));
|
|
11
|
+
//# sourceMappingURL=MergeStrategy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MergeStrategy.js","sourceRoot":"","sources":["../../src/rain/MergeStrategy.ts"],"names":[],"mappings":";;;AAEA,IAAY,aAKX;AALD,WAAY,aAAa;IACrB,8BAAa,CAAA;IACb,4BAAW,CAAA;IACX,oCAAmB,CAAA;IACnB,4BAAW,CAAA;AACf,CAAC,EALW,aAAa,6BAAb,aAAa,QAKxB"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { RaainNode } from '../organization
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import { MergeStrategy, RainComputationAbstract } from './RainComputationAbstract';
|
|
6
|
-
import { LatLng } from '../cartesian/LatLng';
|
|
1
|
+
import { Link, RaainNode } from '../organization';
|
|
2
|
+
import { RainPolarMeasureValue } from '../polar';
|
|
3
|
+
import { CartesianTools, LatLng, RainCartesianMeasureValue } from '../cartesian';
|
|
4
|
+
import { RainComputationAbstract } from './RainComputationAbstract';
|
|
7
5
|
import { RainMeasure } from './RainMeasure';
|
|
8
|
-
import {
|
|
6
|
+
import { MergeStrategy } from './MergeStrategy';
|
|
9
7
|
/**
|
|
10
8
|
* api/rains/:rainId/computations/:computationId
|
|
11
9
|
* or as an array on
|
package/rain/RainComputation.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RainComputation = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const polar_1 = require("../polar");
|
|
5
|
+
const cartesian_1 = require("../cartesian");
|
|
6
6
|
const RainComputationAbstract_1 = require("./RainComputationAbstract");
|
|
7
7
|
const RainMeasure_1 = require("./RainMeasure");
|
|
8
8
|
/**
|
|
@@ -43,16 +43,16 @@ class RainComputation extends RainComputationAbstract_1.RainComputationAbstract
|
|
|
43
43
|
}
|
|
44
44
|
this.results = results.map(r => {
|
|
45
45
|
if (typeof r === 'string' && r.indexOf('polarMeasureValue') >= 0) {
|
|
46
|
-
return new
|
|
46
|
+
return new polar_1.RainPolarMeasureValue(JSON.parse(r));
|
|
47
47
|
}
|
|
48
48
|
else if (r.polarMeasureValue) {
|
|
49
|
-
return new
|
|
49
|
+
return new polar_1.RainPolarMeasureValue(r);
|
|
50
50
|
}
|
|
51
51
|
if (typeof r === 'string' && r.indexOf('cartesian') >= 0) {
|
|
52
|
-
return new
|
|
52
|
+
return new cartesian_1.RainCartesianMeasureValue(JSON.parse(r));
|
|
53
53
|
}
|
|
54
54
|
else if (r.cartesianValues) {
|
|
55
|
-
return new
|
|
55
|
+
return new cartesian_1.RainCartesianMeasureValue(r);
|
|
56
56
|
}
|
|
57
57
|
else {
|
|
58
58
|
return r;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RainComputation.js","sourceRoot":"","sources":["../../src/rain/RainComputation.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"RainComputation.js","sourceRoot":"","sources":["../../src/rain/RainComputation.ts"],"names":[],"mappings":";;;AACA,oCAA+C;AAC/C,4CAA+E;AAC/E,uEAAkE;AAClE,+CAA0C;AAG1C;;;;GAIG;AACH,MAAa,eAAgB,SAAQ,iDAAuB;IAQxD,YAAY,IAgBX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG;QACpB,SAAS,EAAE,KAAK;KACnB;QACG,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,qBAAqB,CAAC,OAKrB;QAEG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAEhC,OAAO,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,yBAAW,CAAC;gBAC3C,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,MAAM,EAAE,IAAI,CAAC,OAAO;gBACpB,IAAI,EAAE,IAAI,CAAC,IAAI;aAClB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAClB,CAAC;IAES,WAAW;QACjB,OAAO,eAAe,CAAC,IAAI,CAAC;IAChC,CAAC;IAEO,UAAU,CAAC,OAAyE;QACxF,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9D,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YAClB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC3B,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC/D,OAAO,IAAI,6BAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,CAAC;iBAAM,IAAI,CAAC,CAAC,iBAAiB,EAAE,CAAC;gBAC7B,OAAO,IAAI,6BAAqB,CAAC,CAAC,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvD,OAAO,IAAI,qCAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,CAAC;iBAAM,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;gBAC3B,OAAO,IAAI,qCAAyB,CAAC,CAAC,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,CAAC;YACb,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;;AAjFL,0CAmFC;AAjFiB,oBAAI,GAAG,kBAAkB,CAAC"}
|
|
@@ -1,21 +1,7 @@
|
|
|
1
|
-
import { RaainNode } from '../organization
|
|
2
|
-
import {
|
|
3
|
-
import { LatLng } from '../cartesian/LatLng';
|
|
1
|
+
import { Link, RaainNode } from '../organization';
|
|
2
|
+
import { CartesianTools, CartesianValue, LatLng } from '../cartesian';
|
|
4
3
|
import { RainMeasure } from './RainMeasure';
|
|
5
|
-
import {
|
|
6
|
-
import { CartesianTools } from '../cartesian/CartesianTools';
|
|
7
|
-
export declare enum MergeStrategy {
|
|
8
|
-
NONE = "none",
|
|
9
|
-
SUM = "sum",
|
|
10
|
-
AVERAGE = "average",
|
|
11
|
-
MAX = "max"
|
|
12
|
-
}
|
|
13
|
-
interface MergeLatLng {
|
|
14
|
-
sum: number;
|
|
15
|
-
max: number;
|
|
16
|
-
count: number;
|
|
17
|
-
latLng: LatLng;
|
|
18
|
-
}
|
|
4
|
+
import { MergeLatLng, MergeStrategy } from './MergeStrategy';
|
|
19
5
|
/**
|
|
20
6
|
* not used directly
|
|
21
7
|
*/
|
|
@@ -82,4 +68,3 @@ export declare class RainComputationAbstract extends RaainNode {
|
|
|
82
68
|
}): RainMeasure[];
|
|
83
69
|
protected buildMergeCartesianValues(mergeStrategy: MergeStrategy, removeNullValues?: boolean): CartesianValue[];
|
|
84
70
|
}
|
|
85
|
-
export {};
|
|
@@ -1,28 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RainComputationAbstract =
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const RadarNode_1 = require("../radar/RadarNode");
|
|
3
|
+
exports.RainComputationAbstract = void 0;
|
|
4
|
+
const organization_1 = require("../organization");
|
|
5
|
+
const radar_1 = require("../radar");
|
|
7
6
|
const RainNode_1 = require("./RainNode");
|
|
8
|
-
const
|
|
9
|
-
const LatLng_1 = require("../cartesian/LatLng");
|
|
7
|
+
const cartesian_1 = require("../cartesian");
|
|
10
8
|
const RainMeasure_1 = require("./RainMeasure");
|
|
11
|
-
const
|
|
12
|
-
const RainCartesianMeasureValue_1 = require("../cartesian/RainCartesianMeasureValue");
|
|
13
|
-
const CartesianValue_1 = require("../cartesian/CartesianValue");
|
|
14
|
-
const CartesianTools_1 = require("../cartesian/CartesianTools");
|
|
15
|
-
var MergeStrategy;
|
|
16
|
-
(function (MergeStrategy) {
|
|
17
|
-
MergeStrategy["NONE"] = "none";
|
|
18
|
-
MergeStrategy["SUM"] = "sum";
|
|
19
|
-
MergeStrategy["AVERAGE"] = "average";
|
|
20
|
-
MergeStrategy["MAX"] = "max";
|
|
21
|
-
})(MergeStrategy || (exports.MergeStrategy = MergeStrategy = {}));
|
|
9
|
+
const MergeStrategy_1 = require("./MergeStrategy");
|
|
22
10
|
/**
|
|
23
11
|
* not used directly
|
|
24
12
|
*/
|
|
25
|
-
class RainComputationAbstract extends
|
|
13
|
+
class RainComputationAbstract extends organization_1.RaainNode {
|
|
26
14
|
constructor(json) {
|
|
27
15
|
super(json);
|
|
28
16
|
this.date = json.date ? new Date(json.date) : null;
|
|
@@ -43,14 +31,14 @@ class RainComputationAbstract extends RaainNode_1.RaainNode {
|
|
|
43
31
|
return [];
|
|
44
32
|
}
|
|
45
33
|
return linksToPurify.map(l => {
|
|
46
|
-
if (l instanceof
|
|
34
|
+
if (l instanceof organization_1.Link) {
|
|
47
35
|
return l;
|
|
48
36
|
}
|
|
49
37
|
else if (l && l['_id']) {
|
|
50
|
-
return new
|
|
38
|
+
return new radar_1.RadarNode({ id: l['_id'].toString(), latitude: 0, longitude: 0, name: l.name, team: l.team });
|
|
51
39
|
}
|
|
52
40
|
else if (l && l.id) {
|
|
53
|
-
return new
|
|
41
|
+
return new radar_1.RadarNode({
|
|
54
42
|
id: l.id.toString(), // 'hex'
|
|
55
43
|
latitude: 0, longitude: 0, name: l.name, team: l.team
|
|
56
44
|
});
|
|
@@ -62,14 +50,14 @@ class RainComputationAbstract extends RaainNode_1.RaainNode {
|
|
|
62
50
|
return [];
|
|
63
51
|
}
|
|
64
52
|
return linksToPurify.map(l => {
|
|
65
|
-
if (l instanceof
|
|
53
|
+
if (l instanceof organization_1.Link) {
|
|
66
54
|
return l;
|
|
67
55
|
}
|
|
68
56
|
else if (l && l['_id']) {
|
|
69
|
-
return new
|
|
57
|
+
return new radar_1.RadarMeasure({ id: l['_id'].toString(), values: [] });
|
|
70
58
|
}
|
|
71
59
|
else if (l && l.id) {
|
|
72
|
-
return new
|
|
60
|
+
return new radar_1.RadarMeasure({ id: l.id.toString(), values: [] }); // 'hex'
|
|
73
61
|
}
|
|
74
62
|
});
|
|
75
63
|
}
|
|
@@ -124,8 +112,8 @@ class RainComputationAbstract extends RaainNode_1.RaainNode {
|
|
|
124
112
|
const topPoint = options.cartesianTools.getLatLngFromEarthMap(options.mergeLimitPoints[1]);
|
|
125
113
|
const scaleLat = options.cartesianTools.getScaleLatLng(downPoint);
|
|
126
114
|
for (let lat = downPoint.lat; lat <= topPoint.lat; lat += scaleLat.lat) {
|
|
127
|
-
lat =
|
|
128
|
-
const latLng = new
|
|
115
|
+
lat = cartesian_1.CartesianTools.LimitWithPrecision(lat);
|
|
116
|
+
const latLng = new cartesian_1.LatLng({ lat, lng: downPoint.lng });
|
|
129
117
|
const scaleLng = options.cartesianTools.getScaleLatLng(latLng);
|
|
130
118
|
const lngCount = Math.round((topPoint.lng - downPoint.lng) / scaleLng.lng) + 1;
|
|
131
119
|
const lngs = [];
|
|
@@ -142,13 +130,13 @@ class RainComputationAbstract extends RaainNode_1.RaainNode {
|
|
|
142
130
|
for (const rainMeasure of rainMeasures) {
|
|
143
131
|
for (const value of rainMeasure.values) {
|
|
144
132
|
if (typeof value['cartesianValues'] !== 'undefined') {
|
|
145
|
-
const cartesianMeasureValue = new
|
|
133
|
+
const cartesianMeasureValue = new cartesian_1.CartesianMeasureValue(value);
|
|
146
134
|
const cartesianValues = cartesianMeasureValue.getCartesianValues();
|
|
147
135
|
for (const cartesianValue of cartesianValues) {
|
|
148
136
|
const latLngIndex = this.getMergeLatLngIndex(cartesianValue);
|
|
149
137
|
if (latLngIndex[0] >= 0 && latLngIndex[1] >= 0 && latLngIndex[0] < this.mergeTools.latsLngs.length &&
|
|
150
138
|
latLngIndex[1] < this.mergeTools.latsLngs[latLngIndex[0]].length) {
|
|
151
|
-
this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].latLng =
|
|
139
|
+
this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].latLng = cartesian_1.CartesianTools.CreateLatLng(cartesianValue);
|
|
152
140
|
this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].sum += cartesianValue.value;
|
|
153
141
|
this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].max = Math.max(cartesianValue.value, this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].max);
|
|
154
142
|
this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].count++;
|
|
@@ -172,7 +160,7 @@ class RainComputationAbstract extends RaainNode_1.RaainNode {
|
|
|
172
160
|
const firstCartesianRainMeasure = rainMeasures[0];
|
|
173
161
|
const cartesianValuesMerged = this.buildMergeCartesianValues(options.mergeStrategy, options.removeNullValues);
|
|
174
162
|
const rm = new RainMeasure_1.RainMeasure(firstCartesianRainMeasure.toJSON());
|
|
175
|
-
rm.values = [new
|
|
163
|
+
rm.values = [new cartesian_1.RainCartesianMeasureValue({
|
|
176
164
|
cartesianValues: cartesianValuesMerged,
|
|
177
165
|
version: firstCartesianRainMeasure.getVersion(),
|
|
178
166
|
limitPoints: options.mergeLimitPoints,
|
|
@@ -184,16 +172,16 @@ class RainComputationAbstract extends RaainNode_1.RaainNode {
|
|
|
184
172
|
for (const [latIndex, latValues] of this.mergeTools.latsLngs.entries()) {
|
|
185
173
|
for (const [lngIndex, mergeValue] of latValues.entries()) {
|
|
186
174
|
let value = mergeValue.sum;
|
|
187
|
-
if (mergeStrategy === MergeStrategy.AVERAGE) {
|
|
175
|
+
if (mergeStrategy === MergeStrategy_1.MergeStrategy.AVERAGE) {
|
|
188
176
|
value = mergeValue.count ? value / mergeValue.count : -1;
|
|
189
177
|
}
|
|
190
|
-
else if (mergeStrategy === MergeStrategy.MAX) {
|
|
178
|
+
else if (mergeStrategy === MergeStrategy_1.MergeStrategy.MAX) {
|
|
191
179
|
value = mergeValue.max;
|
|
192
180
|
}
|
|
193
181
|
if (mergeValue.count && !(removeNullValues && !value)) {
|
|
194
182
|
const lat = mergeValue.latLng.lat;
|
|
195
183
|
const lng = mergeValue.latLng.lng;
|
|
196
|
-
cartesianValuesMerged.push(new
|
|
184
|
+
cartesianValuesMerged.push(new cartesian_1.CartesianValue({ value, lat, lng }));
|
|
197
185
|
}
|
|
198
186
|
}
|
|
199
187
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RainComputationAbstract.js","sourceRoot":"","sources":["../../src/rain/RainComputationAbstract.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"RainComputationAbstract.js","sourceRoot":"","sources":["../../src/rain/RainComputationAbstract.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Link } from '../organization
|
|
1
|
+
import { RainComputationAbstract } from './RainComputationAbstract';
|
|
2
|
+
import { Link, RaainNode } from '../organization';
|
|
3
3
|
import { RainMeasure } from './RainMeasure';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import { CartesianTools } from '../cartesian/CartesianTools';
|
|
4
|
+
import { CartesianTools, LatLng } from '../cartesian';
|
|
5
|
+
import { MergeStrategy } from './MergeStrategy';
|
|
7
6
|
/**
|
|
8
7
|
* api/rains/:id/computations/:computationId?format=map&...
|
|
9
8
|
* or with
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RainComputationMap = void 0;
|
|
4
4
|
const RainComputationAbstract_1 = require("./RainComputationAbstract");
|
|
5
|
+
const MergeStrategy_1 = require("./MergeStrategy");
|
|
5
6
|
/**
|
|
6
7
|
* api/rains/:id/computations/:computationId?format=map&...
|
|
7
8
|
* or with
|
|
@@ -10,7 +11,7 @@ const RainComputationAbstract_1 = require("./RainComputationAbstract");
|
|
|
10
11
|
class RainComputationMap extends RainComputationAbstract_1.RainComputationAbstract {
|
|
11
12
|
constructor(json) {
|
|
12
13
|
super(json);
|
|
13
|
-
this.setMapData(json.map, { mergeStrategy:
|
|
14
|
+
this.setMapData(json.map, { mergeStrategy: MergeStrategy_1.MergeStrategy.NONE });
|
|
14
15
|
}
|
|
15
16
|
toJSON() {
|
|
16
17
|
const json = super.toJSON();
|
|
@@ -24,7 +25,7 @@ class RainComputationMap extends RainComputationAbstract_1.RainComputationAbstra
|
|
|
24
25
|
if (!mapData) {
|
|
25
26
|
return;
|
|
26
27
|
}
|
|
27
|
-
if (typeof (mapData) !== 'string' && options.mergeStrategy !==
|
|
28
|
+
if (typeof (mapData) !== 'string' && options.mergeStrategy !== MergeStrategy_1.MergeStrategy.NONE
|
|
28
29
|
&& (options === null || options === void 0 ? void 0 : options.cartesianTools) && (options === null || options === void 0 ? void 0 : options.mergeLimitPoints)) {
|
|
29
30
|
this.buildLatLngMatrix({
|
|
30
31
|
cartesianTools: options.cartesianTools,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RainComputationMap.js","sourceRoot":"","sources":["../../src/rain/RainComputationMap.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"RainComputationMap.js","sourceRoot":"","sources":["../../src/rain/RainComputationMap.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;AAIlE,mDAA8C;AAE9C;;;;GAIG;AACH,MAAa,kBAAmB,SAAQ,iDAAuB;IAI3D,YAAY,IAiBX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,EAAC,aAAa,EAAE,6BAAa,CAAC,IAAI,EAAC,CAAC,CAAC;IACnE,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;YACvB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU,CAAC,OAA+B,EAAE,OAKlD;QACG,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO;QACX,CAAC;QAED,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,KAAK,6BAAa,CAAC,IAAI;gBAC1E,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAA,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAAA,EAAE,CAAC;YAE1D,IAAI,CAAC,iBAAiB,CAAC;gBACnB,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC7C,CAAC,CAAC;YAEH,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAwB,EAAE;gBACvD,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB;gBAC5C,aAAa,EAAE,OAAO,CAAC,aAAa;aACvC,CAAC,CAAC;QACP,CAAC;QAED,IAAI,GAAG,GAAG,OAAO,CAAC;QAClB,IAAI,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAChC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;QACb,CAAC;QACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAEM,UAAU;QACb,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;CACJ;AA5ED,gDA4EC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { RainComputationAbstract } from './RainComputationAbstract';
|
|
2
|
-
import { Link } from '../organization
|
|
3
|
-
import {
|
|
4
|
-
import { SpeedMatrixContainer } from '../quality/SpeedMatrixContainer';
|
|
2
|
+
import { Link, RaainNode } from '../organization';
|
|
3
|
+
import { SpeedMatrixContainer } from '../quality';
|
|
5
4
|
/**
|
|
6
5
|
* api/rains/:id/computations?format=compare&begin=...&gauges=[...]
|
|
7
6
|
*/
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RainComputationQuality = void 0;
|
|
4
4
|
const RainComputationAbstract_1 = require("./RainComputationAbstract");
|
|
5
|
-
const
|
|
5
|
+
const organization_1 = require("../organization");
|
|
6
6
|
const RainComputation_1 = require("./RainComputation");
|
|
7
7
|
/**
|
|
8
8
|
* api/rains/:id/computations?format=compare&begin=...&gauges=[...]
|
|
@@ -18,7 +18,7 @@ class RainComputationQuality extends RainComputationAbstract_1.RainComputationAb
|
|
|
18
18
|
if (!linkToPurify) {
|
|
19
19
|
return [];
|
|
20
20
|
}
|
|
21
|
-
if (linkToPurify instanceof
|
|
21
|
+
if (linkToPurify instanceof organization_1.Link) {
|
|
22
22
|
return [linkToPurify];
|
|
23
23
|
}
|
|
24
24
|
else if (linkToPurify['_id']) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RainComputationQuality.js","sourceRoot":"","sources":["../../src/rain/RainComputationQuality.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;AAClE
|
|
1
|
+
{"version":3,"file":"RainComputationQuality.js","sourceRoot":"","sources":["../../src/rain/RainComputationQuality.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;AAClE,kDAAgD;AAEhD,uDAAkD;AAGlD;;GAEG;AACH,MAAa,sBAAuB,SAAQ,iDAAuB;IAK/D,YAAY,IAkBX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,2BAA2B,CAAC;QACpE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAC5B,CAAC;IAEO,MAAM,CAAC,wBAAwB,CAAC,YAAiB;QACrD,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACd,CAAC;QAED,IAAI,YAAY,YAAY,mBAAI,EAAE,CAAC;YAC/B,OAAO,CAAC,YAAY,CAAC,CAAC;QAC1B,CAAC;aAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,IAAI,iCAAe,CAAC;oBACxB,EAAE,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;oBAClC,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,OAAO,EAAE,YAAY,CAAC,OAAO;oBAC7B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU;iBACzC,CAAC,CAAC,CAAC;QACR,CAAC;aAAM,IAAI,YAAY,CAAC,EAAE,EAAE,CAAC;YACzB,OAAO,CAAC,IAAI,iCAAe,CAAC;oBACxB,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE;oBAC9B,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,OAAO,EAAE,YAAY,CAAC,OAAO;oBAC7B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU;iBACzC,CAAC,CAAC,CAAC;QACR,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEM,sBAAsB,CAAC,SAA2B;QACrD,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,sBAA8C;QAEhD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC3E,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;QAChG,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;QACzG,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,sBAAsB,CAAC,aAAa,CAAC,CAAC;QAE7F,IAAI,IAAI,CAAC,2BAA2B,IAAI,IAAI,CAAC,2BAA2B,CAAC,KAAK,EAAE,CAAC;YAC7E,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,sBAAsB,CAAC,2BAA2B,CAAC,CAAC;QAClI,CAAC;IAEL,CAAC;IAEM,MAAM,CAAC,GAAS;QACnB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAE5B,IAAI,IAAI,CAAC,2BAA2B,IAAI,IAAI,CAAC,2BAA2B,CAAC,MAAM,EAAE,CAAC;YAC9E,IAAI,CAAC,6BAA6B,CAAC,GAAG,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvF,CAAC;aAAM,IAAI,IAAI,CAAC,2BAA2B,EAAE,CAAC;YAC1C,IAAI,CAAC,6BAA6B,CAAC,GAAG,IAAI,CAAC,2BAA2B,CAAC;QAC3E,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,iCAAe,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,eAAe,EAAE,CAAC;YAClB,IAAI,CAAC,iBAAiB,CAAC,GAAG,eAAe,CAAC;QAC9C,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC/B,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,kBAAkB,CAAC,EAAO,EAAE,EAAO;QACzC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,OAAO,EAAE,CAAC;QACd,CAAC;QACD,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,YAAY,CAAC,EAAQ,EAAE,EAAQ;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YACzB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAES,YAAY,CAAC,EAAQ,EAAE,EAAQ;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YACzB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAES,QAAQ,CAAC,EAAU,EAAE,EAAU;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YACzB,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAES,QAAQ,CAAC,EAAU,EAAE,EAAU;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAES,QAAQ,CAAC,EAAU,EAAE,EAAU;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAES,QAAQ,CAAC,EAAU,EAAE,EAAU;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YACzB,OAAO,EAAE,GAAG,EAAE,CAAC;QACnB,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAES,WAAW,CAAC,EAAc,EAAE,EAAc;QAChD,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YACzB,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;CAEJ;AAzKD,wDAyKC"}
|
package/rain/RainMeasure.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Measure } from '../organization
|
|
2
|
-
import { IPolarMeasureValue } from '../polar
|
|
3
|
-
import { ICartesianMeasureValue } from '../cartesian
|
|
1
|
+
import { Measure } from '../organization';
|
|
2
|
+
import { IPolarMeasureValue } from '../polar';
|
|
3
|
+
import { ICartesianMeasureValue } from '../cartesian';
|
|
4
4
|
/**
|
|
5
5
|
* api/rains/:id/computations/:id?format=map => RainComputationMap getMapData() => RainMeasure[]
|
|
6
6
|
*/
|
package/rain/RainMeasure.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RainMeasure = void 0;
|
|
4
|
-
const
|
|
4
|
+
const organization_1 = require("../organization");
|
|
5
5
|
/**
|
|
6
6
|
* api/rains/:id/computations/:id?format=map => RainComputationMap getMapData() => RainMeasure[]
|
|
7
7
|
*/
|
|
8
|
-
class RainMeasure extends
|
|
8
|
+
class RainMeasure extends organization_1.Measure {
|
|
9
9
|
constructor(json) {
|
|
10
10
|
super(json);
|
|
11
11
|
}
|
package/rain/RainMeasure.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RainMeasure.js","sourceRoot":"","sources":["../../src/rain/RainMeasure.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"RainMeasure.js","sourceRoot":"","sources":["../../src/rain/RainMeasure.ts"],"names":[],"mappings":";;;AAAA,kDAAwC;AAIxC;;GAEG;AACH,MAAa,WAAY,SAAQ,sBAAO;IAIpC,YAAY,IAMX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAES,WAAW;QACjB,OAAO,WAAW,CAAC,IAAI,CAAC;IAC5B,CAAC;;AAhBL,kCAiBC;AAfiB,gBAAI,GAAG,cAAc,CAAC"}
|
package/rain/RainNode.d.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import { RaainNode } from '../organization
|
|
2
|
-
import {
|
|
3
|
-
import { RadarNode } from '../radar/RadarNode';
|
|
1
|
+
import { Link, RaainNode, TeamNode } from '../organization';
|
|
2
|
+
import { RadarNode } from '../radar';
|
|
4
3
|
import { RainComputation } from './RainComputation';
|
|
5
|
-
import { GaugeNode } from '../gauge
|
|
6
|
-
import {
|
|
7
|
-
import { LatLng } from '../cartesian/LatLng';
|
|
4
|
+
import { GaugeNode } from '../gauge';
|
|
5
|
+
import { LatLng } from '../cartesian';
|
|
8
6
|
/**
|
|
9
7
|
* api/rains/:id
|
|
10
8
|
*/
|
package/rain/RainNode.js
CHANGED
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RainNode = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const RadarNode_1 = require("../radar/RadarNode");
|
|
4
|
+
const organization_1 = require("../organization");
|
|
5
|
+
const radar_1 = require("../radar");
|
|
7
6
|
const RainComputation_1 = require("./RainComputation");
|
|
8
|
-
const
|
|
9
|
-
const
|
|
7
|
+
const gauge_1 = require("../gauge");
|
|
8
|
+
const cartesian_1 = require("../cartesian");
|
|
10
9
|
/**
|
|
11
10
|
* api/rains/:id
|
|
12
11
|
*/
|
|
13
|
-
class RainNode extends
|
|
12
|
+
class RainNode extends organization_1.RaainNode {
|
|
14
13
|
constructor(json) {
|
|
15
14
|
super(json);
|
|
16
15
|
const links = (json === null || json === void 0 ? void 0 : json.links) ? json.links : [];
|
|
@@ -20,9 +19,9 @@ class RainNode extends RaainNode_1.RaainNode {
|
|
|
20
19
|
this.status = json.status >= 0 ? json.status : -1;
|
|
21
20
|
this.quality = json.quality >= 0 ? json.quality : -1;
|
|
22
21
|
this.latLngRectsAsJSON = json.latLngRectsAsJSON;
|
|
23
|
-
this.addRadars(links.filter(l => l instanceof
|
|
22
|
+
this.addRadars(links.filter(l => l instanceof radar_1.RadarNode));
|
|
24
23
|
this.addRadars(json.radars);
|
|
25
|
-
this.addGauges(links.filter(l => l instanceof
|
|
24
|
+
this.addGauges(links.filter(l => l instanceof gauge_1.GaugeNode));
|
|
26
25
|
this.addGauges(json.gauges);
|
|
27
26
|
this.setConfiguration(json.configurationAsJSON);
|
|
28
27
|
this.addCompletedComputations(links.filter(l => l instanceof RainComputation_1.RainComputation));
|
|
@@ -33,14 +32,14 @@ class RainNode extends RaainNode_1.RaainNode {
|
|
|
33
32
|
return [];
|
|
34
33
|
}
|
|
35
34
|
const linksPurified = linksToPurify.map(l => {
|
|
36
|
-
if (l instanceof
|
|
35
|
+
if (l instanceof organization_1.Link) {
|
|
37
36
|
return l;
|
|
38
37
|
}
|
|
39
38
|
else if (l && l['_id']) {
|
|
40
|
-
return new
|
|
39
|
+
return new radar_1.RadarNode({ id: l['_id'].toString(), latitude: l.latitude, longitude: l.latitude, name: l.name, team: l.team });
|
|
41
40
|
}
|
|
42
41
|
else if (l && l.id) {
|
|
43
|
-
return new
|
|
42
|
+
return new radar_1.RadarNode({ id: l.id.toString(), latitude: l.latitude, longitude: l.longitude, name: l.name, team: l.team });
|
|
44
43
|
}
|
|
45
44
|
});
|
|
46
45
|
return linksPurified.filter(l => !!l);
|
|
@@ -50,7 +49,7 @@ class RainNode extends RaainNode_1.RaainNode {
|
|
|
50
49
|
return [];
|
|
51
50
|
}
|
|
52
51
|
const linksPurified = linksToPurify.map(l => {
|
|
53
|
-
if (l instanceof
|
|
52
|
+
if (l instanceof organization_1.Link) {
|
|
54
53
|
return l;
|
|
55
54
|
}
|
|
56
55
|
else if (l && l['_id']) {
|
|
@@ -75,14 +74,14 @@ class RainNode extends RaainNode_1.RaainNode {
|
|
|
75
74
|
return [];
|
|
76
75
|
}
|
|
77
76
|
const linksPurified = linksToPurify.map(l => {
|
|
78
|
-
if (l instanceof
|
|
77
|
+
if (l instanceof organization_1.Link) {
|
|
79
78
|
return l;
|
|
80
79
|
}
|
|
81
80
|
else if (l && l['_id']) {
|
|
82
|
-
return new
|
|
81
|
+
return new gauge_1.GaugeNode({ id: l['_id'].toString(), latitude: l.latitude, longitude: l.longitude, name: l.name, team: l.team });
|
|
83
82
|
}
|
|
84
83
|
else if (l && l.id) {
|
|
85
|
-
return new
|
|
84
|
+
return new gauge_1.GaugeNode({ id: l.id.toString(), latitude: l.latitude, longitude: l.longitude, name: l.name, team: l.team });
|
|
86
85
|
}
|
|
87
86
|
});
|
|
88
87
|
return linksPurified.filter(l => !!l);
|
|
@@ -116,8 +115,8 @@ class RainNode extends RaainNode_1.RaainNode {
|
|
|
116
115
|
json['team'] = ((_a = this.team) === null || _a === void 0 ? void 0 : _a.id) || this.team;
|
|
117
116
|
json['latLngRectsAsJSON'] = this.latLngRectsAsJSON;
|
|
118
117
|
json['configurationAsJSON'] = this.configurationAsJSON;
|
|
119
|
-
json['radars'] = this.getLinks().filter(l => l.getLinkType() ===
|
|
120
|
-
json['gauges'] = this.getLinks().filter(l => l.getLinkType() ===
|
|
118
|
+
json['radars'] = this.getLinks().filter(l => l.getLinkType() === radar_1.RadarNode.TYPE).map(l => l.getId());
|
|
119
|
+
json['gauges'] = this.getLinks().filter(l => l.getLinkType() === gauge_1.GaugeNode.TYPE).map(l => l.getId());
|
|
121
120
|
json['lastCompletedComputations'] = this.getLinks().filter(l => l.getLinkType() === RainComputation_1.RainComputation.TYPE).map(l => l.getId());
|
|
122
121
|
return json;
|
|
123
122
|
}
|
|
@@ -132,7 +131,7 @@ class RainNode extends RaainNode_1.RaainNode {
|
|
|
132
131
|
this.addLinks(RainNode._getGaugeLinks(linksToAdd));
|
|
133
132
|
}
|
|
134
133
|
getCenter() {
|
|
135
|
-
let center = new
|
|
134
|
+
let center = new cartesian_1.LatLng({ lat: 0, lng: 0 });
|
|
136
135
|
this.setDefaultLatLng(this['radars']);
|
|
137
136
|
if (this.latLngRectsAsJSON && this.latLngRectsAsJSON !== '[]') {
|
|
138
137
|
const rects = JSON.parse(this.latLngRectsAsJSON);
|
|
@@ -145,7 +144,7 @@ class RainNode extends RaainNode_1.RaainNode {
|
|
|
145
144
|
latMin = typeof latMin === 'undefined' ? bottomRight.lat : Math.min(bottomRight.lat, latMin);
|
|
146
145
|
lngMax = typeof lngMax === 'undefined' ? bottomRight.lng : Math.max(bottomRight.lng, lngMax);
|
|
147
146
|
}
|
|
148
|
-
center = new
|
|
147
|
+
center = new cartesian_1.LatLng({ lat: ((latMax - latMin) / 2) + latMin, lng: ((lngMax - lngMin) / 2) + lngMin });
|
|
149
148
|
}
|
|
150
149
|
return center;
|
|
151
150
|
}
|
|
@@ -163,7 +162,7 @@ class RainNode extends RaainNode_1.RaainNode {
|
|
|
163
162
|
latMin = Math.min(rectA.lat, rectB.lat, typeof latMin !== 'undefined' ? latMin : rectB.lat);
|
|
164
163
|
lngMax = Math.max(rectA.lng, rectB.lng, typeof lngMax !== 'undefined' ? lngMax : rectB.lng);
|
|
165
164
|
}
|
|
166
|
-
limitPoints = [new
|
|
165
|
+
limitPoints = [new cartesian_1.LatLng({ lat: latMin, lng: lngMin }), new cartesian_1.LatLng({ lat: latMax, lng: lngMax })];
|
|
167
166
|
}
|
|
168
167
|
return limitPoints;
|
|
169
168
|
}
|
|
@@ -175,10 +174,10 @@ class RainNode extends RaainNode_1.RaainNode {
|
|
|
175
174
|
if ((radars === null || radars === void 0 ? void 0 : radars.length) && (!this.latLngRectsAsJSON || this.latLngRectsAsJSON === '[]')) {
|
|
176
175
|
const latLngRects = [];
|
|
177
176
|
for (const radarNode of radars) {
|
|
178
|
-
if (radarNode instanceof
|
|
177
|
+
if (radarNode instanceof radar_1.RadarNode) {
|
|
179
178
|
latLngRects.push([
|
|
180
|
-
new
|
|
181
|
-
new
|
|
179
|
+
new cartesian_1.LatLng({ lat: radarNode.latitude + 1, lng: radarNode.longitude - 1 }),
|
|
180
|
+
new cartesian_1.LatLng({ lat: radarNode.latitude - 1, lng: radarNode.longitude + 1 })
|
|
182
181
|
]);
|
|
183
182
|
}
|
|
184
183
|
}
|