Clean code

tjnetwork.py

@@ -163,10 +163,6 @@ SCADA_ELEMENT_STATUS_ONLINE  = api.SCADA_ELEMENT_STATUS_ONLINE
 SCADA_ELEMENT_STATUS_OFFLINE = api.SCADA_ELEMENT_STATUS_OFFLINE
 
 
-DISTRIBUTION_TYPE_ADD      = api.DISTRIBUTION_TYPE_ADD
-DISTRIBUTION_TYPE_OVERRIDE = api.DISTRIBUTION_TYPE_OVERRIDE
-
-
 PARTITION_TYPE_RB   = api.PARTITION_TYPE_RB
 PARTITION_TYPE_KWAY = api.PARTITION_TYPE_KWAY
 
@@ -985,7 +981,7 @@ def get_all_scada_elements(name: str) -> list[dict[str, Any]]:
 
 
 ############################################################
-# region_util 32
+# general_region 32
 ############################################################
 
 def get_nodes_in_boundary(name: str, boundary: list[tuple[float, float]]) -> list[str]:
@@ -1006,10 +1002,11 @@ 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)
 
-############################################################
-# general_region 33
-############################################################
+def calculate_demand_to_region(name: str, demand: float, region: str) -> dict[str, float]:
+    return api.calculate_demand_to_region(name, demand, region)
 
 def get_region_schema(name: str) -> dict[str, dict[str, Any]]:
     return api.get_region_schema(name)
@@ -1029,24 +1026,7 @@ def delete_region(name: str, cs: ChangeSet) -> ChangeSet:
 
 
 ############################################################
-# water_distribution 34
-############################################################
-
-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 distribute_demand_to_nodes(name: str, demand: float, nodes: list[str], type: str = DISTRIBUTION_TYPE_ADD) -> ChangeSet:
-    return api.distribute_demand_to_nodes(name, demand, nodes, type)
-
-def distribute_demand_to_region(name: str, demand: float, region: str, type: str = DISTRIBUTION_TYPE_ADD) -> ChangeSet:
-    return api.distribute_demand_to_region(name, demand, region, type)
-
-
-############################################################
-# district_metering_area 35
+# district_metering_area 33
 ############################################################
 
 def calculate_district_metering_area(name: str, nodes: list[str], part_count: int = 1, part_type: int = PARTITION_TYPE_RB) -> list[list[str]]:
@@ -1054,7 +1034,7 @@ def calculate_district_metering_area(name: str, nodes: list[str], part_count: in
 
 
 ############################################################
-# service_area 36
+# service_area 34
 ############################################################
 
 def calculate_service_area(name: str, time_index: int = 0) -> dict[str, Any]:
@@ -1062,7 +1042,7 @@ def calculate_service_area(name: str, time_index: int = 0) -> dict[str, Any]:
 
 
 ############################################################
-# virtual_district 37
+# virtual_district 35
 ############################################################
 
 def calculate_virtual_district(name: str, centers: list[str]) -> dict[str, list[Any]]: