raain-model 2.5.4 → 2.6.2

package/radar/RadarMeasure.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RadarMeasure = void 0;
-const Measure_1 = require("../organization/Measure");
+const organization_1 = require("../organization");
 const RadarNode_1 = require("./RadarNode");
 /**
  *  api/radars/:id/measures/:id
  */
-class RadarMeasure extends Measure_1.Measure {
+class RadarMeasure extends organization_1.Measure {
     constructor(json) {
         super(json);
         if (json.radar) {

package/radar/RadarMeasure.js.map

@@ -1 +1 @@
-{"version":3,"file":"RadarMeasure.js","sourceRoot":"","sources":["../../src/radar/RadarMeasure.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAGhD,2CAAsC;AAEtC;;GAEG;AACH,MAAa,YAAa,SAAQ,iBAAO;IAIrC,YAAY,IAOC;QAET,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,qBAAS,CAAC,EAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC,CAAC;QAC5G,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,OAAa;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAS,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;QAC5B,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,WAAW;QACjB,OAAO,YAAY,CAAC,IAAI,CAAC;IAC7B,CAAC;;AA/BL,oCAgCC;AA9BiB,iBAAI,GAAG,eAAe,CAAC"}
+{"version":3,"file":"RadarMeasure.js","sourceRoot":"","sources":["../../src/radar/RadarMeasure.ts"],"names":[],"mappings":";;;AAAA,kDAAwC;AAGxC,2CAAsC;AAEtC;;GAEG;AACH,MAAa,YAAa,SAAQ,sBAAO;IAIrC,YAAY,IAOC;QAET,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,qBAAS,CAAC,EAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC,CAAC;QAC5G,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,OAAa;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAS,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;QAC5B,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,WAAW;QACjB,OAAO,YAAY,CAAC,IAAI,CAAC;IAC7B,CAAC;;AA/BL,oCAgCC;AA9BiB,iBAAI,GAAG,eAAe,CAAC"}

package/radar/RadarNode.d.ts

@@ -1,6 +1,4 @@
-import { RaainNode } from '../organization/RaainNode';
-import { Link } from '../organization/Link';
-import { TeamNode } from '../organization/TeamNode';
+import { Link, RaainNode, TeamNode } from '../organization';
 /**
  *  api/radars/:id
  */

package/radar/RadarNode.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RadarNode = void 0;
-const RaainNode_1 = require("../organization/RaainNode");
+const organization_1 = require("../organization");
 /**
  *  api/radars/:id
  */
-class RadarNode extends RaainNode_1.RaainNode {
+class RadarNode extends organization_1.RaainNode {
     constructor(json) {
         super(json);
         this.latitude = json.latitude;

package/radar/RadarNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"RadarNode.js","sourceRoot":"","sources":["../../src/radar/RadarNode.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AAIpD;;GAEG;AACH,MAAa,SAAU,SAAQ,qBAAS;IAcpC,YAAY,IAWX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpD,CAAC;IAEM,MAAM;;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,EAAE,KAAI,IAAI,CAAC,IAAI,CAAC;QAC1C,IAAI,CAAC,qBAAqB,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACvD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,gBAAgB,CAAC,aAA2B;QAC/C,IAAI,IAAI,GAAG,aAAa,CAAC;QACzB,IAAI,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,OAAO,EAAE,CAAC;QACnB,CAAC;QAED,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC;IACL,CAAC;IAEM,gBAAgB;QACnB,IAAI,CAAC;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;QACb,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,WAAW;QACjB,OAAO,SAAS,CAAC,IAAI,CAAC;IAC1B,CAAC;;AAtEL,8BAwEC;AAtEiB,cAAI,GAAG,OAAO,CAAC"}
+{"version":3,"file":"RadarNode.js","sourceRoot":"","sources":["../../src/radar/RadarNode.ts"],"names":[],"mappings":";;;AAAA,kDAA0D;AAE1D;;GAEG;AACH,MAAa,SAAU,SAAQ,wBAAS;IAcpC,YAAY,IAWX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpD,CAAC;IAEM,MAAM;;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,EAAE,KAAI,IAAI,CAAC,IAAI,CAAC;QAC1C,IAAI,CAAC,qBAAqB,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACvD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,gBAAgB,CAAC,aAA2B;QAC/C,IAAI,IAAI,GAAG,aAAa,CAAC;QACzB,IAAI,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,OAAO,EAAE,CAAC;QACnB,CAAC;QAED,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC;IACL,CAAC;IAEM,gBAAgB;QACnB,IAAI,CAAC;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;QACb,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,WAAW;QACjB,OAAO,SAAS,CAAC,IAAI,CAAC;IAC1B,CAAC;;AAtEL,8BAwEC;AAtEiB,cAAI,GAAG,OAAO,CAAC"}

package/radar/RadarNodeMap.d.ts

@@ -1,8 +1,6 @@
 import { RadarMeasure } from './RadarMeasure';
 import { RadarNode } from './RadarNode';
-import { Link } from '../organization/Link';
-import { RaainNode } from '../organization/RaainNode';
-import { TeamNode } from '../organization/TeamNode';
+import { Link, RaainNode, TeamNode } from '../organization';
 /**
  *  api/radars/:radarId?format=map&...
  */

package/radar/RadarNodeMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"RadarNodeMap.js","sourceRoot":"","sources":["../../src/radar/RadarNodeMap.ts"],"names":[],"mappings":";;;AACA,2CAAsC;AAKtC;;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"}
+{"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

@@ -0,0 +1,3 @@
+export * from './RadarMeasure';
+export * from './RadarNodeMap';
+export * from './RadarNode';

package/radar/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./RadarMeasure"), exports);
+__exportStar(require("./RadarNodeMap"), exports);
+__exportStar(require("./RadarNode"), exports);
+//# sourceMappingURL=index.js.map

package/radar/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/radar/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,iDAA+B;AAC/B,8CAA4B"}

package/rain/MergeStrategy.d.ts

@@ -0,0 +1,13 @@
+import { LatLng } from '../cartesian';
+export declare enum MergeStrategy {
+    NONE = "none",
+    SUM = "sum",
+    AVERAGE = "average",
+    MAX = "max"
+}
+export interface MergeLatLng {
+    sum: number;
+    max: number;
+    count: number;
+    latLng: LatLng;
+}

package/rain/MergeStrategy.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeStrategy = void 0;
+var MergeStrategy;
+(function (MergeStrategy) {
+    MergeStrategy["NONE"] = "none";
+    MergeStrategy["SUM"] = "sum";
+    MergeStrategy["AVERAGE"] = "average";
+    MergeStrategy["MAX"] = "max";
+})(MergeStrategy || (exports.MergeStrategy = MergeStrategy = {}));
+//# sourceMappingURL=MergeStrategy.js.map

package/rain/MergeStrategy.js.map

@@ -0,0 +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"}

package/rain/RainComputation.d.ts

@@ -1,10 +1,9 @@
-import { RaainNode } from '../organization/RaainNode';
-import { Link } from '../organization/Link';
-import { RainPolarMeasureValue } from '../polar/RainPolarMeasureValue';
-import { RainCartesianMeasureValue } from '../cartesian/RainCartesianMeasureValue';
+import { Link, RaainNode } from '../organization';
+import { RainPolarMeasureValue } from '../polar';
+import { CartesianTools, LatLng, RainCartesianMeasureValue } from '../cartesian';
 import { RainComputationAbstract } from './RainComputationAbstract';
-import { LatLng } from '../cartesian/LatLng';
 import { RainMeasure } from './RainMeasure';
+import { MergeStrategy } from './MergeStrategy';
 /**
  *  api/rains/:rainId/computations/:computationId
  *  or as an array on
@@ -33,8 +32,9 @@ export declare class RainComputation extends RainComputationAbstract {
         stringify: boolean;
     }): any;
     mergeCartesianResults(options: {
-        mergeCartesianPixelWidth: LatLng;
+        mergeStrategy: MergeStrategy;
         mergeLimitPoints: [LatLng, LatLng];
+        cartesianTools: CartesianTools;
         removeNullValues?: boolean;
     }): RainMeasure[];
     protected getLinkType(): string;

package/rain/RainComputation.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RainComputation = void 0;
-const RainPolarMeasureValue_1 = require("../polar/RainPolarMeasureValue");
-const RainCartesianMeasureValue_1 = require("../cartesian/RainCartesianMeasureValue");
+const polar_1 = require("../polar");
+const cartesian_1 = require("../cartesian");
 const RainComputationAbstract_1 = require("./RainComputationAbstract");
 const RainMeasure_1 = require("./RainMeasure");
 /**
@@ -24,10 +24,9 @@ class RainComputation extends RainComputationAbstract_1.RainComputationAbstract
     }
     mergeCartesianResults(options) {
         this.buildLatLngMatrix(options);
-        const values = this.results;
         return this.mergeRainMeasures([new RainMeasure_1.RainMeasure({
                 id: this.id,
-                values,
+                values: this.results,
                 date: this.date
             })], options);
     }
@@ -44,16 +43,16 @@ class RainComputation extends RainComputationAbstract_1.RainComputationAbstract
         }
         this.results = results.map(r => {
             if (typeof r === 'string' && r.indexOf('polarMeasureValue') >= 0) {
-                return new RainPolarMeasureValue_1.RainPolarMeasureValue(JSON.parse(r));
+                return new polar_1.RainPolarMeasureValue(JSON.parse(r));
             }
             else if (r.polarMeasureValue) {
-                return new RainPolarMeasureValue_1.RainPolarMeasureValue(r);
+                return new polar_1.RainPolarMeasureValue(r);
             }
             if (typeof r === 'string' && r.indexOf('cartesian') >= 0) {
-                return new RainCartesianMeasureValue_1.RainCartesianMeasureValue(JSON.parse(r));
+                return new cartesian_1.RainCartesianMeasureValue(JSON.parse(r));
             }
             else if (r.cartesianValues) {
-                return new RainCartesianMeasureValue_1.RainCartesianMeasureValue(r);
+                return new cartesian_1.RainCartesianMeasureValue(r);
             }
             else {
                 return r;

package/rain/RainComputation.js.map

@@ -1 +1 @@
-{"version":3,"file":"RainComputation.js","sourceRoot":"","sources":["../../src/rain/RainComputation.ts"],"names":[],"mappings":";;;AAEA,0EAAqE;AACrE,sFAAiF;AACjF,uEAAkE;AAElE,+CAA0C;AAE1C;;;;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,OAIrB;QACG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,OAAO,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,yBAAW,CAAC;gBAC3C,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,MAAM;gBACN,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,6CAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,CAAC;iBAAM,IAAI,CAAC,CAAC,iBAAiB,EAAE,CAAC;gBAC7B,OAAO,IAAI,6CAAqB,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,qDAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,CAAC;iBAAM,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;gBAC3B,OAAO,IAAI,qDAAyB,CAAC,CAAC,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,CAAC;YACb,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;;AA/EL,0CAiFC;AA/EiB,oBAAI,GAAG,kBAAkB,CAAC"}
+{"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"}

package/rain/RainComputationAbstract.d.ts

@@ -1,8 +1,7 @@
-import { RaainNode } from '../organization/RaainNode';
-import { Link } from '../organization/Link';
-import { LatLng } from '../cartesian/LatLng';
+import { Link, RaainNode } from '../organization';
+import { CartesianTools, CartesianValue, LatLng } from '../cartesian';
 import { RainMeasure } from './RainMeasure';
-import { CartesianValue } from '../cartesian/CartesianValue';
+import { MergeLatLng, MergeStrategy } from './MergeStrategy';
 /**
  *  not used directly
  */
@@ -17,8 +16,8 @@ export declare class RainComputationAbstract extends RaainNode {
     launchedBy: string;
     name: string;
     protected mergeTools: {
-        cartesianPixelWidth: LatLng;
-        latsLngs: number[][];
+        cartesianTools: CartesianTools;
+        latsLngs: MergeLatLng[][];
         limitPoints: LatLng[];
     };
     constructor(json: {
@@ -43,20 +42,29 @@ export declare class RainComputationAbstract extends RaainNode {
     addRadarLinks(linksToAdd: Link[] | RaainNode[]): void;
     replaceRainLink(linksToAdd: Link | RaainNode | any): void;
     addRadarMeasureLinks(linksToAdd: Link[] | any[]): void;
-    protected getLinkType(): string;
+    getBuiltMergeTools(rainMeasures: RainMeasure[], options: {
+        cartesianTools: CartesianTools;
+        mergeLimitPoints: LatLng[];
+    }): {
+        cartesianTools: CartesianTools;
+        latsLngs: MergeLatLng[][];
+        limitPoints: LatLng[];
+    };
+    getMergeLatLngIndex(cartesianValue: CartesianValue): number[];
     protected buildLatLngMatrix(options: {
-        mergeCartesianPixelWidth: LatLng;
+        cartesianTools: CartesianTools;
         mergeLimitPoints: LatLng[];
     }): {
-        cartesianPixelWidth: LatLng;
-        latsLngs: number[][];
+        cartesianTools: CartesianTools;
+        latsLngs: MergeLatLng[][];
         limitPoints: LatLng[];
     };
+    protected buildMergeTools(rainMeasures: RainMeasure[]): void;
+    protected getLinkType(): string;
     protected mergeRainMeasures(rainMeasures: RainMeasure[], options: {
+        mergeStrategy: MergeStrategy;
         mergeLimitPoints: [LatLng, LatLng];
         removeNullValues?: boolean;
     }): RainMeasure[];
-    protected getMergeLatLngIndex(cartesianValue: CartesianValue): number[];
-    protected getMergeLatLng(latIndex: number, lngIndex: number): number[];
-    protected buildMergeCartesianValues(): CartesianValue[];
+    protected buildMergeCartesianValues(mergeStrategy: MergeStrategy, removeNullValues?: boolean): CartesianValue[];
 }

package/rain/RainComputationAbstract.js

@@ -1,20 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RainComputationAbstract = void 0;
-const RaainNode_1 = require("../organization/RaainNode");
-const Link_1 = require("../organization/Link");
-const RadarNode_1 = require("../radar/RadarNode");
+const organization_1 = require("../organization");
+const radar_1 = require("../radar");
 const RainNode_1 = require("./RainNode");
-const RadarMeasure_1 = require("../radar/RadarMeasure");
-const QualityTools_1 = require("../quality/tools/QualityTools");
+const cartesian_1 = require("../cartesian");
 const RainMeasure_1 = require("./RainMeasure");
-const CartesianMeasureValue_1 = require("../cartesian/CartesianMeasureValue");
-const RainCartesianMeasureValue_1 = require("../cartesian/RainCartesianMeasureValue");
-const CartesianValue_1 = require("../cartesian/CartesianValue");
+const MergeStrategy_1 = require("./MergeStrategy");
 /**
  *  not used directly
  */
-class RainComputationAbstract extends RaainNode_1.RaainNode {
+class RainComputationAbstract extends organization_1.RaainNode {
     constructor(json) {
         super(json);
         this.date = json.date ? new Date(json.date) : null;
@@ -35,14 +31,14 @@ class RainComputationAbstract extends RaainNode_1.RaainNode {
             return [];
         }
         return linksToPurify.map(l => {
-            if (l instanceof Link_1.Link) {
+            if (l instanceof organization_1.Link) {
                 return l;
             }
             else if (l && l['_id']) {
-                return new RadarNode_1.RadarNode({ id: l['_id'].toString(), latitude: 0, longitude: 0, name: l.name, team: l.team });
+                return new radar_1.RadarNode({ id: l['_id'].toString(), latitude: 0, longitude: 0, name: l.name, team: l.team });
             }
             else if (l && l.id) {
-                return new RadarNode_1.RadarNode({
+                return new radar_1.RadarNode({
                     id: l.id.toString(), // 'hex'
                     latitude: 0, longitude: 0, name: l.name, team: l.team
                 });
@@ -54,14 +50,14 @@ class RainComputationAbstract extends RaainNode_1.RaainNode {
             return [];
         }
         return linksToPurify.map(l => {
-            if (l instanceof Link_1.Link) {
+            if (l instanceof organization_1.Link) {
                 return l;
             }
             else if (l && l['_id']) {
-                return new RadarMeasure_1.RadarMeasure({ id: l['_id'].toString(), values: [] });
+                return new radar_1.RadarMeasure({ id: l['_id'].toString(), values: [] });
             }
             else if (l && l.id) {
-                return new RadarMeasure_1.RadarMeasure({ id: l.id.toString(), values: [] }); // 'hex'
+                return new radar_1.RadarMeasure({ id: l.id.toString(), values: [] }); // 'hex'
             }
         });
     }
@@ -98,34 +94,52 @@ class RainComputationAbstract extends RaainNode_1.RaainNode {
     addRadarMeasureLinks(linksToAdd) {
         this.addLinks(RainComputationAbstract._getRadarMeasureLinks(linksToAdd));
     }
-    getLinkType() {
-        throw Error('abstract');
+    getBuiltMergeTools(rainMeasures, options) {
+        this.buildLatLngMatrix(options);
+        this.buildMergeTools(rainMeasures);
+        return this.mergeTools;
+    }
+    getMergeLatLngIndex(cartesianValue) {
+        const latLng = this.mergeTools.cartesianTools.getLatLngFromEarthMap(cartesianValue);
+        const latLngScale = this.mergeTools.cartesianTools.getScaleLatLngFromEarth(latLng);
+        const latIndex = Math.round((latLng.lat - this.mergeTools.limitPoints[0].lat) / latLngScale.lat);
+        const lngIndex = Math.round((latLng.lng - this.mergeTools.limitPoints[0].lng) / latLngScale.lng);
+        return [latIndex, lngIndex];
     }
     buildLatLngMatrix(options) {
         const latsLngs = [];
-        const lngCount = Math.round((options.mergeLimitPoints[1].lng - options.mergeLimitPoints[0].lng)
-            / options.mergeCartesianPixelWidth.lng) + 1;
-        for (let lat = options.mergeLimitPoints[0].lat; lat <= options.mergeLimitPoints[1].lat; lat += options.mergeCartesianPixelWidth.lat) {
-            lat = QualityTools_1.QualityTools.RoundLatLng(lat, options.mergeCartesianPixelWidth.lat);
-            latsLngs.push(new Array(lngCount).fill(0));
+        const downPoint = options.cartesianTools.getLatLngFromEarthMap(options.mergeLimitPoints[0]);
+        const topPoint = options.cartesianTools.getLatLngFromEarthMap(options.mergeLimitPoints[1]);
+        const scaleLat = options.cartesianTools.getScaleLatLng(downPoint);
+        for (let lat = downPoint.lat; lat <= topPoint.lat; lat += scaleLat.lat) {
+            lat = cartesian_1.CartesianTools.LimitWithPrecision(lat);
+            const latLng = new cartesian_1.LatLng({ lat, lng: downPoint.lng });
+            const scaleLng = options.cartesianTools.getScaleLatLng(latLng);
+            const lngCount = Math.round((topPoint.lng - downPoint.lng) / scaleLng.lng) + 1;
+            const lngs = [];
+            for (let i = 0; i < lngCount; i++) {
+                const initValue = { sum: 0, max: 0, count: 0, latLng: undefined };
+                lngs.push(initValue);
+            }
+            latsLngs.push(lngs);
         }
-        this.mergeTools = { latsLngs, cartesianPixelWidth: options.mergeCartesianPixelWidth, limitPoints: options.mergeLimitPoints };
+        this.mergeTools = { latsLngs, cartesianTools: options.cartesianTools, limitPoints: [downPoint, topPoint] };
         return this.mergeTools;
     }
-    mergeRainMeasures(rainMeasures, options) {
-        let rainMeasuresMerged = [];
-        let lastCartesianRainMeasure;
+    buildMergeTools(rainMeasures) {
         for (const rainMeasure of rainMeasures) {
             for (const value of rainMeasure.values) {
-                if (typeof value['cartesianValues'] !== 'undefined' && typeof value['cartesianPixelWidth'] !== 'undefined') {
-                    lastCartesianRainMeasure = rainMeasure;
-                    const cartesianMeasureValue = new CartesianMeasureValue_1.CartesianMeasureValue(value);
+                if (typeof value['cartesianValues'] !== 'undefined') {
+                    const cartesianMeasureValue = new cartesian_1.CartesianMeasureValue(value);
                     const cartesianValues = cartesianMeasureValue.getCartesianValues();
                     for (const cartesianValue of cartesianValues) {
                         const latLngIndex = this.getMergeLatLngIndex(cartesianValue);
                         if (latLngIndex[0] >= 0 && latLngIndex[1] >= 0 && latLngIndex[0] < this.mergeTools.latsLngs.length &&
                             latLngIndex[1] < this.mergeTools.latsLngs[latLngIndex[0]].length) {
-                            this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]] += cartesianValue.value;
+                            this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].latLng = cartesian_1.CartesianTools.CreateLatLng(cartesianValue);
+                            this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].sum += cartesianValue.value;
+                            this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].max = Math.max(cartesianValue.value, this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].max);
+                            this.mergeTools.latsLngs[latLngIndex[0]][latLngIndex[1]].count++;
                         }
                         else {
                             // throw new Error(`Wrong mergeRainMeasure ${latLngIndex[0]} ${latLngIndex[1]}`);
@@ -134,46 +148,40 @@ class RainComputationAbstract extends RaainNode_1.RaainNode {
                 }
             }
         }
-        if (!lastCartesianRainMeasure) {
+    }
+    getLinkType() {
+        throw Error('abstract');
+    }
+    mergeRainMeasures(rainMeasures, options) {
+        if (rainMeasures.length === 0) {
             return [];
         }
-        let cartesianValuesMerged = this.buildMergeCartesianValues();
-        if (options.removeNullValues) {
-            cartesianValuesMerged = cartesianValuesMerged.filter(c => !!c.value);
-        }
-        const rm = new RainMeasure_1.RainMeasure(lastCartesianRainMeasure.toJSON());
-        rm.values = [new RainCartesianMeasureValue_1.RainCartesianMeasureValue({
+        this.buildMergeTools(rainMeasures);
+        const firstCartesianRainMeasure = rainMeasures[0];
+        const cartesianValuesMerged = this.buildMergeCartesianValues(options.mergeStrategy, options.removeNullValues);
+        const rm = new RainMeasure_1.RainMeasure(firstCartesianRainMeasure.toJSON());
+        rm.values = [new cartesian_1.RainCartesianMeasureValue({
                 cartesianValues: cartesianValuesMerged,
-                cartesianPixelWidth: this.mergeTools.cartesianPixelWidth,
-                version: lastCartesianRainMeasure.getVersion(),
+                version: firstCartesianRainMeasure.getVersion(),
                 limitPoints: options.mergeLimitPoints,
             })];
-        rainMeasuresMerged = [rm];
-        return rainMeasuresMerged;
+        return [rm];
     }
-    getMergeLatLngIndex(cartesianValue) {
-        const latMin = Math.round((this.mergeTools.limitPoints[0].lat) / this.mergeTools.cartesianPixelWidth.lat);
-        const lngMin = Math.round((this.mergeTools.limitPoints[0].lng) / this.mergeTools.cartesianPixelWidth.lng);
-        const latToCompare = Math.round(cartesianValue.lat / this.mergeTools.cartesianPixelWidth.lat);
-        const lngToCompare = Math.round(cartesianValue.lng / this.mergeTools.cartesianPixelWidth.lng);
-        return [latToCompare - latMin, lngToCompare - lngMin];
-    }
-    getMergeLatLng(latIndex, lngIndex) {
-        const latMin = this.mergeTools.limitPoints[0].lat;
-        const lngMin = this.mergeTools.limitPoints[0].lng;
-        const latToCompare = latIndex * this.mergeTools.cartesianPixelWidth.lat;
-        const lngToCompare = lngIndex * this.mergeTools.cartesianPixelWidth.lng;
-        return [latToCompare + latMin, lngToCompare + lngMin];
-    }
-    buildMergeCartesianValues() {
+    buildMergeCartesianValues(mergeStrategy, removeNullValues = false) {
         const cartesianValuesMerged = [];
         for (const [latIndex, latValues] of this.mergeTools.latsLngs.entries()) {
-            for (const [lngIndex, value] of latValues.entries()) {
-                if (value) {
-                    const latLng = this.getMergeLatLng(latIndex, lngIndex);
-                    const lat = QualityTools_1.QualityTools.RoundLatLng(latLng[0], this.mergeTools.cartesianPixelWidth.lat, true);
-                    const lng = QualityTools_1.QualityTools.RoundLatLng(latLng[1], this.mergeTools.cartesianPixelWidth.lng, true);
-                    cartesianValuesMerged.push(new CartesianValue_1.CartesianValue({ value, lat, lng }));
+            for (const [lngIndex, mergeValue] of latValues.entries()) {
+                let value = mergeValue.sum;
+                if (mergeStrategy === MergeStrategy_1.MergeStrategy.AVERAGE) {
+                    value = mergeValue.count ? value / mergeValue.count : -1;
+                }
+                else if (mergeStrategy === MergeStrategy_1.MergeStrategy.MAX) {
+                    value = mergeValue.max;
+                }
+                if (mergeValue.count && !(removeNullValues && !value)) {
+                    const lat = mergeValue.latLng.lat;
+                    const lng = mergeValue.latLng.lng;
+                    cartesianValuesMerged.push(new cartesian_1.CartesianValue({ value, lat, lng }));
                 }
             }
         }

package/rain/RainComputationAbstract.js.map

@@ -1 +1 @@
-{"version":3,"file":"RainComputationAbstract.js","sourceRoot":"","sources":["../../src/rain/RainComputationAbstract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RainComputationAbstract.js","sourceRoot":"","sources":["../../src/rain/RainComputationAbstract.ts"],"names":[],"mappings":"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"}

package/rain/RainComputationMap.d.ts

@@ -1,8 +1,8 @@
 import { RainComputationAbstract } from './RainComputationAbstract';
-import { Link } from '../organization/Link';
+import { Link, RaainNode } from '../organization';
 import { RainMeasure } from './RainMeasure';
-import { RaainNode } from '../organization/RaainNode';
-import { LatLng } from '../cartesian/LatLng';
+import { CartesianTools, LatLng } from '../cartesian';
+import { MergeStrategy } from './MergeStrategy';
 /**
  *  api/rains/:id/computations/:computationId?format=map&...
  *  or with
@@ -27,11 +27,11 @@ export declare class RainComputationMap extends RainComputationAbstract {
         radars?: Link[] | RaainNode[];
     });
     toJSON(): any;
-    setMapData(mapData: RainMeasure[] | string, options?: {
-        mergeCartesian: boolean;
-        mergeCartesianPixelWidth: LatLng;
-        mergeLimitPoints: [LatLng, LatLng];
-        removeNullValues: boolean;
+    setMapData(mapData: RainMeasure[] | string, options: {
+        mergeStrategy: MergeStrategy;
+        cartesianTools?: CartesianTools;
+        mergeLimitPoints?: [LatLng, LatLng];
+        removeNullValues?: boolean;
     }): void;
     getMapData(): RainMeasure[];
 }

package/rain/RainComputationMap.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RainComputationMap = void 0;
 const RainComputationAbstract_1 = require("./RainComputationAbstract");
-const LatLng_1 = require("../cartesian/LatLng");
-const QualityTools_1 = require("../quality/tools/QualityTools");
+const MergeStrategy_1 = require("./MergeStrategy");
 /**
  *  api/rains/:id/computations/:computationId?format=map&...
  *  or with
@@ -12,7 +11,7 @@ const QualityTools_1 = require("../quality/tools/QualityTools");
 class RainComputationMap extends RainComputationAbstract_1.RainComputationAbstract {
     constructor(json) {
         super(json);
-        this.setMapData(json.map);
+        this.setMapData(json.map, { mergeStrategy: MergeStrategy_1.MergeStrategy.NONE });
     }
     toJSON() {
         const json = super.toJSON();
@@ -22,18 +21,21 @@ class RainComputationMap extends RainComputationAbstract_1.RainComputationAbstra
         }
         return json;
     }
-    setMapData(mapData, options = {
-        mergeCartesian: false,
-        mergeCartesianPixelWidth: new LatLng_1.LatLng({ lat: QualityTools_1.QualityTools.DEFAULT_SCALE, lng: QualityTools_1.QualityTools.DEFAULT_SCALE }),
-        mergeLimitPoints: [new LatLng_1.LatLng({ lat: 0, lng: 0 }), new LatLng_1.LatLng({ lat: 0, lng: 0 })],
-        removeNullValues: false,
-    }) {
+    setMapData(mapData, options) {
         if (!mapData) {
             return;
         }
-        if (typeof (mapData) !== 'string' && (options === null || options === void 0 ? void 0 : options.mergeCartesian)) {
-            this.buildLatLngMatrix(options);
-            mapData = this.mergeRainMeasures(mapData, options);
+        if (typeof (mapData) !== 'string' && options.mergeStrategy !== MergeStrategy_1.MergeStrategy.NONE
+            && (options === null || options === void 0 ? void 0 : options.cartesianTools) && (options === null || options === void 0 ? void 0 : options.mergeLimitPoints)) {
+            this.buildLatLngMatrix({
+                cartesianTools: options.cartesianTools,
+                mergeLimitPoints: options.mergeLimitPoints
+            });
+            mapData = this.mergeRainMeasures(mapData, {
+                mergeLimitPoints: options.mergeLimitPoints,
+                removeNullValues: !!options.removeNullValues,
+                mergeStrategy: options.mergeStrategy,
+            });
         }
         let map = mapData;
         try {