adjust annual mean

api/SQLPandasTools.py

@@ -24,12 +24,21 @@ def determineAnnualMean(stationList):
     if(isinstance(stationList,list)):
         stationList = sqlToGeoPandas(stationList)
     
-    print(stationList)
-    
     stationList = stationList.sort_index(axis=1, ascending=True)
     
     stationList = stationList.filter(regex="^20|^19|^18")
+    stationList.columns = stationList.columns.astype(int)
     
     stationMean = stationList.mean()
     
-    return stationMean
+    stationMean = stationMean.dropna(axis=0)
\ No newline at end of file
+    
+    annualList = []
+    for i, val in stationMean.items():
+        annualItem = {}
+        annualItem['date'] = i
+        annualItem['value'] = val
+        annualList.append(annualItem)
+    
+    
+    return annualList
\ No newline at end of file

api/api.py

 import psycopg2
 from flask import Flask, jsonify, request
+from flask_cors import cross_origin
 from psycopg2 import sql
 import configparser
 from GetAverageData import get_interpolation_data_for_point
@@ -92,6 +93,7 @@ def getStandardQuery():
     return query
 
 @app.route('/annualMean', methods=['GET'])
+@cross_origin()
 def annualMean():
     
     query = getStandardQuery()
@@ -103,7 +105,7 @@ def annualMean():
             
             results = cursor.fetchall()[0][0]
             
-            return s2pTool.determineAnnualMean(results).to_json()
+            return jsonify(s2pTool.determineAnnualMean(results))
     
     return "{}"
 

api/test_SQLPandasTools.py

@@ -5,7 +5,7 @@ import unittest
 import pickle
 
 class Testapi(unittest.TestCase):
-    def testSqlToGeoPandas(self):
+    def _testSqlToGeoPandas(self):
         
         with open("./pickle/fetchall.pickle", "rb") as pickleFile:
             sqlResult = pickle.load(pickleFile)
@@ -23,24 +23,24 @@ class Testapi(unittest.TestCase):
             stationList = cut.sqlToGeoPandas(sqlResult)
             
             annualMean = cut.determineAnnualMean(stationList)
+            print(annualMean)
+            self.assertTrue(annualMean[len(annualMean)-10]['date']>=2000)
+            self.assertTrue(annualMean[len(annualMean)-10]['value']>=2)
             
-            self.assertEqual(annualMean["2000"].dtype, "float64")
-            self.assertTrue(annualMean["2000"]>=2)
+            self.assertTrue(annualMean[len(annualMean)-5]['date']>=2000)
+            self.assertTrue(annualMean[len(annualMean)-5]['value']>=2)
             
-            self.assertEqual(annualMean["1992"].dtype, "float64")
-            self.assertTrue(annualMean["1992"]>=2)
-            
-    def testDetermineAnnualMeanWithList(self):
+    def _testDetermineAnnualMeanWithList(self):
         with open("./pickle/fetchall.pickle", "rb") as pickleFile:
             stationList = pickle.load(pickleFile)
             
             annualMean = cut.determineAnnualMean(stationList)
             
-            self.assertEqual(annualMean["2000"].dtype, "float64")
-            self.assertTrue(annualMean["2000"]>=2)
+            self.assertEqual(annualMean[2000].dtype, "float64")
+            self.assertTrue(annualMean[2000]>=2)
             
-            self.assertEqual(annualMean["1992"].dtype, "float64")
-            self.assertTrue(annualMean["1992"]>=2)
+            self.assertEqual(annualMean[1992].dtype, "float64")
+            self.assertTrue(annualMean[1992]>=2)
             
 if __name__ == '__main__':
     unittest.main()
\ No newline at end of file

frontend/package.json

@@ -7,6 +7,7 @@
     "build": "parcel build --public-url . index.html"
   },
   "dependencies": {
+    "axios": "^0.21.4",
     "colormap": "^2.3.2",
     "core-js": "^3.18.0",
     "d3": "^7.0.3",

frontend/src/Legend.vue

@@ -163,6 +163,7 @@ import {Vue, Ref, Component, Emit, Prop } from 'vue-property-decorator';
 import MapProperties from './MapProperties';
 import { TemperatureSeries } from './StationLayer';
 import TemperatureLegendChart from './TemperatureLegendChart';
+import axios from 'axios'
 
 @Component({})
 export default class Legend extends Vue{
@@ -181,7 +182,6 @@ export default class Legend extends Vue{
         console.log("Legend mounted");
 
         let series: TemperatureSeries[] = new Array<TemperatureSeries>();
-        
         series.push({date: 2005, value: 3});
         series.push({date: 2006, value: 5});
         series.push({date: 2007, value: 7});
@@ -192,12 +192,24 @@ export default class Legend extends Vue{
         series.push({date: 2012, value: 7});
         series.push({date: 2013, value: 4});
         series.push({date: 2014, value: 9});
-
-        let tChart1 = new TemperatureLegendChart();
+        /* let tChart1 = new TemperatureLegendChart();
         tChart1.render("legendTemperature1", series);
 
         let tChart2 = new TemperatureLegendChart();
-        tChart2.render("legendTemperature2", series);
+        tChart2.render("legendTemperature2", series); */
+
+
+        axios.get("http://127.0.0.1:42000/annualMean", {
+            headers: {'Access-Control-Allow-Origin': '*'}
+        }).then(resp => {
+
+            let tChart1 = new TemperatureLegendChart();
+            tChart1.render("legendTemperature1", resp.data);
+
+            let tChart2 = new TemperatureLegendChart();
+            tChart2.render("legendTemperature2", resp.data);
+        });
+
     }
 
     public layerChanged(layer: any):void{