raain-model 2.6.11 → 3.0.2

package/gauge/GaugeNode.js

@@ -82,13 +82,15 @@ class GaugeNode extends organization_1.RaainNode {
     toJSON() {
         var _a;
         const json = super.toJSON();
-        json['name'] = this.name;
-        json['description'] = this.description;
-        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;
+        return {
+            ...json,
+            name: this.name,
+            description: this.description,
+            latitude: this.latitude,
+            longitude: this.longitude,
+            team: ((_a = this.team) === null || _a === void 0 ? void 0 : _a.id) || this.team,
+            configurationAsJSON: this.configurationAsJSON
+        };
     }
     /**
      * Returns the link type for gauge nodes.

package/gauge/GaugeNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"GaugeNode.js","sourceRoot":"","sources":["../../src/gauge/GaugeNode.ts"],"names":[],"mappings":";;;AAAA,kDAA0D;AAE1D;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAa,SAAU,SAAQ,wBAAS;IAuBpC;;;;;;;;;;;;;OAaG;IACH,YAAY,IAUX;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,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACI,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;IAED;;;;OAIG;IACI,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;IAED;;;;OAIG;IACI,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,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;IAED;;;;OAIG;IACO,WAAW;QACjB,OAAO,SAAS,CAAC,IAAI,CAAC;IAC1B,CAAC;;AA9GL,8BA+GC;AA7GG,sCAAsC;AACxB,cAAI,GAAG,OAAO,CAAC"}
+{"version":3,"file":"GaugeNode.js","sourceRoot":"","sources":["../../src/gauge/GaugeNode.ts"],"names":[],"mappings":";;;AAAA,kDAA0D;AAE1D;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAa,SAAU,SAAQ,wBAAS;IAuBpC;;;;;;;;;;;;;OAaG;IACH,YAAY,IAUX;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,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACI,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;IAED;;;;OAIG;IACI,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;IAED;;;;OAIG;IACI,MAAM;;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAE5B,OAAO;YACH,GAAG,IAAI;YACP,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,EAAE,KAAI,IAAI,CAAC,IAAI;YAChC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;SAChD,CAAC;IACN,CAAC;IAED;;;;OAIG;IACO,WAAW;QACjB,OAAO,SAAS,CAAC,IAAI,CAAC;IAC1B,CAAC;;AAjHL,8BAkHC;AAhHG,sCAAsC;AACxB,cAAI,GAAG,OAAO,CAAC"}

package/gauge/GaugeNodeMap.d.ts

@@ -18,7 +18,18 @@ export declare class GaugeNodeMap extends GaugeNode {
         links?: Link[] | RaainNode[];
         version?: string;
     });
-    toJSON(): any;
+    toJSON(): {
+        map: string;
+        name: string;
+        description: string;
+        latitude: number;
+        longitude: number;
+        team: string | TeamNode;
+        configurationAsJSON: string;
+        id: string;
+        links: Link[];
+        version?: string;
+    };
     setMapData(mapData: GaugeMeasure[] | string): void;
     getMapData(): GaugeMeasure[];
 }

package/gauge/GaugeNodeMap.js

@@ -12,8 +12,10 @@ class GaugeNodeMap extends GaugeNode_1.GaugeNode {
     }
     toJSON() {
         const json = super.toJSON();
-        json.map = this.map;
-        return json;
+        return {
+            ...json,
+            map: this.map
+        };
     }
     setMapData(mapData) {
         if (!mapData) {

package/gauge/GaugeNodeMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"GaugeNodeMap.js","sourceRoot":"","sources":["../../src/gauge/GaugeNodeMap.ts"],"names":[],"mappings":";;;AACA,2CAAsC;AAGtC;;GAEG;AACH,MAAa,YAAa,SAAQ,qBAAS;IAIvC,YAAY,IAWX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,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;AA/CD,oCA+CC"}
+{"version":3,"file":"GaugeNodeMap.js","sourceRoot":"","sources":["../../src/gauge/GaugeNodeMap.ts"],"names":[],"mappings":";;;AACA,2CAAsC;AAGtC;;GAEG;AACH,MAAa,YAAa,SAAQ,qBAAS;IAIvC,YAAY,IAWX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,OAAO;YACH,GAAG,IAAI;YACP,GAAG,EAAE,IAAI,CAAC,GAAG;SAChB,CAAC;IACN,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;AAjDD,oCAiDC"}

package/organization/EventNode.d.ts

@@ -18,5 +18,13 @@ export declare class EventNode {
         created: Date;
         modified: Date;
     });
-    toJSON(): any;
+    toJSON(): {
+        id: string;
+        title: string;
+        status: number;
+        red: boolean;
+        description: string;
+        created: Date;
+        modified: Date;
+    };
 }

package/organization/EventNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventNode.js","sourceRoot":"","sources":["../../src/organization/EventNode.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,SAAS;IASlB,YAAY,IAQC;QAET,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;IAClC,CAAC;IAEM,MAAM;QACT,OAAO;YACH,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACnB,CAAC;IACb,CAAC;CACJ;AAvCD,8BAuCC"}
+{"version":3,"file":"EventNode.js","sourceRoot":"","sources":["../../src/organization/EventNode.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,SAAS;IASlB,YAAY,IAQC;QAET,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;IAClC,CAAC;IAEM,MAAM;QACT,OAAO;YACH,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SAC1B,CAAC;IACN,CAAC;CACJ;AAvCD,8BAuCC"}

package/organization/Measure.d.ts

@@ -17,6 +17,14 @@ export declare class Measure extends RaainNode {
     setConfiguration(configuration: string | any): void;
     toJSON(options?: {
         removeValues?: boolean;
-    }): any;
+    }): {
+        date: Date;
+        validity: number;
+        configurationAsJSON: string;
+        values: number[] | IPolarMeasureValue[] | ICartesianMeasureValue[];
+        id: string;
+        links: import("./Link").Link[];
+        version?: string;
+    };
     getConfiguration(): any;
 }

package/organization/Measure.js

@@ -22,15 +22,21 @@ class Measure extends RaainNode_1.RaainNode {
         }
     }
     toJSON(options = {}) {
-        var _a;
         const json = super.toJSON();
-        json['date'] = (_a = this.date) === null || _a === void 0 ? void 0 : _a.toISOString();
-        json['validity'] = this.validity;
-        json['configurationAsJSON'] = this.configurationAsJSON;
-        if (!(options === null || options === void 0 ? void 0 : options.removeValues)) {
-            json['values'] = this.values;
+        const extendedJson = {
+            ...json,
+            date: this.date,
+            validity: this.validity,
+            configurationAsJSON: this.configurationAsJSON,
+            values: []
+        };
+        if (options === null || options === void 0 ? void 0 : options.removeValues) {
+            return extendedJson;
         }
-        return json;
+        return {
+            ...extendedJson,
+            values: this.values
+        };
     }
     getConfiguration() {
         try {

package/organization/Measure.js.map

@@ -1 +1 @@
-{"version":3,"file":"Measure.js","sourceRoot":"","sources":["../../src/organization/Measure.ts"],"names":[],"mappings":";;;AACA,2CAAsC;AAGtC,MAAa,OAAQ,SAAQ,qBAAS;IASlC,YAAY,IAOC;QAET,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpD,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,MAAM,CAAC,UAAsC,EAAE;;QAClD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,MAAA,IAAI,CAAC,IAAI,0CAAE,WAAW,EAAE,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,qBAAqB,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAEvD,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAA,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,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;CACJ;AAxDD,0BAwDC"}
+{"version":3,"file":"Measure.js","sourceRoot":"","sources":["../../src/organization/Measure.ts"],"names":[],"mappings":";;;AACA,2CAAsC;AAGtC,MAAa,OAAQ,SAAQ,qBAAS;IASlC,YAAY,IAOC;QAET,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpD,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,MAAM,CAAC,UAAsC,EAAE;QAClD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,MAAM,YAAY,GAAG;YACjB,GAAG,IAAI;YACP,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,MAAM,EAAE,EAAgE;SAC3E,CAAA;QAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,EAAE,CAAC;YACxB,OAAO,YAAY,CAAC;QACxB,CAAC;QAED,OAAO;YACH,GAAG,YAAY;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;SACtB,CAAC;IACN,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;CACJ;AAhED,0BAgEC"}

package/organization/PeopleNode.d.ts

@@ -12,7 +12,12 @@ export declare class PeopleNode {
         email: string;
         name: string;
     });
-    toJSON(): any;
+    toJSON(): {
+        id: string;
+        roles: string[];
+        email: string;
+        name: string;
+    };
     hasRole(role: string): boolean;
     addRole(role: string): void;
 }

package/organization/RaainNode.d.ts

@@ -60,7 +60,11 @@ export declare class RaainNode implements IVersion {
      *
      * @returns A JSON object containing the node's data
      */
-    toJSON(): any;
+    toJSON(): {
+        id: string;
+        links: Link[];
+        version?: string;
+    };
     getLinks(linkType?: string): Link[];
     getLink(linkType: string, index?: number): Link;
     /**

package/organization/RaainNode.js.map

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

package/organization/TeamNode.d.ts

@@ -1,5 +1,7 @@
 import { PeopleNode } from './PeopleNode';
 import { RaainNode } from './RaainNode';
+export interface ITeamNode {
+}
 /**
  * Represents a team in the RAAIN system.
  * This class manages team members and their contracts.
@@ -19,28 +21,11 @@ import { RaainNode } from './RaainNode';
  * ```
  */
 export declare class TeamNode extends RaainNode {
-    /** Type identifier for team nodes */
-    static TYPE: string;
-    /** Unique identifier for the team */
-    id: any | string;
-    /** Name of the team */
+    static readonly TYPE = "team";
     name: string;
-    /** Description of the team */
     description: string;
-    /** Array of contract types associated with the team */
     contracts: string[];
-    /** Array of team members */
     contacts: PeopleNode[];
-    /**
-     * Creates a new TeamNode instance.
-     *
-     * @param json - Configuration object
-     * @param json.id - Unique identifier
-     * @param json.name - Optional name of the team
-     * @param json.description - Optional description
-     * @param json.contracts - Optional array of contract types
-     * @param json.contacts - Optional array of team members
-     */
     constructor(json: {
         id: any | string;
         name?: string;
@@ -48,12 +33,15 @@ export declare class TeamNode extends RaainNode {
         contracts?: string[];
         contacts?: PeopleNode[];
     });
-    /**
-     * Converts the team node to a JSON object.
-     *
-     * @returns A JSON object containing the team's data
-     */
-    toJSON(): any;
+    toJSON(): {
+        name: string;
+        description: string;
+        contracts: string[];
+        contacts: PeopleNode[];
+        id: string;
+        links: import("./Link").Link[];
+        version?: string;
+    };
     /**
      * Returns the link type for team nodes.
      *

package/organization/TeamNode.js

@@ -21,32 +21,17 @@ const RaainNode_1 = require("./RaainNode");
  * ```
  */
 class TeamNode extends RaainNode_1.RaainNode {
-    /**
-     * Creates a new TeamNode instance.
-     *
-     * @param json - Configuration object
-     * @param json.id - Unique identifier
-     * @param json.name - Optional name of the team
-     * @param json.description - Optional description
-     * @param json.contracts - Optional array of contract types
-     * @param json.contacts - Optional array of team members
-     */
     constructor(json) {
         super(json);
-        this.id = json.id;
         this.name = json.name;
         this.description = json.description;
         this.contracts = json.contracts;
         this.contacts = json.contacts;
     }
-    /**
-     * Converts the team node to a JSON object.
-     *
-     * @returns A JSON object containing the team's data
-     */
     toJSON() {
+        const json = super.toJSON();
         return {
-            id: this.id,
+            ...json,
             name: this.name,
             description: this.description,
             contracts: this.contracts,
@@ -63,6 +48,5 @@ class TeamNode extends RaainNode_1.RaainNode {
     }
 }
 exports.TeamNode = TeamNode;
-/** Type identifier for team nodes */
 TeamNode.TYPE = 'team';
 //# sourceMappingURL=TeamNode.js.map

package/organization/TeamNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"TeamNode.js","sourceRoot":"","sources":["../../src/organization/TeamNode.ts"],"names":[],"mappings":";;;AACA,2CAAsC;AAEtC;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAa,QAAS,SAAQ,qBAAS;IAoBnC;;;;;;;;;OASG;IACH,YAAY,IAMX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACI,MAAM;QACT,OAAO;YACH,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACnB,CAAC;IACb,CAAC;IAED;;;;OAIG;IACO,WAAW;QACjB,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;;AApEL,4BAqEC;AAnEG,qCAAqC;AACvB,aAAI,GAAG,MAAM,CAAC"}
+{"version":3,"file":"TeamNode.js","sourceRoot":"","sources":["../../src/organization/TeamNode.ts"],"names":[],"mappings":";;;AACA,2CAAsC;AAMtC;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAa,QAAS,SAAQ,qBAAS;IASnC,YAAY,IAMX;QACG,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;IAClC,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,OAAO;YACH,GAAG,IAAI;YACP,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SAC1B,CAAC;IACN,CAAC;IAED;;;;OAIG;IACO,WAAW;QACjB,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;;AA1CL,4BA2CC;AAzC0B,aAAI,GAAG,MAAM,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "raain-model",
-  "version": "2.6.11",
+  "version": "3.0.2",
   "author": "contact@radartorain.com",
   "homepage": "https://github.com/raainio/raain-model",
   "description": "radartorain.com api model",
@@ -33,6 +33,8 @@
     "build-dist": "rm -rf dist/ && npx tsc && cp package.json dist/ && cp *.md dist/",
     "test": "mocha --require ts-node/register 'specs/**/**.spec.ts'",
     "docs": "typedoc --out docs src/",
-    "docs:serve": "npx serve docs"
+    "docs:serve": "npx serve docs",
+    "update-changelog": "node scripts/update-changelog.js",
+    "verify-changelog": "node scripts/verify-changelog.js"
   }
 }

package/polar/AbstractPolarMeasureValue.d.ts

@@ -22,8 +22,10 @@ export declare class AbstractPolarMeasureValue implements IPolarMeasureValue {
     }): void;
     getAzimuthsCount(): number;
     getPolarEdgesCount(): number;
-    toJSON(options?: {
-        stringify: boolean;
-    }): any;
-    toJSONWithPolarStringified(): any;
+    toJSON(): {
+        polarMeasureValue: PolarMeasureValue;
+    };
+    toJSONWithPolarStringified(): {
+        polarMeasureValue: string;
+    };
 }

package/polar/AbstractPolarMeasureValue.js

@@ -69,19 +69,17 @@ class AbstractPolarMeasureValue {
     getPolarEdgesCount() {
         return this.polarMeasureValue.getPolarEdgesCount();
     }
-    toJSON(options = {
-        stringify: false
-    }) {
-        let polarMeasureValue = this.polarMeasureValue;
-        if (options === null || options === void 0 ? void 0 : options.stringify) {
-            polarMeasureValue = JSON.stringify(this.polarMeasureValue.toJSONWithPolarStringified());
-        }
+    toJSON() {
         return {
-            polarMeasureValue,
+            polarMeasureValue: this.polarMeasureValue,
         };
     }
     toJSONWithPolarStringified() {
-        return this.toJSON({ stringify: true });
+        const json = this.toJSON();
+        return {
+            ...json,
+            polarMeasureValue: JSON.stringify(this.polarMeasureValue.toJSONWithPolarStringified())
+        };
     }
 }
 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":";;;AAEA,2DAAsD;AAGtD,MAAa,yBAAyB;IAIlC,YAAY,IAEX;QAEG,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,iBAAiB,CAAA,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,kBAAkB,GAAQ,IAAI,CAAC,iBAAiB,CAAC;QACrD,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE,CAAC;YACzC,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,kBAAkB,YAAY,yBAAyB;eACpD,kBAAkB,YAAY,qCAAiB,EAAE,CAAC;YACrD,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,SAAS,EAAE,EACpD,kBAAkB,CAAC,gBAAgB,EAAE,EACrC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,CAAC;YAC7C,OAAO;QACX,CAAC;QAED,IAAI,kBAAkB,GAAG,kBAAkB,CAAC;QAC5C,IAAI,kBAAkB,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC1C,IAAI,OAAO,kBAAkB,CAAC,mBAAmB,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC9D,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAC7E,CAAC;iBAAM,CAAC;gBACJ,kBAAkB,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;YACjE,CAAC;QACL,CAAC;QAED,IAAI,aAAqB,CAAC;QAC1B,IAAI,eAAuB,CAAC;QAC5B,IAAI,2BAA2B,GAAG,EAAE,CAAC;QACrC,IAAI,kBAAkB,IAAI,kBAAkB,CAAC,6BAA6B,CAAC,EAAE,CAAC;YAC1E,2BAA2B,GAAG,kBAAkB,CAAC,6BAA6B,CAAC,CAAC;YAEhF,IAAI,kBAAkB,CAAC,eAAe,CAAC,IAAI,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC/E,aAAa,GAAG,QAAQ,CAAC,EAAE,GAAG,kBAAkB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvE,eAAe,GAAG,QAAQ,CAAC,EAAE,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/E,CAAC;QACL,CAAC;QAED,IAAI,OAAO,2BAA2B,KAAK,QAAQ,EAAE,CAAC;YAClD,IAAI,CAAC,iBAAiB,CAAC,2BAA2B,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;YACpF,OAAO;QACX,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,2BAA2B,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,oBAAoB,CAAC,2BAA2B,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;YACvF,OAAO;QACX,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACrD,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;IACzD,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC;IAC9C,CAAC;IAED,iBAAiB,CAAC,2BAAmC,EAAE,aAAqB,EAAE,eAAuB;QACjG,IAAI,CAAC,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,EAAC,2BAA2B,EAAE,aAAa,EAAE,eAAe,EAAC,CAAC,CAAC;IAClH,CAAC;IAED,oBAAoB,CAAC,2BAAyD,EAAE,aAAqB,EAAE,eAAuB;QAC1H,IAAI,CAAC,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,EAAC,2BAA2B,EAAE,aAAa,EAAE,eAAe,EAAC,CAAC,CAAC;IAClH,CAAC;IAED,aAAa,CAAC,IAA4D;QACtE,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,aAAa,CAAC,IAA2E;QACrF,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;IACrD,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,CAAC;IACvD,CAAC;IAEM,MAAM;QACT,OAAO;YACH,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC5C,CAAC;IACN,CAAC;IAEM,0BAA0B;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC3B,OAAO;YACH,GAAG,IAAI;YACP,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,EAAE,CAAC;SACzF,CAAC;IACN,CAAC;CACJ;AAxGD,8DAwGC"}

package/polar/MeasureValuePolarContainer.d.ts

@@ -9,7 +9,12 @@ export declare class MeasureValuePolarContainer {
         polarEdges: number[];
         edgeOffset?: number;
     });
-    toJSON(): any;
+    toJSON(): {
+        azimuth: number;
+        distance: number;
+        polarEdges: number[];
+        edgeOffset: number;
+    };
     getPolarEdgesCount(): number;
     getNotNullValuesCount(): number;
     getFiltered(options?: {

package/polar/MeasureValuePolarContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"MeasureValuePolarContainer.js","sourceRoot":"","sources":["../../src/polar/MeasureValuePolarContainer.ts"],"names":[],"mappings":";;;AAAA,MAAa,0BAA0B;IAOnC,YAAY,IAKX;QAEG,IAAI,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAA,KAAK,WAAW,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACvE,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM;QACT,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;SACvB,CAAC;IACb,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACpD,CAAC;IAED,qBAAqB;QACjB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,OAAO,KAAK,CAAC,MAAM,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,OAAO,GAAG,EAAC,UAAU,EAAE,IAAI,EAAC;QACpC,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACrD,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,GAAG,CAAC,GAAG,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACjE,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;gBAC1E,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;oBACV,OAAO,YAAY,CAAC;gBACxB,CAAC;gBACD,OAAO,SAAS,CAAC;YACrB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAEP,IAAI,iBAAiB,IAAI,CAAC,IAAI,gBAAgB,IAAI,CAAC,EAAE,CAAC;gBAClD,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,iBAAiB,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC;gBACvE,UAAU,GAAG,UAAU,GAAG,iBAAiB,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACJ,UAAU,GAAG,EAAE,CAAC;YACpB,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1B,UAAU,GAAG,CAAC,CAAC;YACnB,CAAC;QACL,CAAC;QAED,OAAO,IAAI,0BAA0B,CAAC;YAClC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU;YACV,UAAU;SACb,CAAC,CAAC;IACP,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AA9ED,gEA8EC"}
+{"version":3,"file":"MeasureValuePolarContainer.js","sourceRoot":"","sources":["../../src/polar/MeasureValuePolarContainer.ts"],"names":[],"mappings":";;;AAAA,MAAa,0BAA0B;IAOnC,YAAY,IAKX;QAEG,IAAI,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAA,KAAK,WAAW,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACvE,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM;QACT,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC;IACN,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACpD,CAAC;IAED,qBAAqB;QACjB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,OAAO,KAAK,CAAC,MAAM,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,OAAO,GAAG,EAAC,UAAU,EAAE,IAAI,EAAC;QACpC,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACrD,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,GAAG,CAAC,GAAG,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACjE,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;gBAC1E,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;oBACV,OAAO,YAAY,CAAC;gBACxB,CAAC;gBACD,OAAO,SAAS,CAAC;YACrB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAEP,IAAI,iBAAiB,IAAI,CAAC,IAAI,gBAAgB,IAAI,CAAC,EAAE,CAAC;gBAClD,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,iBAAiB,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC;gBACvE,UAAU,GAAG,UAAU,GAAG,iBAAiB,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACJ,UAAU,GAAG,EAAE,CAAC;YACpB,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1B,UAAU,GAAG,CAAC,CAAC;YACnB,CAAC;QACL,CAAC;QAED,OAAO,IAAI,0BAA0B,CAAC;YAClC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU;YACV,UAAU;SACb,CAAC,CAAC;IACP,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AA9ED,gEA8EC"}

package/polar/RadarPolarMeasureValue.d.ts

@@ -20,8 +20,14 @@ export declare class RadarPolarMeasureValue extends AbstractPolarMeasureValue im
      *  - 250 gate with a step of 1KM
      */
     static BuildFakeRadarPolarMeasureValues(movementFrom0To90?: number): RadarPolarMeasureValue[];
-    toJSON(options?: {
-        stringify: boolean;
-    }): any;
-    toJSONWithPolarStringified(): any;
+    toJSON(): {
+        angle: number;
+        axis: number;
+        polarMeasureValue: PolarMeasureValue;
+    };
+    toJSONWithPolarStringified(): {
+        angle: number;
+        axis: number;
+        polarMeasureValue: string;
+    };
 }

package/polar/RadarPolarMeasureValue.js

@@ -74,16 +74,21 @@ class RadarPolarMeasureValue extends AbstractPolarMeasureValue_1.AbstractPolarMe
         }
         return radarPolarMeasureValues;
     }
-    toJSON(options = {
-        stringify: false
-    }) {
-        const json = super.toJSON(options);
-        json.angle = this.angle;
-        json.axis = this.axis;
-        return json;
+    toJSON() {
+        const json = super.toJSON();
+        return {
+            ...json,
+            angle: this.angle,
+            axis: this.axis,
+        };
     }
     toJSONWithPolarStringified() {
-        return this.toJSON({ stringify: true });
+        const json = super.toJSONWithPolarStringified();
+        return {
+            ...json,
+            angle: this.angle,
+            axis: this.axis,
+        };
     }
 }
 exports.RadarPolarMeasureValue = RadarPolarMeasureValue;

package/polar/RadarPolarMeasureValue.js.map

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

package/polar/RainPolarMeasureValue.d.ts

@@ -12,9 +12,13 @@ export declare class RainPolarMeasureValue extends AbstractPolarMeasureValue imp
         version?: string;
     });
     static From(obj: IPolarMeasureValue | any): RainPolarMeasureValue;
-    toJSON(options?: {
-        stringify: boolean;
-    }): any;
-    toJSONWithPolarStringified(): any;
+    toJSON(): {
+        version: string;
+        polarMeasureValue: PolarMeasureValue;
+    };
+    toJSONWithPolarStringified(): {
+        version: string;
+        polarMeasureValue: string;
+    };
     getVersion(): string;
 }

package/polar/RainPolarMeasureValue.js

@@ -24,15 +24,19 @@ class RainPolarMeasureValue extends AbstractPolarMeasureValue_1.AbstractPolarMea
         }
         return new RainPolarMeasureValue({ polarMeasureValue, version });
     }
-    toJSON(options = {
-        stringify: false
-    }) {
-        const json = super.toJSON(options);
-        json.version = this.version;
-        return json;
+    toJSON() {
+        const json = super.toJSON();
+        return {
+            ...json,
+            version: this.version
+        };
     }
     toJSONWithPolarStringified() {
-        return this.toJSON({ stringify: true });
+        const json = super.toJSONWithPolarStringified();
+        return {
+            ...json,
+            version: this.version
+        };
     }
     getVersion() {
         return this.version;

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,iBAAiB,YAAY,qBAAqB,EAAE,CAAC;YAC1D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;YAC9C,OAAO;QACX,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAA6B;QACrC,IAAI,OAAe,EACf,iBAAoC,CAAC;QAEzC,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAClC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC1B,CAAC;QAED,IAAI,OAAO,GAAG,CAAC,iBAAiB,KAAK,WAAW,EAAE,CAAC;YAC/C,iBAAiB,GAAG,GAAG,CAAC,iBAAiB,CAAC;QAC9C,CAAC;QAED,OAAO,IAAI,qBAAqB,CAAC,EAAC,iBAAiB,EAAE,OAAO,EAAC,CAAC,CAAC;IACnE,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG;QACpB,SAAS,EAAE,KAAK;KACnB;QACG,MAAM,IAAI,GAAQ,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,0BAA0B;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;IAC1C,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,CAAC;YAC1D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;YAC9C,OAAO;QACX,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAA6B;QACrC,IAAI,OAAe,EACf,iBAAoC,CAAC;QAEzC,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAClC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC1B,CAAC;QAED,IAAI,OAAO,GAAG,CAAC,iBAAiB,KAAK,WAAW,EAAE,CAAC;YAC/C,iBAAiB,GAAG,GAAG,CAAC,iBAAiB,CAAC;QAC9C,CAAC;QAED,OAAO,IAAI,qBAAqB,CAAC,EAAC,iBAAiB,EAAE,OAAO,EAAC,CAAC,CAAC;IACnE,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5B,OAAO;YACH,GAAG,IAAI;YACP,OAAO,EAAE,IAAI,CAAC,OAAO;SACxB,CAAC;IACN,CAAC;IAEM,0BAA0B;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,0BAA0B,EAAE,CAAC;QAChD,OAAO;YACH,GAAG,IAAI;YACP,OAAO,EAAE,IAAI,CAAC,OAAO;SACxB,CAAC;IACN,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AApDD,sDAoDC"}

package/radar/RadarMeasure.d.ts

@@ -1,4 +1,4 @@
-import { Measure } from '../organization';
+import { Link, Measure } from '../organization';
 import { IPolarMeasureValue } from '../polar';
 import { ICartesianMeasureValue } from '../cartesian';
 /**
@@ -14,6 +14,26 @@ export declare class RadarMeasure extends Measure {
         configurationAsJSON?: string;
         radar?: string;
     });
-    toJSON(options?: any): any;
+    toJSON(options?: {
+        removeValues?: boolean;
+    }): {
+        date: Date;
+        validity: number;
+        configurationAsJSON: string;
+        values: number[] | IPolarMeasureValue[] | ICartesianMeasureValue[];
+        id: string;
+        links: Link[];
+        version?: string;
+    } | {
+        radar: string;
+        date: Date;
+        validity: number;
+        configurationAsJSON: string;
+        values: number[] | IPolarMeasureValue[] | ICartesianMeasureValue[];
+        id: string;
+        links: Link[];
+        version?: string;
+    };
+    protected getRadarLinks(linksToPurify: any[]): any[];
     protected getLinkType(): string;
 }

package/radar/RadarMeasure.js

@@ -10,17 +10,39 @@ class RadarMeasure extends organization_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 })]);
+            this.addLinks(this.getRadarLinks([json.radar]));
         }
     }
     toJSON(options) {
         const json = super.toJSON(options);
         const radarLink = this.getLink(RadarNode_1.RadarNode.TYPE);
         if (radarLink) {
-            json['radar'] = radarLink.getId();
+            return {
+                ...json,
+                radar: radarLink.getId()
+            };
         }
         return json;
     }
+    getRadarLinks(linksToPurify) {
+        if (!linksToPurify || linksToPurify.length === 0) {
+            return [];
+        }
+        return linksToPurify.map(l => {
+            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 });
+            }
+            else if (l && l.id) {
+                return new RadarNode_1.RadarNode({
+                    id: l.id.toString(), // 'hex'
+                    latitude: 0, longitude: 0, name: l.name, team: l.team
+                });
+            }
+        });
+    }
     getLinkType() {
         return RadarMeasure.TYPE;
     }