Skip to content

Include cuff nerve feature in path_nerve_ids and path_node_ids for no-centreline map #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbrnz merged 1 commit into from
Aug 7, 2025
Merged

Include cuff nerve feature in path_nerve_ids and path_node_ids for no-centreline map #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion mapmaker/routing/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@ def get_centreline_from_containing_features(start_dict, end_dict, feature_ids: s
tmp_edge_dicts[(n,s)] = edge_dict
if len(candidates) > 0:
new_direct_edges.update([min(candidates, key=candidates.get)]) # type: ignore
elif ((p_dict:=connectivity_graph.nodes[prev_node])['type'] == 'feature' and
elif ((p_dict:=connectivity_graph.nodes[prev_node])['type'] == 'feature' and
(n_dict:=connectivity_graph.nodes[node])['type'] == 'feature'):
if ((pf:=list(p_dict.get('features'))[0].id) in route_graph.nodes and
(nf:=list(n_dict.get('features'))[0].id) in route_graph.nodes):
Expand Down Expand Up @@ -1376,6 +1376,10 @@ def set_properties_from_feature_id(feature_id: str):
route_graph.add_node(node_0, type='terminal')
route_graph.add_node(node_1, type='terminal')
route_graph.add_edge(node_0, node_1, type='terminal', **debug_properties)
for node in (node_0, node_1):
if (f:=self.__flatmap.get_feature(node)) and f.get_property('type')=='nerve':
path_nerve_ids.add(node)
path_node_ids.add(node)
else:
upstream_node = node_0 if terminal_graph.nodes[node_0].get('upstream') else node_1
route_graph.nodes[upstream_node]['type'] = 'upstream'
Expand Down