diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index c564f16f..0ea08a8b 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2194,20 +2194,20 @@ def leaflet_chart_compare(course,workoutids,labeldict={},startenddict={}): }} ); - +var navionics = new JNC.Leaflet.NavionicsOverlay({{ + navKey: 'Navionics_webapi_03205', + chartType: JNC.NAVIONICS_CHARTS.NAUTICAL, + isTransparent: true, + zIndex: 1 +}}); var mymap = L.map('map_canvas', {{ center: [{latmean}, {lonmean}], zoom: 13, - layers: [streets, satellite] + layers: [outdoors] }}).setView([{latmean},{lonmean}], 13); - var navionics = new JNC.Leaflet.NavionicsOverlay({{ - navKey: 'Navionics_webapi_03205', - chartType: JNC.NAVIONICS_CHARTS.NAUTICAL, - isTransparent: true, - zIndex: 1 - }}); + var osmUrl2='http://tiles.openseamap.org/seamark/{{z}}/{{x}}/{{y}}.png'; diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index b74651be..a68ef3ba 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -380,7 +380,7 @@ def standard_view(request,id=0): r = getrower(request.user) - allower = ["-referencespeed","agemax","agemin","sex","name", + allowed = ["-referencespeed","agemax","agemin","sex","name", "referencespeed","-agemax","-agemin","-sex","-name"] orderby = request.GET.get('order_by')