From 3f8a7d4b8f4ebd5b54be548b27a8510db3857aa1 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mn@iter.dk>
Date: Sun, 2 Aug 2020 20:37:15 -0700
Subject: [PATCH] minor tweaks

---
 src/NmeaParser/Gnss/Ntrip/Client.cs           | 32 +++++++++++++++----
 src/SampleApp.WinDesktop/NtripView.xaml.cs    |  6 +++-
 .../PointPlotView.xaml.cs                     | 20 +++++-------
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/NmeaParser/Gnss/Ntrip/Client.cs b/src/NmeaParser/Gnss/Ntrip/Client.cs
index 0a1aeb1..1097c14 100644
--- a/src/NmeaParser/Gnss/Ntrip/Client.cs
+++ b/src/NmeaParser/Gnss/Ntrip/Client.cs
@@ -132,18 +132,21 @@ namespace NmeaParser.Gnss.Ntrip
             if (string.IsNullOrWhiteSpace(mountPoint))
                 throw new ArgumentException(nameof(mountPoint));
             
-            var sckt = Request(mountPoint);
-            return new NtripDataStream(sckt);
+            return new NtripDataStream(() => Request(mountPoint));
         }
 
         private class NtripDataStream : System.IO.Stream
         {
+            private Func<Socket> m_openSocketAction;
             private Socket m_socket;
-            public NtripDataStream(Socket socket)
+
+            public NtripDataStream(Func<Socket> openSocketAction)
             {
-                m_socket = socket;
+                m_openSocketAction = openSocketAction;
+                m_socket = openSocketAction();
             }
-            public override bool CanRead => true;
+
+            public override bool CanRead => m_socket.Connected;
 
             public override bool CanSeek => false;
 
@@ -158,6 +161,14 @@ namespace NmeaParser.Gnss.Ntrip
 
             public override int Read(byte[] buffer, int offset, int count)
             {
+                if (isDiposed)
+                    throw new ObjectDisposedException("NTRIP Stream");
+                if(!m_socket.Connected)
+                {
+                    // reconnect
+                    m_socket.Dispose();
+                    m_socket = m_openSocketAction();
+                }
                 int read = m_socket.Receive(buffer, offset, count, SocketFlags.None);
                 position += read;
                 return read;
@@ -168,6 +179,14 @@ namespace NmeaParser.Gnss.Ntrip
                 TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
                 if (cancellationToken.CanBeCanceled)
                     cancellationToken.Register(() => tcs.TrySetCanceled());
+                if (isDiposed)
+                    throw new ObjectDisposedException("NTRIP Stream");
+                if (!m_socket.Connected)
+                {
+                    // reconnect
+                    m_socket.Dispose();
+                    m_socket = m_openSocketAction();
+                }
                 m_socket.BeginReceive(buffer, offset, count, SocketFlags.None, ReceiveCallback, tcs);
                 return tcs.Task;
             }
@@ -195,10 +214,11 @@ namespace NmeaParser.Gnss.Ntrip
             public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
             protected override void Dispose(bool disposing)
             {
+                isDiposed = true;
                 m_socket.Dispose();
                 base.Dispose(disposing);
             }
-
+            private bool isDiposed;
             public override int ReadTimeout { get => m_socket.ReceiveTimeout; set => m_socket.ReceiveTimeout = value; }
         }
     }
diff --git a/src/SampleApp.WinDesktop/NtripView.xaml.cs b/src/SampleApp.WinDesktop/NtripView.xaml.cs
index 33284f3..9911533 100644
--- a/src/SampleApp.WinDesktop/NtripView.xaml.cs
+++ b/src/SampleApp.WinDesktop/NtripView.xaml.cs
@@ -69,7 +69,11 @@ namespace SampleApp.WinDesktop
                     }
                     catch (System.Exception ex)
                     {
-                        Debugger.Break();
+                        if(!stream.CanRead)
+                        {
+                            // TODO: Restart stream
+                            return;
+                        }
                     }
                     var device = MainWindow.currentDevice;
                     if (device != null && device.CanWrite)
diff --git a/src/SampleApp.WinDesktop/PointPlotView.xaml.cs b/src/SampleApp.WinDesktop/PointPlotView.xaml.cs
index 4148875..709030f 100644
--- a/src/SampleApp.WinDesktop/PointPlotView.xaml.cs
+++ b/src/SampleApp.WinDesktop/PointPlotView.xaml.cs
@@ -105,12 +105,10 @@ namespace SampleApp.WinDesktop
             if (autoFit)
             {
                 maxDif = distances.Max();
-                if (maxDif < .1)
-                    maxDif = .1;
-                if (maxDif < .25)
-                    maxDif = .25;
-                else if (maxDif < .5)
-                    maxDif = .5;
+                if (maxDif < 0.05)
+                    maxDif = 0.05;
+                else if (maxDif < 1)
+                    maxDif = Math.Ceiling(maxDif * 10) / 10d;
                 else
                     maxDif = Math.Ceiling(maxDif);
                 currentScale = maxDif / (Math.Min(size.Width, size.Height) * .5);
@@ -253,12 +251,10 @@ namespace SampleApp.WinDesktop
                 maxDif = e.Delta < 0 ? maxDif * 2 : maxDif / 2;
             else
                 maxDif = e.Delta < 0 ? maxDif + 1 : maxDif - 1;
-            if (maxDif < .1)
-                maxDif = .1;
-            if (maxDif < .25)
-                maxDif = .25;
-            else if (maxDif < .5)
-                maxDif = .5;
+            if (maxDif < 0.05)
+                maxDif = 0.05;
+            else if (maxDif < 1)
+                maxDif = Math.Ceiling(maxDif * 10) / 10d;
             else
                 maxDif = Math.Ceiling(maxDif);
             currentScale = maxDif / (Math.Min(size.Width, size.Height) * .5);