Merge pull request #245 from Tronald/develop

3.1.1.1

Author: Tronald

CoordinateSharp.Magnetic/CoordinateSharp.Magnetic.csproj

@@ -44,24 +44,24 @@ For more information, please contact Signature Group, LLC at this address: sales
 -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40; netstandard1.3; netstandard1.4; netstandard2.0; netstandard2.1; net50; net60; net70; net80</TargetFrameworks>
+    <TargetFrameworks>net40; netstandard1.3; netstandard1.4; netstandard2.0; netstandard2.1; net50; net60; net70; net80; net90</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Version>1.1.15.0</Version>
+    <Version>1.1.16.0</Version>
     <Authors>Signature Group, LLC</Authors>
     <Company />
     <PackageProjectUrl>https://github.com/Tronald/CoordinateSharp</PackageProjectUrl>
     <PackageLicenseUrl></PackageLicenseUrl>
     <Copyright>Copyright 2024</Copyright>
     <Description>CoordinateSharp magnetic data extensions.</Description>
-    <PackageReleaseNotes>-Maps to latest CoordinateSharp version.</PackageReleaseNotes>
+    <PackageReleaseNotes>-Adds .NET 9 support</PackageReleaseNotes>
     <PackageTags>CoordinateSharp Latitude Longitude Coordinates Geography Magnetic Declination</PackageTags>
     <!-- <PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>-->
     <PackageLicenseFile>License.txt</PackageLicenseFile>
     <PackageIconUrl></PackageIconUrl>
     <PackageId>CoordinateSharp.Magnetic</PackageId>
     <Title>CoordinateSharp.Magnetic</Title>
-    <AssemblyVersion>1.1.15.0</AssemblyVersion>
+    <AssemblyVersion>1.1.16.0</AssemblyVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <SignAssembly>true</SignAssembly>
     <PackageIcon>128x128.png</PackageIcon>

CoordinateSharp/Celestial/Celestial.Methods.cs

@@ -167,8 +167,7 @@ internal Celestial(bool hasCalcs)
 
         //Creates empty properties
         private void Create_Properties()
-        {
-            astrologicalSigns = new AstrologicalSigns(); //REMOVE WITH ZODIAC REMOVAL
+        {          
             almanacMoonName = new AlmanacMoonName();
             lunarEclipse = new LunarEclipse();
             solarEclipse = new SolarEclipse();
@@ -222,16 +221,10 @@ internal void CalculateCelestialTime(double lat, double longi, DateTime date, Ea
                 }
             }
 
-            if (el.Extensions.Lunar_Cycle || el.Extensions.Zodiac || el.Extensions.Lunar_Eclipse)
+            if (el.Extensions.Lunar_Cycle || el.Extensions.Lunar_Eclipse)
             {
                 MoonCalc.GetMoonIllumination(date, this, lat, longi, el, offset);
-            }
-
-            if (el.Extensions.Zodiac)
-            {
-                SunCalc.CalculateZodiacSign(date, this);
-                MoonCalc.GetMoonSign(date, this);
-            }
+            }        
 
             if (el.Extensions.Lunar_Cycle || el.Extensions.Solar_Cycle)
             {
@@ -266,8 +259,7 @@ private void Local_Convert(Coordinate c, double offset, Celestial_EagerLoad el)
 
                 Perigee.ConvertTo_Local_Time(offset);
                 Apogee.ConvertTo_Local_Time(offset);
-                LunarEclipse.ConvertTo_LocalTime(offset);
-                MoonCalc.GetMoonSign(c.GeoDate.AddHours(offset), this);
+                LunarEclipse.ConvertTo_LocalTime(offset);            
             }
 
             ////Solar
@@ -278,8 +270,7 @@ private void Local_Convert(Coordinate c, double offset, Celestial_EagerLoad el)
                 AdditionalSolarTimes.Convert_To_Local_Time(offset);
 
                 //Eclipse
-                SolarEclipse.ConvertTo_LocalTime(offset);
-                SunCalc.CalculateZodiacSign(c.GeoDate.AddHours(offset), this);
+                SolarEclipse.ConvertTo_LocalTime(offset);             
             }
         }
 

CoordinateSharp/Celestial/Celestial.Model.cs

@@ -83,7 +83,7 @@ public partial class Celestial
         internal Perigee perigee;
         internal Apogee apogee;
         internal AdditionalSolarTimes additionalSolarTimes;
-        internal AstrologicalSigns astrologicalSigns;
+      
         internal AlmanacMoonName almanacMoonName;
         internal SolarEclipse solarEclipse;
         internal LunarEclipse lunarEclipse;
@@ -262,15 +262,7 @@ public partial class Celestial
         /// <remarks>Contains dawn, dusk and twilight times.</remarks>
         public AdditionalSolarTimes AdditionalSolarTimes { get { return additionalSolarTimes; } }
 
-        /// <summary>
-        /// Astrological signs based on the provided date.
-        /// </summary>
-        /// <remarks>
-        /// Contains zodiac, moon sign and moon name during full moon events.
-        /// </remarks>       
-        [Obsolete("Astrological sign calculations have been deprecated and are being removed from CoordinateSharp. Moon names will still be available via the " +
-        "AlmanacMoonName class contained within the CelestialInfo class.")]
-        public AstrologicalSigns AstrologicalSigns { get { return astrologicalSigns; } }
+     
 
         /// <summary>
         /// Farmers Almanac moon names