Merge pull request #73 from mcrossley/master

b3084
cumulusmx · Jun 18, 2020 · 18645d5 · 18645d5
2 parents e4ba434 + ee68eb8
commit 18645d5
Show file tree

Hide file tree

Showing 9 changed files with 618 additions and 326 deletions.
diff --git a/CumulusMX/Api.cs b/CumulusMX/Api.cs
@@ -334,32 +334,32 @@ public async Task<bool> GetGraphData()
 					{
 						case "tempdata.json":
 							return await this.JsonResponseAsync(Station.GetTempGraphData());
-						case "tempdatad3.json":
-							return await this.JsonResponseAsync(Station.GetTempGraphDataD3());
+						//case "tempdatad3.json":
+						//	return await this.JsonResponseAsync(Station.GetTempGraphDataD3());
 						case "winddata.json":
 							return await this.JsonResponseAsync(Station.GetWindGraphData());
-						case "winddatad3.json":
-							return await this.JsonResponseAsync(Station.GetWindGraphDataD3());
+						//case "winddatad3.json":
+						//	return await this.JsonResponseAsync(Station.GetWindGraphDataD3());
 						case "raindata.json":
 							return await this.JsonResponseAsync(Station.GetRainGraphData());
-						case "raindatad3.json":
-							return await this.JsonResponseAsync(Station.GetRainGraphDataD3());
+						//case "raindatad3.json":
+						//	return await this.JsonResponseAsync(Station.GetRainGraphDataD3());
 						case "pressdata.json":
 							return await this.JsonResponseAsync(Station.GetPressGraphData());
-						case "pressdatad3.json":
-							return await this.JsonResponseAsync(Station.GetPressGraphDataD3());
+						//case "pressdatad3.json":
+						//	return await this.JsonResponseAsync(Station.GetPressGraphDataD3());
 						case "wdirdata.json":
 							return await this.JsonResponseAsync(Station.GetWindDirGraphData());
-						case "wdirdatad3.json":
-							return await this.JsonResponseAsync(Station.GetWindDirGraphDataD3());
+						//case "wdirdatad3.json":
+						//	return await this.JsonResponseAsync(Station.GetWindDirGraphDataD3());
 						case "humdata.json":
 							return await this.JsonResponseAsync(Station.GetHumGraphData());
-						case "humdatad3.json":
-							return await this.JsonResponseAsync(Station.GetHumGraphDataD3());
+						//case "humdatad3.json":
+						//	return await this.JsonResponseAsync(Station.GetHumGraphDataD3());
 						case "solardata.json":
 							return await this.JsonResponseAsync(Station.GetSolarGraphData());
-						case "solardatad3.json":
-							return await this.JsonResponseAsync(Station.GetSolarGraphDataD3());
+						//case "solardatad3.json":
+						//	return await this.JsonResponseAsync(Station.GetSolarGraphDataD3());
 						case "dailyrain.json":
 							return await this.JsonResponseAsync(Station.GetDailyRainGraphData());
 						case "sunhours.json":