From 3ed4afeb8593a759e3e248cad87bedd5c1c971b6 Mon Sep 17 00:00:00 2001 From: wqy Date: Fri, 16 Sep 2022 23:01:43 +0800 Subject: [PATCH] Add new api to tjnetwork --- api/__init__.py | 4 +++- tjnetwork.py | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/api/__init__.py b/api/__init__.py index 611c91b..556cb6b 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -29,4 +29,6 @@ from .s3_reservoirs import set_reservoir_head, set_reservoir_pattern, set_reserv from .s4_tanks import OVERFLOW_YES, OVERFLOW_NO from .s4_tanks import add_tank, delete_tank from .s4_tanks import get_tank_elevation, get_tank_init_level, get_tank_min_level, get_tank_max_level, get_tank_diameter, get_tank_min_vol, get_tank_vol_curve, get_tank_overflow, get_tank_coord -from .s4_tanks import set_tank_elevation, set_tank_init_level, set_tank_min_level, set_tank_max_level, set_tank_diameter, set_tank_min_vol, set_tank_vol_curve, set_tank_overflow, set_tank_coord \ No newline at end of file +from .s4_tanks import set_tank_elevation, set_tank_init_level, set_tank_min_level, set_tank_max_level, set_tank_diameter, set_tank_min_vol, set_tank_vol_curve, set_tank_overflow, set_tank_coord + +from .s24_coordinates import get_node_coord, set_node_coord \ No newline at end of file diff --git a/tjnetwork.py b/tjnetwork.py index fa7be2c..cd4e92c 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -266,3 +266,14 @@ def set_tank_overflow(name: str, tank_id: str, overflow: str) -> ChangeSet: def set_tank_coord(name: str, tank_id: str, x: float, y: float) -> ChangeSet: return api.set_tank_coord(name, tank_id, x, y) + + +############################################################ +# coordinates 24.[COORDINATES] +############################################################ + +def get_node_coord(name: str, tank_id: str) -> dict[str, float] | None: + return api.get_node_coord(name, tank_id) + +def set_node_coord(name: str, tank_id: str, x: float, y: float) -> ChangeSet: + return api.set_node_coord(name, tank_id, x, y)