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: Ie5b31fe506e075460a81f9ae2e5eb75976abea4f
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/code/network-generator/network_generation/model/python/o_ran_cu.py b/code/network-generator/network_generation/model/python/o_ran_cu.py
index a8156ab..ed26a19 100644 (file)
--- a/code/network-generator/network_generation/model/python/o_ran_cu.py
+++ b/code/network-generator/network_generation/model/python/o_ran_cu.py
@@ -82,7 +82,7 @@ class ORanCu(ORanNode):
                 ORanCloudDu(
                     {
                         "name": name,
-                        "geoLocation": newGeo,
+                        "geoLocation": GeoLocation(newGeo),
                         "position": hex,
                         "layout": self.layout,
                         "parent": self,
@@ -105,11 +105,7 @@ class ORanCu(ORanNode):
         return result
 
     def toKml(self) -> ET.Element:
-        o_ran_cu: ET.Element = ET.Element("Folder")
-        open: ET.Element = ET.SubElement(o_ran_cu, "open")
-        open.text = "1"
-        name: ET.Element = ET.SubElement(o_ran_cu, "name")
-        name.text = self.name
+        o_ran_cu = super().toKml()
         for o_ran_cloud_du in self.o_ran_cloud_dus:
             o_ran_cu.append(o_ran_cloud_du.toKml())
         return o_ran_cu