@enervance/insight-cim-model 0.0.62 → 0.0.63

package/dist/model/assets/HealthScore.js.map

@@ -1 +1 @@
-{"version":3,"file":"HealthScore.js","sourceRoot":"","sources":["../../../src/model/assets/HealthScore.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAIhD,MAAa,WAAY,SAAQ,+BAAc;IAC3C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAChG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAwBM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACzE;QACD,OAAO,WAAW,CAAC,WAAW,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC3D,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;YACnC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,wBAAwB;QAE3B,OAAO;eACA,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;SAK9B,CAAC;IACN,CAAC;;AApDL,kCAqDC;AA/CiB,uBAAW,GAAW;;;;;;;;;;;;;;;;;;;;KAoBnC,CAAC"}
+{"version":3,"file":"HealthScore.js","sourceRoot":"","sources":["../../../src/model/assets/HealthScore.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAIhD,MAAa,WAAY,SAAQ,+BAAc;IAC3C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAChG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;KAoBnC,CAAC;IAEK,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACzE;QACD,OAAO,WAAW,CAAC,WAAW,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACpE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;YACnC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,wBAAwB;QAE3B,OAAO;eACA,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;SAK9B,CAAC;IACN,CAAC;;AApDL,kCAqDC"}

package/dist/model/assets/LifecycleDate.js

@@ -3,12 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LifecycleDate = void 0;
 const utils_1 = require("../../util/utils");
 class LifecycleDate {
+    installationDate;
+    manufacturedDate;
+    purchaseDate;
+    receivedDate;
+    removalDate;
+    retiredDate;
     constructor() {
     }
     resolveClassFusekiJSON(value) {
         this.manufacturedDate = (0, utils_1.getValue)(value, 'manufacturedDate');
         this.installationDate = (0, utils_1.getValue)(value, 'installationDate');
     }
+    /*  setManufacturedDate(manufacturedDate: string): string {
+        this.manufacturedDate = manufacturedDate;
+        return ` [
+                  a cim:LifecycleDate ;
+                  cim:LifecycleDate.manufacturedDate  "${this.manufacturedDate}"
+                ] `;
+      }*/
     setManufacturedDate(date) {
         this.manufacturedDate = date;
         return `[ cim:LifecycleDate.manufacturedDate '${date}' ]`;

package/dist/model/assets/LifecycleDate.js.map

@@ -1 +1 @@
-{"version":3,"file":"LifecycleDate.js","sourceRoot":"","sources":["../../../src/model/assets/LifecycleDate.ts"],"names":[],"mappings":";;;AAAA,4CAA0C;AAE1C,MAAa,aAAa;IASxB;IACA,CAAC;IAEM,sBAAsB,CAAC,KAAU;QACtC,IAAI,CAAC,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;QAC5D,IAAI,CAAC,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAC9D,CAAC;IAUD,mBAAmB,CAAC,IAAY;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,yCAAyC,IAAI,KAAK,CAAC;IAC5D,CAAC;IAED,mBAAmB,CAAC,IAAY;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,yCAAyC,IAAI,KAAK,CAAC;IAC5D,CAAC;CACF;AAlCD,sCAkCC"}
+{"version":3,"file":"LifecycleDate.js","sourceRoot":"","sources":["../../../src/model/assets/LifecycleDate.ts"],"names":[],"mappings":";;;AAAA,4CAA0C;AAE1C,MAAa,aAAa;IAExB,gBAAgB,CAAS;IACzB,gBAAgB,CAAS;IACzB,YAAY,CAAS;IACrB,YAAY,CAAS;IACrB,WAAW,CAAS;IACpB,WAAW,CAAS;IAEpB;IACA,CAAC;IAEM,sBAAsB,CAAC,KAAU;QACtC,IAAI,CAAC,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;QAC5D,IAAI,CAAC,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAC9D,CAAC;IAEH;;;;;;SAMK;IAEH,mBAAmB,CAAC,IAAY;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,yCAAyC,IAAI,KAAK,CAAC;IAC5D,CAAC;IAED,mBAAmB,CAAC,IAAY;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,yCAAyC,IAAI,KAAK,CAAC;IAC5D,CAAC;CACF;AAlCD,sCAkCC"}

package/dist/model/assets/Structure.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Structure = void 0;
 const AssetContainer_1 = require("./AssetContainer");
 class Structure extends AssetContainer_1.AssetContainer {
+    constructionKind;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }

package/dist/model/assets/Structure.js.map

@@ -1 +1 @@
-{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../../src/model/assets/Structure.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAGlD,MAAa,SAAU,SAAQ,+BAAc;IAI3C,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;CAIF;AAVD,8BAUC"}
+{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../../src/model/assets/Structure.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAGlD,MAAa,SAAU,SAAQ,+BAAc;IAE3C,gBAAgB,CAAwB;IAExC,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;CAIF;AAVD,8BAUC"}

package/dist/model/common/ActivityRecord.d.ts

@@ -1,16 +1,17 @@
-import { IdentifiedObject, Model } from '../..';
+import { IdentifiedObject, ModelContainer } from '../..';
 import { Status } from './Status';
 import { Asset } from '../assets/Asset';
-export declare class ActivityRecord extends IdentifiedObject {
+import { IActivityRecord } from '../../interfaces/model/assets/IActivityRecord';
+export declare class ActivityRecord extends IdentifiedObject implements IActivityRecord {
     reason: string;
     severity: string;
     status: Status;
     type: string;
-    assets: Map<string, IdentifiedObject>;
+    assets: Map<string, Asset>;
     assetUUIDs: string[];
     protected constructor(mrid?: string, name?: string, shortName?: string, description?: string);
-    protected resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
     toJSONAttributes(): void;
     toJSONAssociations(): void;
     addAsset(asset: Asset): string;

package/dist/model/common/ActivityRecord.js

@@ -4,9 +4,14 @@ exports.ActivityRecord = void 0;
 const __1 = require("../..");
 const utils_1 = require("../../util/utils");
 class ActivityRecord extends __1.IdentifiedObject {
+    reason;
+    severity;
+    status;
+    type;
+    assets = new Map();
+    assetUUIDs; // für Parser
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
-        this.assets = new Map();
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
@@ -16,6 +21,7 @@ class ActivityRecord extends __1.IdentifiedObject {
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
+        /** assets parsen */
         for (const assetUUID of this.assetUUIDs) {
             const asset = cimModel.getObject(assetUUID);
             if (asset) {
@@ -37,6 +43,8 @@ class ActivityRecord extends __1.IdentifiedObject {
         if (!this.assets.has(asset.mrid)) {
             this.assets.set(asset.mrid, asset);
             return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'ActivityRecord', 'Assets', asset.mrid);
+            // return this.createSPARQLStatement('cim', 'ActivityRecord', 'Assets', asset.mrid, false);
+            // return `<${this.baseIRI}${this.mrid}> cim:ActivityRecord.Assets <${this.baseIRI}${assets.mrid}> . `;
         }
         return '';
     }
@@ -44,6 +52,7 @@ class ActivityRecord extends __1.IdentifiedObject {
         if (this.assets.has(delAsset.mrid)) {
             this.assets.delete(delAsset.mrid);
             return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'ActivityRecord', 'Assets', delAsset.mrid);
+            // return this.createSPARQLStatement('cim', 'ActivityRecord', 'Assets', delAsset.mrid, false);
         }
         return '';
     }

package/dist/model/common/ActivityRecord.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActivityRecord.js","sourceRoot":"","sources":["../../../src/model/common/ActivityRecord.ts"],"names":[],"mappings":";;;AAAA,6BAA8C;AAG9C,4CAAiE;AAEjE,MAAa,cAAe,SAAQ,oBAAgB;IAUhD,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACxF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAJ9C,WAAM,GAAkC,IAAI,GAAG,EAAE,CAAC;IAKlD,CAAC;IAGS,2BAA2B,CAAC,KAAU;QAC5C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,UAAU,GAAI,IAAA,6BAAqB,EAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;IACjF,CAAC;IACM,yBAAyB,CAAC,QAAe;QAC5C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAE1C,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAU,CAAC;YACrD,IAAI,KAAK,EAAE;gBACP,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;aACjC;SACJ;QACD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACzB,CAAC;IAGM,gBAAgB;QACnB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IAClC,CAAC;IACM,kBAAkB;QACrB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC/B,CAAC;IAED,QAAQ,CAAC,KAAY;QACjB,IAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;SAGlH;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IACD,WAAW,CAAC,QAAe;QACvB,IAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;SAErH;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CA0BJ;AAtFD,wCAsFC"}
+{"version":3,"file":"ActivityRecord.js","sourceRoot":"","sources":["../../../src/model/common/ActivityRecord.ts"],"names":[],"mappings":";;;AAAA,6BAAuD;AAGvD,4CAAiE;AAGjE,MAAa,cAAe,SAAQ,oBAAgB;IAEhD,MAAM,CAAS;IACf,QAAQ,CAAS;IACjB,MAAM,CAAS;IACf,IAAI,CAAS;IAEb,MAAM,GAAuB,IAAI,GAAG,EAAE,CAAC;IACvC,UAAU,CAAW,CAAC,aAAa;IAEnC,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACxF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAGM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,UAAU,GAAI,IAAA,6BAAqB,EAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;IACjF,CAAC;IACM,yBAAyB,CAAC,QAAwB;QACrD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,oBAAoB;QACpB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAU,CAAC;YACrD,IAAI,KAAK,EAAE;gBACP,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;aACjC;SACJ;QACD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,gBAAgB;QACnB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IAClC,CAAC;IACM,kBAAkB;QACrB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC/B,CAAC;IAED,QAAQ,CAAC,KAAY;QACjB,IAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/G,2FAA2F;YAC3F,uGAAuG;SAC1G;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IACD,WAAW,CAAC,QAAe;QACvB,IAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClH,8FAA8F;SACjG;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;AA5DD,wCA4DC"}

package/dist/model/common/CoordinateSystem.d.ts

@@ -1,17 +1,19 @@
-import { IdentifiedObject, Location, Model } from '../..';
+import { IdentifiedObject, Location, ModelContainer } from '../..';
 import XMLWriter from 'xml-writer';
 export declare class CoordinateSystem extends IdentifiedObject {
     crsUrn: string;
     locations: Location[];
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     addLocation(loaction: Location): void;
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
+    /** ------------------ Fuseki Schnittstelle ------------------*/
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
-    protected resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
     setCrsUrn(crsUrn: string): string;
     createNewStatementSPARQL(): string;
 }

package/dist/model/common/CoordinateSystem.js

@@ -6,9 +6,10 @@ const utils_1 = require("../../util/utils");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 const xml_serializer_2 = require("../../util/xml/xml.serializer");
 class CoordinateSystem extends __1.IdentifiedObject {
+    crsUrn;
+    locations = [];
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
-        this.locations = [];
         this.baseIRI = baseIRI;
     }
     addLocation(loaction) {
@@ -19,6 +20,7 @@ class CoordinateSystem extends __1.IdentifiedObject {
             console.log('CoordinateSystem.Location ' + this.mrid + ' existiert bereits.');
         }
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === __1.RDF_XML.PROFILE_GL) {
             const suffixID = this.getSuffixID(profile);
@@ -39,6 +41,21 @@ class CoordinateSystem extends __1.IdentifiedObject {
             xmlWriter.writeComment(`${__1.RDF_XML.CIM_NS_PREFIX}:CoordinateSystem.crsUrn is not defined`);
         }
     }
+    /** ------------------ Fuseki Schnittstelle ------------------*/
+    static sparqlQuery = `
+                PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+                PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+
+                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
+                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
+                        ?crsUrn       
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?MRID rdf:type cim:CoordinateSystem .
+                        OPTIONAL {?MRID cim:CoordinateSystem.crsUrn ?crsUrn .}
+                    }
+                }
+                `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return CoordinateSystem.sparqlQuery.replace('<http://default/>', graphURI);
@@ -46,8 +63,7 @@ class CoordinateSystem extends __1.IdentifiedObject {
         return CoordinateSystem.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b;
-        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
+        data?.results?.bindings?.forEach((value) => {
             const coordinateSystem = new CoordinateSystem();
             coordinateSystem.resolveAttributesFusekiJSON(value);
             cimModel.addCoordinateSystem(coordinateSystem);
@@ -73,18 +89,4 @@ class CoordinateSystem extends __1.IdentifiedObject {
     }
 }
 exports.CoordinateSystem = CoordinateSystem;
-CoordinateSystem.sparqlQuery = `
-                PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-                PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-
-                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
-                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
-                        ?crsUrn       
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type cim:CoordinateSystem .
-                        OPTIONAL {?MRID cim:CoordinateSystem.crsUrn ?crsUrn .}
-                    }
-                }
-                `;
 //# sourceMappingURL=CoordinateSystem.js.map

package/dist/model/common/CoordinateSystem.js.map

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

package/dist/model/common/Document.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Document = void 0;
 const IdentifiedObject_1 = require("../core/IdentifiedObject");
 class Document extends IdentifiedObject_1.IdentifiedObject {
+    type;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }

package/dist/model/common/Document.js.map

@@ -1 +1 @@
-{"version":3,"file":"Document.js","sourceRoot":"","sources":["../../../src/model/common/Document.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAG1D,MAAa,QAAS,SAAQ,mCAAgB;IAI5C,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;CAEF;AARD,4BAQC"}
+{"version":3,"file":"Document.js","sourceRoot":"","sources":["../../../src/model/common/Document.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAG1D,MAAa,QAAS,SAAQ,mCAAgB;IAE5C,IAAI,CAAS;IAEb,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;CAEF;AARD,4BAQC"}

package/dist/model/common/Location.d.ts

@@ -1,8 +1,9 @@
-import { Asset, IdentifiedObject, ISchemaSettings, Model, PositionPoint, PowerSystemResource } from '../..';
+import { Asset, IdentifiedObject, ISchemaSettings, ModelContainer, PositionPoint, PowerSystemResource } from '../..';
 import { CoordinateSystem } from './CoordinateSystem';
 import XMLWriter from 'xml-writer';
 import { ILocation } from '../../interfaces/model/common/ILocation';
 export declare class Location extends IdentifiedObject implements ILocation {
+    /** In CGMES ist die Assoziation umgedreht!*/
     powerSystemResources: Map<string, PowerSystemResource>;
     powerSystemResourcesUUIDs: string[];
     assets: Map<string, Asset>;
@@ -12,17 +13,26 @@ export declare class Location extends IdentifiedObject implements ILocation {
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     addPositionPoint(positionPoint: PositionPoint): void;
     getGeoJSON(profile: string, schemaSettings: ISchemaSettings): any;
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
+    /** ------------------ CIM RDF/XML Parser ------------------*/
+    /** ------------------ insight JSON Serialisierung ------------------*/
     toJSON(): any;
     toJSONAttributes(): void;
     toJSONAssociations(): void;
+    /** ------------------ Fuseki Schnittstelle ------------------*/
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
-    protected resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    /** ------------------ Fuseki Parser ------------------------*/
+    /** Parst und initialisiert das Objekt aus Fuseki JSON Daten  */
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    /** Parst die Attributs- und Assoziationsinformationen aus Fuseki JSON Daten */
+    resolveAttributesFusekiJSON(value: any): void;
+    /** Initialisiert Assoziationen aus geparsten Daten
+     *  Fuseki und XML Daten */
+    resolveParsedAssociations(cimModel: ModelContainer): void;
     setCoordinateSystem(cs: CoordinateSystem): string;
     addPowerSystemResource(psr: PowerSystemResource): string;
     sortPoints(): void;

package/dist/model/common/Location.js

@@ -5,11 +5,15 @@ const __1 = require("../..");
 const utils_1 = require("../../util/utils");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class Location extends __1.IdentifiedObject {
+    /** In CGMES ist die Assoziation umgedreht!*/
+    powerSystemResources = new Map();
+    powerSystemResourcesUUIDs;
+    assets = new Map();
+    coordinateSystem;
+    coordinateSystemUUID;
+    positionPoints = [];
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
-        this.powerSystemResources = new Map();
-        this.assets = new Map();
-        this.positionPoints = [];
         this.baseIRI = baseIRI;
     }
     addPositionPoint(positionPoint) {
@@ -17,11 +21,12 @@ class Location extends __1.IdentifiedObject {
             this.positionPoints.push(positionPoint);
         }
         else {
-            console.log('Location/PositionPoint ' + this.mrid + ' existiert bereits.');
+            // console.log(`Location ${this.mrid} PositionPoint ${positionPoint?.mrid} existiert bereits.`);
         }
     }
     getGeoJSON(profile, schemaSettings) {
         if (this.positionPoints.length) {
+            /** Initial wird nur ein Element berücksichtigt */
             for (const value of this.powerSystemResources.values()) {
                 return value.toMapGeoJSON();
             }
@@ -30,6 +35,7 @@ class Location extends __1.IdentifiedObject {
             console.log(`Location ${this.mrid} has ${this.powerSystemResources.size} psr instances.`);
         }
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === __1.RDF_XML.PROFILE_GL) {
             const suffixID = this.getSuffixID(profile);
@@ -39,6 +45,7 @@ class Location extends __1.IdentifiedObject {
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
+            // PositionPoints
             for (const positionPoint of this.positionPoints) {
                 positionPoint.toCIMXML(xmlWriter, profile);
             }
@@ -49,6 +56,7 @@ class Location extends __1.IdentifiedObject {
     }
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
+        /*<cim:VoltageLevel.Substation rdf:resource="#_1be806f9-0316-4bb8-b350-f54a292353f1"/>*/
         if (profile === __1.RDF_XML.PROFILE_GL) {
             if (this.coordinateSystem) {
                 xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'Location.CoordinateSystem', __1.RDF_XML.CIM_NS_16);
@@ -58,6 +66,7 @@ class Location extends __1.IdentifiedObject {
             else {
                 xmlWriter.writeComment('CoordinateSystem is not defined');
             }
+            /** ! CIM !== CGMES => Kardinalität (0..* vs. 1) und Leserichtung? (PowerSystemResource.Location vs. Location.PowerSystemResources) */
             if (this.powerSystemResources.size > 0) {
                 for (const value of this.powerSystemResources.values()) {
                     xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'Location.PowerSystemResources', __1.RDF_XML.CIM_NS_16);
@@ -70,6 +79,34 @@ class Location extends __1.IdentifiedObject {
             }
         }
     }
+    /** ------------------ CIM RDF/XML Parser ------------------*/
+    /*  public static resolveClassRDFXML(uuid: string, cimModel: Model): IdentifiedObject | undefined {
+        const newClass = new Terminal(uuid);
+        cimModel.addTerminal(newClass);
+        return newClass;
+      }
+  
+      public resolveAttributesRDFXML(className: string, attrName: string, value: string){
+        if(className === 'Terminal') {
+  
+        } else {
+          super.resolveAttributesRDFXML(className, attrName, value);
+        }
+      }
+      public resolveAssociationRDFXML(className: string, resourceName: string, resourceUUID: string){
+        if(className === 'Terminal') {
+          if(resourceName === 'ConductingEquipment') {
+            this.conductingEquipmentUUID = resourceUUID;
+          } else if(resourceName === 'ConnectivityNode') {
+            this.connectivityNodeUUID = resourceUUID;
+          } else if(resourceName === 'phases') {
+            this.phases = PhaseCode[resourceUUID];
+          }
+        } else {
+          super.resolveAssociationRDFXML(className,  resourceName, resourceUUID);
+        }
+      }*/
+    /** ------------------ insight JSON Serialisierung ------------------*/
     toJSON() {
         super.toJSON();
         this.toJSONAttributes();
@@ -84,26 +121,56 @@ class Location extends __1.IdentifiedObject {
         this.json['coordinateSystem'] = this.coordinateSystemUUID;
         this.json['powerSystemResources'] = [...this.powerSystemResources.keys()];
     }
+    /** ------------------ Fuseki Schnittstelle ------------------*/
+    static sparqlQuery = `
+                PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+                PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
+                PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+                PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+                PREFIX amp:	 		            <http://amprion.net/Extensions#> 
+                PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+                PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+
+                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
+                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
+                        (strafter(strafter(str(?csUUIDs), '#'), '_') AS ?coordinateSystemUUID) 
+                        (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourcesUUIDs)
+                                
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?MRID rdf:type cim:Location .
+                        OPTIONAL {?MRID cim:Location.CoordinateSystem ?csUUIDs .}
+                        OPTIONAL {?MRID cim:Location.PowerSystemResources ?psrUUIDs .}
+                    }
+                }
+                GROUP BY ?MRID ?baseIRI ?csUUIDs
+                `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return Location.sparqlQuery.replace('<http://default/>', graphURI);
         }
         return Location.sparqlQuery;
     }
+    /** ------------------ Fuseki Parser ------------------------*/
+    /** Parst und initialisiert das Objekt aus Fuseki JSON Daten  */
     static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b;
-        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
+        data?.results?.bindings?.forEach((value) => {
             const location = new Location();
             location.resolveAttributesFusekiJSON(value);
             cimModel.addLocation(location);
         });
     }
+    /** Parst die Attributs- und Assoziationsinformationen aus Fuseki JSON Daten */
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
         this.coordinateSystemUUID = (0, utils_1.getValue)(value, 'coordinateSystemUUID');
+        // Array powerSystemResources
         this.powerSystemResourcesUUIDs = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'powerSystemResourcesUUIDs'), ',');
     }
+    /** Initialisiert Assoziationen aus geparsten Daten
+     *  Fuseki und XML Daten */
     resolveParsedAssociations(cimModel) {
+        //CoordinateSystem
         this.coordinateSystem = cimModel.getCoordinateSystem(this.coordinateSystemUUID);
         if (this.coordinateSystem) {
             this.coordinateSystem.addLocation(this);
@@ -111,6 +178,7 @@ class Location extends __1.IdentifiedObject {
         else {
             console.log(this.constructor.name + ' ' + this.mrid + ' hat keine CoordinateSystem Instanz ' + this.coordinateSystemUUID);
         }
+        //PowerSystemResources
         for (const psrUUID of this.powerSystemResourcesUUIDs) {
             if (cimModel.objects.has(psrUUID)) {
                 const psr = cimModel.getObject(psrUUID);
@@ -148,31 +216,8 @@ class Location extends __1.IdentifiedObject {
         this.positionPoints = sortedArray;
     }
     addAsset(asset) {
-        this.assets.set(asset === null || asset === void 0 ? void 0 : asset.mrid, asset);
+        this.assets.set(asset?.mrid, asset);
     }
 }
 exports.Location = Location;
-Location.sparqlQuery = `
-                PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-                PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
-                PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
-                PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-                PREFIX amp:	 		            <http://amprion.net/Extensions#> 
-                PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-                PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-
-                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
-                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
-                        (strafter(strafter(str(?csUUIDs), '#'), '_') AS ?coordinateSystemUUID) 
-                        (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourcesUUIDs)
-                                
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type cim:Location .
-                        OPTIONAL {?MRID cim:Location.CoordinateSystem ?csUUIDs .}
-                        OPTIONAL {?MRID cim:Location.PowerSystemResources ?psrUUIDs .}
-                    }
-                }
-                GROUP BY ?MRID ?baseIRI ?csUUIDs
-                `;
 //# sourceMappingURL=Location.js.map

package/dist/model/common/Location.js.map

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

package/dist/model/common/Organisation.d.ts

@@ -1,11 +1,11 @@
 import { IdentifiedObject } from '../core/IdentifiedObject';
 import { OrganisationRole } from './OrganisationRole';
-import { Model } from '../model/Model';
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 export declare class Organisation extends IdentifiedObject {
     roles: Map<string, OrganisationRole>;
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     addRole(role: OrganisationRole): void;
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
 }

package/dist/model/common/Organisation.js

@@ -3,37 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Organisation = void 0;
 const IdentifiedObject_1 = require("../core/IdentifiedObject");
 class Organisation extends IdentifiedObject_1.IdentifiedObject {
+    roles = new Map();
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description, baseIRI);
-        this.roles = new Map();
     }
     addRole(role) {
-        if (this.roles.has(role === null || role === void 0 ? void 0 : role.mrid)) {
-            console.log(`OrganisationRole ${role === null || role === void 0 ? void 0 : role.mrid} für ${this.name} existiert bereits.`);
+        if (this.roles.has(role?.mrid)) {
+            console.log(`OrganisationRole ${role?.mrid} für ${this.name} existiert bereits.`);
         }
         else {
             this.roles.set(role.mrid, role);
         }
     }
-    static getQuerySPARQL(graphURI) {
-        if (graphURI.length > 0) {
-            return Organisation.sparqlQuery.replace("<http://default/>", graphURI);
-        }
-        else {
-            return Organisation.sparqlQuery;
-        }
-    }
-    static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b;
-        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
-            const orga = new Organisation();
-            orga.resolveAttributesFusekiJSON(value);
-            cimModel.addOrganisation(orga);
-        });
-    }
-}
-exports.Organisation = Organisation;
-Organisation.sparqlQuery = `
+    static sparqlQuery = `
         PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
         PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
         PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
@@ -55,4 +37,21 @@ Organisation.sparqlQuery = `
             }
         }
     `;
+    static getQuerySPARQL(graphURI) {
+        if (graphURI.length > 0) {
+            return Organisation.sparqlQuery.replace("<http://default/>", graphURI);
+        }
+        else {
+            return Organisation.sparqlQuery;
+        }
+    }
+    static resolveClassFusekiJSON(data, cimModel) {
+        data?.results?.bindings?.forEach((value) => {
+            const orga = new Organisation();
+            orga.resolveAttributesFusekiJSON(value);
+            cimModel.addOrganisation(orga);
+        });
+    }
+}
+exports.Organisation = Organisation;
 //# sourceMappingURL=Organisation.js.map

package/dist/model/common/Organisation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Organisation.js","sourceRoot":"","sources":["../../../src/model/common/Organisation.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAI5D,MAAa,YAAa,SAAQ,mCAAgB;IAIhD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAHrD,UAAK,GAAkC,IAAI,GAAG,EAAE,CAAC;IAIjD,CAAC;IAEM,OAAO,CAAC,IAAsB;QACnC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,QAAQ,IAAI,CAAC,IAAI,qBAAqB,CAAC,CAAC;SACnF;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACjC;IACH,CAAC;IAyBM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACxE;aAAM;YACL,OAAO,YAAY,CAAC,WAAW,CAAC;SACjC;IACH,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC7D,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACxC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;;AArDH,oCAsDC;AAtCe,wBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;KAqBjC,CAAA"}
+{"version":3,"file":"Organisation.js","sourceRoot":"","sources":["../../../src/model/common/Organisation.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAI5D,MAAa,YAAa,SAAQ,mCAAgB;IAEhD,KAAK,GAAkC,IAAI,GAAG,EAAE,CAAC;IAEjD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,OAAO,CAAC,IAAsB;QACnC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,IAAI,QAAQ,IAAI,CAAC,IAAI,qBAAqB,CAAC,CAAC;SACnF;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACjC;IACH,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;KAqBjC,CAAA;IAEI,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACxE;aAAM;YACL,OAAO,YAAY,CAAC,WAAW,CAAC;SACjC;IACH,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACxC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;;AArDH,oCAsDC"}

package/dist/model/common/OrganisationRole.d.ts

@@ -1,9 +1,9 @@
-import { IdentifiedObject, Model } from '../..';
+import { IdentifiedObject, ModelContainer } from '../..';
 import { Organisation } from './Organisation';
 export declare class OrganisationRole extends IdentifiedObject {
     organisation: Organisation;
     organisationUUID: string;
     protected constructor(mrid?: string, name?: string, shortName?: string, description?: string);
-    protected resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
 }