Revize 22211075

Revert "Merge branch 'PredictorAPI' into 'master'"

This reverts merge request !20

Server/ServerApp/WeatherPredictionParser/JsonParser.cs

@@ -20 +20 @@
     /// <author>A. Konig</author>
     class JsonParser : IJsonParser
     {
+        /// <summary> Current weather </summary>
+        WeatherInfo current;
+        public new WeatherInfo Current { get => current; }
+        /// <summary> Prediction for today, tommorrow and day after tommorrow </summary>
+        List<WeatherInfo> predictions;
+        public new List<WeatherInfo> Predictions { get => predictions; set => predictions = value; }
+
         /// <summary> Data loader </summary>
         DataDownloader loader;
         /// <summary> Currently parsed day </summary>
@@ -39 +46 @@
             this.loader = loader;
         }
 
-        /// <summary>
-        /// Get predictions from Predictions that are within specified time span
-        /// From-to including
-        /// If from == null then all until to
-        /// If to  == null then all starting from from
-        /// </summary>
-        /// <param name="from">DateTime from</param>
-        /// <param name="to">DateTime to</param>
-        /// <returns>List of predictions that fit specified criteria or null if incorrect input</returns>
-        public override List<WeatherInfo> GetPredictionForTime(DateTime from, DateTime to)
-        {
-            if (Predictions == null)
-                return null;
-
-            List<WeatherInfo> res = new List<WeatherInfo>();
-
-            if (from == null)
-                from = Predictions[0].startTime;
-
-            if (to == null)
-                from = Predictions[Predictions.Count].startTime;
-
-            if (from > to)
-                return null;
-
-            foreach (WeatherInfo pred in Predictions)
-            {
-                int hour = pred.startTime.Hour + pred.intervalLength;
-                Console.WriteLine(pred.intervalLength);
-                bool addDay = false;
-                if (hour >= 24)
-                {
-                    hour -= 24;
-                    addDay = true;
-                }
-                DateTime endTime = new DateTime(pred.startTime.Year, pred.startTime.Month, pred.startTime.Day, hour, pred.startTime.Minute, pred.startTime.Second);
-                if (addDay)
-                    endTime = endTime.AddDays(1);
-
-                // if both end and start not outside of interval
-                if (!((pred.startTime < from && endTime <= from) || (pred.startTime > to && endTime >= to)))
-                    res.Add(pred);
-            }
-
-            return res;
-        }
-
         /// <summary>
         /// Parse weather prediction
         /// Results is in attributes current for current weather and pred for weather prediction for today, tommorrow and day after tommorrow
@@ -99 +59 @@
             DateTime now = DateTime.Now;
             Console.WriteLine(File.Exists(file));
 
-            Current = new WeatherInfo();
-            Predictions = new List<WeatherInfo>();
+            current = new WeatherInfo();
+            predictions = new List<WeatherInfo>();
 
             if (!File.Exists(file))
                 return;
@@ -124 +84 @@
                     case "current_condition":
                         {
                             ArrayEnumerator currentWeather = weatherP.Current.Value.EnumerateArray();
-                            Current = ParseCurrentWeather(currentWeather);
+                            current = ParseCurrentWeather(currentWeather);
 
                             break;
                         }
@@ -150 +110 @@
         /// </summary>
         private void TestConsoleOutput()
         {
-            Console.WriteLine(Current);
-            foreach (WeatherInfo w in Predictions)
+            Console.WriteLine(current);
+            foreach (WeatherInfo w in predictions)
                 Console.WriteLine(w);
         }
 
@@ -177 +137 @@
         private void EncompassSunRiseSetTimes()
         {
             // change current weather
-            if ((Current.startTime.TimeOfDay > sunsetTime.TimeOfDay) || (Current.startTime.TimeOfDay < sunriseTime.TimeOfDay))
-                Current.condition = WeatherConditions.Dark;
+            if ((current.startTime.TimeOfDay > sunsetTime.TimeOfDay) || (current.startTime.TimeOfDay < sunriseTime.TimeOfDay))
+                current.condition = WeatherConditions.Dark;
 
             // change prediction
-            for (int i = 0; i < Predictions.Count - 1; i++)
+            for (int i = 0; i < predictions.Count - 1; i++)
             {
-                WeatherInfo w = Predictions[i];
-                WeatherInfo wNext = Predictions[i + 1];
+                WeatherInfo w = predictions[i];
+                WeatherInfo wNext = predictions[i + 1];
 
                 // if wNext time < than w time then it is prediction from the next day -> add 24 to correctly calculate timespan
                 int timespan = wNext.startTime.Hour - w.startTime.Hour;
@@ -218 +178 @@
             }
 
             // last prediction
-            WeatherInfo wLast = Predictions[Predictions.Count - 1];
+            WeatherInfo wLast = predictions[predictions.Count - 1];
             TimeSpan endTimeW = new TimeSpan(24, 0, 0);
-            int timespanLast = 24 - wLast.startTime.Hour;
+            int timespanLast = endTimeW.Hours - wLast.startTime.Hour;
             wLast.intervalLength = timespanLast;
 
             // if start under sunset
@@ -378 +338 @@
                 }
 
                 // Console.WriteLine(weather.ToString());
-                Predictions.Add(weather);
+                predictions.Add(weather);
 
             }
 
@@ -441 +401 @@
             return res;
         }
 
-      
     }
 }