@enervance/insight-cim-model 0.0.58 → 0.0.60

package/dist/model/assetinfo/WireInfo.js

@@ -22,9 +22,9 @@ class WireInfo extends AssetInfo_1.AssetInfo {
         this.ratedCurrent = +utils_1.getValue(value, 'ratedCurrent');
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:EVWireInfo ;
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:EVWireInfo ;
                 cim:IdentifiedObject.name '${this.name}' .`;
     }
 }

package/dist/model/assets/Asset.js

@@ -193,39 +193,39 @@ class Asset extends __1.IdentifiedObject {
         this.powerSystemResourcesUUIDs = [];
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:Asset ;
-                cim:IdentifiedObject.name "${this.name}" .
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:Asset ;
+                cim:IdentifiedObject.name "${this.name}" .
         `;
     }
 }
 exports.Asset = Asset;
-Asset.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) 
-                ?name ?status ?manufacturedDate
-                (STRAFTER(str(?lUUID), '#_') AS ?locationUUID) 
-                (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)
-    
-        WHERE {
-              GRAPH <http://default/> {
-                ?fUUID rdf:type cim:Asset .
-                OPTIONAL {?fUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?fUUID cim:Asset.type ?type .}
-                OPTIONAL {?fUUID cim:Asset.status [ cim:Status.value ?status ] .}
-                OPTIONAL {?fUUID cim:Asset.lifecycleDate [ cim:LifecycleDate.manufacturedDate ?manufacturedDate ] .}
-                OPTIONAL {?fUUID cim:Asset.PowerSystemResources ?psrUUIDs . }
-                OPTIONAL {?fUUID cim:Asset.Location ?lUUID . }
-                  
-            }
-        }
+Asset.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) 
+                ?name ?status ?manufacturedDate
+                (STRAFTER(str(?lUUID), '#_') AS ?locationUUID) 
+                (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)
+    
+        WHERE {
+              GRAPH <http://default/> {
+                ?fUUID rdf:type cim:Asset .
+                OPTIONAL {?fUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?fUUID cim:Asset.type ?type .}
+                OPTIONAL {?fUUID cim:Asset.status [ cim:Status.value ?status ] .}
+                OPTIONAL {?fUUID cim:Asset.lifecycleDate [ cim:LifecycleDate.manufacturedDate ?manufacturedDate ] .}
+                OPTIONAL {?fUUID cim:Asset.PowerSystemResources ?psrUUIDs . }
+                OPTIONAL {?fUUID cim:Asset.Location ?lUUID . }
+                  
+            }
+        }
         GROUP BY ?fUUID ?baseIRI ?name ?status ?manufacturedDate ?lUUID`;
 //# sourceMappingURL=Asset.js.map

package/dist/model/assets/AssetDeployment.js

@@ -52,15 +52,15 @@ class AssetDeployment extends __1.IdentifiedObject {
         return;
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:AssetDeployment ;
-                cim:AssetDeployment.deploymentDate 
-                [
-                    a   cim:DeploymentDate ;
-                    cim:DeploymentDate.inServiceDate '' ;
-                    cim:DeploymentDate.installedDate '' 
-                 ] .
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:AssetDeployment ;
+                cim:AssetDeployment.deploymentDate 
+                [
+                    a   cim:DeploymentDate ;
+                    cim:DeploymentDate.inServiceDate '' ;
+                    cim:DeploymentDate.installedDate '' 
+                 ] .
         `;
     }
     setAsset(asset) {
@@ -82,49 +82,49 @@ class AssetDeployment extends __1.IdentifiedObject {
         return this.deploymentDate.getInServiceDate();
     }
     getInsertNewSPARQL(baseIRI, graphURI) {
-        const insertStatement = `
-            ${__1.NS_PREFIX_RDF}
-            ${__1.NS_PREFIX_CIM}
-             INSERT DATA
-             {
-                GRAPH ${graphURI}
-                {
-                   <${baseIRI}${this.mrid}>
-                    a   cim:AssetDeployment ;
-                        cim:AssetDeployment.deploymentDate 
-                        [
-                            a   cim:DeploymentDate ;
-                            cim:DeploymentDate.inServiceDate '' ;
-                            cim:DeploymentDate.installedDate '' 
-                        ] .
-                }
-             }
+        const insertStatement = `
+            ${__1.NS_PREFIX_RDF}
+            ${__1.NS_PREFIX_CIM}
+             INSERT DATA
+             {
+                GRAPH ${graphURI}
+                {
+                   <${baseIRI}${this.mrid}>
+                    a   cim:AssetDeployment ;
+                        cim:AssetDeployment.deploymentDate 
+                        [
+                            a   cim:DeploymentDate ;
+                            cim:DeploymentDate.inServiceDate '' ;
+                            cim:DeploymentDate.installedDate '' 
+                        ] .
+                }
+             }
         `;
         return insertStatement;
     }
 }
 exports.AssetDeployment = AssetDeployment;
-AssetDeployment.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(?adUUID), '#_') AS ?uuid)  
-        (CONCAT(STRBEFORE(str(?adUUID), '#_'), '#_') AS ?baseIRI) 
-        (STRAFTER(str(?aUUID), '#_') AS ?assetUUID)
-        (STRAFTER(STRAFTER(str(?deplState), '#'), '.') AS ?deploymentState) 
-        ?installedDate ?inServiceDate 
-        WHERE { 
-            GRAPH <http://default/>{
-                ?adUUID rdf:type cim:AssetDeployment .
-                OPTIONAL {?adUUID cim:AssetDeployment.deploymentDate [ cim:DeploymentDate.installedDate ?installedDate ] .}
-                OPTIONAL {?adUUID cim:AssetDeployment.deploymentDate [ cim:DeploymentDate.inServiceDate ?inServiceDate ] .}
-                OPTIONAL {?adUUID cim:AssetDeployment.deploymentState ?deplState }
-                OPTIONAL {?adUUID cim:AssetDeployment.Asset ?aUUID . }
-            }
-        }
+AssetDeployment.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(?adUUID), '#_') AS ?uuid)  
+        (CONCAT(STRBEFORE(str(?adUUID), '#_'), '#_') AS ?baseIRI) 
+        (STRAFTER(str(?aUUID), '#_') AS ?assetUUID)
+        (STRAFTER(STRAFTER(str(?deplState), '#'), '.') AS ?deploymentState) 
+        ?installedDate ?inServiceDate 
+        WHERE { 
+            GRAPH <http://default/>{
+                ?adUUID rdf:type cim:AssetDeployment .
+                OPTIONAL {?adUUID cim:AssetDeployment.deploymentDate [ cim:DeploymentDate.installedDate ?installedDate ] .}
+                OPTIONAL {?adUUID cim:AssetDeployment.deploymentDate [ cim:DeploymentDate.inServiceDate ?inServiceDate ] .}
+                OPTIONAL {?adUUID cim:AssetDeployment.deploymentState ?deplState }
+                OPTIONAL {?adUUID cim:AssetDeployment.Asset ?aUUID . }
+            }
+        }
     `;
 //# sourceMappingURL=AssetDeployment.js.map

package/dist/model/assets/AssetHealthEvent.js

@@ -42,7 +42,7 @@ AssetHealthEvent.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/assets/AssetUser.js

@@ -27,7 +27,7 @@ AssetUser.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/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,32 +62,32 @@ 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 entsoe:IdentifiedObject.shortName ?shortName .}
-                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 entsoe:IdentifiedObject.shortName ?shortName .}
+                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/Organisation.js

@@ -37,7 +37,7 @@ Organisation.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 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/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/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/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

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