Skip to content

Commit cd3a01f

Browse files
authored
Merge pull request #21 from kevingoos/development
Release
2 parents a5c6188 + 3631a59 commit cd3a01f

File tree

5 files changed

+30
-7
lines changed

5 files changed

+30
-7
lines changed

GPS.NET/GPS.NET.sln

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27428.2037
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ghostware.GPS.NET", "Ghostware.GPS.NET\Ghostware.GPS.NET.csproj", "{CFBDB710-C75D-4DDF-94D2-8855FA6F9F07}"
77
EndProject
@@ -70,4 +70,7 @@ Global
7070
GlobalSection(SolutionProperties) = preSolution
7171
HideSolutionNode = FALSE
7272
EndGlobalSection
73+
GlobalSection(ExtensibilityGlobals) = postSolution
74+
SolutionGuid = {6450ED75-69E6-4017-ACE0-C5BB0BC1076F}
75+
EndGlobalSection
7376
EndGlobal

GPS.NET/Ghostware.GPS.NET.UnitTests/Converters/CoordinateConverterUtilitiesTests.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,28 @@ namespace Ghostware.GPS.NET.UnitTests.Converters
77
public class CoordinateConverterUtilitiesTests
88
{
99
[TestMethod]
10-
public void CreateComPortGpsTypeTest()
10+
public void GeoEtrs89ToLambert72Tests()
1111
{
1212
double x = 0;
1313
double y = 0;
1414
double z = 0;
1515
var result = CoordinateConverterUtilities.GeoETRS89ToLambert72(50.8991, 4.6157, 0, ref x, ref y, ref z);
1616
Assert.AreEqual(1, result);
17+
Assert.AreEqual(167371.95591558915, x);
18+
Assert.AreEqual(176557.58040618268, y);
19+
Assert.AreEqual(-42.959737811999808, z);
20+
}
21+
22+
[TestMethod]
23+
public void Lambert72ToGeoEtrs89Tests()
24+
{
25+
double x = 0;
26+
double y = 0;
27+
double z = 0;
28+
CoordinateConverterUtilities.Lambert72ToGeoETRS89(167371.95591558915, 176557.58040618268, -42.959737811999808, ref x, ref y, ref z);
29+
Assert.AreEqual(50.8991, x, 0.0001);
30+
Assert.AreEqual(4.6157, y, 0.0001);
31+
Assert.AreEqual(0, z, 0.0001);
1732
}
1833
}
1934
}

GPS.NET/Ghostware.GPS.NET/Converters/CoordinateConverterUtilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Ghostware.GPS.NET.Converters
44
{
5-
public class CoordinateConverterUtilities
5+
internal class CoordinateConverterUtilities
66
{
77
#if WIN64
88
private const string DllImport = @"plugins/ETRS89_LAMBERT_UTM_64bits.dll";

GPS.NET/Ghostware.GPS.NET/GPS.NET.nuspec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>Ghostware.GPS.NET</id>
5-
<version>1.0.13</version>
5+
<version>1.0.14</version>
66
<title>Ghostware.GPS.NET</title>
77
<authors>Kevin Goos</authors>
88
<owners>Ghostware</owners>
@@ -18,10 +18,14 @@
1818
- Using the Windows location API. (Starting from windows 7)
1919
</description>
2020
<releaseNotes>
21-
v1.0.13:
21+
v1.0.14:
22+
--------
23+
- Made CoordinateConverter class internal
24+
25+
v1.0.13:
2226
--------
2327
- Updated order of GPS status enum
24-
28+
2529
v1.0.12:
2630
--------
2731
- Temp fix for the new nmea messages

GPS.NET/Ghostware.GPS.NET/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
[assembly: AssemblyCopyright("Copyright © Infrabel 2017")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
16+
[assembly: InternalsVisibleTo("Ghostware.GPS.NET.UnitTests")]
1617

1718
// Setting ComVisible to false makes the types in this assembly not visible
1819
// to COM components. If you need to access a type in this assembly from

0 commit comments

Comments
 (0)