From 091c8d6f19e3ea5c21f3039c4ba8a0a42d3e9a70 Mon Sep 17 00:00:00 2001 From: Gitea Date: Sun, 27 Oct 2019 13:10:10 +0100 Subject: [PATCH] final changes --- map/static/map/index.css | 15 ++++++++------- map/templates/map/index.html | 10 +++++----- mobile/predict.py | 4 ++-- mobile/templates/mobile/base.html | 2 +- mobile/templates/mobile/scan.html | 2 ++ static/spring_logo.png | Bin 0 -> 10777 bytes 6 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 static/spring_logo.png diff --git a/map/static/map/index.css b/map/static/map/index.css index fd20e14..236aed1 100644 --- a/map/static/map/index.css +++ b/map/static/map/index.css @@ -10,12 +10,13 @@ #p_date { position: absolute; - bottom: 20px; + left: 25px; + bottom: 60px; } #logo_side { - width: 60%; - margin-left: 20%; + width: 90%; + margin-left: 5%; margin-top: 10%; } @@ -59,13 +60,13 @@ div.yearno { } #div19 { - top: 30px; - left: 30px; + top: 4%; + left: 2%; } #div29 { - top: 330px; - left: 30px; + top: 50%; + left: 2%; } .slider { diff --git a/map/templates/map/index.html b/map/templates/map/index.html index cd87265..c2558f4 100644 --- a/map/templates/map/index.html +++ b/map/templates/map/index.html @@ -27,6 +27,7 @@
2019
2029
+
@@ -189,7 +187,7 @@ function updateMap(value) { for (var i = 0; i < trees_2.length; i++) { trees_2[i].update(value); } - p_date.innerHTML = "Date: " + dateFromDay(value); + p_date.innerHTML = dateFromDay(value); } function dateFromDay(dayno) { @@ -203,6 +201,8 @@ var cities2 = L.layerGroup(trees_2.map(t => t.marker)); cities1.addTo(map1); cities2.addTo(map2); +p_date.innerHTML = dateFromDay(180); + diff --git a/mobile/predict.py b/mobile/predict.py index 34eb898..690a099 100644 --- a/mobile/predict.py +++ b/mobile/predict.py @@ -12,7 +12,7 @@ def normalize(x): def get_gdd_until(date): - temp=pd.read_csv('/tmp/temp', sep=',') + temp=pd.read_csv('~/tmp/temp', sep=',') y=int(temp[temp.Datum==date].index.values) GDD_date=0 for x in range(y+1): @@ -21,7 +21,7 @@ def get_gdd_until(date): return GDD_date -def predict_blooming(date,gdd_infile='/tmp/wachstumsgradtag.csv',climate_infile='/tmp/climate_heidelberg_tima_and_date.csv'): +def predict_blooming(date,gdd_infile='~/tmp/wachstumsgradtag.csv',climate_infile='~/tmp/climate_heidelberg_tima_and_date.csv'): gdd_date = get_gdd_until(date) gdd_trees = pd.read_csv(gdd_infile, sep=',', encoding='utf-8') monthly_temp = pd.read_csv(climate_infile,sep='\t') diff --git a/mobile/templates/mobile/base.html b/mobile/templates/mobile/base.html index 70359b1..f4f5a04 100644 --- a/mobile/templates/mobile/base.html +++ b/mobile/templates/mobile/base.html @@ -22,7 +22,7 @@
-

Bloom up your region

+

Spring Up Your Region

diff --git a/mobile/templates/mobile/scan.html b/mobile/templates/mobile/scan.html index acad262..5e162f8 100644 --- a/mobile/templates/mobile/scan.html +++ b/mobile/templates/mobile/scan.html @@ -36,6 +36,8 @@ function identify() { +
+ diff --git a/static/spring_logo.png b/static/spring_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..81b59597aba8c0fee5f079010d5493641ed95083 GIT binary patch literal 10777 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