npm - @enervance/insight-cim-model - Versions diffs - 0.0.77 → 0.0.78 - Mend

@enervance/insight-cim-model 0.0.77 → 0.0.78

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (330) hide show

package/dist/model/assets/Asset.js CHANGED Viewed

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Asset = void 0;
-const __1 = require("../../index.js");
 const HealthScore_1 = require("./HealthScore.js");
-const utils_1 = require("../../util/utils.js");
 const LifecycleDate_1 = require("./LifecycleDate.js");
-class Asset extends __1.IdentifiedObject {
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+const PowerSystemResource_1 = require("../core/PowerSystemResource.js");
+const Status_1 = require("../common/Status.js");
+const AssetOwner_1 = require("./AssetOwner.js");
+class Asset extends IdentifiedObject_1.IdentifiedObject {
     static sparqlQuery = `
         PREFIX cim:    <http://iec.ch/TC57/2013/CIM-schema-cim16#>
         PREFIX enervance:   <http://enervance.com/CIM/Extensions#>
@@ -50,7 +53,7 @@ class Asset extends __1.IdentifiedObject {
     analyticScoresUUIDs = [];
     lifecycleDate = new LifecycleDate_1.LifecycleDate();
     analytic = new Map();
-    status = new __1.Status();
+    status = new Status_1.Status();
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.baseIRI = baseIRI;
@@ -139,7 +142,7 @@ class Asset extends __1.IdentifiedObject {
         return '';
     }
     getAssetOwner() {
-        return [...this.organisationRoles.values()].find(it => it instanceof __1.AssetOwner);
+        return [...this.organisationRoles.values()].find(it => it instanceof AssetOwner_1.AssetOwner);
     }
     removeAssetOrganisationRole(delOrganisationRole) {
         if (this.organisationRoles.has(delOrganisationRole.mrid)) {
@@ -228,7 +231,7 @@ class Asset extends __1.IdentifiedObject {
         /** psr parsen */
         for (const psrUUID of this.powerSystemResourcesUUIDs) {
             const psr = cimModel.getObject(psrUUID);
-            if (psr && psr instanceof __1.PowerSystemResource) {
+            if (psr && psr instanceof PowerSystemResource_1.PowerSystemResource) {
                 this.powerSystemResources.set(psr.mrid, psr);
                 psr.addAsset(this);
             }
@@ -246,11 +249,11 @@ class Asset extends __1.IdentifiedObject {
         super.resolveAttributesFusekiJSON(value);
         this.lifecycleDate.resolveClassFusekiJSON(value);
         this.status.resolveClassFusekiJSON(value);
-        this.type = (0, utils_1.getValue)(value, 'type');
-        this.assetContainerUUID = (0, utils_1.getValue)(value, 'assetContainerUUID');
-        this.assetInfoUUID = (0, utils_1.getValue)(value, 'assetInfoUUID');
-        this.locationUUID = (0, utils_1.getValue)(value, 'locationUUID');
-        this.powerSystemResourcesUUIDs = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'powerSystemResourceUUIDs'), ',');
+        this.type = parser_utils_1.ParserUtils.getValue(value, 'type');
+        this.assetContainerUUID = parser_utils_1.ParserUtils.getValue(value, 'assetContainerUUID');
+        this.assetInfoUUID = parser_utils_1.ParserUtils.getValue(value, 'assetInfoUUID');
+        this.locationUUID = parser_utils_1.ParserUtils.getValue(value, 'locationUUID');
+        this.powerSystemResourcesUUIDs = parser_utils_1.ParserUtils.parseCsvLineIntoArray(parser_utils_1.ParserUtils.getValue(value, 'powerSystemResourceUUIDs'), ',');
     }
 }
 exports.Asset = Asset;

package/dist/model/assets/Asset.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Asset.js","sourceRoot":"","sources":["../../../src/model/assets/Asset.ts"],"names":[],"mappings":";;;~~AAAA,6BAAwH;AAMxH~~,+CAA4C;AAE5C,~~4CAAmE~~;~~AACnE~~,~~mDAAgD~~;~~AAMhD~~,MAAa,KAAM,SAAQ,~~oBAAgB~~;IAElC,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;wEA0BkC,CAAC;IACvE,IAAI,CAAS;IACb,eAAe,CAAkB;IACjC,cAAc,CAAiB;IAC/B,kBAAkB,CAAS;IAC3B,QAAQ,CAAY;IACpB,YAAY,CAAS;IACrB,oBAAoB,GAAqC,IAAI,GAAG,EAAE,CAAC;IACnE,yBAAyB,CAAW;IACpC,SAAS,CAAY;IACrB,aAAa,CAAS;IACtB,iBAAiB,GAAuC,IAAI,GAAG,EAAE,CAAC;IAClE,uCAAuC;IAC/B,eAAe,CAA+B;IACtD,aAAa,GAA+B,IAAI,GAAG,EAAE,CAAC;IACtD,mBAAmB,GAAa,EAAE,CAAC;IACnC,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;IACpC,QAAQ,GAA2B,IAAI,GAAG,EAAE,CAAC;IAC7C,MAAM,GAAG,IAAI,~~UAAM~~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~~cAAU~~,CAAC,CAAC;IACnF,CAAC;IACD,2BAA2B,CAAC,mBAA0C;QACpE,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE;YACxD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;SACzD;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,EAAE,CAAA;QACnB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,EAAE;YACpD,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACzB;~~QAED~~,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;IACnC,CAAC;IAEM,OAAO,CAAC,IAAY;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAClG,CAAC;IAEM,SAAS,CAAC,MAAc;QAC7B,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,sBAAsB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;QAC5F,kGAAkG;IACpG,CAAC;IAEM,iBAAiB,CAAC,cAA8B;QACrD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IAC1H,CAAC;IAEM,WAAW,CAAC,QAAmB;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACnH,CAAC;IAEM,YAAY,CAAC,SAAoB;QACtC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAChH,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,gBAAgB,CAAC,IAAY,EAAE,IAAY;QAChD,IAAI,MAAM,CAAC;QACX,QAAQ,IAAI,EAAE;YACZ,KAAK,kBAAkB,CAAC,CAAC;gBACvB,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;gBACtD,MAAM;aACP;YACD,KAAK,kBAAkB,CAAC,CAAC;gBACvB,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;gBACtD,MAAM;aACP;SACF;QACD,IAAI,MAAM,EAAE;YACV,gFAAgF;YAChF,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,6BAA6B,MAAM,KAAK,CAAC;SAC7E;aAAM;YACL,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IACM,gBAAgB,CAAC,IAAY;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;IACjD,CAAC;IAEM,gBAAgB,CAAC,IAAY;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,eAAe,EAAE,gBAAgB,EAAE,CAAC;IAClD,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAmB,CAAC;QACpF,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAc,CAAC;QACxE,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAyB,CAAC;QAC9E,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE9B,iBAAiB;QACjB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,yBAAyB,EAAE;YACpD,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACxC,IAAI,GAAG,IAAI,GAAG,YAAY,~~uBAAmB~~,EAAE;gBAC7C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAC7C,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;aACpB;SACF;QACD,IAAI,CAAC,yBAAyB,GAAG,EAAE,CAAC;IACtC,CAAC;IAEM,wBAAwB;QAE7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;6CAEM,IAAI,CAAC,IAAI;SAC7C,CAAC;IACR,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;~~QAEzC~~,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,MAAM,CAAC,CAAC;~~QACpC~~,IAAI,CAAC,kBAAkB,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,oBAAoB,CAAC,CAAC;~~QAChE~~,IAAI,CAAC,aAAa,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,eAAe,CAAC,CAAC;~~QACtD~~,IAAI,CAAC,YAAY,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,cAAc,CAAC,CAAC;~~QACpD~~,IAAI,CAAC,yBAAyB,GAAG,~~IAAA~~,~~6BAAqB~~,~~EAAC~~,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,0BAA0B,CAAC,EAAE,GAAG,CAAC,CAAC;~~IAC3G~~,CAAC;;~~AA9RH~~,~~sBAuVC~~"}
1	+ {"version":3,"file":"Asset.js","sourceRoot":"","sources":["../../../src/model/assets/Asset.ts"],"names":[],"mappings":"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"}

package/dist/model/assets/AssetDeployment.d.ts CHANGED Viewed

@@ -1,8 +1,10 @@
-import { BaseVoltage, IdentifiedObject, ModelContainer } from '../../index.js';
 import { Asset } from './Asset.js';
 import { DeploymentDate } from './DeploymentDate.js';
 import { DeploymentStateKind } from './DeploymentStateKind.js';
 import { TransformerApplicationKind } from './TransformerApplicationKind.js';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { BaseVoltage } from '../core/BaseVoltage.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class AssetDeployment extends IdentifiedObject {
     deploymentDate: DeploymentDate;
     deploymentState: DeploymentStateKind;

package/dist/model/assets/AssetDeployment.js CHANGED Viewed

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetDeployment = void 0;
-const __1 = require("../../index.js");
 const DeploymentDate_1 = require("./DeploymentDate.js");
 const DeploymentStateKind_1 = require("./DeploymentStateKind.js");
-const utils_1 = require("../../util/utils.js");
-class AssetDeployment extends __1.IdentifiedObject {
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+const sparql_building_block_1 = require("../../util/sparql/sparql-building-block.js");
+class AssetDeployment extends IdentifiedObject_1.IdentifiedObject {
     deploymentDate;
     deploymentState;
     transformerApplication;
@@ -56,8 +57,8 @@ class AssetDeployment extends __1.IdentifiedObject {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.assetUUID = (0, utils_1.getValue)(value, 'assetUUID');
-        deploymentState: DeploymentStateKind_1.DeploymentStateKind[(0, utils_1.getValue)(value, 'deploymentState')];
+        this.assetUUID = parser_utils_1.ParserUtils.getValue(value, 'assetUUID');
+        deploymentState: DeploymentStateKind_1.DeploymentStateKind[parser_utils_1.ParserUtils.getValue(value, 'deploymentState')];
         // Compound ?inServiceDate
         this.deploymentDate = new DeploymentDate_1.DeploymentDate();
         this.deploymentDate.resolveClassFusekiJSON(value);
@@ -118,8 +119,8 @@ class AssetDeployment extends __1.IdentifiedObject {
     }
     getInsertNewSPARQL(baseIRI, graphURI) {
         const insertStatement = `
-            ${__1.NS_PREFIX_RDF}
-            ${__1.NS_PREFIX_CIM}
+            ${sparql_building_block_1.NS_PREFIX_RDF}
+            ${sparql_building_block_1.NS_PREFIX_CIM}
              INSERT DATA
              {
                 GRAPH ${graphURI}

package/dist/model/assets/AssetDeployment.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AssetDeployment.js","sourceRoot":"","sources":["../../../src/model/assets/AssetDeployment.ts"],"names":[],"mappings":";;;~~AAAA~~,~~6BAAoG;AAEpG,~~qDAAkD;AAClD,+DAA4D;AAE5D,~~4CAA4C~~;~~AAG5C~~,MAAa,eAAgB,SAAQ,~~oBAAgB~~;IAEjD,cAAc,CAAiB;IAC/B,eAAe,CAAsB;IACrC,sBAAsB,CAA6B;IAEnD,KAAK,CAAQ;IACb,SAAS,CAAS;IAElB,WAAW,CAAc;IACzB,eAAe,CAAS;IAExB,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAChG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,EAAE,CAAA;IAC9C,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;KAsBnC,CAAC;IACK,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC7E;QACD,OAAO,eAAe,CAAC,WAAW,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACpE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;YACvC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,WAAW,CAAC,CAAC;~~QAC9C~~,eAAe,EAAE,yCAAmB,CAAC,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC;~~QACzE~~,0BAA0B;QAC1B,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,EAAE,CAAC;QAC3C,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACrD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAU,CAAC;QACzD,IAAG,IAAI,CAAC,KAAK;YAAE,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;;YAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,0BAA0B,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5G,CAAC;IAED;;;;wFAIoF;IAC7E,eAAe,CAAC,SAAiB,EAAE,QAAgB;QACtD,IAAG,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,SAAS,EAAE;YACpC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,+BAA+B;YAEzE,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5D,IAAI,MAAM,EAAE;gBACR,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,aAAa,IAAI,QAAQ,MAAM,SAAS,OAAO,CAAC;aACrG;SACJ;QACD,OAAO;IACX,CAAC;IAEM,wBAAwB;QAC3B,OAAO;eACA,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;;;;SAQ9B,CAAC;IACN,CAAC;IAEM,QAAQ,CAAC,KAAY;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACnH,CAAC;IAEM,gBAAgB,CAAC,IAAY;QAChC,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC1E,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,sBAAsB,CAAC,CAAC;IACxI,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;IAClD,CAAC;IAEM,gBAAgB,CAAC,IAAY;QAChC,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAE1E,OAAO,KAAK,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,uCAAuC,CAAC;IAChF,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;IAClD,CAAC;IAEM,kBAAkB,CAAC,OAAe,EAAE,QAAgB;QAEvD,MAAM,eAAe,GAAG;cAClB,~~iBAAa~~;cACb,~~iBAAa~~;;;wBAGH,QAAQ;;sBAEV,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;;;;;;SAUhC,CAAC;QACF,OAAO,eAAe,CAAC;IAC3B,CAAC;;AApJL,0CAqJC"}
1	+ {"version":3,"file":"AssetDeployment.js","sourceRoot":"","sources":["../../../src/model/assets/AssetDeployment.ts"],"names":[],"mappings":"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"}

package/dist/model/assets/AssetOrganisationRole.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { OrganisationRole } from '../common/OrganisationRole.js';
 import { Asset } from './Asset.js';
-import { ModelContainer } from '../../index.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class AssetOrganisationRole extends OrganisationRole {
     assets: Map<string, Asset>;
     assetUUIDs: string[];

package/dist/model/assets/AssetOrganisationRole.js CHANGED Viewed

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetOrganisationRole = void 0;
 const OrganisationRole_1 = require("../common/OrganisationRole.js");
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class AssetOrganisationRole extends OrganisationRole_1.OrganisationRole {
     assets = new Map(); // für Parser
     assetUUIDs = [];
@@ -11,7 +11,7 @@ class AssetOrganisationRole extends OrganisationRole_1.OrganisationRole {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.assetUUIDs = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'assetUUIDs'), ',');
+        this.assetUUIDs = parser_utils_1.ParserUtils.parseCsvLineIntoArray(parser_utils_1.ParserUtils.getValue(value, 'assetUUIDs'), ',');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);

package/dist/model/assets/AssetOrganisationRole.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AssetOrganisationRole.js","sourceRoot":"","sources":["../../../src/model/assets/AssetOrganisationRole.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAE5D,~~4CAAiE~~;~~AAGjE~~,MAAa,qBAAsB,SAAQ,mCAAgB;IAEzD,MAAM,GAAuB,IAAI,GAAG,EAAE,CAAC,CAAC,aAAa;IACrD,UAAU,GAAa,EAAE,CAAC;IAE1B,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,~~IAAA~~,~~6BAAqB~~,~~EAAC~~,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;~~IAC9E~~,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,oBAAoB;QACpB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAU,CAAC;YACrD,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnC,KAAK,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;aACtC;SACF;QACD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACtH,kGAAkG;YAClG,uGAAuG;SACxG;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,WAAW,CAAC,QAAe;QACzB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzH,qGAAqG;SACtG;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA7CD,sDA6CC"}
1	+ {"version":3,"file":"AssetOrganisationRole.js","sourceRoot":"","sources":["../../../src/model/assets/AssetOrganisationRole.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAE5D,4DAAwD;AAGxD,MAAa,qBAAsB,SAAQ,mCAAgB;IAEzD,MAAM,GAAuB,IAAI,GAAG,EAAE,CAAC,CAAC,aAAa;IACrD,UAAU,GAAa,EAAE,CAAC;IAE1B,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,0BAAW,CAAC,qBAAqB,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;IACtG,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,oBAAoB;QACpB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAU,CAAC;YACrD,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnC,KAAK,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;aACtC;SACF;QACD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACtH,kGAAkG;YAClG,uGAAuG;SACxG;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,WAAW,CAAC,QAAe;QACzB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzH,qGAAqG;SACtG;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA7CD,sDA6CC"}

package/dist/model/assets/AssetOwner.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { AssetOrganisationRole } from './AssetOrganisationRole.js';
-import { ModelContainer } from '../../index.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class AssetOwner extends AssetOrganisationRole {
     protected constructor(mrid?: string, name?: string, shortName?: string, description?: string);
     /** SPARQL */

package/dist/model/assets/DeploymentDate.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeploymentDate = void 0;
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class DeploymentDate {
     inServiceDate;
     installedDate;
@@ -11,8 +11,8 @@ class DeploymentDate {
     constructor() {
     }
     resolveClassFusekiJSON(value) {
-        this.inServiceDate = (0, utils_1.getValue)(value, 'inServiceDate');
-        this.installedDate = (0, utils_1.getValue)(value, 'installedDate');
+        this.inServiceDate = parser_utils_1.ParserUtils.getValue(value, 'inServiceDate');
+        this.installedDate = parser_utils_1.ParserUtils.getValue(value, 'installedDate');
     }
     getInServiceDate() {
         return this.inServiceDate ? this.inServiceDate : '';

package/dist/model/assets/DeploymentDate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DeploymentDate.js","sourceRoot":"","sources":["../../../src/model/assets/DeploymentDate.ts"],"names":[],"mappings":";;;AAAA,~~4CAA4C~~;~~AAE5C~~,MAAa,cAAc;IAEvB,aAAa,CAAS;IACtB,aAAa,CAAS;IACtB,mBAAmB,CAAS;IAC5B,gBAAgB,CAAS;IACzB,WAAW,CAAS;IAEpB;IACA,CAAC;IAGM,sBAAsB,CAAC,KAAU;QACpC,IAAI,CAAC,aAAa,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,eAAe,CAAC,CAAC;~~QACtD~~,IAAI,CAAC,aAAa,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,eAAe,CAAC,CAAC;~~IAC1D~~,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IAED,gBAAgB,CAAC,IAAY;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,OAAO,uCAAuC,IAAI,KAAK,CAAC;IAC5D,CAAC;IACD,gBAAgB,CAAC,IAAY;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,OAAO,sCAAsC,IAAI,KAAK,CAAC;IAC3D,CAAC;CACJ;AAjCD,wCAiCC"}
1	+ {"version":3,"file":"DeploymentDate.js","sourceRoot":"","sources":["../../../src/model/assets/DeploymentDate.ts"],"names":[],"mappings":";;;AAAA,4DAAwD;AAExD,MAAa,cAAc;IAEvB,aAAa,CAAS;IACtB,aAAa,CAAS;IACtB,mBAAmB,CAAS;IAC5B,gBAAgB,CAAS;IACzB,WAAW,CAAS;IAEpB;IACA,CAAC;IAGM,sBAAsB,CAAC,KAAU;QACpC,IAAI,CAAC,aAAa,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAClE,IAAI,CAAC,aAAa,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IACtE,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IAED,gBAAgB,CAAC,IAAY;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,OAAO,uCAAuC,IAAI,KAAK,CAAC;IAC5D,CAAC;IACD,gBAAgB,CAAC,IAAY;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,OAAO,sCAAsC,IAAI,KAAK,CAAC;IAC3D,CAAC;CACJ;AAjCD,wCAiCC"}

package/dist/model/assets/Facility.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { AssetContainer } from './AssetContainer.js';
-import { ModelContainer } from '../../index.js';
 import { IFacility } from '../../interfaces/model/assets/IFacility.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class Facility extends AssetContainer implements IFacility {
     kind: string;
     constructor(mrid?: string, name?: string, shortName?: string, description?: string);

package/dist/model/assets/Facility.js CHANGED Viewed

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Facility = void 0;
 const AssetContainer_1 = require("./AssetContainer.js");
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class Facility extends AssetContainer_1.AssetContainer {
     kind;
     constructor(mrid, name, shortName, description) {
@@ -28,7 +28,7 @@ class Facility extends AssetContainer_1.AssetContainer {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.kind = (0, utils_1.getValue)(value, 'kind');
+        this.kind = parser_utils_1.ParserUtils.getValue(value, 'kind');
     }
     toJSON() {
         super.toJSON();

package/dist/model/assets/Facility.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Facility.js","sourceRoot":"","sources":["../../../src/model/assets/Facility.ts"],"names":[],"mappings":";;;AAAA,~~qDAAgD~~;~~AAEhD~~,~~4CAA0C~~;~~AAG1C~~,MAAa,QAAS,SAAQ,+BAAc;~~IAExC~~,IAAI,CAAS;IAEb,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;~~QAC9E~~,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,oBAAoB,GAAG,IAAI,GAAG,EAAE,CAAC;QAEtC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,wCAAwC;QACtF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;~~IAC/C~~,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,~~QAAiB~~;~~QAC1C~~,~~IAAG~~,QAAQ,CAAC,MAAM,GAAG,CAAC,~~EAAC~~;~~YACnB~~,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;~~SACtE~~;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;~~IAChC~~,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;~~QACpE~~,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;~~YAC5C~~,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;~~QACnC~~,CAAC,CAAC,CAAC;~~IACP~~,CAAC;IAEM,2BAA2B,CAAC,KAAU;~~QACzC~~,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,MAAM,CAAC,CAAC;~~IACxC~~,CAAC;IAGM,MAAM;~~QACT~~,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;~~IACrB~~,CAAC;IAEM,gBAAgB;~~QACnB~~,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;~~IAClC~~,CAAC;~~IACM~~,kBAAkB;~~QACrB~~,KAAK,CAAC,kBAAkB,EAAE,CAAC;~~IAC/B~~,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;~~8EA2BsC~~,CAAC;~~IAGpE~~,wBAAwB;~~QAE3B~~,OAAO;~~eACA~~,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;;;;;SAS9B,CAAC;~~IACN~~,CAAC;IAGD,OAAO,CAAC,IAAY;~~QAChB~~,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;~~IACvG~~,CAAC;;~~AAnGL~~,~~4BAoGC~~"}
1	+ {"version":3,"file":"Facility.js","sourceRoot":"","sources":["../../../src/model/assets/Facility.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAIlD,4DAAwD;AAExD,MAAa,QAAS,SAAQ,+BAAc;IAE1C,IAAI,CAAS;IAEb,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,oBAAoB,GAAG,IAAI,GAAG,EAAE,CAAC;QAEtC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,wCAAwC;QACtF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACpE;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;IAC9B,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAGM,MAAM;QACX,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IAChC,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC7B,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;8EA2BwC,CAAC;IAGtE,wBAAwB;QAE7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;;;;;SAS9B,CAAC;IACR,CAAC;IAGD,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACrG,CAAC;;AApGH,4BAqGC"}

package/dist/model/assets/HealthScore.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { AggregateScore } from './AggregateScore.js';
-import { ModelContainer } from '../../index.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class HealthScore extends AggregateScore {
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     static sparqlQuery: string;

package/dist/model/assets/HealthScore.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"HealthScore.js","sourceRoot":"","sources":["../../../src/model/assets/HealthScore.ts"],"names":[],"mappings":";;;AAAA,~~qDAAgD~~;~~AAIhD~~,MAAa,WAAY,SAAQ,+BAAc;IAC3C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAChG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;KAoBnC,CAAC;IAEK,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACzE;QACD,OAAO,WAAW,CAAC,WAAW,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACpE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;YACnC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,wBAAwB;QAE3B,OAAO;eACA,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;SAK9B,CAAC;IACN,CAAC;;AApDL,kCAqDC"}
1	+ {"version":3,"file":"HealthScore.js","sourceRoot":"","sources":["../../../src/model/assets/HealthScore.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAIlD,MAAa,WAAY,SAAQ,+BAAc;IAC3C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAChG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;KAoBnC,CAAC;IAEK,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACzE;QACD,OAAO,WAAW,CAAC,WAAW,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACpE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;YACnC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,wBAAwB;QAE3B,OAAO;eACA,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;;;SAK9B,CAAC;IACN,CAAC;;AApDL,kCAqDC"}

package/dist/model/assets/LifecycleDate.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LifecycleDate = void 0;
-const utils_1 = require("../../util/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class LifecycleDate {
     installationDate;
     manufacturedDate;
@@ -12,8 +12,8 @@ class LifecycleDate {
     constructor() {
     }
     resolveClassFusekiJSON(value) {
-        this.manufacturedDate = (0, utils_1.getValue)(value, 'manufacturedDate');
-        this.installationDate = (0, utils_1.getValue)(value, 'installationDate');
+        this.manufacturedDate = parser_utils_1.ParserUtils.getValue(value, 'manufacturedDate');
+        this.installationDate = parser_utils_1.ParserUtils.getValue(value, 'installationDate');
     }
     /*  setManufacturedDate(manufacturedDate: string): string {
         this.manufacturedDate = manufacturedDate;

package/dist/model/assets/LifecycleDate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"LifecycleDate.js","sourceRoot":"","sources":["../../../src/model/assets/LifecycleDate.ts"],"names":[],"mappings":";;;AAAA,~~4CAA0C~~;~~AAE1C~~,MAAa,aAAa;IAExB,gBAAgB,CAAS;IACzB,gBAAgB,CAAS;IACzB,YAAY,CAAS;IACrB,YAAY,CAAS;IACrB,WAAW,CAAS;IACpB,WAAW,CAAS;IAEpB;IACA,CAAC;IAEM,sBAAsB,CAAC,KAAU;QACtC,IAAI,CAAC,gBAAgB,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,kBAAkB,CAAC,CAAC;~~QAC5D~~,IAAI,CAAC,gBAAgB,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,kBAAkB,CAAC,CAAC;~~IAC9D~~,CAAC;~~IAEH~~;;;;;;SAMK;~~IAEH~~,mBAAmB,CAAC,IAAY;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,yCAAyC,IAAI,KAAK,CAAC;IAC5D,CAAC;IAED,mBAAmB,CAAC,IAAY;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,yCAAyC,IAAI,KAAK,CAAC;IAC5D,CAAC;CACF;AAlCD,sCAkCC"}
1	+ {"version":3,"file":"LifecycleDate.js","sourceRoot":"","sources":["../../../src/model/assets/LifecycleDate.ts"],"names":[],"mappings":";;;AAAA,4DAAwD;AAExD,MAAa,aAAa;IAExB,gBAAgB,CAAS;IACzB,gBAAgB,CAAS;IACzB,YAAY,CAAS;IACrB,YAAY,CAAS;IACrB,WAAW,CAAS;IACpB,WAAW,CAAS;IAEpB;IACA,CAAC;IAEM,sBAAsB,CAAC,KAAU;QACtC,IAAI,CAAC,gBAAgB,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;QACxE,IAAI,CAAC,gBAAgB,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAC1E,CAAC;IAED;;;;;;SAMK;IAEL,mBAAmB,CAAC,IAAY;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,yCAAyC,IAAI,KAAK,CAAC;IAC5D,CAAC;IAED,mBAAmB,CAAC,IAAY;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,yCAAyC,IAAI,KAAK,CAAC;IAC5D,CAAC;CACF;AAlCD,sCAkCC"}

package/dist/model/common/ActivityRecord.d.ts CHANGED Viewed

@@ -1,7 +1,8 @@
-import { IdentifiedObject, ModelContainer } from '../../index.js';
 import { Status } from './Status.js';
 import { Asset } from '../assets/Asset.js';
 import { IActivityRecord } from '../../interfaces/model/assets/IActivityRecord.js';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class ActivityRecord extends IdentifiedObject implements IActivityRecord {
     reason: string;
     severity: string;

package/dist/model/common/ActivityRecord.js CHANGED Viewed

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActivityRecord = void 0;
-const __1 = require("../../index.js");
-const utils_1 = require("../../util/utils.js");
-class ActivityRecord extends __1.IdentifiedObject {
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+class ActivityRecord extends IdentifiedObject_1.IdentifiedObject {
     reason;
     severity;
     status;
@@ -15,9 +15,9 @@ class ActivityRecord extends __1.IdentifiedObject {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.severity = (0, utils_1.getValue)(value, 'severity');
-        this.type = (0, utils_1.getValue)(value, 'type');
-        this.assetUUIDs = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'assetUUIDs'), ',');
+        this.severity = parser_utils_1.ParserUtils.getValue(value, 'severity');
+        this.type = parser_utils_1.ParserUtils.getValue(value, 'type');
+        this.assetUUIDs = parser_utils_1.ParserUtils.parseCsvLineIntoArray(parser_utils_1.ParserUtils.getValue(value, 'assetUUIDs'), ',');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);

package/dist/model/common/ActivityRecord.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ActivityRecord.js","sourceRoot":"","sources":["../../../src/model/common/ActivityRecord.ts"],"names":[],"mappings":";;;~~AAAA~~,~~6BAAuD~~;~~AAGvD,4CAAiE~~;~~AAGjE~~,MAAa,cAAe,SAAQ,~~oBAAgB~~;~~IAEhD~~,MAAM,CAAS;IACf,QAAQ,CAAS;IACjB,MAAM,CAAS;IACf,IAAI,CAAS;IAEb,MAAM,GAAuB,IAAI,GAAG,EAAE,CAAC;IACvC,UAAU,CAAW,CAAC,aAAa;IAEnC,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;~~QACxF~~,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;~~IAC9C~~,CAAC;IAGM,2BAA2B,CAAC,KAAU;~~QACzC~~,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,UAAU,CAAC,CAAC;~~QAC5C~~,IAAI,CAAC,IAAI,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,MAAM,CAAC,CAAC;~~QACpC~~,IAAI,CAAC,UAAU,~~GAAI~~,~~IAAA~~,~~6BAAqB~~,~~EAAC~~,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;~~IACjF~~,CAAC;~~IACM~~,yBAAyB,CAAC,QAAwB;~~QACrD~~,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,oBAAoB;QACpB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;~~YACrC~~,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAU,CAAC;YACrD,IAAI,KAAK,EAAE;~~gBACP~~,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;~~aACjC~~;~~SACJ~~;QACD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;~~IACzB~~,CAAC;IAEM,gBAAgB;~~QACnB~~,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;~~IAClC~~,CAAC;~~IACM~~,kBAAkB;~~QACrB~~,KAAK,CAAC,kBAAkB,EAAE,CAAC;~~IAC/B~~,CAAC;IAED,QAAQ,CAAC,KAAY;~~QACjB~~,~~IAAG~~,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;~~YAC7B~~,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/G,2FAA2F;YAC3F,uGAAuG;~~SAC1G~~;QACD,OAAO,EAAE,CAAC;~~IACd~~,CAAC;~~IACD~~,WAAW,CAAC,QAAe;~~QACvB~~,~~IAAG~~,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;~~YAC/B~~,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClH,8FAA8F;~~SACjG~~;QACD,OAAO,EAAE,CAAC;~~IACd~~,CAAC;~~CACJ~~;~~AA5DD~~,~~wCA4DC~~"}
1	+ {"version":3,"file":"ActivityRecord.js","sourceRoot":"","sources":["../../../src/model/common/ActivityRecord.ts"],"names":[],"mappings":";;;AAKA,4DAAwD;AACxD,+DAA4D;AAG5D,MAAa,cAAe,SAAQ,mCAAgB;IAElD,MAAM,CAAS;IACf,QAAQ,CAAS;IACjB,MAAM,CAAS;IACf,IAAI,CAAS;IAEb,MAAM,GAAuB,IAAI,GAAG,EAAE,CAAC;IACvC,UAAU,CAAW,CAAC,aAAa;IAEnC,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,GAAG,0BAAW,CAAC,qBAAqB,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;IACtG,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,oBAAoB;QACpB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAU,CAAC;YACrD,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;aAC/B;SACF;QACD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IAChC,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC7B,CAAC;IAED,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/G,2FAA2F;YAC3F,uGAAuG;SACxG;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,WAAW,CAAC,QAAe;QACzB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClH,8FAA8F;SAC/F;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA/DD,wCA+DC"}

package/dist/model/common/CoordinateSystem.d.ts CHANGED Viewed

@@ -1,10 +1,12 @@
-import { IdentifiedObject, Location, ModelContainer } from '../../index.js';
 import XMLWriter from 'xml-writer';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
+import { Location } from '../common/Location.js';
 export declare class CoordinateSystem extends IdentifiedObject {
     crsUrn: string;
     locations: Location[];
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
-    addLocation(loaction: Location): void;
+    addLocation(location: Location): void;
     /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;

package/dist/model/common/CoordinateSystem.js CHANGED Viewed

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoordinateSystem = void 0;
-const __1 = require("../../index.js");
-const utils_1 = require("../../util/utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
-const xml_serializer_2 = require("../../util/xml/xml.serializer.js");
-class CoordinateSystem extends __1.IdentifiedObject {
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+const rdf_xml_1 = require("../../constants/rdf-xml.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+class CoordinateSystem extends IdentifiedObject_1.IdentifiedObject {
     crsUrn;
     locations = [];
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.baseIRI = baseIRI;
     }
-    addLocation(loaction) {
-        if (this.locations.indexOf(loaction) === -1) {
-            this.locations.push(loaction);
+    addLocation(location) {
+        if (this.locations.indexOf(location) === -1) {
+            this.locations.push(location);
         }
         else {
             console.log('CoordinateSystem.Location ' + this.mrid + ' existiert bereits.');
@@ -22,11 +22,11 @@ class CoordinateSystem extends __1.IdentifiedObject {
     }
     /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
-        if (profile === __1.RDF_XML.PROFILE_GL) {
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_GL) {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
-            xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);
-            (0, xml_serializer_2.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
+            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -35,10 +35,10 @@ class CoordinateSystem extends __1.IdentifiedObject {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (this.crsUrn) {
-            (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:CoordinateSystem.crsUrn`, this.crsUrn);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:CoordinateSystem.crsUrn`, this.crsUrn);
         }
         else {
-            xmlWriter.writeComment(`${__1.RDF_XML.CIM_NS_PREFIX}:CoordinateSystem.crsUrn is not defined`);
+            xmlWriter.writeComment(`${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:CoordinateSystem.crsUrn is not defined`);
         }
     }
     /** ------------------ Fuseki Schnittstelle ------------------*/
@@ -71,7 +71,7 @@ class CoordinateSystem extends __1.IdentifiedObject {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.crsUrn = (0, utils_1.getValue)(value, 'crsUrn');
+        this.crsUrn = parser_utils_1.ParserUtils.getValue(value, 'crsUrn');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);

package/dist/model/common/CoordinateSystem.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CoordinateSystem.js","sourceRoot":"","sources":["../../../src/model/common/CoordinateSystem.ts"],"names":[],"mappings":";;;AAAA,~~6BAA0E~~;~~AAC1E,4CAA0C~~;~~AAC1C~~,~~kEAA6D~~;~~AAE7D~~,~~kEAAsE~~;~~AAEtE~~,MAAa,gBAAiB,SAAQ,~~oBAAgB~~;IAEpD,MAAM,CAAS;IACf,SAAS,GAAe,EAAE,CAAC;IAE3B,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,WAAW,CAAC,QAAkB;QACnC,~~IAAG~~,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;~~YAC1C~~,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC/B;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC,CAAC;SAC/E;IACH,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,~~IAAG~~,OAAO,KAAK,~~WAAO~~,CAAC,UAAU,EAAE;~~YACjC~~,MAAM,QAAQ,~~GAAI~~,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;~~YAC5C~~,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,~~WAAO~~,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,~~WAAO~~,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,~~WAAO~~,CAAC,aAAa,0BAA0B,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1F;aAAM;YACL,SAAS,CAAC,YAAY,CAAC,GAAG,~~WAAO~~,CAAC,aAAa,yCAAyC,CAAC,CAAC;SAC3F;IAEH,CAAC;IAED,gEAAgE;IACzD,MAAM,CAAC,WAAW,~~GAAY~~;;;;;;;;;;;;;~~iBAatB~~,CAAC;~~IACT~~,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,~~IAAG~~,QAAQ,CAAC,MAAM,GAAG,CAAC,~~EAAC~~;~~YACrB~~,OAAO,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC5E;QACD,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACtC,CAAC;~~IACM~~,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC;YAChD,gBAAgB,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACpD,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,QAAQ,CAAC,CAAC;~~IAC1C~~,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAGD,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjH,CAAC;IAEM,wBAAwB;QAE7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;6CAEM,IAAI,CAAC,IAAI;SAC7C,CAAC;IACR,CAAC;;~~AA5FH~~,~~4CA8FC~~"}
1	+ {"version":3,"file":"CoordinateSystem.js","sourceRoot":"","sources":["../../../src/model/common/CoordinateSystem.ts"],"names":[],"mappings":"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"}

package/dist/model/common/Location.d.ts CHANGED Viewed

@@ -1,7 +1,12 @@
-import { Asset, IdentifiedObject, ISchemaSettings, ModelContainer, PositionPoint, PowerSystemResource } from '../../index.js';
 import { CoordinateSystem } from './CoordinateSystem.js';
 import XMLWriter from 'xml-writer';
 import { ILocation } from '../../interfaces/model/common/ILocation.js';
+import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { PowerSystemResource } from '../core/PowerSystemResource.js';
+import { Asset } from '../assets/Asset.js';
+import { PositionPoint } from './PositionPoint.js';
+import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos.js';
+import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 export declare class Location extends IdentifiedObject implements ILocation {
     /** In CGMES ist die Assoziation umgedreht!*/
     powerSystemResources: Map<string, PowerSystemResource>;

package/dist/model/common/Location.js CHANGED Viewed

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Location = void 0;
-const __1 = require("../../index.js");
-const utils_1 = require("../../util/utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
-class Location extends __1.IdentifiedObject {
+const parser_utils_1 = require("../../utils2/parser.utils.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
+const rdf_xml_1 = require("../../constants/rdf-xml.js");
+class Location extends IdentifiedObject_1.IdentifiedObject {
     /** In CGMES ist die Assoziation umgedreht!*/
     powerSystemResources = new Map();
     powerSystemResourcesUUIDs;
@@ -37,10 +38,10 @@ class Location extends __1.IdentifiedObject {
     }
     /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
-        if (profile === __1.RDF_XML.PROFILE_GL) {
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_GL) {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
-            xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);
+            xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
             (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
@@ -57,10 +58,10 @@ class Location extends __1.IdentifiedObject {
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         /*<cim:VoltageLevel.Substation rdf:resource="#_1be806f9-0316-4bb8-b350-f54a292353f1"/>*/
-        if (profile === __1.RDF_XML.PROFILE_GL) {
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_GL) {
             if (this.coordinateSystem) {
-                xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'Location.CoordinateSystem', __1.RDF_XML.CIM_NS_16);
-                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.coordinateSystem.mrid}`);
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'Location.CoordinateSystem', rdf_xml_1.RDF_XML.CIM_NS_16);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.coordinateSystem.mrid}`);
                 xmlWriter.endElement();
             }
             else {
@@ -69,8 +70,8 @@ class Location extends __1.IdentifiedObject {
             /** ! CIM !== CGMES => Kardinalität (0..* vs. 1) und Leserichtung? (PowerSystemResource.Location vs. Location.PowerSystemResources) */
             if (this.powerSystemResources.size > 0) {
                 for (const value of this.powerSystemResources.values()) {
-                    xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'Location.PowerSystemResources', __1.RDF_XML.CIM_NS_16);
-                    (0, xml_serializer_1.writeElementAttribute)(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${value.mrid}`);
+                    xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'Location.PowerSystemResources', rdf_xml_1.RDF_XML.CIM_NS_16);
+                    (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${value.mrid}`);
                     xmlWriter.endElement();
                 }
             }
@@ -163,9 +164,9 @@ class Location extends __1.IdentifiedObject {
     /** Parst die Attributs- und Assoziationsinformationen aus Fuseki JSON Daten */
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.coordinateSystemUUID = (0, utils_1.getValue)(value, 'coordinateSystemUUID');
+        this.coordinateSystemUUID = parser_utils_1.ParserUtils.getValue(value, 'coordinateSystemUUID');
         // Array powerSystemResources
-        this.powerSystemResourcesUUIDs = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'powerSystemResourcesUUIDs'), ',');
+        this.powerSystemResourcesUUIDs = parser_utils_1.ParserUtils.parseCsvLineIntoArray(parser_utils_1.ParserUtils.getValue(value, 'powerSystemResourcesUUIDs'), ',');
     }
     /** Initialisiert Assoziationen aus geparsten Daten
      *  Fuseki und XML Daten */

package/dist/model/common/Location.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Location.js","sourceRoot":"","sources":["../../../src/model/common/Location.ts"],"names":[],"mappings":";;;~~AAAA~~,~~6BAA4H~~;~~AAE5H~~,~~4CAAiE~~;~~AAGjE~~,~~kEAAsE~~;~~AAEtE~~,MAAa,QAAS,SAAQ,~~oBAAgB~~;IAE5C,6CAA6C;IAC7C,oBAAoB,GAAqC,IAAI,GAAG,EAAE,CAAC;IACnE,yBAAyB,CAAW;IAEpC,MAAM,GAAuB,IAAI,GAAG,EAAE,CAAC;IAEvC,gBAAgB,CAAmB;IACnC,oBAAoB,CAAS;IAE7B,cAAc,GAAoB,EAAE,CAAC;IAErC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,gBAAgB,CAAC,aAA4B;QAClD,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE;YACrD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACzC;aAAM;YACL,gGAAgG;SACjG;IACH,CAAC;IAGM,UAAU,CAAC,OAAe,EAAE,cAA+B;QAChE,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;YAC9B,kDAAkD;YAClD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,EAAE;gBACtD,OAAO,KAAK,CAAC,YAAY,EAAE,CAAC;aAC7B;SAEF;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,IAAI,QAAQ,IAAI,CAAC,oBAAoB,CAAC,IAAI,iBAAiB,CAAC,CAAC;SAC3F;IACH,CAAC;IAGD,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,~~WAAO~~,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,~~WAAO~~,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,~~WAAO~~,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;YAEvB,iBAAiB;YACjB,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC/C,aAAa,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;aAC5C;SACF;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,wFAAwF;QACxF,IAAI,OAAO,KAAK,~~WAAO~~,CAAC,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,gBAAgB,EAAE;gBACzB,SAAS,CAAC,cAAc,CAAC,~~WAAO~~,CAAC,aAAa,EAAE,2BAA2B,EAAE,~~WAAO~~,CAAC,SAAS,CAAC,CAAC;gBAChG,IAAA,sCAAqB,EAAC,SAAS,EAAE,~~WAAO~~,CAAC,SAAS,EAAE,GAAG,~~WAAO~~,CAAC,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC/G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;aAC3D;YACD,sIAAsI;YACtI,IAAI,IAAI,CAAC,oBAAoB,CAAC,IAAI,GAAG,CAAC,EAAE;gBACtC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,EAAE;oBACtD,SAAS,CAAC,cAAc,CAAC,~~WAAO~~,CAAC,aAAa,EAAE,+BAA+B,EAAE,~~WAAO~~,CAAC,SAAS,CAAC,CAAC;oBACpG,IAAA,sCAAqB,EAAC,SAAS,EAAE,~~WAAO~~,CAAC,SAAS,EAAE,GAAG,~~WAAO~~,CAAC,eAAe,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC/F,SAAS,CAAC,UAAU,EAAE,CAAC;iBACxB;aACF;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,sCAAsC,CAAC,CAAC;aAChE;SACF;IACH,CAAC;IAGD,8DAA8D;IAE9D;;;;;;;;;;;;;;;;;;;;;;;;;SAyBK;IAEL,uEAAuE;IAChE,MAAM;QACX,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,gEAAgE;IAEzD,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;iBAsBrB,CAAC;IAET,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACpE;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;IAC9B,CAAC;IAED,+DAA+D;IAC/D,gEAAgE;IACzD,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,+EAA+E;IACxE,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,oBAAoB,GAAG,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,sBAAsB,CAAC,CAAC;~~QACpE~~,6BAA6B;QAC7B,IAAI,CAAC,yBAAyB,GAAG,~~IAAA~~,~~6BAAqB~~,~~EAAC~~,~~IAAA~~,~~gBAAQ~~,~~EAAC~~,KAAK,EAAE,2BAA2B,CAAC,EAAE,GAAG,CAAC,CAAC;~~IAC5G~~,CAAC;IAED;+BAC2B;IACpB,yBAAyB,CAAC,QAAwB;QACvD,kBAAkB;QAClB,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAChF,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SACzC;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,sCAAsC,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;SAC3H;QACD,sBAAsB;QACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,yBAAyB,EAAE;YACpD,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBACjC,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAwB,CAAC;gBAC/D,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC5C,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;aACrB;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,iCAAiC,GAAG,OAAO,CAAC,CAAC;aACpG;SACF;IACH,CAAC;IAED,mBAAmB,CAAC,EAAoB;QACtC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAClH,CAAC;IAEM,sBAAsB,CAAC,GAAwB;QACpD,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE;YACjD,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,CAAC;YAClD,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,sBAAsB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;SACtH;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,+BAA+B,GAAG,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC,CAAC;SAClF;IACH,CAAC;IAEM,UAAU;QACf,MAAM,WAAW,GAAoB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;YACvE,IAAI,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,cAAc,EAAE;gBACzC,OAAO,CAAC,CAAC;aACV;YAED,IAAI,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,cAAc,EAAE;gBACzC,OAAO,CAAC,CAAC,CAAC;aACX;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC;IACpC,CAAC;IAED,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;;AA9OH,4BA+OC"}
1	+ {"version":3,"file":"Location.js","sourceRoot":"","sources":["../../../src/model/common/Location.ts"],"names":[],"mappings":";;;AAIA,kEAAsE;AACtE,4DAAwD;AACxD,+DAA4D;AAK5D,qDAAkD;AAGlD,MAAa,QAAS,SAAQ,mCAAgB;IAE5C,6CAA6C;IAC7C,oBAAoB,GAAqC,IAAI,GAAG,EAAE,CAAC;IACnE,yBAAyB,CAAW;IAEpC,MAAM,GAAuB,IAAI,GAAG,EAAE,CAAC;IAEvC,gBAAgB,CAAmB;IACnC,oBAAoB,CAAS;IAE7B,cAAc,GAAoB,EAAE,CAAC;IAErC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,gBAAgB,CAAC,aAA4B;QAClD,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE;YACrD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACzC;aAAM;YACL,gGAAgG;SACjG;IACH,CAAC;IAGM,UAAU,CAAC,OAAe,EAAE,cAA+B;QAChE,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;YAC9B,kDAAkD;YAClD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,EAAE;gBACtD,OAAO,KAAK,CAAC,YAAY,EAAE,CAAC;aAC7B;SAEF;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,IAAI,QAAQ,IAAI,CAAC,oBAAoB,CAAC,IAAI,iBAAiB,CAAC,CAAC;SAC3F;IACH,CAAC;IAGD,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;YAEvB,iBAAiB;YACjB,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC/C,aAAa,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;aAC5C;SACF;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,wFAAwF;QACxF,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,gBAAgB,EAAE;gBACzB,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,2BAA2B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAChG,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC/G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;aAC3D;YACD,sIAAsI;YACtI,IAAI,IAAI,CAAC,oBAAoB,CAAC,IAAI,GAAG,CAAC,EAAE;gBACtC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,EAAE;oBACtD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,+BAA+B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;oBACpG,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC/F,SAAS,CAAC,UAAU,EAAE,CAAC;iBACxB;aACF;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,sCAAsC,CAAC,CAAC;aAChE;SACF;IACH,CAAC;IAGD,8DAA8D;IAE9D;;;;;;;;;;;;;;;;;;;;;;;;;SAyBK;IAEL,uEAAuE;IAChE,MAAM;QACX,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,gEAAgE;IAEzD,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;iBAsBrB,CAAC;IAET,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACpE;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;IAC9B,CAAC;IAED,+DAA+D;IAC/D,gEAAgE;IACzD,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,+EAA+E;IACxE,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,oBAAoB,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC;QAChF,6BAA6B;QAC7B,IAAI,CAAC,yBAAyB,GAAG,0BAAW,CAAC,qBAAqB,CAAC,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,2BAA2B,CAAC,EAAE,GAAG,CAAC,CAAC;IACpI,CAAC;IAED;+BAC2B;IACpB,yBAAyB,CAAC,QAAwB;QACvD,kBAAkB;QAClB,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAChF,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SACzC;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,sCAAsC,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;SAC3H;QACD,sBAAsB;QACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,yBAAyB,EAAE;YACpD,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBACjC,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAwB,CAAC;gBAC/D,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC5C,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;aACrB;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,iCAAiC,GAAG,OAAO,CAAC,CAAC;aACpG;SACF;IACH,CAAC;IAED,mBAAmB,CAAC,EAAoB;QACtC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAClH,CAAC;IAEM,sBAAsB,CAAC,GAAwB;QACpD,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE;YACjD,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,CAAC;YAClD,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,sBAAsB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;SACtH;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,+BAA+B,GAAG,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC,CAAC;SAClF;IACH,CAAC;IAEM,UAAU;QACf,MAAM,WAAW,GAAoB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;YACvE,IAAI,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,cAAc,EAAE;gBACzC,OAAO,CAAC,CAAC;aACV;YAED,IAAI,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,cAAc,EAAE;gBACzC,OAAO,CAAC,CAAC,CAAC;aACX;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC;IACpC,CAAC;IAED,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;;AA9OH,4BA+OC"}