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

take coordinates from first and last point from route result

Browse source
This commit is contained in:
Laura Klünder 2017-11-28 13:10:38 +01:00
parent e0f13e49a4
commit 8b2f19ee9e
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ def describe_location(location, locations):
location = final_location location = final_location
else: else:
location.can_describe = False location.can_describe = False
return location.serialize(detailed=False, describe_only=True) return location.serialize(detailed=False, describe_only=True, simple_geometry=True)
class Route: class Route:

7
src/c3nav/site/static/site/js/c3nav.js
View file

@ -222,8 +222,6 @@ c3nav = {
var $route = $('#route-summary'), var $route = $('#route-summary'),
first_primary_level = null, first_primary_level = null,
last_primary_level = null, last_primary_level = null,
origin = c3nav.locations_by_id[result.origin.id],
destination = c3nav.locations_by_id[result.destination.id],
level_collect = [], level_collect = [],
next_level_collect = [], next_level_collect = [],
in_intermediate_level = true, in_intermediate_level = true,
@ -253,17 +251,16 @@ c3nav = {
level_collect = level_collect.slice(-1); level_collect = level_collect.slice(-1);
} }
} }
level_collect.push([destination.point[1], destination.point[2]]);
if (last_primary_level && level_collect.length >= 2) { if (last_primary_level && level_collect.length >= 2) {
c3nav._add_line_to_level(last_primary_level, level_collect); c3nav._add_line_to_level(last_primary_level, level_collect);
} }
c3nav._add_line_to_level(first_primary_level, [ c3nav._add_line_to_level(first_primary_level, [
[origin.point[1], origin.point[2]], [result.origin.point[1], result.origin.point[2]],
result.items[0].coordinates.slice(0, 2) result.items[0].coordinates.slice(0, 2)
], true); ], true);
c3nav._add_line_to_level(last_primary_level, [ c3nav._add_line_to_level(last_primary_level, [
item.coordinates.slice(0, 2), item.coordinates.slice(0, 2),
[destination.point[1], destination.point[2]] [result.destination.point[1], result.destination.point[2]]
], true); ], true);
$route.find('span').text(String(result.distance)+' m'); $route.find('span').text(String(result.distance)+' m');
}, },