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

site: add option to select ctypes to avoid

Browse source
This commit is contained in:
Laura Klünder 2016-12-19 01:31:20 +01:00
parent a63c98d8bc
commit f9268db2d9
2 changed files with 62 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/c3nav/site/templates/site/main.html
View file

@ -4,7 +4,8 @@
{% load i18n %}
{% block content %}
<form>
<form method="post">
{% csrf_token %}
<div class="row">
{% trans "Origin" as heading %}
{% include 'site/fragment_location.html' with name='origin' location=origin heading=heading %}
@ -12,6 +13,39 @@
{% trans "Destination" as heading %}
{% include 'site/fragment_location.html' with name='destination' location=destination heading=heading %}
</div>
<div class="row">
<div class="form-group col-md-2">
<label for="stairs-select">{% trans 'Stairs' %}</label>
<select name="stairs" id="stairs-select" class="form-control">
<option value="yes">{% trans 'allow' %}</option>
<option value="up">{% trans 'only upwards' %}</option>
<option value="down">{% trans 'only downwards' %}</option>
<option value="no">{% trans 'avoid' %}</option>
</select>
</div>
<div class="form-group col-md-2">
<label for="escalators-select">{% trans 'Escalators' %}</label>
<select name="escalators" id="escalator-select" class="form-control">
<option value="yes">{% trans 'allow' %}</option>
<option value="up">{% trans 'only upwards' %}</option>
<option value="down">{% trans 'only downwards' %}</option>
<option value="no">{% trans 'avoid' %}</option>
</select>
</div>
<div class="form-group col-md-2">
<label for="elevators-select">{% trans 'Elevators' %}</label>
<select name="elevators" id="elevators-select" class="form-control">
<option value="yes">{% trans 'allow' %}</option>
<option value="up">{% trans 'only upwards' %}</option>
<option value="down">{% trans 'only downwards' %}</option>
<option value="no">{% trans 'avoid' %}</option>
</select>
</div>
<div class="form-group col-md-6">
<label for="elevators-select">{% trans 'Get Route' %}</label>
<button type="submit" id="submitbtn" class="btn btn-block btn-primary">{% trans 'Get Route' %}</button>
</div>
</div>
</form>
{% if route %}

52
src/c3nav/site/views.py
View file

@ -1,8 +1,8 @@
import os
from django.conf import settings
from django.http import HttpResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.http import Http404, HttpResponse
from django.shortcuts import get_object_or_404, render
from PIL import Image, ImageDraw
from c3nav.mapdata.models import Level
@ -12,37 +12,39 @@ from c3nav.mapdata.utils.misc import get_dimensions
from c3nav.routing.graph import Graph
from c3nav.routing.utils.draw import _line_coords
ctype_mapping = {
'yes': ('up', 'down'),
'up': ('up', ),
'down': ('down', ),
'no': ()
}
def get_ctypes(prefix, value):
return tuple((prefix+'_'+direction) for direction in ctype_mapping.get(value, ('up', 'dowm')))
def main(request, origin=None, destination=None):
do_redirect = False
if origin:
origin_obj = get_location(request, origin)
if origin_obj.name != origin:
do_redirect = True
origin = origin_obj
origin = get_location(request, origin)
if origin is None:
raise Http404
if destination:
destination_obj = get_location(request, destination)
if destination_obj.name != destination:
do_redirect = True
destination = destination_obj
if do_redirect:
new_url = '/'
if origin:
new_url += origin.name+'/'
if destination:
new_url += destination.name + '/'
elif destination:
new_url += '_/' + destination.name + '/'
redirect(new_url)
destination = get_location(request, destination)
if destination is None:
raise Http404
route = None
if origin and destination:
if request.method == 'POST' and origin and destination:
graph = Graph.load()
route = graph.get_route(origin, destination, ('', 'escalator_down', 'escalator_up'))
allowed_ctypes = ('', )
allowed_ctypes += get_ctypes('stairs', request.POST.get('stairs'))
allowed_ctypes += get_ctypes('escalator', request.POST.get('escalators'))
allowed_ctypes += get_ctypes('elevator', request.POST.get('elevators'))
route = graph.get_route(origin, destination, allowed_ctypes)
print(route)
route = route.split()
print(route)