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

add routing mode: fastest (respect speeds)

Browse source
This commit is contained in:
Laura Klünder 2017-12-17 00:41:18 +01:00
parent df6f5b5aff
commit 676a561578
2 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/c3nav/routing/models.py
View file

@ -28,6 +28,11 @@ class RouteOptions(models.Model):
@classmethod
def build_fields(cls):
fields = OrderedDict()
fields['mode'] = forms.ChoiceField(
label=_('Routing mode'),
choices=(('fastest', _('fastest')), ('shortest', _('shortest'))),
initial='fastest'
)
fields['walk_speed'] = forms.ChoiceField(
label=_('Walk speed'),
choices=(('slow', _('slow')), ('default', _('default')), ('fast', _('fast'))),
@ -137,6 +142,10 @@ class RouteOptions(models.Model):
def __setitem__(self, key, value):
self.update({key: value})
@property
def walk_factor(self):
return {'slow': 0.8, 'default': 1, 'fast': 1.2}[self['walk_speed']]
def get(self, key, default):
try:
return self[key]

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

@ -313,10 +313,30 @@ class Router:
return result
graph = self.graph.copy()
graph[tuple(restrictions.spaces), :] = np.inf
graph[:, tuple(restrictions.spaces)] = np.inf
graph[restrictions.edges.transpose().tolist()] = np.inf
# speeds of waytypes, if relevant
if options['mode'] == 'fastest':
self.waytypes[0].speed = 1
self.waytypes[0].speed_up = 1
self.waytypes[0].extra_seconds = 0
self.waytypes[0].walk = True
for waytype in self.waytypes:
speed = float(waytype.speed)
speed_up = float(waytype.speed_up)
if waytype.walk:
speed *= options.walk_factor
speed_up *= options.walk_factor
for indices, dir_speed in ((waytype.nonupwards_indices, speed), (waytype.upwards_indices, speed_up)):
indices = indices.transpose().tolist()
values = graph[indices]
values /= dir_speed
if waytype.extra_seconds:
values += int(waytype.extra_seconds)
graph[indices] = values
# avoid waytypes as specified in settings
for waytype in self.waytypes[1:]:
value = options.get('waytype_%s' % waytype.pk, 'allow')
if value in ('avoid', 'avoid_up'):
@ -324,6 +344,11 @@ class Router:
if value in ('avoid', 'avoid_down'):
graph[waytype.nonupwards_indices.transpose().tolist()] *= 100000
# exclude spaces and edges
graph[tuple(restrictions.spaces), :] = np.inf
graph[:, tuple(restrictions.spaces)] = np.inf
graph[restrictions.edges.transpose().tolist()] = np.inf
result = shortest_path(graph, directed=True, return_predecessors=True)
cache.set(cache_key, result, 600)
return result