✨ Overhaul 2020, adds Aurora support

donatmarko · Jan 14, 2020 · b5b024a · b5b024a
1 parent 866ea78
commit b5b024a
Show file tree

Hide file tree

Showing 7 changed files with 943 additions and 791 deletions.
diff --git a/AIPcoord/AIPcoord.csproj b/AIPcoord/AIPcoord.csproj
@@ -46,16 +46,16 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Coordinate.cs" />
-    <Compile Include="Form1.cs">
+    <Compile Include="frmMain.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <Compile Include="frmMain.Designer.cs">
+      <DependentUpon>frmMain.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="frmMain.resx">
+      <DependentUpon>frmMain.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

diff --git a/AIPcoord/Coordinate.cs b/AIPcoord/Coordinate.cs
@@ -265,7 +265,31 @@ public string ToString(string format, IFormatProvider formatProvider)
                     break;
 
                 case "WEBEYE":
-                    sb.AppendFormat(fi, "{0}:{1}", Math.Round(Latitude, 2), Math.Round(Longitude, 2));
+                    sb.AppendFormat(fi, "{0}:{1}", Math.Round(Latitude, 6), Math.Round(Longitude, 6));
+                    break;
+
+                case "AURORA_DMS14":
+                    this.GetDMS(out latDeg, out latMin, out latSec, out north, out lonDeg, out lonMin, out lonSec, out east);
+                    latSecInt = (int)latSec;
+                    latSecDec = (int)((latSec - latSecInt) * 1000);
+                    lonSecInt = (int)lonSec;
+                    lonSecDec = (int)((lonSec - lonSecInt) * 1000);
+
+                    sb.AppendFormat(fi, "{4}{0:000}.{1:00}.{2:00}.{3:000};{9}{5:000}.{6:00}.{7:00}.{8:000};", latDeg, latMin, latSecInt, latSecDec, (north ? "N" : "S"), lonDeg, lonMin, lonSecInt, lonSecDec, (east ? "E" : "W"));
+                    break;
+
+                case "AURORA_DMS11":
+                    this.GetDMS(out latDeg, out latMin, out latSec, out north, out lonDeg, out lonMin, out lonSec, out east);
+                    latSecInt = (int)latSec;
+                    latSecDec = (int)((latSec - latSecInt) * 1000);
+                    lonSecInt = (int)lonSec;
+                    lonSecDec = (int)((lonSec - lonSecInt) * 1000);
+
+                    sb.AppendFormat(fi, "{4}{0:000}{1:00}{2:00}{3:000};{9}{5:000}{6:00}{7:00}{8:000};", latDeg, latMin, latSecInt, latSecDec, (north ? "N" : "S"), lonDeg, lonMin, lonSecInt, lonSecDec, (east ? "E" : "W"));
+                    break;
+
+                case "AURORA_DEC":
+                    sb.AppendFormat(fi, "{0};{1};", Math.Round(Latitude, 8), Math.Round(Longitude, 8));
                     break;
 
                 case "D":

diff --git a/AIPcoord/Properties/AssemblyInfo.cs b/AIPcoord/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("AIPcoord")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Donat Marko")]
+[assembly: AssemblyCompany("Donat Marko - www.donatus.hu")]
 [assembly: AssemblyProduct("AIPcoord")]
-[assembly: AssemblyCopyright("Copyright © www.donatus.hu 2018")]
+[assembly: AssemblyCopyright("Copyright © Donat Marko, 2020.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]