sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/gmapfix'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-06 18:04:15 +01:00
parent 1c4048e247 f9eae7f591
commit a89628dd8a
3 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/interactiveplots.py
View File

@@ -442,7 +442,7 @@ def googlemap_chart(lat,lon,name=""):
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,resize'
map_options = GMapOptions(lat = lat.mean(),lng=lon.mean(),
map_type="roadmap",zoom=11)
map_type="roadmap",zoom=13)
plot = GMapPlot(
x_range=DataRange1d(), y_range=DataRange1d(),

46
rowers/templates/workout_form.html
View File

@@ -167,21 +167,6 @@
{% endif %}
</div>
<script>
// Set things up to resize the plot on a window resize. You can play with
// the arguments of resize_width_height() to change the plot's behavior.
var plot_resize_setup = function () {
var plotid = Object.keys(Bokeh.index)[0]; // assume we have just one plot
var plot = Bokeh.index[plotid];
var plotresizer = function() {
// arguments: use width, use height, maintain aspect ratio
plot.resize_width_height(true, true, true);
};
window.addEventListener('resize', plotresizer);
plotresizer();
};
window.addEventListener('load', plot_resize_setup);
</script>
<style>
/* Need this to get the page in "desktop mode"; not having an infinite height.*/
html, body {height: 100%; margin:5px;}
@@ -211,27 +196,22 @@
{{ gmscript |safe }}
<script>
// Set things up to resize the plot on a window resize. You can play with
// the arguments of resize_width_height() to change the plot's behavior.
var plot_resize_setup = function () {
var plotid = Object.keys(Bokeh.index)[0]; // assume we have just one plot
var plot = Bokeh.index[plotid];
var plotresizer = function() {
// arguments: use width, use height, maintain aspect ratio
plot.resize_width_height(true, true, true);
};
window.addEventListener('resize', plotresizer);
plotresizer();
};
window.addEventListener('load', plot_resize_setup);
</script>
<style>
/* Need this to get the page in "desktop mode"; not having an infinite height.*/
html, body {height: 100%; margin:5px;}
</style>
html, body, #map_canvas {
height: 100%;
width: 100%;
margin:0;
padding: 0;
}
#map_canvas_container {position: relative; top:0; right:0; bottom:0; left:0;}
{{ gmdiv|safe }}
#map_canvas {position: relative; top: 0; right: 0; bottom: 0; left: 0;}
</style>
<div id="map_canvas">
{{ gmdiv|safe }}
</div>
</div>
{% endblock %}

5
static/css/rowsandall.css
View File

@@ -549,3 +549,8 @@ a.wh:visited {
a.wh:hover {
color: #e9e9e9;
}
.bk-canvas-map {
overflow: hidden;
}