Add link type information for link
This commit is contained in:
2
main.py
2
main.py
@@ -1404,7 +1404,7 @@ async def fastapi_get_network_coords(network: str) -> list[str] | None:
|
|||||||
return result
|
return result
|
||||||
|
|
||||||
# DingZQ, 2024-12-08, get all links' start and end node
|
# 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/")
|
@app.get("/getnetworklinknodes/")
|
||||||
async def fastapi_get_network_link_nodes(network: str) -> list[str] | None:
|
async def fastapi_get_network_link_nodes(network: str) -> list[str] | None:
|
||||||
return get_network_link_nodes(network)
|
return get_network_link_nodes(network)
|
||||||
|
|||||||
@@ -842,13 +842,13 @@ def get_network_node_coords(name: str) -> dict[str, dict[str, float]]:
|
|||||||
return result
|
return result
|
||||||
|
|
||||||
# DingZQ, 2024-12-08, get all links' start and end node
|
# 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]:
|
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 = []
|
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)
|
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
|
return result
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|||||||
Reference in New Issue
Block a user