diff --git a/BaseGpsClient.cs b/BaseGpsClient.cs index 825ca02..aa4b53e 100644 --- a/BaseGpsClient.cs +++ b/BaseGpsClient.cs @@ -41,16 +41,6 @@ namespace GpsClient2 { #region Events Triggers protected virtual void OnGpsDataReceived(GpsDataEventArgs e) { - if (GpsInfo.CoordinateSystem == GpsCoordinateSystem.Lambert72) { - var x = 0.0d; - var y = 0.0d; - var h = 0.0d; - CoordinateConverterUtilities.GeoETRS89ToLambert72(e.Latitude, e.Longitude, 0, ref x, ref y, ref h); - e.CoordinateSystem = GpsCoordinateSystem.Lambert72; - e.Latitude = x; - e.Longitude = y; - } - GpsCallbackEvent?.Invoke(this, e); } diff --git a/CoordinateConverterUtilities.cs b/CoordinateConverterUtilities.cs deleted file mode 100644 index 9001009..0000000 --- a/CoordinateConverterUtilities.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Runtime.InteropServices; - -namespace GpsClient2 { - internal class CoordinateConverterUtilities { -#if WIN64 - private const string DllImport = @"plugins/ETRS89_LAMBERT_UTM_64bits.dll"; -#else - private const string DllImport = @"plugins/ETRS89_LAMBERT_UTM_32bits.dll"; -#endif - - #region Coordinate conversion functions using NGI DLL - - //Import the dll with the functions to calculate lambert coordinates - [DllImport(DllImport, SetLastError = true, CharSet = CharSet.Auto)] - public static extern int GeoETRS89ToLambert72(double Xi, double Yi, double Zi, ref double xo, ref double yo, ref double Ho); - - [DllImport(DllImport, SetLastError = true, CharSet = CharSet.Auto)] - public static extern int Lambert72ToLambert08(double Xi, double Yi, double Zi, ref double xo, ref double yo, ref double Ho); - - [DllImport(DllImport, SetLastError = true, CharSet = CharSet.Auto)] - public static extern int Lambert72ToGeoETRS89(double Xi, double Yi, double Zi, ref double xo, ref double yo, ref double Ho); - - #endregion - } -} diff --git a/GpsClient2.csproj b/GpsClient2.csproj index 9731c9f..0b46630 100644 --- a/GpsClient2.csproj +++ b/GpsClient2.csproj @@ -44,7 +44,6 @@ - @@ -65,13 +64,5 @@ - - - Always - - - Always - - \ No newline at end of file diff --git a/plugins/ETRS89_LAMBERT_UTM_32bits.dll b/plugins/ETRS89_LAMBERT_UTM_32bits.dll deleted file mode 100644 index 8b160af..0000000 Binary files a/plugins/ETRS89_LAMBERT_UTM_32bits.dll and /dev/null differ diff --git a/plugins/ETRS89_LAMBERT_UTM_64bits.dll b/plugins/ETRS89_LAMBERT_UTM_64bits.dll deleted file mode 100644 index e64d9a9..0000000 Binary files a/plugins/ETRS89_LAMBERT_UTM_64bits.dll and /dev/null differ