@enervance/insight-cim-model 0.0.140 → 0.0.141
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/converter/integral7/converter.integral7.d.ts +2 -2
- package/dist/converter/integral7/converter.integral7.js +111 -63
- package/dist/converter/integral7/converter.integral7.js.map +1 -1
- package/dist/converter/integral7/dl-convert/data-manager.d.ts +33 -0
- package/dist/converter/integral7/dl-convert/data-manager.js +97 -0
- package/dist/converter/integral7/dl-convert/data-manager.js.map +1 -0
- package/dist/converter/integral7/dl-convert/db/{data.types.d.ts → data-types.d.ts} +7 -0
- package/dist/converter/integral7/dl-convert/db/{data.types.js → data-types.js} +1 -1
- package/dist/converter/integral7/dl-convert/db/{data.types.js.map → data-types.js.map} +1 -1
- package/dist/converter/integral7/dl-convert/db/database.interface.types.d.ts +133 -4
- package/dist/converter/integral7/dl-convert/dl-converter-i7-2.d.ts +56 -0
- package/dist/converter/integral7/dl-convert/dl-converter-i7-2.js +2039 -0
- package/dist/converter/integral7/dl-convert/dl-converter-i7-2.js.map +1 -0
- package/dist/converter/integral7/dl-convert/dl-converter-i7-function.types.d.ts +1 -1
- package/dist/converter/integral7/dl-convert/dl-converter-i7.js +9 -6
- package/dist/converter/integral7/dl-convert/dl-converter-i7.js.map +1 -1
- package/dist/converter/integral7/dl-convert/dl-converter-i7.types.d.ts +3 -0
- package/dist/converter/integral7/dl-convert/dl-converter-i7.types.js +3 -0
- package/dist/converter/integral7/dl-convert/dl-converter-i7.types.js.map +1 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.d.ts +21 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.js +49 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.js.map +1 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/convert-graph-keys.d.ts +119 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/convert-graph-keys.js +84 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/convert-graph-keys.js.map +1 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/db-object-graph.d.ts +40 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/db-object-graph.js +229 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/db-object-graph.js.map +1 -0
- package/dist/converter/integral7/dl-convert/executor.d.ts +35 -0
- package/dist/converter/integral7/dl-convert/executor.js +263 -0
- package/dist/converter/integral7/dl-convert/executor.js.map +1 -0
- package/dist/converter/integral7/model/dl-utils/constants.js +1 -1
- package/dist/converter/integral7/model/dl-utils/util-functions.d.ts +8 -4
- package/dist/converter/integral7/model/dl-utils/util-functions.js +134 -6
- package/dist/converter/integral7/model/dl-utils/util-functions.js.map +1 -1
- package/dist/converter/integral7/model/integral/Point.d.ts +3 -0
- package/dist/converter/integral7/model/integral/Point.js +33 -0
- package/dist/converter/integral7/model/integral/Point.js.map +1 -1
- package/dist/model/core/ConnectivityNode.js +2 -0
- package/dist/model/core/ConnectivityNode.js.map +1 -1
- package/dist/model/core/Terminal.d.ts +3 -0
- package/dist/model/core/Terminal.js +18 -0
- package/dist/model/core/Terminal.js.map +1 -1
- package/dist/model/dc/DCLine.js +17 -17
- package/dist/model/dc/DCLineSegment.js +25 -25
- package/dist/model/extensions/enervance/core/EVTerminal.js +20 -15
- package/dist/model/extensions/enervance/core/EVTerminal.js.map +1 -1
- package/dist/model/loadmodel/ConformLoad.js +33 -33
- package/dist/model/loadmodel/ConformLoadGroup.js +22 -22
- package/dist/model/loadmodel/LoadArea.js +21 -21
- package/dist/model/loadmodel/SubLoadArea.js +22 -22
- package/dist/model/wires/BusbarSection.d.ts +4 -1
- package/dist/model/wires/BusbarSection.js +21 -1
- package/dist/model/wires/BusbarSection.js.map +1 -1
- package/dist/model/wires/PowerTransformer.js +124 -33
- package/dist/model/wires/PowerTransformer.js.map +1 -1
- package/dist/util/database/mysql-controller.d.ts +6 -0
- package/dist/util/database/mysql-controller.js +36 -1
- package/dist/util/database/mysql-controller.js.map +1 -1
- package/package.json +1 -1
|
@@ -39,38 +39,38 @@ class ConformLoad extends EnergyConsumer_1.EnergyConsumer {
|
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
exports.ConformLoad = ConformLoad;
|
|
42
|
-
ConformLoad.sparqlQuery = `
|
|
43
|
-
PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
44
|
-
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
45
|
-
PREFIX westnetzneplan: <http://westnetzneplan.de/CIM/Extensions#>
|
|
46
|
-
PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
47
|
-
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
48
|
-
PREFIX amp: <http://amprion.net/Extensions#>
|
|
49
|
-
PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
|
|
50
|
-
PREFIX afn: <http://jena.apache.org/ARQ/function#>
|
|
51
|
-
|
|
52
|
-
SELECT (strafter(strafter(str(?econUUID), '#'), '_') AS ?uuid)
|
|
53
|
-
(CONCAT(STRBEFORE(STR(?econUUID), '#_'), '#_') AS ?baseIRI)
|
|
54
|
-
?name ?shortName ?description ?aggregate ?p ?q
|
|
55
|
-
(strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
|
|
56
|
-
(strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID)
|
|
57
|
-
(strafter(strafter(str(?lgUUID), '#'), '_') AS ?loadGroupUUID)
|
|
58
|
-
(group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
|
|
59
|
-
WHERE {
|
|
60
|
-
GRAPH <http://default/>{
|
|
61
|
-
?econUUID rdf:type cim:ConformLoad .
|
|
62
|
-
OPTIONAL{?econUUID cim:IdentifiedObject.name ?name .}
|
|
63
|
-
OPTIONAL{?econUUID entsoe:IdentifiedObject.shortName ?shortName .}
|
|
64
|
-
OPTIONAL{?econUUID cim:IdentifiedObject.description ?description .}
|
|
65
|
-
OPTIONAL{?econUUID cim:EnergyConsumer.p ?p .}
|
|
66
|
-
OPTIONAL{?econUUID cim:EnergyConsumer.q ?q .}
|
|
67
|
-
|
|
68
|
-
OPTIONAL{?econUUID cim:Equipment.aggregate ?aggregate .}
|
|
69
|
-
OPTIONAL{?econUUID cim:Equipment.EquipmentContainer ?ecUUID .}
|
|
70
|
-
OPTIONAL{?econUUID cim:PowerSystemResource.PSRType ?ptUUID .}
|
|
71
|
-
OPTIONAL{?econUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
|
|
72
|
-
OPTIONAL{?econUUID cim:Equipment.LoadGroup ?lgUUID .}
|
|
73
|
-
}
|
|
74
|
-
}
|
|
42
|
+
ConformLoad.sparqlQuery = `
|
|
43
|
+
PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
44
|
+
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
45
|
+
PREFIX westnetzneplan: <http://westnetzneplan.de/CIM/Extensions#>
|
|
46
|
+
PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
47
|
+
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
48
|
+
PREFIX amp: <http://amprion.net/Extensions#>
|
|
49
|
+
PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
|
|
50
|
+
PREFIX afn: <http://jena.apache.org/ARQ/function#>
|
|
51
|
+
|
|
52
|
+
SELECT (strafter(strafter(str(?econUUID), '#'), '_') AS ?uuid)
|
|
53
|
+
(CONCAT(STRBEFORE(STR(?econUUID), '#_'), '#_') AS ?baseIRI)
|
|
54
|
+
?name ?shortName ?description ?aggregate ?p ?q
|
|
55
|
+
(strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
|
|
56
|
+
(strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID)
|
|
57
|
+
(strafter(strafter(str(?lgUUID), '#'), '_') AS ?loadGroupUUID)
|
|
58
|
+
(group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
|
|
59
|
+
WHERE {
|
|
60
|
+
GRAPH <http://default/>{
|
|
61
|
+
?econUUID rdf:type cim:ConformLoad .
|
|
62
|
+
OPTIONAL{?econUUID cim:IdentifiedObject.name ?name .}
|
|
63
|
+
OPTIONAL{?econUUID entsoe:IdentifiedObject.shortName ?shortName .}
|
|
64
|
+
OPTIONAL{?econUUID cim:IdentifiedObject.description ?description .}
|
|
65
|
+
OPTIONAL{?econUUID cim:EnergyConsumer.p ?p .}
|
|
66
|
+
OPTIONAL{?econUUID cim:EnergyConsumer.q ?q .}
|
|
67
|
+
|
|
68
|
+
OPTIONAL{?econUUID cim:Equipment.aggregate ?aggregate .}
|
|
69
|
+
OPTIONAL{?econUUID cim:Equipment.EquipmentContainer ?ecUUID .}
|
|
70
|
+
OPTIONAL{?econUUID cim:PowerSystemResource.PSRType ?ptUUID .}
|
|
71
|
+
OPTIONAL{?econUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
|
|
72
|
+
OPTIONAL{?econUUID cim:Equipment.LoadGroup ?lgUUID .}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
75
|
GROUP BY ?econUUID ?baseIRI ?name ?shortName ?description ?aggregate ?p ?q ?ecUUID ?ptUUID ?lgUUID `;
|
|
76
76
|
//# sourceMappingURL=ConformLoad.js.map
|
|
@@ -22,27 +22,27 @@ class ConformLoadGroup extends LoadGroup_1.LoadGroup {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
exports.ConformLoadGroup = ConformLoadGroup;
|
|
25
|
-
ConformLoadGroup.sparqlQuery = `
|
|
26
|
-
PREFIX cim:\t \t\t <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
27
|
-
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
28
|
-
PREFIX westnetzneplan:\t <http://westnetzneplan.de/CIM/Extensions#>
|
|
29
|
-
PREFIX entsoe:\t \t <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
30
|
-
PREFIX rdf:\t \t\t <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
31
|
-
PREFIX amp:\t \t\t <http://amprion.net/Extensions#>
|
|
32
|
-
PREFIX apf:\t \t\t <http://jena.hpl.hp.com/ARQ/property#>
|
|
33
|
-
PREFIX afn:\t \t\t <http://jena.apache.org/ARQ/function#>
|
|
34
|
-
|
|
35
|
-
SELECT (STRAFTER(str(?MRID), '#_') AS ?uuid)
|
|
36
|
-
(CONCAT(STRBEFORE(str(?MRID), '#_'), '#_') AS ?baseIRI)
|
|
37
|
-
?name
|
|
38
|
-
(strafter(strafter(str(?slaUUID), '#'), '_') AS ?subLloadAreaUUID)
|
|
39
|
-
|
|
40
|
-
WHERE {
|
|
41
|
-
GRAPH <http://default/> {
|
|
42
|
-
?MRID rdf:type cim:ConformLoadGroup .
|
|
43
|
-
OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
|
|
44
|
-
|
|
45
|
-
OPTIONAL{?MRID cim:LoadGroup.SubLoadArea ?slaUUID .}
|
|
46
|
-
}
|
|
25
|
+
ConformLoadGroup.sparqlQuery = `
|
|
26
|
+
PREFIX cim:\t \t\t <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
27
|
+
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
28
|
+
PREFIX westnetzneplan:\t <http://westnetzneplan.de/CIM/Extensions#>
|
|
29
|
+
PREFIX entsoe:\t \t <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
30
|
+
PREFIX rdf:\t \t\t <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
31
|
+
PREFIX amp:\t \t\t <http://amprion.net/Extensions#>
|
|
32
|
+
PREFIX apf:\t \t\t <http://jena.hpl.hp.com/ARQ/property#>
|
|
33
|
+
PREFIX afn:\t \t\t <http://jena.apache.org/ARQ/function#>
|
|
34
|
+
|
|
35
|
+
SELECT (STRAFTER(str(?MRID), '#_') AS ?uuid)
|
|
36
|
+
(CONCAT(STRBEFORE(str(?MRID), '#_'), '#_') AS ?baseIRI)
|
|
37
|
+
?name
|
|
38
|
+
(strafter(strafter(str(?slaUUID), '#'), '_') AS ?subLloadAreaUUID)
|
|
39
|
+
|
|
40
|
+
WHERE {
|
|
41
|
+
GRAPH <http://default/> {
|
|
42
|
+
?MRID rdf:type cim:ConformLoadGroup .
|
|
43
|
+
OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
|
|
44
|
+
|
|
45
|
+
OPTIONAL{?MRID cim:LoadGroup.SubLoadArea ?slaUUID .}
|
|
46
|
+
}
|
|
47
47
|
}`;
|
|
48
48
|
//# sourceMappingURL=ConformLoadGroup.js.map
|
|
@@ -27,27 +27,27 @@ class LoadArea extends EnergyArea_1.EnergyArea {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
exports.LoadArea = LoadArea;
|
|
30
|
-
LoadArea.sparqlQuery = `
|
|
31
|
-
PREFIX cim:\t \t\t <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
32
|
-
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
33
|
-
PREFIX westnetzneplan:\t <http://westnetzneplan.de/CIM/Extensions#>
|
|
34
|
-
PREFIX entsoe:\t \t <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
35
|
-
PREFIX rdf:\t \t\t <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
36
|
-
PREFIX amp:\t \t\t <http://amprion.net/Extensions#>
|
|
37
|
-
PREFIX apf:\t \t\t <http://jena.hpl.hp.com/ARQ/property#>
|
|
38
|
-
PREFIX afn:\t \t\t <http://jena.apache.org/ARQ/function#>
|
|
39
|
-
|
|
40
|
-
SELECT (STRAFTER(str(?MRID), '#_') AS ?uuid)
|
|
41
|
-
(CONCAT(STRBEFORE(str(?MRID), '#_'), '#_') AS ?baseIRI)
|
|
42
|
-
?name
|
|
43
|
-
|
|
44
|
-
WHERE {
|
|
45
|
-
GRAPH <http://default/> {
|
|
46
|
-
?MRID rdf:type cim:LoadArea .
|
|
47
|
-
OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
|
|
48
|
-
|
|
49
|
-
}
|
|
50
|
-
}
|
|
30
|
+
LoadArea.sparqlQuery = `
|
|
31
|
+
PREFIX cim:\t \t\t <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
32
|
+
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
33
|
+
PREFIX westnetzneplan:\t <http://westnetzneplan.de/CIM/Extensions#>
|
|
34
|
+
PREFIX entsoe:\t \t <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
35
|
+
PREFIX rdf:\t \t\t <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
36
|
+
PREFIX amp:\t \t\t <http://amprion.net/Extensions#>
|
|
37
|
+
PREFIX apf:\t \t\t <http://jena.hpl.hp.com/ARQ/property#>
|
|
38
|
+
PREFIX afn:\t \t\t <http://jena.apache.org/ARQ/function#>
|
|
39
|
+
|
|
40
|
+
SELECT (STRAFTER(str(?MRID), '#_') AS ?uuid)
|
|
41
|
+
(CONCAT(STRBEFORE(str(?MRID), '#_'), '#_') AS ?baseIRI)
|
|
42
|
+
?name
|
|
43
|
+
|
|
44
|
+
WHERE {
|
|
45
|
+
GRAPH <http://default/> {
|
|
46
|
+
?MRID rdf:type cim:LoadArea .
|
|
47
|
+
OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
|
|
48
|
+
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
51
|
`;
|
|
52
52
|
/**
|
|
53
53
|
* <cim:LoadArea rdf:ID="_dd7efdb9-ad63-b9ef-8511-b0032fde2c19">
|
|
@@ -38,28 +38,28 @@ class SubLoadArea extends EnergyArea_1.EnergyArea {
|
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
exports.SubLoadArea = SubLoadArea;
|
|
41
|
-
SubLoadArea.sparqlQuery = `
|
|
42
|
-
PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
43
|
-
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
44
|
-
PREFIX westnetzneplan: <http://westnetzneplan.de/CIM/Extensions#>
|
|
45
|
-
PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
46
|
-
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
47
|
-
PREFIX amp: <http://amprion.net/Extensions#>
|
|
48
|
-
PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
|
|
49
|
-
PREFIX afn: <http://jena.apache.org/ARQ/function#>
|
|
50
|
-
|
|
51
|
-
SELECT (STRAFTER(str(?MRID), '#_') AS ?uuid)
|
|
52
|
-
(CONCAT(STRBEFORE(str(?MRID), '#_'), '#_') AS ?baseIRI)
|
|
53
|
-
?name
|
|
54
|
-
(strafter(strafter(str(?laUUID), '#'), '_') AS ?loadAreaUUID)
|
|
55
|
-
|
|
56
|
-
WHERE {
|
|
57
|
-
GRAPH <http://default/>{
|
|
58
|
-
?MRID rdf:type cim:SubLoadArea .
|
|
59
|
-
OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
|
|
60
|
-
|
|
61
|
-
OPTIONAL{?MRID cim:SubLoadArea.LoadArea ?laUUID .}
|
|
62
|
-
}
|
|
41
|
+
SubLoadArea.sparqlQuery = `
|
|
42
|
+
PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
43
|
+
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
44
|
+
PREFIX westnetzneplan: <http://westnetzneplan.de/CIM/Extensions#>
|
|
45
|
+
PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
46
|
+
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
47
|
+
PREFIX amp: <http://amprion.net/Extensions#>
|
|
48
|
+
PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
|
|
49
|
+
PREFIX afn: <http://jena.apache.org/ARQ/function#>
|
|
50
|
+
|
|
51
|
+
SELECT (STRAFTER(str(?MRID), '#_') AS ?uuid)
|
|
52
|
+
(CONCAT(STRBEFORE(str(?MRID), '#_'), '#_') AS ?baseIRI)
|
|
53
|
+
?name
|
|
54
|
+
(strafter(strafter(str(?laUUID), '#'), '_') AS ?loadAreaUUID)
|
|
55
|
+
|
|
56
|
+
WHERE {
|
|
57
|
+
GRAPH <http://default/>{
|
|
58
|
+
?MRID rdf:type cim:SubLoadArea .
|
|
59
|
+
OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
|
|
60
|
+
|
|
61
|
+
OPTIONAL{?MRID cim:SubLoadArea.LoadArea ?laUUID .}
|
|
62
|
+
}
|
|
63
63
|
}`;
|
|
64
64
|
/**
|
|
65
65
|
* <cim:SubLoadArea rdf:ID="_dcf432e0-1fc2-f8d3-d332-7cc78553e0aa">
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { Connector } from
|
|
1
|
+
import { Connector } from './Connector.js';
|
|
2
2
|
import { ModelContainer } from '../../model-container/model/ModelContainer.js';
|
|
3
3
|
import XMLWriter from 'xml-writer';
|
|
4
|
+
import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos.js';
|
|
5
|
+
import { DiagramObject } from '../diagram/DiagramObject.js';
|
|
4
6
|
export declare class BusbarSection extends Connector {
|
|
5
7
|
ipMax: number;
|
|
6
8
|
constructor(uuid?: string, name?: string, shortName?: string, description?: string);
|
|
@@ -13,4 +15,5 @@ export declare class BusbarSection extends Connector {
|
|
|
13
15
|
toCIMXML(xmlWriter: XMLWriter, profile: string): void;
|
|
14
16
|
protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
|
|
15
17
|
toJSONAttributes(): void;
|
|
18
|
+
toGeoJSON(geoJSON: any, profile: string, schemaSettings: ISchemaSettings, diagramObject?: DiagramObject): any;
|
|
16
19
|
}
|
|
@@ -10,7 +10,7 @@ class BusbarSection extends Connector_1.Connector {
|
|
|
10
10
|
}
|
|
11
11
|
static getQuerySPARQL(graphURI) {
|
|
12
12
|
if (graphURI.length > 0) {
|
|
13
|
-
return BusbarSection.sparqlQuery.replace(
|
|
13
|
+
return BusbarSection.sparqlQuery.replace('<http://default/>', graphURI);
|
|
14
14
|
}
|
|
15
15
|
return BusbarSection.sparqlQuery;
|
|
16
16
|
}
|
|
@@ -50,6 +50,26 @@ class BusbarSection extends Connector_1.Connector {
|
|
|
50
50
|
super.toJSONAttributes();
|
|
51
51
|
this.json['ipMax'] = this.ipMax;
|
|
52
52
|
}
|
|
53
|
+
toGeoJSON(geoJSON, profile, schemaSettings, diagramObject) {
|
|
54
|
+
if (profile === 'Integral 7' || profile === 'Integral7Westnetz') {
|
|
55
|
+
if (diagramObject) {
|
|
56
|
+
super.toGeoJSON(geoJSON, profile, schemaSettings, diagramObject);
|
|
57
|
+
const linePoints = [];
|
|
58
|
+
diagramObject.diagramObjectPoints.forEach((point) => {
|
|
59
|
+
linePoints.push([+point.getXPosition(), +point.getYPosition() * -1]);
|
|
60
|
+
});
|
|
61
|
+
geoJSON['geometry'] = {
|
|
62
|
+
type: 'LineString',
|
|
63
|
+
coordinates: linePoints
|
|
64
|
+
};
|
|
65
|
+
geoJSON['properties'] = {
|
|
66
|
+
diagramObjectUUID: diagramObject.mrid,
|
|
67
|
+
objectType: this.constructor.name,
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
return geoJSON;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
53
73
|
}
|
|
54
74
|
exports.BusbarSection = BusbarSection;
|
|
55
75
|
BusbarSection.sparqlQuery = `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BusbarSection.js","sourceRoot":"","sources":["../../../src/model/wires/BusbarSection.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"BusbarSection.js","sourceRoot":"","sources":["../../../src/model/wires/BusbarSection.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const rdf_xml_1 = require("../../constants/rdf-xml.js");
|
|
|
6
6
|
const datatype_converter_1 = require("../../util/datatype-converter.js");
|
|
7
7
|
const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
|
|
8
8
|
const parser_utils_1 = require("../../utils2/parser.utils.js");
|
|
9
|
+
const Point_1 = require("../../converter/integral7/model/integral/Point.js");
|
|
9
10
|
class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
|
|
10
11
|
constructor(uuid, name, shortName, description) {
|
|
11
12
|
super(uuid, name, shortName, description);
|
|
@@ -100,43 +101,133 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
|
|
|
100
101
|
});
|
|
101
102
|
}
|
|
102
103
|
toGeoJSON(geoJSON, profile, schemaSettings, diagramObject) {
|
|
103
|
-
const coordinates = diagramObject.computeRectBounds(diagramObject);
|
|
104
104
|
const shapeInfos = schemaSettings.getTransformerShapeInfo(profile);
|
|
105
|
-
|
|
106
|
-
const y = coordinates[1] * -1;
|
|
107
|
-
const width = coordinates[2] === 1 ? +shapeInfos.width : coordinates[2];
|
|
108
|
-
const height = (coordinates[3] === 1 ? +shapeInfos.height : coordinates[3]);
|
|
109
|
-
const offsetX = width === 1 ? 0 : width / 2;
|
|
110
|
-
const offsetY = height === 1 ? 0 : height / 2;
|
|
111
|
-
if (x != 0 && y != 0 && width != 0 && height != 0) {
|
|
105
|
+
if (profile === 'Integral7Westnetz' || profile === 'Integral 7') {
|
|
112
106
|
super.toGeoJSON(geoJSON, profile, schemaSettings, diagramObject);
|
|
113
|
-
const pointsPolygon = [
|
|
114
|
-
[
|
|
115
|
-
[x - offsetX, y + offsetY],
|
|
116
|
-
[x + offsetX, y + offsetY],
|
|
117
|
-
[x + offsetX, y - offsetY],
|
|
118
|
-
[x - offsetX, y - offsetY],
|
|
119
|
-
[x - offsetX, y + offsetY] //links oben
|
|
120
|
-
]
|
|
121
|
-
];
|
|
122
|
-
geoJSON['geometry'] = {
|
|
123
|
-
type: 'Polygon',
|
|
124
|
-
coordinates: pointsPolygon
|
|
125
|
-
};
|
|
126
107
|
const windingRadius = shapeInfos.windingRadius;
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
108
|
+
const centerX = diagramObject.diagramObjectPoints[0].xPosition;
|
|
109
|
+
const centerY = diagramObject.diagramObjectPoints[0].yPosition * -1;
|
|
110
|
+
const windingAngleOffset = 360 / this.powerTransformerEnd.length;
|
|
111
|
+
const windingRotationStartPosition = [
|
|
112
|
+
windingRadius,
|
|
113
|
+
windingRadius - (windingRadius * 0.5)
|
|
114
|
+
];
|
|
115
|
+
const windingsCenter = [windingRadius, windingRadius];
|
|
116
|
+
if (this.powerTransformerEnd.length === 2) {
|
|
117
|
+
/* ---------- ---------- ---------- ---------- ---------- */
|
|
118
|
+
/* Transformer 2W */
|
|
119
|
+
/* ---------- ---------- ---------- ---------- ---------- */
|
|
120
|
+
const winding1Center = [...windingRotationStartPosition];
|
|
121
|
+
const winding2Center = [...windingRotationStartPosition];
|
|
122
|
+
// rotate the second winding to the correct position
|
|
123
|
+
Point_1.Point.inplaceRotate2DPoints(windingsCenter, windingAngleOffset, winding2Center);
|
|
124
|
+
// rotate all windings based on the given rotation
|
|
125
|
+
Point_1.Point.inplaceRotate2DPoints(windingsCenter, diagramObject.rotation, winding1Center, winding2Center);
|
|
126
|
+
const pointsPolygon = [
|
|
127
|
+
[
|
|
128
|
+
[centerX - windingRadius / 2, centerY - windingRadius],
|
|
129
|
+
[centerX + windingRadius / 2, centerY - windingRadius],
|
|
130
|
+
[centerX + windingRadius / 2, centerY + windingRadius],
|
|
131
|
+
[centerX - windingRadius / 2, centerY + windingRadius],
|
|
132
|
+
[centerX - windingRadius / 2, centerY - windingRadius]
|
|
133
|
+
]
|
|
134
|
+
];
|
|
135
|
+
geoJSON['geometry'] = {
|
|
136
|
+
type: 'Polygon',
|
|
137
|
+
coordinates: pointsPolygon
|
|
138
|
+
};
|
|
139
|
+
geoJSON['properties'] = {
|
|
140
|
+
diagramObjectUUID: diagramObject.mrid,
|
|
141
|
+
objectType: this.constructor.name,
|
|
142
|
+
sourceSystem: profile,
|
|
143
|
+
rotation: diagramObject.rotation,
|
|
144
|
+
center: [centerX, centerY],
|
|
145
|
+
winding1Center: winding1Center,
|
|
146
|
+
winding2Center: winding2Center,
|
|
147
|
+
radius: windingRadius,
|
|
148
|
+
windingOffset: shapeInfos.windingOffset
|
|
149
|
+
};
|
|
150
|
+
return geoJSON;
|
|
151
|
+
}
|
|
152
|
+
else {
|
|
153
|
+
/* ---------- ---------- ---------- ---------- ---------- */
|
|
154
|
+
/* Transformer 3W */
|
|
155
|
+
/* ---------- ---------- ---------- ---------- ---------- */
|
|
156
|
+
const winding1Center = [...windingRotationStartPosition];
|
|
157
|
+
const winding2Center = [...windingRotationStartPosition];
|
|
158
|
+
// rotate the second winding to the correct position
|
|
159
|
+
Point_1.Point.inplaceRotate2DPoints([windingRadius, windingRadius], windingAngleOffset, winding2Center);
|
|
160
|
+
const winding3Center = [...windingRotationStartPosition];
|
|
161
|
+
// rotate the third winding to the correct position
|
|
162
|
+
Point_1.Point.inplaceRotate2DPoints(windingsCenter, windingAngleOffset * 2, winding3Center);
|
|
163
|
+
// rotate all windings based on the given rotation
|
|
164
|
+
Point_1.Point.inplaceRotate2DPoints(windingsCenter, diagramObject.rotation, winding1Center, winding2Center, winding3Center);
|
|
165
|
+
const pointsPolygon = [
|
|
166
|
+
[
|
|
167
|
+
[centerX - windingRadius / 2, centerY - windingRadius],
|
|
168
|
+
[centerX + windingRadius / 2, centerY - windingRadius],
|
|
169
|
+
[centerX + windingRadius / 2, centerY + windingRadius],
|
|
170
|
+
[centerX - windingRadius / 2, centerY + windingRadius],
|
|
171
|
+
[centerX - windingRadius / 2, centerY - windingRadius]
|
|
172
|
+
]
|
|
173
|
+
];
|
|
174
|
+
geoJSON['geometry'] = {
|
|
175
|
+
type: 'Polygon',
|
|
176
|
+
coordinates: pointsPolygon
|
|
177
|
+
};
|
|
178
|
+
geoJSON['properties'] = {
|
|
179
|
+
diagramObjectUUID: diagramObject.mrid,
|
|
180
|
+
objectType: this.constructor.name,
|
|
181
|
+
sourceSystem: profile,
|
|
182
|
+
rotation: diagramObject.rotation,
|
|
183
|
+
center: [centerX, centerY],
|
|
184
|
+
winding1Center: winding1Center,
|
|
185
|
+
winding2Center: winding2Center,
|
|
186
|
+
winding3Center: winding3Center,
|
|
187
|
+
radius: windingRadius,
|
|
188
|
+
windingOffset: shapeInfos.windingOffset
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
return geoJSON;
|
|
192
|
+
}
|
|
193
|
+
else {
|
|
194
|
+
const coordinates = diagramObject.computeRectBounds(diagramObject);
|
|
195
|
+
const x = coordinates[0];
|
|
196
|
+
const y = coordinates[1] * -1;
|
|
197
|
+
const width = coordinates[2] === 1 ? +shapeInfos.width : coordinates[2];
|
|
198
|
+
const height = (coordinates[3] === 1 ? +shapeInfos.height : coordinates[3]);
|
|
199
|
+
const offsetX = width === 1 ? 0 : width / 2;
|
|
200
|
+
const offsetY = height === 1 ? 0 : height / 2;
|
|
201
|
+
if (x != 0 && y != 0 && width != 0 && height != 0) {
|
|
202
|
+
super.toGeoJSON(geoJSON, profile, schemaSettings, diagramObject);
|
|
203
|
+
const pointsPolygon = [
|
|
204
|
+
[
|
|
205
|
+
[x - offsetX, y + offsetY],
|
|
206
|
+
[x + offsetX, y + offsetY],
|
|
207
|
+
[x + offsetX, y - offsetY],
|
|
208
|
+
[x - offsetX, y - offsetY],
|
|
209
|
+
[x - offsetX, y + offsetY] //links oben
|
|
210
|
+
]
|
|
211
|
+
];
|
|
212
|
+
geoJSON['geometry'] = {
|
|
213
|
+
type: 'Polygon',
|
|
214
|
+
coordinates: pointsPolygon
|
|
215
|
+
};
|
|
216
|
+
const windingRadius = shapeInfos.windingRadius;
|
|
217
|
+
geoJSON['properties'] = {
|
|
218
|
+
diagramObjectUUID: diagramObject.mrid,
|
|
219
|
+
objectType: this.constructor.name,
|
|
220
|
+
rotation: +diagramObject.rotation * Math.PI / 180,
|
|
221
|
+
center: [x, y],
|
|
222
|
+
winding1: [x, y + offsetY - windingRadius],
|
|
223
|
+
winding2: [x, y - offsetY + windingRadius],
|
|
224
|
+
winding3: [0, 0],
|
|
225
|
+
radius: shapeInfos.windingRadius,
|
|
226
|
+
windingOffset: shapeInfos.windingOffset
|
|
227
|
+
};
|
|
228
|
+
}
|
|
229
|
+
return geoJSON;
|
|
138
230
|
}
|
|
139
|
-
return geoJSON;
|
|
140
231
|
}
|
|
141
232
|
/** CIM RDF/XML Serialisierung */
|
|
142
233
|
toCIMXML(xmlWriter, profile) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PowerTransformer.js","sourceRoot":"","sources":["../../../src/model/wires/PowerTransformer.ts"],"names":[],"mappings":";;;AAAA,qEAAkE;AAKlE,qDAAkD;AAGlD,sEAA0D;AAG1D,kEAAoF;AACpF,4DAAwD;
|
|
1
|
+
{"version":3,"file":"PowerTransformer.js","sourceRoot":"","sources":["../../../src/model/wires/PowerTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,17 @@
|
|
|
1
1
|
export declare class MysqlController {
|
|
2
|
+
private mySqlConfig;
|
|
2
3
|
private mysqlConnection;
|
|
4
|
+
get config(): Readonly<MySQLConfig>;
|
|
3
5
|
constructor(mySqlConfig: MySQLConfig);
|
|
4
6
|
private initMySQLConnection;
|
|
5
7
|
execQuery(query: any): Promise<any>;
|
|
6
8
|
private query;
|
|
7
9
|
openConnection(): void;
|
|
8
10
|
closeConnection(): void;
|
|
11
|
+
/**
|
|
12
|
+
* Gibt die verfügbaren Tabellennamen mit ihren Spaltennamen zurück
|
|
13
|
+
*/
|
|
14
|
+
getTableMetaData(): Promise<Map<string, string[]> | null>;
|
|
9
15
|
}
|
|
10
16
|
export interface MySQLConfig {
|
|
11
17
|
host: string;
|
|
@@ -4,7 +4,11 @@ exports.MysqlController = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const mysql_1 = require("mysql");
|
|
6
6
|
class MysqlController {
|
|
7
|
+
get config() {
|
|
8
|
+
return this.mySqlConfig;
|
|
9
|
+
}
|
|
7
10
|
constructor(mySqlConfig) {
|
|
11
|
+
this.mySqlConfig = mySqlConfig;
|
|
8
12
|
this.initMySQLConnection(mySqlConfig);
|
|
9
13
|
}
|
|
10
14
|
initMySQLConnection(mySqlConfig) {
|
|
@@ -13,7 +17,7 @@ class MysqlController {
|
|
|
13
17
|
port: mySqlConfig.port,
|
|
14
18
|
database: mySqlConfig.database,
|
|
15
19
|
user: mySqlConfig.user,
|
|
16
|
-
password: mySqlConfig.password
|
|
20
|
+
password: mySqlConfig.password
|
|
17
21
|
});
|
|
18
22
|
}
|
|
19
23
|
execQuery(query) {
|
|
@@ -40,6 +44,37 @@ class MysqlController {
|
|
|
40
44
|
closeConnection() {
|
|
41
45
|
this.mysqlConnection.end();
|
|
42
46
|
}
|
|
47
|
+
/**
|
|
48
|
+
* Gibt die verfügbaren Tabellennamen mit ihren Spaltennamen zurück
|
|
49
|
+
*/
|
|
50
|
+
getTableMetaData() {
|
|
51
|
+
var _a;
|
|
52
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
53
|
+
const tableNamesWithColumNames = new Map();
|
|
54
|
+
try {
|
|
55
|
+
let results;
|
|
56
|
+
results = yield this.execQuery(`SHOW TABLES FROM ${this.mySqlConfig.database}`);
|
|
57
|
+
for (const table of results) {
|
|
58
|
+
tableNamesWithColumNames.set(table[`Tables_in_${this.mySqlConfig.database}`], []);
|
|
59
|
+
}
|
|
60
|
+
const query = `SELECT table_name, column_name
|
|
61
|
+
FROM information_schema.columns
|
|
62
|
+
WHERE table_schema = '${this.mySqlConfig.database}'
|
|
63
|
+
ORDER BY table_name, ORDINAL_POSITION;`;
|
|
64
|
+
results = yield this.execQuery(query);
|
|
65
|
+
for (const table of results) {
|
|
66
|
+
(_a = tableNamesWithColumNames.get(table['table_name'])) === null || _a === void 0 ? void 0 : _a.push(table['column_name']);
|
|
67
|
+
}
|
|
68
|
+
return tableNamesWithColumNames;
|
|
69
|
+
}
|
|
70
|
+
catch (e) {
|
|
71
|
+
// todo
|
|
72
|
+
// this.logger.error(e);
|
|
73
|
+
console.error('ERROR:' + e);
|
|
74
|
+
}
|
|
75
|
+
return null;
|
|
76
|
+
});
|
|
77
|
+
}
|
|
43
78
|
}
|
|
44
79
|
exports.MysqlController = MysqlController;
|
|
45
80
|
//# sourceMappingURL=mysql-controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-controller.js","sourceRoot":"","sources":["../../../src/util/database/mysql-controller.ts"],"names":[],"mappings":";;;;AAAA,iCAAqD;AAErD,MAAa,eAAe;IAI1B,
|
|
1
|
+
{"version":3,"file":"mysql-controller.js","sourceRoot":"","sources":["../../../src/util/database/mysql-controller.ts"],"names":[],"mappings":";;;;AAAA,iCAAqD;AAErD,MAAa,eAAe;IAI1B,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;QAC1C,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAEO,mBAAmB,CAAC,WAAwB;QAClD,IAAI,CAAC,eAAe,GAAG,IAAA,wBAAgB,EAAC;YACtC,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,QAAQ,EAAE,WAAW,CAAC,QAAQ;SAC/B,CAAC,CAAC;IACL,CAAC;IAEY,SAAS,CAAC,KAAK;;YAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,eAAe,EAAE,EAAE;oBACpC,OAAO,CAAC,eAAe,CAAC,CAAC;gBAC3B,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE;oBACnB,MAAM,CAAC,aAAa,CAAC,CAAA;gBACvB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAEO,KAAK,CAAC,KAAK,EAAE,eAAe,EAAE,aAAa;QACjD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3D,IAAI,KAAK;gBAAE,aAAa,CAAC,KAAK,CAAC,CAAC;YAChC,eAAe,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,cAAc;QACnB,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAEM,eAAe;QACpB,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;IAC7B,CAAC;IAED;;OAEG;IACU,gBAAgB;;;YAC3B,MAAM,wBAAwB,GAA0B,IAAI,GAAG,EAAE,CAAC;YAClE,IAAI;gBACF,IAAI,OAAO,CAAC;gBACZ,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACjF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;oBAC3B,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;iBACnF;gBAED,MAAM,KAAK,GAAG;;6CAEyB,IAAI,CAAC,WAAW,CAAC,QAAQ;4DACV,CAAC;gBACvD,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBACtC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;oBAC3B,MAAA,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,0CAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;iBAC/E;gBAED,OAAO,wBAAwB,CAAC;aACjC;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO;gBACP,wBAAwB;gBACxB,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;aAE7B;YACD,OAAO,IAAI,CAAC;;KACb;CACF;AA7ED,0CA6EC"}
|