@enervance/insight-cim-model 0.0.34 → 0.0.35

package/dist/config/westnetz-neplan/callbacks/cb-psr.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PsrCallbacks = void 0;
 const util_search_1 = require("../../../util/util-search");
+const persistence_interfaces_1 = require("../../../interfaces/persistence-interfaces");
+const sparql_utils_1 = require("../../../util/sparql/sparql-utils");
 exports.PsrCallbacks = {
     psrType: (cimModel, psr, data) => {
         const tripleData = { oldTriple: '', newTriple: '' };
@@ -23,19 +25,29 @@ exports.PsrCallbacks = {
         return tripleData;
     },
     lifeCycle: (cimModel, psr, data) => {
-        const tripleData = { oldTriple: '', newTriple: '' };
+        var _a;
+        const tripleData = sparql_utils_1.createTripleDataObject(persistence_interfaces_1.TripleDataKind.compound);
         for (const asset of psr.assets.values()) {
             const propName = data.propName.toLowerCase();
             const propValue = data.propValue;
+            const assetDeploymentUUID = (_a = asset === null || asset === void 0 ? void 0 : asset.assetDeployment) === null || _a === void 0 ? void 0 : _a.mrid;
+            if (!assetDeploymentUUID)
+                continue;
+            tripleData.iri = asset.baseIRI;
+            tripleData.subject = `<${asset.baseIRI}${assetDeploymentUUID}>`;
+            tripleData.predicate = `cim:AssetDeployment.deploymentDate`;
+            tripleData.object = undefined;
+            tripleData.objectCompound = propValue;
             switch (propName) {
                 case 'inservicedate': {
-                    tripleData.oldTriple = asset.setInServiceDate(asset.getInServiceDate());
-                    tripleData.newTriple = asset.setInServiceDate(propValue);
+                    ;
+                    asset.setInServiceDate(propValue);
+                    tripleData.predicateCompound = `cim:DeploymentDate.inServiceDate`;
                     break;
                 }
                 case 'installeddate': {
-                    tripleData.oldTriple = asset.setInstalledDate(asset.getInstalledDate());
-                    tripleData.newTriple = asset.setInstalledDate(propValue);
+                    asset.setInstalledDate(propValue);
+                    tripleData.predicateCompound = `cim:DeploymentDate.installedDate`;
                     break;
                 }
             }

package/dist/config/westnetz-neplan/callbacks/cb-psr.js.map

@@ -1 +1 @@
-{"version":3,"file":"cb-psr.js","sourceRoot":"","sources":["../../../../src/config/westnetz-neplan/callbacks/cb-psr.ts"],"names":[],"mappings":";;;AAIA,2DAA8D;AAKjD,QAAA,YAAY,GAAG;IAC1B,OAAO,EAAE,CAAC,QAAe,EAAE,GAAwB,EAAE,IAAS,EAAc,EAAE;QAC5E,MAAM,UAAU,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAC,CAAC;QAEnD,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC;QACnC,MAAM,cAAc,GAAG,iCAAmB,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtF,IAAG,cAAc,EAAE;YACjB,IAAI;gBACF,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;aAC7I;YAAC,OAAO,CAAC,EAAE,GAAG;SAChB;QACD,IAAG,cAAc,EAAE;YACjB,IAAI;gBACF,MAAM,UAAU,GAAI,cAAqC,CAAC;gBAC1D,UAAU,CAAC,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;aAEnD;YAAC,OAAO,CAAC,EAAE,GAAG;SAChB;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,SAAS,EAAE,CAAC,QAAe,EAAE,GAAwB,EAAE,IAAS,EAAc,EAAE;QAC9E,MAAM,UAAU,GAAG,EAAC,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAC,CAAC;QAElD,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE;YACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YACjC,QAAQ,QAAQ,EAAE;gBAChB,KAAK,eAAe,CAAC,CAAC;oBACpB,UAAU,CAAC,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBACxE,UAAU,CAAC,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;oBACzD,MAAM;iBACP;gBACD,KAAK,eAAe,CAAC,CAAC;oBACpB,UAAU,CAAC,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBACxE,UAAU,CAAC,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;oBACzD,MAAM;iBACP;aACF;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACO,CAAC"}
+{"version":3,"file":"cb-psr.js","sourceRoot":"","sources":["../../../../src/config/westnetz-neplan/callbacks/cb-psr.ts"],"names":[],"mappings":";;;AAIA,2DAA8D;AAC9D,uFAAwF;AAExF,oEAA2E;AAI9D,QAAA,YAAY,GAAG;IAC1B,OAAO,EAAE,CAAC,QAAe,EAAE,GAAwB,EAAE,IAAS,EAAc,EAAE;QAC5E,MAAM,UAAU,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAC,CAAC;QAEnD,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC;QACnC,MAAM,cAAc,GAAG,iCAAmB,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtF,IAAG,cAAc,EAAE;YACjB,IAAI;gBACF,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;aAC7I;YAAC,OAAO,CAAC,EAAE,GAAG;SAChB;QACD,IAAG,cAAc,EAAE;YACjB,IAAI;gBACF,MAAM,UAAU,GAAI,cAAqC,CAAC;gBAC1D,UAAU,CAAC,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;aAEnD;YAAC,OAAO,CAAC,EAAE,GAAG;SAChB;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,SAAS,EAAE,CAAC,QAAe,EAAE,GAAwB,EAAE,IAAS,EAAc,EAAE;;QAC9E,MAAM,UAAU,GAAG,qCAAsB,CAAC,uCAAc,CAAC,QAAQ,CAAC,CAAC;QACnE,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE;YACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YACjC,MAAM,mBAAmB,SAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,eAAe,0CAAE,IAAI,CAAC;YACzD,IAAI,CAAC,mBAAmB;gBAAE,SAAS;YAEnC,UAAU,CAAC,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC;YAC/B,UAAU,CAAC,OAAO,GAAG,IAAI,KAAK,CAAC,OAAO,GAAG,mBAAmB,GAAG,CAAC;YAChE,UAAU,CAAC,SAAS,GAAG,oCAAoC,CAAC;YAC5D,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;YAC9B,UAAU,CAAC,cAAc,GAAG,SAAS,CAAC;YAEtC,QAAQ,QAAQ,EAAE;gBAChB,KAAK,eAAe,CAAC,CAAC;oBAAC,CAAC;oBACtB,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;oBAClC,UAAU,CAAC,iBAAiB,GAAG,kCAAkC,CAAC;oBAElE,MAAM;iBACP;gBACD,KAAK,eAAe,CAAC,CAAC;oBACpB,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;oBAClC,UAAU,CAAC,iBAAiB,GAAG,kCAAkC,CAAC;oBAClE,MAAM;iBACP;aACF;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACO,CAAC"}

package/dist/config/westnetz-neplan/property-handler-westenergy.config.d.ts

@@ -1,59 +1,59 @@
 export declare const PROPERTY_HANDLER_WESTNETZNEPLAN_CONFIG: {
     wn_connectivity_node_s4: {
-        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../..").TripleData;
     };
     wn_connectivity_node_s6: {
-        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../..").TripleData;
     };
     wn_connectivity_node_health_score: {
-        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../..").TripleData;
     };
     wn_connectivity_node_importance_score: {
-        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../..").TripleData;
     };
     wn_connectivity_node_zuwo_analytics: {
-        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode) => import("../..").TripleData;
     };
     wn_connectivity_node_kind: {
-        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../..").TripleData;
     };
     wn_connectivity_node_type: {
-        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../..").TripleData;
     };
     wn_connectivity_node_assetowner: {
-        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../..").TripleData;
     };
     wn_connectivity_node_assetuser: {
-        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, icn: import("../..").ConnectivityNode, data: any) => import("../..").TripleData;
     };
     psrType: {
-        cb: (cimModel: import("../..").Model, psr: import("../..").PowerSystemResource, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, psr: import("../..").PowerSystemResource, data: any) => import("../..").TripleData;
     };
     inServiceDate: {
-        cb: (cimModel: import("../..").Model, psr: import("../..").PowerSystemResource, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, psr: import("../..").PowerSystemResource, data: any) => import("../..").TripleData;
     };
     intalledDate: {
-        cb: (cimModel: import("../..").Model, psr: import("../..").PowerSystemResource, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, psr: import("../..").PowerSystemResource, data: any) => import("../..").TripleData;
     };
     wn_energyconsumer_installed: {
-        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../..").TripleData;
     };
     wn_energyconsumer_measured: {
-        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../..").TripleData;
     };
     wn_energyconsumer_contractual: {
-        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../..").TripleData;
     };
     wn_energyconsumer_sub_measured: {
-        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../..").TripleData;
     };
     wn_energyconsumer_sub_contractual: {
-        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../..").TripleData;
     };
     wn_energyconsumer_trafo1: {
-        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../..").TripleData;
     };
     wn_energyconsumer_trafo2: {
-        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../../interfaces/persistence-interfaces").TripleData;
+        cb: (cimModel: import("../..").Model, ec: import("../..").EnergyConsumer, data: any) => import("../..").TripleData;
     };
 };

package/dist/converter/integral7/converter-i7.d.ts

@@ -119,6 +119,7 @@ export declare class ConverterI7 {
     private addDefaultObjectsLoadModel;
     private addDefaultObjectsGeo;
     private setPowerTransformerEndProperties;
+    private createRatioTapChanger;
     private createPhaseTapChanger;
     private setTapChangerControl;
     private convertTrafoGrounding;

package/dist/converter/integral7/converter-i7.js

@@ -112,6 +112,10 @@ const AsynchronousMachine_1 = require("../../model/wires/AsynchronousMachine");
 const EquivalentBranch_1 = require("../../model/equivalents/EquivalentBranch");
 const AMPRIONLine_1 = require("../../model/extensions/amprion/core/AMPRIONLine");
 const ControlArea_1 = require("../../model/operations/ControlArea");
+const PhaseTapChangerSymmetrical_1 = require("../../model/wires/PhaseTapChangerSymmetrical");
+const RatioTapChangerTable_1 = require("../../model/wires/RatioTapChangerTable");
+const RatioTapChanger_1 = require("../../model/wires/RatioTapChanger");
+const TransformerControlMode_1 = require("../../model/wires/TransformerControlMode");
 class ConverterI7 {
     constructor() {
         this.exportFrames = new Map();
@@ -2555,24 +2559,11 @@ class ConverterI7 {
                     const connectivityNode = cimModel.getObject(cnUUID);
                     for (const powerTransformerEnd of powerTransformerEnds) {
                         const winkel = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${powerTransformerEnd.endNumber}`]);
-                        switch (i7Data.trafo_spezial) {
-                            case (1): {
-                                this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
-                                break;
-                            }
-                            case (2): {
-                                this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
-                                break;
-                            }
-                            default: {
-                                if (winkel !== 0) {
-                                    this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
-                                }
-                                else {
-                                    this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
-                                }
-                                break;
-                            }
+                        if (winkel > 0) {
+                            this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband, false);
+                        }
+                        else {
+                            this.createRatioTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
                         }
                     }
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
@@ -2730,6 +2721,21 @@ class ConverterI7 {
                     powerTransformerEnd3.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd3.endNumber, powerTransformerEnd3.grounded);
                     powerTransformerEnd3.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd3.endNumber);
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
+                    const terminals = [terminal1, terminal2, terminal3];
+                    const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2, powerTransformerEnd3];
+                    const spRegKnoten = yield this.getSpannungsbandTrafo2W(i7Data);
+                    const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
+                    const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
+                    const connectivityNode = cimModel.getObject(cnUUID);
+                    for (const powerTransformerEnd of powerTransformerEnds) {
+                        const winkel = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${powerTransformerEnd.endNumber}`]);
+                        if (winkel > 0) {
+                            this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband, true);
+                        }
+                        else {
+                            this.createRatioTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
+                        }
+                    }
                     cimModel.addPowerTransformer(powerTransformer);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
@@ -2764,9 +2770,10 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const bdModelUUID = frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD);
             const relevantMasFrames = masFrames.filter(elem => {
-                const modelUUIDs = elem.dependentModels.get(rdf_xml_1.RDF_XML.PROFILE_EQ_BD);
-                if ((modelUUIDs === null || modelUUIDs === void 0 ? void 0 : modelUUIDs.indexOf(bdModelUUID)) > -1)
-                    return elem;
+                for (const modelUUIDs of elem.dependentModels.values()) {
+                    if ((modelUUIDs === null || modelUUIDs === void 0 ? void 0 : modelUUIDs.indexOf(bdModelUUID)) > -1)
+                        return elem;
+                }
             });
             const cimModel = frame.cimModel;
             const substations = Array.from(cimModel.substations.values());
@@ -2811,8 +2818,8 @@ class ConverterI7 {
                     cimModel.removeObject(equipment);
                 }
                 const location = substation.location;
-                let cnt = 1;
-                for (const connectivityNode of connectivityNodes) {
+                for (let i = 0; i < connectivityNodes.length; i++) {
+                    const connectivityNode = connectivityNodes[i];
                     connectivityNode.connectivityNodeContainer = line;
                     line.addConnectivityNode(connectivityNode);
                     const junction = new Junction_1.Junction(utils_1.generateUUID(), `${line.name}_BD-J`, `Junction`, 'Junction for Geo');
@@ -2821,23 +2828,19 @@ class ConverterI7 {
                     junction.terminals.set(terminal.getUUID(), terminal);
                     terminal.conductingEquipment = junction;
                     line.addEquipment(junction);
-                    if (location && location.positionPoints.length > 0) {
-                        for (const masFrame of relevantMasFrames) {
-                            const clonedLocation = new Location_1.Location(utils_1.generateUUID(), `Location ${cnt}`);
-                            clonedLocation.addPowerSystemResource(junction);
-                            clonedLocation.coordinateSystem = location.coordinateSystem;
-                            const clonedPositionPoint = new PositionPoint_1.PositionPoint(utils_1.generateUUID(), `PositionPoint ${cnt}`);
-                            clonedPositionPoint.xPosition = location.positionPoints[0].xPosition;
-                            clonedPositionPoint.yPosition = location.positionPoints[0].yPosition;
-                            clonedPositionPoint.location = clonedLocation;
-                            clonedLocation.addPositionPoint(clonedPositionPoint);
-                            masFrame.cimModel.addLocation(clonedLocation);
-                            masFrame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_GL, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
-                        }
+                    if (location && location.positionPoints.length) {
+                        const clonedLocation = new Location_1.Location(utils_1.generateUUID(), `Location_${i + 1}`);
+                        clonedLocation.addPowerSystemResource(junction);
+                        clonedLocation.coordinateSystem = location.coordinateSystem;
+                        const clonedPositionPoint = new PositionPoint_1.PositionPoint(utils_1.generateUUID(), `PositionPoint ${i + 1}`);
+                        clonedPositionPoint.xPosition = location.positionPoints[0].xPosition;
+                        clonedPositionPoint.yPosition = location.positionPoints[0].yPosition;
+                        clonedPositionPoint.location = clonedLocation;
+                        clonedLocation.addPositionPoint(clonedPositionPoint);
+                        cimModel.addLocation(clonedLocation);
                     }
                     cimModel.addTerminal(terminal);
                     cimModel.addJunction(junction);
-                    cnt++;
                 }
                 if (location && location.powerSystemResources.size && location.powerSystemResources.get(substation.mrid) !== undefined) {
                     location.powerSystemResources.delete(substation.mrid);
@@ -3477,14 +3480,122 @@ class ConverterI7 {
         powerTransformerEnd.powerTransformer = powerTransformer;
         powerTransformer.addPowerTransformerEnd(powerTransformerEnd);
     }
-    createPhaseTapChanger(i7Data, transformerEnd, cimModel, neutralU, connectivityNode, spannungsband) {
+    createRatioTapChanger(i7Data, transformerEnd, cimModel, neutralU, connectivityNode, spannungsband) {
+        var _a, _b;
+        const wicklungsnummer = transformerEnd.endNumber;
+        const gestufteSeite = i7Data[`gestufte_seite_s${wicklungsnummer}`] === 0 ? 1 : i7Data[`gestufte_seite_s${wicklungsnummer}`];
+        if (gestufteSeite === wicklungsnummer) {
+            const lowStep = i7Data[`minstufe_s${transformerEnd.endNumber}`];
+            const highStep = i7Data[`maxstufe_s${transformerEnd.endNumber}`];
+            const neutralStep = i7Data[`mittelstufe_s${transformerEnd.endNumber}`];
+            const currentStep = i7Data[`aktstufe_s${transformerEnd.endNumber}`];
+            const i7TapArray = utils_2.getTapChangerStepArray(lowStep, highStep);
+            const mappedCurrentStep = i7TapArray.indexOf(currentStep) + 1;
+            const lowerVoltageStepCount = utils_2.getTapChangerStepCount(lowStep, neutralStep);
+            const increaseVoltageStepCount = utils_2.getTapChangerStepCount(neutralStep, highStep);
+            const lowerVoltageStepIncrement = Math.abs(i7Data[`umin_s${transformerEnd.endNumber}`]) / lowerVoltageStepCount * -1;
+            let increaseVoltageStepIncrement = Math.abs(i7Data[`umax_s${transformerEnd.endNumber}`]) / lowerVoltageStepCount;
+            increaseVoltageStepIncrement = isNaN(increaseVoltageStepIncrement) ? 1 : increaseVoltageStepIncrement;
+            const ratioTapChangerTable = new RatioTapChangerTable_1.RatioTapChangerTable(utils_1.generateUUID(), `${transformerEnd.name} W${transformerEnd.endNumber}`);
+            for (let i = 0; i < lowerVoltageStepCount; i++) {
+                util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, i + 1, 1 + (lowerVoltageStepIncrement * (lowerVoltageStepCount - i)));
+            }
+            util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, lowerVoltageStepCount + 1, 1);
+            for (let i = 0; i < increaseVoltageStepCount; i++) {
+                const step = (lowerVoltageStepCount + 1) + (i + 1);
+                util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, step, 1 + (increaseVoltageStepIncrement * (i + 1)));
+            }
+            const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger(utils_1.generateUUID(), `${transformerEnd.name} W${transformerEnd.endNumber}`);
+            ratioTapChanger.stepVoltageIncrement = increaseVoltageStepIncrement;
+            ratioTapChanger.tculControlMode = TransformerControlMode_1.TransformerControlMode.volt;
+            ratioTapChanger.ltcFlag = false;
+            ratioTapChanger.lowStep = 1;
+            ratioTapChanger.highStep = ratioTapChangerTable.ratioTapChangerTablePoints.length;
+            ratioTapChanger.neutralStep = i7TapArray.indexOf(neutralStep) + 1;
+            ratioTapChanger.normalStep = ratioTapChanger.neutralStep;
+            ratioTapChanger.step = mappedCurrentStep;
+            ratioTapChanger.transformerEnd = transformerEnd;
+            transformerEnd.ratioTapChanger = ratioTapChanger;
+            ratioTapChanger.neutralU = neutralU;
+            ratioTapChanger.ratioTapChangerTableUUID = ratioTapChangerTable.mrid;
+            ratioTapChangerTable.ratioTapChanger = ratioTapChanger;
+            const regelung = +i7Data[`regelung_s${transformerEnd.endNumber}`];
+            if (regelung > 0) {
+                const tapChangerControl = new TapChangerControl_1.TapChangerControl(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                tapChangerControl.discrete = true;
+                const umax = utils_2.getSpannungsband('umax', spannungsband, neutralU);
+                const umin = utils_2.getSpannungsband('umin', spannungsband, neutralU);
+                const usoll = utils_2.getSpannungsband('usoll', spannungsband, (umax + umin) / 2);
+                const pVorgabe = utils_2.isNumericI7(i7Data[`p_vorgabe`]) ? +i7Data[`p_vorgabe`] : undefined;
+                switch (regelung) {
+                    case 1: {
+                        ratioTapChanger.controlEnabled = true;
+                        tapChangerControl.enabled = true;
+                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
+                        tapChangerControl.targetValue = usoll;
+                        tapChangerControl.targetDeadband = umax - usoll;
+                        tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
+                        break;
+                    }
+                    case 2: {
+                        ratioTapChanger.controlEnabled = true;
+                        tapChangerControl.enabled = true;
+                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.activePower;
+                        tapChangerControl.targetValue = pVorgabe;
+                        tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.M;
+                        break;
+                    }
+                    case 3: {
+                        ratioTapChanger.controlEnabled = true;
+                        tapChangerControl.enabled = true;
+                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.currentFlow;
+                        break;
+                    }
+                    case 4: {
+                        ratioTapChanger.controlEnabled = true;
+                        tapChangerControl.enabled = true;
+                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.reactivePower;
+                        tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.M;
+                        break;
+                    }
+                }
+                ratioTapChanger.tapChangerControl = tapChangerControl;
+                tapChangerControl.addTapChanger(ratioTapChanger);
+                cimModel.addTapChangerControl(tapChangerControl);
+            }
+            else {
+                ratioTapChanger.controlEnabled = false;
+            }
+            if ((_a = connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.terminals) === null || _a === void 0 ? void 0 : _a.size) {
+                const terminal = [...connectivityNode.terminals.values()].find(elem => elem.connected);
+                if (terminal)
+                    this.setTapChangerControl(ratioTapChanger, terminal);
+            }
+            if (!((_b = ratioTapChanger.tapChangerControl) === null || _b === void 0 ? void 0 : _b.terminal)) {
+                this.logger.error(`Trafo ${i7Data.trafo3w}: Kein Terminal für TapChangerControl`);
+                if (transformerEnd.phaseTapChanger) {
+                    transformerEnd.phaseTapChanger.tapChangerControl = undefined;
+                    transformerEnd.phaseTapChanger.tapChangerControlUUID = undefined;
+                }
+            }
+            cimModel.addRatioTapChanger(ratioTapChanger);
+            cimModel.addRatioTapChangerTable(ratioTapChangerTable);
+        }
+    }
+    createPhaseTapChanger(i7Data, transformerEnd, cimModel, neutralU, connectivityNode, spannungsband, is3WTransformer) {
         var _a, _b;
         const wicklungsnummer = transformerEnd.endNumber;
         const gestufteSeite = i7Data[`gestufte_seite_s${wicklungsnummer}`] === 0 ? 1 : i7Data[`gestufte_seite_s${wicklungsnummer}`];
         if (gestufteSeite === wicklungsnummer) {
-            const spezialregelung = i7Data.trafo_spezial;
             let phaseTapChanger;
+            const spezialregelung = i7Data.trafo_spezial ? i7Data.trafo_spezial : (is3WTransformer ? 2 : undefined);
             switch (spezialregelung) {
+                case (1): {
+                    const phaseTapChangerSync = new PhaseTapChangerSymmetrical_1.PhaseTapChangerSymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                    phaseTapChanger = phaseTapChangerSync;
+                    cimModel.addPhaseTapChangerSymmetrical(phaseTapChangerSync);
+                    break;
+                }
                 case (2): {
                     const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
                     phaseTapChangerAsync.windingConnectionAngle = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${transformerEnd.endNumber}`]);