Skip to content
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

Refactor: Replace connected_nodes connected_edges #12

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Refactor: Replace connected_nodes connected_edges #12

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff14a23
dep: use custom yaramo
antonykamp Apr 17, 2023
724a960
refactor: replace connected nodes with edges
antonykamp Apr 17, 2023
63a028a
fix: use bp2022-ap1 repo
antonykamp Apr 24, 2023
0fcef21
fix: use bp2022-ap1 repo
antonykamp Apr 24, 2023
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
16 changes: 8 additions & 8 deletions planpro_importer/reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,29 @@ def read_topology_from_container(self, container):

for top_kante in container.TOP_Kante:
top_kante_uuid = top_kante.Identitaet.Wert
length = top_kante.TOP_Kante_Allg.TOP_Laenge.Wert
node_a = self.topology.nodes[top_kante.ID_TOP_Knoten_A.Wert]
node_b = self.topology.nodes[top_kante.ID_TOP_Knoten_B.Wert]
edge = Edge(node_a, node_b, length=length, uuid=top_kante_uuid)
antonykamp marked this conversation as resolved.
Show resolved Hide resolved

# Anschluss A
anschluss_a = top_kante.TOP_Kante_Allg.TOP_Anschluss_A.Wert
if anschluss_a == "Links":
node_a.set_connection_left(node_b)
node_a.set_connection_left_edge(edge)
elif anschluss_a == "Rechts":
node_a.set_connection_right(node_b)
node_a.set_connection_right_edge(edge)
else:
node_a.set_connection_head(node_b)
node_a.set_connection_head_edge(edge)

# Anschluss B
anschluss_b = top_kante.TOP_Kante_Allg.TOP_Anschluss_B.Wert
if anschluss_b == "Links":
node_b.set_connection_left(node_a)
node_b.set_connection_left_edge(edge)
elif anschluss_b == "Rechts":
node_b.set_connection_right(node_a)
node_b.set_connection_right_edge(edge)
else:
node_b.set_connection_head(node_a)
node_b.set_connection_head_edge(edge)

length = top_kante.TOP_Kante_Allg.TOP_Laenge.Wert

# Intermediate geo nodes
geo_edges = self.get_all_geo_edges_by_top_edge_uuid(container, top_kante_uuid)
Expand Down Expand Up @@ -103,7 +104,6 @@ def _get_next_edge(_last_node_uuid, _second_last_node):
second_last_node_uuid = last_node_uuid
last_node_uuid = _get_other_uuid(second_last_node_uuid, next_edge)

edge = Edge(node_a, node_b, length=length, uuid=top_kante_uuid)
edge.intermediate_geo_nodes = geo_nodes_in_order
self.topology.add_edge(edge)

Expand Down
Loading