@enervance/insight-cim-model 0.0.57 → 0.0.59

package/dist/model/model-operations/ModelOperationDescription.js

@@ -6,43 +6,8 @@ class ModelOperationDescription extends IdentifiedObject_1.IdentifiedObject {
     constructor(uuid, name, shortName, description, baseIRI) {
         super(uuid, name, shortName, description, baseIRI);
         this.modelOperation = new Set();
-    }
-    static getQuerySPARQL(graphURI, filteredUUID) {
-        if (graphURI.length > 0) {
-            return ModelOperationDescription.sparqlQuery.replace('<http://default/>', graphURI);
-        }
-        return ModelOperationDescription.sparqlQuery;
-    }
-    static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b;
-        return (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.map(value => {
-            const modelOperationDescription = new ModelOperationDescription();
-            modelOperationDescription.resolveAttributesFusekiJSON(value);
-            cimModel.addModelOperationDescription(modelOperationDescription);
-            return modelOperationDescription;
-        });
-    }
-    addModelOperation(modelOperation) {
-        this.modelOperation.add(modelOperation);
+        this.operationDatasetArgDescription = new Set();
     }
 }
 exports.ModelOperationDescription = ModelOperationDescription;
-ModelOperationDescription.sparqlQuery = `
-                PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-                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(?MRID), '#'), '_') AS ?uuid) 
-                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
-                        ?name ?shortName ?description        
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type cim:ModelOperationDescription .
-                        OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
-                        OPTIONAL {?MRID entsoe:IdentifiedObject.shortName ?shortName .}
-                        OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
-                    }
-                }`;
 //# sourceMappingURL=ModelOperationDescription.js.map

package/dist/model/model-operations/ModelOperationDescription.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelOperationDescription.js","sourceRoot":"","sources":["../../../src/model/model-operations/ModelOperationDescription.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAI5D,MAAa,yBAA0B,SAAQ,mCAAgB;IA4B7D,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QANrD,mBAAc,GAAwB,IAAI,GAAG,EAAkB,CAAC;IAOhE,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB,EAAE,YAAsB;QACnE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,yBAAyB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACrF;QACD,OAAO,yBAAyB,CAAC,WAAW,CAAC;IAC/C,CAAC;IAGM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAiB;;QAC/D,mBAAO,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,GAAG,CAAC,KAAK,CAAC,EAAE;YAC1C,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,EAAE,CAAC;YAClE,yBAAyB,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC7D,QAAQ,CAAC,4BAA4B,CAAC,yBAAyB,CAAC,CAAC;YACjE,OAAO,yBAAyB,CAAC;QACnC,CAAC,EAAE;IACL,CAAC;IAMM,iBAAiB,CAAC,cAA8B;QACrD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC1C,CAAC;;AAvDH,8DAwDC;AArDe,qCAAW,GAAW;;;;;;;;;;;;;;;;;kBAiBpB,CAAC"}
+{"version":3,"file":"ModelOperationDescription.js","sourceRoot":"","sources":["../../../src/model/model-operations/ModelOperationDescription.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAG5D,MAAa,yBAA0B,SAAQ,mCAAgB;IAM7D,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QALrD,mBAAc,GAAwB,IAAI,GAAG,EAAkB,CAAC;QAEhE,mCAA8B,GAAmC,IAAI,GAAG,EAA6B,CAAC;IAItG,CAAC;CACF;AATD,8DASC"}

package/dist/model/operationallimits/CurrentLimit.js

@@ -71,24 +71,24 @@ class CurrentLimit extends OperationalLimit_1.OperationalLimit {
     }
 }
 exports.CurrentLimit = CurrentLimit;
-CurrentLimit.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/CIM/Extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-
-        SELECT  (strafter(strafter(str(?clUUID), "#"), "_") AS ?uuid) ?value (strafter(strafter(str(?olsUUID), "#"), "_") AS ?operationalLimitSetUUID) (strafter(strafter(str(?oltUUID), "#"), "_") AS ?operationalLimitTypeUUID) 
-                        
-        WHERE {
-            GRAPH <http://default/>{
-                ?clUUID rdf:type cim:CurrentLimit .
-                OPTIONAL{?clUUID cim:CurrentLimit.value ?value .}
-                OPTIONAL{?clUUID cim:OperationalLimit.OperationalLimitSet ?olsUUID .}
-                OPTIONAL{?clUUID cim:OperationalLimit.OperationalLimitType ?oltUUID .}
-            }
-        }
+CurrentLimit.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(?clUUID), "#"), "_") AS ?uuid) ?value (strafter(strafter(str(?olsUUID), "#"), "_") AS ?operationalLimitSetUUID) (strafter(strafter(str(?oltUUID), "#"), "_") AS ?operationalLimitTypeUUID) 
+                        
+        WHERE {
+            GRAPH <http://default/>{
+                ?clUUID rdf:type cim:CurrentLimit .
+                OPTIONAL{?clUUID cim:CurrentLimit.value ?value .}
+                OPTIONAL{?clUUID cim:OperationalLimit.OperationalLimitSet ?olsUUID .}
+                OPTIONAL{?clUUID cim:OperationalLimit.OperationalLimitType ?oltUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=CurrentLimit.js.map

package/dist/model/operationallimits/OperationalLimitSet.js

@@ -80,23 +80,23 @@ class OperationalLimitSet extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.OperationalLimitSet = OperationalLimitSet;
-OperationalLimitSet.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/CIM/Extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-
-        SELECT  (strafter(strafter(str(?olsUUID), "#"), "_") AS ?uuid) (strafter(strafter(str(?trUUID), "#"), "_") AS ?terminalUUID) (strafter(strafter(str(?eqUUID), "#"), "_") AS ?equipmentUUID) 
-                        
-        WHERE {
-            GRAPH <http://default/>{
-                ?olsUUID rdf:type cim:OperationalLimitSet .
-                OPTIONAL{?olsUUID cim:OperationalLimitSet.Terminal ?trUUID .}
-                OPTIONAL{?olsUUID cim:OperationalLimitSet.Equipment ?eqUUID .}
-            }
-        }
+OperationalLimitSet.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(?olsUUID), "#"), "_") AS ?uuid) (strafter(strafter(str(?trUUID), "#"), "_") AS ?terminalUUID) (strafter(strafter(str(?eqUUID), "#"), "_") AS ?equipmentUUID) 
+                        
+        WHERE {
+            GRAPH <http://default/>{
+                ?olsUUID rdf:type cim:OperationalLimitSet .
+                OPTIONAL{?olsUUID cim:OperationalLimitSet.Terminal ?trUUID .}
+                OPTIONAL{?olsUUID cim:OperationalLimitSet.Equipment ?eqUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=OperationalLimitSet.js.map

package/dist/model/operationallimits/OperationalLimitType.js

@@ -55,21 +55,21 @@ class OperationalLimitType extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.OperationalLimitType = OperationalLimitType;
-OperationalLimitType.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/CIM/Extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-
-        SELECT  (strafter(strafter(str(?clUUID), "#"), "_") AS ?uuid)
-                        
-        WHERE {
-            GRAPH <http://default/>{
-                ?clUUID rdf:type cim:OperationalLimitType .
-            }
-        }
+OperationalLimitType.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(?clUUID), "#"), "_") AS ?uuid)
+                        
+        WHERE {
+            GRAPH <http://default/>{
+                ?clUUID rdf:type cim:OperationalLimitType .
+            }
+        }
     `;
 //# sourceMappingURL=OperationalLimitType.js.map

package/dist/model/statevariables/SvPowerFlow.js

@@ -79,25 +79,25 @@ class SvPowerFlow extends StateVariable_1.StateVariable {
     }
 }
 exports.SvPowerFlow = SvPowerFlow;
-SvPowerFlow.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/CIM/Extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?svPfUUID), "#"), "_") AS ?uuid) ?p ?q (strafter(strafter(str(?trUUID), "#"), "_") AS ?terminalUUID)
-        
-        WHERE { 
-            GRAPH <http://default/>{
-            
-                ?svPfUUID rdf:type cim:SvPowerFlow .
-                OPTIONAL{?svPfUUID cim:SvPowerFlow.p ?p .}
-                OPTIONAL{?svPfUUID cim:SvPowerFlow.q ?q .}
-                OPTIONAL{?svPfUUID cim:SvPowerFlow.Terminal ?trUUID .}
-            }
-        }
+SvPowerFlow.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(?svPfUUID), "#"), "_") AS ?uuid) ?p ?q (strafter(strafter(str(?trUUID), "#"), "_") AS ?terminalUUID)
+        
+        WHERE { 
+            GRAPH <http://default/>{
+            
+                ?svPfUUID rdf:type cim:SvPowerFlow .
+                OPTIONAL{?svPfUUID cim:SvPowerFlow.p ?p .}
+                OPTIONAL{?svPfUUID cim:SvPowerFlow.q ?q .}
+                OPTIONAL{?svPfUUID cim:SvPowerFlow.Terminal ?trUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=SvPowerFlow.js.map

package/dist/model/statevariables/SvVoltage.js

@@ -42,7 +42,7 @@ SvVoltage.sparqlQuery = `
         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/CIM/Extensions#> 
+        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#>
         

package/dist/model/topology/TopologicalIsland.js

@@ -32,7 +32,7 @@ TopologicalIsland.sparqlQuery = `
         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/CIM/Extensions#> 
+        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#>
         

package/dist/model/topology/TopologicalNode.js

@@ -184,30 +184,30 @@ class TopologicalNode extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.TopologicalNode = TopologicalNode;
-TopologicalNode.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/CIM/Extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?tpUUID), '#'), '_') AS ?uuid) 
-        (CONCAT(STRBEFORE(str(?tpUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?shortName ?description 
-        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID)
-        (strafter(strafter(str(?cncUUID), '#'), '_') AS ?connectivityNodeContainerUUID) 
-        WHERE { 
-            GRAPH <http://default/>{
-            
-                ?tpUUID rdf:type cim:TopologicalNode .
-                OPTIONAL{?tpUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?tpUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?tpUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?tpUUID cim:TopologicalNode.BaseVoltage ?bvUUID .}
-                OPTIONAL{?tpUUID cim:TopologicalNode.ConnectivityNodeContainer ?cncUUID .}
-            }
-        }
+TopologicalNode.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(?tpUUID), '#'), '_') AS ?uuid) 
+        (CONCAT(STRBEFORE(str(?tpUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?shortName ?description 
+        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID)
+        (strafter(strafter(str(?cncUUID), '#'), '_') AS ?connectivityNodeContainerUUID) 
+        WHERE { 
+            GRAPH <http://default/>{
+            
+                ?tpUUID rdf:type cim:TopologicalNode .
+                OPTIONAL{?tpUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?tpUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?tpUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?tpUUID cim:TopologicalNode.BaseVoltage ?bvUUID .}
+                OPTIONAL{?tpUUID cim:TopologicalNode.ConnectivityNodeContainer ?cncUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=TopologicalNode.js.map

package/dist/model/wires/Breaker.js

@@ -41,39 +41,39 @@ class Breaker extends ProtectedSwitch_1.ProtectedSwitch {
     }
 }
 exports.Breaker = Breaker;
-Breaker.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/CIM/Extensions#>
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?vlUUID), '#'), '_') AS ?uuid) 
-        (CONCAT(STRBEFORE(STR(?vlUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?shortName ?description ?open ?aggregate ?normalOpen ?retained 
-        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
-        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID) 
-        (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
-           
-        
-        WHERE { 
-            GRAPH <http://default/>{
-                ?vlUUID rdf:type cim:Breaker .
-                OPTIONAL{?vlUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?vlUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?vlUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?vlUUID cim:Equipment.aggregate ?aggregate .}
-                OPTIONAL{?vlUUID cim:Switch.normalOpen ?normalOpen .}
-                OPTIONAL{?vlUUID cim:Switch.retained ?retained .}
-                OPTIONAL{?vlUUID cim:Switch.open ?open .}
-                OPTIONAL{?vlUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-                OPTIONAL{?vlUUID cim:ConductingEquipment.BaseVoltage ?bvUUID .}
-                OPTIONAL{?vlUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
-            }
-        }
-        GROUP BY ?vlUUID ?baseIRI ?name ?shortName ?description 
-         ?open ?aggregate ?normalOpen ?retained ?ecUUID ?bvUUID
+Breaker.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/CIM/Extensions#>
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (strafter(strafter(str(?vlUUID), '#'), '_') AS ?uuid) 
+        (CONCAT(STRBEFORE(STR(?vlUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?shortName ?description ?open ?aggregate ?normalOpen ?retained 
+        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
+        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID) 
+        (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
+           
+        
+        WHERE { 
+            GRAPH <http://default/>{
+                ?vlUUID rdf:type cim:Breaker .
+                OPTIONAL{?vlUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?vlUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?vlUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?vlUUID cim:Equipment.aggregate ?aggregate .}
+                OPTIONAL{?vlUUID cim:Switch.normalOpen ?normalOpen .}
+                OPTIONAL{?vlUUID cim:Switch.retained ?retained .}
+                OPTIONAL{?vlUUID cim:Switch.open ?open .}
+                OPTIONAL{?vlUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+                OPTIONAL{?vlUUID cim:ConductingEquipment.BaseVoltage ?bvUUID .}
+                OPTIONAL{?vlUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
+            }
+        }
+        GROUP BY ?vlUUID ?baseIRI ?name ?shortName ?description 
+         ?open ?aggregate ?normalOpen ?retained ?ecUUID ?bvUUID
     `;
 //# sourceMappingURL=Breaker.js.map

package/dist/model/wires/BusbarSection.js

@@ -52,7 +52,7 @@ BusbarSection.sparqlQuery = `
         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/CIM/Extensions#> 
+        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#>
         

package/dist/model/wires/Clamp.js

@@ -19,7 +19,7 @@ Clamp.sparqlQuery = `
         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/CIM/Extensions#> 
+        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#>
         

package/dist/model/wires/Disconnector.js

@@ -72,36 +72,36 @@ class Disconnector extends Switch_1.Switch {
     }
 }
 exports.Disconnector = Disconnector;
-Disconnector.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/CIM/Extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-
-        SELECT  (strafter(strafter(str(?dUUID), '#'), '_') AS ?uuid) 
-        (CONCAT(STRBEFORE(STR(?dUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?shortName ?description 
-        ?open ?aggregate ?normalOpen ?retained (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
-        (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
-                        
-        WHERE {
-            GRAPH <http://default/>{
-                ?dUUID rdf:type cim:Disconnector .
-                OPTIONAL{?dUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?dUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?dUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?dUUID cim:Equipment.aggregate ?aggregate .}
-                OPTIONAL{?dUUID cim:Switch.normalOpen ?normalOpen .}
-                OPTIONAL{?dUUID cim:Switch.retained ?retained .}
-                OPTIONAL{?dUUID cim:Switch.open ?open .}
-                OPTIONAL{?dUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-                OPTIONAL{?dUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
-            }
-        }
-        GROUP BY ?dUUID ?baseIRI ?name ?shortName ?description 
-         ?open ?aggregate ?normalOpen ?retained ?ecUUID
+Disconnector.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(?dUUID), '#'), '_') AS ?uuid) 
+        (CONCAT(STRBEFORE(STR(?dUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?shortName ?description 
+        ?open ?aggregate ?normalOpen ?retained (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
+        (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
+                        
+        WHERE {
+            GRAPH <http://default/>{
+                ?dUUID rdf:type cim:Disconnector .
+                OPTIONAL{?dUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?dUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?dUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?dUUID cim:Equipment.aggregate ?aggregate .}
+                OPTIONAL{?dUUID cim:Switch.normalOpen ?normalOpen .}
+                OPTIONAL{?dUUID cim:Switch.retained ?retained .}
+                OPTIONAL{?dUUID cim:Switch.open ?open .}
+                OPTIONAL{?dUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+                OPTIONAL{?dUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
+            }
+        }
+        GROUP BY ?dUUID ?baseIRI ?name ?shortName ?description 
+         ?open ?aggregate ?normalOpen ?retained ?ecUUID
     `;
 //# sourceMappingURL=Disconnector.js.map

package/dist/model/wires/EnergyConsumer.js

@@ -202,37 +202,37 @@ class EnergyConsumer extends EnergyConnection_1.EnergyConnection {
     }
 }
 exports.EnergyConsumer = EnergyConsumer;
-EnergyConsumer.sparqlQuery = `
-      ${sparql_building_block_1.NS_PREFIX_CIM} 
-      ${sparql_building_block_1.NS_PREFIX_ENERVANCE} 
-      ${sparql_building_block_1.NS_PREFIX_ENTSOE} 
-      ${sparql_building_block_1.NS_PREFIX_RDF} 
-      ${sparql_building_block_1.NS_PREFIX_RDF} 
-      ${sparql_building_block_1.NS_PREFIX_ENTSOE} 
-      ${sparql_building_block_1.NS_PREFIX_APF}
-      ${sparql_building_block_1.NS_PREFIX_AFN}
-
-      SELECT  (strafter(strafter(str(?econUUID), '#'), '_') AS ?uuid)  
-      (CONCAT(STRBEFORE(STR(?econUUID), '#_'), '#_') AS ?baseIRI) 
-      ?name ?shortName ?description ?aggregate ?p ?q
-      (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)  
-      (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID) 
-      (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)              
-      WHERE {
-          GRAPH <http://default/>{
-              ?econUUID rdf:type cim:EnergyConsumer . 
-              OPTIONAL{?econUUID cim:IdentifiedObject.name ?name .}
-              OPTIONAL{?econUUID entsoe:IdentifiedObject.shortName ?shortName .}
-              OPTIONAL{?econUUID cim:IdentifiedObject.description ?description .}
-              OPTIONAL{?econUUID cim:EnergyConsumer.p ?p .}
-              OPTIONAL{?econUUID cim:EnergyConsumer.q ?q .}
-                              
-              OPTIONAL{?econUUID cim:Equipment.aggregate ?aggregate .}
-              OPTIONAL{?econUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-              OPTIONAL{?econUUID cim:PowerSystemResource.PSRType ?ptUUID .}
-              OPTIONAL{?econUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
-          }
-      }
-     GROUP BY ?econUUID ?baseIRI ?name ?shortName ?description ?aggregate ?p ?q ?ecUUID ?ptUUID
+EnergyConsumer.sparqlQuery = `
+      ${sparql_building_block_1.NS_PREFIX_CIM} 
+      ${sparql_building_block_1.NS_PREFIX_ENERVANCE} 
+      ${sparql_building_block_1.NS_PREFIX_ENTSOE} 
+      ${sparql_building_block_1.NS_PREFIX_RDF} 
+      ${sparql_building_block_1.NS_PREFIX_RDF} 
+      ${sparql_building_block_1.NS_PREFIX_ENTSOE} 
+      ${sparql_building_block_1.NS_PREFIX_APF}
+      ${sparql_building_block_1.NS_PREFIX_AFN}
+
+      SELECT  (strafter(strafter(str(?econUUID), '#'), '_') AS ?uuid)  
+      (CONCAT(STRBEFORE(STR(?econUUID), '#_'), '#_') AS ?baseIRI) 
+      ?name ?shortName ?description ?aggregate ?p ?q
+      (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)  
+      (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID) 
+      (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)              
+      WHERE {
+          GRAPH <http://default/>{
+              ?econUUID rdf:type cim:EnergyConsumer . 
+              OPTIONAL{?econUUID cim:IdentifiedObject.name ?name .}
+              OPTIONAL{?econUUID entsoe:IdentifiedObject.shortName ?shortName .}
+              OPTIONAL{?econUUID cim:IdentifiedObject.description ?description .}
+              OPTIONAL{?econUUID cim:EnergyConsumer.p ?p .}
+              OPTIONAL{?econUUID cim:EnergyConsumer.q ?q .}
+                              
+              OPTIONAL{?econUUID cim:Equipment.aggregate ?aggregate .}
+              OPTIONAL{?econUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+              OPTIONAL{?econUUID cim:PowerSystemResource.PSRType ?ptUUID .}
+              OPTIONAL{?econUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
+          }
+      }
+     GROUP BY ?econUUID ?baseIRI ?name ?shortName ?description ?aggregate ?p ?q ?ecUUID ?ptUUID
   `;
 //# sourceMappingURL=EnergyConsumer.js.map