Fixed buf in adding ticks to Epoch

Author: reed

One_Sgp4/One_Sgp4.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Reed</Authors>
     <Company>1 Man Projects</Company>
     <Description>This library calculates the orbits of satellites via TLEs data from the web. Other functions for coordination transformation, time calculations and the calculation of contact windows depending on the observers coordinates on earth are also available.</Description>
@@ -20,11 +20,14 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;netstandard2.0;net40;net45</TargetFrameworks>
     <Version>1.0.11</Version>
-    <PackageReleaseNotes>Included Net 4.0 and Net 4.5 as TargetFrameworks</PackageReleaseNotes>
+    <PackageReleaseNotes>Fixed minor conversion Issues with Date time</PackageReleaseNotes>
     <AssemblyVersion>1.0.11.0</AssemblyVersion>
     <PackageLicenseExpression />
     <PackageLicenseFile>license.txt</PackageLicenseFile>
     <FileVersion>1.0.11.0</FileVersion>
+    <Product>One_Sgp4</Product>
+    <PackageId>One_Sgp4</PackageId>
+    <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 
   <ItemGroup>

One_Sgp4/ground/Pass.cs

@@ -99,7 +99,7 @@ public PassDetail getPassDetailOfMaxElevation()
         */
         public override string ToString()
         {
-            return string.Format("{0}:\nStart: {1}\nMax Elevation: {2}\nEnd: {3}", start.time.getDateToString(), start.ToString(), maxElevation.ToString(), end.ToString());
+            return string.Format("{0}:\nStart: {1}\nMax Elevation: {2}\nEnd: {3}", start.time.ToString(), start.ToString(), maxElevation.ToString(), end.ToString());
         }
     }
 }

One_Sgp4/time/EpochTime.cs

@@ -40,7 +40,7 @@ public class EpochTime : IComparable<EpochTime>
         private double epoch; //!< double epoch of the Date
 
         private const double secToDay = 86400.0; //!< double constant seconds of a day
-        private int days = 365; //!< int days in the year
+        private const int days = 365; //!< int days in the year
 
         private const double twoPi = 2.0 * Math.PI; //!< double constant two Pi
         public const double toRadians = Math.PI / 180.0; //!< double constant converstion to radians
@@ -216,7 +216,7 @@ public override string ToString()
             time = (time - hour) * 60.0;
             int min = Convert.ToInt32(Math.Floor(time));
             int sec = Convert.ToInt32 ((time - min) * 60.0 );
-            string date = getDay() + "." + getMonth().ToString("00") + "." + getYear() + "-" + hour.ToString("00") + ":" +
+            string date = getDay().ToString("00") + "." + getMonth().ToString("00") + "." + getYear() + "-" + hour.ToString("00") + ":" +
                           min.ToString("00") + ":" +
                           sec.ToString("00");
             return date;
@@ -241,6 +241,10 @@ private void dayToDate(int year, double epoch)
                     year = year + 1900;
             }
             int dayOfYear = Convert.ToInt32(Math.Floor(epoch));
+            if (dayOfYear == 0)
+            {
+                dayOfYear = 1;
+            }
 
             int[] months = new int[12] {31,28,31,30,31,30,31,31,30,31,30,31};
             if( year % 4 == 0)
@@ -278,6 +282,7 @@ private void convertEpochToTime()
             time = (time - hour) * 60.0;
             minutes = Convert.ToInt32(Math.Floor(time));
             seconds = (time - minutes) * 60.0;
+            dayToDate(this.year, this.epoch);
         }
 
         //! adds an tick in seconds on current time
@@ -290,17 +295,15 @@ private void convertEpochToTime()
         public void addTick(double tick)
         {
             epoch = epoch + (tick / secToDay );
+            int daysInYear = days;
             if (year % 4 == 0)
             {
-                days = 366;
-            }
-            else
-            {
-                days = 365;
+                daysInYear = days + 1;
             }
-            if(epoch >= days + 1)
+            if(epoch >= daysInYear + 1)
             {
-                epoch = epoch % 1;
+                epoch = epoch - daysInYear;
+                //epoch = epoch % 1;
                 year++;
             }
             convertEpochToTime();
@@ -490,8 +493,7 @@ public override bool Equals(object obj)
                    year == time.year &&
                    month == time.month &&
                    day == time.day &&
-                   epoch == time.epoch &&
-                   days == time.days;
+                   epoch == time.epoch;
         }
 
         //! GetHaschCode Operator

Test/EpochTimeTest.cs

@@ -97,5 +97,17 @@ public void TestJulianDate(int yyyy, int MM, int dd, int hh, int mm, int ss, dou
             double etJul = et.toJulianDate();
             Assert.That(etJul, Is.InRange(julianDate-e,julianDate+e));
         }
+
+        
+        [TestCase(1999,4,22,12,45,30, 3 * 86400.0, "25.04.1999-12:45:30")]
+        [TestCase(1999, 12, 29, 12, 00, 00, 6 * 86400.0, "04.01.2000-12:00:00")]
+        [TestCase(2020, 12, 29, 12, 00, 00, 6 * 86400.0, "04.01.2021-12:00:00")]
+        [TestCase(2018, 11, 20, 05, 45, 33, 5 * 86400.0, "25.11.2018-05:45:33")]
+        public void TestToString(int yyyy, int MM, int dd, int hh, int mm, int ss, double ticksToAdd, string result)
+        {
+            EpochTime epoch = new EpochTime(hh, mm, ss, yyyy, MM, dd);
+            epoch.addTick(ticksToAdd);
+            Assert.AreEqual(result, epoch.ToString());
+        }
     }
 }