Skip to content

Yaramo 2 #63

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Yaramo 2 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b0a260
Update dependencies
arneboockmeyer Apr 1, 2025
ea107b1
Remove geo points
arneboockmeyer Apr 1, 2025
add3e05
Remove conversion to DBRef during import
arneboockmeyer May 8, 2025
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
11 changes: 5 additions & 6 deletions orm_importer/importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from yaramo import model
from yaramo.edge import Edge
from yaramo.geo_node import Wgs84GeoNode
from yaramo.geo_point import Wgs84GeoPoint
from yaramo.topology import Topology

from orm_importer.utils import (
Expand Down Expand Up @@ -104,18 +103,18 @@ def _add_geo_nodes(self, path, top_edge: Edge):
node = self.node_data[node_id]
if idx == 0 or is_signal(node):
continue
top_edge.intermediate_geo_nodes.append(Wgs84GeoNode(node.lat, node.lon).to_dbref())
top_edge.intermediate_geo_nodes.append(Wgs84GeoNode(node.lat, node.lon))

def _add_signals(self, path, edge: model.Edge, node_before, node_after):
# append node and next_tope_node to path as they could also be signals (e.g. buffer stop)
for node_id in [int(edge.node_a.name), *path, int(edge.node_b.name)]:
node = self.node_data[node_id]
if is_signal(node):
signal_geo_point = Wgs84GeoPoint(node.lat, node.lon).to_dbref()
signal_geo_node = Wgs84GeoNode(node.lat, node.lon)
signal = model.Signal(
edge=edge,
distance_edge=edge.node_a.geo_node.geo_point.get_distance_to_other_geo_point(
signal_geo_point
distance_edge=edge.node_a.geo_node.get_distance_to_other_geo_node(
signal_geo_node
),
side_distance=dist_edge(node_before, node_after, node),
direction=get_signal_direction(
Expand Down Expand Up @@ -167,7 +166,7 @@ def run(self, polygon, railway_option_types: list[str] = None):
export_node = model.Node(
name=node.id, turnout_side=node.tags.get("railway:turnout_side", None)
)
export_node.geo_node = model.Wgs84GeoNode(lat, lon).to_dbref()
export_node.geo_node = model.Wgs84GeoNode(lat, lon)
self.topology.add_node(export_node)

# DFS-Like to create top and geo edges
Expand Down
Loading
Loading