From a0166193efab3e00b5130e99b32f8f0f88958a42 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Sat, 29 Apr 2023 14:27:25 +0800 Subject: [PATCH] Refactor vd --- api/__init__.py | 2 +- api/{s32_virtual_district.py => s37_virtual_district.py} | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) rename api/{s32_virtual_district.py => s37_virtual_district.py} (94%) diff --git a/api/__init__.py b/api/__init__.py index de43ec5..e7f81b0 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -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 \ No newline at end of file +from .s37_virtual_district import calculate_virtual_district \ No newline at end of file diff --git a/api/s32_virtual_district.py b/api/s37_virtual_district.py similarity index 94% rename from api/s32_virtual_district.py rename to api/s37_virtual_district.py index 6ce4682..93e8d1d 100644 --- a/api/s32_virtual_district.py +++ b/api/s37_virtual_district.py @@ -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 })