@enervance/insight-cim-model 0.0.62 → 0.0.63

package/dist/model/extensions/enervance/assets/EVWireObject.js

@@ -7,16 +7,27 @@ const EVWireInfo_1 = require("../assetinfo/EVWireInfo");
 const cim_asset_types_1 = require("../../../../constants/cim-asset-types");
 const EVImportanceScore_1 = require("./EVImportanceScore");
 const HealthScore_1 = require("../../../assets/HealthScore");
-const EVAnalytic_1 = require("./EVAnalytic");
+const WNZUWOImportanceScore_1 = require("../../neplan-westnetz/assets/WNZUWOImportanceScore");
+const WNZUWOPriority_1 = require("../../neplan-westnetz/assets/WNZUWOPriority");
+const AggregateScore_1 = require("../../../assets/AggregateScore");
+const WNZUWOHealthScore_1 = require("../../neplan-westnetz/assets/WNZUWOHealthScore");
+const parser_utils_1 = require("../../../../utils2/parser.utils");
 class EVWireObject extends AssetContainer_1.AssetContainer {
+    number;
+    length;
+    /** Anzahl der separaten Kabel- oder Freileitungen.
+     Z.B. 3x1x150 NA2XS2Y => 3 Kabel des Typs 1x150 NA2XS2Y. */
+    wireCount;
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.baseIRI = baseIRI;
     }
+    /** längenbezogene Ausfallwahrscheinlichkeit pro Jahr
+     * Nur EVWireObjects, da CN ein Sonderfall aufgrund con VoltageLevels ist.*/
     getFailureRate() {
-        var _a;
         let ausfallWahrschl = 0;
         if (this.assets.size) {
+            /** zusammengesetztes Asset => AssetContiner => aufsummieren */
             for (const asset of this.assets.values()) {
                 if (asset instanceof EVWireObject) {
                     ausfallWahrschl += asset.getFailureRate();
@@ -24,18 +35,23 @@ class EVWireObject extends AssetContainer_1.AssetContainer {
             }
         }
         else {
+            /** atomares Asset */
             if (this.assetInfo instanceof EVWireInfo_1.EVWireInfo) {
-                const failureProbability = (_a = this.assetInfo) === null || _a === void 0 ? void 0 : _a.failureProbability;
+                const failureProbability = this.assetInfo?.failureProbability;
                 ausfallWahrschl = failureProbability && this.length ? failureProbability * this.length : 0;
             }
         }
         return ausfallWahrschl;
     }
+    /**
+     * ZuWo Wihtigkeit und Zustand
+     * Die Zuwo-Daten der Strecken werden an die Stromkreisabschnitte propagiert.
+     * */
     getZuWoScore(type) {
         for (const asset of this.assets.values()) {
             if (asset instanceof EVWireObject) {
                 const subsegment = asset;
-                for (const analyticScore of subsegment.analyticScores.values()) {
+                for (const analyticScore of subsegment.analyticScore.values()) {
                     if (type === 'zustand' && analyticScore instanceof HealthScore_1.HealthScore && analyticScore.value) {
                         return analyticScore.value;
                     }
@@ -56,24 +72,36 @@ class EVWireObject extends AssetContainer_1.AssetContainer {
         }
     }
     toJSONAttributes() {
-        var _a;
         super.toJSONAttributes();
         this.json['number'] = this.number;
         this.json['length'] = this.length;
         this.json['wireCount'] = this.wireCount;
-        this.json['installYear'] = (_a = this.lifecycleDate) === null || _a === void 0 ? void 0 : _a.installationDate;
+        this.json['installYear'] = this.lifecycleDate?.installationDate;
         this.json['failureRate'] = this.getFailureRate();
-        for (const analyticScore of this.analyticScores.values()) {
-            if (analyticScore instanceof HealthScore_1.HealthScore) {
-                this.json['healthScore'] = analyticScore.value;
-            }
-            else if (analyticScore instanceof EVImportanceScore_1.EVImportanceScore) {
-                this.json['importanceScore'] = analyticScore.value;
-            }
-        }
-        for (const analyticScore of this.analytics.values()) {
-            if (analyticScore instanceof EVAnalytic_1.EVAnalytic) {
-                this.json['zuwoScore'] = analyticScore.value;
+        if (this.analyticScore?.size) {
+            for (const analyticScore of this.analyticScore?.values()) {
+                if (analyticScore instanceof WNZUWOHealthScore_1.WNZUWOHealthScore) {
+                    this.json['asset_health_score'] = analyticScore.value;
+                    this.json['asset_node_health_classifier'] = parser_utils_1.ParserUtils.CIMHealthScoreClassifierToCSV(analyticScore.classifier);
+                }
+                else if (analyticScore instanceof WNZUWOImportanceScore_1.WNZUWOImportanceScore) {
+                    this.json['asset_importance_score'] = analyticScore.value;
+                    this.json['asset_importance_classifier'] = parser_utils_1.ParserUtils.CIMImportanceClassifierToCSV(analyticScore.classifier);
+                }
+                else if (analyticScore instanceof WNZUWOPriority_1.WNZUWOPriority) {
+                    this.json['asset_priority_score'] = analyticScore.value;
+                    this.json['asset_priority_classifier'] = parser_utils_1.ParserUtils.CIMPriorityClassifierToCSV(analyticScore.classifier);
+                    ;
+                }
+                else if (analyticScore instanceof AggregateScore_1.AggregateScore) {
+                    if (cim_asset_types_1.ZuWoNames.KO === analyticScore.name) {
+                        this.json['asset_ko_score'] = analyticScore.value;
+                    }
+                    else if (cim_asset_types_1.ZuWoNames.CategoryI === analyticScore.name || cim_asset_types_1.ZuWoNames.CategoryII === analyticScore.name) {
+                        this.json['asset_category_score'] = analyticScore.value;
+                        this.json['asset_category_classifier'] = analyticScore.name;
+                    }
+                }
             }
         }
         const info = this.assetInfo;
@@ -90,10 +118,9 @@ class EVWireObject extends AssetContainer_1.AssetContainer {
         }
     }
     toJSONAssociations() {
-        var _a;
         super.toJSONAssociations();
         if (this.assetContainer) {
-            const psr = (_a = [...this.assetContainer.powerSystemResources.values()]) === null || _a === void 0 ? void 0 : _a.find(elem => elem);
+            const psr = [...this.assetContainer.powerSystemResources.values()]?.find(elem => elem);
             if (psr)
                 this.json['lineSegmentUUID'] = psr.mrid;
         }
@@ -111,8 +138,32 @@ class EVWireObject extends AssetContainer_1.AssetContainer {
         return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'enervance', 'EVWireObject', 'wireCount', String(this.wireCount));
     }
     getImportanceScore() {
-        for (const score of this.analyticScores.values()) {
-            if (score instanceof EVImportanceScore_1.EVImportanceScore) {
+        for (const score of this.analyticScore.values()) {
+            if (score instanceof WNZUWOImportanceScore_1.WNZUWOImportanceScore) {
+                return score;
+            }
+        }
+        return;
+    }
+    getPriorityScore() {
+        for (const score of this.analyticScore.values()) {
+            if (score instanceof WNZUWOPriority_1.WNZUWOPriority) {
+                return score;
+            }
+        }
+        return;
+    }
+    getCategoryScore() {
+        for (const score of this.analyticScore.values()) {
+            if (score.name === cim_asset_types_1.ZuWoNames.CategoryI || score.name === cim_asset_types_1.ZuWoNames.CategoryII) {
+                return score;
+            }
+        }
+        return;
+    }
+    getKoScore() {
+        for (const score of this.analyticScore.values()) {
+            if (score.name === cim_asset_types_1.ZuWoNames.KO) {
                 return score;
             }
         }
@@ -124,6 +175,39 @@ class EVWireObject extends AssetContainer_1.AssetContainer {
             a   enervance:EVWireObject ;
                 cim:IdentifiedObject.name '${this.name}' .`;
     }
+    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) 
+                      ?name ?description ?type ?number ?wireCount ?length ?installationDate
+                      (strafter(strafter(str(?acUUID), '#'), '_') AS ?assetContainerUUID)  
+                      (strafter(strafter(str(?aiUUID), '#'), '_') AS ?assetInfoUUID)  
+                      (strafter(strafter(str(?lUUID), '#'), '_') AS ?locationUUID)  
+                      (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)          
+                      WHERE {
+                         GRAPH <http://default/> {
+                          ?MRID rdf:type enervance:EVWireObject .
+                          OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
+                          OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
+                          OPTIONAL {?MRID cim:Asset.type ?type .}
+                          OPTIONAL {?MRID cim:Asset.lifecycleDate [ cim:LifecycleDate.installationDate ?installationDate ] .}
+                          OPTIONAL {?MRID enervance:EVWireObject.number ?number .}
+                          OPTIONAL {?MRID enervance:EVWireObject.wireCount ?wireCount .}
+                          OPTIONAL {?MRID enervance:EVWireObject.length ?length .}
+                          OPTIONAL {?MRID cim:Asset.AssetContainer ?acUUID .}
+                          OPTIONAL {?MRID cim:Asset.AssetInfo ?aiUUID .}
+                          OPTIONAL {?MRID cim:Asset.Location ?lUUID .}
+                          OPTIONAL {?MRID cim:Asset.PowerSystemResources ?psrUUIDs .}
+                        }
+                    }
+                    GROUP BY ?MRID ?baseIRI ?name ?description ?type ?number ?wireCount ?length ?installationDate ?acUUID ?aiUUID ?lUUID`;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return EVWireObject.sparqlQuery.replace('<http://default/>', graphURI);
@@ -131,9 +215,8 @@ class EVWireObject extends AssetContainer_1.AssetContainer {
         return EVWireObject.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b, _c;
-        if ((_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) {
-            (_c = (_b = data === null || data === void 0 ? void 0 : data.results) === null || _b === void 0 ? void 0 : _b.bindings) === null || _c === void 0 ? void 0 : _c.forEach((value) => {
+        if (data?.results?.bindings) {
+            data?.results?.bindings?.forEach((value) => {
                 const newClass = new EVWireObject();
                 newClass.resolveAttributesFusekiJSON(value);
                 cimModel.addWireObject(newClass);
@@ -146,12 +229,13 @@ class EVWireObject extends AssetContainer_1.AssetContainer {
         this.length = +(0, utils_1.getValue)(value, 'length');
         this.wireCount = +(0, utils_1.getValue)(value, 'wireCount');
     }
+    /** Erstellt ein GeoJSON-Objekt für die Karte */
+    // TODO überarbeiten und konsolidieren mit Schema
     toMapGeoJSON() {
-        var _a, _b, _c, _d;
         const geoJSON = {};
-        if ((_b = (_a = this.location) === null || _a === void 0 ? void 0 : _a.positionPoints) === null || _b === void 0 ? void 0 : _b.length) {
+        if (this.location?.positionPoints?.length) {
             const linePoints = [];
-            (_d = (_c = this.location) === null || _c === void 0 ? void 0 : _c.positionPoints) === null || _d === void 0 ? void 0 : _d.forEach((point) => {
+            this.location?.positionPoints?.forEach((point) => {
                 if (+point.xPosition > 0 && +point.yPosition > 0) {
                     linePoints.push([+point.xPosition, +point.yPosition]);
                 }
@@ -174,37 +258,4 @@ class EVWireObject extends AssetContainer_1.AssetContainer {
     }
 }
 exports.EVWireObject = EVWireObject;
-EVWireObject.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) 
-                      ?name ?description ?type ?number ?wireCount ?length ?installationDate
-                      (strafter(strafter(str(?acUUID), '#'), '_') AS ?assetContainerUUID)  
-                      (strafter(strafter(str(?aiUUID), '#'), '_') AS ?assetInfoUUID)  
-                      (strafter(strafter(str(?lUUID), '#'), '_') AS ?locationUUID)  
-                      (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)          
-                      WHERE {
-                         GRAPH <http://default/> {
-                          ?MRID rdf:type enervance:EVWireObject .
-                          OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
-                          OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
-                          OPTIONAL {?MRID cim:Asset.type ?type .}
-                          OPTIONAL {?MRID cim:Asset.lifecycleDate [ cim:LifecycleDate.installationDate ?installationDate ] .}
-                          OPTIONAL {?MRID enervance:EVWireObject.number ?number .}
-                          OPTIONAL {?MRID enervance:EVWireObject.wireCount ?wireCount .}
-                          OPTIONAL {?MRID enervance:EVWireObject.length ?length .}
-                          OPTIONAL {?MRID cim:Asset.AssetContainer ?acUUID .}
-                          OPTIONAL {?MRID cim:Asset.AssetInfo ?aiUUID .}
-                          OPTIONAL {?MRID cim:Asset.Location ?lUUID .}
-                          OPTIONAL {?MRID cim:Asset.PowerSystemResources ?psrUUIDs .}
-                        }
-                    }
-                    GROUP BY ?MRID ?baseIRI ?name ?description ?type ?number ?wireCount ?length ?installationDate ?acUUID ?aiUUID ?lUUID`;
 //# sourceMappingURL=EVWireObject.js.map

package/dist/model/extensions/enervance/assets/EVWireObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"EVWireObject.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/assets/EVWireObject.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAC9D,kDAAgD;AAEhD,wDAAmD;AAEnD,2EAAsE;AACtE,2DAAwD;AACxD,6DAA0D;AAC1D,6CAA0C;AAE1C,MAAa,YAAa,SAAQ,+BAAc;IAS9C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAKM,cAAc;;QACnB,IAAI,eAAe,GAAG,CAAC,CAAC;QACxB,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YAEpB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE;gBACxC,IAAG,KAAK,YAAY,YAAY,EAAE;oBAChC,eAAe,IAAK,KAAsB,CAAC,cAAc,EAAE,CAAC;iBAC7D;aACF;SACF;aAAM;YAEL,IAAG,IAAI,CAAC,SAAS,YAAY,uBAAU,EAAE;gBACvC,MAAM,kBAAkB,GAAG,MAAC,IAAI,CAAC,SAAwB,0CAAE,kBAAkB,CAAC;gBAC9E,eAAe,GAAG,kBAAkB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5F;SACF;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAMM,YAAY,CAAC,IAA+B;QACjD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE;YACxC,IAAG,KAAK,YAAY,YAAY,EAAE;gBAChC,MAAM,UAAU,GAAI,KAAsB,CAAC;gBAE3C,KAAK,MAAM,aAAa,IAAI,UAAU,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE;oBAC9D,IAAI,IAAI,KAAK,SAAS,IAAI,aAAa,YAAY,yBAAW,IAAI,aAAa,CAAC,KAAK,EAAE;wBACrF,OAAO,aAAa,CAAC,KAAK,CAAC;qBAC5B;yBACI,IAAI,IAAI,KAAK,aAAa,IAAI,aAAa,YAAY,qCAAiB,IAAI,aAAa,CAAC,KAAK,EAAE;wBACpG,OAAO,aAAa,CAAC,KAAK,CAAC;qBAC5B;iBACF;aACF;SACF;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAEM,MAAM;QACX,IAAI,IAAI,CAAC,IAAI,KAAK,iCAAe,CAAC,gBAAgB,EAAE;YAClD,KAAK,CAAC,MAAM,EAAE,CAAC;YACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;SAClB;IACH,CAAC;IAEM,gBAAgB;;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,MAAA,IAAI,CAAC,aAAa,0CAAE,gBAAgB,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACjD,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE;YACxD,IAAI,aAAa,YAAY,yBAAW,EAAE;gBACxC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC;aAChD;iBAAM,IAAI,aAAa,YAAY,qCAAiB,EAAE;gBACrD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC;aACpD;SACF;QAED,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE;YACnD,IAAI,aAAa,YAAY,uBAAU,EAAE;gBACvC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC;aAC9C;SACF;QAED,MAAM,IAAI,GAAI,IAAI,CAAC,SAAwB,CAAC;QAC5C,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC;YAE9C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;YAEzC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAChC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;SAClC;IAEH,CAAC;IAEM,kBAAkB;;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,MAAM,GAAG,GAAG,MAAA,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,0CAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YACvF,IAAI,GAAG;gBAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC;SAClD;IACH,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnH,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3H,CAAC;IAED,YAAY,CAAC,SAAiB;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACjI,CAAC;IAED,kBAAkB;QAChB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE;YAChD,IAAI,KAAK,YAAY,qCAAiB,EAAE;gBACtC,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO;IACT,CAAC;IAEM,wBAAwB;QAC7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;6CAEM,IAAI,CAAC,IAAI,KAAK,CAAC;IAC1D,CAAC;IAoCM,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;QACD,OAAO,YAAY,CAAC,WAAW,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC7D,IAAI,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,EAAE;YAC3B,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;gBAC9C,MAAM,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;gBACpC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;gBAC5C,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;IAKM,YAAY;;QAEjB,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,IAAI,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,cAAc,0CAAE,MAAM,EAAE;YACzC,MAAM,UAAU,GAAe,EAAE,CAAC;YAClC,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,cAAc,0CAAE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC/C,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,EAAE;oBAChD,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;iBACvD;YACH,CAAC,CAAC,CAAC;YACH,IAAI,UAAU,CAAC,MAAM,EAAE;gBACrB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;gBAC5B,OAAO,CAAC,UAAU,CAAC,GAAG;oBACpB,IAAI,EAAE,YAAY;oBAClB,WAAW,EAAE,UAAU;iBACxB,CAAC;gBACF,OAAO,CAAC,YAAY,CAAC,GAAG;oBACtB,KAAK,EAAE,IAAI,CAAC,IAAI;oBAChB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,UAAU,EAAE,kBAAkB;iBAC/B,CAAA;aACF;SAEF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;;AAxOH,oCAyOC;AAzFe,wBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yIAgCmG,CAAC"}
+{"version":3,"file":"EVWireObject.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/assets/EVWireObject.ts"],"names":[],"mappings":"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"}

package/dist/model/extensions/enervance/core/EVTerminal.d.ts

@@ -1,5 +1,5 @@
 import { Terminal } from '../../../core/Terminal';
-import { Model } from '../../../model/Model';
+import { ModelContainer } from '../../../../model-container/model/ModelContainer';
 import { EVTerminalAction } from '../operations/EVTerminalAction';
 import { ISchemaSettings } from '../../../../interfaces/schema-settings/ShapeInfos';
 import { DiagramObject } from '../../../diagram/DiagramObject';
@@ -8,7 +8,7 @@ export declare class EVTerminal extends Terminal {
     protected constructor(mrid?: string, name?: string, shortName?: string, description?: string);
     addTerminalAction(action: EVTerminalAction): void;
     toGeoJSON(geoJSON: any, profile: string, schemaSettings: ISchemaSettings, diagramObject?: DiagramObject): any;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
     static getQuerySPARQL(graphURI: string): string;
     static sparqlQuery: string;
 }

package/dist/model/extensions/enervance/core/EVTerminal.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EVTerminal = void 0;
 const Terminal_1 = require("../../../core/Terminal");
 class EVTerminal extends Terminal_1.Terminal {
+    terminalAction;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
         this.terminalAction = new Map();
@@ -30,8 +31,7 @@ class EVTerminal extends Terminal_1.Terminal {
         return geoJSON;
     }
     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 newClass = new EVTerminal();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addTerminal(newClass);
@@ -43,9 +43,7 @@ class EVTerminal extends Terminal_1.Terminal {
         }
         return EVTerminal.sparqlQuery;
     }
-}
-exports.EVTerminal = EVTerminal;
-EVTerminal.sparqlQuery = `
+    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#>
@@ -63,7 +61,7 @@ EVTerminal.sparqlQuery = `
 
         WHERE {
             GRAPH <http://default/>{
-                ?terminalUUID rdf:type cim:Terminal .
+                ?terminalUUID rdf:type enervance:EVTerminal .
                 OPTIONAL {?terminalUUID cim:IdentifiedObject.name ?name .}
                 OPTIONAL {?terminalUUID entsoe:IdentifiedObject.shortName ?shortName .}
                 OPTIONAL {?terminalUUID cim:ACDCTerminal.connected ?connected .}
@@ -75,4 +73,6 @@ EVTerminal.sparqlQuery = `
             }
         }
     `;
+}
+exports.EVTerminal = EVTerminal;
 //# sourceMappingURL=EVTerminal.js.map

package/dist/model/extensions/enervance/core/EVTerminal.js.map

@@ -1 +1 @@
-{"version":3,"file":"EVTerminal.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/core/EVTerminal.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAMhD,MAAa,UAAW,SAAQ,mBAAQ;IAItC,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;IAClC,CAAC;IAEM,iBAAiB,CAAC,MAAwB;QAC/C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAEM,SAAS,CAAC,OAAY,EAAE,OAAe,EAAE,cAA+B,EAAE,aAA6B;QAC5G,MAAM,WAAW,GAAa,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAC7E,MAAM,SAAS,GAAqB,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC/E,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAE9B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpB,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;YAEjE,OAAO,CAAC,UAAU,CAAC,GAAG;gBACpB,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;aACpB,CAAA;YAED,OAAO,CAAC,YAAY,CAAC,GAAG;gBACtB,iBAAiB,EAAE,aAAa,CAAC,IAAI;gBACrC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;gBACjC,MAAM,EAAE,GAAG;aACZ,CAAA;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAGM,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,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAC;YAClC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,WAAW,CAAC;IAChC,CAAC;;AAlDH,gCAiFC;AA9Be,sBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6BjC,CAAA"}
+{"version":3,"file":"EVTerminal.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/core/EVTerminal.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAMlD,MAAa,UAAW,SAAQ,mBAAQ;IAEtC,cAAc,CAAgC;IAE9C,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;IAClC,CAAC;IAEM,iBAAiB,CAAC,MAAwB;QAC/C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAEM,SAAS,CAAC,OAAY,EAAE,OAAe,EAAE,cAA+B,EAAE,aAA6B;QAC5G,MAAM,WAAW,GAAa,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAC7E,MAAM,SAAS,GAAqB,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC/E,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAE9B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpB,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;YAEjE,OAAO,CAAC,UAAU,CAAC,GAAG;gBACpB,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;aACpB,CAAA;YAED,OAAO,CAAC,YAAY,CAAC,GAAG;gBACtB,iBAAiB,EAAE,aAAa,CAAC,IAAI;gBACrC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;gBACjC,MAAM,EAAE,GAAG;aACZ,CAAA;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAGM,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,UAAU,EAAE,CAAC;YAClC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,WAAW,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6BjC,CAAA;;AAjFL,gCAkFC"}

package/dist/model/extensions/enervance/generic-data-set/EVMetaObject.d.ts

@@ -0,0 +1,34 @@
+import { IUUIDObject } from '../../../../interfaces/IUUIDObject';
+import { ChangeSetMember } from '../../../generic-data-set/ChangeSetMember';
+import { ModelContainer } from '../../../../model-container/model/ModelContainer';
+import { CimType } from '../../../../types/cim.types';
+export declare class EVMetaObject implements IUUIDObject {
+    mrid: string;
+    name: string;
+    visited: boolean;
+    /** Name der Objekteigenschaft (z. B. description). */
+    private propertyName;
+    /**
+     * Der Zustand der Objekteigenschaft.
+     - Collections als Array abgebildet z.B. ['id_a', 'id_b'].
+     - primitive Datentypen als String z.B. 'Schaltanlage A'.
+     - komplexe Datentypen  als String z. B. 'id_a'.
+     * */
+    private propertyState;
+    private changeSetMember;
+    private changeSetMemberUUID;
+    constructor(mrid?: string);
+    getUUID(): string;
+    getPropertyName(): string;
+    setPropertyName(propertyName: any): void;
+    getPropertyState(): string | Array<string>;
+    setPropertyState(propertyState: any | CimType | Array<CimType> | Set<CimType> | Map<string, CimType>): void;
+    private cimTypeToUUID;
+    getChangeSetMember(): ChangeSetMember;
+    setChangeSetMember(changeSetMember: ChangeSetMember): void;
+    static sparqlQuery: string;
+    static getQuerySPARQL(graphURI: string): string;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
+}

package/dist/model/extensions/enervance/generic-data-set/EVMetaObject.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EVMetaObject = void 0;
+const parser_utils_1 = require("../../../../utils2/parser.utils");
+class EVMetaObject {
+    mrid;
+    name;
+    visited;
+    /** Name der Objekteigenschaft (z. B. description). */
+    propertyName;
+    /**
+     * Der Zustand der Objekteigenschaft.
+     - Collections als Array abgebildet z.B. ['id_a', 'id_b'].
+     - primitive Datentypen als String z.B. 'Schaltanlage A'.
+     - komplexe Datentypen  als String z. B. 'id_a'.
+     * */
+    propertyState;
+    changeSetMember;
+    changeSetMemberUUID;
+    constructor(mrid) {
+        this.mrid = mrid;
+    }
+    getUUID() {
+        return this.mrid;
+    }
+    getPropertyName() {
+        return this.propertyName;
+    }
+    setPropertyName(propertyName) {
+        this.propertyName = propertyName;
+    }
+    getPropertyState() {
+        return this.propertyState;
+    }
+    setPropertyState(propertyState) {
+        if (propertyState instanceof Map) {
+            this.propertyState = [...propertyState.keys()];
+        }
+        else if (propertyState instanceof Set) {
+            this.propertyState = Array.from(propertyState).map(it => this.cimTypeToUUID(it));
+        }
+        else if (Array.isArray(propertyState)) {
+            this.propertyState = propertyState.map(it => this.cimTypeToUUID(it));
+        }
+        else if (propertyState?.hasOwnProperty('mrid')) {
+            this.propertyState = propertyState.mrid;
+        }
+        else {
+            this.propertyState = propertyState;
+        }
+    }
+    cimTypeToUUID(object) {
+        switch (typeof object) {
+            case 'object': {
+                return object.mrid;
+            }
+            default: {
+                return String(object);
+            }
+        }
+    }
+    getChangeSetMember() {
+        return this.changeSetMember;
+    }
+    setChangeSetMember(changeSetMember) {
+        this.changeSetMember = changeSetMember;
+    }
+    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(?MRID), '#_') AS ?uuid)  
+                ?propertyName ?propertyState
+                (STRAFTER(str(?csmUUID), '#_') AS ?changeSetMemberUUID) 
+        
+        WHERE { 
+            GRAPH <http://default/>{
+                ?MRID rdf:type enervance:EVMetaObject .
+                OPTIONAL {?MRID enervance:EVMetaObject.propertyName ?propertyName .}
+                OPTIONAL {?MRID enervance:EVMetaObject.propertyState ?propertyState .}
+                OPTIONAL {?MRID enervance:EVMetaObject.ChangeSetMember ?csmUUID .}
+            }
+        }
+    `;
+    static getQuerySPARQL(graphURI) {
+        if (graphURI.length > 0) {
+            return EVMetaObject.sparqlQuery.replace('<http://default/>', graphURI);
+        }
+        return EVMetaObject.sparqlQuery;
+    }
+    static resolveClassFusekiJSON(data, cimModel) {
+        data?.results?.bindings?.forEach((value) => {
+            const metaObject = new EVMetaObject();
+            metaObject.resolveAttributesFusekiJSON(value);
+            cimModel.addObject(metaObject);
+        });
+    }
+    resolveAttributesFusekiJSON(value) {
+        this.mrid = parser_utils_1.ParserUtils.getValue(value, 'uuid');
+        this.propertyName = parser_utils_1.ParserUtils.getValue(value, 'propertyName');
+        this.propertyState = JSON.parse(parser_utils_1.ParserUtils.getValue(value, 'propertyState'));
+        this.changeSetMemberUUID = parser_utils_1.ParserUtils.getValue(value, 'changeSetMemberUUID');
+    }
+    resolveParsedAssociations(cimModel) {
+        this.changeSetMember = cimModel.getChangeSetMember(this.changeSetMemberUUID);
+        this.changeSetMember?.addMetaObject(this);
+    }
+}
+exports.EVMetaObject = EVMetaObject;
+//# sourceMappingURL=EVMetaObject.js.map

package/dist/model/extensions/enervance/generic-data-set/EVMetaObject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EVMetaObject.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/generic-data-set/EVMetaObject.ts"],"names":[],"mappings":"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"}

package/dist/model/extensions/enervance/operations/EVTerminalAction.d.ts

@@ -1,7 +1,7 @@
 import { SwitchingAction } from '../../../operations/SwitchingAction';
 import { EVTerminal } from '../core/EVTerminal';
 import { SwitchActionKind } from '../../../operations/SwitchActionKind';
-import { Model } from '../../../model/Model';
+import { ModelContainer } from '../../../../model-container/model/ModelContainer';
 import { IIdentifiedObject } from '../../../../interfaces/model/core/IIdentifiedObject';
 export declare class EVTerminalAction extends SwitchingAction {
     kind: SwitchActionKind;
@@ -9,13 +9,15 @@ export declare class EVTerminalAction extends SwitchingAction {
     terminalUUIDs: string[];
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     getSwitchingEquipment(): IIdentifiedObject[];
-    protected resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
     addTerminal(terminal: EVTerminal): string;
+    /** ------------------ JSON------------------------*/
     toJSON(): any;
     toJSONAttributes(): void;
     toJSONAssociations(): void;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
+    /** ------------------ Fuseki Parser ------------------------*/
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
     static getQuerySPARQL(graphURI: string): string;
     static sparqlQuery: string;
     createNewStatementSPARQL(): string;

package/dist/model/extensions/enervance/operations/EVTerminalAction.js

@@ -5,6 +5,9 @@ const SwitchingAction_1 = require("../../../operations/SwitchingAction");
 const SwitchActionKind_1 = require("../../../operations/SwitchActionKind");
 const utils_1 = require("../../../../util/utils");
 class EVTerminalAction extends SwitchingAction_1.SwitchingAction {
+    kind;
+    terminals;
+    terminalUUIDs;
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.terminals = new Map();
@@ -33,6 +36,16 @@ class EVTerminalAction extends SwitchingAction_1.SwitchingAction {
         }
         this.terminalUUIDs.length = 0;
     }
+    /*  addOutageIsolationEquipment(ce: IConductingEquipment): string {
+        if (!this.outageIsolationEquipment.has(ce.mrid)) {
+          this.outageIsolationEquipment.set(ce.mrid, ce);
+          ce.addOutage(this);
+          return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'Outage', 'OutageIsolationEquipment', ce.mrid);
+        } else {
+          console.log(`Outage ${this.mrid} add: OutageIsolationEquipment ${ce.mrid} already exists.`);
+        }
+        return '';
+      }*/
     addTerminal(terminal) {
         if (!this.terminals.has(terminal.mrid)) {
             this.terminals.set(terminal.mrid, terminal);
@@ -42,6 +55,7 @@ class EVTerminalAction extends SwitchingAction_1.SwitchingAction {
         else {
         }
     }
+    /** ------------------ JSON------------------------*/
     toJSON() {
         super.toJSON();
         this.toJSONAttributes();
@@ -56,9 +70,9 @@ class EVTerminalAction extends SwitchingAction_1.SwitchingAction {
         super.toJSONAssociations();
         this.json['terminalUUIDs'] = [...this.terminalUUIDs];
     }
+    /** ------------------ Fuseki Parser ------------------------*/
     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 newClass = new EVTerminalAction();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addSwitchingAction(newClass);
@@ -70,20 +84,7 @@ class EVTerminalAction extends SwitchingAction_1.SwitchingAction {
         }
         return EVTerminalAction.sparqlQuery;
     }
-    createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:SwitchingAction ;
-                cim:IdentifiedObject.name "EVTerminalAction" .
-        `;
-    }
-    setKind(kind) {
-        this.kind = kind;
-        return `<${this.baseIRI}${this.mrid}> enervance:EVTerminalAction.kind 'http://iec.ch/TC57/2013/CIM-schema-cim16#SwitchActionKind.${this.kind}' . `;
-    }
-}
-exports.EVTerminalAction = EVTerminalAction;
-EVTerminalAction.sparqlQuery = `
+    static sparqlQuery = `
         PREFIX cim:	 		    <http://iec.ch/TC57/2013/CIM-schema-cim16#>
         PREFIX westnetzneplan:	  <http://westnetzneplan.de/CIM/Extensions#>
         PREFIX entsoe:	 	  <http://entsoe.eu/CIM/SchemaExtension/3/1#>
@@ -111,4 +112,18 @@ EVTerminalAction.sparqlQuery = `
             }
         }
         GROUP BY ?MRID ?baseIRI ?name ?description ?actionKindEnum ?spUUID `;
+    createNewStatementSPARQL() {
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:SwitchingAction ;
+                cim:IdentifiedObject.name "EVTerminalAction" .
+        `;
+    }
+    setKind(kind) {
+        this.kind = kind;
+        // <cim:Terminal.phases rdf:resource="http://iec.ch/TC57/2013/CIM-schema-cim16#PhaseCode.ABC"/>
+        return `<${this.baseIRI}${this.mrid}> enervance:EVTerminalAction.kind 'http://iec.ch/TC57/2013/CIM-schema-cim16#SwitchActionKind.${this.kind}' . `;
+    }
+}
+exports.EVTerminalAction = EVTerminalAction;
 //# sourceMappingURL=EVTerminalAction.js.map