Revize 8a243ab2

re #8962 Fixing bugs in JsonParser.EncompassSunriseSetTimes

Server/ServerApp/WeatherPredictionParser/JsonParser.cs

@@ -189 +189 @@
             {
                 WeatherInfo w = Predictions[i];
                 WeatherInfo wNext = Predictions[i + 1];
+                DateTime sunrise = sunriseTime[index];
+                DateTime sunset = sunsetTime[index];
+
 
                 // 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;
+                bool intoTwo = false;
                 if (wNext.startTime.Hour < w.startTime.Hour)
                 {
+                    intoTwo = true;
                     timespan = (wNext.startTime.Hour + 24) - w.startTime.Hour;
                 }
                 
                 w.intervalLength = timespan;
+                TimeSpan endTime = new TimeSpan(w.startTime.TimeOfDay.Hours + timespan, w.startTime.TimeOfDay.Minutes, 0);
 
                 // if start under sunset
                 if (w.startTime.TimeOfDay > sunsetTime[index].TimeOfDay)
-                    w.condition = WeatherConditions.Dark;
+                {
+                    // when is end - if end after next sunrise need to compute the extent of dark
+                    if (intoTwo && endTime > sunriseTime[index+1].TimeOfDay)
+                    {
+                        double howMuch = ((endTime.Hours * 60 + endTime.Minutes) - (sunriseTime[index + 1].Hour * 60 + sunriseTime[index + 1].Minute)) / 60.0;
+                        howMuch = w.intervalLength - howMuch;
+
+                        if (howMuch >= timespan / 2.0)
+                            w.condition = WeatherConditions.Dark;
+                    }
+                    else
+                        w.condition = WeatherConditions.Dark;
+                }
 
                 // if start under sunrise
                 if (w.startTime.TimeOfDay < sunriseTime[index].TimeOfDay)
                 {
                     double howMuch = ((sunriseTime[index].Hour * 60 + sunriseTime[index].Minute) - (w.startTime.Hour * 60 + w.startTime.Minute)) / 60.0;
+                    if (endTime > sunset.TimeOfDay)
+                        howMuch += ((w.startTime.Hour * 60 + w.startTime.Minute) - (sunset.Hour * 60 + sunset.Minute)) / 60.0;
 
                     if (howMuch >= timespan / 2.0)
                         w.condition = WeatherConditions.Dark;
                 }
 
-                // if start under sunrise
-                TimeSpan endTime = new TimeSpan(w.startTime.TimeOfDay.Hours + timespan, w.startTime.TimeOfDay.Minutes, 0);
-                if (endTime > sunsetTime[index].TimeOfDay)
+                // if end over sunset
+                else if (endTime > sunsetTime[index].TimeOfDay)
                 {
                     double howMuch = ((endTime.Hours * 60 + endTime.Minutes) - (sunsetTime[index].Hour * 60 + sunsetTime[index].Minute)) / 60.0;
 
@@ -228 +247 @@
 
             // last prediction
             WeatherInfo wLast = Predictions[Predictions.Count - 1];
-            TimeSpan endTimeW = new TimeSpan(24, 0, 0);
+            TimeSpan endTimeW = new TimeSpan(23, 59, 59);
             int timespanLast = 24 - wLast.startTime.Hour;
             wLast.intervalLength = timespanLast;
 
@@ -240 +259 @@
             if (wLast.startTime.TimeOfDay < sunriseTime[sunriseTime.Count - 1].TimeOfDay)
             {
                 double howMuch = ((sunriseTime[sunriseTime.Count - 1].Hour * 60 + sunriseTime[sunriseTime.Count - 1].Minute) - (wLast.startTime.Hour * 60 + wLast.startTime.Minute)) / 60.0;
+                if (endTimeW > sunsetTime[sunriseTime.Count - 1].TimeOfDay)
+                    howMuch += ((wLast.startTime.Hour * 60 + wLast.startTime.Minute) - (sunsetTime[sunriseTime.Count - 1].Hour * 60 + sunsetTime[sunriseTime.Count - 1].Minute)) / 60.0;
 
                 if (howMuch >= timespanLast / 2.0)
                     wLast.condition = WeatherConditions.Dark;