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

and even more type hinting for the route

Browse source
This commit is contained in:
Laura Klünder 2024-12-17 23:36:30 +00:00
parent c2ae631d84
commit 5264b0599a
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/c3nav/routing/route.py
View file

@ -2,7 +2,7 @@
from collections import OrderedDict, deque from collections import OrderedDict, deque
from dataclasses import dataclass from dataclasses import dataclass
from typing import TYPE_CHECKING, Sequence, Optional, Mapping from typing import TYPE_CHECKING, Sequence, Optional, Mapping, NamedTuple
import numpy as np import numpy as np
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
@ -11,7 +11,7 @@ from c3nav.mapdata.models import Location
from c3nav.routing.models import RouteOptions from c3nav.routing.models import RouteOptions
if TYPE_CHECKING: if TYPE_CHECKING:
from c3nav.routing.router import Router, RouterPoint, RouterNodeAndEdge from c3nav.routing.router import Router, RouterPoint, RouterNode, RouterEdge
def describe_location(location, locations): def describe_location(location, locations):
@ -26,6 +26,11 @@ def describe_location(location, locations):
return location return location
class RouteNodeWithOptionalEdge(NamedTuple):
node: int | "RouterNode"
edge: Optional["RouterEdge"]
@dataclass @dataclass
class Route: class Route:
router: "Router" router: "Router"
@ -40,12 +45,16 @@ class Route:
visible_locations: Mapping[int, Location] visible_locations: Mapping[int, Location]
def serialize(self): # todo: move this into schema def serialize(self): # todo: move this into schema
nodes = [[node, None] for node in self.path_nodes] nodes: list[RouteNodeWithOptionalEdge] = [
RouteNodeWithOptionalEdge(node=node, edge=None) for node in self.path_nodes
]
if self.origin_addition and any(self.origin_addition): if self.origin_addition and any(self.origin_addition):
nodes.insert(0, (self.origin_addition[0], None)) nodes.insert(0, RouteNodeWithOptionalEdge(node=self.origin_addition.node, edge=None))
nodes[1][1] = self.origin_addition[1] nodes[1] = RouteNodeWithOptionalEdge(node=nodes[1].node, edge=self.origin_addition.edge)
if self.destination_addition and any(self.destination_addition): if self.destination_addition and any(self.destination_addition):
nodes.append(self.destination_addition) nodes.append(
RouteNodeWithOptionalEdge(node=self.destination_addition.node, edge=self.destination_addition.edge)
)
# calculate distances from origin and destination to the origin and destination nodes # calculate distances from origin and destination to the origin and destination nodes
if self.origin_xyz is not None: if self.origin_xyz is not None:
@ -64,7 +73,7 @@ class Route:
else: else:
destination_distance = 0 destination_distance = 0
items = deque() items: deque[RouteItem] = deque()
last_node = None last_node = None
last_item = None last_item = None
walk_factor = self.options.walk_factor walk_factor = self.options.walk_factor