Clean code

tjnetwork.py

@@ -984,9 +984,13 @@ def get_all_scada_elements(name: str) -> list[dict[str, Any]]:
 # general_region 32
 ############################################################
 
+# pure geometry function, test point is in polygon
 def get_nodes_in_boundary(name: str, boundary: list[tuple[float, float]]) -> list[str]:
     return api.get_nodes_in_boundary(name, boundary)
 
+# if region is general or wda => get_nodes_in_boundary
+# if region is dma, sa or vd  => get stored nodes in table
+# TODO: more test
 def get_nodes_in_region(name: str, region_id: str) -> list[str]:
     return api.get_nodes_in_region(name, region_id)
 
@@ -1002,15 +1006,6 @@ def inflate_boundary(name: str, boundary: list[tuple[float, float]], delta: floa
 def inflate_region(name: str, region_id: str, delta: float = 0.5) -> list[tuple[float, float]]:
     return api.inflate_region(name, region_id, delta)
 
-def calculate_demand_to_nodes(name: str, demand: float, nodes: list[str]) -> dict[str, float]:
-    return api.calculate_demand_to_nodes(name, demand, nodes)
-
-def calculate_demand_to_region(name: str, demand: float, region: str) -> dict[str, float]:
-    return api.calculate_demand_to_region(name, demand, region)
-
-def calculate_demand_to_network(name: str, demand: float) -> dict[str, float]:
-    return api.calculate_demand_to_network(name, demand)
-
 def get_region_schema(name: str) -> dict[str, dict[str, Any]]:
     return api.get_region_schema(name)
 
@@ -1027,7 +1022,7 @@ def add_region(name: str, cs: ChangeSet) -> ChangeSet:
 def delete_region(name: str, cs: ChangeSet) -> ChangeSet:
     return api.delete_region(name, cs)
 
-def get_all_regions(name: str) -> list[str]:
+def get_all_regions(name: str) -> list[dict[str, Any]]:
     return []
 
 
@@ -1126,3 +1121,20 @@ def get_all_virtual_district(name: str) -> list[dict[str, Any]]:
 
 def generate_virtual_district(name: str, centers: list[str]) -> ChangeSet:
     return ChangeSet()
+
+
+############################################################
+# water_distribution_area 36
+############################################################
+
+def calculate_demand_to_nodes(name: str, demand: float, nodes: list[str]) -> dict[str, float]:
+    return api.calculate_demand_to_nodes(name, demand, nodes)
+
+# if region is general or wda => get_nodes_in_boundary
+# if region is dma, sa or vd  => get stored nodes in table
+# TODO: more test
+def calculate_demand_to_region(name: str, demand: float, region: str) -> dict[str, float]:
+    return api.calculate_demand_to_region(name, demand, region)
+
+def calculate_demand_to_network(name: str, demand: float) -> dict[str, float]:
+    return api.calculate_demand_to_network(name, demand)