From 9e85364c37daf16dc2d022ca86103e0f89968db1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 4 Jul 2020 06:41:59 +0200 Subject: [PATCH] better maps splines --- rowers/interactiveplots.py | 2 +- rowers/models.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index dd923ee8..c564f16f 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1868,7 +1868,7 @@ def course_map(course): 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({{ diff --git a/rowers/models.py b/rowers/models.py index c292d8eb..972126e3 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -25,7 +25,8 @@ import re import pytz from django_countries.fields import CountryField -from scipy.interpolate import splprep, splev, CubicSpline +from scipy.interpolate import splprep, splev, CubicSpline,interp1d + import numpy as np import shutil @@ -438,8 +439,10 @@ def course_spline(coordinates): tnew = np.linspace(0,1,100) try: - latnew = CubicSpline(t,latitudes,bc_type='clamped')(tnew) - lonnew = CubicSpline(t,longitudes,bc_type='clamped')(tnew) + #latnew = CubicSpline(t,latitudes,bc_type='not-a-knot')(tnew) + #lonnew = CubicSpline(t,longitudes,bc_type='not-a-knot')(tnew) + latnew = interp1d(t,latitudes)(tnew) + lonnew = interp1d(t,longitudes)(tnew) except ValueError: latnew = latitudes lonnew = longitudes