Refine node getter api

api/s2_junctions.py

@@ -1,3 +1,4 @@
+from typing import Any
 from psycopg.rows import Row
 from .s0_base import *
 from .change_set import ChangeSet
@@ -33,31 +34,6 @@ def delete_junction(name: str, id: str) -> ChangeSet:
     return delete_node(name, JUNCTION, id, sql, undo_sql)
 
 
-def get_junction_elevation(name: str, id: str) -> float | None:
-    row = _get_junction(name, id)
-    return float(row['elevation']) if row != None else None
-
-
-def get_junction_demand(name: str, id: str) -> float | str | None:
-    row = _get_junction(name, id)
-    if row != None:
-        return float(row['demand']) if row['demand'] != None else 'NULL'
-    else:
-        return None
-
-
-def get_junction_pattern(name: str, id: str) -> str | None:
-    row = _get_junction(name, id)
-    if row != None:
-        return row['pattern'] if row['pattern'] != None else 'NULL'
-    else:
-        return None
-
-
-def get_junction_coord(name: str, id: str) -> dict[str, float] | None:
-    return get_node_coord(name, id)
-
-
 def _set_junction(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet:
     if not is_junction(name, id):
         return ChangeSet()
@@ -89,3 +65,21 @@ def set_junction_coord(name: str, id: str, x: float, y: float) -> ChangeSet:
         return ChangeSet()
 
     return set_node_coord(name, JUNCTION, id, x, y)
+
+
+def get_junction_property_names(name: str) -> list[str]:
+    return ['elevation', 'demand', 'pattern', 'coord', 'links']
+
+
+def get_junction_properties(name: str, id: str) -> dict[str, Any] | None:
+    row = _get_junction(name, id)
+    if row == None:
+        return None
+
+    ps: dict[str, str] = {}
+    ps['elevation'] = float(row['elevation'])
+    ps['demand'] = float(row['demand']) if row != None and row['demand'] != None else None 
+    ps['pattern'] = row['pattern'] if row != None and row['pattern'] != None else None
+    ps['coord'] = get_node_coord(name, id)
+    ps['links'] = get_node_links(name, id)
+    return ps