Merge pull request #21 from kevingoos/development

Release
kevingoos · Apr 24, 2018 · cd3a01f · cd3a01f
2 parents a5c6188 + 3631a59
commit cd3a01f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/GPS.NET/GPS.NET.sln b/GPS.NET/GPS.NET.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2037
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ghostware.GPS.NET", "Ghostware.GPS.NET\Ghostware.GPS.NET.csproj", "{CFBDB710-C75D-4DDF-94D2-8855FA6F9F07}"
 EndProject
@@ -70,4 +70,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6450ED75-69E6-4017-ACE0-C5BB0BC1076F}
+	EndGlobalSection
 EndGlobal
diff --git a/GPS.NET/Ghostware.GPS.NET.UnitTests/Converters/CoordinateConverterUtilitiesTests.cs b/GPS.NET/Ghostware.GPS.NET.UnitTests/Converters/CoordinateConverterUtilitiesTests.cs
@@ -7,13 +7,28 @@ namespace Ghostware.GPS.NET.UnitTests.Converters
     public class CoordinateConverterUtilitiesTests
     {
         [TestMethod]
-        public void CreateComPortGpsTypeTest()
+        public void GeoEtrs89ToLambert72Tests()
         {
             double x = 0;
             double y = 0;
             double z = 0;
             var result = CoordinateConverterUtilities.GeoETRS89ToLambert72(50.8991, 4.6157, 0, ref x, ref y, ref z);
             Assert.AreEqual(1, result);
+            Assert.AreEqual(167371.95591558915, x);
+            Assert.AreEqual(176557.58040618268, y);
+            Assert.AreEqual(-42.959737811999808, z);
+        }
+
+        [TestMethod]
+        public void Lambert72ToGeoEtrs89Tests()
+        {
+            double x = 0;
+            double y = 0;
+            double z = 0;
+            CoordinateConverterUtilities.Lambert72ToGeoETRS89(167371.95591558915, 176557.58040618268, -42.959737811999808, ref x, ref y, ref z);
+            Assert.AreEqual(50.8991, x, 0.0001);
+            Assert.AreEqual(4.6157, y, 0.0001);
+            Assert.AreEqual(0, z, 0.0001);
         }
     }
 }
diff --git a/GPS.NET/Ghostware.GPS.NET/Converters/CoordinateConverterUtilities.cs b/GPS.NET/Ghostware.GPS.NET/Converters/CoordinateConverterUtilities.cs
@@ -2,7 +2,7 @@
 
 namespace Ghostware.GPS.NET.Converters
 {
-    public class CoordinateConverterUtilities
+    internal class CoordinateConverterUtilities
     {
 #if WIN64
         private const string DllImport = @"plugins/ETRS89_LAMBERT_UTM_64bits.dll";

diff --git a/GPS.NET/Ghostware.GPS.NET/GPS.NET.nuspec b/GPS.NET/Ghostware.GPS.NET/GPS.NET.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Ghostware.GPS.NET</id>
-    <version>1.0.13</version>
+    <version>1.0.14</version>
     <title>Ghostware.GPS.NET</title>
     <authors>Kevin Goos</authors>
     <owners>Ghostware</owners>
@@ -18,10 +18,14 @@
       - Using the Windows location API. (Starting from windows 7)
     </description>
     <releaseNotes>
-	  v1.0.13:
+      v1.0.14:
+      --------
+      - Made CoordinateConverter class internal
+
+      v1.0.13:
       --------
       - Updated order of GPS status enum
-	  
+
       v1.0.12:
       --------
       - Temp fix for the new nmea messages

diff --git a/GPS.NET/Ghostware.GPS.NET/Properties/AssemblyInfo.cs b/GPS.NET/Ghostware.GPS.NET/Properties/AssemblyInfo.cs
@@ -13,6 +13,7 @@
 [assembly: AssemblyCopyright("Copyright © Infrabel 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: InternalsVisibleTo("Ghostware.GPS.NET.UnitTests")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from