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

Merge branch 'develop' into feature/garmin

Browse Source
This commit is contained in:
Sander Roosendaal
2020-07-05 12:00:27 +02:00
parent 7ded4dcdb0 72d3f93669
commit c0c73319e0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rowers/interactiveplots.py
View File

@@ -2194,20 +2194,20 @@ def leaflet_chart_compare(course,workoutids,labeldict={},startenddict={}):
}} }}
); );
var navionics = new JNC.Leaflet.NavionicsOverlay({{
var mymap = L.map('map_canvas', {{
center: [{latmean}, {lonmean}],
zoom: 13,
layers: [streets, satellite]
}}).setView([{latmean},{lonmean}], 13);
var navionics = new JNC.Leaflet.NavionicsOverlay({{
navKey: 'Navionics_webapi_03205', navKey: 'Navionics_webapi_03205',
chartType: JNC.NAVIONICS_CHARTS.NAUTICAL, chartType: JNC.NAVIONICS_CHARTS.NAUTICAL,
isTransparent: true, isTransparent: true,
zIndex: 1 zIndex: 1
}}); }});
var mymap = L.map('map_canvas', {{
center: [{latmean}, {lonmean}],
zoom: 13,
layers: [outdoors]
}}).setView([{latmean},{lonmean}], 13);
var osmUrl2='http://tiles.openseamap.org/seamark/{{z}}/{{x}}/{{y}}.png'; var osmUrl2='http://tiles.openseamap.org/seamark/{{z}}/{{x}}/{{y}}.png';

2
rowers/views/racesviews.py
View File

@@ -380,7 +380,7 @@ def standard_view(request,id=0):
r = getrower(request.user) r = getrower(request.user)
allower = ["-referencespeed","agemax","agemin","sex","name", allowed = ["-referencespeed","agemax","agemin","sex","name",
"referencespeed","-agemax","-agemin","-sex","-name"] "referencespeed","-agemax","-agemin","-sex","-name"]
orderby = request.GET.get('order_by') orderby = request.GET.get('order_by')