@enervance/insight-cim-model 0.0.30 → 0.0.31

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

@@ -36,12 +36,23 @@ export interface IDefaultValuesConfig {
     readonly ConformLoadGroup: {
         name: string;
     };
+    readonly ConnectivityNode: {
+        fromEndIsoCode: string;
+        fromEndName: string;
+        fromEndNameTso: string;
+        toEndIsoCode: string;
+        toEndName: string;
+        toEndNameTso: string;
+    };
     readonly CsConverter: {
         pPccControl: string;
         targetAlpha: number;
         targetGamma: number;
         targetIdc: number;
     };
+    readonly CurrentLimit: {
+        ratedCurrent: number;
+    };
     readonly DCConverterUnit: {
         operationMode: string;
     };
@@ -116,6 +127,8 @@ export interface IDefaultValuesConfig {
     };
     readonly IdentifiedObject: {
         name: string;
+        shortName: string;
+        description: string;
     };
     readonly LinearShuntCompensator: {
         bPerSection: number;
@@ -222,6 +235,14 @@ export interface IDefaultValuesConfig {
         modelType: string;
         rotorType: string;
     };
+    readonly TapChanger: {
+        highStep: number;
+        neutralStep: number;
+        normalStep: number;
+        lowStep: number;
+        step: number;
+        neutralU: number;
+    };
     readonly TapChangerTablePoint: {
         b?: number;
         g?: number;
@@ -234,6 +255,7 @@ export interface IDefaultValuesConfig {
         endNumber: number;
         grounded: boolean;
         rground: number;
+        xground: number;
     };
     readonly VsConverter: {
         droop: number;

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

@@ -5,4 +5,7 @@ export interface IObjectMappingConfig {
     readonly Einspeisung: {
         class: 'EnergySource' | 'EquivalentInjection' | 'ExternalNetworkInjection';
     };
+    readonly Randnetzeinspeisung: {
+        class: 'EquivalentInjection' | 'ExternalNetworkInjection';
+    };
 }

package/dist/converter/integral7/interface-i7/data-structures-i7.d.ts

@@ -1,4 +1,16 @@
 /// <reference types="node" />
+import { StandortImpl } from '../model/integral/Standort';
+import { SchaltanlageImpl } from '../model/integral/Schaltanlage';
+import { SchaltanlagenabschnittImpl } from '../model/integral/Schaltanlagenabschnitt';
+import { SchaltfeldImpl } from '../model/integral/Schaltfeld';
+import { KnotenSoImpl } from '../model/integral/KnotenSo';
+import { LeitungImpl } from '../model/integral/Leitung';
+import { ITerminal } from '../../../interfaces/model/core/ITerminal';
+import { EarthFaultCompensator } from '../../../model/wires/EarthFaultCompensator';
+import { PetersenCoil } from '../../../model/wires/PetersenCoil';
+import { Junction } from '../../../model/wires/Junction';
+import { GroundingImpedance } from '../../../model/wires/GroundingImpedance';
+import { IConnectivityNode } from '../../../interfaces/model/core/IConnectivityNode';
 export interface ConverterStatus {
     status: 'successful' | 'error';
     message: string;
@@ -16,19 +28,64 @@ export interface ISchemaValue {
     x: number;
     y: number;
 }
-export interface IUkzNode {
+export interface IExportConfig {
     name: string;
+    isoCode: string;
+    tsoName: string;
     boundary: boolean;
-    isoName: string;
+    objectType: ExportObjectType;
+    objects: IExportObject[];
 }
-export interface IUkzRegion {
+export declare enum ExportObjectType {
+    georegion = "Georegion",
+    subgeoregion = "Subgeoregion"
+}
+export interface IExportObject {
+    name: string;
+}
+export interface ISubGeoregion {
     georegion_id: number;
     subgeoregion_id: boolean;
-    ukzCSV: string;
-    ukzArray: string[];
+    georegion_name: string;
+    subgeoregion_name: string;
 }
 export interface IVoltageLimit {
     usoll: number;
     umin: number;
     umax: number;
 }
+export interface Integral7Model {
+    integralStandorte: Map<number, StandortImpl>;
+    integralSchaltanlagen: Map<number, SchaltanlageImpl>;
+    integralSchaltanlagenAbschnitte: Map<number, SchaltanlagenabschnittImpl>;
+    integralSchaltfelder: Map<number, SchaltfeldImpl>;
+    integralKnotenSo: Map<number, KnotenSoImpl>;
+    integralLeitungen: Map<number, LeitungImpl>;
+    knotenSfIDs: number[];
+    kontenZwIDs: number[];
+    querkupplungIDs: number[];
+    laengskupplungIDs: number[];
+    leitungsAnschlussIDs: number[];
+    trafo2wAnschlussKnotenIDs: number[];
+    trafo3wAnschlussKnotenIDs: number[];
+    hgueAnschlussKnotenIDs: number[];
+    lDrosselAnschlussKnotenIDs: number[];
+    lKondensatorAnschlussKnotenIDs: number[];
+    ersatzZweigAnschlussKnotenIDs: number[];
+    targetVoltages: Map<number, ITargetVoltage>;
+    sternPunktImpModel: SternpunktImpedanzModell;
+}
+export interface ITargetVoltage {
+    usoll: number;
+    umin: number;
+    umax: number;
+}
+export interface SternpunktImpedanzModell {
+    stpSchieneJunctionUUIDs: Map<number, string>;
+    stpSchieneTerminal: Map<number, ITerminal>;
+    junctionUUIDstpImp: Map<string, EarthFaultCompensator>;
+    petersenCoils: Map<string, PetersenCoil>;
+    junctions: Map<string, Junction>;
+    groundingImpedances: Map<string, GroundingImpedance>;
+    connectivityNodes: Map<string, IConnectivityNode>;
+}

package/dist/converter/integral7/interface-i7/data-structures-i7.js

@@ -1,3 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExportObjectType = void 0;
+var ExportObjectType;
+(function (ExportObjectType) {
+    ExportObjectType["georegion"] = "Georegion";
+    ExportObjectType["subgeoregion"] = "Subgeoregion";
+})(ExportObjectType = exports.ExportObjectType || (exports.ExportObjectType = {}));
 //# sourceMappingURL=data-structures-i7.js.map

package/dist/converter/integral7/interface-i7/data-structures-i7.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-structures-i7.js","sourceRoot":"","sources":["../../../../src/converter/integral7/interface-i7/data-structures-i7.ts"],"names":[],"mappings":""}
+{"version":3,"file":"data-structures-i7.js","sourceRoot":"","sources":["../../../../src/converter/integral7/interface-i7/data-structures-i7.ts"],"names":[],"mappings":";;;AA6CA,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,2CAAuB,CAAA;IACvB,iDAA6B,CAAA;AAC/B,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B"}

package/dist/converter/integral7/interface-i7/export-frame-i7.d.ts

@@ -1,18 +1,66 @@
 import { Model } from '../../../model/model/Model';
 import { IXmlSerializers } from '../../../util/xml/xml.serializer';
 import { IDefaultValuesConfig } from './IDefaultValuesConfig';
+import { StandortImpl } from '../model/integral/Standort';
+import { SchaltanlageImpl } from '../model/integral/Schaltanlage';
+import { SchaltanlagenabschnittImpl } from '../model/integral/Schaltanlagenabschnitt';
+import { SchaltfeldImpl } from '../model/integral/Schaltfeld';
+import { KnotenSoImpl } from '../model/integral/KnotenSo';
+import { LeitungImpl } from '../model/integral/Leitung';
+import { ITargetVoltage } from './data-structures-i7';
+import { ITerminal } from '../../../interfaces/model/core/ITerminal';
+import { PetersenCoil } from '../../../model/wires/PetersenCoil';
+import { Junction } from '../../../model/wires/Junction';
+import { GroundingImpedance } from '../../../model/wires/GroundingImpedance';
+import { IConnectivityNode } from '../../../interfaces/model/core/IConnectivityNode';
 export declare class I7ExportFrame {
+    name: string;
+    isoCode: string;
+    tsoName: string;
+    boundary: boolean;
     mas: string;
     profileXmlSerializers: Map<string, IXmlSerializers>;
     cimModel: Model;
     modelUUIDs: Map<string, string>;
-    dependentOnModels: Map<string, string[]>;
-    constructor(partName: string, exportProfiles: string[], tempDirPath: string, dependentOnModels: Map<string, string[]>);
-    private initProfileXmlSerializers;
-    getModelUUID(profileName: string): string;
+    dependentModels: Map<string, string[]>;
+    integral7Modell: {
+        integralStandorte: Map<number, StandortImpl>;
+        integralSchaltanlagen: Map<number, SchaltanlageImpl>;
+        integralSchaltanlagenAbschnitte: Map<number, SchaltanlagenabschnittImpl>;
+        integralSchaltfelder: Map<number, SchaltfeldImpl>;
+        integralKnotenSo: Map<number, KnotenSoImpl>;
+        integralLeitungen: Map<number, LeitungImpl>;
+        knotenSfIDs: any[];
+        kontenZwIDs: any[];
+        querkupplungIDs: any[];
+        laengskupplungIDs: any[];
+        leitungsAnschlussIDs: any[];
+        trafo2wAnschlussKnotenIDs: any[];
+        trafo3wAnschlussKnotenIDs: any[];
+        hgueAnschlussKnotenIDs: any[];
+        lDrosselAnschlussKnotenIDs: any[];
+        lKondensatorAnschlussKnotenIDs: any[];
+        ersatzZweigAnschlussKnotenIDs: any[];
+        targetVoltages: Map<number, ITargetVoltage>;
+        sternPunktImpModel: {
+            stpSchieneJunctionUUIDs: Map<number, string>;
+            stpSchieneTerminal: Map<number, ITerminal>;
+            junctionUUIDstpImp: Map<string, PetersenCoil>;
+            petersenCoils: Map<string, PetersenCoil>;
+            junctions: Map<string, Junction>;
+            groundingImpedances: Map<string, GroundingImpedance>;
+            connectivityNodes: Map<string, IConnectivityNode>;
+        };
+    };
+    constructor(name: string);
+    initProfileXmlSerializers(exportProfiles: string[], tempDirPath: string): void;
+    addDependentModel(profileName: string, modelUUID: string): void;
+    getModelUUID(profileName: string): string | undefined;
+    getI7Model(): any;
     openXMLModel(): void;
     closeXMLModel(): Promise<void>;
     serializeModel(defaultValuesConfig: IDefaultValuesConfig): void;
+    validateCIMModel(): void;
     private openModel;
     private closeModel;
     private getProfileURIs;

package/dist/converter/integral7/interface-i7/export-frame-i7.js

@@ -7,23 +7,67 @@ const rdf_xml_1 = require("../../../constants/rdf-xml");
 const xml_serializer_1 = require("../../../util/xml/xml.serializer");
 const utils_cgmes_export_1 = require("../utils-cgmes-export");
 class I7ExportFrame {
-    constructor(partName, exportProfiles, tempDirPath, dependentOnModels) {
+    constructor(name) {
         this.profileXmlSerializers = new Map();
         this.cimModel = new Model_1.Model();
         this.modelUUIDs = new Map();
-        this.dependentOnModels = dependentOnModels;
-        this.mas = `http://${partName.toLowerCase()}.net/mas`;
-        this.initProfileXmlSerializers(exportProfiles, partName, tempDirPath);
+        this.integral7Modell = {
+            integralStandorte: new Map(),
+            integralSchaltanlagen: new Map(),
+            integralSchaltanlagenAbschnitte: new Map(),
+            integralSchaltfelder: new Map(),
+            integralKnotenSo: new Map(),
+            integralLeitungen: new Map(),
+            knotenSfIDs: [],
+            kontenZwIDs: [],
+            querkupplungIDs: [],
+            laengskupplungIDs: [],
+            leitungsAnschlussIDs: [],
+            trafo2wAnschlussKnotenIDs: [],
+            trafo3wAnschlussKnotenIDs: [],
+            hgueAnschlussKnotenIDs: [],
+            lDrosselAnschlussKnotenIDs: [],
+            lKondensatorAnschlussKnotenIDs: [],
+            ersatzZweigAnschlussKnotenIDs: [],
+            targetVoltages: new Map(),
+            sternPunktImpModel: {
+                stpSchieneJunctionUUIDs: new Map(),
+                stpSchieneTerminal: new Map(),
+                junctionUUIDstpImp: new Map(),
+                petersenCoils: new Map(),
+                junctions: new Map(),
+                groundingImpedances: new Map(),
+                connectivityNodes: new Map(),
+            },
+        };
+        this.dependentModels = new Map();
+        this.name = name;
+        this.mas = `http://${name.toLowerCase()}.net/mas`;
     }
-    initProfileXmlSerializers(exportProfiles, partName, tempDirPath) {
+    initProfileXmlSerializers(exportProfiles, tempDirPath) {
         for (const profileName of exportProfiles) {
-            this.profileXmlSerializers.set(profileName, xml_serializer_1.initXmlSerializerObjects(tempDirPath, `${partName}_${profileName}.xml`));
+            this.profileXmlSerializers.set(profileName, xml_serializer_1.initXmlSerializerObjects(tempDirPath, `${this.name}_${profileName}.xml`));
             this.modelUUIDs.set(profileName, utils_1.generateUUID());
         }
     }
+    addDependentModel(profileName, modelUUID) {
+        if (modelUUID) {
+            if (this.dependentModels.has(profileName)) {
+                const arr = this.dependentModels.get(profileName);
+                if (arr.indexOf(modelUUID) === -1)
+                    arr.push(modelUUID);
+            }
+            else {
+                this.dependentModels.set(profileName, [modelUUID]);
+            }
+        }
+    }
     getModelUUID(profileName) {
         return this.modelUUIDs.get(profileName);
     }
+    getI7Model() {
+        return this.integral7Modell;
+    }
     openXMLModel() {
         for (const entry of this.profileXmlSerializers.entries()) {
             const profileName = entry[0];
@@ -31,7 +75,7 @@ class I7ExportFrame {
             const modelUUID = this.modelUUIDs.get(profileName);
             const profileUri = this.getProfileURIs(profileName);
             const dependentModelUUIDs = this.getDependentModelsUUIDs(profileName);
-            this.openModel(profileSerializer.xmlWriter);
+            this.openModel(profileSerializer.xmlWriter, profileUri[0]);
             this.cimModel.toCIMXML(profileSerializer.xmlWriter, modelUUID, profileUri, dependentModelUUIDs, this.mas);
         }
     }
@@ -89,6 +133,69 @@ class I7ExportFrame {
             }
         }
     }
+    validateCIMModel() {
+        let terminals_to_delete = [];
+        this.cimModel.terminals.forEach(function (value, key) {
+            if (value.getConductingEquipmentUUID() === undefined) {
+                let terminal = value;
+                terminals_to_delete.push(terminal.getUUID());
+            }
+        });
+        for (let terminalUUID of terminals_to_delete) {
+            let cnUUID = this.cimModel.terminals.get(terminalUUID).getConnectivityNodeUUID();
+            this.cimModel.connectivityNodes.get(cnUUID).terminals.delete(terminalUUID);
+            this.cimModel.terminals.delete(terminalUUID);
+        }
+        let regulatingControl_to_delete = [];
+        this.cimModel.regulatingControl.forEach(function (value, key) {
+            if (value.regulatingCondEq === undefined) {
+                let regulatingControl = value;
+                regulatingControl_to_delete.push(regulatingControl.getUUID());
+            }
+        });
+        for (let regulatingControlUUID of regulatingControl_to_delete) {
+            this.cimModel.regulatingControl.delete(regulatingControlUUID);
+        }
+        regulatingControl_to_delete = [];
+        this.cimModel.regulatingControl.forEach(function (value, key) {
+            if (value.terminalUUID === undefined) {
+                let regulatingControl = value;
+                regulatingControl_to_delete.push(regulatingControl.getUUID());
+            }
+        });
+        for (let regulatingControlUUID of regulatingControl_to_delete) {
+            let rc = this.cimModel.regulatingControl.get(regulatingControlUUID);
+            rc.regulatingCondEq.forEach(function (value, key) {
+                value.regulatingControl = undefined;
+                value.regulatingControlUUID = undefined;
+            });
+            this.cimModel.regulatingControl.delete(regulatingControlUUID);
+        }
+        regulatingControl_to_delete = [];
+        this.cimModel.tapChangerControls.forEach(function (value, key) {
+            if (value.terminalUUID === undefined) {
+                let regulatingControl = value;
+                regulatingControl_to_delete.push(regulatingControl.getUUID());
+            }
+        });
+        for (let regulatingControlUUID of regulatingControl_to_delete) {
+            let rc = this.cimModel.tapChangerControls.get(regulatingControlUUID);
+            rc.regulatingCondEq.forEach(function (value, key) {
+                value.regulatingControl = undefined;
+                value.regulatingControlUUID = undefined;
+            });
+            this.cimModel.tapChangerControls.delete(regulatingControlUUID);
+        }
+        if (this.cimModel.conformLoads.size <= 0) {
+            this.cimModel.conformLoadGroups.clear();
+        }
+        if (this.cimModel.conformLoadGroups.size <= 0) {
+            this.cimModel.subLoadAreas.clear();
+        }
+        if (this.cimModel.subLoadAreas.size <= 0) {
+            this.cimModel.loadAreas.clear();
+        }
+    }
     openModel(xmlWriter, profileURI) {
         xmlWriter.startDocument('1.0', 'UTF-8');
         xmlWriter.startElementNS(rdf_xml_1.RDF_XML.RDF_NS_PREFIX, 'RDF', rdf_xml_1.RDF_XML.RDF_NS);
@@ -136,9 +243,11 @@ class I7ExportFrame {
         }
     }
     getDependentModelsUUIDs(profileName) {
-        const modelUUIDs = this.dependentOnModels.has(profileName) ? this.dependentOnModels.get(profileName) : [];
+        const modelUUIDs = [];
         switch (profileName) {
             case rdf_xml_1.RDF_XML.PROFILE_EQ: {
+                if (this.dependentModels.has(rdf_xml_1.RDF_XML.PROFILE_EQ_BD))
+                    modelUUIDs.push(...this.dependentModels.get(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
                 break;
             }
             case rdf_xml_1.RDF_XML.PROFILE_DL: {
@@ -171,12 +280,6 @@ class I7ExportFrame {
                 modelUUIDs.push(this.modelUUIDs.get(rdf_xml_1.RDF_XML.PROFILE_EQ));
                 break;
             }
-            case rdf_xml_1.RDF_XML.PROFILE_EQ_BD: {
-                break;
-            }
-            case rdf_xml_1.RDF_XML.PROFILE_EQ_BD: {
-                break;
-            }
         }
         return modelUUIDs;
     }

package/dist/converter/integral7/interface-i7/export-frame-i7.js.map

@@ -1 +1 @@
-{"version":3,"file":"export-frame-i7.js","sourceRoot":"","sources":["../../../../src/converter/integral7/interface-i7/export-frame-i7.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"export-frame-i7.js","sourceRoot":"","sources":["../../../../src/converter/integral7/interface-i7/export-frame-i7.ts"],"names":[],"mappings":";;;AAAA,+CAA8E;AAC9E,sDAAmD;AACnD,wDAAqD;AAGrD,qEAK0C;AAC1C,8DAQ+B;AAkB/B,MAAa,aAAa;IA6DxB,YAAY,IAAY;QAjDxB,0BAAqB,GAAiC,IAAI,GAAG,EAAE,CAAC;QAGhE,aAAQ,GAAU,IAAI,aAAK,EAAE,CAAC;QAI9B,eAAU,GAAwB,IAAI,GAAG,EAAE,CAAC;QAM5C,oBAAe,GAAG;YAChB,iBAAiB,EAAE,IAAI,GAAG,EAAwB;YAClD,qBAAqB,EAAE,IAAI,GAAG,EAA4B;YAC1D,+BAA+B,EAAE,IAAI,GAAG,EAAsC;YAC9E,oBAAoB,EAAE,IAAI,GAAG,EAA0B;YACvD,gBAAgB,EAAE,IAAI,GAAG,EAAwB;YACjD,iBAAiB,EAAE,IAAI,GAAG,EAAuB;YACjD,WAAW,EAAE,EAAE;YACf,WAAW,EAAE,EAAE;YACf,eAAe,EAAE,EAAE;YACnB,iBAAiB,EAAE,EAAE;YACrB,oBAAoB,EAAE,EAAE;YACxB,yBAAyB,EAAE,EAAE;YAC7B,yBAAyB,EAAE,EAAE;YAC7B,sBAAsB,EAAE,EAAE;YAC1B,0BAA0B,EAAE,EAAE;YAC9B,8BAA8B,EAAE,EAAE;YAClC,6BAA6B,EAAE,EAAE;YACjC,cAAc,EAAE,IAAI,GAAG,EAA0B;YACjD,kBAAkB,EAAE;gBAClB,uBAAuB,EAAE,IAAI,GAAG,EAAkB;gBAClD,kBAAkB,EAAE,IAAI,GAAG,EAAqB;gBAChD,kBAAkB,EAAE,IAAI,GAAG,EAAwB;gBACnD,aAAa,EAAE,IAAI,GAAG,EAAwB;gBAG9C,SAAS,EAAE,IAAI,GAAG,EAAoB;gBACtC,mBAAmB,EAAE,IAAI,GAAG,EAA8B;gBAC1D,iBAAiB,EAAE,IAAI,GAAG,EAA6B;aACxD;SACF,CAAC;QAOA,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,UAAU,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC;IACpD,CAAC;IAEM,yBAAyB,CAAC,cAAwB,EAAE,WAAmB;QAC5E,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE;YACxC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,WAAW,EAAE,yCAAwB,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,IAAI,IAAI,WAAW,MAAM,CAAC,CAAC,CAAC;YACtH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,oBAAY,EAAE,CAAC,CAAC;SAClD;IACH,CAAC;IAGM,iBAAiB,CAAC,WAAmB,EAAE,SAAiB;QAC7D,IAAI,SAAS,EAAE;YACb,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBACzC,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAClD,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACxD;iBACI;gBACH,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;aACpD;SACF;IACH,CAAC;IAEM,YAAY,CAAC,WAAmB;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEM,YAAY;QACjB,KAAK,MAAM,KAAK,IAAK,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,EAAE;YACzD,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,iBAAiB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YACpD,MAAM,mBAAmB,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YAEtE,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3D,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,mBAAmB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;SAC3G;IACH,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,EAAE;gBACnE,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;aAC9C;YACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,iCAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;iBACzG,IAAI,CAAC,GAAG,EAAE;gBACT,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,CAAC,EAAE;gBACX,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IAGM,cAAc,CAAC,mBAAyC;QAC7D,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,EAAE;YACxD,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,iBAAiB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACnC,QAAQ,WAAW,EAAE;gBACnB,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;oBACvB,gCAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;oBAC7E,MAAM;iBACP;gBACD,KAAK,iBAAO,CAAC,WAAW,CAAC,CAAC;oBACxB,iCAAY,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;oBAC9E,MAAM;iBACP;gBACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;oBACvB,gCAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;oBAC7E,MAAM;iBACP;gBACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;oBACvB,gCAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;oBAC7E,MAAM;iBACP;gBACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;oBACvB,gCAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;oBAC7E,MAAM;iBACP;gBACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;oBACvB,gCAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;oBAC7E,MAAM;iBACP;gBACD,KAAK,iBAAO,CAAC,aAAa,CAAC,CAAC;oBAC1B,gCAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;oBAC7E,MAAM;iBACP;gBACD,KAAK,iBAAO,CAAC,aAAa,CAAC,CAAC;oBAC1B,qCAAgB,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;oBAClF,MAAM;iBACP;aACF;SACF;IACH,CAAC;IAED,gBAAgB;QAEd,IAAI,mBAAmB,GAAY,EAAE,CAAC;QACtC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,UAAS,KAAgB,EAAE,GAAW;YACpE,IAAG,KAAK,CAAC,0BAA0B,EAAE,KAAK,SAAS,EAAC;gBAClD,IAAI,QAAQ,GAAG,KAAiB,CAAC;gBACjC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;aAC9C;QACH,CAAC,CAAC,CAAC;QACH,KAAI,IAAI,YAAY,IAAI,mBAAmB,EAAC;YAC1C,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,uBAAuB,EAAE,CAAC;YACjF,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC3E,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;SAC9C;QAED,IAAI,2BAA2B,GAAY,EAAE,CAAC;QAC9C,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAS,KAAwB,EAAE,GAAW;YACpF,IAAG,KAAK,CAAC,gBAAgB,KAAK,SAAS,EAAC;gBACtC,IAAI,iBAAiB,GAAG,KAAK,CAAC;gBAC9B,2BAA2B,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC;aAC/D;QACH,CAAC,CAAC,CAAC;QACH,KAAI,IAAI,qBAAqB,IAAI,2BAA2B,EAAC;YAC3D,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;SAC/D;QAED,2BAA2B,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAS,KAAwB,EAAE,GAAW;YACpF,IAAG,KAAK,CAAC,YAAY,KAAK,SAAS,EAAC;gBAClC,IAAI,iBAAiB,GAAG,KAAK,CAAC;gBAC9B,2BAA2B,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC;aAC/D;QACH,CAAC,CAAC,CAAC;QACH,KAAI,IAAI,qBAAqB,IAAI,2BAA2B,EAAC;YAC3D,IAAI,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YACpE,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAS,KAAuB,EAAE,GAAW;gBACvE,KAAK,CAAC,iBAAiB,GAAG,SAAS,CAAC;gBACpC,KAAK,CAAC,qBAAqB,GAAG,SAAS,CAAC;YAC1C,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;SAC/D;QAED,2BAA2B,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAS,KAAwB,EAAE,GAAW;YACrF,IAAG,KAAK,CAAC,YAAY,KAAK,SAAS,EAAC;gBAClC,IAAI,iBAAiB,GAAG,KAAK,CAAC;gBAC9B,2BAA2B,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC;aAC/D;QACH,CAAC,CAAC,CAAC;QACH,KAAI,IAAI,qBAAqB,IAAI,2BAA2B,EAAC;YAC3D,IAAI,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YACrE,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAS,KAAuB,EAAE,GAAW;gBACvE,KAAK,CAAC,iBAAiB,GAAG,SAAS,CAAC;gBACpC,KAAK,CAAC,qBAAqB,GAAG,SAAS,CAAC;YAC1C,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;SAChE;QAED,IAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,EAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;SACzC;QAED,IAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,EAAC;YAC3C,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;SACpC;QAED,IAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,EAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;SACjC;IACH,CAAC;IAEO,SAAS,CAAC,SAAoB,EAAE,UAAmB;QACzD,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAExC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,KAAK,EAAE,iBAAO,CAAC,MAAM,CAAC,CAAC;QAEvE,sCAAqB,CAAC,SAAS,EAAE,SAAS,iBAAO,CAAC,aAAa,EAAE,EAAE,iBAAO,CAAC,MAAM,CAAC,CAAC;QACnF,sCAAqB,CAAC,SAAS,EAAE,SAAS,iBAAO,CAAC,aAAa,EAAE,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;QACtF,sCAAqB,CAAC,SAAS,EAAE,SAAS,iBAAO,CAAC,gBAAgB,EAAE,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;QACzF,sCAAqB,CAAC,SAAS,EAAE,SAAS,iBAAO,CAAC,YAAY,EAAE,EAAE,iBAAO,CAAC,KAAK,CAAC,CAAC;QAEjF,IAAI,UAAU,KAAK,iBAAO,CAAC,kBAAkB,EAAE;YAC7C,sCAAqB,CAAC,SAAS,EAAE,SAAS,iBAAO,CAAC,iBAAiB,EAAE,EAAE,iBAAO,CAAC,UAAU,CAAC,CAAC;YAC3F,sCAAqB,CAAC,SAAS,EAAE,SAAS,iBAAO,CAAC,aAAa,EAAE,EAAE,iBAAO,CAAC,MAAM,CAAC,CAAC;YACnF,sCAAqB,CAAC,SAAS,EAAE,SAAS,iBAAO,CAAC,cAAc,EAAE,EAAE,iBAAO,CAAC,OAAO,CAAC,CAAC;YACrF,sCAAqB,CAAC,SAAS,EAAE,SAAS,iBAAO,CAAC,YAAY,EAAE,EAAE,iBAAO,CAAC,YAAY,CAAC,CAAC;SACzF;IACH,CAAC;IAEO,UAAU,CAAC,SAAoB;QAErC,SAAS,CAAC,UAAU,EAAE,CAAC;QACvB,SAAS,CAAC,WAAW,EAAE,CAAC;IAC1B,CAAC;IAEO,cAAc,CAAC,WAAmB;QACxC,QAAQ,WAAW,EAAE;YACnB,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;gBACvB,OAAO,CAAC,iBAAO,CAAC,mBAAmB,EAAE,iBAAO,CAAC,iBAAiB,EAAE,iBAAO,CAAC,mBAAmB,CAAC,CAAC;aAC9F;YACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;gBACvB,OAAO,CAAC,iBAAO,CAAC,mBAAmB,CAAC,CAAC;aACtC;YACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;gBACvB,OAAO,CAAC,iBAAO,CAAC,cAAc,CAAC,CAAC;aACjC;YACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;gBACvB,OAAO,CAAC,iBAAO,CAAC,mBAAmB,CAAC,CAAC;aACtC;YACD,KAAK,iBAAO,CAAC,WAAW,CAAC,CAAC;gBACxB,OAAO,CAAC,iBAAO,CAAC,oBAAoB,CAAC,CAAC;aACvC;YACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;gBACvB,OAAO,CAAC,iBAAO,CAAC,mBAAmB,CAAC,CAAC;aACtC;YACD,KAAK,iBAAO,CAAC,aAAa,CAAC,CAAC;gBAC1B,OAAO,CAAC,iBAAO,CAAC,iBAAiB,EAAE,iBAAO,CAAC,sBAAsB,CAAC,CAAC;aACpE;YACD,KAAK,iBAAO,CAAC,aAAa,CAAC,CAAC;gBAC1B,OAAO,CAAC,iBAAO,CAAC,kBAAkB,CAAC,CAAC;aACrC;SACF;IACH,CAAC;IAEO,uBAAuB,CAAC,WAAmB;QACjD,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,QAAQ,WAAW,EAAE;YACnB,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;gBACvB,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,iBAAO,CAAC,aAAa,CAAC;oBAAE,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,iBAAO,CAAC,aAAa,CAAC,CAAC,CAAC;gBACzH,MAAM;aACP;YACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;gBACvB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC;oBAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,CAAC,CAAC;gBACtG,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,aAAa,CAAC;oBAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,aAAa,CAAC,CAAC,CAAC;gBAC5G,MAAM;aACP;YACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;gBACvB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,CAAC,CAAC;gBACzD,MAAM;aACP;YACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;gBACvB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC;oBAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,CAAC,CAAC;gBACtG,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,aAAa,CAAC;oBAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,aAAa,CAAC,CAAC,CAAC;gBAC5G,MAAM;aACP;YACD,KAAK,iBAAO,CAAC,WAAW,CAAC,CAAC;gBACxB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,CAAC,CAAC;gBACzD,MAAM;aACP;YACD,KAAK,iBAAO,CAAC,UAAU,CAAC,CAAC;gBACvB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,WAAW,CAAC,CAAC,CAAC;gBACnG,MAAM;aACP;YACD,KAAK,iBAAO,CAAC,kBAAkB,CAAC,CAAC;gBAC/B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,CAAC,CAAC;gBACzD,MAAM;aACP;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CAEF;AAtUD,sCAsUC"}

package/dist/converter/integral7/model/interfaces.d.ts

@@ -14,6 +14,13 @@ export interface Georegion extends BaseClass {
 export interface Subgeoregion extends BaseClass {
     georegion: number;
 }
+export interface Regelzone extends BaseClass {
+    ausgleich_faktor: number;
+    eic: string;
+    p_bezug: number;
+    p_lieferung: number;
+    regelblock: number;
+}
 export interface Standort extends BaseClass {
     stationsnummer: string;
     soname6: string;
@@ -112,6 +119,7 @@ export interface Stk extends BaseClass {
     tend: number;
     typ: string;
     pos: number;
+    flag_impedanzlos: number;
 }
 export interface Ldrossel extends BaseClass, Connection {
     standort: number;
@@ -240,6 +248,7 @@ export interface Trafo2w extends Trafo {
     sr: number;
     ukr: number;
     pkr: number;
+    v_zuordnung: number;
 }
 export interface Trafo3w extends Trafo {
     standort: number;
@@ -417,6 +426,11 @@ export interface Generator extends Einspeisung {
     xqu2s: number;
     xq2s: number;
     nameprimaertyp: string;
+    blocktrafo_1: number;
+    blocktrafo_2: number;
+    blocktrafo_3: number;
+    blocktrafo_4: number;
+    blocktrafo_5: number;
 }
 export interface Netzvarianten extends Belastung {
     name: string;

package/dist/converter/integral7/sql/integral.sql.d.ts

@@ -53,6 +53,7 @@ export declare class Integral7TableNames {
     static TYP_TRAFO2W: string;
     static TYP_TRAFO3W: string;
     static FUEL_TYPES: string;
+    static REGELZONE: string;
     static NETZVARIANTEN: string;
     static NSG_STANDORT: string;
     static NSG_KNOTEN_SO: string;
@@ -82,6 +83,7 @@ export declare class I7Objects {
     static KNOTEN_SF: string;
     static SCHLAUFE: string;
     static KNOTEN_ZW: string;
+    static TRENNER: string;
     static TRENNER_3P: string;
     static TRENNERFI_3P: string;
     static LEISTUNGSSCHALTER: string;
@@ -89,6 +91,9 @@ export declare class I7Objects {
     static FREILEITUNG: string;
     static KABEL: string;
     static STROMKREISABSCHNITT: string;
+    static STROMKREISABSCHNITT_KABEL_FREILEITUNG: string;
+    static STROMKREISABSCHNITT_FREILEITUNG: string;
+    static STROMKREISABSCHNITT_KABEL: string;
     static ERSATZLAENGSZWEIG: string;
     static TRAFO2W: string;
     static TRAFO3W: string;
@@ -125,6 +130,7 @@ export declare class I7Objects {
     static TYP_TRAFO2W: string;
     static TYP_TRAFO3W: string;
     static FUEL_TYPES: string;
+    static REGELZONE: string;
     static NETZVARIANTEN: string;
     static NSG_STANDORT: string;
     static NSG_KNOTEN_SO: string;
@@ -160,3 +166,5 @@ export declare const NSG_QUERKUPPLUNG_SQL_QUERY: string;
 export declare const NSG_DROSSEL_SQL_QUERY: string;
 export declare const NSG_LEITUNG_SQL_QUERY: string;
 export declare const NSG_LEITUNGSPUNKT_SQL_QUERY: string;
+export declare const SQL_SUB_GEOREGIONS_UKZ = "\n                                    SELECT gr.id AS georegion_id, sgr.id AS subgeoregion_id, group_concat(DISTINCT standort.ukz) AS ukzCSV\n                                    FROM netz_subgeoregion sgr\n                                    LEFT OUTER JOIN netz_georegion gr ON sgr.georegion = gr.id\n                                    LEFT OUTER JOIN netz_standort standort ON sgr.id = standort.subgeoregion\n                                    GROUP BY georegion_id;\n                                    ";
+export declare const SQL_SUB_GEOREGIONS = "\n                                    SELECT gr.id AS georegion_id, gr.bezeichner AS georegion_name, sgr.id AS subgeoregion_id, sgr.bezeichner AS subgeoregion_id\n                                    FROM netz_subgeoregion sgr\n                                    LEFT OUTER JOIN netz_georegion gr ON sgr.georegion = gr.id\n                                    GROUP BY georegion_id;\n                                    ";

package/dist/converter/integral7/sql/integral.sql.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NSG_LEITUNGSPUNKT_SQL_QUERY = exports.NSG_LEITUNG_SQL_QUERY = exports.NSG_DROSSEL_SQL_QUERY = exports.NSG_QUERKUPPLUNG_SQL_QUERY = exports.NSG_QUERZWEIG_SQL_QUERY = exports.NSG_ABSTACTION_SQL_QUERY = exports.NSG_TRAFO3W_SQL_QUERY = exports.NSG_TRAFO2W_SQL_QUERY = exports.NSG_SCHALTFELD_SQL_QUERY = exports.NSG_SCHALTANLAGENABSCHNITT_SQL_QUERY = exports.NSG_SCHALTANLAGE_SQL_QUERY = exports.NSG_KNOTEN_SO_SQL_QUERY = exports.NSG_STANDORT_SQL_QUERY = exports.NETZVARIANTEN_SQL_QUERY = exports.getWhereIDs = exports.queryResultData = exports.getI7Query = exports.getNetzQuery = exports.I7Objects = exports.Integral7TableNames = void 0;
+exports.SQL_SUB_GEOREGIONS = exports.SQL_SUB_GEOREGIONS_UKZ = exports.NSG_LEITUNGSPUNKT_SQL_QUERY = exports.NSG_LEITUNG_SQL_QUERY = exports.NSG_DROSSEL_SQL_QUERY = exports.NSG_QUERKUPPLUNG_SQL_QUERY = exports.NSG_QUERZWEIG_SQL_QUERY = exports.NSG_ABSTACTION_SQL_QUERY = exports.NSG_TRAFO3W_SQL_QUERY = exports.NSG_TRAFO2W_SQL_QUERY = exports.NSG_SCHALTFELD_SQL_QUERY = exports.NSG_SCHALTANLAGENABSCHNITT_SQL_QUERY = exports.NSG_SCHALTANLAGE_SQL_QUERY = exports.NSG_KNOTEN_SO_SQL_QUERY = exports.NSG_STANDORT_SQL_QUERY = exports.NETZVARIANTEN_SQL_QUERY = exports.getWhereIDs = exports.queryResultData = exports.getI7Query = exports.getNetzQuery = exports.I7Objects = exports.Integral7TableNames = void 0;
 class Integral7TableNames {
 }
 exports.Integral7TableNames = Integral7TableNames;
@@ -58,6 +58,7 @@ Integral7TableNames.TYP_KDROSSEL = "typen_kdrossel";
 Integral7TableNames.TYP_TRAFO2W = "typen_trafo2w";
 Integral7TableNames.TYP_TRAFO3W = "typen_trafo3w";
 Integral7TableNames.FUEL_TYPES = "typen_primaerenergie";
+Integral7TableNames.REGELZONE = "netz_regelzone";
 Integral7TableNames.NETZVARIANTEN = "allg_netzvarianten";
 Integral7TableNames.NSG_STANDORT = "nsg_nsgstandort";
 Integral7TableNames.NSG_KNOTEN_SO = "nsg_nsgknotenso";
@@ -88,6 +89,7 @@ I7Objects.SCHALTFELD = "SCHALTFELD";
 I7Objects.KNOTEN_SF = "KNOTEN_SF";
 I7Objects.SCHLAUFE = "SCHLAUFE";
 I7Objects.KNOTEN_ZW = "KNOTEN_ZW";
+I7Objects.TRENNER = "TRENNER";
 I7Objects.TRENNER_3P = "TRENNER_3P";
 I7Objects.TRENNERFI_3P = "TRENNERFI_3P";
 I7Objects.LEISTUNGSSCHALTER = "LEISTUNGSSCHALTER";
@@ -95,6 +97,9 @@ I7Objects.LEITUNG = "LEITUNG";
 I7Objects.FREILEITUNG = "FREILEITUNG";
 I7Objects.KABEL = "KABEL";
 I7Objects.STROMKREISABSCHNITT = "STROMKREISABSCHNITT";
+I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG = "STROMKREISABSCHNITT_KABEL_FREILEITUNG";
+I7Objects.STROMKREISABSCHNITT_FREILEITUNG = "STROMKREISABSCHNITT_FREILEITUNG";
+I7Objects.STROMKREISABSCHNITT_KABEL = "STROMKREISABSCHNITT_KABEL";
 I7Objects.ERSATZLAENGSZWEIG = "ERSATZLAENGSZWEIG";
 I7Objects.TRAFO2W = "TRAFO2W";
 I7Objects.TRAFO3W = "TRAFO3W";
@@ -131,6 +136,7 @@ I7Objects.TYP_KDROSSEL = "TYP_KDROSSEL";
 I7Objects.TYP_TRAFO2W = "TYP_TRAFO2W";
 I7Objects.TYP_TRAFO3W = "TYP_TRAFO3W";
 I7Objects.FUEL_TYPES = "FUEL_TYPES";
+I7Objects.REGELZONE = "REGELZONE";
 I7Objects.NETZVARIANTEN = "NETZVARIANTEN";
 I7Objects.NSG_STANDORT = "NSG_STANDORT";
 I7Objects.NSG_KNOTEN_SO = "NSG_KNOTEN_SO";
@@ -158,6 +164,9 @@ function getNetzQuery(objectName, limit, offset, whereIDs) {
         case I7Objects.STANDORT: {
             return `SELECT * FROM ${Integral7TableNames[I7Objects.STANDORT]} LIMIT ${limit} OFFSET ${offset};`;
         }
+        case I7Objects.REGELZONE: {
+            return `SELECT id, bezeichner, guid, p_lieferung, p_bezug, ausgleich_faktor, regelblock FROM ${Integral7TableNames[I7Objects.REGELZONE]};`;
+        }
         case I7Objects.NSG_STANDORT: {
             return `SELECT variantennr, id, xrel, yrel, standort FROM ${Integral7TableNames[I7Objects.NSG_STANDORT]} WHERE ${getWhereIDs('standort', whereIDs).join(' OR ')};`;
         }
@@ -283,14 +292,19 @@ function getNetzQuery(objectName, limit, offset, whereIDs) {
         case I7Objects.KNOTEN_ZW: {
             return `SELECT id,bezeichner,kurzname,geerdet,schlaufe,bzweig3p  FROM ${Integral7TableNames[I7Objects.KNOTEN_ZW]} WHERE ${getWhereIDs('schlaufe', whereIDs).join(' OR ')};`;
         }
+        case I7Objects.TRENNER: {
+            return `SELECT id, bezeichner, kurzname, guid, aknoten, eknoten, schaltzustand, seliste  FROM ${Integral7TableNames[I7Objects.TRENNER_3P]} WHERE ${getWhereIDs('seliste', whereIDs).join(' OR ')}
+              UNION
+              SELECT id, bezeichner, kurzname, guid, aknoten, eknoten, schaltzustand, seliste FROM ${Integral7TableNames[I7Objects.TRENNERFI_3P]} WHERE ${getWhereIDs('seliste', whereIDs).join(' OR ')};`;
+        }
         case I7Objects.TRENNER_3P: {
-            return `SELECT id, bezeichner, kurzname, aknoten, eknoten, schaltzustand, seliste  FROM ${Integral7TableNames[I7Objects.TRENNER_3P]} WHERE ${getWhereIDs('seliste', whereIDs).join(' OR ')};`;
+            return `SELECT id, bezeichner, kurzname, guid, aknoten, eknoten, schaltzustand, seliste  FROM ${Integral7TableNames[I7Objects.TRENNER_3P]} WHERE ${getWhereIDs('seliste', whereIDs).join(' OR ')};`;
         }
         case I7Objects.TRENNERFI_3P: {
             return `SELECT * FROM ${Integral7TableNames[I7Objects.TRENNERFI_3P]} WHERE ${getWhereIDs('seliste', whereIDs).join(' OR ')};`;
         }
         case I7Objects.LEISTUNGSSCHALTER: {
-            return `SELECT id, bezeichner, kurzname, aknoten, eknoten, schaltzustand, seliste FROM ${Integral7TableNames[I7Objects.LEISTUNGSSCHALTER]} WHERE ${getWhereIDs('seliste', whereIDs).join(' OR ')};`;
+            return `SELECT id, bezeichner, kurzname, aknoten, eknoten, guid, schaltzustand, seliste FROM ${Integral7TableNames[I7Objects.LEISTUNGSSCHALTER]} WHERE ${getWhereIDs('seliste', whereIDs).join(' OR ')};`;
         }
         case I7Objects.BELASTUNG: {
             return `SELECT * FROM ${Integral7TableNames[I7Objects.BELASTUNG]} WHERE ${getWhereIDs('anschluss', whereIDs).join(' OR ')};`;
@@ -411,7 +425,7 @@ function getI7Query(objectName, whereIDs) {
         case I7Objects.KABEL: {
             return `SELECT * FROM ${Integral7TableNames[I7Objects.KABEL]} WHERE ${getWhereIDs('leitung', whereIDs).join(' OR ')};`;
         }
-        case I7Objects.STROMKREISABSCHNITT: {
+        case I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG: {
             return `SELECT id, leitung, pos, bezeichner, kurzname, laenge, un, r1, x1, c1, r0, x0, c0, ir, nametyp, tend, 'Freileitung' as typ
               FROM ${Integral7TableNames[I7Objects.FREILEITUNG]} WHERE ${getWhereIDs('leitung', whereIDs).join(' OR ')}
               UNION 
@@ -419,6 +433,16 @@ function getI7Query(objectName, whereIDs) {
               FROM ${Integral7TableNames[I7Objects.KABEL]} WHERE ${getWhereIDs('leitung', whereIDs).join(' OR ')}
               ORDER BY leitung, pos ASC;`;
         }
+        case I7Objects.STROMKREISABSCHNITT_KABEL: {
+            return `SELECT id, leitung, pos, bezeichner, kurzname, laenge, un, r1, x1, c1, r0, x0, c0, ir, nametyp, tend, 'Kabel' as typ
+              FROM ${Integral7TableNames[I7Objects.KABEL]} WHERE ${getWhereIDs('leitung', whereIDs).join(' OR ')}
+              ORDER BY leitung, pos ASC;`;
+        }
+        case I7Objects.STROMKREISABSCHNITT_FREILEITUNG: {
+            return `SELECT id, leitung, pos, bezeichner, kurzname, laenge, un, r1, x1, c1, r0, x0, c0, ir, nametyp, tend, 'Freileitung' as typ
+              FROM ${Integral7TableNames[I7Objects.FREILEITUNG]} WHERE ${getWhereIDs('leitung', whereIDs).join(' OR ')}
+              ORDER BY leitung, pos ASC;`;
+        }
         case I7Objects.LAENGSDROSSEL: {
             return `SELECT * FROM ${Integral7TableNames[I7Objects.LAENGSDROSSEL]};`;
         }
@@ -602,4 +626,17 @@ exports.NSG_QUERKUPPLUNG_SQL_QUERY = `SELECT * FROM ${Integral7TableNames['NSG_Q
 exports.NSG_DROSSEL_SQL_QUERY = `SELECT * FROM ${Integral7TableNames['NSG_DROSSEL']};`;
 exports.NSG_LEITUNG_SQL_QUERY = `SELECT * FROM ${Integral7TableNames['NSG_LEITUNG']};`;
 exports.NSG_LEITUNGSPUNKT_SQL_QUERY = `SELECT * FROM ${Integral7TableNames['NSG_LEITUNGSPUNKT']};`;
+exports.SQL_SUB_GEOREGIONS_UKZ = `
+                                    SELECT gr.id AS georegion_id, sgr.id AS subgeoregion_id, group_concat(DISTINCT standort.ukz) AS ukzCSV
+                                    FROM netz_subgeoregion sgr
+                                    LEFT OUTER JOIN netz_georegion gr ON sgr.georegion = gr.id
+                                    LEFT OUTER JOIN netz_standort standort ON sgr.id = standort.subgeoregion
+                                    GROUP BY georegion_id;
+                                    `;
+exports.SQL_SUB_GEOREGIONS = `
+                                    SELECT gr.id AS georegion_id, gr.bezeichner AS georegion_name, sgr.id AS subgeoregion_id, sgr.bezeichner AS subgeoregion_id
+                                    FROM netz_subgeoregion sgr
+                                    LEFT OUTER JOIN netz_georegion gr ON sgr.georegion = gr.id
+                                    GROUP BY georegion_id;
+                                    `;
 //# sourceMappingURL=integral.sql.js.map