@enervance/insight-cim-model 0.0.58 → 0.0.59

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

package/dist/model/wires/ExternalNetworkInjection.js

@@ -364,50 +364,50 @@ class ExternalNetworkInjection extends RegulatingCondEq_1.RegulatingCondEq {
     }
 }
 exports.ExternalNetworkInjection = ExternalNetworkInjection;
-ExternalNetworkInjection.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(?eneUUID), '#'), '_') AS ?uuid) ?name ?shortName ?description ?aggregate ?p ?q 
-      ?referencePriority ?controlEnabled ?maxInitialSymShCCurrent ?minInitialSymShCCurrent ?maxR0ToX0Ratio
-      ?maxR1ToX1Ratio ?maxZ0ToZ1Ratio ?minR0ToX0Ratio ?minR1ToX1Ratio ?minZ0ToZ1Ratio ?maxP ?maxQ ?minP ?minQ ?governorSCD
-      (strafter(strafter(str(?regCntrUUID), '#'), '_') AS ?regulatingControlUUID) 
-      (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
-                      
-      WHERE {
-          GRAPH <http://default/>{
-              ?eneUUID rdf:type cim:ExternalNetworkInjection .
-              OPTIONAL{?eneUUID cim:IdentifiedObject.name ?name .}
-              OPTIONAL{?eneUUID entsoe:IdentifiedObject.shortName ?shortName .}
-              OPTIONAL{?eneUUID cim:IdentifiedObject.description ?description .}
-              OPTIONAL{?eneUUID cim:Equipment.aggregate ?aggregate .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.p ?p .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.q ?q .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.referencePriority ?referencePriority .}
-              OPTIONAL{?eneUUID cim:RegulatingCondEq.controlEnabled ?controlEnabled .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxInitialSymShCCurrent ?maxInitialSymShCCurrent .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minInitialSymShCCurrent ?minInitialSymShCCurrent .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxR0ToX0Ratio ?maxR0ToX0Ratio .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxR1ToX1Ratio ?maxR1ToX1Ratio .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxZ0ToZ1Ratio ?maxZ0ToZ1Ratio .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minR0ToX0Ratio ?minR0ToX0Ratio .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minR1ToX1Ratio ?minR1ToX1Ratio .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minZ0ToZ1Ratio ?minZ0ToZ1Ratio .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.voltageFactor ?voltageFactor .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxP ?maxP .}
-              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxQ ?maxQ .}
-
-                OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minP ?minP .}
-                OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minQ ?minQ .}
-                OPTIONAL{?eneUUID cim:ExternalNetworkInjection.governorSCD ?governorSCD .}
-                OPTIONAL{?eneUUID cim:RegulatingCondEq.RegulatingControl ?regCntrUUID .}
-                OPTIONAL{?eneUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-            }
-        }
+ExternalNetworkInjection.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(?eneUUID), '#'), '_') AS ?uuid) ?name ?shortName ?description ?aggregate ?p ?q 
+      ?referencePriority ?controlEnabled ?maxInitialSymShCCurrent ?minInitialSymShCCurrent ?maxR0ToX0Ratio
+      ?maxR1ToX1Ratio ?maxZ0ToZ1Ratio ?minR0ToX0Ratio ?minR1ToX1Ratio ?minZ0ToZ1Ratio ?maxP ?maxQ ?minP ?minQ ?governorSCD
+      (strafter(strafter(str(?regCntrUUID), '#'), '_') AS ?regulatingControlUUID) 
+      (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
+                      
+      WHERE {
+          GRAPH <http://default/>{
+              ?eneUUID rdf:type cim:ExternalNetworkInjection .
+              OPTIONAL{?eneUUID cim:IdentifiedObject.name ?name .}
+              OPTIONAL{?eneUUID entsoe:IdentifiedObject.shortName ?shortName .}
+              OPTIONAL{?eneUUID cim:IdentifiedObject.description ?description .}
+              OPTIONAL{?eneUUID cim:Equipment.aggregate ?aggregate .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.p ?p .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.q ?q .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.referencePriority ?referencePriority .}
+              OPTIONAL{?eneUUID cim:RegulatingCondEq.controlEnabled ?controlEnabled .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxInitialSymShCCurrent ?maxInitialSymShCCurrent .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minInitialSymShCCurrent ?minInitialSymShCCurrent .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxR0ToX0Ratio ?maxR0ToX0Ratio .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxR1ToX1Ratio ?maxR1ToX1Ratio .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxZ0ToZ1Ratio ?maxZ0ToZ1Ratio .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minR0ToX0Ratio ?minR0ToX0Ratio .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minR1ToX1Ratio ?minR1ToX1Ratio .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minZ0ToZ1Ratio ?minZ0ToZ1Ratio .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.voltageFactor ?voltageFactor .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxP ?maxP .}
+              OPTIONAL{?eneUUID cim:ExternalNetworkInjection.maxQ ?maxQ .}
+
+                OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minP ?minP .}
+                OPTIONAL{?eneUUID cim:ExternalNetworkInjection.minQ ?minQ .}
+                OPTIONAL{?eneUUID cim:ExternalNetworkInjection.governorSCD ?governorSCD .}
+                OPTIONAL{?eneUUID cim:RegulatingCondEq.RegulatingControl ?regCntrUUID .}
+                OPTIONAL{?eneUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=ExternalNetworkInjection.js.map

package/dist/model/wires/Ground.js

@@ -22,7 +22,7 @@ Ground.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/GroundDisconnector.js

@@ -22,7 +22,7 @@ GroundDisconnector.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/Junction.js

@@ -38,25 +38,25 @@ class Junction extends Connector_1.Connector {
     }
 }
 exports.Junction = Junction;
-Junction.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(?MRID), '#'), '_') AS ?uuid) 
-        ?name 
-        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
-        
-        WHERE { 
-            GRAPH <http://default/>{
-                ?MRID rdf:type cim:Junction .
-                ?MRID cim:IdentifiedObject.name ?name .
-                OPTIONAL {?MRID cim:Equipment.EquipmentContainer ?ecUUID .}
-            }
-        }
+Junction.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) 
+        ?name 
+        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
+        
+        WHERE { 
+            GRAPH <http://default/>{
+                ?MRID rdf:type cim:Junction .
+                ?MRID cim:IdentifiedObject.name ?name .
+                OPTIONAL {?MRID cim:Equipment.EquipmentContainer ?ecUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=Junction.js.map

package/dist/model/wires/Line.js

@@ -86,28 +86,28 @@ class Line extends EquipmentContainer_1.EquipmentContainer {
     }
 }
 exports.Line = Line;
-Line.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(?lUUID), '#'), '_') AS ?uuid) ?name ?shortName ?description 
-        (strafter(strafter(str(?rUUID ), '#'), '_') AS ?regionUUID)
-        
-        WHERE { 
-            GRAPH <http://default/>{
-        
-                ?lUUID rdf:type cim:Line .
-                OPTIONAL {?lUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?lUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?lUUID cim:IdentifiedObject.description ?description .}
-                #Region
-                OPTIONAL {?lUUID cim:Line.Region ?rUUID .}
-            }
-        }
+Line.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(?lUUID), '#'), '_') AS ?uuid) ?name ?shortName ?description 
+        (strafter(strafter(str(?rUUID ), '#'), '_') AS ?regionUUID)
+        
+        WHERE { 
+            GRAPH <http://default/>{
+        
+                ?lUUID rdf:type cim:Line .
+                OPTIONAL {?lUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?lUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?lUUID cim:IdentifiedObject.description ?description .}
+                #Region
+                OPTIONAL {?lUUID cim:Line.Region ?rUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=Line.js.map

package/dist/model/wires/LinearShuntCompensator.js

@@ -56,41 +56,41 @@ class LinearShuntCompensator extends ShuntCompensator_1.ShuntCompensator {
     }
 }
 exports.LinearShuntCompensator = LinearShuntCompensator;
-LinearShuntCompensator.sparqlQuery = `
-        PREFIX cim:\t \t\t<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-        PREFIX enervance:\t<http://enervance.com/CIM/Extensions#> 
-        PREFIX entsoe:\t \t<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
-        PREFIX rdf:\t \t\t<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-        PREFIX amp:\t \t\t<http://amprion.net/CIM/Extensions#> 
-        PREFIX apf:\t \t\t<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:\t \t\t<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?MRID), "#"), "_") AS ?uuid) 
-        ?name ?shortName ?description ?r ?x ?r0 ?x0 ?varistorPresent ?varistorRatedCurrent ?varistorVoltageThreshold
-        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID) 
-        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID) 
-        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
-        WHERE { 
-            GRAPH <http://default/>{
-                ?MRID rdf:type cim:LinearShuntCompensator .
-                OPTIONAL{?MRID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?MRID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?MRID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?MRID cim:Equipment.aggregate ?aggregate .}
-                OPTIONAL{?MRID cim:SeriesCompensator.r ?r .}
-                OPTIONAL{?MRID cim:SeriesCompensator.x ?x .}
-                OPTIONAL{?MRID cim:SeriesCompensator.r0 ?r0 .}
-                OPTIONAL{?MRID cim:SeriesCompensator.x0 ?x0 .}
-                
-                OPTIONAL{?MRID cim:SeriesCompensator.varistorPresent ?varistorPresent .}
-                OPTIONAL{?MRID cim:SeriesCompensator.varistorRatedCurrent ?varistorRatedCurrent
-                OPTIONAL{?MRID cim:SeriesCompensator.varistorVoltageThreshold ?varistorVoltageThreshold .}
-                
-                OPTIONAL{?MRID cim:PowerSystemResource.PSRType ?ptUUID .}
-                OPTIONAL{?MRID cim:ConductingEquipment.BaseVoltage ?bvUUID .}
-                OPTIONAL{?MRID cim:Equipment.EquipmentContainer ?ecUUID .}
-            }
-          }
-        }
+LinearShuntCompensator.sparqlQuery = `
+        PREFIX cim:\t \t\t<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+        PREFIX enervance:\t<http://enervance.com/CIM/Extensions#> 
+        PREFIX entsoe:\t \t<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+        PREFIX rdf:\t \t\t<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+        PREFIX amp:\t \t\t<http://amprion.net/2018/cim_extensions#> 
+        PREFIX apf:\t \t\t<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:\t \t\t<http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (strafter(strafter(str(?MRID), "#"), "_") AS ?uuid) 
+        ?name ?shortName ?description ?r ?x ?r0 ?x0 ?varistorPresent ?varistorRatedCurrent ?varistorVoltageThreshold
+        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID) 
+        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID) 
+        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
+        WHERE { 
+            GRAPH <http://default/>{
+                ?MRID rdf:type cim:LinearShuntCompensator .
+                OPTIONAL{?MRID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?MRID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?MRID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?MRID cim:Equipment.aggregate ?aggregate .}
+                OPTIONAL{?MRID cim:SeriesCompensator.r ?r .}
+                OPTIONAL{?MRID cim:SeriesCompensator.x ?x .}
+                OPTIONAL{?MRID cim:SeriesCompensator.r0 ?r0 .}
+                OPTIONAL{?MRID cim:SeriesCompensator.x0 ?x0 .}
+                
+                OPTIONAL{?MRID cim:SeriesCompensator.varistorPresent ?varistorPresent .}
+                OPTIONAL{?MRID cim:SeriesCompensator.varistorRatedCurrent ?varistorRatedCurrent
+                OPTIONAL{?MRID cim:SeriesCompensator.varistorVoltageThreshold ?varistorVoltageThreshold .}
+                
+                OPTIONAL{?MRID cim:PowerSystemResource.PSRType ?ptUUID .}
+                OPTIONAL{?MRID cim:ConductingEquipment.BaseVoltage ?bvUUID .}
+                OPTIONAL{?MRID cim:Equipment.EquipmentContainer ?ecUUID .}
+            }
+          }
+        }
     `;
 //# sourceMappingURL=LinearShuntCompensator.js.map

package/dist/model/wires/LoadBreakSwitch.js

@@ -64,7 +64,7 @@ LoadBreakSwitch.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/PetersenCoil.js

@@ -93,39 +93,39 @@ class PetersenCoil extends EarthFaultCompensator_1.EarthFaultCompensator {
     }
 }
 exports.PetersenCoil = PetersenCoil;
-PetersenCoil.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(?acLineSegmentUUID), '#'), '_') AS ?uuid) 
-                        (CONCAT(STRBEFORE(STR(?acLineSegmentUUID), '#_'), '#_') AS ?baseIRI) 
-                        ?name ?shortName ?description ?length ?r ?x ?bch ?gch ?installation 
-                        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID) 
-                        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
-                        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID) 
-                                
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?acLineSegmentUUID rdf:type cim:ACLineSegment .
-                        OPTIONAL {?acLineSegmentUUID cim:IdentifiedObject.name ?name .}
-                        OPTIONAL {?acLineSegmentUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                        OPTIONAL {?acLineSegmentUUID cim:IdentifiedObject.description ?description .}
-                        OPTIONAL {?acLineSegmentUUID enervance:IdentifiedObject.installation ?installation .}
-                        OPTIONAL {?acLineSegmentUUID cim:Conductor.length ?length .}
-                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.r ?r .}
-                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.x ?x .}
-                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.bch ?bch .}
-                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.gch ?gch .}
-                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.length ?length .}
-                        OPTIONAL {?acLineSegmentUUID cim:ConductingEquipment.BaseVoltage ?bvUUID .}
-                        OPTIONAL {?acLineSegmentUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-                        OPTIONAL {?acLineSegmentUUID cim:PowerSystemResource.PSRType ?ptUUID .}
-                    }
-                }
+PetersenCoil.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(?acLineSegmentUUID), '#'), '_') AS ?uuid) 
+                        (CONCAT(STRBEFORE(STR(?acLineSegmentUUID), '#_'), '#_') AS ?baseIRI) 
+                        ?name ?shortName ?description ?length ?r ?x ?bch ?gch ?installation 
+                        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID) 
+                        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
+                        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID) 
+                                
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?acLineSegmentUUID rdf:type cim:ACLineSegment .
+                        OPTIONAL {?acLineSegmentUUID cim:IdentifiedObject.name ?name .}
+                        OPTIONAL {?acLineSegmentUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                        OPTIONAL {?acLineSegmentUUID cim:IdentifiedObject.description ?description .}
+                        OPTIONAL {?acLineSegmentUUID enervance:IdentifiedObject.installation ?installation .}
+                        OPTIONAL {?acLineSegmentUUID cim:Conductor.length ?length .}
+                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.r ?r .}
+                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.x ?x .}
+                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.bch ?bch .}
+                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.gch ?gch .}
+                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.length ?length .}
+                        OPTIONAL {?acLineSegmentUUID cim:ConductingEquipment.BaseVoltage ?bvUUID .}
+                        OPTIONAL {?acLineSegmentUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+                        OPTIONAL {?acLineSegmentUUID cim:PowerSystemResource.PSRType ?ptUUID .}
+                    }
+                }
                 `;
 //# sourceMappingURL=PetersenCoil.js.map

package/dist/model/wires/PowerTransformer.js

@@ -158,32 +158,32 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
     }
 }
 exports.PowerTransformer = PowerTransformer;
-PowerTransformer.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(?trUUID), '#'), '_') AS ?uuid) 
-        (CONCAT(STRBEFORE(STR(?trUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?shortName ?description ?installation ?isPartOfGeneratorUnit
-        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
-        
-        WHERE { 
-            GRAPH <http://default/>{
-            
-                ?trUUID rdf:type cim:PowerTransformer .
-                OPTIONAL {?trUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?trUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL {?trUUID enervance:IdentifiedObject.installation ?installation .}
-                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL {?trUUID cim:PowerTransformer.isPartOfGeneratorUnit ?isPartOfGeneratorUnit .}
-                OPTIONAL {?trUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-            }
-        }
+PowerTransformer.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(?trUUID), '#'), '_') AS ?uuid) 
+        (CONCAT(STRBEFORE(STR(?trUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?shortName ?description ?installation ?isPartOfGeneratorUnit
+        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
+        
+        WHERE { 
+            GRAPH <http://default/>{
+            
+                ?trUUID rdf:type cim:PowerTransformer .
+                OPTIONAL {?trUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?trUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL {?trUUID enervance:IdentifiedObject.installation ?installation .}
+                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL {?trUUID cim:PowerTransformer.isPartOfGeneratorUnit ?isPartOfGeneratorUnit .}
+                OPTIONAL {?trUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=PowerTransformer.js.map