diff --git a/main.py b/main.py index 6493342..c49442c 100644 --- a/main.py +++ b/main.py @@ -1404,7 +1404,7 @@ async def fastapi_get_network_coords(network: str) -> list[str] | None: return result # DingZQ, 2024-12-08, get all links' start and end node -# link_id:node_id1:node_id2 +# link_id:link_type:node_id1:node_id2 @app.get("/getnetworklinknodes/") async def fastapi_get_network_link_nodes(network: str) -> list[str] | None: return get_network_link_nodes(network) diff --git a/tjnetwork.py b/tjnetwork.py index de06930..5e1198c 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -842,13 +842,13 @@ def get_network_node_coords(name: str) -> dict[str, dict[str, float]]: return result # DingZQ, 2024-12-08, get all links' start and end node -# link_id:node_id1:node_id2 +# link_id:link_type:node_id1:node_id2 def get_network_link_nodes(name: str) -> list[str]: - links = api.get_links(name) + links_id_and_type = api.get_links_id_and_type(name) result = [] - for link_id in links: + for link_id, link_type in links_id_and_type.items(): nodes = api.get_link_nodes(name, link_id) - result.append(f"{link_id}:{nodes[0]}:{nodes[1]}") + result.append(f"{link_id}:{link_type}:{nodes[0]}:{nodes[1]}") return result ############################################################