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

respect route options

Browse source
This commit is contained in:
Laura Klünder 2017-12-16 22:14:00 +01:00
parent 76d7ab4b0e
commit cf95ef714b
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/c3nav/routing/api.py
View file

@ -38,7 +38,8 @@ class RoutingViewSet(ViewSet):
try: try:
route = Router.load().get_route(origin=form.cleaned_data['origin'], route = Router.load().get_route(origin=form.cleaned_data['origin'],
destination=form.cleaned_data['destination'], destination=form.cleaned_data['destination'],
permissions=AccessPermission.get_for_request(request)) permissions=AccessPermission.get_for_request(request),
options=options)
except NotYetRoutable: except NotYetRoutable:
return Response({ return Response({
'error': _('Not yet routable, try again shortly.'), 'error': _('Not yet routable, try again shortly.'),

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

@ -137,6 +137,12 @@ class RouteOptions(models.Model):
def __setitem__(self, key, value): def __setitem__(self, key, value):
self.update({key: value}) self.update({key: value})
def get(self, key, default):
try:
return self[key]
except AttributeError:
return default
def serialize(self): def serialize(self):
return [ return [
{ {

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

@ -1,3 +1,4 @@
import json
import operator import operator
import os import os
import pickle import pickle
@ -302,9 +303,11 @@ class Router:
self.get_restrictions(location.permissions)) self.get_restrictions(location.permissions))
) )
def shortest_path(self, restrictions): def shortest_path(self, restrictions, options):
cache_key = 'router:shortest_path:%s:%s' % (MapUpdate.current_processed_cache_key(), options_key = json.dumps(options.data, separators=(',', '='), sort_keys=True)[1:-1]
restrictions.cache_key) cache_key = 'router:shortest_path:%s:%s:%s' % (MapUpdate.current_processed_cache_key(),
restrictions.cache_key,
options_key)
result = cache.get(cache_key) result = cache.get(cache_key)
if result: if result:
return result return result
@ -314,6 +317,13 @@ class Router:
graph[:, tuple(restrictions.spaces)] = np.inf graph[:, tuple(restrictions.spaces)] = np.inf
graph[restrictions.edges.transpose().tolist()] = np.inf graph[restrictions.edges.transpose().tolist()] = np.inf
for waytype in self.waytypes[1:]:
value = options.get('waytype_%s' % waytype.pk, 'allow')
if value in ('avoid', 'avoid_up'):
graph[waytype.upwards_indices.transpose().tolist()] *= 100000
if value in ('avoid', 'avoid_down'):
graph[waytype.nonupwards_indices.transpose().tolist()] *= 100000
result = shortest_path(graph, directed=True, return_predecessors=True) result = shortest_path(graph, directed=True, return_predecessors=True)
cache.set(cache_key, result, 600) cache.set(cache_key, result, 600)
return result return result
@ -323,7 +333,7 @@ class Router:
pk: restriction for pk, restriction in self.restrictions.items() if pk not in permissions pk: restriction for pk, restriction in self.restrictions.items() if pk not in permissions
}) })
def get_route(self, origin, destination, permissions=frozenset()): def get_route(self, origin, destination, permissions, options):
restrictions = self.get_restrictions(permissions) restrictions = self.get_restrictions(permissions)
# get possible origins and destinations # get possible origins and destinations
@ -331,7 +341,7 @@ class Router:
destinations = self.get_locations(destination, restrictions) destinations = self.get_locations(destination, restrictions)
# calculate shortest path matrix # calculate shortest path matrix
distances, predecessors = self.shortest_path(restrictions) distances, predecessors = self.shortest_path(restrictions, options=options)
# find shortest path for our origins and destinations # find shortest path for our origins and destinations
origin_nodes = np.array(tuple(origins.nodes)) origin_nodes = np.array(tuple(origins.nodes))