Move cell configurations to cell level

- adopt changes in python classes
-- network,
-- tower

IssueID: OAM-375
Change-Id: I6f69ce3018ba874dab2c2c1f72947cdef6d7d396
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/code/network-generator/model/python/o_ran_network.py b/code/network-generator/model/python/o_ran_network.py
index 5caf7f6..6339335 100644 (file)
--- a/code/network-generator/model/python/o_ran_network.py
+++ b/code/network-generator/model/python/o_ran_network.py
@@ -38,7 +38,7 @@ class ORanNetwork(ORanObject):
         self.__configuration = configuration
         self.name = configuration["name"]
         self.center = configuration["center"]
-        size = configuration["pattern"]["o-ran-ru"]["max-reach"]
+        size = configuration["pattern"]["nr-cell-du"]["max-reach"]
         layout = Layout(
             Hexagon.layout_flat, Point(size, size), Point(0, 0)
         )  # 1 pixel = 1 meter

diff --git a/code/network-generator/model/python/tower.py b/code/network-generator/model/python/tower.py
index 46a906e..a28909d 100644 (file)
--- a/code/network-generator/model/python/tower.py
+++ b/code/network-generator/model/python/tower.py
@@ -55,9 +55,7 @@ class Tower(ORanNode):
         coordinates.text = " ".join(text)
 
         # cells
-        cell_angle = self.parent.parent.parent.parent.parent.configuration()["pattern"][
-            "o-ran-ru"
-        ]["cell-angle"]
+        cell_angle = self.parent.parent.parent.parent.parent.configuration()["pattern"]["nr-cell-du"]["cell-angle"]
         for index in range(int(360 / cell_angle)):
             line: ET.Element = ET.SubElement(multi_geometry, "LineString")
             tessellate: ET.Element = ET.SubElement(line, "tessellate")

diff --git a/code/network-generator/view/kml.styles.json b/code/network-generator/view/kml.styles.json
index 38eca05..b431b1b 100644 (file)
--- 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":"3"},"fill":{"color":"ff00ccff"}},
-  "Tower":{"stroke":{"color":"ffffcc00", "width":"3"},"fill":{"color":"22ffcc00"}}
+  "Railway":{"stroke":{"color":"ff00ccff", "width":"2"},"fill":{"color":"ff00ccff"}},
+  "Tower":{"stroke":{"color":"ffffcc00", "width":"2"},"fill":{"color":"22ffcc00"}}
 }        
\ No newline at end of file