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 0000000..81b5959 Binary files /dev/null and b/static/spring_logo.png differ