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

make elevator transitions clickable

Browse source
This commit is contained in:
Laura Klünder 2017-12-07 01:33:40 +01:00
parent 276eee5adf
commit f5b5cad891
1 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -249,18 +249,31 @@ c3nav = {
// if we were in a secondary level, collect this line for the next primary level // if we were in a secondary level, collect this line for the next primary level
next_level_collect = next_level_collect.concat(level_collect); next_level_collect = next_level_collect.concat(level_collect);
} else if (last_primary_level) { } else if (last_primary_level) {
// if we were in an intermediate level, add this line to it // if we were in an primary level, add this line to it
if (!item.level.on_top_of) {
// directly from primary level to primary level
console.log('add to primary (to primary)');
c3nav._add_line_to_route(last_primary_level, level_collect.slice(0, -1));
} else {
console.log('add to primary (to secondary)');
c3nav._add_line_to_route(last_primary_level, level_collect); c3nav._add_line_to_route(last_primary_level, level_collect);
} }
}
if (item.level.on_top_of) { if (item.level.on_top_of) {
// if we area now in an intermediate level, note this // if we area now in an secondary level, note this
in_intermediate_level = true; in_intermediate_level = true;
} else { } else {
// if we are now in a primary level, add intermediate lines as links to last primary and this level // if we are now in a primary level, add intermediate lines as links to last primary and this level
in_intermediate_level = false; if (last_primary_level) {
if (!in_intermediate_level) {
next_level_collect = level_collect.slice(-2);
}
console.log('add blargh');
c3nav._add_line_to_route(last_primary_level, next_level_collect, false, item.level.id); c3nav._add_line_to_route(last_primary_level, next_level_collect, false, item.level.id);
c3nav._add_line_to_route(item.level.id, next_level_collect, false, last_primary_level); c3nav._add_line_to_route(item.level.id, next_level_collect, false, last_primary_level);
}
in_intermediate_level = false;
if (!first_primary_level) first_primary_level = item.level.id; if (!first_primary_level) first_primary_level = item.level.id;
last_primary_level = item.level.id; last_primary_level = item.level.id;
next_level_collect = []; next_level_collect = [];
@ -303,7 +316,8 @@ c3nav = {
routeLayer = c3nav._routeLayers[level]; routeLayer = c3nav._routeLayers[level];
line = L.polyline(latlngs, { line = L.polyline(latlngs, {
color: gray ? '#888888': $('button.swap').css('color'), color: gray ? '#888888': $('button.swap').css('color'),
dashArray: (gray || link_to_level) ? '7' : null dashArray: (gray || link_to_level) ? '7' : null,
interactive: false
}).addTo(routeLayer), }).addTo(routeLayer),
bounds = {}; bounds = {};
bounds[level] = line.getBounds(); bounds[level] = line.getBounds();
@ -313,7 +327,8 @@ c3nav = {
if (link_to_level) { if (link_to_level) {
L.polyline(latlngs, { L.polyline(latlngs, {
opacity: 0, opacity: 0,
weight: 15 weight: 15,
interactive: true
}).addTo(routeLayer).on('click', function() { }).addTo(routeLayer).on('click', function() {
c3nav._levelControl.setLevel(link_to_level); c3nav._levelControl.setLevel(link_to_level);
}); });