@enervance/insight-cim-model 0.0.61 → 0.0.63

package/dist/etl/etl-neplan/etl-neplan.js

@@ -1,119 +1,331 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTrafoApprentPower = exports.parseFusekiData = exports.loadFusekiData = exports.getEnergyConsumerSPARQL = exports.determineMeasuredContractualPower = exports.getUnifiedEnergyConsumersNames = exports.transformEnergyConsumers = exports.addNeplanFacilities = void 0;
-const tslib_1 = require("tslib");
-const fetch = tslib_1.__importStar(require("node-fetch"));
+exports.getTrafoApprentPower = exports.parseFusekiData = exports.loadFusekiData = exports.getEnergyConsumerSPARQL = exports.determineMeasuredContractualPower = exports.getUnifiedEnergyConsumersNames = exports.NeplanModelEnrichment = void 0;
+const fetch = require("node-fetch");
 const index_1 = require("../../index");
-const EVImportanceScore_1 = require("../../model/extensions/enervance/assets/EVImportanceScore");
-const HealthScore_1 = require("../../model/assets/HealthScore");
 const sparql_utils_1 = require("../../util/sparql/sparql-utils");
-const EVAnalytic_1 = require("../../model/extensions/enervance/assets/EVAnalytic");
-const AnalyticKind_1 = require("../../model/assets/AnalyticKind");
-const utils_1 = require("../../util/utils");
 const AssetDeployment_1 = require("../../model/assets/AssetDeployment");
-function addNeplanFacilities(cimModel, graphURI, limit) {
-    const createObjectsSPARQL = [];
-    const setValueSPARQL = [];
-    const addReleationsSPARQL = [];
-    for (const cn of cimModel.connectivityNodes.values()) {
-        const facility = new index_1.WNFacility(index_1.generateUUID(), cn.mrid, '', '', cn.baseIRI);
-        createObjectsSPARQL.push(facility.createNewStatementSPARQL());
-        addReleationsSPARQL.push(facility.addConnectivityNode(cn));
-        const healthScore = new HealthScore_1.HealthScore(index_1.generateUUID(), facility.mrid, '', '', cn.baseIRI);
-        const importanceScore = new EVImportanceScore_1.EVImportanceScore(index_1.generateUUID(), facility.mrid, '', '', cn.baseIRI);
-        createObjectsSPARQL.push(healthScore.createNewStatementSPARQL());
-        createObjectsSPARQL.push(importanceScore.createNewStatementSPARQL());
-        addReleationsSPARQL.push(healthScore.setAsset(facility));
-        addReleationsSPARQL.push(importanceScore.setAsset(facility));
-        const analytic = new EVAnalytic_1.EVAnalytic(index_1.generateUUID(), undefined, undefined, undefined, cn.baseIRI);
-        createObjectsSPARQL.push(analytic.createNewStatementSPARQL());
-        addReleationsSPARQL.push(analytic.setAsset(facility));
-        addReleationsSPARQL.push(analytic.setKind(AnalyticKind_1.AnalyticKind.replacementAnalytic));
-        setValueSPARQL.push(analytic.setValue(0));
-    }
-    const energyConnections = [...cimModel.energySources.values()];
-    for (const ec of energyConnections) {
-        const facility = new index_1.WNFacility(index_1.generateUUID(), ec.name, '', '', ec.baseIRI);
-        const assetDeployment = new AssetDeployment_1.AssetDeployment(index_1.generateUUID(), ec.name, '', '', ec.baseIRI);
-        createObjectsSPARQL.push(facility.createNewStatementSPARQL());
-        addReleationsSPARQL.push(facility.addPowerSystemResource(ec));
-        createObjectsSPARQL.push(assetDeployment.createNewStatementSPARQL());
-        addReleationsSPARQL.push(assetDeployment.setAsset(facility));
-    }
-    const length = createObjectsSPARQL.length + setValueSPARQL.length + addReleationsSPARQL.length;
-    const insertDataStatement = [];
-    if (limit && length) {
-        const intervalDataCreateObjects = utils_1.splitArrayIntoChunks(createObjectsSPARQL, limit);
-        const intervalDataCreateAssociations = utils_1.splitArrayIntoChunks(addReleationsSPARQL, limit);
-        const intervalDataInsertValues = utils_1.splitArrayIntoChunks(setValueSPARQL, limit);
-        insertDataStatement.push(...sparql_utils_1.createSPARQLStatement('INSERT_DATA', graphURI, intervalDataCreateObjects), ...sparql_utils_1.createSPARQLStatement('INSERT_DATA', graphURI, intervalDataCreateAssociations), ...sparql_utils_1.createSPARQLStatement('INSERT_DATA', graphURI, intervalDataInsertValues));
-    }
-    else if (length) {
-        insertDataStatement.push(`
+class NeplanModelEnrichment {
+    /**
+     * Ändert (Bestands-)Terminalinstanzen in EVTerminals um
+     * @param modelContainer Netzmodel
+     * */
+    static typeTerminals(modelContainer) {
+        const graphURI = modelContainer.getGraphURI();
+        const deleteRdfTypes = new Array();
+        const insertRdfType = new Array();
+        for (const terminal of modelContainer.terminals.values()) {
+            /**
+             * Aufgrund der Erweiterung rdf:type von cim:ConnectivityNode zu westnetzneplan:WNConnectivityNode wechseln. */
+            deleteRdfTypes.push(`<${terminal.baseIRI}${terminal.mrid}> rdf:type cim:Terminal .`);
+            insertRdfType.push(`<${terminal.baseIRI}${terminal.mrid}> rdf:type enervance:EVTerminal .`);
+        }
+        const length = insertRdfType.length + deleteRdfTypes.length;
+        const insertDataStatement = [];
+        if (length) {
+            insertDataStatement.push(`
             PREFIX rdf:             <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
             PREFIX enervance:       <http://enervance.com/CIM/Extensions#> 
             PREFIX cim:             <http://iec.ch/TC57/2013/CIM-schema-cim16#>
             PREFIX westnetzneplan:  <http://westnetzneplan.de/CIM/Extensions#>
             
-            ${sparql_utils_1.getInsertDataPartStatement(graphURI, [...createObjectsSPARQL, ...addReleationsSPARQL, ...setValueSPARQL])}
+            ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, insertRdfType)}
+            ${(0, index_1.getDeleteDataPartStatement)(graphURI, deleteRdfTypes)}
         `);
+        }
+        return insertDataStatement;
     }
-    return insertDataStatement;
-}
-exports.addNeplanFacilities = addNeplanFacilities;
-function transformEnergyConsumers(cimModelXML, graphURI, limit) {
-    const sparqlUpdates = [];
-    const tpEnergyConsumerMap = getUnifiedEnergyConsumersNames(cimModelXML);
-    if (tpEnergyConsumerMap.size > 0) {
-        for (const entry of tpEnergyConsumerMap.entries()) {
-            const unifiedName = entry[0];
-            const energyConsumers = entry[1];
-            const energyConsumerUnified = determineMeasuredContractualPower(unifiedName, energyConsumers);
-            if (energyConsumerUnified.size > 0) {
-                const sparqlUpdate = getEnergyConsumerSPARQL(energyConsumerUnified, unifiedName, graphURI, limit);
-                sparqlUpdates.push(sparqlUpdate);
+    static rearrangeVoltageLevels(modelContainer) {
+        const graphURI = modelContainer.getGraphURI();
+        const deleteSparql = new Array();
+        const insertSparql = new Array();
+        const processedNodes = new Set();
+        const nodesToCombine = new Array();
+        /** 1) Alle zusammengehörige CNs und CunductingEquipments bestimmen */
+        for (const connectivityNode of modelContainer.connectivityNodes.values()) {
+            if (!processedNodes.has(connectivityNode.getUUID())) {
+                const objectsFound = NeplanModelEnrichment.getVoltageLevelObjects(connectivityNode);
+                nodesToCombine.push(objectsFound);
+                objectsFound.forEach(it => {
+                    processedNodes.add(it.getUUID());
+                });
             }
         }
+        /** 2) Slack Vls von den übrigen Vls trennen  */
+        const slackVls = new Map();
+        const nonSlackVls = new Map();
+        for (const nodes of nodesToCombine) {
+            // Umspannanlagen mit Slacks beleiben unverändert
+            const slackSubstation = nodes.some(it => it instanceof index_1.ExternalNetworkInjection);
+            nodes.forEach(it => {
+                if (it instanceof index_1.ConnectivityNode) {
+                    const vl = it.connectivityNodeContainer;
+                    if (slackSubstation)
+                        slackVls.set(vl?.getUUID(), vl);
+                    else
+                        nonSlackVls.set(vl?.getUUID(), vl);
+                }
+                else if (it instanceof index_1.ConductingEquipment) {
+                    const vl = it.equipmentContainer;
+                    if (slackSubstation)
+                        slackVls.set(vl?.getUUID(), vl);
+                    else
+                        nonSlackVls.set(vl?.getUUID(), vl);
+                }
+                else {
+                    console.log(`rearrangeVoltageLevels unknown class ${typeof it}`);
+                }
+            });
+        }
+        /** 3) Zusammengefasse Equipments zu einem neuen VLs zuordnen */
+        const removedVls = new Set();
+        for (const nodes of nodesToCombine) {
+            const slackSubstation = nodes.some(it => it instanceof index_1.ExternalNetworkInjection);
+            if (slackSubstation)
+                continue;
+            const connectivityNodes = nodes.filter(it => it instanceof index_1.ConnectivityNode);
+            const condEquipments = nodes.filter(it => it instanceof index_1.ConductingEquipment);
+            const newVoltageLevelUUID = index_1.CommonUtils.generateUUID();
+            const newSubstationUUID = index_1.CommonUtils.generateUUID();
+            const baseVoltage = connectivityNodes?.find(it => it.getBaseVoltage() !== undefined)?.getBaseVoltage();
+            const tp = connectivityNodes?.find(it => it.name.length === 21)?.name;
+            const name = tp ? tp : connectivityNodes?.find(it => it.name)?.name;
+            const baseURL = modelContainer.getBaseURL();
+            insertSparql.push(`<${baseURL}${newSubstationUUID}> rdf:type cim:Substation .`);
+            insertSparql.push(`<${baseURL}${newSubstationUUID}> cim:IdentifiedObject.name '${name}' .`);
+            insertSparql.push(`<${baseURL}${newVoltageLevelUUID}> rdf:type cim:VoltageLevel .`);
+            insertSparql.push(`<${baseURL}${newVoltageLevelUUID}> cim:IdentifiedObject.name '${name}' .`);
+            insertSparql.push(`<${baseURL}${newVoltageLevelUUID}> cim:VoltageLevel.Substation <${baseURL}${newSubstationUUID}> .`);
+            insertSparql.push(`<${baseURL}${newVoltageLevelUUID}> cim:VoltageLevel.BaseVoltage <${baseVoltage.baseIRI}${baseVoltage?.getUUID()}> .`);
+            connectivityNodes.forEach(it => {
+                const voltageLevel = it.connectivityNodeContainer;
+                // Lösche Vl, wenn kein SlackVL
+                if (nonSlackVls.has(voltageLevel?.getUUID()) && !removedVls.has(voltageLevel?.getUUID())) {
+                    deleteSparql.push(`<${voltageLevel.baseIRI}${voltageLevel.getUUID()}> rdf:type cim:VoltageLevel .`);
+                    removedVls.add(voltageLevel.getUUID());
+                }
+                deleteSparql.push(`<${it.baseIRI}${it.getUUID()}> cim:ConnectivityNode.ConnectivityNodeContainer <${voltageLevel?.baseIRI}${voltageLevel.getUUID()}> .`);
+                insertSparql.push(`<${it.baseIRI}${it.getUUID()}> cim:ConnectivityNode.ConnectivityNodeContainer <${baseURL}${newVoltageLevelUUID}> .`);
+            });
+            condEquipments.forEach(it => {
+                const voltageLevel = it.equipmentContainer;
+                // Lösche Vl, wenn kein SlackVL
+                if (nonSlackVls.has(voltageLevel?.getUUID()) && !removedVls.has(voltageLevel?.getUUID())) {
+                    deleteSparql.push(`<${voltageLevel.baseIRI}${voltageLevel.getUUID()}> rdf:type cim:VoltageLevel .`);
+                    removedVls.add(voltageLevel.getUUID());
+                }
+                deleteSparql.push(`<${it.baseIRI}${it.getUUID()}> cim:Equipment.EquipmentContainer <${it.baseIRI}${voltageLevel.getUUID()}> .`);
+                insertSparql.push(`<${it.baseIRI}${it.getUUID()}> cim:Equipment.EquipmentContainer <${baseURL}${newVoltageLevelUUID}> .`);
+            });
+        }
+        const length = insertSparql.length + deleteSparql.length;
+        const insertDataStatement = [];
+        if (length) {
+            insertDataStatement.push(`
+            PREFIX rdf:             <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+            PREFIX enervance:       <http://enervance.com/CIM/Extensions#> 
+            PREFIX cim:             <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+            PREFIX westnetzneplan:  <http://westnetzneplan.de/CIM/Extensions#>
+            
+            ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, insertSparql)}
+            ${(0, index_1.getDeleteDataPartStatement)(graphURI, deleteSparql)}
+        `);
+        }
+        return insertDataStatement;
     }
-    else {
-        console.log(`tpEnergyConsumerMap.size ${tpEnergyConsumerMap.size}`);
-    }
-    const insertQueries = [];
-    for (const row of sparqlUpdates) {
-        insertQueries.push(...row.insert);
+    /**
+     * Bestimmen alle zu einem VoltageLevel gehörigen Objekte.
+     * @param startCN Startknoten
+     * @return Ein Array mit zu einem VoltageLevel gehörigen Objekte
+     * */
+    static getVoltageLevelObjects(startCN) {
+        const objectsFound = new Array();
+        let nodesOnCurrentLevel = new Array();
+        let nodesOnNextLevel = new Array(startCN);
+        let nodesVisited = [];
+        while (nodesOnNextLevel.length) {
+            nodesOnCurrentLevel.length = 0;
+            nodesOnCurrentLevel = [...nodesOnNextLevel];
+            /** next level nodes leeren */
+            nodesOnNextLevel.length = 0;
+            for (const currentNode of nodesOnCurrentLevel) {
+                objectsFound.push(currentNode);
+                nodesVisited.push(currentNode.getUUID());
+                for (const terminal of currentNode.terminals.values()) {
+                    /** Terminal traversierbar und nicht besucht */
+                    if (nodesVisited.indexOf(terminal.getUUID()) > -1)
+                        continue;
+                    const terminalConductingEquipment = terminal.conductingEquipment;
+                    if (nodesVisited.indexOf(terminalConductingEquipment?.getUUID()) === -1) {
+                        let toAdd = true;
+                        /** Stromkreisabschnitte mit einer Länge von 0.001 oder 0 werden häufig als Hilfselemente verwendet innerhalb von Stationen verwendet.
+                         * Daher werden derartige Stromkreisabschnitte als Bestandteil von Station berücksichtigt.
+                         * Es gibt Stromkreisabschnitte mit einer kürzeren Länge. Die Letzteren sind 'korrekte' Abschnitte.
+                         * */
+                        if (terminalConductingEquipment instanceof index_1.ACLineSegment) {
+                            if (terminalConductingEquipment.length !== 0.001) {
+                                toAdd = false;
+                            }
+                        }
+                        if (toAdd) {
+                            nodesOnNextLevel.push(terminalConductingEquipment);
+                        }
+                    }
+                    const terminalConnectivityNode = terminal.connectivityNode;
+                    if (nodesVisited.indexOf(terminalConnectivityNode?.getUUID()) === -1) {
+                        nodesOnNextLevel.push(terminalConnectivityNode);
+                    }
+                }
+            }
+        }
+        return objectsFound;
     }
-    const deleteWhereQueries = [];
-    for (const row of sparqlUpdates) {
-        deleteWhereQueries.push(...row.deleteWhere);
+    /**
+     *  Erstellt für ConnectivityNodes das Assetmodell.
+     * @param modelContainer Netzmodel
+     * */
+    static createAssetModelConnectivityNode(modelContainer) {
+        const graphURI = modelContainer.getGraphURI();
+        const createObjectsSPARQL = [];
+        const setValueSPARQL = [];
+        const addReleationsSPARQL = [];
+        const deleteRdfTypes = new Array();
+        const insertRdfType = new Array();
+        for (const cn of modelContainer.connectivityNodes.values()) {
+            const facility = new index_1.WNFacility((0, index_1.generateUUID)(), cn.mrid, '', '', cn.baseIRI);
+            /** CN <-> Facility */
+            createObjectsSPARQL.push(facility.createNewStatementSPARQL());
+            addReleationsSPARQL.push(facility.addConnectivityNode(cn));
+            /**
+             * Aufgrund der Erweiterung rdf:type von cim:ConnectivityNode zu westnetzneplan:WNConnectivityNode wechseln.
+             * */
+            deleteRdfTypes.push(`<${cn.baseIRI}${cn.mrid}> rdf:type cim:ConnectivityNode .`);
+            insertRdfType.push(`<${cn.baseIRI}${cn.mrid}> rdf:type westnetzneplan:WNConnectivityNode .`);
+        }
+        const length = createObjectsSPARQL.length + setValueSPARQL.length + addReleationsSPARQL.length;
+        const insertDataStatement = [];
+        if (length) {
+            insertDataStatement.push(`
+            PREFIX rdf:             <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+            PREFIX enervance:       <http://enervance.com/CIM/Extensions#> 
+            PREFIX cim:             <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+            PREFIX westnetzneplan:  <http://westnetzneplan.de/CIM/Extensions#>
+            
+            ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, [...createObjectsSPARQL, ...addReleationsSPARQL, ...setValueSPARQL, ...insertRdfType])}
+            ${(0, index_1.getDeleteDataPartStatement)(graphURI, deleteRdfTypes)}
+        `);
+        }
+        return insertDataStatement;
     }
-    const deleteWhereValuesQueries = [];
-    for (const row of sparqlUpdates) {
-        deleteWhereValuesQueries.push(...row.deleteWhereValues);
+    /**
+     *  Erstellt für EnergySources das Assetmodell.
+     * @param modelContainer Netzmodel
+     * */
+    static createAssetModelEnergySources(modelContainer) {
+        const graphURI = modelContainer.getGraphURI();
+        const createObjectsSPARQL = [];
+        const setValueSPARQL = [];
+        const addReleationsSPARQL = [];
+        const energyConnections = [...modelContainer.energySources.values()];
+        for (const ec of energyConnections) {
+            const facility = new index_1.WNFacility((0, index_1.generateUUID)(), ec.name, '', '', ec.baseIRI);
+            const assetDeployment = new AssetDeployment_1.AssetDeployment((0, index_1.generateUUID)(), ec.name, '', '', ec.baseIRI);
+            /** CN <-> Facility */
+            createObjectsSPARQL.push(facility.createNewStatementSPARQL());
+            addReleationsSPARQL.push(facility.addPowerSystemResource(ec));
+            /** AssetDeployment <-> Facility */
+            createObjectsSPARQL.push(assetDeployment.createNewStatementSPARQL());
+            addReleationsSPARQL.push(assetDeployment.setAsset(facility));
+        }
+        const length = createObjectsSPARQL.length + setValueSPARQL.length + addReleationsSPARQL.length;
+        const insertDataStatement = [];
+        if (length) {
+            insertDataStatement.push(`
+            PREFIX rdf:             <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+            PREFIX enervance:       <http://enervance.com/CIM/Extensions#> 
+            PREFIX cim:             <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+            PREFIX westnetzneplan:  <http://westnetzneplan.de/CIM/Extensions#>
+            
+            ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, [...createObjectsSPARQL, ...addReleationsSPARQL, ...setValueSPARQL])}
+        `);
+        }
+        return insertDataStatement;
     }
-    const length = insertQueries.length + deleteWhereQueries.length + deleteWhereValuesQueries.length;
-    const insertDataStatement = [];
-    if (limit && length) {
-        const insertDataChunks = utils_1.splitArrayIntoChunks(insertQueries, limit);
-        const deleteWhereDataChunks = utils_1.splitArrayIntoChunks(deleteWhereQueries, limit);
-        const deleteWhereValuesObjectsChunks = utils_1.splitArrayIntoChunks(deleteWhereValuesQueries, limit);
-        insertDataStatement.push(...sparql_utils_1.createSPARQLStatement('DELETE_WHERE_VALUES', graphURI, deleteWhereDataChunks), ...sparql_utils_1.createSPARQLStatement('DELETE_WHERE', graphURI, deleteWhereValuesObjectsChunks), ...sparql_utils_1.createSPARQLStatement('INSERT_DATA', graphURI, insertDataChunks));
+    /**
+     * Aufgrund der Erweiterung rdf:type von cim:EnergyConsumer
+     * zu westnetzneplan:WNEnergyConsumer wechseln. */
+    static transformEnergyConsumers(modelContainer) {
+        const graphURI = modelContainer.getGraphURI();
+        const deleteRdfTypes = new Array();
+        const insertRdfType = new Array();
+        for (const ec of modelContainer.energyConsumers.values()) {
+            deleteRdfTypes.push(`<${ec.baseIRI}${ec.mrid}> rdf:type cim:EnergyConsumer .`);
+            insertRdfType.push(`<${ec.baseIRI}${ec.mrid}> rdf:type westnetzneplan:WNEnergyConsumer .`);
+        }
+        const length = deleteRdfTypes.length + insertRdfType.length;
+        const insertDataStatement = [];
+        if (length) {
+            insertDataStatement.push(`
+            PREFIX rdf:             <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+            PREFIX cim:             <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+            PREFIX westnetzneplan:  <http://westnetzneplan.de/CIM/Extensions#>
+            
+            ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, insertRdfType)}
+            ${(0, index_1.getDeleteDataPartStatement)(graphURI, deleteRdfTypes)}
+        `);
+        }
+        return insertDataStatement;
     }
-    else if (length) {
-        insertDataStatement.push(`
+    static unifyEnergyConsumers(modelContainer) {
+        const graphURI = modelContainer.getGraphURI();
+        const sparqlUpdates = [];
+        /** key unifiedName, Value -> EnergySourceArray*/
+        const tpEnergyConsumerMap = getUnifiedEnergyConsumersNames(modelContainer);
+        if (tpEnergyConsumerMap.size > 0) {
+            for (const entry of tpEnergyConsumerMap.entries()) {
+                const unifiedName = entry[0];
+                const energyConsumers = entry[1];
+                const energyConsumerUnified = determineMeasuredContractualPower(unifiedName, energyConsumers);
+                if (energyConsumerUnified.size > 0) {
+                    const sparqlUpdate = getEnergyConsumerSPARQL(energyConsumerUnified, unifiedName, graphURI, 0);
+                    sparqlUpdates.push(sparqlUpdate);
+                }
+            }
+        }
+        else {
+            console.log(`tpEnergyConsumerMap.size ${tpEnergyConsumerMap.size}`);
+        }
+        const insertQueries = [];
+        for (const row of sparqlUpdates) {
+            insertQueries.push(...row.insert);
+        }
+        const deleteWhereQueries = [];
+        for (const row of sparqlUpdates) {
+            deleteWhereQueries.push(...row.deleteWhere);
+        }
+        const deleteWhereValuesQueries = [];
+        for (const row of sparqlUpdates) {
+            deleteWhereValuesQueries.push(...row.deleteWhereValues);
+        }
+        const length = insertQueries.length + deleteWhereQueries.length + deleteWhereValuesQueries.length;
+        const insertDataStatement = [];
+        if (length) {
+            insertDataStatement.push(`
                         PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
                         PREFIX cim:<http://iec.ch/TC57/2013/CIM-schema-cim16#>
                         PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
                         PREFIX enervance: <http://enervance.com/CIM/Extensions#>
                         PREFIX westnetzneplan:  <http://westnetzneplan.de/CIM/Extensions#>
 
-                        ${sparql_utils_1.getDeleteWhereValuesPartStatement(graphURI, deleteWhereValuesQueries)}
-                        ${sparql_utils_1.getDeleteWherePartStatement(graphURI, deleteWhereQueries)}
-                        ${sparql_utils_1.getInsertDataPartStatement(graphURI, insertQueries)}
+                        ${(0, sparql_utils_1.getDeleteWhereValuesPartStatement)(graphURI, deleteWhereValuesQueries)}
+                        ${(0, sparql_utils_1.getDeleteWherePartStatement)(graphURI, deleteWhereQueries)}
+                        ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, insertQueries)}
         `);
+        }
+        return insertDataStatement;
     }
-    return insertDataStatement;
 }
-exports.transformEnergyConsumers = transformEnergyConsumers;
+exports.NeplanModelEnrichment = NeplanModelEnrichment;
 function getUnifiedEnergyConsumersNames(cimModelXML) {
     const tpEnergyConsumerMap = new Map();
     for (const ec of cimModelXML.energyConsumers.values()) {
@@ -133,7 +345,14 @@ function getUnifiedEnergyConsumersNames(cimModelXML) {
     return tpEnergyConsumerMap;
 }
 exports.getUnifiedEnergyConsumersNames = getUnifiedEnergyConsumersNames;
+/** B – vertragliche Last der angeschlossenen Niederspannungskunden
+ MB – gemessene Last der angeschlossenen Niederspannungskunden
+ V – vertragliche Last des Mittelspannungskunden
+ M – gemessene Last des Mittelspannungskunden
+ T – Trafo-Leistung
+ */
 function determineMeasuredContractualPower(unifiedName, energyConsumer) {
+    /** key consolidated | remove */
     const result = new Map();
     if (energyConsumer.length > 0) {
         let energyConsumerMain = energyConsumer[0];
@@ -145,6 +364,7 @@ function determineMeasuredContractualPower(unifiedName, energyConsumer) {
                 }
             }
         }
+        // energyConsumerMain.cosPhi = energyConsumerMain.p / energyConsumerMain.getTypedApparentPower('default');
         const ecToRemove = energyConsumer.filter(ec => ec.mrid !== energyConsumerMain.mrid);
         result.set('consolidated', energyConsumerMain);
         result.set('remove', ecToRemove);
@@ -162,13 +382,13 @@ function determineMeasuredContractualPower(unifiedName, energyConsumer) {
                     break;
                 }
                 case 'MB': {
-                    energyConsumerMain.subMeasuredP = ec.p / 1000;
-                    energyConsumerMain.subMeasuredQ = ec.q / 1000;
+                    energyConsumerMain.subMeasuredP = ec.p / 1000; // da in Neplan kW -> Umrechnung in MW
+                    energyConsumerMain.subMeasuredQ = ec.q / 1000; // da in Neplan kVAr -> Umrechnung in MVAr
                     break;
                 }
                 case 'VB': {
-                    energyConsumerMain.subContractualP = ec.p / 1000;
-                    energyConsumerMain.subContractualQ = ec.q / 1000;
+                    energyConsumerMain.subContractualP = ec.p / 1000; // da in Neplan kW -> Umrechnung in MW
+                    energyConsumerMain.subContractualQ = ec.q / 1000; // da in Neplan kVAr -> Umrechnung in MVAr
                     break;
                 }
                 case '-T': {
@@ -204,6 +424,7 @@ function determineMeasuredContractualPower(unifiedName, energyConsumer) {
         }
     }
     return result;
+    // const regexTrafo = /-T\d*/;
 }
 exports.determineMeasuredContractualPower = determineMeasuredContractualPower;
 function getEnergyConsumerSPARQL(result, unifiedName, graphURI, limit) {
@@ -213,20 +434,40 @@ function getEnergyConsumerSPARQL(result, unifiedName, graphURI, limit) {
     const deleteWhereQueries = [];
     const deleteQueries = [];
     const deleteObjectsQueries = [];
+    /** Die Alten Leistungsabgaben löschen und umgerechnete persistieren */
+    // const type = wnEnergyConsumerUnified.name.substr(wnEnergyConsumerUnified.name.length - 2, 2);
+    /** Mettelspannung gemessene Last
+     * unterlagerte Last Trafo * 0.65*/
     const midVoltagePower = wnEnergyConsumerUnified.getTypedApparentPower('wn_energyconsumer_measured');
     const aggLoad = midVoltagePower + getTrafoApprentPower(wnEnergyConsumerUnified) * 0.65;
     const cosPhi = wnEnergyConsumerUnified.getCosPhi();
     const aggLoadP = aggLoad * cosPhi;
     const aggLoadQ = Math.sqrt(Math.pow(aggLoad, 2) - Math.pow(aggLoadP, 2));
-    deleteWhereQueries.push(sparql_utils_1.getDeleteWhereObjectSPARQL(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'cim', 'EnergyConsumer', 'p'));
-    deleteWhereQueries.push(sparql_utils_1.getDeleteWhereObjectSPARQL(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'cim', 'EnergyConsumer', 'q'));
+    deleteWhereQueries.push((0, sparql_utils_1.getDeleteWhereObjectSPARQL)(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'cim', 'EnergyConsumer', 'p'));
+    deleteWhereQueries.push((0, sparql_utils_1.getDeleteWhereObjectSPARQL)(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'cim', 'EnergyConsumer', 'q'));
+    /** Umgerechnete P und q Werte  */
     wnEnergyConsumerUnified.p = isNaN(aggLoadP) ? 0 : +aggLoadP.toFixed(4);
     wnEnergyConsumerUnified.q = isNaN(aggLoadQ) ? 0 : +aggLoadQ.toFixed(4);
     insertQueries.push(wnEnergyConsumerUnified.getPropertySparqlTriple(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'cim', 'EnergyConsumer', 'p', wnEnergyConsumerUnified.p + ''));
     insertQueries.push(wnEnergyConsumerUnified.getPropertySparqlTriple(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'cim', 'EnergyConsumer', 'q', wnEnergyConsumerUnified.q + ''));
+    /** Abgangsskalierte Last */
     insertQueries.push(wnEnergyConsumerUnified.setP(wnEnergyConsumerUnified.p, 'wn_energyconsumer_feeder_scaled'));
     insertQueries.push(wnEnergyConsumerUnified.setQ(wnEnergyConsumerUnified.q, 'wn_energyconsumer_feeder_scaled'));
-    deleteWhereQueries.push(sparql_utils_1.getDeleteWhereObjectSPARQL(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'cim', 'IdentifiedObject', 'name'));
+    /** IGP Last */
+    /** gemessene Last der angeschlossenen Niederspannungskunden + gemessene Last des Mittelspannungskunden */
+    const vP = isNaN(wnEnergyConsumerUnified.contractualP) ? 0 : wnEnergyConsumerUnified.contractualP;
+    const vbP = isNaN(wnEnergyConsumerUnified.subMeasuredP) ? 0 : wnEnergyConsumerUnified.subMeasuredP;
+    const qP = isNaN(wnEnergyConsumerUnified.contractualQ) ? 0 : wnEnergyConsumerUnified.contractualQ;
+    const qbP = isNaN(wnEnergyConsumerUnified.subMeasuredQ) ? 0 : wnEnergyConsumerUnified.subMeasuredQ;
+    wnEnergyConsumerUnified.igpP = vP + vbP;
+    wnEnergyConsumerUnified.igpQ = qP + qbP;
+    insertQueries.push(wnEnergyConsumerUnified.getPropertySparqlTriple(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'westnetzneplan', 'WNEnergyConsumer', 'igpP', wnEnergyConsumerUnified.igpP + ''));
+    insertQueries.push(wnEnergyConsumerUnified.getPropertySparqlTriple(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'westnetzneplan', 'WNEnergyConsumer', 'igpQ', wnEnergyConsumerUnified.igpQ + ''));
+    /** alten Namen löschen */
+    // deleteQueries.push(wnEnergyConsumerUnified.getPropertySparqlTriple(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid,'cim', 'IdentifiedObject', 'name', wnEnergyConsumerUnified.name));
+    deleteWhereQueries.push((0, sparql_utils_1.getDeleteWhereObjectSPARQL)(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'cim', 'IdentifiedObject', 'name'));
+    /** neuen Namen einfügen*/
+    /** konsolidierte Leistungswerte einfügen */
     wnEnergyConsumerUnified.name = unifiedName;
     insertQueries.push(wnEnergyConsumerUnified.getPropertySparqlTriple(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'cim', 'IdentifiedObject', 'name', wnEnergyConsumerUnified.name));
     insertQueries.push(wnEnergyConsumerUnified.getPropertySparqlTriple(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'westnetzneplan', 'WNEnergyConsumer', 'contractualP', wnEnergyConsumerUnified.contractualP + ''));
@@ -242,10 +483,22 @@ function getEnergyConsumerSPARQL(result, unifiedName, graphURI, limit) {
     insertQueries.push(wnEnergyConsumerUnified.getPropertySparqlTriple(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'westnetzneplan', 'WNEnergyConsumer', 'powerTransfomer2P', wnEnergyConsumerUnified.powerTransfomer2P + ''));
     insertQueries.push(wnEnergyConsumerUnified.getPropertySparqlTriple(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'westnetzneplan', 'WNEnergyConsumer', 'powerTransfomer2Q', wnEnergyConsumerUnified.powerTransfomer2Q + ''));
     insertQueries.push(wnEnergyConsumerUnified.getPropertySparqlTriple(wnEnergyConsumerUnified.baseIRI, wnEnergyConsumerUnified.mrid, 'westnetzneplan', 'WNEnergyConsumer', 'cosPhi', wnEnergyConsumerUnified.cosPhi + ''));
+    /** alle anderen Lastobjekte löschen */
     for (const delObject of deleteLoadObjects) {
-        deleteObjectsQueries.push(`<${delObject.baseIRI}${delObject.mrid}> rdf:type cim:EnergyConsumer .`);
+        // deleteObjectsQueries.push(delObject.createDeleteStatementSPARQL(graphURI));
+        deleteObjectsQueries.push(`<${delObject.baseIRI}${delObject.mrid}> rdf:type westnetzneplan:WNEnergyConsumer .`);
+        /** die assoziierten DiagramObjects löschen
+         * die Diagramme werden vorerst aus Performancegründen nicht gelöscht*/
+        for (const diagramObject of delObject.diagramObjects) {
+            deleteObjectsQueries.push(`<${diagramObject.baseIRI}${diagramObject.mrid}> rdf:type cim:DiagramObject .`);
+            for (const coor of diagramObject.diagramObjectPoints) {
+                deleteObjectsQueries.push(`<${coor.baseIRI}${coor.mrid}> rdf:type cim:DiagramObjectPoint .`);
+            }
+        }
+        /** die assoziierten Terminals löschen */
         for (const terminal of delObject.terminals.values()) {
-            deleteObjectsQueries.push(`<${terminal.baseIRI}${terminal.mrid}> rdf:type cim:Terminal .`);
+            // deleteObjectsQueries.push(terminal.createDeleteStatementSPARQL(graphURI));
+            deleteObjectsQueries.push(`<${terminal.baseIRI}${terminal.mrid}> rdf:type enervance:EVTerminal .`);
         }
     }
     return {
@@ -255,14 +508,12 @@ function getEnergyConsumerSPARQL(result, unifiedName, graphURI, limit) {
     };
 }
 exports.getEnergyConsumerSPARQL = getEnergyConsumerSPARQL;
-function loadFusekiData(fusekiURI, graphURI, loadConfig, neplanClassDefinitions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield Promise.all(loadConfig.map((className) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const sparqlQuery = neplanClassDefinitions.get(className).getQuerySPARQL(graphURI);
-            const dataResponse = yield fetch(`${fusekiURI}?query=${encodeURIComponent(sparqlQuery)}&format=json`);
-            return yield dataResponse.json();
-        })));
-    });
+async function loadFusekiData(fusekiURI, graphURI, loadConfig, neplanClassDefinitions) {
+    return await Promise.all(loadConfig.map(async (className) => {
+        const sparqlQuery = neplanClassDefinitions.get(className).getQuerySPARQL(graphURI);
+        const dataResponse = await fetch(`${fusekiURI}?query=${encodeURIComponent(sparqlQuery)}&format=json`);
+        return await dataResponse.json();
+    }));
 }
 exports.loadFusekiData = loadFusekiData;
 function parseFusekiData(cimModel, cimFusekiDataRaw, loadConfig, neplanClassDefinitions) {