@enervance/insight-cim-model 0.0.176 → 0.0.178

package/dist/converter/integral7/dl-convert/data-manager.d.ts

@@ -22,5 +22,5 @@ export declare class DataManager {
     setCimModelGraph(graph: CimModelGraph): void;
     addTrafowicklungIntegralId2UuidMapping(i7Id: number, uuid: string): void;
     setDbObjectKeyCimModelUuidGraph(graph: DbObjectKey2CimModelUUIDGraph<typeof i7SchemaKeyDefinitions>): void;
-    loadFromMySQL(mysqlController: MysqlController, options: LoadFromMySQLOptions): Promise<void>;
+    loadFromMySQL(mysqlController: MysqlController, options: LoadFromMySQLOptions, currentFrameBoundary?: IterableIterator<number>): Promise<void>;
 }

package/dist/converter/integral7/dl-convert/data-manager.js

@@ -21,7 +21,7 @@ class DataManager {
     setDbObjectKeyCimModelUuidGraph(graph) {
         this.dbObjectKeyCimModelUuidGraph = graph;
     }
-    loadFromMySQL(mysqlController, options) {
+    loadFromMySQL(mysqlController, options, currentFrameBoundary) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const tableMetaData = yield mysqlController.getTableMetaData();
@@ -49,9 +49,47 @@ class DataManager {
                     selectQuery += ';';
                     /* END: query-build */
                     try {
+                        let queryResultsAllSites = undefined;
+                        if (tableName === 'nsg_nsgstandort') {
+                            const selectQuery = `SELECT * FROM nsg_nsgstandort WHERE ${whereConditionsConcats_and[0]}` + ';';
+                            queryResultsAllSites = yield mysqlController.execQuery(selectQuery);
+                        }
                         const queryResults = yield mysqlController.execQuery(selectQuery);
-                        this.dbObjectGraph[tableName] = (_a = this.dbObjectGraph[tableName]) !== null && _a !== void 0 ? _a : {};
-                        this.dbObjectGraph.addObjects(tableName, convert_graph_keys_1.i7TableNamesToPrimaryKeys[tableName], queryResults);
+                        if (queryResults.length > 0) {
+                            if (tableName !== 'nsg_nsgstandort') {
+                                this.dbObjectGraph.addObjects(tableName, convert_graph_keys_1.i7TableNamesToPrimaryKeys[tableName], queryResults);
+                            }
+                            else if (queryResultsAllSites !== undefined && queryResults.length / queryResultsAllSites.length > 0.5) { //ignore cause this variant is not the main variant for this sites
+                                console.log(tableName);
+                                console.log('---------------queryResultsAllSites---------------');
+                                console.log(queryResultsAllSites.length);
+                                console.log('---------------queryResults---------------');
+                                console.log(queryResults.length);
+                                this.dbObjectGraph[tableName] = (_a = this.dbObjectGraph[tableName]) !== null && _a !== void 0 ? _a : {};
+                                let bdSites = [];
+                                if (currentFrameBoundary !== undefined) {
+                                    for (let site of currentFrameBoundary) {
+                                        const filter = queryResults.filter(elem => elem.id === site);
+                                        if (filter.length > 0) {
+                                            bdSites.push(filter);
+                                        }
+                                        let stop = true;
+                                    }
+                                }
+                                if (bdSites.length / queryResults.length <= 0.5) {
+                                    this.dbObjectGraph.addObjects(tableName, convert_graph_keys_1.i7TableNamesToPrimaryKeys[tableName], queryResults);
+                                }
+                                else {
+                                    let stop = true;
+                                }
+                            }
+                            else {
+                                let stop = true;
+                            }
+                        }
+                        else { //ignore cause this variant contains no elements for this tablename
+                            let stop = true;
+                        }
                     }
                     catch (e) {
                         // todo better solution for:

package/dist/converter/integral7/dl-convert/data-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/data-manager.ts"],"names":[],"mappings":";;;;AACA,uEAKwC;AAIxC,yCAAsC;AAWtC,MAAa,WAAW;IAStB,YAAY,MAAgB;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,4BAA4B,GAAG,IAAI,GAAG,EAAkB,CAAC;IAChE,CAAC;IAED,gBAAgB,CAAC,KAAmE;QAClF,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,gBAAgB,CAAC,KAAoB;QACnC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,sCAAsC,CAAC,IAAY,EAAE,IAAY;QAC/D,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,+BAA+B,CAAC,KAAmE;QACjG,IAAI,CAAC,4BAA4B,GAAG,KAAK,CAAC;IAC5C,CAAC;IAEK,aAAa,CAAC,eAAgC,EAAE,OAA6B;;;YACjF,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,gBAAgB,EAAE,CAAC;YAE/D,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;gBAC/B,IAAI,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;oBAChC,wBAAwB;oBACxB,IAAI,0BAA0B,GAAG,EAAE,CAAC;oBACpC,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;wBAC3C,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAC,oDAAoD;4BAC1F,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gCAC/D,OAAO,GAAG,UAAU,MAAM,GAAG,EAAE,CAAA;4BACjC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BAChB,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;yBAC/C;6BAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAC,oDAAoD;4BACjG,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;4BAClE,0BAA0B,CAAC,IAAI,CAAC,IAAI,UAAU,QAAQ,YAAY,GAAG,CAAC,CAAC;yBACxE;qBACF;oBACD,IAAI,WAAW,GAAG;kCACQ,SAAS,EAAE,CAAC;oBACtC,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzC,WAAW,IAAI,UAAU,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;qBACrE;oBACD,WAAW,IAAI,GAAG,CAAA;oBAClB,sBAAsB;oBAEtB,IAAI;wBACF,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;wBAElE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,mCAAI,EAAE,CAAC;wBAEpE,IAAI,CAAC,aAAa,CAAC,UAAU,CAC3B,SAAkC,EAAE,8CAAyB,CAAC,SAAS,CAAC,EAAE,YAAY,CACvF,CAAC;qBACH;oBAAC,OAAO,CAAC,EAAE;wBACV,4BAA4B;wBAC5B,mGAAmG;wBACnG,qDAAqD;wBACrD,0FAA0F;wBAC1F,kCAAkC;wBAClC,IAAI,CAAC,mBAAQ,CAAC,eAAe,EAAE;4BAC7B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;yBAChB;qBACF;iBACF;aACF;;KACF;CACF;AA9ED,kCA8EC"}
+{"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/data-manager.ts"],"names":[],"mappings":"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"}

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

@@ -34,7 +34,7 @@ export declare class DLConverterI7 {
     /**
      * convertNsgVariante
      */
-    convertNsgVariante(arg: Netzvariante): Promise<Diagram | null>;
+    convertNsgVariante(arg: Netzvariante, tsoName: string): Promise<Diagram | null>;
     /**
      * convertSchemaStandort
      */

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

@@ -19,6 +19,7 @@ const utils_schema_1 = require("../utils-schema.js");
 const BusbarSection_1 = require("../../../model/wires/BusbarSection.js");
 const Junction_1 = require("../../../model/wires/Junction.js");
 const cim_class_names_1 = require("../../../constants/cim-class-names.js");
+const util_create_1 = require("../../../util/util-create.js");
 class DLConverterI7 {
     constructor(configUuid, logger, config) {
         // private exportedBusbarSectionConnectivityNodeUuidToDiagramObject: Map<string, DiagramObject>;
@@ -61,9 +62,9 @@ class DLConverterI7 {
     /**
      * convertNsgVariante
      */
-    convertNsgVariante(arg) {
+    convertNsgVariante(arg, tsoName) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const diagram = new Diagram_1.Diagram((0, parser_utils_1.getUUID)(arg.guid), arg.name, String(arg.id));
+            const diagram = new Diagram_1.Diagram((0, parser_utils_1.getUUID)(arg.guid), (0, util_create_1.createNotation)([arg.name, '_', tsoName], 32, true), String(arg.id));
             diagram.orientation = OrientationKind_1.OrientationKind.negative;
             const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramStyle, this.configUuid, cim_constants_1.DiagramLayoutTypes.NODE_BREAKER);
             diagram.diagramStyle = new DiagramStyle_1.DiagramStyle(uuid, cim_constants_1.DiagramLayoutTypes.NODE_BREAKER);