@enervance/insight-cim-model 0.0.77 → 0.0.79

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

@@ -1 +1 @@
-{"version":3,"file":"AssetUser.js","sourceRoot":"","sources":["../../../src/model/assets/AssetUser.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAIhE,MAAa,SAAU,SAAQ,6CAAqB;IAElD,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGD,aAAa;IACN,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;KAwBjC,CAAC;IAEJ,kBAAkB;IACX,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACrE;QACD,OAAO,SAAS,CAAC,WAAW,CAAC;IAC/B,CAAC;IAED,yBAAyB;IAClB,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,SAAS,EAAE,CAAC;YACjC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;;AAjDH,8BAoDC"}
+{"version":3,"file":"AssetUser.js","sourceRoot":"","sources":["../../../src/model/assets/AssetUser.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAIhE,MAAa,SAAU,SAAQ,6CAAqB;IAElD,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IA8BD,kBAAkB;IACX,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACrE;QACD,OAAO,SAAS,CAAC,WAAW,CAAC;IAC/B,CAAC;IAED,yBAAyB;IAClB,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACtE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,SAAS,EAAE,CAAC;YACjC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;;AAjDH,8BAoDC;AA7CC,aAAa;AACC,qBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;KAwBjC,CAAC"}

package/dist/model/assets/DeploymentDate.js

@@ -1,18 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeploymentDate = void 0;
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class DeploymentDate {
-    inServiceDate;
-    installedDate;
-    notYetInstalledDate;
-    outOfServiceDate;
-    removedDate;
     constructor() {
     }
     resolveClassFusekiJSON(value) {
-        this.inServiceDate = (0, utils_1.getValue)(value, 'inServiceDate');
-        this.installedDate = (0, utils_1.getValue)(value, 'installedDate');
+        this.inServiceDate = parser_utils_1.ParserUtils.getValue(value, 'inServiceDate');
+        this.installedDate = parser_utils_1.ParserUtils.getValue(value, 'installedDate');
     }
     getInServiceDate() {
         return this.inServiceDate ? this.inServiceDate : '';

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

@@ -1 +1 @@
-{"version":3,"file":"DeploymentDate.js","sourceRoot":"","sources":["../../../src/model/assets/DeploymentDate.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE5C,MAAa,cAAc;IAEvB,aAAa,CAAS;IACtB,aAAa,CAAS;IACtB,mBAAmB,CAAS;IAC5B,gBAAgB,CAAS;IACzB,WAAW,CAAS;IAEpB;IACA,CAAC;IAGM,sBAAsB,CAAC,KAAU;QACpC,IAAI,CAAC,aAAa,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAC1D,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IAED,gBAAgB,CAAC,IAAY;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,OAAO,uCAAuC,IAAI,KAAK,CAAC;IAC5D,CAAC;IACD,gBAAgB,CAAC,IAAY;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,OAAO,sCAAsC,IAAI,KAAK,CAAC;IAC3D,CAAC;CACJ;AAjCD,wCAiCC"}
+{"version":3,"file":"DeploymentDate.js","sourceRoot":"","sources":["../../../src/model/assets/DeploymentDate.ts"],"names":[],"mappings":";;;AAAA,4DAAwD;AAExD,MAAa,cAAc;IAQvB;IACA,CAAC;IAGM,sBAAsB,CAAC,KAAU;QACpC,IAAI,CAAC,aAAa,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAClE,IAAI,CAAC,aAAa,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IACtE,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IAED,gBAAgB,CAAC,IAAY;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,OAAO,uCAAuC,IAAI,KAAK,CAAC;IAC5D,CAAC;IACD,gBAAgB,CAAC,IAAY;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,OAAO,sCAAsC,IAAI,KAAK,CAAC;IAC3D,CAAC;CACJ;AAjCD,wCAiCC"}

package/dist/model/assets/Facility.d.ts

@@ -1,6 +1,6 @@
 import { AssetContainer } from './AssetContainer.js';
-import { ModelContainer } from '../../index.js';
 import { IFacility } from '../../interfaces/model/assets/IFacility.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class Facility extends AssetContainer implements IFacility {
     kind: string;
     constructor(mrid?: string, name?: string, shortName?: string, description?: string);

package/dist/model/assets/Facility.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Facility = void 0;
 const AssetContainer_1 = require("./AssetContainer.js");
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class Facility extends AssetContainer_1.AssetContainer {
-    kind;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
         this.powerSystemResources = new Map();
@@ -20,7 +19,8 @@ class Facility extends AssetContainer_1.AssetContainer {
         return Facility.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        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 newClass = new Facility();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addFacility(newClass);
@@ -28,7 +28,7 @@ class Facility extends AssetContainer_1.AssetContainer {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.kind = (0, utils_1.getValue)(value, 'kind');
+        this.kind = parser_utils_1.ParserUtils.getValue(value, 'kind');
     }
     toJSON() {
         super.toJSON();
@@ -43,7 +43,26 @@ class Facility extends AssetContainer_1.AssetContainer {
     toJSONAssociations() {
         super.toJSONAssociations();
     }
-    static sparqlQuery = `
+    createNewStatementSPARQL() {
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:Facility ;
+                cim:IdentifiedObject.name "Facility" ;
+                cim:Asset.lifecycleDate 
+                [
+                    a   cim:LifecycleDate ;
+                    cim:LifecycleDate.manufacturedDate "" ;
+                    cim:LifecycleDate.purchaseDate "" 
+                ] .
+        `;
+    }
+    setKind(kind) {
+        this.kind = kind;
+        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'cim', 'Facility', 'kind', this.kind);
+    }
+}
+exports.Facility = Facility;
+Facility.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#>
@@ -71,23 +90,4 @@ class Facility extends AssetContainer_1.AssetContainer {
             }
         }
         GROUP BY ?fUUID ?baseIRI ?name ?type ?kind ?cnUUID ?manufacturedDate `;
-    createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:Facility ;
-                cim:IdentifiedObject.name "Facility" ;
-                cim:Asset.lifecycleDate 
-                [
-                    a   cim:LifecycleDate ;
-                    cim:LifecycleDate.manufacturedDate "" ;
-                    cim:LifecycleDate.purchaseDate "" 
-                ] .
-        `;
-    }
-    setKind(kind) {
-        this.kind = kind;
-        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'cim', 'Facility', 'kind', this.kind);
-    }
-}
-exports.Facility = Facility;
 //# sourceMappingURL=Facility.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Facility.js","sourceRoot":"","sources":["../../../src/model/assets/Facility.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAEhD,4CAA0C;AAG1C,MAAa,QAAS,SAAQ,+BAAc;IAExC,IAAI,CAAS;IAEb,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC9E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,oBAAoB,GAAG,IAAI,GAAG,EAAE,CAAC;QAEtC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,wCAAwC;QACtF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACtE;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;IAChC,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,QAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAGM,MAAM;QACT,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,gBAAgB;QACnB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IAClC,CAAC;IACM,kBAAkB;QACrB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;8EA2BsC,CAAC;IAGpE,wBAAwB;QAE3B,OAAO;eACA,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;;;;;SAS9B,CAAC;IACN,CAAC;IAGD,OAAO,CAAC,IAAY;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACvG,CAAC;;AAnGL,4BAoGC"}
+{"version":3,"file":"Facility.js","sourceRoot":"","sources":["../../../src/model/assets/Facility.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAIlD,4DAAwD;AAExD,MAAa,QAAS,SAAQ,+BAAc;IAI1C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,oBAAoB,GAAG,IAAI,GAAG,EAAE,CAAC;QAEtC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,wCAAwC;QACtF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACpE;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;IAC9B,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACtE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAGM,MAAM;QACX,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IAChC,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC7B,CAAC;IAgCM,wBAAwB;QAE7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;;;;;SAS9B,CAAC;IACR,CAAC;IAGD,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACrG,CAAC;;AApGH,4BAqGC;AAlDe,oBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;8EA2BwC,CAAC"}

package/dist/model/assets/HealthScore.d.ts

@@ -1,5 +1,5 @@
 import { AggregateScore } from './AggregateScore.js';
-import { ModelContainer } from '../../index.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class HealthScore extends AggregateScore {
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     static sparqlQuery: string;

package/dist/model/assets/HealthScore.js

@@ -7,27 +7,6 @@ class HealthScore extends AggregateScore_1.AggregateScore {
         super(mrid, name, shortName, description);
         this.baseIRI = baseIRI;
     }
-    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 apf:         <http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (STRAFTER(str(?hsUUID), '#_') AS ?uuid)  
-        (CONCAT(STRBEFORE(str(?hsUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?value
-         (strafter(strafter(str(?aUUID), '#'), '_') AS ?assetUUID)
-        WHERE { 
-            GRAPH <http://default/>{
-                ?hsUUID rdf:type cim:HealthScore .
-                OPTIONAL { ?hsUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL { ?hsUUID cim:AnalyticScore.value ?value .}
-                OPTIONAL { ?hsUUID cim:AnalyticScore.Asset ?aUUID .}
-            }
-        }
-    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return HealthScore.sparqlQuery.replace('<http://default/>', graphURI);
@@ -35,7 +14,8 @@ class HealthScore extends AggregateScore_1.AggregateScore {
         return HealthScore.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        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 newClass = new HealthScore();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addAnalyticScore(newClass);
@@ -52,4 +32,25 @@ class HealthScore extends AggregateScore_1.AggregateScore {
     }
 }
 exports.HealthScore = HealthScore;
+HealthScore.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 apf:         <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (STRAFTER(str(?hsUUID), '#_') AS ?uuid)  
+        (CONCAT(STRBEFORE(str(?hsUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?value
+         (strafter(strafter(str(?aUUID), '#'), '_') AS ?assetUUID)
+        WHERE { 
+            GRAPH <http://default/>{
+                ?hsUUID rdf:type cim:HealthScore .
+                OPTIONAL { ?hsUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL { ?hsUUID cim:AnalyticScore.value ?value .}
+                OPTIONAL { ?hsUUID cim:AnalyticScore.Asset ?aUUID .}
+            }
+        }
+    `;
 //# sourceMappingURL=HealthScore.js.map

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;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"}
+{"version":3,"file":"HealthScore.js","sourceRoot":"","sources":["../../../src/model/assets/HealthScore.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAIlD,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,QAAwB;;QACpE,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"}

package/dist/model/assets/LifecycleDate.js

@@ -1,19 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LifecycleDate = void 0;
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 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');
+        this.manufacturedDate = parser_utils_1.ParserUtils.getValue(value, 'manufacturedDate');
+        this.installationDate = parser_utils_1.ParserUtils.getValue(value, 'installationDate');
     }
     /*  setManufacturedDate(manufacturedDate: string): string {
         this.manufacturedDate = manufacturedDate;

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;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"}
+{"version":3,"file":"LifecycleDate.js","sourceRoot":"","sources":["../../../src/model/assets/LifecycleDate.ts"],"names":[],"mappings":";;;AAAA,4DAAwD;AAExD,MAAa,aAAa;IASxB;IACA,CAAC;IAEM,sBAAsB,CAAC,KAAU;QACtC,IAAI,CAAC,gBAAgB,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;QACxE,IAAI,CAAC,gBAAgB,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAC1E,CAAC;IAED;;;;;;SAMK;IAEL,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,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Structure = void 0;
 const AssetContainer_1 = require("./AssetContainer.js");
 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;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"}
+{"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"}

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

@@ -1,7 +1,8 @@
-import { IdentifiedObject, ModelContainer } from '../../index.js';
 import { Status } from './Status.js';
 import { Asset } from '../assets/Asset.js';
 import { IActivityRecord } from '../../interfaces/model/assets/IActivityRecord.js';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class ActivityRecord extends IdentifiedObject implements IActivityRecord {
     reason: string;
     severity: string;

package/dist/model/common/ActivityRecord.js

@@ -1,23 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActivityRecord = void 0;
-const __1 = require("../../index.js");
-const utils_1 = require("../../util/utils.js");
-class ActivityRecord extends __1.IdentifiedObject {
-    reason;
-    severity;
-    status;
-    type;
-    assets = new Map();
-    assetUUIDs; // für Parser
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+class ActivityRecord extends IdentifiedObject_1.IdentifiedObject {
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
+        this.assets = new Map();
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.severity = (0, utils_1.getValue)(value, 'severity');
-        this.type = (0, utils_1.getValue)(value, 'type');
-        this.assetUUIDs = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'assetUUIDs'), ',');
+        this.severity = parser_utils_1.ParserUtils.getValue(value, 'severity');
+        this.type = parser_utils_1.ParserUtils.getValue(value, 'type');
+        this.assetUUIDs = parser_utils_1.ParserUtils.parseCsvLineIntoArray(parser_utils_1.ParserUtils.getValue(value, 'assetUUIDs'), ',');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"ActivityRecord.js","sourceRoot":"","sources":["../../../src/model/common/ActivityRecord.ts"],"names":[],"mappings":";;;AAKA,4DAAwD;AACxD,+DAA4D;AAG5D,MAAa,cAAe,SAAQ,mCAAgB;IAUlD,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAJ5C,WAAM,GAAuB,IAAI,GAAG,EAAE,CAAC;IAKvC,CAAC;IAGM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,GAAG,0BAAW,CAAC,qBAAqB,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;IACtG,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,oBAAoB;QACpB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAU,CAAC;YACrD,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;aAC/B;SACF;QACD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAEM,gBAAgB;QACrB,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;IAChC,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC7B,CAAC;IAED,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAChC,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;SACxG;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,WAAW,CAAC,QAAe;QACzB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClC,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;SAC/F;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA/DD,wCA+DC"}

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

@@ -1,10 +1,12 @@
-import { IdentifiedObject, Location, ModelContainer } from '../../index.js';
 import XMLWriter from 'xml-writer';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
+import { Location } from '../common/Location.js';
 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;
+    addLocation(location: Location): void;
     /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;

package/dist/model/common/CoordinateSystem.js

@@ -1,20 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoordinateSystem = void 0;
-const __1 = require("../../index.js");
-const utils_1 = require("../../util/utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
-const xml_serializer_2 = require("../../util/xml/xml.serializer.js");
-class CoordinateSystem extends __1.IdentifiedObject {
-    crsUrn;
-    locations = [];
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+const rdf_xml_1 = require("../../constants/rdf-xml.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+class CoordinateSystem extends IdentifiedObject_1.IdentifiedObject {
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
+        this.locations = [];
         this.baseIRI = baseIRI;
     }
-    addLocation(loaction) {
-        if (this.locations.indexOf(loaction) === -1) {
-            this.locations.push(loaction);
+    addLocation(location) {
+        if (this.locations.indexOf(location) === -1) {
+            this.locations.push(location);
         }
         else {
             console.log('CoordinateSystem.Location ' + this.mrid + ' existiert bereits.');
@@ -22,11 +21,11 @@ class CoordinateSystem extends __1.IdentifiedObject {
     }
     /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
-        if (profile === __1.RDF_XML.PROFILE_GL) {
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_GL) {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
-            xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);
-            (0, xml_serializer_2.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
+            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -35,27 +34,12 @@ class CoordinateSystem extends __1.IdentifiedObject {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (this.crsUrn) {
-            (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:CoordinateSystem.crsUrn`, this.crsUrn);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:CoordinateSystem.crsUrn`, this.crsUrn);
         }
         else {
-            xmlWriter.writeComment(`${__1.RDF_XML.CIM_NS_PREFIX}:CoordinateSystem.crsUrn is not defined`);
+            xmlWriter.writeComment(`${rdf_xml_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);
@@ -63,7 +47,8 @@ class CoordinateSystem extends __1.IdentifiedObject {
         return CoordinateSystem.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        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 coordinateSystem = new CoordinateSystem();
             coordinateSystem.resolveAttributesFusekiJSON(value);
             cimModel.addCoordinateSystem(coordinateSystem);
@@ -71,7 +56,7 @@ class CoordinateSystem extends __1.IdentifiedObject {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.crsUrn = (0, utils_1.getValue)(value, 'crsUrn');
+        this.crsUrn = parser_utils_1.ParserUtils.getValue(value, 'crsUrn');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -89,4 +74,19 @@ class CoordinateSystem extends __1.IdentifiedObject {
     }
 }
 exports.CoordinateSystem = CoordinateSystem;
+/** ------------------ Fuseki Schnittstelle ------------------*/
+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,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Document = void 0;
 const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
 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;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"}
+{"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"}

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

@@ -1,7 +1,12 @@
-import { Asset, IdentifiedObject, ISchemaSettings, ModelContainer, PositionPoint, PowerSystemResource } from '../../index.js';
 import { CoordinateSystem } from './CoordinateSystem.js';
 import XMLWriter from 'xml-writer';
 import { ILocation } from '../../interfaces/model/common/ILocation.js';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { PowerSystemResource } from '../core/PowerSystemResource.js';
+import { Asset } from '../assets/Asset.js';
+import { PositionPoint } from './PositionPoint.js';
+import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class Location extends IdentifiedObject implements ILocation {
     /** In CGMES ist die Assoziation umgedreht!*/
     powerSystemResources: Map<string, PowerSystemResource>;