Merge pull request #143 from Tronald/develop

MGRS Parser Bug Fix

Author: Tronald

CoordinateSharp/CoordinateSharp.csproj

@@ -47,20 +47,20 @@ For more information, please contact Signature Group, LLC at this address: sales
     <TargetFrameworks>net40; netstandard1.3; netstandard1.4; netstandard2.0; netstandard2.1;</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Version>2.6.1.1</Version>
+    <Version>2.6.2.1</Version>
     <Authors>Signature Group, LLC</Authors>
     <Company />
     <PackageProjectUrl>https://github.com/Tronald/CoordinateSharp</PackageProjectUrl>
     <PackageLicenseUrl></PackageLicenseUrl>
     <Copyright>Copyright 2020</Copyright>
     <Description>A simple library designed to assist with geographic coordinate conversions, formatting and location based solar and lunar information.</Description>
-    <PackageReleaseNotes>Adds a strong named key to the assembly for strong named application compatability.</PackageReleaseNotes>
+    <PackageReleaseNotes>Fixes parser bug occurring with less precise UTM/MGRS coordinate strings.</PackageReleaseNotes>
     <PackageTags>CoordinateSharp Latitude Longitude Coordinates Geography Sun Moon Solar Lunar Time MGRS UTM Julian ECEF Sunset Sunrise Set Moonset Moonrise</PackageTags>
     <!-- <PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>-->
     <PackageLicenseFile>License.txt</PackageLicenseFile>    <PackageIconUrl></PackageIconUrl>
     <PackageId>CoordinateSharp</PackageId>
     <Title>CoordinateSharp</Title>
-    <AssemblyVersion>2.6.1.1</AssemblyVersion>
+    <AssemblyVersion>2.6.2.1</AssemblyVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <SignAssembly>true</SignAssembly>
     <PackageIcon>CoordinateSharpPNG.png</PackageIcon>

CoordinateSharp/Parsers/Coordinate Formats/MGRS.cs

@@ -46,6 +46,7 @@ Organizations or use cases that fall under the following conditions may receive
 using System.Text.RegularExpressions;
 using System.Linq;
 using System.Globalization;
+using System.Diagnostics;
 
 namespace CoordinateSharp
 {
@@ -82,7 +83,7 @@ private static bool TryMGRS(string s, out string[] mgrs)
                     string easting = eastingNorthing.Substring(0, (int)(eastingNorthing.Length / 2));
                     string northing = eastingNorthing.Substring((int)(eastingNorthing.Length / 2), (int)(eastingNorthing.Length / 2));
 
-                    mgrs = new string[] { longZone, latZone, identifier, easting, northing };
+                    mgrs = new string[] { longZone, latZone, identifier, easting.PadRight(5, '0'), northing.PadRight(5, '0') };
                     return true;
                 }
 
@@ -116,7 +117,9 @@ private static bool TryMGRS(string s, out string[] mgrs)
                 if (!double.TryParse(sA[3], NumberStyles.Any, CultureInfo.InvariantCulture, out northing))
                 { return false; }
 
-                mgrs = new string[] { zone.ToString(), zoneL, diagraph, easting.ToString(), northing.ToString() };
+                
+
+                mgrs = new string[] { zone.ToString(), zoneL, diagraph, sA[2].PadRight(5,'0'), sA[3].PadRight(5, '0') };
                 return true;
             }
             return false;
@@ -159,7 +162,8 @@ private static bool TryMGRS_Polar(string s, out string[] mgrs)
                     string easting = eastingNorthing.Substring(0, (int)(eastingNorthing.Length / 2));
                     string northing = eastingNorthing.Substring((int)(eastingNorthing.Length / 2), (int)(eastingNorthing.Length / 2));
 
-                    mgrs = new string[] { longZone, latZone, identifier, easting, northing };
+                    mgrs = new string[] { longZone, latZone, identifier, easting.PadRight(5, '0'), northing.PadRight(5, '0') };
+                
                     return true;
                 }
 
@@ -193,7 +197,8 @@ private static bool TryMGRS_Polar(string s, out string[] mgrs)
                 if (!double.TryParse(sA[3], NumberStyles.Any, CultureInfo.InvariantCulture, out northing))
                 { return false; }
 
-                mgrs = new string[] { zone.ToString(), zoneL, diagraph, easting.ToString(), northing.ToString() };
+                mgrs = new string[] { zone.ToString(), zoneL, diagraph, sA[2].PadRight(5, '0'), sA[3].PadRight(5, '0') };
+               
                 return true;
             }
             return false;

CoordinateSharp_TestProj/CoordinateSharp_TestProj.csproj.user

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+</Project>

CoordinateSharp_TestProj/Coordinate_Parser_Tests.cs

@@ -83,7 +83,14 @@ private static void Coordinate_Parses_Test()
             {
                 Pass.Write(lastType.Split(',')[0], pass);
             }
-
+            //MGRS LESS PRECISE PARSE
+            Console.WriteLine();
+            pass = true;
+            var precise = Coordinate.Parse("16REU6070");
+            if(precise.MGRS.ToString() != "16R EU 60000 70000") { pass = false; }
+            precise = Coordinate.Parse("ZBE6611");
+            if (precise.MGRS.ToString() != "Z BE 65999 11000") { pass = false; Debug.WriteLine(precise.MGRS); }
+            Pass.Write("\\MGRS Less Precise Parse", pass);
             //Attempt Forces Param
             pass = true;
             try