@enervance/insight-cim-model 1.0.2 → 1.0.3

package/dist/utils2/sparql.utils.js

@@ -0,0 +1,317 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SparqlType = exports.SparqlUtils = void 0;
+const tslib_1 = require("tslib");
+const rdf_enums_1 = require("../rdf/rdf-enums.js");
+const common_utils_1 = require("./common.utils.js");
+const moment = tslib_1.__importStar(require("moment"));
+class SparqlUtils {
+    static getSparqlStatementFromCIM(sparqlType, rdfModel, instance, baseIRI) {
+        return SparqlUtils.getSparqlStatements(sparqlType, instance, instance.constructor.name, baseIRI, rdfModel);
+    }
+    static getSparqlStatements(sparqlType, instance, className, baseIRI, rdfModel) {
+        const sparqls = [];
+        const rdfClass = rdfModel.findClass(className);
+        if (!rdfClass) {
+            console.log(`RDF Klasse für ${className} nicht gefunden.`);
+            return sparqls;
+        }
+        const uuid = instance.mrid ? instance.mrid : common_utils_1.CommonUtils.generateUUID();
+        const namespace = rdfModel.findNamespace(rdfClass.baseIri);
+        sparqls.push(SparqlUtils.getNewInstanceSparqlTriple(baseIRI, uuid, namespace.prefix, className));
+        for (const entry of Object.entries(instance)) {
+            const objectPropertyName = entry[0]; // Attributsname des Objektes
+            const objectPropertyValue = entry[1]; // Wert des Attributs
+            /** UUIDs werden nicht verändert */
+            if (objectPropertyName === 'mrid')
+                continue;
+            /** Ausprägung nicht gepflegt
+             * null-Werte werden gespeichert */
+            if (objectPropertyValue === undefined)
+                continue;
+            const rdfProperty = rdfClass.findProperty(objectPropertyName.toLowerCase());
+            if (!rdfProperty)
+                continue;
+            const namespaceProperty = rdfModel.findNamespace(rdfProperty.baseIri);
+            const primitiverDatentyp = rdfProperty.dataType;
+            const komplexerDatentyp = rdfProperty.range?.name;
+            if (primitiverDatentyp) {
+                // ein Attribut oder CompondProperty
+                const dataTypeClass = rdfModel.findClass(primitiverDatentyp);
+                if (dataTypeClass?.stereotype === rdf_enums_1.Stereotype.Compound) {
+                    if (sparqlType !== SparqlType.INSERT_DATA)
+                        continue;
+                    // Iterieren über Object und if !== undefined
+                    // [cim:DeploymentDate.installedDate '01.05.2020']
+                    for (const entry of Object.entries(objectPropertyValue)) {
+                        if (entry[1] === undefined)
+                            continue;
+                        const rdfPropertyCompound = dataTypeClass.findProperty(entry[0].toLowerCase());
+                        if (!rdfPropertyCompound)
+                            continue;
+                        const namespacePropertyCompound = rdfModel.findNamespace(rdfPropertyCompound.baseIri);
+                        const value = SparqlUtils.convertRdfDataType(rdfPropertyCompound, entry[1]);
+                        sparqls.push(SparqlUtils.getInsertCompoundPropertySparqlTriple(baseIRI, uuid, namespaceProperty.prefix, rdfProperty.domain.name, rdfProperty.propertyName, namespacePropertyCompound.prefix, dataTypeClass.name, rdfPropertyCompound.propertyName, value));
+                    }
+                }
+                else if (dataTypeClass?.stereotype === rdf_enums_1.Stereotype.CIMDatatype) {
+                    //
+                    if (objectPropertyValue && objectPropertyValue['value']) {
+                        sparqls.push(SparqlUtils.getPropertySparqlTriple(baseIRI, uuid, namespaceProperty.prefix, rdfProperty.domain.name, rdfProperty.propertyName, objectPropertyValue.value));
+                    }
+                    else {
+                        sparqls.push(SparqlUtils.getPropertySparqlTriple(baseIRI, uuid, namespaceProperty.prefix, rdfProperty.domain.name, rdfProperty.propertyName, objectPropertyValue));
+                    }
+                }
+                else {
+                    /** Sonderfall */
+                    // TODO
+                    if (rdfProperty.propertyName === 'propertyState') {
+                        sparqls.push(SparqlUtils.getPropertySparqlTriple(baseIRI, uuid, namespaceProperty.prefix, rdfProperty.domain.name, rdfProperty.propertyName, JSON.stringify(objectPropertyValue)));
+                    }
+                    else {
+                        const value = SparqlUtils.convertRdfDataType(rdfProperty, objectPropertyValue);
+                        sparqls.push(SparqlUtils.getPropertySparqlTriple(baseIRI, uuid, namespaceProperty.prefix, rdfProperty.domain.name, rdfProperty.propertyName, value));
+                    }
+                }
+            }
+            else if (komplexerDatentyp) {
+                // ein komlexes Attribut oder eine Collection
+                // EnumType ist ein komlexes Objekt
+                if (!rdfProperty.associationUsed) {
+                    // wenn nicht gepflegt, dann ein Enum. Anderes Merkmal ist 'stereotype' #attribute
+                    const objectPropertyValueEnum = rdfProperty.range?.findEnum(objectPropertyValue)?.iri;
+                    if (!objectPropertyValueEnum) {
+                        // console.log(`Enum ${komplexerDatentyp} mit dem Wert ${objectPropertyValueEnum} konnte nicht bestimmt werden.`);
+                        continue;
+                    }
+                    sparqls.push(SparqlUtils.getEnumerationSparqlTriple(baseIRI, uuid, namespaceProperty.prefix, rdfProperty.domain.name, rdfProperty.propertyName, objectPropertyValueEnum));
+                }
+                else if (rdfProperty.associationUsed === rdf_enums_1.Used.Yes) {
+                    /**
+                     * Ein Sonderfall im Rdf-Modell (Profil) können Collections als komlexes Attribut abgebildet werden!
+                     * s. Location.PowerSystemResource Information Model Kardinalität 0..*, CGMES Model 0..1
+                     * */
+                    const isCollection = common_utils_1.CommonUtils.isCollection(objectPropertyValue);
+                    if (isCollection) {
+                        /** eine Collection */
+                        const associatedArray = common_utils_1.CommonUtils.collectionToArray(objectPropertyValue); // immer ein String-Array
+                        for (const associatedEntity of associatedArray) {
+                            sparqls.push(SparqlUtils.getAssociationSparqlTriple(baseIRI, uuid, namespaceProperty.prefix, rdfProperty.domain.name, rdfProperty.propertyName, common_utils_1.CommonUtils.ifUndefined2Null(associatedEntity?.mrid, true)));
+                        }
+                    }
+                    else {
+                        /** ein komlexes Attribut */
+                        sparqls.push(SparqlUtils.getAssociationSparqlTriple(baseIRI, uuid, namespaceProperty.prefix, rdfProperty.domain.name, rdfProperty.propertyName, common_utils_1.CommonUtils.ifUndefined2Null(objectPropertyValue?.mrid, true)));
+                    }
+                }
+            }
+        }
+        return sparqls;
+    }
+    static getDeleteCompoundsSparqlStatements(instance, className, baseIRI, rdfModel) {
+        const sparqls = [];
+        const rdfClass = rdfModel.findClass(className);
+        const uuid = instance.mrid;
+        for (const entry of Object.entries(instance)) {
+            const objectPropertyName = entry[0]; // Attributsname des Objektes
+            const objectPropertyValue = entry[1]; // Wert des Attributs
+            /** Ausprägung nicht gepflegt
+             * null-Werte werden gepsiechert */
+            if (objectPropertyValue === undefined)
+                continue;
+            const rdfProperty = rdfClass.findProperty(objectPropertyName.toLowerCase());
+            if (!rdfProperty)
+                continue;
+            const namespaceProperty = rdfModel.findNamespace(rdfProperty.baseIri);
+            const primitiverDatentyp = rdfProperty.dataType;
+            if (!primitiverDatentyp)
+                continue;
+            const dataTypeClass = rdfModel.findClass(primitiverDatentyp);
+            if (dataTypeClass?.stereotype === rdf_enums_1.Stereotype.Compound) {
+                for (const entry of Object.entries(objectPropertyValue)) {
+                    if (entry[1] === undefined)
+                        continue;
+                    const rdfPropertyCompound = dataTypeClass.findProperty(entry[0].toLowerCase());
+                    if (!rdfPropertyCompound)
+                        continue;
+                    const namespacePropertyCompound = rdfModel.findNamespace(rdfPropertyCompound.baseIri);
+                    sparqls.push(SparqlUtils.getDeleteCompoundPropertySparqlTriple(baseIRI, uuid, namespaceProperty.prefix, rdfProperty.domain.name, rdfProperty.propertyName, namespacePropertyCompound.prefix, dataTypeClass.name, rdfPropertyCompound.propertyName));
+                }
+            }
+        }
+        return sparqls;
+    }
+    /** <http://a351a3d4-e55a-4f6e-8485-c20e73aba744/data/Kevelaer#_ef5077dc-4f94-4b8f-a649-00758581ecc7> rdf:type cim:Substation . */
+    static getNewInstanceSparqlTriple(baseIRI, mrid, namespacePrefix, className) {
+        return `<${baseIRI}${mrid}> rdf:type ${namespacePrefix}:${className} . `;
+    }
+    /** Erstellt Subject Prädikat Objekt Triple für eine Assoziation
+     * <http://rdf.model#_ef5077dc-4f94-4b8f-a649-00758581ecc8> cim:ACLineSegment.BaseVoltage <http://rdf.model#_4625198b-0d24-41e9-8be7-fa2db7d225bb> */
+    static getAssociationSparqlTriple(baseIRI, mrid, namespace, className, propName, propValueMrid) {
+        return `<${baseIRI}${mrid}> ${namespace}:${className}.${propName} <${baseIRI}${propValueMrid}> . `;
+    }
+    /** Erstellt Subject Prädikat Objekt Triple für eine Enumeration
+     * <http://rdf.model#_ef5077dc-4f94-4b8f-a649-00758581ecc8> cim:ACLineSegment.BaseVoltage <http://enervance.com/CIM/Extensions#EVSourceSystemKind.NeplanWestnetz> */
+    static getEnumerationSparqlTriple(baseIRI, mrid, namespace, className, propName, propValueMrid) {
+        return `<${baseIRI}${mrid}> ${namespace}:${className}.${propName} <${propValueMrid}> . `;
+    }
+    /** Erstellt Subjekt Prädikat Objekt Triple für ein Attribut
+     * <http://rdf.model#_ef5077dc-4f94-4b8f-a649-00758581ecc8> cim:IdentifiedObject.name 'neuer Name' */
+    static getPropertySparqlTriple(baseIRI, mrid, namespace, className, propName, propValue) {
+        return `<${baseIRI}${mrid}> ${namespace}:${className}.${propName} '${propValue}' . `;
+    }
+    /** Erstellt Subjekt Prädikat Objekt Triple zum Einfügen eines Compound-Attributs
+     * <http://enervance.com/CIM/Extensions#_b8f2358e-fe5d-4e72-ab0a-edac942f186d> cim:AssetDeployment.deploymentDate [cim:DeploymentDate.installedDate '01.05.2020'] . */
+    static getInsertCompoundPropertySparqlTriple(baseIRI, mrid, namespace, className, propName, namespaceCompound, classNameCompound, propNameCompound, propValue) {
+        return `<${baseIRI}${mrid}> ${namespace}:${className}.${propName} [${namespaceCompound}:${classNameCompound}.${propNameCompound} '${propValue}'] . `;
+    }
+    /** Erstellt Subjekt Prädikat Objekt Triple zum Löschen eines Compound-Attributs
+     * <http://enervance.com/CIM/Extensions#_b8f2358e-fe5d-4e72-ab0a-edac942f186d> cim:AssetDeployment.deploymentDate [cim:DeploymentDate.installedDate '01.05.2020'] . */
+    static getDeleteCompoundPropertySparqlTriple(baseIRI, mrid, namespace, className, propName, namespaceCompound, classNameCompound, propNameCompound) {
+        return `(<${baseIRI}${mrid}> ${namespace}:${className}.${propName} ${namespaceCompound}:${classNameCompound}.${propNameCompound}) `;
+    }
+    static getInsertDataStatement(graphURI, insertData) {
+        return insertData?.some(elem => elem.length) ? `
+            PREFIX rdf:                 <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+            PREFIX entsoe:	 	          <http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+            PREFIX enervance:           <http://enervance.com/CIM/Extensions#> 
+            PREFIX cim:                 <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+            PREFIX westnetzneplan:      <http://westnetzneplan.de/CIM/Extensions#>
+            PREFIX westnetzintegral:	  <http://westnetzintegral.de/CIM/Extensions#>
+            PREFIX fgh:	                <http://fgh-ma.de/Integral/ProfileExtension/1#>
+            INSERT DATA {
+                GRAPH ${SparqlUtils.checkGraphName(graphURI)} {
+                     ${insertData.join(' ')}
+                }
+            }` : '';
+    }
+    static getDeleteDataStatement(graphURI, deleteData) {
+        return deleteData?.some(elem => elem?.length) ?
+            `                 PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+                        PREFIX cim:<http://iec.ch/TC57/2013/CIM-schema-cim16#>
+                        PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
+                        PREFIX enervance: <http://enervance.com/CIM/Extensions#>
+                        PREFIX westnetzneplan:  <http://westnetzneplan.de/CIM/Extensions#>
+                        PREFIX fgh:	                <http://fgh-ma.de/Integral/ProfileExtension/1#>
+                        DELETE DATA {
+                            GRAPH ${SparqlUtils.checkGraphName(graphURI)} {
+                                ${deleteData.join(' ')}
+                            }
+                        }` : '';
+    }
+    static getDeleteCompoundDataStatement(graphURI, deleteData) {
+        return deleteData?.some(elem => elem?.length) ?
+            `               PREFIX rdf:             <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+                      PREFIX enervance:       <http://enervance.com/CIM/Extensions#> 
+                      PREFIX cim:             <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+                      PREFIX westnetzneplan:  <http://westnetzneplan.de/CIM/Extensions#>
+                      PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+                      PREFIX fgh:	                <http://fgh-ma.de/Integral/ProfileExtension/1#>
+                      WITH ${SparqlUtils.checkGraphName(graphURI)}
+                      DELETE { ?o  ?p1  ?o1 . }
+                      WHERE {
+                          ?s ?p ?o .
+                          VALUES (?s ?p ?p1) { ${deleteData.join(' ')} }
+                          ?o ?p1 ?o1 .
+                      }` : '';
+    }
+    static createSPARQLStatement(sparqlType, instance, graphURI, rdfModel, baseIri) {
+        const insertData = SparqlUtils.getSparqlStatementFromCIM(sparqlType, rdfModel, instance, baseIri);
+        return insertData?.some(elem => elem.length) ? `
+            PREFIX rdf:             <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+            PREFIX enervance:       <http://enervance.com/CIM/Extensions#>
+            PREFIX cim:             <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+            PREFIX westnetzneplan:  <http://westnetzneplan.de/CIM/Extensions#>
+            PREFIX fgh:	                <http://fgh-ma.de/Integral/ProfileExtension/1#>
+            ${sparqlType} {
+                GRAPH ${SparqlUtils.checkGraphName(graphURI)} {
+                     ${insertData.join(' ')}
+                }
+            }` : '';
+    }
+    static checkGraphName(graphName) {
+        let checkedGraphName = graphName.trim();
+        if (!checkedGraphName.startsWith('<')) {
+            checkedGraphName = '<' + checkedGraphName;
+        }
+        if (!graphName.endsWith('>')) {
+            checkedGraphName = checkedGraphName + '>';
+        }
+        return checkedGraphName;
+    }
+    static convertRdfDataType(rdfProperty, value) {
+        switch (rdfProperty.dataType) {
+            case ('DateTime'): {
+                return value ? moment.utc(value, "YYYY").format('YYYY-MM-DDTHH:mm:ss') : null;
+            }
+            case ('Date'): {
+                return value ? moment.utc(value, "YYYY").format('YYYY-MM-DD') : null;
+            }
+            default: {
+                return value ? value?.toString() : null;
+            }
+        }
+    }
+    /** ZUWO Kennzahlen */
+    static QUERY_ANALYTIC_Category = `
+        PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX entsoe:      <http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX apf:         <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
+        PREFIX xsd:         <http://www.w3.org/2001/XMLSchema#>
+            
+        SELECT (COUNT(xsd:float(?value)) as ?zuwo)
+        WHERE {
+            GRAPH <http://default/> {
+                ?mrid rdf:type cim:AggregateScore .
+                ?mrid cim:AnalyticScore.value ?value .
+            }
+            FILTER(?name = 'Kategorie I')
+        }
+    `;
+    static QUERY_HEALTH_SCORE_AVG = `
+        PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        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 apf:         <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
+        PREFIX xsd:         <http://www.w3.org/2001/XMLSchema#>
+
+        SELECT (AVG(xsd:float(?value)) as ?zustand)
+        WHERE {
+            GRAPH <http://default/> {
+                ?mrid rdf:type westnetzneplan:WNZUWOHealthScore .
+                OPTIONAL { ?mrid cim:AnalyticScore.value ?value .}
+            }
+            FILTER(xsd:float(?value) > 0) .
+        }
+
+    `;
+    static QUERY_IMPORTANCE_SCORE_AVG = `
+        PREFIX cim:                 <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        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 apf:                 <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:                 <http://jena.apache.org/ARQ/function#>
+        PREFIX xsd:                 <http://www.w3.org/2001/XMLSchema#>
+        SELECT (AVG(xsd:float(?value)) as ?wichtigkeit)
+        WHERE { 
+            GRAPH <http://default/> {
+                ?mrid rdf:type westnetzneplan:WNZUWOImportanceScore .
+                ?mrid cim:AnalyticScore.value ?value .
+            }
+        FILTER(xsd:float(?value) > 0) .
+        }
+    `;
+}
+exports.SparqlUtils = SparqlUtils;
+var SparqlType;
+(function (SparqlType) {
+    SparqlType["INSERT_DATA"] = "INSERT DATA";
+    SparqlType["DELETE_DATA"] = "DELETE DATA";
+})(SparqlType || (exports.SparqlType = SparqlType = {}));
+//# sourceMappingURL=sparql.utils.js.map

package/dist/utils2/sparql.utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sparql.utils.js","sourceRoot":"","sources":["../../src/utils2/sparql.utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,16 +1,13 @@
 {
   "name": "@enervance/insight-cim-model",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "CIM data model",
-  "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "release:patch": "npm version patch --force && npm run release",
-    "release": "rimraf dist  && npm run build && npm publish",
-    "prebuild": "npm run clean",
-    "build": "rollup -c",
+    "release": "rimraf dist && npm run build && npm publish",
+    "build2": "rimraf dist && tsc && copyfiles -f src/package.json dist",
+    "build": "npm run clean && tsc --p tsconfig.json && tsc-esm-fix --target='dist'",
     "test": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine/jasmine_all.json",
     "test_fuseki_psdm": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine/jasmine_fuseki_psdm.json",
     "test_i7": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine/jasmine_integral_7.json --max-old-space-size=32000",
@@ -60,33 +57,29 @@
   "dependencies": {
     "@enervance/xml-writer": "0.0.1",
     "@fast-csv/parse": "^4.3.6",
-    "@turf/helpers": "^7.3.4",
-    "@turf/line-intersect": "^7.3.4",
-    "@turf/line-to-polygon": "^7.3.4",
-    "@turf/point-to-line-distance": "^7.3.4",
-    "@turf/turf": "^7.3.4",
+    "@turf/helpers": "^7.2.0",
+    "@turf/line-intersect": "^7.2.0",
+    "@turf/line-to-polygon": "^7.2.0",
+    "@turf/point-to-line-distance": "^7.2.0",
+    "@turf/turf": "7.2.0",
+    "@turf/clusters-dbscan": "7.2.0",
     "complex.js": "^2.1.1",
     "fast-csv": "^4.3.6",
-    "jszip": "^3.10.1",
+    "jszip": "^3.5.0",
     "pg": "^8.6.0",
     "proj4": "^2.9.0",
     "saxes": "^5.0.1",
-    "superagent": "^10.3.0",
+    "superagent": "^6.1.0",
     "uuid": "^13.0.0"
   },
   "peerDependencies": {
-    "@enervance/base-model-utils": "^0.5.0",
-    "@enervance/cim-model-utils": "^0.5.1",
+    "@enervance/base-model-utils": "^0.4.10",
+    "@enervance/cim-model-utils": "^0.4.3",
     "mariadb": "^2.5.2",
     "moment": "^2.29.4",
     "mysql": "^2.18.1"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^29.0.0",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-typescript": "^12.3.0",
-    "@types/luxon": "^3.3.1",
     "@types/geojson": "^7946.0.7",
     "@types/jasmine": "^3.6.2",
     "@types/node": "^20.19.9",
@@ -101,7 +94,6 @@
     "jest-extended": "^4.0.2",
     "nyc": "^15.1.0",
     "rimraf": "^3.0.0",
-    "rollup": "^4.57.1",
     "serve": "^11.3.2",
     "tmp": "^0.2.1",
     "ts-jest": "^29.1.1",
@@ -110,6 +102,9 @@
     "tsc-esm-fix": "^2.20.12",
     "typescript": "^5.4.5",
     "typescript-coverage-report": "^0.5.0",
+    "webpack": "^5.10.1",
+    "webpack-cli": "^4.2.0",
+    "webpack-dev-server": "^3.11.0",
     "winston": "^3.3.3"
   },
   "overrides": {

package/dist/etl/etl-neplan/etl-neplan-util.d.ts

@@ -1,4 +0,0 @@
-import { NetzstreckenTypData, WestnetzNeplanTypData } from './etl-neplan-csv';
-import { WNWireInfo } from '../../model/extensions/westnetz-neplan/assets/WNWireInfo';
-export declare function getAssetTypeDataByNameCSV(typesCSV: WestnetzNeplanTypData[], name: string): WestnetzNeplanTypData | undefined;
-export declare function createAssetInfoNeplan(type: WestnetzNeplanTypData, strecke: NetzstreckenTypData): WNWireInfo | undefined;