Skip to content
Merged
Changes from all commits
Commits
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: 3 additions & 3 deletions mapmaker/properties/pathways.py
Original file line number Diff line number Diff line change
Expand Up @@ -772,15 +772,15 @@ def __extract_rendered_connectivity(self, route_graphs, path_id):
},
'forward_connections': [
conn_id for conn_id in connectivity_graph.graph.get('forward-connections', [])
if conn_id in route_graphs and route_graphs[conn_id].graph['connectivity'].nodes
if conn_id in route_graphs and route_graphs[conn_id].nodes
],
'node_nerves': [
rn for n in connectivity_graph.graph.get('nerves', [])
if n in connectivity_graph and
((rn := connectivity_graph.nodes[n]['node']) == n or any(get_knowledge(t).get('type') == NERVE_TYPE for t in [rn[0], *rn[1]]))
]
}

return rendered_data


Expand Down Expand Up @@ -822,7 +822,7 @@ def __route_network_connectivity(self, network: Network):
('completeness', path.connectivity.graph.get('completeness')),
] if value is not None
}

for geometric_shape in geometric_shapes:
if geometric_shape.properties.get('type') not in ['arrow', 'junction']:
properties = DEFAULT_PATH_PROPERTIES.copy() | added_properties
Expand Down