2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

calculate edge distance in 3 dimensions

Browse source
This commit is contained in:
Laura Klünder 2017-11-27 16:51:48 +01:00
parent e4b0995751
commit 0306b3fa87
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c3nav/routing/router.py
View file

@ -262,8 +262,8 @@ class RouterNode:
return Point(self.x, self.y) return Point(self.x, self.y)
@cached_property @cached_property
def xy(self): def xyz(self):
return np.array((self.x, self.y)) return np.array((self.x, self.y, self.altitude))
class RouterEdge: class RouterEdge:
@ -272,7 +272,7 @@ class RouterEdge:
self.to_node = to_node self.to_node = to_node
self.waytype = waytype self.waytype = waytype
self.rise = rise if rise is not None else (self.to_node.altitude - self.from_node.altitude) self.rise = rise if rise is not None else (self.to_node.altitude - self.from_node.altitude)
self.distance = distance if distance is not None else np.linalg.norm(to_node.xy - from_node.xy) self.distance = distance if distance is not None else np.linalg.norm(to_node.xyz - from_node.xyz)
class RouterWayType: class RouterWayType: