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

diff --git a/code/network-generator/network_generation/model/python/o_ran_near_rt_ric.py b/code/network-generator/network_generation/model/python/o_ran_near_rt_ric.py
index 3c921c8..a513f9c 100644 (file)
--- a/code/network-generator/network_generation/model/python/o_ran_near_rt_ric.py
+++ b/code/network-generator/network_generation/model/python/o_ran_near_rt_ric.py
@@ -88,7 +88,7 @@ class ORanNearRtRic(ORanNode):
                 ORanCu(
                     {
                         "name": name,
-                        "geoLocation": newGeo,
+                        "geoLocation": GeoLocation(newGeo),
                         "position": hex,
                         "layout": self.layout,
                         "parent": self,
@@ -111,11 +111,7 @@ class ORanNearRtRic(ORanNode):
         return result
 
     def toKml(self) -> ET.Element:
-        ric: ET.Element = ET.Element("Folder")
-        open: ET.Element = ET.SubElement(ric, "open")
-        open.text = "1"
-        name: ET.Element = ET.SubElement(ric, "name")
-        name.text = self.name
+        ric = super().toKml()
         for o_ran_cu in self.o_ran_cus:
             ric.append(o_ran_cu.toKml())
         return ric