Refine node getter api

api/s4_tanks.py

@@ -1,3 +1,4 @@
+from typing import Any
 from psycopg.rows import Row
 from .s0_base import *
 from .change_set import ChangeSet
@@ -42,56 +43,6 @@ def delete_tank(name: str, id: str) -> ChangeSet:
     return delete_node(name, TANK, id, sql, undo_sql)
 
 
-def get_tank_elevation(name: str, id: str) -> float | None:
-    row = _get_tank(name, id)
-    return float(row['elevation']) if row != None else None
-
-
-def get_tank_init_level(name: str, id: str) -> float | None:
-    row = _get_tank(name, id)
-    return float(row['init_level']) if row != None else None
-
-
-def get_tank_min_level(name: str, id: str) -> float | None:
-    row = _get_tank(name, id)
-    return float(row['min_level']) if row != None else None
-
-
-def get_tank_max_level(name: str, id: str) -> float | None:
-    row = _get_tank(name, id)
-    return float(row['max_level']) if row != None else None
-
-
-def get_tank_diameter(name: str, id: str) -> float | None:
-    row = _get_tank(name, id)
-    return float(row['diameter']) if row != None else None
-
-
-def get_tank_min_vol(name: str, id: str) -> float | None:
-    row = _get_tank(name, id)
-    return float(row['min_vol']) if row != None else None
-
-
-def get_tank_vol_curve(name: str, id: str) -> str | None:
-    row = _get_tank(name, id)
-    if row != None:
-        return row['vol_curve'] if row['vol_curve'] != None else 'NULL'
-    else:
-        return None
-
-
-def get_tank_overflow(name: str, id: str) -> str | None:
-    row = _get_tank(name, id)
-    if row != None:
-        return row['overflow'] if row['overflow'] != None else 'NULL'
-    else:
-        return None
-
-
-def get_tank_coord(name: str, id: str) -> dict[str, float] | None:
-    return get_node_coord(name, id)
-
-
 def _set_tank(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet:
     if not is_tank(name, id):
         return ChangeSet()
@@ -146,3 +97,25 @@ def set_tank_coord(name: str, id: str, x: float, y: float) -> ChangeSet:
         return ChangeSet()
 
     return set_node_coord(name, TANK, id, x, y)
+
+
+def get_tank_property_names(name: str) -> list[str]:
+    return ['elevation', 'init_level', 'min_level', 'max_level', 'diameter', 'min_vol', 'vol_curve', 'overflow', 'coord']
+
+
+def get_tank_properties(name: str, id: str) -> dict[str, Any] | None:
+    row = _get_tank(name, id)
+    if row == None:
+        return None
+
+    ps: dict[str, str] = {}
+    ps['elevation'] = float(row['elevation']) if row != None else None
+    ps['init_level'] = float(row['init_level']) if row != None else None
+    ps['min_level'] = float(row['min_level']) if row != None else None
+    ps['max_level'] = float(row['max_level']) if row != None else None
+    ps['diameter'] = float(row['diameter']) if row != None else None
+    ps['min_vol'] = float(row['min_vol']) if row != None else None
+    ps['vol_curve'] = row['vol_curve'] if row != None and row['vol_curve'] != None else None
+    ps['overflow'] = row['overflow'] if row != None and row['overflow'] != None else None
+    ps['coord'] = get_node_coord(name, id)
+    return ps