@enervance/insight-cim-model 0.0.41 → 0.0.43

package/dist/model/assets/Facility.js

@@ -44,16 +44,16 @@ class Facility extends AssetContainer_1.AssetContainer {
         super.toJSONAssociations();
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:Facility ;
-                cim:IdentifiedObject.name "Facility" ;
-                cim:Asset.lifecycleDate 
-                [
-                    a   cim:LifecycleDate ;
-                    cim:LifecycleDate.manufacturedDate "" ;
-                    cim:LifecycleDate.purchaseDate "" 
-                ] .
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:Facility ;
+                cim:IdentifiedObject.name "Facility" ;
+                cim:Asset.lifecycleDate 
+                [
+                    a   cim:LifecycleDate ;
+                    cim:LifecycleDate.manufacturedDate "" ;
+                    cim:LifecycleDate.purchaseDate "" 
+                ] .
         `;
     }
     setKind(kind) {
@@ -62,31 +62,31 @@ class Facility extends AssetContainer_1.AssetContainer {
     }
 }
 exports.Facility = Facility;
-Facility.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(?fUUID), '#_') AS ?uuid)
-                (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI) 
-                (STRAFTER(str(?cnUUID), '#_') AS ?connectivityNodeUUID) 
-                ?name ?type ?kind ?manufacturedDate
-                (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)
-    
-        WHERE {
-            GRAPH <http://default/>{
-                ?fUUID rdf:type cim:Facility .
-                OPTIONAL {?fUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?fUUID cim:Facility.kind ?kind .}
-                OPTIONAL {?fUUID cim:Asset.type ?type .}
-                OPTIONAL {?fUUID cim:Asset.lifecycleDate [ cim:LifecycleDate.manufacturedDate ?manufacturedDate ] .}
-                OPTIONAL {?fUUID enervance:Asset.ConnectivityNode ?cnUUID .}
-                OPTIONAL {?fUUID cim:Asset.PowerSystemResources ?psrUUIDs . }
-                  
-            }
-        }
+Facility.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(?fUUID), '#_') AS ?uuid)
+                (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI) 
+                (STRAFTER(str(?cnUUID), '#_') AS ?connectivityNodeUUID) 
+                ?name ?type ?kind ?manufacturedDate
+                (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)
+    
+        WHERE {
+            GRAPH <http://default/>{
+                ?fUUID rdf:type cim:Facility .
+                OPTIONAL {?fUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?fUUID cim:Facility.kind ?kind .}
+                OPTIONAL {?fUUID cim:Asset.type ?type .}
+                OPTIONAL {?fUUID cim:Asset.lifecycleDate [ cim:LifecycleDate.manufacturedDate ?manufacturedDate ] .}
+                OPTIONAL {?fUUID enervance:Asset.ConnectivityNode ?cnUUID .}
+                OPTIONAL {?fUUID cim:Asset.PowerSystemResources ?psrUUIDs . }
+                  
+            }
+        }
         GROUP BY ?fUUID ?baseIRI ?name ?type ?kind ?cnUUID ?manufacturedDate `;
 //# sourceMappingURL=Facility.js.map

package/dist/model/common/CoordinateSystem.js

@@ -65,26 +65,26 @@ class CoordinateSystem extends __1.IdentifiedObject {
         return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'cim', 'CoordinateSystem', 'crsUrn', this.crsUrn);
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:CoordinateSystem ;
-                cim:IdentifiedObject.name "${this.name}" .
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:CoordinateSystem ;
+                cim:IdentifiedObject.name "${this.name}" .
         `;
     }
 }
 exports.CoordinateSystem = CoordinateSystem;
-CoordinateSystem.sparqlQuery = `
-                PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-                PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-
-                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
-                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
-                        ?crsUrn       
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type cim:CoordinateSystem .
-                        OPTIONAL {?MRID cim:CoordinateSystem.crsUrn ?crsUrn .}
-                    }
-                }
+CoordinateSystem.sparqlQuery = `
+                PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+                PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+
+                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
+                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
+                        ?crsUrn       
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?MRID rdf:type cim:CoordinateSystem .
+                        OPTIONAL {?MRID cim:CoordinateSystem.crsUrn ?crsUrn .}
+                    }
+                }
                 `;
 //# sourceMappingURL=CoordinateSystem.js.map

package/dist/model/common/Location.js

@@ -152,27 +152,27 @@ class Location extends __1.IdentifiedObject {
     }
 }
 exports.Location = Location;
-Location.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/Extensions#> 
-                PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-                PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-
-                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
-                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
-                        (strafter(strafter(str(?csUUIDs), '#'), '_') AS ?coordinateSystemUUID) 
-                        (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourcesUUIDs)
-                                
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type cim:Location .
-                        OPTIONAL {?MRID cim:Location.CoordinateSystem ?csUUIDs .}
-                        OPTIONAL {?MRID cim:Location.PowerSystemResources ?psrUUIDs .}
-                    }
-                }
-                GROUP BY ?MRID ?baseIRI ?csUUIDs
+Location.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/Extensions#> 
+                PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+                PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+
+                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
+                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
+                        (strafter(strafter(str(?csUUIDs), '#'), '_') AS ?coordinateSystemUUID) 
+                        (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourcesUUIDs)
+                                
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?MRID rdf:type cim:Location .
+                        OPTIONAL {?MRID cim:Location.CoordinateSystem ?csUUIDs .}
+                        OPTIONAL {?MRID cim:Location.PowerSystemResources ?psrUUIDs .}
+                    }
+                }
+                GROUP BY ?MRID ?baseIRI ?csUUIDs
                 `;
 //# sourceMappingURL=Location.js.map

package/dist/model/common/PositionPoint.js

@@ -90,8 +90,8 @@ class PositionPoint extends __1.IdentifiedObject {
         return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'PositionPoint', 'Location', location.mrid);
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
+        return `
+            <${this.baseIRI}${this.mrid}>
             a   cim:PositionPoint .`;
     }
     setSequenceNumber(sequenceNumber) {
@@ -108,28 +108,28 @@ class PositionPoint extends __1.IdentifiedObject {
     }
 }
 exports.PositionPoint = PositionPoint;
-PositionPoint.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(?MRID), '#'), '_') AS ?uuid) 
-                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
-                        ?sequenceNumber ?xPosition ?yPosition
-                        (strafter(strafter(str(?locUUID), '#'), '_') AS ?locationUUID) 
-                                
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type cim:PositionPoint .
-                        OPTIONAL {?MRID cim:PositionPoint.sequenceNumber ?sequenceNumber .}
-                        OPTIONAL {?MRID cim:PositionPoint.xPosition ?xPosition .}
-                        OPTIONAL {?MRID cim:PositionPoint.yPosition ?yPosition .}
-                        OPTIONAL {?MRID cim:PositionPoint.Location ?locUUID .}
-                    }
-                }
+PositionPoint.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(?MRID), '#'), '_') AS ?uuid) 
+                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
+                        ?sequenceNumber ?xPosition ?yPosition
+                        (strafter(strafter(str(?locUUID), '#'), '_') AS ?locationUUID) 
+                                
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?MRID rdf:type cim:PositionPoint .
+                        OPTIONAL {?MRID cim:PositionPoint.sequenceNumber ?sequenceNumber .}
+                        OPTIONAL {?MRID cim:PositionPoint.xPosition ?xPosition .}
+                        OPTIONAL {?MRID cim:PositionPoint.yPosition ?yPosition .}
+                        OPTIONAL {?MRID cim:PositionPoint.Location ?locUUID .}
+                    }
+                }
                 `;
 //# sourceMappingURL=PositionPoint.js.map

package/dist/model/core/BaseVoltage.js

@@ -85,27 +85,27 @@ class BaseVoltage extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.BaseVoltage = BaseVoltage;
-BaseVoltage.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(?bvUUID), "#"), "_") AS ?uuid) 
-                ?name ?shortName ?description ?nominalVoltage
-                
-                WHERE { 
-                    GRAPH <http://default/>{
-                    
-                        ?bvUUID rdf:type cim:BaseVoltage .
-                        OPTIONAL{?bvUUID cim:IdentifiedObject.name ?name .}
-                        OPTIONAL{?bvUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                        OPTIONAL{?bvUUID cim:IdentifiedObject.description ?description .}
-                        OPTIONAL{?bvUUID cim:BaseVoltage.nominalVoltage ?nominalVoltage .}
-                    }
-                }
+BaseVoltage.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(?bvUUID), "#"), "_") AS ?uuid) 
+                ?name ?shortName ?description ?nominalVoltage
+                
+                WHERE { 
+                    GRAPH <http://default/>{
+                    
+                        ?bvUUID rdf:type cim:BaseVoltage .
+                        OPTIONAL{?bvUUID cim:IdentifiedObject.name ?name .}
+                        OPTIONAL{?bvUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                        OPTIONAL{?bvUUID cim:IdentifiedObject.description ?description .}
+                        OPTIONAL{?bvUUID cim:BaseVoltage.nominalVoltage ?nominalVoltage .}
+                    }
+                }
     `;
 //# sourceMappingURL=BaseVoltage.js.map

package/dist/model/core/ConnectivityNode.js

@@ -384,29 +384,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/Feeder.js

@@ -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/Terminal.js

@@ -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/dc/DCLine.js

@@ -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.d.ts

@@ -12,7 +12,7 @@ export declare class Diagram extends IdentifiedObject {
     y2InitialView: number;
     diagramStyle: DiagramStyle;
     diagramElements: DiagramObject[];
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string);
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     addDiagramObject(diagramObject: DiagramObject): void;
     getDiagramElements(): DiagramObject[];
     static sparqlQuery: string;

package/dist/model/diagram/Diagram.js

@@ -5,8 +5,8 @@ const IdentifiedObject_1 = require("../core/IdentifiedObject");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class Diagram extends IdentifiedObject_1.IdentifiedObject {
-    constructor(uuid, name, shortName, description) {
-        super(uuid, name, shortName, description);
+    constructor(uuid, name, shortName, description, baseIRI) {
+        super(uuid, name, shortName, description, baseIRI);
         this.diagramElements = [];
     }
     addDiagramObject(diagramObject) {
@@ -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/Diagram.js.map

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