@enervance/insight-cim-model 0.0.1 → 0.0.3

package/src/model/wires/ACLineSegment.ts

@@ -3,7 +3,7 @@ import { Conductor } from './Conductor';
 import { Model } from '../model/Model';
 import { DiagramObject } from '../diagram/DiagramObject';
 import { ConnectivityNode } from '../core/ConnectivityNode';
-import {ISchemaSettings} from '../../interfaces/schema-settings/ShapeInfos';
+import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos';
 import { getValue, writeElement, writeElementAttribute } from '../../util/utils';
 import { CIM_CLASS_NAMES, IConnectivityNode } from '../..';
 import { convertValue } from '../../util/datatype-converter';
@@ -12,23 +12,23 @@ import XMLWriter from 'xml-writer';
 
 export class ACLineSegment extends Conductor {
 
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string, length?: number,aggregate?: boolean){
-        super(uuid, name, shortName, description, length, aggregate);
-    }
+  constructor(uuid?: string, name?: string, shortName?: string, description?: string, length?: number, aggregate?: boolean) {
+    super(uuid, name, shortName, description, length, aggregate);
+  }
 
-    r0: number;
-    x0: number;
-    r: number;
-    x: number;
-    bch: number;
-    gch: number;
+  r0: number;
+  x0: number;
+  r: number;
+  x: number;
+  bch: number;
+  gch: number;
 
-    b0ch: number;
-    g0ch: number;
+  b0ch: number;
+  g0ch: number;
 
-    shortCircuitEndTemperature: number;
+  shortCircuitEndTemperature: number;
 
-    public static sparqlQuery : string = `
+  public static sparqlQuery: string = `
                 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#> 
@@ -69,225 +69,241 @@ export class ACLineSegment extends Conductor {
                          ?installation ?length ?r ?x ?bch ?gch ?length ?bvUUID ?ptUUID ?ecUUID
                 `
 
-    public static getQuerySPARQL(graphURI : string) : string{
-        if(graphURI.length > 0){
-            return ACLineSegment.sparqlQuery.replace('<http://default/>', graphURI);
-        }
-        return ACLineSegment.sparqlQuery;
-    }
-
-    public static resolveClassFusekiJSON(data: any, cimModel: Model){
-        data.results.bindings.forEach((value: any) => {
-            const acLineSegment = new ACLineSegment();
-            acLineSegment.resolveAttributesFusekiJSON(value);
-            cimModel.addACLineSegment(acLineSegment);
-        });
+  public static getQuerySPARQL(graphURI: string): string {
+    if (graphURI.length > 0) {
+      return ACLineSegment.sparqlQuery.replace('<http://default/>', graphURI);
     }
-
-    protected resolveAttributesFusekiJSON(value: any){
-        super.resolveAttributesFusekiJSON(value);
-        this.r = +getValue(value, 'r');
-        this.x = +getValue(value, 'x');
-        this.bch = +getValue(value, 'bch');
-        this.gch = +getValue(value, 'gch');
-
-    }  
-
-    public resolveParsedAssociations(cimModel: Model){
-        super.resolveParsedAssociations(cimModel);
+    return ACLineSegment.sparqlQuery;
+  }
+
+  public static resolveClassFusekiJSON(data: any, cimModel: Model) {
+    data.results.bindings.forEach((value: any) => {
+      const acLineSegment = new ACLineSegment();
+      acLineSegment.resolveAttributesFusekiJSON(value);
+      cimModel.addACLineSegment(acLineSegment);
+    });
+  }
+
+  protected resolveAttributesFusekiJSON(value: any) {
+    super.resolveAttributesFusekiJSON(value);
+    this.r = +getValue(value, 'r');
+    this.x = +getValue(value, 'x');
+    this.bch = +getValue(value, 'bch');
+    this.gch = +getValue(value, 'gch');
+  }
+
+  public resolveParsedAssociations(cimModel: Model) {
+    super.resolveParsedAssociations(cimModel);
+  }
+
+
+  public toJSON() {
+    super.toJSON();
+    this.toJSONAttributes();
+    this.toJSONAssociations();
+    return this.json;
+  }
+
+  public toJSONAttributes() {
+    super.toJSONAttributes();
+    //this.json['baseVoltageUUID'] = this.baseVoltage.nominalVoltage.value;
+    this.json['r'] = this.r;
+    this.json['x'] = this.x;
+    this.json['bch'] = this.bch;
+    this.json['gch'] = this.gch;
+    this.json['currentLimit'] = this.getCurrentLimit();
+  }
+
+  public toJSONAssociations() {
+    super.toJSONAssociations();
+    if (this.baseVoltage)
+      this.json['baseVoltageUUID'] = this.baseVoltage.mrid;
+  }
+
+  public toGeoJSON(geoJSON: any, profile: string, schemaSettings: ISchemaSettings, diagramObject?: DiagramObject): any {
+    if (diagramObject) {
+      super.toGeoJSON(geoJSON, profile, schemaSettings, diagramObject);
+      const linePoints: number[][] = [];
+      diagramObject.diagramObjectPoints.forEach((point) => {
+        linePoints.push([+point.getXPosition(), +point.getYPosition() * -1]);
+      });
+      geoJSON['geometry'] = {
+        type: 'LineString',
+        coordinates: linePoints
+      }
+      geoJSON['properties'] = {
+        diagramObjectUUID: diagramObject.mrid,
+        objectType: this.constructor.name,
+      }
     }
-
-
-    public toJSON(){
-        super.toJSON();
-        this.toJSONAttributes();
-        this.toJSONAssociations();
-        return this.json;
+    return geoJSON;
+  }
+
+  /** Erstellt ein GeoJSON-Objekt für die Karte */
+  // TODO überarbeiten und konsolidieren mit Schema
+  public toMapGeoJSON(): any {
+    const linePoints: number[][] = [];
+    this.location.positionPoints.forEach((point) => {
+      linePoints.push([+point.xPosition, +point.yPosition]);
+    });
+    const geoJSON = {};
+
+    geoJSON['id'] = this.mrid;
+    geoJSON['type'] = 'Feature';
+    geoJSON['geometry'] = {
+      type: 'LineString',
+      coordinates: linePoints
+    };
+    geoJSON['properties'] = {
+      uuid: this.mrid,
+      objectType: this.constructor.name,
     }
-
-    public toJSONAttributes(){
-        super.toJSONAttributes();
-        //this.json['baseVoltageUUID'] = this.baseVoltage.nominalVoltage.value; 
-        this.json['r'] = this.r; 
-        this.json['x'] = this.x; 
-        this.json['bch'] = this.bch; 
-        this.json['gch'] = this.gch; 
-        this.json['currentLimit'] = this.getCurrentLimit(); 
+    return geoJSON;
+  }
+
+  //hier endet der Aufruf
+  public determineTopologicalNodes(connNodes: IConnectivityNode[]) {
+    return;
+  }
+
+  /** die Methode bestimmt den Datentyp, konvertiert und weist den Wert zu */
+  /*    public setProperty(cimModel: Model, propName: string, propertyValue: any){
+          const dataType: string = this.prop2Datatype.get(propName);
+
+          if(dataType) {
+              if(CIM_CLASS_NAMES[dataType]) { // komplexer Datentyp
+                  this.setAssociation(cimModel, propName, propertyValue);
+              } else { // primitiver Datentyp
+                  this[propName] = convertValue(dataType, propertyValue);
+              }
+          }
+      }*/
+
+  /*   public setAssociation(cimModel: Model, associationName: string, associatioValue: any){
+         super.setAssociation(cimModel, associationName, associatioValue);
+     }*/
+
+
+  /** die Methode gibt basierend auf der aktuellen Ausprägung des übergebenen Property
+   * ein SPARQL-INSERT Statemant zurück.
+   * 2 Szearien:
+   *      Löschen der aktuellen Ausprägung -> wird im DELETE DATA Block platziert.
+   *      Einfügen der aktuellen Ausprägung -> wird im INSERT DATA Block platziert. */
+
+  /*    public getUpdateSPARQL(className: string, propName: string): string  {
+          if(this.constructor.name === className) {
+
+              const dataType: string = this.prop2Datatype.get(propName);
+              if(CIM_CLASS_NAMES[dataType]) { // komplexer Datentyp
+                  return super.getUpdateSPARQL(className, propName);
+              } else {
+                  const propValue = String(this[propName]); // aktuelle Ausprägung auslesen
+
+                  const propNS = this.prop2namespacePrefix.get(String(propName));
+                  const propClassName = this.prop2Class.get(String(propName));
+                  if(propNS) {
+                      return `<${this.baseIRI}${this.mrid}> ${propNS}:${propClassName}.${propName} \'${propValue}\' . `;
+                  }
+              }
+          } else {
+              //TODO überarbeiten murks
+              return super.getUpdateSPARQL(className, propName);
+          }
+          return;
+      }*/
+
+  /** CIM RDF/XML Serialisierung */
+  public toCIMXML(xmlWriter: XMLWriter, profile: string) {
+    const suffixID = this.getSuffixID(profile);
+    const prefixUUID = this.getPrefixUUID(suffixID);
+    let defaultValues = '';
+    this.checkMandatoryAttributes(profile, defaultValues);
+    this.description += defaultValues;
+    if (profile === RDF_XML.PROFILE_EQ) {
+      xmlWriter.startElementNS(RDF_XML.CIM_NS_PREFIX, this.constructor.name, RDF_XML.CIM_NS_16);
+      writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+      this.toCIMXMLAttributes(xmlWriter, profile);
+      this.toCIMXMLAssociations(xmlWriter, profile);
+      xmlWriter.endElement();
+    } else if (profile === RDF_XML.PROFILE_AMPI7 && this.checkExportData(RDF_XML.PROFILE_AMPI7)) {
+      xmlWriter.startElementNS(RDF_XML.CIM_NS_PREFIX, this.constructor.name, RDF_XML.CIM_NS_16);
+      writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+      this.toCIMXMLAttributes(xmlWriter, profile);
+      this.toCIMXMLAssociations(xmlWriter, profile);
+      xmlWriter.endElement();
     }
-
-    public toJSONAssociations(){
-        super.toJSONAssociations();
-        if(this.baseVoltage)
-            this.json['baseVoltageUUID'] = this.baseVoltage.mrid; 
+  }
+
+  protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string) {
+    super.toCIMXMLAttributes(xmlWriter, profile);
+    if (profile === RDF_XML.PROFILE_EQ) {
+      writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.r`, this.r);
+      writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.x`, this.x);
+      writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.bch`, this.bch);
+      writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.gch`, this.gch);
+
+      writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.r0`, this.r0);
+      writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.x0`, this.x0);
+      writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.b0ch`, this.b0ch);
+      writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.g0ch`, this.g0ch);
+
+      writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.shortCircuitEndTemperature`, this.shortCircuitEndTemperature);
     }
-
-    public toGeoJSON (geoJSON: any, profile: string, schemaSettings: ISchemaSettings, diagramObject?: DiagramObject): any {
-        if(diagramObject) {
-            super.toGeoJSON(geoJSON, profile, schemaSettings, diagramObject);
-            const linePoints: number[][] = [];
-            diagramObject.diagramObjectPoints.forEach( (point) => {
-                linePoints.push([+point.getXPosition(), +point.getYPosition() * -1]);
-            });
-            geoJSON['geometry'] = {
-                type: 'LineString',
-                coordinates: linePoints
-            }
-            geoJSON['properties'] = {
-                diagramObjectUUID: diagramObject.mrid,
-                objectType: this.constructor.name,
-            }
-        }
-        return geoJSON;
+  }
+
+  protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string) {
+    super.toCIMXMLAssociations(xmlWriter, profile);
+  }
+
+  checkMandatoryAttributes(profile: string, defaultValues: string) {
+    super.checkMandatoryAttributes(profile, defaultValues);
+    if (profile === RDF_XML.PROFILE_EQ) {
+      if (!this.r) {
+        this.r = 1;
+        defaultValues += 'r,'
+      }
+      if (!this.x) {
+        this.x = 1;
+        defaultValues += 'x,'
+      }
+      if (!this.bch) {
+        this.bch = 1;
+        defaultValues += 'bch,'
+      }
+      if (!this.gch) {
+        this.gch = 1;
+        defaultValues += 'gch,'
+      }
+      if (!this.r0) {
+        this.r0 = 1;
+        defaultValues += 'r0,'
+      }
+      if (!this.x0) {
+        this.x0 = 1;
+        defaultValues += 'x0,'
+      }
+      if (!this.b0ch) {
+        this.b0ch = 1;
+        defaultValues += 'b0ch,'
+      }
+      if (!this.g0ch) {
+        this.g0ch = 1;
+        defaultValues += 'g0ch,'
+      }
+      if (!this.shortCircuitEndTemperature) {
+        this.shortCircuitEndTemperature = 80;
+        defaultValues += 'shortCircuitEndTemperature,'
+      }
     }
-
-    /** Erstellt ein GeoJSON-Objekt für die Karte */
-    // TODO überarbeiten und konsolidieren mit Schema
-    public toMapGeoJSON (): any {
-        const linePoints: number[][] = [];
-        this.location.positionPoints.forEach( (point) => {
-            linePoints.push([+point.xPosition, +point.yPosition]);
-        });
-        const geoJSON = {};
-
-        geoJSON['id'] = this.mrid;
-        geoJSON['type'] = 'Feature';
-        geoJSON['geometry'] = {
-            type: 'LineString',
-            coordinates: linePoints
-        };
-        geoJSON['properties'] = {
-            uuid: this.mrid,
-            objectType: this.constructor.name,
-        }
-        return geoJSON;
-    }
-
-    //hier endet der Aufruf
-    public determineTopologicalNodes(connNodes: IConnectivityNode[]){
-        return;
-    }
-
-    /** die Methode bestimmt den Datentyp, konvertiert und weist den Wert zu */
-/*    public setProperty(cimModel: Model, propName: string, propertyValue: any){
-        const dataType: string = this.prop2Datatype.get(propName);
-
-        if(dataType) {
-            if(CIM_CLASS_NAMES[dataType]) { // komplexer Datentyp
-                this.setAssociation(cimModel, propName, propertyValue);
-            } else { // primitiver Datentyp
-                this[propName] = convertValue(dataType, propertyValue);
-            }
-        }
-    }*/
-
- /*   public setAssociation(cimModel: Model, associationName: string, associatioValue: any){
-        super.setAssociation(cimModel, associationName, associatioValue);
-    }*/
-
-
-    /** die Methode gibt basierend auf der aktuellen Ausprägung des übergebenen Property
-     * ein SPARQL-INSERT Statemant zurück.
-     * 2 Szearien:
-     *      Löschen der aktuellen Ausprägung -> wird im DELETE DATA Block platziert.
-     *      Einfügen der aktuellen Ausprägung -> wird im INSERT DATA Block platziert. */
-/*    public getUpdateSPARQL(className: string, propName: string): string  {
-        if(this.constructor.name === className) {
-
-            const dataType: string = this.prop2Datatype.get(propName);
-            if(CIM_CLASS_NAMES[dataType]) { // komplexer Datentyp
-                return super.getUpdateSPARQL(className, propName);
-            } else {
-                const propValue = String(this[propName]); // aktuelle Ausprägung auslesen
-
-                const propNS = this.prop2namespacePrefix.get(String(propName));
-                const propClassName = this.prop2Class.get(String(propName));
-                if(propNS) {
-                    return `<${this.baseIRI}${this.mrid}> ${propNS}:${propClassName}.${propName} \'${propValue}\' . `;
-                }
-            }
-        } else {
-            //TODO überarbeiten murks
-            return super.getUpdateSPARQL(className, propName);
-        }
-        return;
-    }*/
-
-    /** CIM RDF/XML Serialisierung */
-    public toCIMXML(xmlWriter: XMLWriter, profile: string) {
-        let defaultValues = '';
-        this.checkMandatoryAttributes(profile, defaultValues);
-        this.description += defaultValues;
-        if(profile === RDF_XML.PROFILE_EQ) {
-            const suffixID =  this.getSuffixID(profile);
-            const prefixUUID = this.getPrefixUUID(suffixID);
-            xmlWriter.startElementNS(RDF_XML.CIM_NS_PREFIX, this.constructor.name, RDF_XML.CIM_NS_16);
-            writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
-            this.toCIMXMLAttributes(xmlWriter, profile);
-            this.toCIMXMLAssociations(xmlWriter, profile);
-            xmlWriter.endElement();
-        }
-    }
-
-    protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string) {
-        super.toCIMXMLAttributes(xmlWriter, profile);
-        if(profile === RDF_XML.PROFILE_EQ) {
-            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.r`, this.r);
-            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.x`, this.x);
-            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.bch`, this.bch);
-            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.gch`, this.gch);
-
-            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.r0`, this.r0);
-            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.x0`, this.x0);
-            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.b0ch`, this.b0ch);
-            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.g0ch`, this.g0ch);
-
-            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:ACLineSegment.shortCircuitEndTemperature`, this.shortCircuitEndTemperature);
-        }
-    }
-
-    protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string) {
-        super.toCIMXMLAssociations(xmlWriter, profile);
-    }
-
-    checkMandatoryAttributes(profile: string, defaultValues: string) {
-        super.checkMandatoryAttributes(profile, defaultValues);
-        if (profile === RDF_XML.PROFILE_EQ) {
-            if (!this.r) {
-                this.r = 1;
-                defaultValues += 'r,'
-            }
-            if (!this.x) {
-                this.x = 1;
-                defaultValues += 'x,'
-            }
-            if (!this.bch) {
-                this.bch = 1;
-                defaultValues += 'bch,'
-            }
-            if (!this.gch) {
-                this.gch = 1;
-                defaultValues += 'gch,'
-            }
-            if (!this.r0) {
-                this.r0 = 1;
-                defaultValues += 'r0,'
-            }
-            if (!this.x0) {
-                this.x0 = 1;
-                defaultValues += 'x0,'
-            }
-            if (!this.b0ch) {
-                this.b0ch = 1;
-                defaultValues += 'b0ch,'
-            }
-            if (!this.g0ch) {
-                this.g0ch = 1;
-                defaultValues += 'g0ch,'
-            }
-            if (!this.shortCircuitEndTemperature) {
-                this.shortCircuitEndTemperature = 80;
-                defaultValues += 'shortCircuitEndTemperature,'
-            }
-        }
+  }
+
+  /** Die Methode überprüft, ob für die übergebene ProfilURI
+   * relevante Informationen gepflegt sind.
+   * @param profilURI URI des Profils. */
+  checkExportData(profilURI: string): boolean {
+    if (this.psrType || this.psrTypeUUID) {
+      return true;
     }
+    return false;
+  }
 }

package/src/model/wires/AsynchronousMachine.ts

@@ -24,6 +24,9 @@ export class AsynchronousMachine extends RotatingMachine {
 
     /** CIM RDF/XML Serialisierung */
     public toCIMXML(xmlWriter: XMLWriter, profile: string) {
+        let defaultValues = '';
+        this.checkMandatoryAttributes(profile, defaultValues);
+        this.description += defaultValues;
         if(profile === RDF_XML.PROFILE_EQ) {
             const suffixID =  this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
@@ -40,7 +43,7 @@ export class AsynchronousMachine extends RotatingMachine {
         if(profile === RDF_XML.PROFILE_EQ) {
             writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:AsynchronousMachine.nominalFrequency`, this.nominalFrequency);
             writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:AsynchronousMachine.nominalSpeed`, this.nominalSpeed);
-            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:AsynchronousMachine.converterFedDrive`, this.converterFedDrive ? this.converterFedDrive : false);
+            writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:AsynchronousMachine.converterFedDrive`, this.converterFedDrive);
             writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:AsynchronousMachine.efficiency`, this.efficiency);
             writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:AsynchronousMachine.iaIrRatio`, this.iaIrRatio);
             writeElement(xmlWriter, `${RDF_XML.CIM_NS_PREFIX}:AsynchronousMachine.polePairNumber`, this.polePairNumber);
@@ -53,4 +56,38 @@ export class AsynchronousMachine extends RotatingMachine {
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string) {
         super.toCIMXMLAssociations(xmlWriter, profile);
     }
+
+    checkMandatoryAttributes(profile: string, defaultValues: string) {
+        super.checkMandatoryAttributes(profile, defaultValues);
+        if (profile === RDF_XML.PROFILE_EQ) {
+            if (!this.converterFedDrive) {
+                this.converterFedDrive = false;
+                defaultValues += 'converterFedDrive,'
+            }
+            if (!this.efficiency) {
+                this.efficiency = 1;
+                defaultValues += 'efficiency,'
+            }
+            if (!this.iaIrRatio) {
+                this.iaIrRatio = 1;
+                defaultValues += 'iaIrRatio,'
+            }
+            if (!this.polePairNumber) {
+                this.polePairNumber = 1;
+                defaultValues += 'polePairNumber,'
+            }
+            if (!this.ratedMechanicalPower) {
+                this.ratedMechanicalPower = 0;
+                defaultValues += 'ratedMechanicalPower,'
+            }
+            if (!this.reversible) {
+                this.reversible = false;
+                defaultValues += 'reversible,'
+            }
+            if (!this.rxLockedRotorRatio) {
+                this.rxLockedRotorRatio = 0.1;
+                defaultValues += 'rxLockedRotorRatio,'
+            }
+        }
+    }
 }

package/src/model/wires/Disconnector.ts

@@ -62,7 +62,7 @@ export class Disconnector extends Switch {
                 OPTIONAL{?dUUID cim:Switch.retained ?retained .}
                 OPTIONAL{?dUUID cim:Switch.open ?open .}
                 OPTIONAL{?dUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-                OPTIONAL {?dUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
+                OPTIONAL{?dUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
             }
         }
         GROUP BY ?dUUID ?baseIRI ?name ?shortName ?description