X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=code%2Fnetwork-generator%2Fnetwork_generation%2Fmodel%2Fpython%2Fnr_cell_du.py;h=578ac16e0281157980b5dd4dd79e016997b54bc6;hb=9a0d7d6f6b9bb268514d0c0e75c071fd297a425a;hp=40fa66b8c3d71f4182b5598bd298cf2dbd302eee;hpb=091313ef66ae97923fd970be160e01d46649a835;p=oam.git diff --git a/code/network-generator/network_generation/model/python/nr_cell_du.py b/code/network-generator/network_generation/model/python/nr_cell_du.py index 40fa66b..578ac16 100644 --- a/code/network-generator/network_generation/model/python/nr_cell_du.py +++ b/code/network-generator/network_generation/model/python/nr_cell_du.py @@ -1,4 +1,4 @@ -# Copyright 2023 highstreet technologies GmbH +# Copyright 2023 highstreet technologies USA CORP. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ """ A Class representing a 3GPP new radio cell du (NrCellDu) """ +import math import xml.etree.ElementTree as ET from typing import Any, cast @@ -34,7 +35,9 @@ from network_generation.model.python.point import Point # Define the "INrCellDu" interface class INrCellDu(IORanNode): - cell_angle: int + cellAngle: int + cellScaleFactorForHandoverArea: int + maxReach: int azimuth: int @@ -42,7 +45,12 @@ default_value: INrCellDu = cast( INrCellDu, { **ORanNode.default(), - **{"cellAngle": 120, "azimuth": 120}, + **{ + "cellAngle": 120, + "cellScaleFactorForHandoverArea": 0, + "maxReach": 100, + "azimuth": 120, + }, }, ) @@ -57,6 +65,10 @@ class NrCellDu(ORanNode): cell_data: INrCellDu = self._to_cell_data(data) super().__init__(cast(dict[str, Any], cell_data), **kwargs) self._cell_angle: int = int(str(cell_data["cellAngle"])) + self._cell_scale_factor: int = int( + str(cell_data["cellScaleFactorForHandoverArea"]) + ) + self._maxReach: int = int(str(cell_data["maxReach"])) self._azimuth: int = int(str(cell_data["azimuth"])) def _to_cell_data(self, data: dict[str, Any]) -> INrCellDu: @@ -66,11 +78,41 @@ class NrCellDu(ORanNode): result[key] = data[key] # type: ignore return result + @property + def cell_angle(self) -> int: + return self._cell_angle + + @cell_angle.setter + def cell_angle(self, value: int) -> None: + self._cell_angle = value + + @property + def cell_scale_factor(self) -> int: + return self._cell_scale_factor + + @cell_scale_factor.setter + def cell_scale_factor(self, value: int) -> None: + self._cell_scale_factor = value + + @property + def maxReach(self) -> int: + return self._maxReach + + @maxReach.setter + def maxReach(self, value: int) -> None: + self._maxReach = value + + @property + def azimuth(self) -> int: + return self._azimuth + + @azimuth.setter + def azimuth(self, value: int) -> None: + self._azimuth = value + def termination_points(self) -> list[ORanTerminationPoint]: result: list[ORanTerminationPoint] = super().termination_points() - result.append( - ORanTerminationPoint({"id": self.name, "name": self.name}) - ) + result.append(ORanTerminationPoint({"id": self.name, "name": self.name})) return result def to_topology_nodes(self) -> list[dict[str, Any]]: @@ -95,12 +137,9 @@ class NrCellDu(ORanNode): linear_ring: ET.Element = ET.SubElement(outer_boundary, "LinearRing") coordinates: ET.Element = ET.SubElement(linear_ring, "coordinates") - points: list[Point] = Hexagon.polygon_corners( - self.layout, self.position - ) + points: list[Point] = Hexagon.polygon_corners(self.layout, self.position) method = ( - self.parent.parent.parent.parent.parent.parent - .geo_location.point_to_geo_location + self.parent.parent.parent.parent.parent.parent.geo_location.point_to_geo_location ) geo_locations: list[GeoLocation] = list(map(method, points)) text: list[str] = [] @@ -111,23 +150,19 @@ class NrCellDu(ORanNode): ) intersect1: Point = Point( - (points[(2 * index + 1) % 6].x + points[(2 * index + 2) % 6].x) - / 2, - (points[(2 * index + 1) % 6].y + points[(2 * index + 2) % 6].y) - / 2, + (points[(2 * index + 1) % 6].x + points[(2 * index + 2) % 6].x) / 2, + (points[(2 * index + 1) % 6].y + points[(2 * index + 2) % 6].y) / 2, ) - intersect_geo_location1: GeoLocation = ( - network_center.point_to_geo_location(intersect1) + intersect_geo_location1: GeoLocation = network_center.point_to_geo_location( + intersect1 ) intersect2: Point = Point( - (points[(2 * index + 3) % 6].x + points[(2 * index + 4) % 6].x) - / 2, - (points[(2 * index + 3) % 6].y + points[(2 * index + 4) % 6].y) - / 2, + (points[(2 * index + 3) % 6].x + points[(2 * index + 4) % 6].x) / 2, + (points[(2 * index + 3) % 6].y + points[(2 * index + 4) % 6].y) / 2, ) - intersect_geo_location2: GeoLocation = ( - network_center.point_to_geo_location(intersect2) + intersect_geo_location2: GeoLocation = network_center.point_to_geo_location( + intersect2 ) tower: GeoLocation = GeoLocation(cast(IGeoLocation, self.geo_location)) @@ -143,7 +178,6 @@ class NrCellDu(ORanNode): cell_polygon.append(tower) for gl in cell_polygon: - index += 1 strs: list[str] = [ str("%.6f" % float(gl.longitude)), str("%.6f" % float(gl.latitude)), @@ -152,6 +186,47 @@ class NrCellDu(ORanNode): text.append(",".join(strs)) coordinates.text = " ".join(text) + if self.cell_scale_factor > 0: + scaled_polygon: ET.Element = ET.SubElement(multi_geometry, "Polygon") + scaled_outer_boundary: ET.Element = ET.SubElement(scaled_polygon, "outerBoundaryIs") + scaled_linear_ring: ET.Element = ET.SubElement(scaled_outer_boundary, "LinearRing") + scaled_coordinates: ET.Element = ET.SubElement(scaled_linear_ring, "coordinates") + + arc: float = self.azimuth * math.pi / 180 + meterToDegree: float = 2 * math.pi * GeoLocation().equatorialRadius / 360 + translateX: float = ( + self.layout.size.x + * (self.cell_scale_factor / 100) + * math.sin(arc) + ) + translateY: float = ( + self.layout.size.y + * (self.cell_scale_factor / 100) + * math.cos(arc) + ) + centerX: float = self.layout.size.x * 0.5 * math.sin(arc) + centerY: float = self.layout.size.y * 0.5 * math.cos(arc) + cell_center : GeoLocation = GeoLocation( + { + "latitude": tower.latitude + centerY / meterToDegree, + "longitude": tower.longitude + centerX / meterToDegree, + "aboveMeanSeaLevel": tower.aboveMeanSeaLevel, + } + ) + point_index: int = 0 + text = [] + for gl in cell_polygon: + scale: float = 1 + self.cell_scale_factor / 100 + lng_new: float = ( 1 * scale * (gl.longitude - cell_center.longitude) ) + cell_center.longitude + lat_new: float = ( 1 * scale * ( gl.latitude - cell_center.latitude ) ) + cell_center.latitude + scaled_strs: list[str] = [ + str("%.6f" % float(lng_new)), + str("%.6f" % float(lat_new)), + str("%.6f" % float(gl.aboveMeanSeaLevel)), + ] + text.append(",".join(scaled_strs)) + point_index += 1 + scaled_coordinates.text = " ".join(text) return placemark def toSvg(self) -> ET.Element: