npm - @enervance/insight-cim-model - Versions diffs - 0.0.47 → 0.0.48 - Mend

@enervance/insight-cim-model 0.0.47 → 0.0.48

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.

Files changed (179) hide show

package/dist/model/core/Bay.js CHANGED Viewed

@@ -134,27 +134,27 @@ class Bay extends EquipmentContainer_1.EquipmentContainer {
     }
 }
 exports.Bay = Bay;
-Bay.sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        SELECT  (strafter(strafter(str(?bayUUID), '#'), '_') AS ?uuid)
-                 (CONCAT(STRBEFORE(str(?bayUUID), '#_'), '#_') AS ?baseIRI)
-                 ?name ?shortName ?description
-                 (strafter(strafter(str(?vlUUID), '#'), '_') AS ?voltageLevelUUID)
-        WHERE {
-            GRAPH <http://default/>{
-                ?bayUUID rdf:type cim:Bay .
-                OPTIONAL {?bayUUID cim:IdentifiedObject.name ?name . }
-                OPTIONAL {?bayUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?bayUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL {?bayUUID cim:Bay.VoltageLevel ?vlUUID}
-            }
-        }
+Bay.sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        SELECT  (strafter(strafter(str(?bayUUID), '#'), '_') AS ?uuid)
+                 (CONCAT(STRBEFORE(str(?bayUUID), '#_'), '#_') AS ?baseIRI)
+                 ?name ?shortName ?description
+                 (strafter(strafter(str(?vlUUID), '#'), '_') AS ?voltageLevelUUID)
+        WHERE {
+            GRAPH <http://default/>{
+                ?bayUUID rdf:type cim:Bay .
+                OPTIONAL {?bayUUID cim:IdentifiedObject.name ?name . }
+                OPTIONAL {?bayUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?bayUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL {?bayUUID cim:Bay.VoltageLevel ?vlUUID}
+            }
+        }
     `;
 //# sourceMappingURL=Bay.js.map

package/dist/model/core/ConnectivityNode.js CHANGED Viewed

@@ -247,7 +247,7 @@ class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
             offsetX = +width / 2;
             offsetY = +height / 2;
         }
-        if (x != 0 && y != 0 && width != 0 && height != 0) {
+        if (x != 0 && y != 0 && width > 0 && height > 0) {
             super.toGeoJSON(geoJSON, profile, schemaSettings, diagramObject);
             if (profile === 'Integral 7') {
                 let xx = coordinates[0];
@@ -256,11 +256,7 @@ class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
                 let offsetYY = height / 2;
                 const pointsPolygon = [
                     [
-                        [xx, yy + offsetYY],
-                        [xx + offsetXX, yy],
-                        [xx, yy - offsetYY],
-                        [xx - offsetXX, yy],
-                        [xx, yy + offsetYY]
+                        [xx, yy]
                     ]
                 ];
                 geoJSON['geometry'] = {
@@ -384,29 +380,29 @@ class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.ConnectivityNode = ConnectivityNode;
-ConnectivityNode.sparqlQuery = `
-        PREFIX cim:	 		            <http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        PREFIX enervance:           <http://enervance.com/CIM/Extensions#>
-        PREFIX westnetzneplan:	    <http://westnetzneplan.de/CIM/Extensions#>
-        PREFIX entsoe:	 	          <http://entsoe.eu/CIM/SchemaExtension/3/1#>
-        PREFIX rdf:	 		            <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX amp:	 		            <http://amprion.net/Extensions#>
-        PREFIX apf:	 		            <http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		            <http://jena.apache.org/ARQ/function#>
-        SELECT  (STRAFTER(str(?MRID), '#_') AS ?uuid)
-                (CONCAT(STRBEFORE(str(?MRID), '#_'), '#_') AS ?baseIRI)
-                ?name ?shortName ?description
-                (STRAFTER(str(?cncUUID), '#_') AS ?connectivityNodeContainerUUID)
-        WHERE {
-            GRAPH <http://default/>{
-                ?MRID rdf:type cim:ConnectivityNode .
-                OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?MRID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
-                OPTIONAL {?MRID cim:ConnectivityNode.ConnectivityNodeContainer ?cncUUID .}
-            }
-        }
+ConnectivityNode.sparqlQuery = `
+        PREFIX cim:	 		            <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX enervance:           <http://enervance.com/CIM/Extensions#>
+        PREFIX westnetzneplan:	    <http://westnetzneplan.de/CIM/Extensions#>
+        PREFIX entsoe:	 	          <http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:	 		            <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX amp:	 		            <http://amprion.net/Extensions#>
+        PREFIX apf:	 		            <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		            <http://jena.apache.org/ARQ/function#>
+        SELECT  (STRAFTER(str(?MRID), '#_') AS ?uuid)
+                (CONCAT(STRBEFORE(str(?MRID), '#_'), '#_') AS ?baseIRI)
+                ?name ?shortName ?description
+                (STRAFTER(str(?cncUUID), '#_') AS ?connectivityNodeContainerUUID)
+        WHERE {
+            GRAPH <http://default/>{
+                ?MRID rdf:type cim:ConnectivityNode .
+                OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?MRID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
+                OPTIONAL {?MRID cim:ConnectivityNode.ConnectivityNodeContainer ?cncUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=ConnectivityNode.js.map

package/dist/model/core/ConnectivityNode.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ConnectivityNode.js","sourceRoot":"","sources":["../../../src/model/core/ConnectivityNode.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"ConnectivityNode.js","sourceRoot":"","sources":["../../../src/model/core/ConnectivityNode.ts"],"names":[],"mappings":"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"}

package/dist/model/core/Feeder.js CHANGED Viewed

@@ -75,10 +75,10 @@ class Feeder extends EquipmentContainer_1.EquipmentContainer {
         }
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:Feeder ;
-                cim:IdentifiedObject.name "Feeder" .
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:Feeder ;
+                cim:IdentifiedObject.name "Feeder" .
         `;
     }
     static resolveClassFusekiJSON(data, cimModel) {
@@ -118,30 +118,30 @@ class Feeder extends EquipmentContainer_1.EquipmentContainer {
     }
 }
 exports.Feeder = Feeder;
-Feeder.sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        SELECT  (strafter(strafter(str(?fUUID), "#"), "_") AS ?uuid)
-        (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI)
-        ?name ?shortName ?description
-        (STRAFTER(str(?negsUUID), '#_') AS ?normalEnergizingSubstationUUID)
-        (group_concat(STRAFTER(str(?nedsUUIDs), '#_');separator=',') as ?energizedSubstationUUIDs)
-        WHERE {
-            GRAPH <http://default/>{
-                ?fUUID rdf:type cim:Feeder .
-                OPTIONAL{?fUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?fUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?fUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?fUUID cim:Feeder.NormalEnergizingSubstation ?negsUUID .}
-                OPTIONAL{?fUUID cim:Feeder.NormalEnergizedSubstation ?nedsUUIDs . }
-            }
-        }
-        GROUP BY ?fUUID ?baseIRI ?name ?shortName ?description ?negsUUID
+Feeder.sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        SELECT  (strafter(strafter(str(?fUUID), "#"), "_") AS ?uuid)
+        (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI)
+        ?name ?shortName ?description
+        (STRAFTER(str(?negsUUID), '#_') AS ?normalEnergizingSubstationUUID)
+        (group_concat(STRAFTER(str(?nedsUUIDs), '#_');separator=',') as ?energizedSubstationUUIDs)
+        WHERE {
+            GRAPH <http://default/>{
+                ?fUUID rdf:type cim:Feeder .
+                OPTIONAL{?fUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?fUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?fUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?fUUID cim:Feeder.NormalEnergizingSubstation ?negsUUID .}
+                OPTIONAL{?fUUID cim:Feeder.NormalEnergizedSubstation ?nedsUUIDs . }
+            }
+        }
+        GROUP BY ?fUUID ?baseIRI ?name ?shortName ?description ?negsUUID
     `;
 //# sourceMappingURL=Feeder.js.map

package/dist/model/core/Substation.js CHANGED Viewed

@@ -230,28 +230,28 @@ class Substation extends EquipmentContainer_1.EquipmentContainer {
     }
 }
 exports.Substation = Substation;
-Substation.sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#>
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        SELECT  (strafter(strafter(str(?sUUID), "#"), "_") AS ?uuid)
-                (CONCAT(STRBEFORE(str(?sUUID), '#_'), '#_') AS ?baseIRI)
-        ?name ?shortName ?description
-        WHERE {
-            GRAPH <http://default/>{
-                ?sUUID rdf:type cim:Substation .
-                OPTIONAL{?sUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?sUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?sUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL { ?mrid cim:PowerSystemResource.Location ?lUUID . }
-            }
-        }
+Substation.sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#>
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        SELECT  (strafter(strafter(str(?sUUID), "#"), "_") AS ?uuid)
+                (CONCAT(STRBEFORE(str(?sUUID), '#_'), '#_') AS ?baseIRI)
+        ?name ?shortName ?description
+        WHERE {
+            GRAPH <http://default/>{
+                ?sUUID rdf:type cim:Substation .
+                OPTIONAL{?sUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?sUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?sUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL { ?mrid cim:PowerSystemResource.Location ?lUUID . }
+            }
+        }
     `;
 //# sourceMappingURL=Substation.js.map

package/dist/model/core/Terminal.js CHANGED Viewed

@@ -338,36 +338,36 @@ class Terminal extends ACDCTerminal_1.ACDCTerminal {
     }
 }
 exports.Terminal = Terminal;
-Terminal.sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#>
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        SELECT  (strafter(strafter(str(?terminalUUID), '#'), '_') AS ?uuid)
-                (CONCAT(STRBEFORE(STR(?terminalUUID), '#_'), '#_') AS ?baseIRI)
-                ?name ?shortName ?connected ?sequenceNumber ?phases
-                (strafter(strafter(str(?cnUUID), '#'), '_') AS ?connectivityNodeUUID)
-                (strafter(strafter(str(?ceUUID), '#'), '_') AS ?conductingEquipmentUUID)
-                (strafter(strafter(str(?tpUUID), '#'), '_') AS ?topologicalNodeUUID)
-                (strafter(strafter(str(?nhFeederUUID), '#'), '_') AS ?normalHeadFeederUUID)
-        WHERE {
-            GRAPH <http://default/>{
-                ?terminalUUID rdf:type cim:Terminal .
-                OPTIONAL {?terminalUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?terminalUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?terminalUUID cim:ACDCTerminal.connected ?connected .}
-                OPTIONAL {?terminalUUID cim:ACDCTerminal.sequenceNumber ?sequenceNumber .}
-                OPTIONAL {?terminalUUID cim:Terminal.phases ?phases .}
-                OPTIONAL {?terminalUUID cim:Terminal.ConnectivityNode ?cnUUID .}
-                OPTIONAL {?terminalUUID cim:Terminal.ConductingEquipment ?ceUUID .}
-                OPTIONAL {?terminalUUID cim:Terminal.TopologicalNode ?tpUUID .}
-                OPTIONAL {?terminalUUID cim:Terminal.NormalHeadFeeder ?nhFeederUUID .}
-            }
-        }
+Terminal.sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#>
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        SELECT  (strafter(strafter(str(?terminalUUID), '#'), '_') AS ?uuid)
+                (CONCAT(STRBEFORE(STR(?terminalUUID), '#_'), '#_') AS ?baseIRI)
+                ?name ?shortName ?connected ?sequenceNumber ?phases
+                (strafter(strafter(str(?cnUUID), '#'), '_') AS ?connectivityNodeUUID)
+                (strafter(strafter(str(?ceUUID), '#'), '_') AS ?conductingEquipmentUUID)
+                (strafter(strafter(str(?tpUUID), '#'), '_') AS ?topologicalNodeUUID)
+                (strafter(strafter(str(?nhFeederUUID), '#'), '_') AS ?normalHeadFeederUUID)
+        WHERE {
+            GRAPH <http://default/>{
+                ?terminalUUID rdf:type cim:Terminal .
+                OPTIONAL {?terminalUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?terminalUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?terminalUUID cim:ACDCTerminal.connected ?connected .}
+                OPTIONAL {?terminalUUID cim:ACDCTerminal.sequenceNumber ?sequenceNumber .}
+                OPTIONAL {?terminalUUID cim:Terminal.phases ?phases .}
+                OPTIONAL {?terminalUUID cim:Terminal.ConnectivityNode ?cnUUID .}
+                OPTIONAL {?terminalUUID cim:Terminal.ConductingEquipment ?ceUUID .}
+                OPTIONAL {?terminalUUID cim:Terminal.TopologicalNode ?tpUUID .}
+                OPTIONAL {?terminalUUID cim:Terminal.NormalHeadFeeder ?nhFeederUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=Terminal.js.map

package/dist/model/core/VoltageLevel.js CHANGED Viewed

@@ -136,25 +136,25 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
     }
 }
 exports.VoltageLevel = VoltageLevel;
-VoltageLevel.sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        SELECT  (STRAFTER(str(?vlUUID), '#_') AS ?uuid)
-                (CONCAT(STRBEFORE(str(?vlUUID), '#_'), '#_') AS ?baseIRI)
-                ?name (STRAFTER(str(?sUUID), '#_') AS ?substationUUID) (STRAFTER(str(?bvUUID), '#_') AS ?baseVoltageUUID)
-        WHERE {
-            GRAPH <http://default/>{
-                OPTIONAL{?vlUUID rdf:type cim:VoltageLevel .}
-                OPTIONAL{?vlUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?vlUUID cim:VoltageLevel.Substation ?sUUID .}
-                OPTIONAL{?vlUUID cim:VoltageLevel.BaseVoltage ?bvUUID .}
-            }
-        }
+VoltageLevel.sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        SELECT  (STRAFTER(str(?vlUUID), '#_') AS ?uuid)
+                (CONCAT(STRBEFORE(str(?vlUUID), '#_'), '#_') AS ?baseIRI)
+                ?name (STRAFTER(str(?sUUID), '#_') AS ?substationUUID) (STRAFTER(str(?bvUUID), '#_') AS ?baseVoltageUUID)
+        WHERE {
+            GRAPH <http://default/>{
+                OPTIONAL{?vlUUID rdf:type cim:VoltageLevel .}
+                OPTIONAL{?vlUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?vlUUID cim:VoltageLevel.Substation ?sUUID .}
+                OPTIONAL{?vlUUID cim:VoltageLevel.BaseVoltage ?bvUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=VoltageLevel.js.map

package/dist/model/dc/DCLine.js CHANGED Viewed

@@ -27,22 +27,22 @@ class DCLine extends DCEquipmentContainer_1.DCEquipmentContainer {
     }
 }
 exports.DCLine = DCLine;
-DCLine.sparqlQuery = `
-        PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        PREFIX enervance:   <http://enervance.com/CIM/Extensions#>
-        PREFIX entsoe:      <http://entsoe.eu/CIM/SchemaExtension/3/1#>
-        PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX apf:         <http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
-        SELECT  (STRAFTER(str(?hsUUID), '#_') AS ?uuid)
-        (CONCAT(STRBEFORE(str(?hsUUID), '#_'), '#_') AS ?baseIRI)
-        ?name
-        WHERE {
-            GRAPH <http://default/>{
-                ?MRID rdf:type cim:DCLine .
-                OPTIONAL { ?MRID cim:IdentifiedObject.name ?name .}
-            }
-        }
+DCLine.sparqlQuery = `
+        PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX enervance:   <http://enervance.com/CIM/Extensions#>
+        PREFIX entsoe:      <http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX apf:         <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
+        SELECT  (STRAFTER(str(?hsUUID), '#_') AS ?uuid)
+        (CONCAT(STRBEFORE(str(?hsUUID), '#_'), '#_') AS ?baseIRI)
+        ?name
+        WHERE {
+            GRAPH <http://default/>{
+                ?MRID rdf:type cim:DCLine .
+                OPTIONAL { ?MRID cim:IdentifiedObject.name ?name .}
+            }
+        }
     `;
 //# sourceMappingURL=DCLine.js.map

package/dist/model/diagram/Diagram.js CHANGED Viewed

@@ -82,25 +82,25 @@ class Diagram extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.Diagram = Diagram;
-Diagram.sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#>
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        SELECT  (strafter(strafter(str(?diagramUUID), "#"), "_") AS ?uuid)
-                ?name ?shortName
-        WHERE {
-            GRAPH <http://default/>{
-                ?diagramUUID rdf:type cim:Diagram .
-                OPTIONAL {?diagramUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?diagramUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?diagramUUID cim:Diagram.orientation ?orientationEnum .}
-            }
-        }
+Diagram.sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#>
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        SELECT  (strafter(strafter(str(?diagramUUID), "#"), "_") AS ?uuid)
+                ?name ?shortName
+        WHERE {
+            GRAPH <http://default/>{
+                ?diagramUUID rdf:type cim:Diagram .
+                OPTIONAL {?diagramUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?diagramUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?diagramUUID cim:Diagram.orientation ?orientationEnum .}
+            }
+        }
     `;
 //# sourceMappingURL=Diagram.js.map

package/dist/model/diagram/DiagramObject.js CHANGED Viewed

@@ -89,9 +89,9 @@ class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
         });
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:DiagramObject .
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:DiagramObject .
         `;
     }
     resolveAttributesFusekiJSON(value) {
@@ -269,28 +269,28 @@ class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.DiagramObject = DiagramObject;
-DiagramObject.sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#>
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        SELECT  (strafter(strafter(str(?doUUID), '#'), '_') AS ?uuid)
-        (CONCAT(STRBEFORE(str(?doUUID), '#_'), '#_') AS ?baseIRI)
-        (strafter(strafter(str(?dUUID), '#'), '_') AS ?diagramUUID)
-        (strafter(strafter(str(?psrUUID), '#'), '_') AS ?identifiedObjectUUID) ?drawingOrder ?rotation
-        WHERE {
-            GRAPH <http://default/>{
-                ?doUUID rdf:type cim:DiagramObject .
-                OPTIONAL {?doUUID cim:DiagramObject.drawingOrder ?drawingOrder .}
-                OPTIONAL {?doUUID cim:DiagramObject.rotation ?rotation .}
-                OPTIONAL {?doUUID cim:DiagramObject.IdentifiedObject ?psrUUID .}
-                OPTIONAL {?doUUID cim:DiagramObject.Diagram ?dUUID .}
-            }
-        }
+DiagramObject.sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#>
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#>
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        SELECT  (strafter(strafter(str(?doUUID), '#'), '_') AS ?uuid)
+        (CONCAT(STRBEFORE(str(?doUUID), '#_'), '#_') AS ?baseIRI)
+        (strafter(strafter(str(?dUUID), '#'), '_') AS ?diagramUUID)
+        (strafter(strafter(str(?psrUUID), '#'), '_') AS ?identifiedObjectUUID) ?drawingOrder ?rotation
+        WHERE {
+            GRAPH <http://default/>{
+                ?doUUID rdf:type cim:DiagramObject .
+                OPTIONAL {?doUUID cim:DiagramObject.drawingOrder ?drawingOrder .}
+                OPTIONAL {?doUUID cim:DiagramObject.rotation ?rotation .}
+                OPTIONAL {?doUUID cim:DiagramObject.IdentifiedObject ?psrUUID .}
+                OPTIONAL {?doUUID cim:DiagramObject.Diagram ?dUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=DiagramObject.js.map