@enervance/insight-cim-model 0.0.61 → 0.0.63

package/dist/model/extensions/enervance/assetinfo/EVWireInfo.d.ts

@@ -1,6 +1,6 @@
 import { WireInfo } from '../../../assetinfo/WireInfo';
 import XMLWriter from 'xml-writer';
-import { Model } from '../../../model/Model';
+import { ModelContainer } from '../../../../model-container/model/ModelContainer';
 export declare class EVWireInfo extends WireInfo {
     r1: number;
     x1: number;
@@ -10,18 +10,23 @@ export declare class EVWireInfo extends WireInfo {
     c0: number;
     b: number;
     g: number;
+    /** Typ der Leitungstypen (Cable, OverheadLine) */
     type: string;
+    /** Spannungsebene */
     voltage: number;
+    /** Ausfallwahrscheinlichkeit  in % pro 100kM pro Jahr*/
     failureProbability: number;
+    /** Material der Isolierung. Standardklasse reicht nicht aus (z.B. PE)  */
     insulation: string;
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
     static getQuerySPARQL(graphURI: string): string;
     static sparqlQuery: string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
-    protected resolveAttributesFusekiJSON(value: any): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    resolveAttributesFusekiJSON(value: any): void;
     createNewStatementSPARQL(): string;
     setR1(r: number): string;
     setX1(x: number): string;

package/dist/model/extensions/enervance/assetinfo/EVWireInfo.js

@@ -6,33 +6,50 @@ const rdf_xml_1 = require("../../../../constants/rdf-xml");
 const utils_1 = require("../../../../util/utils");
 const xml_serializer_1 = require("../../../../util/xml/xml.serializer");
 class EVWireInfo extends WireInfo_1.WireInfo {
+    r1; //ResistancePerLength;
+    x1; //ReactancePerLength;
+    c1;
+    r0;
+    x0;
+    c0;
+    b;
+    g;
+    /** Typ der Leitungstypen (Cable, OverheadLine) */
+    type;
+    /** Spannungsebene */
+    voltage;
+    /** Ausfallwahrscheinlichkeit  in % pro 100kM pro Jahr*/
+    failureProbability;
+    /** Material der Isolierung. Standardklasse reicht nicht aus (z.B. PE)  */
+    insulation;
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.baseIRI = baseIRI;
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         const suffixID = this.getSuffixID(profile);
         const prefixUUID = this.getPrefixUUID(suffixID);
         xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'WireInfo', rdf_xml_1.RDF_XML.CIM_NS_16);
-        xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+        (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
         this.toCIMXMLAttributes(xmlWriter, profile);
         this.toCIMXMLAssociations(xmlWriter, profile);
         xmlWriter.endElement();
     }
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.r1`, this.r1);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.x1`, this.x1);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.c1`, this.c1);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.r0`, this.r0);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.x0`, this.x0);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.c0`, this.c0);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.b`, this.b);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.g`, this.g);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.type`, this.type);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.voltage`, this.voltage);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.failureProbability`, this.failureProbability);
-        xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.insulation`, this.insulation);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.r1`, this.r1);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.x1`, this.x1);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.c1`, this.c1);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.r0`, this.r0);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.x0`, this.x0);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.c0`, this.c0);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.b`, this.b);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.g`, this.g);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.type`, this.type);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.voltage`, this.voltage);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.failureProbability`, this.failureProbability);
+        (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.EV_NS_PREFIX}:EVWireInfo.insulation`, this.insulation);
     }
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
@@ -43,58 +60,12 @@ class EVWireInfo extends WireInfo_1.WireInfo {
         }
         return EVWireInfo.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) => {
-                const newClass = new EVWireInfo();
-                newClass.resolveAttributesFusekiJSON(value);
-                cimModel.addEVWireInfo(newClass);
-            });
-        }
-    }
-    resolveAttributesFusekiJSON(value) {
-        super.resolveAttributesFusekiJSON(value);
-        this.r0 = +utils_1.getValue(value, 'r0');
-        this.x0 = +utils_1.getValue(value, 'x0');
-        this.c0 = +utils_1.getValue(value, 'c0');
-        this.r1 = +utils_1.getValue(value, 'r1');
-        this.x1 = +utils_1.getValue(value, 'x1');
-        this.c1 = +utils_1.getValue(value, 'c1');
-        this.b = +utils_1.getValue(value, 'b');
-        this.g = +utils_1.getValue(value, 'g');
-        this.g = +utils_1.getValue(value, 'g');
-        this.voltage = +utils_1.getValue(value, 'voltage');
-        this.type = utils_1.getValue(value, 'type');
-        this.failureProbability = +utils_1.getValue(value, 'failureProbability');
-        this.insulation = utils_1.getValue(value, 'insulation');
-    }
-    createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:WireInfo ;
-                cim:IdentifiedObject.name '${this.name}' .`;
-    }
-    setR1(r) {
-        this.r1 = r;
-        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'enervance', 'EVWireInfo', 'r1', String(this.r1));
-    }
-    setX1(x) {
-        this.x1 = x;
-        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'enervance', 'EVWireInfo', 'x1', String(this.x1));
-    }
-    setC1(c) {
-        this.c1 = c;
-        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'enervance', 'EVWireInfo', 'c1', String(this.c1));
-    }
-}
-exports.EVWireInfo = EVWireInfo;
-EVWireInfo.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#>
         PREFIX rdf:	 		    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX amp:	 		    <http://amprion.net/2018/cim_extensions#>
+        PREFIX amp:	 		    <http://amprion.net/CIM/Extensions#>
         PREFIX apf:	 		    <http://jena.hpl.hp.com/ARQ/property#>
         PREFIX afn:	 		    <http://jena.apache.org/ARQ/function#>
 
@@ -104,7 +75,7 @@ EVWireInfo.sparqlQuery = `
                 ?ratedCurrent ?voltage ?type ?failureProbability ?insulation
         WHERE {
             GRAPH <http://default/>{
-                ?MRID rdf:type cim:WireInfo .
+                ?MRID rdf:type enervance:EVWireInfo .
                 OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
                 OPTIONAL {?MRID cim:WireInfo.ratedCurrent ?ratedCurrent .}
                 OPTIONAL {?MRID cim:WireInfo.sizeDescription ?sizeDescription .}
@@ -125,4 +96,49 @@ EVWireInfo.sparqlQuery = `
             }
         }
     `;
+    static resolveClassFusekiJSON(data, cimModel) {
+        if (data?.results?.bindings) {
+            data?.results?.bindings?.forEach((value) => {
+                const newClass = new EVWireInfo();
+                newClass.resolveAttributesFusekiJSON(value);
+                cimModel.addEVWireInfo(newClass);
+            });
+        }
+    }
+    resolveAttributesFusekiJSON(value) {
+        super.resolveAttributesFusekiJSON(value);
+        this.r0 = +(0, utils_1.getValue)(value, 'r0');
+        this.x0 = +(0, utils_1.getValue)(value, 'x0');
+        this.c0 = +(0, utils_1.getValue)(value, 'c0');
+        this.r1 = +(0, utils_1.getValue)(value, 'r1');
+        this.x1 = +(0, utils_1.getValue)(value, 'x1');
+        this.c1 = +(0, utils_1.getValue)(value, 'c1');
+        this.b = +(0, utils_1.getValue)(value, 'b');
+        this.g = +(0, utils_1.getValue)(value, 'g');
+        this.g = +(0, utils_1.getValue)(value, 'g');
+        this.voltage = +(0, utils_1.getValue)(value, 'voltage');
+        this.type = (0, utils_1.getValue)(value, 'type');
+        this.failureProbability = +(0, utils_1.getValue)(value, 'failureProbability');
+        this.insulation = (0, utils_1.getValue)(value, 'insulation');
+    }
+    createNewStatementSPARQL() {
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   enervance:EVWireInfo ;
+                cim:IdentifiedObject.name '${this.name}' .`;
+    }
+    setR1(r) {
+        this.r1 = r;
+        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'enervance', 'EVWireInfo', 'r1', String(this.r1));
+    }
+    setX1(x) {
+        this.x1 = x;
+        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'enervance', 'EVWireInfo', 'x1', String(this.x1));
+    }
+    setC1(c) {
+        this.c1 = c;
+        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'enervance', 'EVWireInfo', 'c1', String(this.c1));
+    }
+}
+exports.EVWireInfo = EVWireInfo;
 //# sourceMappingURL=EVWireInfo.js.map

package/dist/model/extensions/enervance/assetinfo/EVWireInfo.js.map

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

package/dist/model/extensions/enervance/assets/EVAnalytic.d.ts

@@ -1,10 +1,10 @@
 import { Analytic } from '../../../assets/Analytic';
-import { Model } from '../../../model/Model';
+import { ModelContainer } from '../../../../model-container/model/ModelContainer';
 export declare class EVAnalytic extends Analytic {
     value: number;
     static getQuerySPARQL(graphURI: string): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
-    protected resolveAttributesFusekiJSON(value: any): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    resolveAttributesFusekiJSON(value: any): void;
     static sparqlQuery: string;
     setValue(value: number): string;
     createNewStatementSPARQL(): string;

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

@@ -4,6 +4,7 @@ exports.EVAnalytic = void 0;
 const Analytic_1 = require("../../../assets/Analytic");
 const utils_1 = require("../../../../util/utils");
 class EVAnalytic extends Analytic_1.Analytic {
+    value;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return EVAnalytic.sparqlQuery.replace('<http://default/>', graphURI);
@@ -11,8 +12,7 @@ class EVAnalytic extends Analytic_1.Analytic {
         return EVAnalytic.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b;
-        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
+        data?.results?.bindings?.forEach((value) => {
             const newClass = new EVAnalytic();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addAnalytic(newClass);
@@ -20,21 +20,9 @@ class EVAnalytic extends Analytic_1.Analytic {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.value = +utils_1.getNumberValue(value, 'value');
+        this.value = +(0, utils_1.getNumberValue)(value, 'value');
     }
-    setValue(value) {
-        this.value = value;
-        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'enervance', 'EVAnalytic', 'value', String(this.value));
-    }
-    createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:Analytic .                
-        `;
-    }
-}
-exports.EVAnalytic = EVAnalytic;
-EVAnalytic.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#> 
@@ -56,4 +44,16 @@ EVAnalytic.sparqlQuery = `
             }
         }
         GROUP BY ?mrid ?baseIRI ?analyticKind ?value`;
+    setValue(value) {
+        this.value = value;
+        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'enervance', 'EVAnalytic', 'value', String(this.value));
+    }
+    createNewStatementSPARQL() {
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:Analytic .                
+        `;
+    }
+}
+exports.EVAnalytic = EVAnalytic;
 //# sourceMappingURL=EVAnalytic.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"EVAnalytic.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/assets/EVAnalytic.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAElD,kDAAsD;AAEtD,MAAa,UAAW,SAAQ,mBAAQ;IAG/B,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC5C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,WAAW,CAAC;IAChC,CAAC;IACM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC7D,YAAA,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,EAAE;IACL,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,CAAC,sBAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IA2BD,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACvH,CAAC;IAEM,wBAAwB;QAC7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;SAE9B,CAAC;IACR,CAAC;;AAzDH,gCA0DC;AAnCe,sBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;qDAqBe,CAAC"}
+{"version":3,"file":"EVAnalytic.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/assets/EVAnalytic.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAClD,kDAAsD;AAGtD,MAAa,UAAW,SAAQ,mBAAQ;IAEtC,KAAK,CAAS;IACP,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC5C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,WAAW,CAAC;IAChC,CAAC;IACM,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,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAA,sBAAc,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAGM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;qDAqBe,CAAC;IAGpD,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACvH,CAAC;IAEM,wBAAwB;QAC7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;SAE9B,CAAC;IACR,CAAC;;AAzDH,gCA0DC"}

package/dist/model/extensions/enervance/assets/EVImportanceKind.d.ts

@@ -0,0 +1,7 @@
+export declare enum EVImportanceKind {
+    veryImportant = "veryImportant",
+    important = "important",
+    medium = "medium",
+    low = "low",
+    veryLow = "veryLow"
+}

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EVImportanceKind = void 0;
+var EVImportanceKind;
+(function (EVImportanceKind) {
+    EVImportanceKind["veryImportant"] = "veryImportant";
+    EVImportanceKind["important"] = "important";
+    EVImportanceKind["medium"] = "medium";
+    EVImportanceKind["low"] = "low";
+    EVImportanceKind["veryLow"] = "veryLow";
+})(EVImportanceKind = exports.EVImportanceKind || (exports.EVImportanceKind = {}));
+//# sourceMappingURL=EVImportanceKind.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"EVImportanceKind.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/assets/EVImportanceKind.ts"],"names":[],"mappings":";;;AAAA,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,mDAA+B,CAAA;IAC/B,2CAAuB,CAAA;IACvB,qCAAiB,CAAA;IACjB,+BAAW,CAAA;IACX,uCAAmB,CAAA;AACrB,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B"}

package/dist/model/extensions/enervance/assets/EVImportanceScore.d.ts

@@ -1,9 +1,9 @@
 import { AggregateScore } from '../../../assets/AggregateScore';
-import { Model } from '../../../../index';
+import { ModelContainer } from '../../../../index';
 export declare class EVImportanceScore extends AggregateScore {
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
     createNewStatementSPARQL(): string;
 }

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

@@ -7,6 +7,27 @@ class EVImportanceScore 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(?isUUID), '#_') AS ?uuid)  
+        (CONCAT(STRBEFORE(str(?isUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?value
+         (strafter(strafter(str(?aUUID), '#'), '_') AS ?assetUUID)
+        WHERE { 
+            GRAPH <http://default/>{
+                ?isUUID rdf:type enervance:EVImportanceScore .
+                OPTIONAL { ?isUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL { ?isUUID cim:AnalyticScore.value ?value .}
+                OPTIONAL { ?isUUID cim:AnalyticScore.Asset ?aUUID .}
+            }
+        }
+    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return EVImportanceScore.sparqlQuery.replace('<http://default/>', graphURI);
@@ -14,8 +35,7 @@ class EVImportanceScore extends AggregateScore_1.AggregateScore {
         return EVImportanceScore.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b;
-        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
+        data?.results?.bindings?.forEach((value) => {
             const newClass = new EVImportanceScore();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addAnalyticScore(newClass);
@@ -32,25 +52,4 @@ class EVImportanceScore extends AggregateScore_1.AggregateScore {
     }
 }
 exports.EVImportanceScore = EVImportanceScore;
-EVImportanceScore.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(?isUUID), '#_') AS ?uuid)  
-        (CONCAT(STRBEFORE(str(?isUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?value
-         (strafter(strafter(str(?aUUID), '#'), '_') AS ?assetUUID)
-        WHERE { 
-            GRAPH <http://default/>{
-                ?isUUID rdf:type enervance:EVImportanceScore .
-                OPTIONAL { ?isUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL { ?isUUID cim:AnalyticScore.value ?value .}
-                OPTIONAL { ?isUUID cim:AnalyticScore.Asset ?aUUID .}
-            }
-        }
-    `;
 //# sourceMappingURL=EVImportanceScore.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"EVImportanceScore.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/assets/EVImportanceScore.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAG9D,MAAa,iBAAkB,SAAQ,+BAAc;IACjD,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,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC/E;QACD,OAAO,iBAAiB,CAAC,WAAW,CAAC;IACzC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC3D,YAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAC;YACzC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,EAAE;IACP,CAAC;IAEM,wBAAwB;QAE3B,OAAO;eACA,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;SAK9B,CAAC;IACN,CAAC;;AApDL,8CAqDC;AA/CiB,6BAAW,GAAW;;;;;;;;;;;;;;;;;;;;KAoBnC,CAAC"}
+{"version":3,"file":"EVImportanceScore.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/assets/EVImportanceScore.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAG9D,MAAa,iBAAkB,SAAQ,+BAAc;IACjD,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,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC/E;QACD,OAAO,iBAAiB,CAAC,WAAW,CAAC;IACzC,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,iBAAiB,EAAE,CAAC;YACzC,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,8CAqDC"}

package/dist/model/extensions/enervance/assets/EVIndicator.d.ts

@@ -1,13 +1,13 @@
 import { AggregateScore } from '../../../assets/AggregateScore';
 import { IndicatorTypeKind } from './IndicatorTypeKind';
-import { Model } from '../../../model/Model';
+import { ModelContainer } from '../../../../model-container/model/ModelContainer';
 export declare class EVIndicator extends AggregateScore {
     typeKind: IndicatorTypeKind;
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     static sparqlQuery: string;
     createNewStatementSPARQL(): string;
     static getQuerySPARQL(graphURI: string): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
-    protected resolveAttributesFusekiJSON(value: any): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    resolveAttributesFusekiJSON(value: any): void;
     setTypeKind(typeKind: IndicatorTypeKind): string;
 }

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

@@ -5,10 +5,33 @@ const AggregateScore_1 = require("../../../assets/AggregateScore");
 const IndicatorTypeKind_1 = require("./IndicatorTypeKind");
 const utils_1 = require("../../../../util/utils");
 class EVIndicator extends AggregateScore_1.AggregateScore {
+    typeKind;
     constructor(mrid, name, shortName, description, baseIRI) {
         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(?isUUID), '#_') AS ?uuid)  
+        (CONCAT(STRBEFORE(str(?isUUID), '#_'), '#_') AS ?baseIRI) 
+        ?value
+        (strafter(strafter(str(?kindEnum), '#'), '.') AS ?typeKind) 
+         (strafter(strafter(str(?aUUID), '#'), '_') AS ?assetUUID)
+        WHERE { 
+            GRAPH <http://default/>{
+                ?MRID rdf:type enervance:EVIndicator .
+                OPTIONAL { ?MRID cim:AnalyticScore.value ?value .}
+                OPTIONAL { ?MRID cim:AnalyticScore.Asset ?aUUID .}
+                OPTIONAL { ?MRID enervance:EVIndicator.typeKind ?kindEnum .}
+            }
+        }
+    `;
     createNewStatementSPARQL() {
         return `
             <${this.baseIRI}${this.mrid}>
@@ -22,8 +45,7 @@ class EVIndicator extends AggregateScore_1.AggregateScore {
         return EVIndicator.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b;
-        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
+        data?.results?.bindings?.forEach((value) => {
             const newClass = new EVIndicator();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addAnalyticScore(newClass);
@@ -31,34 +53,13 @@ class EVIndicator extends AggregateScore_1.AggregateScore {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.typeKind = IndicatorTypeKind_1.IndicatorTypeKind[utils_1.getValue(value, 'typeKind')];
+        this.typeKind = IndicatorTypeKind_1.IndicatorTypeKind[(0, utils_1.getValue)(value, 'typeKind')];
     }
     setTypeKind(typeKind) {
         this.typeKind = typeKind;
+        // <cim:Terminal.phases rdf:resource="http://iec.ch/TC57/2013/CIM-schema-cim16#PhaseCode.ABC"/>
         return `<${this.baseIRI}${this.mrid}> enervance:EVIndicator.typeKind 'http://enervance.com/CIM/Extensions#IndicatorTypeKind.${this.typeKind}' . `;
     }
 }
 exports.EVIndicator = EVIndicator;
-EVIndicator.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(?isUUID), '#_') AS ?uuid)  
-        (CONCAT(STRBEFORE(str(?isUUID), '#_'), '#_') AS ?baseIRI) 
-        ?value
-        (strafter(strafter(str(?kindEnum), '#'), '.') AS ?typeKind) 
-         (strafter(strafter(str(?aUUID), '#'), '_') AS ?assetUUID)
-        WHERE { 
-            GRAPH <http://default/>{
-                ?MRID rdf:type enervance:EVIndicator .
-                OPTIONAL { ?MRID cim:AnalyticScore.value ?value .}
-                OPTIONAL { ?MRID cim:AnalyticScore.Asset ?aUUID .}
-                OPTIONAL { ?MRID enervance:EVIndicator.typeKind ?kindEnum .}
-            }
-        }
-    `;
 //# sourceMappingURL=EVIndicator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"EVIndicator.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/assets/EVIndicator.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAC9D,2DAAsD;AAEtD,kDAAgD;AAEhD,MAAa,WAAY,SAAQ,+BAAc;IAI7C,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;IAyBM,wBAAwB;QAC7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;SAE9B,CAAC;IACR,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC5C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACvE;QACD,OAAO,WAAW,CAAC,WAAW,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC7D,YAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;YACnC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC,EAAE;IACL,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,qCAAiB,CAAC,gBAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,WAAW,CAAC,QAA2B;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,2FAA2F,IAAI,CAAC,QAAQ,MAAM,CAAC;IACpJ,CAAC;;AA/DH,kCAiEC;AAxDe,uBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;KAqBjC,CAAC"}
+{"version":3,"file":"EVIndicator.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/assets/EVIndicator.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAChE,2DAAwD;AAExD,kDAAkD;AAGlD,MAAa,WAAY,SAAQ,+BAAc;IAE7C,QAAQ,CAAoB;IAE5B,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;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;KAqBjC,CAAC;IAEG,wBAAwB;QAC7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;SAE9B,CAAC;IACR,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACvE;QACD,OAAO,WAAW,CAAC,WAAW,CAAC;IACjC,CAAC;IAEM,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,WAAW,EAAE,CAAC;YACnC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,qCAAiB,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,WAAW,CAAC,QAA2B;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,+FAA+F;QAC/F,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,2FAA2F,IAAI,CAAC,QAAQ,MAAM,CAAC;IACpJ,CAAC;;AA/DH,kCAiEC"}

package/dist/model/extensions/enervance/assets/EVPriorityKind.d.ts

@@ -0,0 +1,7 @@
+export declare enum EVPriorityKind {
+    veryHigh = "veryHigh",
+    high = "high",
+    medium = "medium",
+    low = "low",
+    veryLow = "veryLow"
+}

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EVPriorityKind = void 0;
+var EVPriorityKind;
+(function (EVPriorityKind) {
+    EVPriorityKind["veryHigh"] = "veryHigh";
+    EVPriorityKind["high"] = "high";
+    EVPriorityKind["medium"] = "medium";
+    EVPriorityKind["low"] = "low";
+    EVPriorityKind["veryLow"] = "veryLow";
+})(EVPriorityKind = exports.EVPriorityKind || (exports.EVPriorityKind = {}));
+//# sourceMappingURL=EVPriorityKind.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"EVPriorityKind.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/assets/EVPriorityKind.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAMX;AAND,WAAY,cAAc;IACxB,uCAAqB,CAAA;IACrB,+BAAa,CAAA;IACb,mCAAiB,CAAA;IACjB,6BAAW,CAAA;IACX,qCAAmB,CAAA;AACrB,CAAC,EANW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAMzB"}

package/dist/model/extensions/enervance/assets/EVWireObject.d.ts

@@ -1,12 +1,22 @@
 import { AssetContainer } from '../../../assets/AssetContainer';
-import { Model } from '../../../model/Model';
-import { EVImportanceScore } from './EVImportanceScore';
+import { ModelContainer } from '../../../../model-container/model/ModelContainer';
+import { WNZUWOImportanceScore } from '../../neplan-westnetz/assets/WNZUWOImportanceScore';
+import { WNZUWOPriority } from '../../neplan-westnetz/assets/WNZUWOPriority';
+import { AggregateScore } from '../../../assets/AggregateScore';
 export declare class EVWireObject extends AssetContainer {
     number: string;
     length: number;
+    /** Anzahl der separaten Kabel- oder Freileitungen.
+     Z.B. 3x1x150 NA2XS2Y => 3 Kabel des Typs 1x150 NA2XS2Y. */
     wireCount: number;
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
+    /** längenbezogene Ausfallwahrscheinlichkeit pro Jahr
+     * Nur EVWireObjects, da CN ein Sonderfall aufgrund con VoltageLevels ist.*/
     getFailureRate(): number;
+    /**
+     * ZuWo Wihtigkeit und Zustand
+     * Die Zuwo-Daten der Strecken werden an die Stromkreisabschnitte propagiert.
+     * */
     getZuWoScore(type: 'wichtigkeit' | 'zustand'): number;
     toJSON(): any;
     toJSONAttributes(): void;
@@ -14,11 +24,15 @@ export declare class EVWireObject extends AssetContainer {
     setNumber(number: string): string;
     setLength(length: number): string;
     setWireCount(wireCount: number): string;
-    getImportanceScore(): EVImportanceScore | undefined;
+    getImportanceScore(): WNZUWOImportanceScore | undefined;
+    getPriorityScore(): WNZUWOPriority | undefined;
+    getCategoryScore(): AggregateScore | undefined;
+    getKoScore(): AggregateScore | undefined;
     createNewStatementSPARQL(): string;
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
-    protected resolveAttributesFusekiJSON(value: any): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    /** Erstellt ein GeoJSON-Objekt für die Karte */
     toMapGeoJSON(): any;
 }