diff --git a/main.py b/main.py index 47fbda6..9f2281d 100644 --- a/main.py +++ b/main.py @@ -522,7 +522,7 @@ async def fast_get_link_properties(network: str, link: str) -> dict[str, Any]: # type can be 'node' or 'link' or 'scada' @app.get('/getelementpropertieswithtype/') async def fast_get_element_properties_with_type(network: str, type: str, element: str) -> dict[str, Any]: - return get_element_properties(network, type, element) + return get_element_properties_with_type(network, type, element) # type can be 'node' or 'link' or 'scada' @app.get('/getelementproperties/') diff --git a/tjnetwork.py b/tjnetwork.py index b55efae..b1a2224 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -423,11 +423,13 @@ def get_link_properties(name: str, link_id: str) -> dict[str, Any]: return api.get_valve(name, link_id) # type can be 'node' or 'link' -def get_element_properties(name: str, type: str, element_id: str) -> dict[str, Any]: +def get_element_properties_with_type(name: str, type: str, element_id: str) -> dict[str, Any]: if type == 'node': return get_node_properties(name, element_id) elif type == 'link': return get_link_properties(name, element_id) + elif type == 'scada': + return get_scada_info(name, element_id) else: return {}