All links to kml

- use generic method 'toKml' for folder, placemark, point, and line representation
- fix GeoLocation type issue

Issue-ID: OAM-395
Change-Id: I8464d2da2f11323a8650d1f70651d0f1b3b66911
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/code/network-generator/network_generation/model/python/o_ran_ru.py b/code/network-generator/network_generation/model/python/o_ran_ru.py
index 5d88401..71b0b3c 100644 (file)
--- a/code/network-generator/network_generation/model/python/o_ran_ru.py
+++ b/code/network-generator/network_generation/model/python/o_ran_ru.py
@@ -161,14 +161,14 @@ class ORanRu(ORanNode):
         return result
 
     def toKml(self) -> ET.Element:
-        o_ran_ru: ET.Element = ET.Element("Folder")
-        open: ET.Element = ET.SubElement(o_ran_ru, "open")
-        open.text = "1"
-        name: ET.Element = ET.SubElement(o_ran_ru, "name")
-        name.text = self.name
+        # The O-RU 'creates' the O-DUs
+        # therefore the O-RU returns is "wrapper" too
+        o_ran_du = self.oRanDu.toKml()
+        o_ran_ru = super().toKml()
         for cell in self.cells:
             o_ran_ru.append(cell.toKml())
-        return o_ran_ru
+        o_ran_du.append(o_ran_ru)
+        return o_ran_du     
 
     def toSvg(self) -> ET.Element:
         return ET.Element("to-be-implemented")