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

diff --git a/code/network-generator/network_generation/model/python/o_ran_smo.py b/code/network-generator/network_generation/model/python/o_ran_smo.py
index 6aa3eeb..8da06e2 100644 (file)
--- a/code/network-generator/network_generation/model/python/o_ran_smo.py
+++ b/code/network-generator/network_generation/model/python/o_ran_smo.py
@@ -81,7 +81,7 @@ class ORanSmo(ORanNode):
                 ORanNearRtRic(
                     {
                         "name": name,
-                        "geoLocation": newGeo,
+                        "geoLocation": GeoLocation(newGeo),
                         "position": hex,
                         "layout": self.layout,
                         "parent": self,
@@ -111,11 +111,7 @@ class ORanSmo(ORanNode):
         return result
 
     def toKml(self) -> ET.Element:
-        smo: ET.Element = ET.Element("Folder")
-        open: ET.Element = ET.SubElement(smo, "open")
-        open.text = "1"
-        name: ET.Element = ET.SubElement(smo, "name")
-        name.text = self.name
+        smo = super().toKml()
         for ric in self.o_ran_near_rt_rics:
             smo.append(ric.toKml())
         return smo