raain-model 1.11.9 → 2.0.36

package/polar/AbstractPolarMeasureValue.js

@@ -4,93 +4,97 @@ exports.AbstractPolarMeasureValue = void 0;
 const PolarMeasureValue_1 = require("./PolarMeasureValue");
 class AbstractPolarMeasureValue {
     constructor(json) {
-        if (!(json === null || json === void 0 ? void 0 : json.polars)) {
-            throw new Error('PolarMeasureValue needs polars');
+        if (!(json === null || json === void 0 ? void 0 : json.polarMeasureValue)) {
+            throw new Error('PolarMeasureValue needs polarMeasureValue');
         }
-        let polars = json.polars;
-        if (typeof polars === 'string') {
-            if (polars.indexOf('polars') > 0) {
-                polars = JSON.parse(polars);
+        let polarMeasureValue = json.polarMeasureValue;
+        if (typeof polarMeasureValue === 'string') {
+            if (polarMeasureValue.indexOf('polarMeasureValue') > 0) {
+                polarMeasureValue = JSON.parse(polarMeasureValue);
             }
             else {
-                this.setPolarsAsString(polars);
+                this.setPolarsAsString(polarMeasureValue);
                 return;
             }
         }
-        if (polars instanceof PolarMeasureValue_1.PolarMeasureValue) {
-            this.setPolarsAsContainer(polars.getPolars());
+        if (polarMeasureValue instanceof AbstractPolarMeasureValue
+            || polarMeasureValue instanceof PolarMeasureValue_1.PolarMeasureValue) {
+            this.setPolarsAsContainer(polarMeasureValue.getPolars());
             return;
         }
-        let polarMeasure = polars;
-        if (polars && typeof polars['polars'] !== 'undefined' && typeof polars['angle'] !== 'undefined') {
-            polarMeasure = polars['polars'];
+        let polarMeasure = polarMeasureValue;
+        if (polarMeasureValue
+            && typeof polarMeasureValue['polarMeasureValue'] !== 'undefined'
+            && typeof polarMeasureValue['angle'] !== 'undefined') {
+            polarMeasure = polarMeasureValue['polarMeasureValue'];
         }
-        let subPolars = polarMeasure;
-        if (polarMeasure && polarMeasure['polars']) {
-            subPolars = polarMeasure['polars'];
+        let polarContainers = polarMeasure;
+        if (polarMeasure && polarMeasure['measureValuePolarContainers']) {
+            polarContainers = polarMeasure['measureValuePolarContainers'];
         }
-        if (subPolars instanceof PolarMeasureValue_1.PolarMeasureValue) {
-            this.setPolarsAsContainer(subPolars.getPolars());
+        if (polarContainers instanceof AbstractPolarMeasureValue
+            || polarContainers instanceof PolarMeasureValue_1.PolarMeasureValue) {
+            this.setPolarsAsContainer(polarContainers.getPolars());
             return;
         }
-        if (typeof subPolars === 'string') {
-            this.setPolarsAsString(subPolars);
+        if (typeof polarContainers === 'string') {
+            this.setPolarsAsString(polarContainers);
             return;
         }
-        if (Array.isArray(subPolars)) {
-            this.setPolarsAsContainer(subPolars);
+        if (Array.isArray(polarContainers)) {
+            this.setPolarsAsContainer(polarContainers);
             return;
         }
-        throw new Error('PolarMeasureValue needs valid typed polars');
+        throw new Error('PolarMeasureValue needs valid typed polarMeasureValue');
     }
     getPolarsStringified() {
-        return this.polars.getPolarsStringified();
+        return this.polarMeasureValue.getPolarsStringified();
     }
     getPolars() {
-        return this.polars.getPolars();
+        return this.polarMeasureValue.getPolars();
     }
     setPolarsAsString(s) {
-        this.polars = new PolarMeasureValue_1.PolarMeasureValue({ measureValuePolarContainers: s });
+        this.polarMeasureValue = new PolarMeasureValue_1.PolarMeasureValue({ measureValuePolarContainers: s });
     }
     setPolarsAsContainer(s) {
-        this.polars = new PolarMeasureValue_1.PolarMeasureValue({ measureValuePolarContainers: s });
+        this.polarMeasureValue = new PolarMeasureValue_1.PolarMeasureValue({ measureValuePolarContainers: s });
     }
     getPolarValue(json) {
-        return this.polars.getPolarValue(json);
+        return this.polarMeasureValue.getPolarValue(json);
     }
     setPolarValue(json) {
-        return this.polars.setPolarValue(json);
+        return this.polarMeasureValue.setPolarValue(json);
     }
     getAzimuthsCount() {
-        return this.polars.getPolars().length;
+        return this.polarMeasureValue.getPolars().length;
     }
     getPolarEdgesCount() {
-        const polars = this.polars.getPolars();
+        const polars = this.polarMeasureValue.getPolars();
         if (polars.length > 0) {
             return polars[0].polarEdges.length;
         }
         return 0;
     }
     getDistance() {
-        const polars = this.polars.getPolars();
+        const polars = this.polarMeasureValue.getPolars();
         if (polars.length > 0) {
             return polars[0].distance;
         }
         return 1;
     }
     toJSON(stringify = false) {
-        let polars = this.polars;
+        let polarMeasureValue = this.polarMeasureValue;
         if (stringify) {
-            polars = this.polars.toJSONWithPolarStringified();
+            polarMeasureValue = JSON.stringify(this.polarMeasureValue.toJSONWithPolarStringified());
         }
         const json = {
-            polars,
+            polarMeasureValue,
         };
         return json;
     }
     toJSONWithPolarStringified() {
-        const json = this.polars.toJSONWithPolarStringified();
-        return json;
+        const polarMeasureValue = JSON.stringify(this.polarMeasureValue.toJSONWithPolarStringified());
+        return { polarMeasureValue };
     }
 }
 exports.AbstractPolarMeasureValue = AbstractPolarMeasureValue;

package/polar/AbstractPolarMeasureValue.js.map

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

package/polar/GaugePolarMeasureValue.d.ts

@@ -6,6 +6,6 @@ import { PolarMeasureValue } from './PolarMeasureValue';
  */
 export declare class GaugePolarMeasureValue extends AbstractPolarMeasureValue implements IPolarMeasureValue {
     constructor(json: {
-        polars: string | PolarMeasureValue | AbstractPolarMeasureValue;
+        polarMeasureValue: string | PolarMeasureValue | AbstractPolarMeasureValue;
     });
 }

package/polar/IPolarMeasureValue.d.ts

@@ -5,8 +5,8 @@ export interface IPolarMeasureValue {
     getPolars(): MeasureValuePolarContainer[];
     setPolarsAsString(s: string): void;
     setPolarsAsContainer(s: MeasureValuePolarContainer[]): void;
-    toJSON(): JSON;
-    toJSONWithPolarStringified(): JSON;
+    toJSON(): any;
+    toJSONWithPolarStringified(): any;
     getPolarValue(json: {
         azimuthIndex: number;
         edgeIndex: number;

package/polar/MeasureValuePolarContainer.d.ts

@@ -7,5 +7,5 @@ export declare class MeasureValuePolarContainer {
         distance: number;
         polarEdges: number[];
     });
-    toJSON(): JSON;
+    toJSON(): any;
 }

package/polar/PolarMeasureValue.d.ts

@@ -2,7 +2,7 @@ import { MeasureValuePolarContainer } from './MeasureValuePolarContainer';
 import { IPolarMeasureValue } from './IPolarMeasureValue';
 import { PolarValue } from './PolarValue';
 export declare class PolarMeasureValue implements IPolarMeasureValue {
-    private polars;
+    private measureValuePolarContainers;
     constructor(json: {
         measureValuePolarContainers: MeasureValuePolarContainer[] | string;
     });
@@ -20,7 +20,7 @@ export declare class PolarMeasureValue implements IPolarMeasureValue {
         edgeIndex: number;
         value: number;
     }): void;
-    toJSON(): JSON;
-    toJSONWithPolarStringified(): JSON;
+    toJSON(): any;
+    toJSONWithPolarStringified(): any;
     protected updateIndex(array: Array<any>, index: number): number;
 }

package/polar/PolarMeasureValue.js

@@ -3,13 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PolarMeasureValue = void 0;
 const MeasureValuePolarContainer_1 = require("./MeasureValuePolarContainer");
 const PolarValue_1 = require("./PolarValue");
+const AbstractPolarMeasureValue_1 = require("./AbstractPolarMeasureValue");
 class PolarMeasureValue {
     constructor(json) {
         if (typeof json.measureValuePolarContainers === 'string') {
             this.setPolarsAsString(json.measureValuePolarContainers);
             return;
         }
-        if (json.measureValuePolarContainers instanceof PolarMeasureValue && json.measureValuePolarContainers.getPolars()) {
+        if (json.measureValuePolarContainers instanceof AbstractPolarMeasureValue_1.AbstractPolarMeasureValue
+            || json.measureValuePolarContainers instanceof PolarMeasureValue) {
             this.setPolarsAsContainer(json.measureValuePolarContainers.getPolars());
             return;
         }
@@ -19,22 +21,22 @@ class PolarMeasureValue {
         return JSON.stringify(this.getPolars());
     }
     getPolars() {
-        return this.polars;
+        return this.measureValuePolarContainers;
     }
     setPolarsAsString(s) {
         try {
             let polars = JSON.parse(s);
-            if (polars && polars.polars) {
-                polars = polars.polars;
+            if (polars && polars.measureValuePolarContainers) {
+                polars = polars.measureValuePolarContainers;
             }
             if (typeof polars === 'string') {
                 polars = JSON.parse(polars);
             }
-            this.polars = polars.map(convertedPolar => new MeasureValuePolarContainer_1.MeasureValuePolarContainer(convertedPolar));
+            this.measureValuePolarContainers = polars.map(convertedPolar => new MeasureValuePolarContainer_1.MeasureValuePolarContainer(convertedPolar));
         }
         catch (e) {
             console.warn('setPolarsAsString pb: ', e, typeof s, s);
-            this.polars = [];
+            this.measureValuePolarContainers = [];
         }
     }
     setPolarsAsContainer(measureValuePolarContainers) {
@@ -42,14 +44,14 @@ class PolarMeasureValue {
         if (!('length' in parsed)) {
             parsed = [];
         }
-        this.polars = parsed;
+        this.measureValuePolarContainers = parsed;
     }
     getPolarValue(json) {
         let azimuthIndex = json.azimuthIndex;
         if (!json.strict) {
-            azimuthIndex = this.updateIndex(this.polars, json.azimuthIndex);
+            azimuthIndex = this.updateIndex(this.measureValuePolarContainers, json.azimuthIndex);
         }
-        const azimuthContainer = this.polars[azimuthIndex];
+        const azimuthContainer = this.measureValuePolarContainers[azimuthIndex];
         if (!azimuthContainer) {
             return null;
         }
@@ -68,8 +70,8 @@ class PolarMeasureValue {
         });
     }
     setPolarValue(json) {
-        const azimuthIndex = this.updateIndex(this.polars, json.azimuthIndex);
-        const azimuthContainer = this.polars[azimuthIndex];
+        const azimuthIndex = this.updateIndex(this.measureValuePolarContainers, json.azimuthIndex);
+        const azimuthContainer = this.measureValuePolarContainers[azimuthIndex];
         if (!azimuthContainer) {
             return null;
         }
@@ -78,12 +80,12 @@ class PolarMeasureValue {
     }
     toJSON() {
         return {
-            polars: this.polars
+            measureValuePolarContainers: this.measureValuePolarContainers
         };
     }
     toJSONWithPolarStringified() {
         return {
-            polars: this.getPolarsStringified()
+            measureValuePolarContainers: this.getPolarsStringified()
         };
     }
     updateIndex(array, index) {

package/polar/PolarMeasureValue.js.map

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

package/polar/RadarPolarMeasureValue.d.ts

@@ -7,9 +7,9 @@ import { PolarMeasureValue } from './PolarMeasureValue';
 export declare class RadarPolarMeasureValue extends AbstractPolarMeasureValue implements IPolarMeasureValue {
     angle: number;
     constructor(json: {
-        polars: RadarPolarMeasureValue | PolarMeasureValue | string;
+        polarMeasureValue: RadarPolarMeasureValue | PolarMeasureValue | string;
         angle?: number;
     });
-    toJSON(stringify?: boolean): JSON;
-    toJSONWithPolarStringified(): JSON;
+    toJSON(stringify?: boolean): any;
+    toJSONWithPolarStringified(): any;
 }

package/polar/RadarPolarMeasureValue.js

@@ -8,12 +8,12 @@ const AbstractPolarMeasureValue_1 = require("./AbstractPolarMeasureValue");
 class RadarPolarMeasureValue extends AbstractPolarMeasureValue_1.AbstractPolarMeasureValue {
     constructor(json) {
         super(json);
-        if (json.polars instanceof RadarPolarMeasureValue) {
-            this.angle = json.polars.angle;
+        if (json.polarMeasureValue instanceof RadarPolarMeasureValue) {
+            this.angle = json.polarMeasureValue.angle;
             return;
         }
-        if (typeof json.polars === 'string') {
-            const object = JSON.parse(json.polars);
+        if (typeof json.polarMeasureValue === 'string') {
+            const object = JSON.parse(json.polarMeasureValue);
             this.angle = json.angle ? json.angle : object.angle;
             return;
         }

package/polar/RadarPolarMeasureValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"RadarPolarMeasureValue.js","sourceRoot":"","sources":["../../src/polar/RadarPolarMeasureValue.ts"],"names":[],"mappings":";;;AACA,2EAAsE;AAGtE;;GAEG;AACH,MAAa,sBAAuB,SAAQ,qDAAyB;IAIjE,YAAY,IAGX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,IAAI,CAAC,MAAM,YAAY,sBAAsB,EAAE;YAC/C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YAC/B,OAAO;SACV;QAED,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE;YACjC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YACpD,OAAO;SACV;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAC5B,CAAC;IAEM,MAAM,CAAC,SAAS,GAAG,KAAK;QAC3B,MAAM,IAAI,GAAQ,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,0BAA0B;QAC7B,MAAM,IAAI,GAAQ,KAAK,CAAC,0BAA0B,EAAE,CAAC;QACrD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAnCD,wDAmCC"}
+{"version":3,"file":"RadarPolarMeasureValue.js","sourceRoot":"","sources":["../../src/polar/RadarPolarMeasureValue.ts"],"names":[],"mappings":";;;AACA,2EAAsE;AAGtE;;GAEG;AACH,MAAa,sBAAuB,SAAQ,qDAAyB;IAIjE,YAAY,IAGX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,IAAI,CAAC,iBAAiB,YAAY,sBAAsB,EAAE;YAC1D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;YAC1C,OAAO;SACV;QAED,IAAI,OAAO,IAAI,CAAC,iBAAiB,KAAK,QAAQ,EAAE;YAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAClD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YACpD,OAAO;SACV;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAC5B,CAAC;IAEM,MAAM,CAAC,SAAS,GAAG,KAAK;QAC3B,MAAM,IAAI,GAAQ,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,0BAA0B;QAC7B,MAAM,IAAI,GAAQ,KAAK,CAAC,0BAA0B,EAAE,CAAC;QACrD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAnCD,wDAmCC"}

package/polar/RainPolarMeasureValue.d.ts

@@ -8,11 +8,11 @@ import { PolarMeasureValue } from './PolarMeasureValue';
 export declare class RainPolarMeasureValue extends AbstractPolarMeasureValue implements IPolarMeasureValue, IVersion {
     private readonly version;
     constructor(json: {
-        polars: RainPolarMeasureValue | PolarMeasureValue | string;
+        polarMeasureValue: RainPolarMeasureValue | PolarMeasureValue | string;
         version?: string;
     });
     static From(obj: any): RainPolarMeasureValue;
-    toJSON(stringify?: boolean): JSON;
-    toJSONWithPolarStringified(): JSON;
+    toJSON(stringify?: boolean): any;
+    toJSONWithPolarStringified(): any;
     getVersion(): string;
 }

package/polar/RainPolarMeasureValue.js

@@ -8,21 +8,21 @@ const AbstractPolarMeasureValue_1 = require("./AbstractPolarMeasureValue");
 class RainPolarMeasureValue extends AbstractPolarMeasureValue_1.AbstractPolarMeasureValue {
     constructor(json) {
         super(json);
-        if (json.polars instanceof RainPolarMeasureValue) {
-            this.version = json.polars.version;
+        if (json.polarMeasureValue instanceof RainPolarMeasureValue) {
+            this.version = json.polarMeasureValue.version;
             return;
         }
         this.version = json.version;
     }
     static From(obj) {
-        let version, polars;
+        let version, polarMeasureValue;
         if (typeof obj.version === 'string') {
             version = obj.version;
         }
         if (typeof obj.polars !== 'undefined') {
-            polars = obj.polars;
+            polarMeasureValue = obj.polars;
         }
-        return new RainPolarMeasureValue({ polars, version });
+        return new RainPolarMeasureValue({ polarMeasureValue, version });
     }
     toJSON(stringify = false) {
         const json = super.toJSON(stringify);

package/polar/RainPolarMeasureValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"RainPolarMeasureValue.js","sourceRoot":"","sources":["../../src/polar/RainPolarMeasureValue.ts"],"names":[],"mappings":";;;AAEA,2EAAsE;AAGtE;;GAEG;AACH,MAAa,qBAAsB,SAAQ,qDAAyB;IAIhE,YAAY,IAGX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,IAAI,CAAC,MAAM,YAAY,qBAAqB,EAAE;YAC9C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YACnC,OAAO;SACV;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAQ;QAChB,IAAI,OAAe,EACf,MAAyB,CAAC;QAE9B,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE;YACjC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;SACzB;QAED,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,WAAW,EAAE;YACnC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;SACvB;QAED,OAAO,IAAI,qBAAqB,CAAC,EAAC,MAAM,EAAE,OAAO,EAAC,CAAC,CAAC;IACxD,CAAC;IAEM,MAAM,CAAC,SAAS,GAAG,KAAK;QAC3B,MAAM,IAAI,GAAQ,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,0BAA0B;QAC7B,MAAM,IAAI,GAAQ,KAAK,CAAC,0BAA0B,EAAE,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AAhDD,sDAgDC"}
+{"version":3,"file":"RainPolarMeasureValue.js","sourceRoot":"","sources":["../../src/polar/RainPolarMeasureValue.ts"],"names":[],"mappings":";;;AAEA,2EAAsE;AAGtE;;GAEG;AACH,MAAa,qBAAsB,SAAQ,qDAAyB;IAIhE,YAAY,IAGX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,IAAI,CAAC,iBAAiB,YAAY,qBAAqB,EAAE;YACzD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;YAC9C,OAAO;SACV;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAQ;QAChB,IAAI,OAAe,EACf,iBAAoC,CAAC;QAEzC,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE;YACjC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;SACzB;QAED,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,WAAW,EAAE;YACnC,iBAAiB,GAAG,GAAG,CAAC,MAAM,CAAC;SAClC;QAED,OAAO,IAAI,qBAAqB,CAAC,EAAC,iBAAiB,EAAE,OAAO,EAAC,CAAC,CAAC;IACnE,CAAC;IAEM,MAAM,CAAC,SAAS,GAAG,KAAK;QAC3B,MAAM,IAAI,GAAQ,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,0BAA0B;QAC7B,MAAM,IAAI,GAAQ,KAAK,CAAC,0BAA0B,EAAE,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AAhDD,sDAgDC"}

package/quality/history/CartesianRainHistory.d.ts

@@ -1,11 +1,9 @@
 import { CartesianValue } from '../../cartesian/CartesianValue';
 export declare class CartesianRainHistory {
-    periodBegin: Date;
-    periodEnd: Date;
+    date: Date;
     computedValue: CartesianValue;
     constructor(json: {
-        periodBegin: Date;
-        periodEnd: Date;
+        date: Date;
         computedValue: CartesianValue;
     });
 }

package/quality/history/CartesianRainHistory.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CartesianRainHistory = void 0;
 class CartesianRainHistory {
     constructor(json) {
-        this.periodBegin = json.periodBegin;
-        this.periodEnd = json.periodEnd;
+        this.date = json.date;
         this.computedValue = json.computedValue;
     }
 }

package/quality/history/CartesianRainHistory.js.map

@@ -1 +1 @@
-{"version":3,"file":"CartesianRainHistory.js","sourceRoot":"","sources":["../../../src/quality/history/CartesianRainHistory.ts"],"names":[],"mappings":";;;AAEA,MAAa,oBAAoB;IAM7B,YAAY,IAIX;QACG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;IAC5C,CAAC;CACJ;AAfD,oDAeC"}
+{"version":3,"file":"CartesianRainHistory.js","sourceRoot":"","sources":["../../../src/quality/history/CartesianRainHistory.ts"],"names":[],"mappings":";;;AAEA,MAAa,oBAAoB;IAK7B,YAAY,IAGX;QACG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;IAC5C,CAAC;CACJ;AAZD,oDAYC"}

package/radar/RadarMeasure.d.ts

@@ -1,7 +1,6 @@
 import { Measure } from '../organization/Measure';
 import { IPolarMeasureValue } from '../polar/IPolarMeasureValue';
 import { ICartesianMeasureValue } from '../cartesian/ICartesianMeasureValue';
-import { RadarMeasureConfiguration } from '../configuration/RadarMeasureConfiguration';
 /**
  *  api/radars/:id/measures/:id
  */
@@ -12,7 +11,9 @@ export declare class RadarMeasure extends Measure {
         values: IPolarMeasureValue[] | ICartesianMeasureValue[] | Measure[] | number[];
         date?: Date;
         validity?: number;
-        configurationAsJSON?: string | RadarMeasureConfiguration;
+        configurationAsJSON?: string;
+        radar?: string;
     });
+    toJSON(): any;
     protected getLinkType(): string;
 }

package/radar/RadarMeasure.js

@@ -2,12 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RadarMeasure = void 0;
 const Measure_1 = require("../organization/Measure");
+const RadarNode_1 = require("./RadarNode");
 /**
  *  api/radars/:id/measures/:id
  */
 class RadarMeasure extends Measure_1.Measure {
     constructor(json) {
         super(json);
+        if (json.radar) {
+            this.addLinks([new RadarNode_1.RadarNode({ id: json.radar, latitude: NaN, longitude: NaN, team: null, name: null })]);
+        }
+    }
+    toJSON() {
+        const json = super.toJSON();
+        const radarId = this.getLinkId(RadarNode_1.RadarNode.TYPE);
+        if (radarId) {
+            json['radar'] = radarId;
+        }
+        return json;
     }
     getLinkType() {
         return RadarMeasure.TYPE;

package/radar/RadarMeasure.js.map

@@ -1 +1 @@
-{"version":3,"file":"RadarMeasure.js","sourceRoot":"","sources":["../../src/radar/RadarMeasure.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAKhD;;GAEG;AACH,MAAa,YAAa,SAAQ,iBAAO;IAIrC,YAAY,IAMC;QAET,KAAK,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAES,WAAW;QACjB,OAAO,YAAY,CAAC,IAAI,CAAC;IAC7B,CAAC;;AAfa,iBAAI,GAAG,eAAe,CAAC;AAF5B,oCAAY"}
+{"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;YACZ,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;SAC3G;IACL,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAS,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;SAC3B;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,WAAW;QACjB,OAAO,YAAY,CAAC,IAAI,CAAC;IAC7B,CAAC;;AA7Ba,iBAAI,GAAG,eAAe,CAAC;AAF5B,oCAAY"}

package/radar/RadarNode.d.ts

@@ -7,18 +7,26 @@ import { TeamNode } from '../organization/TeamNode';
 export declare class RadarNode extends RaainNode {
     static TYPE: string;
     name: string;
+    description: string;
+    technicalInfos: string;
     latitude: number;
     longitude: number;
     team: TeamNode;
+    private configurationAsJSON;
     constructor(json: {
         id: string;
         latitude: number;
         longitude: number;
         name: string;
+        team: TeamNode;
+        description?: string;
+        technicalInfos?: string;
         links?: Link[] | RaainNode[];
-        team?: TeamNode;
         version?: string;
+        configurationAsJSON?: any;
     });
-    toJSON(): JSON;
+    toJSON(): any;
+    setConfiguration(configuration: string | any): void;
+    getConfiguration(): any;
     protected getLinkType(): string;
 }

package/radar/RadarNode.js

@@ -11,17 +11,40 @@ class RadarNode extends RaainNode_1.RaainNode {
         this.latitude = json.latitude;
         this.longitude = json.longitude;
         this.name = json.name;
+        this.description = json.description;
+        this.technicalInfos = json.technicalInfos;
         this.team = json.team;
+        this.setConfiguration(json.configurationAsJSON);
     }
     toJSON() {
         var _a;
         const json = super.toJSON();
         json['name'] = this.name;
+        json['description'] = this.description;
+        json['technicalInfos'] = this.technicalInfos;
         json['latitude'] = this.latitude;
         json['longitude'] = this.longitude;
         json['team'] = ((_a = this.team) === null || _a === void 0 ? void 0 : _a.id) || this.team;
+        json['configurationAsJSON'] = this.configurationAsJSON;
         return json;
     }
+    setConfiguration(configuration) {
+        let conf = configuration;
+        try {
+            conf = JSON.parse(configuration);
+        }
+        catch (ignored) {
+        }
+        this.configurationAsJSON = JSON.stringify(conf);
+    }
+    getConfiguration() {
+        try {
+            return JSON.parse(this.configurationAsJSON);
+        }
+        catch (e) {
+        }
+        return null;
+    }
     getLinkType() {
         return RadarNode.TYPE;
     }

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;IASpC,YAAY,IAQX;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,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IAC1B,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,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,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,WAAW;QACjB,OAAO,SAAS,CAAC,IAAI,CAAC;IAC1B,CAAC;;AAlCa,cAAI,GAAG,OAAO,CAAC;AAFpB,8BAAS"}
+{"version":3,"file":"RadarNode.js","sourceRoot":"","sources":["../../src/radar/RadarNode.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AAIpD;;GAEG;AACH,MAAa,SAAU,SAAQ,qBAAS;IAYpC,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;YACA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;SACpC;QAAC,OAAO,OAAO,EAAE;SACjB;QAED,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;IAEM,gBAAgB;QACnB,IAAI;YACA,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC/C;QAAC,OAAO,CAAC,EAAE;SACX;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,WAAW;QACjB,OAAO,SAAS,CAAC,IAAI,CAAC;IAC1B,CAAC;;AAhEa,cAAI,GAAG,OAAO,CAAC;AAFpB,8BAAS"}

package/radar/RadarNodeMap.d.ts

@@ -7,22 +7,22 @@ import { TeamNode } from '../organization/TeamNode';
  *  api/radars/:radarId?format=map&...
  */
 export declare class RadarNodeMap extends RadarNode {
-    periodBegin: Date;
-    periodEnd: Date;
+    date: Date;
     private map;
     constructor(json: {
         id: string;
         latitude: number;
         longitude: number;
-        periodBegin: Date;
-        periodEnd: Date;
+        date: Date;
         map: RadarMeasure[] | string;
         name: string;
+        description: string;
+        team: TeamNode;
         links?: Link[] | RaainNode[];
-        team?: TeamNode;
         version?: string;
+        configurationAsJSON?: any;
     });
-    toJSON(): JSON;
+    toJSON(): any;
     setMapData(mapData: RadarMeasure[] | string): void;
     getMapData(): RadarMeasure[];
 }

package/radar/RadarNodeMap.js

@@ -8,8 +8,7 @@ const RadarNode_1 = require("./RadarNode");
 class RadarNodeMap extends RadarNode_1.RadarNode {
     constructor(json) {
         super(json);
-        this.periodBegin = new Date(json.periodBegin);
-        this.periodEnd = new Date(json.periodEnd);
+        this.date = new Date(json.date);
         this.setMapData(json.map);
     }
     toJSON() {
@@ -17,8 +16,7 @@ class RadarNodeMap extends RadarNode_1.RadarNode {
         if (this.map) {
             json['map'] = this.map;
         }
-        json['periodBegin'] = this.periodBegin.toISOString();
-        json['periodEnd'] = this.periodEnd.toISOString();
+        json['date'] = this.date.toISOString();
         return json;
     }
     setMapData(mapData) {

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;IAMvC,YAAY,IAWX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,WAAW,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1C,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;YACV,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;SAC1B;QACD,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;QACrD,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QACjD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU,CAAC,OAAgC;QAC9C,IAAI,CAAC,OAAO,EAAE;YACV,OAAO;SACV;QAED,IAAI,GAAG,GAAG,OAAO,CAAC;QAClB,IAAI;YACA,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE;gBAC/B,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;aACjC;SACJ;QAAC,OAAO,CAAC,EAAE;SACX;QACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAEM,UAAU;QACb,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACX,OAAO,EAAE,CAAC;SACb;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;CACJ;AAvDD,oCAuDC"}
+{"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;YACV,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;SAC1B;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;YACV,OAAO;SACV;QAED,IAAI,GAAG,GAAG,OAAO,CAAC;QAClB,IAAI;YACA,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE;gBAC/B,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;aACjC;SACJ;QAAC,OAAO,CAAC,EAAE;SACX;QACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAEM,UAAU;QACb,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACX,OAAO,EAAE,CAAC;SACb;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;CACJ;AArDD,oCAqDC"}