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

Merge branch 'release/v4.05'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-09-25 22:17:59 +02:00
parent 2b3ac0f35d 1fa4f28a0a
commit 3638d89c43
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/interactiveplots.py
View File

@@ -700,6 +700,8 @@ def leaflet_chart(lat,lon,name=""):
df = df.replace(0,np.nan) df = df.replace(0,np.nan)
df = df.loc[(df!=0).any(axis=1)] df = df.loc[(df!=0).any(axis=1)]
df.fillna(method='bfill',axis=0,inplace=True)
df.fillna(method='ffill',axis=0,inplace=True)
lat = df['lat'] lat = df['lat']
lon = df['lon'] lon = df['lon']
if lat.empty or lon.empty: if lat.empty or lon.empty:

2
rowsandall_app/settings.py
View File

@@ -176,13 +176,13 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/1.9/topics/i18n/ # https://docs.djangoproject.com/en/1.9/topics/i18n/
TIME_ZONE = 'UTC'
USE_I18N = True USE_I18N = True
USE_L10N = True USE_L10N = True
USE_TZ = True USE_TZ = True
TIME_ZONE = 'UTC'
TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT') TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT')