From 702dd749655f885624aa8efab9f166df63d20ba2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 4 Jul 2020 17:24:39 +0200 Subject: [PATCH 1/3] bug fix --- rowers/views/racesviews.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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') From 75fd1a3d522a01cc95c2951cb848d6e8fa7a0281 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 5 Jul 2020 11:52:57 +0200 Subject: [PATCH 2/3] map compare with navionics --- rowers/interactiveplots.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index c564f16f..32bc7fae 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: [navionics,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'; From 72d3f936698e65540f2d039e734779cc6e354fcf Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 5 Jul 2020 11:56:41 +0200 Subject: [PATCH 3/3] fix --- rowers/interactiveplots.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 32bc7fae..0ea08a8b 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2204,7 +2204,7 @@ var navionics = new JNC.Leaflet.NavionicsOverlay({{ var mymap = L.map('map_canvas', {{ center: [{latmean}, {lonmean}], zoom: 13, - layers: [navionics,outdoors] + layers: [outdoors] }}).setView([{latmean},{lonmean}], 13);