Merge branch 'main' into to/#208-pv-power-fix

ie3-institute · Mar 24, 2022 · 6767c82 · 6767c82
2 parents 851a452 + 7c26654
commit 6767c82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/scala/edu/ie3/powerFactory2psdm/converter/NodeConverter.scala b/src/main/scala/edu/ie3/powerFactory2psdm/converter/NodeConverter.scala
@@ -92,7 +92,7 @@ object NodeConverter {
     val uuid = unsafeNodeId2Uuid.getOrElse(node.unsafeId, UUID.randomUUID())
     new NodeInput(
       uuid,
-      node.id,
+      node.unsafeId,
       OperatorInput.NO_OPERATOR_ASSIGNED,
       OperationTime.notLimited(),
       node.vTarget.asPu,

diff --git a/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala b/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala
@@ -211,7 +211,7 @@ object ConverterTestData extends LazyLogging {
   val nodes = Map(
     "someNode" -> ConversionPair(
       Node(
-        "someNode",
+        "node",
         "someNode",
         0.4,
         1.0,