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

use <main> dimensions instead of window dimensions

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

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

@ -707,7 +707,9 @@ c3nav = {
// map // map
init_map: function () { init_map: function () {
var $map = $('#map'), i; var $map = $('#map'),
$main = $('main'),
i;
c3nav.bounds = JSON.parse($map.attr('data-bounds')); c3nav.bounds = JSON.parse($map.attr('data-bounds'));
c3nav.levels = JSON.parse($map.attr('data-levels')); c3nav.levels = JSON.parse($map.attr('data-levels'));
c3nav.tile_server = $map.attr('data-tile-server'); c3nav.tile_server = $map.attr('data-tile-server');
@ -718,8 +720,8 @@ c3nav = {
} }
minZoom = Math.log2(Math.max(0.25, Math.min( minZoom = Math.log2(Math.max(0.25, Math.min(
($(window).width()-40)/(c3nav.bounds[1][0]-c3nav.bounds[0][0]), ($main.width()-40)/(c3nav.bounds[1][0]-c3nav.bounds[0][0]),
($(window).height()-250)/(c3nav.bounds[1][1]-c3nav.bounds[0][1]) ($main.height()-250)/(c3nav.bounds[1][1]-c3nav.bounds[0][1])
))); )));
// create leaflet map // create leaflet map
@ -855,7 +857,8 @@ c3nav = {
_add_map_padding: function(options, topleft, bottomright) { _add_map_padding: function(options, topleft, bottomright) {
// add padding information for the current ui layout to fitBoudns options // add padding information for the current ui layout to fitBoudns options
var $search = $('#search'), var $search = $('#search'),
padBesideSidebar = ($(window).width() > 1000 && ($(window).height() < 250 || c3nav.state.details)), $main = $('main'),
padBesideSidebar = ($main.width() > 1000 && ($main.height() < 250 || c3nav.state.details)),
left = padBesideSidebar ? $search.width()+10 : 0, left = padBesideSidebar ? $search.width()+10 : 0,
top = padBesideSidebar ? 10 : $search.height()+10; top = padBesideSidebar ? 10 : $search.height()+10;
options[topleft || 'paddingTopLeft'] = L.point(left+13, top+41); options[topleft || 'paddingTopLeft'] = L.point(left+13, top+41);