OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor vd

Browse Source
This commit is contained in:
WQY\qiong
2023-04-29 14:27:25 +08:00
parent a278335bbe
commit a0166193ef
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/__init__.py
View File

@@ -132,4 +132,4 @@ from .s31_scada_element import SCADA_ELEMENT_STATUS_OFFLINE, SCADA_ELEMENT_STATU
from .s31_scada_element import get_scada_element_schema, get_scada_elements, get_scada_element, set_scada_element, add_scada_element, delete_scada_element
from .del_cmd import clean_scada_element
from .s32_virtual_district import calculate_virtual_district
from .s37_virtual_district import calculate_virtual_district

2
api/s32_virtual_district.py → api/s37_virtual_district.py
View File

@@ -68,7 +68,6 @@ def calculate_virtual_district(name: str, centers: list[str]) -> dict[str, Any]:
center_node[value['center']] = []
center_node[value['center']].append(node)
# write(name, 'delete from virtual_district')
vds: list[dict[str, Any]] = []
for center, value in center_node.items():
@@ -80,7 +79,6 @@ def calculate_virtual_district(name: str, centers: list[str]) -> dict[str, Any]:
# TODO: check none
boundary = read(name, f'select st_astext(st_convexhull(st_collect(array(select coord from coordinates where node in (select * from vd_{center}))))) as boundary' )['boundary']
# write(name, f"insert into virtual_district (id, center, boundary) values ('vd_{center}', '{center}', st_geomfromtext('{boundary}'))")
xys = _polygon_to_nodes(boundary)
vds.append({ 'center': center, 'nodes': value, 'boundary': xys })