From 585e9202ce60916fc1269fccab4a8e21d6dffc4b Mon Sep 17 00:00:00 2001 From: Martin Skorupski Date: Sat, 28 Oct 2023 21:30:55 +0200 Subject: [PATCH] Ensure that only Cells cover a geographical area - some housekeeping Issue-ID: OAM-378 Change-Id: I858be9b782de50ed9c7cbee6641d81500552b6df Signed-off-by: Martin Skorupski --- code/network-generator/model/python/o_ran_cloud_du.py | 10 +++++----- code/network-generator/model/python/o_ran_cu.py | 4 ++-- code/network-generator/view/kml.styles.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/network-generator/model/python/o_ran_cloud_du.py b/code/network-generator/model/python/o_ran_cloud_du.py index 953fca6..617827a 100644 --- a/code/network-generator/model/python/o_ran_cloud_du.py +++ b/code/network-generator/model/python/o_ran_cloud_du.py @@ -73,14 +73,14 @@ class ORanCloudDu(ORanNode, IORanCloudDu): return self._towers def toKml(self) -> ET.Element: - o_ran__cloud_du: ET.Element = ET.Element("Folder") - open: ET.Element = ET.SubElement(o_ran__cloud_du, "open") + o_ran_cloud_du: ET.Element = ET.Element("Folder") + open: ET.Element = ET.SubElement(o_ran_cloud_du, "open") open.text = "1" - name: ET.Element = ET.SubElement(o_ran__cloud_du, "name") + name: ET.Element = ET.SubElement(o_ran_cloud_du, "name") name.text = self.name for tower in self.towers: - o_ran__cloud_du.append(tower.toKml()) - return o_ran__cloud_du + o_ran_cloud_du.append(tower.toKml()) + return o_ran_cloud_du def toSvg(self) -> None: return None diff --git a/code/network-generator/model/python/o_ran_cu.py b/code/network-generator/model/python/o_ran_cu.py index 9069f36..fba55d7 100644 --- a/code/network-generator/model/python/o_ran_cu.py +++ b/code/network-generator/model/python/o_ran_cu.py @@ -86,8 +86,8 @@ class ORanCu(ORanNode, IORanCu): open.text = "1" name: ET.Element = ET.SubElement(o_ran_cu, "name") name.text = self.name - for o_ran_du in self.o_ran_cloud_dus: - o_ran_cu.append(o_ran_du.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 diff --git a/code/network-generator/view/kml.styles.json b/code/network-generator/view/kml.styles.json index b431b1b..ba61cde 100644 --- a/code/network-generator/view/kml.styles.json +++ b/code/network-generator/view/kml.styles.json @@ -1,4 +1,4 @@ { "Railway":{"stroke":{"color":"ff00ccff", "width":"2"},"fill":{"color":"ff00ccff"}}, - "Tower":{"stroke":{"color":"ffffcc00", "width":"2"},"fill":{"color":"22ffcc00"}} + "NrCellDu":{"stroke":{"color":"ffffcc00", "width":"2"},"fill":{"color":"22ffcc00"}} } \ No newline at end of file -- 2.16.6