@enervance/insight-cim-model 0.0.77 → 0.0.79

package/dist/model/common/Location.js

@@ -1,19 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Location = void 0;
-const __1 = require("../../index.js");
-const utils_1 = require("../../util/utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
-class Location extends __1.IdentifiedObject {
-    /** In CGMES ist die Assoziation umgedreht!*/
-    powerSystemResources = new Map();
-    powerSystemResourcesUUIDs;
-    assets = new Map();
-    coordinateSystem;
-    coordinateSystemUUID;
-    positionPoints = [];
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+const rdf_xml_1 = require("../../constants/rdf-xml.js");
+class Location extends IdentifiedObject_1.IdentifiedObject {
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
+        /** In CGMES ist die Assoziation umgedreht!*/
+        this.powerSystemResources = new Map();
+        this.assets = new Map();
+        this.positionPoints = [];
         this.baseIRI = baseIRI;
     }
     addPositionPoint(positionPoint) {
@@ -37,10 +35,10 @@ class Location 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);
+            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);
@@ -57,10 +55,10 @@ 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 (profile === rdf_xml_1.RDF_XML.PROFILE_GL) {
             if (this.coordinateSystem) {
-                xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'Location.CoordinateSystem', __1.RDF_XML.CIM_NS_16);
-                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.coordinateSystem.mrid}`);
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'Location.CoordinateSystem', rdf_xml_1.RDF_XML.CIM_NS_16);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.coordinateSystem.mrid}`);
                 xmlWriter.endElement();
             }
             else {
@@ -69,8 +67,8 @@ class Location extends __1.IdentifiedObject {
             /** ! 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);
-                    (0, xml_serializer_1.writeElementAttribute)(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${value.mrid}`);
+                    xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'Location.PowerSystemResources', rdf_xml_1.RDF_XML.CIM_NS_16);
+                    (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${value.mrid}`);
                     xmlWriter.endElement();
                 }
             }
@@ -121,30 +119,6 @@ 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);
@@ -154,7 +128,8 @@ class Location extends __1.IdentifiedObject {
     /** ------------------ Fuseki Parser ------------------------*/
     /** Parst und initialisiert das Objekt aus Fuseki JSON Daten  */
     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 location = new Location();
             location.resolveAttributesFusekiJSON(value);
             cimModel.addLocation(location);
@@ -163,9 +138,9 @@ class Location extends __1.IdentifiedObject {
     /** Parst die Attributs- und Assoziationsinformationen aus Fuseki JSON Daten */
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.coordinateSystemUUID = (0, utils_1.getValue)(value, 'coordinateSystemUUID');
+        this.coordinateSystemUUID = parser_utils_1.ParserUtils.getValue(value, 'coordinateSystemUUID');
         // Array powerSystemResources
-        this.powerSystemResourcesUUIDs = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'powerSystemResourcesUUIDs'), ',');
+        this.powerSystemResourcesUUIDs = parser_utils_1.ParserUtils.parseCsvLineIntoArray(parser_utils_1.ParserUtils.getValue(value, 'powerSystemResourcesUUIDs'), ',');
     }
     /** Initialisiert Assoziationen aus geparsten Daten
      *  Fuseki und XML Daten */
@@ -216,8 +191,32 @@ class Location extends __1.IdentifiedObject {
         this.positionPoints = sortedArray;
     }
     addAsset(asset) {
-        this.assets.set(asset?.mrid, asset);
+        this.assets.set(asset === null || asset === void 0 ? void 0 : asset.mrid, asset);
     }
 }
 exports.Location = Location;
+/** ------------------ Fuseki Schnittstelle ------------------*/
+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.js

@@ -3,19 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Organisation = void 0;
 const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
 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?.mrid)) {
-            console.log(`OrganisationRole ${role?.mrid} für ${this.name} existiert bereits.`);
+        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.`);
         }
         else {
             this.roles.set(role.mrid, role);
         }
     }
-    static sparqlQuery = `
+    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 = `
         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#> 
@@ -37,21 +55,4 @@ class Organisation extends IdentifiedObject_1.IdentifiedObject {
             }
         }
     `;
-    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;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"}
+{"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,QAAwB;;QACtE,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"}

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

@@ -1,5 +1,6 @@
-import { IdentifiedObject, ModelContainer } from '../../index.js';
 import { Organisation } from './Organisation.js';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class OrganisationRole extends IdentifiedObject {
     organisation: Organisation;
     organisationUUID: string;

package/dist/model/common/OrganisationRole.js

@@ -1,21 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrganisationRole = void 0;
-const __1 = require("../../index.js");
-const utils_1 = require("../../util/utils.js");
-class OrganisationRole extends __1.IdentifiedObject {
-    organisation;
-    organisationUUID;
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+class OrganisationRole extends IdentifiedObject_1.IdentifiedObject {
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.organisationUUID = (0, utils_1.getValue)(value, 'organisationUUID');
+        this.organisationUUID = parser_utils_1.ParserUtils.getValue(value, 'organisationUUID');
     }
     resolveParsedAssociations(cimModel) {
+        var _a;
         this.organisation = cimModel.getOrganisation(this.organisationUUID);
-        this.organisation?.addRole(this);
+        (_a = this.organisation) === null || _a === void 0 ? void 0 : _a.addRole(this);
     }
 }
 exports.OrganisationRole = OrganisationRole;

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

@@ -1 +1 @@
-{"version":3,"file":"OrganisationRole.js","sourceRoot":"","sources":["../../../src/model/common/OrganisationRole.ts"],"names":[],"mappings":";;;AAAA,6BAAmE;AAEnE,4CAA4C;AAE5C,MAAa,gBAAiB,SAAQ,oBAAgB;IAElD,YAAY,CAAe;IAC3B,gBAAgB,CAAS;IAEzB,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACxF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAChE,CAAC;IACM,yBAAyB,CAAC,QAAwB;QACrD,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACpE,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;CACJ;AAjBD,4CAiBC"}
+{"version":3,"file":"OrganisationRole.js","sourceRoot":"","sources":["../../../src/model/common/OrganisationRole.ts"],"names":[],"mappings":";;;AACA,4DAAwD;AACxD,+DAA4D;AAG5D,MAAa,gBAAiB,SAAQ,mCAAgB;IAKpD,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,gBAAgB,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAC1E,CAAC;IAEM,yBAAyB,CAAC,QAAwB;;QACvD,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACpE,MAAA,IAAI,CAAC,YAAY,0CAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;CACF;AAlBD,4CAkBC"}

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

@@ -1,6 +1,7 @@
-import { IdentifiedObject, ModelContainer } from '../../index.js';
 import XMLWriter from 'xml-writer';
 import { ILocation } from '../../interfaces/model/common/ILocation.js';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class PositionPoint extends IdentifiedObject {
     location: ILocation;
     locationUUID: string;

package/dist/model/common/PositionPoint.js

@@ -1,45 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PositionPoint = void 0;
-const __1 = require("../../index.js");
-const utils_1 = require("../../util/utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
-class PositionPoint extends __1.IdentifiedObject {
-    location;
-    locationUUID;
-    sequenceNumber;
-    xPosition;
-    yPosition;
-    zPosition;
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const rdf_xml_1 = require("../../constants/rdf-xml.js");
+class PositionPoint extends IdentifiedObject_1.IdentifiedObject {
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.baseIRI = baseIRI;
     }
-    /** ------------------ 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/CIM/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) 
-                        ?sequenceNumber ?xPosition ?yPosition
-                        (strafter(strafter(str(?locUUID), '#'), '_') AS ?locationUUID) 
-                                
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type cim:PositionPoint .
-                        OPTIONAL {?MRID cim:PositionPoint.sequenceNumber ?sequenceNumber .}
-                        OPTIONAL {?MRID cim:PositionPoint.xPosition ?xPosition .}
-                        OPTIONAL {?MRID cim:PositionPoint.yPosition ?yPosition .}
-                        OPTIONAL {?MRID cim:PositionPoint.Location ?locUUID .}
-                    }
-                }
-                `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return PositionPoint.sparqlQuery.replace('<http://default/>', graphURI);
@@ -47,7 +17,8 @@ class PositionPoint extends __1.IdentifiedObject {
         return PositionPoint.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 positionPoint = new PositionPoint();
             positionPoint.resolveAttributesFusekiJSON(value);
             cimModel.addLPositionPoint(positionPoint);
@@ -56,10 +27,10 @@ class PositionPoint extends __1.IdentifiedObject {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.locationUUID = (0, utils_1.getValue)(value, 'locationUUID');
-        this.sequenceNumber = +(0, utils_1.getValue)(value, 'sequenceNumber');
-        this.xPosition = (0, utils_1.getValue)(value, 'xPosition');
-        this.yPosition = (0, utils_1.getValue)(value, 'yPosition');
+        this.locationUUID = parser_utils_1.ParserUtils.getValue(value, 'locationUUID');
+        this.sequenceNumber = +parser_utils_1.ParserUtils.getValue(value, 'sequenceNumber');
+        this.xPosition = parser_utils_1.ParserUtils.getValue(value, 'xPosition');
+        this.yPosition = parser_utils_1.ParserUtils.getValue(value, 'yPosition');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -79,10 +50,10 @@ class PositionPoint 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);
+            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);
@@ -92,19 +63,19 @@ class PositionPoint extends __1.IdentifiedObject {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (this.sequenceNumber) {
-            (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:PositionPoint.sequenceNumber`, this.sequenceNumber);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:PositionPoint.sequenceNumber`, this.sequenceNumber);
         }
         else {
             xmlWriter.writeComment(`PositionPoint.sequenceNumber is not defined`);
         }
         if (this.xPosition) {
-            (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:PositionPoint.xPosition`, this.xPosition);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:PositionPoint.xPosition`, this.xPosition);
         }
         else {
             xmlWriter.writeComment(`PositionPoint.xPosition is not defined`);
         }
         if (this.yPosition) {
-            (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:PositionPoint.yPosition`, this.yPosition);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:PositionPoint.yPosition`, this.yPosition);
         }
         else {
             xmlWriter.writeComment(`PositionPoint.yPosition is not defined`);
@@ -112,10 +83,10 @@ class PositionPoint extends __1.IdentifiedObject {
     }
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
-        if (profile === __1.RDF_XML.PROFILE_GL) {
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_GL) {
             if (this.location) {
-                xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'PositionPoint.Location', __1.RDF_XML.CIM_NS_16);
-                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.location.mrid}`);
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'PositionPoint.Location', rdf_xml_1.RDF_XML.CIM_NS_16);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.location.mrid}`);
                 xmlWriter.endElement();
             }
             else {
@@ -146,4 +117,29 @@ class PositionPoint extends __1.IdentifiedObject {
     }
 }
 exports.PositionPoint = PositionPoint;
+/** ------------------ Fuseki Schnittstelle ------------------*/
+PositionPoint.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/CIM/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) 
+                        ?sequenceNumber ?xPosition ?yPosition
+                        (strafter(strafter(str(?locUUID), '#'), '_') AS ?locationUUID) 
+                                
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?MRID rdf:type cim:PositionPoint .
+                        OPTIONAL {?MRID cim:PositionPoint.sequenceNumber ?sequenceNumber .}
+                        OPTIONAL {?MRID cim:PositionPoint.xPosition ?xPosition .}
+                        OPTIONAL {?MRID cim:PositionPoint.yPosition ?yPosition .}
+                        OPTIONAL {?MRID cim:PositionPoint.Location ?locUUID .}
+                    }
+                }
+                `;
 //# sourceMappingURL=PositionPoint.js.map

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

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

package/dist/model/common/Status.js

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Status = void 0;
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class Status {
-    value;
-    reason;
-    remark;
-    dateTime;
     setStatus(value) {
         this.value = value;
         return ` [ 
@@ -15,7 +11,7 @@ class Status {
             ] `;
     }
     resolveClassFusekiJSON(value) {
-        this.value = (0, utils_1.getValue)(value, 'status');
+        this.value = parser_utils_1.ParserUtils.getValue(value, 'status');
     }
 }
 exports.Status = Status;

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

@@ -1 +1 @@
-{"version":3,"file":"Status.js","sourceRoot":"","sources":["../../../src/model/common/Status.ts"],"names":[],"mappings":";;;AAAA,4CAA0C;AAE1C,MAAa,MAAM;IAEjB,KAAK,CAAS;IACd,MAAM,CAAS;IACf,MAAM,CAAS;IACf,QAAQ,CAAS;IAEjB,SAAS,CAAC,KAAa;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO;;mCAEwB,IAAI,CAAC,KAAK;eAC9B,CAAC;IACd,CAAC;IAEM,sBAAsB,CAAC,KAAU;QACtC,IAAI,CAAC,KAAK,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;CACF;AAlBD,wBAkBC"}
+{"version":3,"file":"Status.js","sourceRoot":"","sources":["../../../src/model/common/Status.ts"],"names":[],"mappings":";;;AAAA,4DAAwD;AAExD,MAAa,MAAM;IAOjB,SAAS,CAAC,KAAa;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO;;mCAEwB,IAAI,CAAC,KAAK;eAC9B,CAAC;IACd,CAAC;IAEM,sBAAsB,CAAC,KAAU;QACtC,IAAI,CAAC,KAAK,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACrD,CAAC;CACF;AAlBD,wBAkBC"}

package/dist/model/core/ACDCTerminal.js

@@ -2,17 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ACDCTerminal = void 0;
 const datatype_converter_1 = require("../../util/datatype-converter.js");
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const IdentifiedObject_1 = require("./IdentifiedObject.js");
-const utils_2 = require("../../converter/integral7/utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 class ACDCTerminal extends IdentifiedObject_1.IdentifiedObject {
-    sequenceNumber;
-    connected;
     constructor(mrid, name, shortName, description, sequenceNumber) {
         super(mrid, name, shortName, description);
-        this.sequenceNumber = sequenceNumber ?? 0;
+        this.sequenceNumber = sequenceNumber !== null && sequenceNumber !== void 0 ? sequenceNumber : 0;
         this.prop2namespacePrefix.set('sequenceNumber', 'cim'); // zur Generierung der Insert-Statements
         this.prop2Class.set('sequenceNumber', 'ACDCTerminal');
         this.prop2Datatype.set('sequenceNumber', 'number');
@@ -33,8 +30,8 @@ class ACDCTerminal extends IdentifiedObject_1.IdentifiedObject {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.sequenceNumber = +(0, utils_1.getValue)(value, 'sequenceNumber');
-        this.connected = (0, datatype_converter_1.toBoolean)((0, utils_1.getValue)(value, 'connected'));
+        this.sequenceNumber = +parser_utils_1.ParserUtils.getValue(value, 'sequenceNumber');
+        this.connected = (0, datatype_converter_1.toBoolean)(parser_utils_1.ParserUtils.getValue(value, 'connected'));
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -54,7 +51,7 @@ class ACDCTerminal extends IdentifiedObject_1.IdentifiedObject {
     }
     validateMandatoryAttributesCGMES(defaultValuesConfig) {
         let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
-        if (!(0, utils_2.isBooleanI7)(this.connected)) {
+        if (!(0, parser_utils_1.isBooleanI7)(this.connected)) {
             this.connected = defaultValuesConfig.ACDCTerminal.connected;
             defaultValues += 'connected,';
         }

package/dist/model/core/ACDCTerminal.js.map

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