Accept Merge Request #39: (api -> master)

Merge Request: Expose node specific api

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/39

api/__init__.py

@@ -33,4 +33,4 @@ from .s6_pumps import get_pump_schema, add_pump, get_pump, set_pump, delete_pump
 from .s7_valves import VALVES_TYPE_PRV, VALVES_TYPE_PSV, VALVES_TYPE_PBV, VALVES_TYPE_FCV, VALVES_TYPE_TCV, VALVES_TYPE_GPV
 from .s7_valves import get_valve_schema, add_valve, get_valve, set_valve, delete_valve
 
-# from .s24_coordinates import get_node_coord, set_node_coord
+from .s24_coordinates import get_node_coord

api/s24_coordinates.py

@@ -20,7 +20,7 @@ def get_node_coord(name: str, id: str) -> dict[str, float] | None:
         coord = str(row['coord'])
         return _to_client_point(coord)
 
-
+'''
 def set_node_coord(name: str, node_type: str, id: str, x: float, y: float) -> ChangeSet:
     old = get_node_coord(name, id)
     if old == None:
@@ -39,3 +39,4 @@ def set_node_coord(name: str, node_type: str, id: str, x: float, y: float) -> Ch
     change = ChangeSet()
     change.update(node_type, id, 'coord')
     return change
+'''

test_tjnetwork.py

@@ -104,6 +104,12 @@ class TestApi:
         assert change_set.operations[0]['properties'] == ['demand']
         assert get_junction(p, 'j0')['demand'] == 100.0
 
+        assert get_junction(p, 'j0')['coord']['x'] == 0.0
+        assert get_junction(p, 'j0')['coord']['y'] == 10.0
+        change_set = set_junction(p, 'j0', {'coord': {'x': 100.0, 'y': 200.0}})
+        assert get_junction(p, 'j0')['coord']['x'] == 100.0
+        assert get_junction(p, 'j0')['coord']['y'] == 200.0
+
         # TODO: pattern
 
         change_set = add_junction(p, "j1", 0.0, 10.0, 20.0)

tjnetwork.py

@@ -136,6 +136,9 @@ def get_curves(name: str) -> list[str]:
 def get_patterns(name: str) -> list[str]:
     return api.get_patterns(name)
 
+def get_node_links(name: str, node_id: str) -> list[str]:
+    return api.get_node_links(name, node_id)
+
 
 ############################################################
 # title 1.[TITLE]
@@ -266,3 +269,11 @@ def set_valve(name: str, valve_id: str, properties: dict[str, Any]) -> ChangeSet
 
 def delete_valve(name: str, valve_id: str) -> ChangeSet:
     return api.delete_valve(name, valve_id)
+
+
+############################################################
+# coord 24.[COORDINATES]
+############################################################
+
+def get_node_coord(name: str, node_id: str) -> dict[str, float] | None:
+    return api.get_node_coord(name, node_id)