update

Author: petesramek

src/PolylineAlgorithm/Coordinate.cs

@@ -63,16 +63,6 @@ public bool IsValid()
         => ICoordinateValidator.Default.Latitude.IsInRange(Latitude)
         && ICoordinateValidator.Default.Longitude.IsInRange(Longitude);
 
-    /// <summary>
-    /// Deconstructs this instance into its latitude and longitude components.
-    /// </summary>
-    /// <param name="latitude">The latitude component.</param>
-    /// <param name="longitude">The longitude component.</param>
-    public readonly void Deconstruct(out double latitude, out double longitude) {
-        latitude = Latitude;
-        longitude = Longitude;
-    }
-
     #region Overrides
 
     /// <inheritdoc />

src/PolylineAlgorithm/Internal/CoordinateVariance.cs

@@ -7,7 +7,7 @@
 
 [DebuggerDisplay($"{{{nameof(ToString)}(),nq}}")]
 [StructLayout(LayoutKind.Auto)]
-public struct CoordinateVariance {
+internal struct CoordinateVariance {
     private (int Latitude, int Longitude) _current = (0, 0);
 
     private CoordinateVariance(int latitude, int longitude) {
@@ -20,11 +20,11 @@ private CoordinateVariance(int latitude, int longitude) {
     public int Longitude { get; private set; }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void Next((int Latitude, int Longitude) next) {
-        Latitude = Variance(_current.Latitude, next.Latitude);
-        Longitude = Variance(_current.Longitude, next.Longitude);
+    public void Next(int latitude, int longitude) {
+        Latitude = Variance(_current.Latitude, latitude);
+        Longitude = Variance(_current.Longitude, longitude);
 
-        _current = next;
+        _current = (latitude, longitude);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/PolylineAlgorithm/PolylineDecoder.cs

@@ -9,7 +9,6 @@ namespace PolylineAlgorithm;
 using PolylineAlgorithm.Properties;
 using System;
 using System.Buffers;
-using System.Runtime.CompilerServices;
 
 
 /// <summary>
@@ -31,21 +30,21 @@ public IEnumerable<Coordinate> Decode(Polyline polyline) {
         ReadOnlySequence<char>.Enumerator enumerator = polyline.GetEnumerator();
 
         int position;
-        ReadOnlyMemory<char> buffer = enumerator.Current;
+        ReadOnlyMemory<char> sequence = enumerator.Current;
 
         while (enumerator.MoveNext()) {
             position = 0;
-            buffer = enumerator.Current;
+            sequence = enumerator.Current;
 
-            while (PolylineEncoding.Default.TryReadValue(ref latitude, ref buffer, ref position)
-                && PolylineEncoding.Default.TryReadValue(ref longitude, ref buffer, ref position)
+            while (PolylineEncoding.Default.TryReadValue(ref latitude, ref sequence, ref position)
+                && PolylineEncoding.Default.TryReadValue(ref longitude, ref sequence, ref position)
             ) {
                 yield return new(PolylineEncoding.Default.Denormalize(latitude), PolylineEncoding.Default.Denormalize(longitude));
             }
 
             consumed += position;
 
-            if (buffer.Length != position) {
+            if (sequence.Length != position) {
                 InvalidPolylineException.Throw(consumed);
             }
         }

src/PolylineAlgorithm/PolylineEncoder.cs

@@ -50,10 +50,10 @@ public Polyline Encode(IEnumerable<Coordinate> coordinates) {
 
         while (enumerator.MoveNext()) {
             variance
-                .Next((PolylineEncoding.Default.Normalize(enumerator.Current.Latitude), PolylineEncoding.Default.Normalize(enumerator.Current.Longitude)));
-            
+                .Next(PolylineEncoding.Default.Normalize(enumerator.Current.Latitude), PolylineEncoding.Default.Normalize(enumerator.Current.Longitude));
+
             if (asMultiSegment
-                && buffer.Length - position < PolylineEncoding.Default.GetCharCount(variance.Latitude) + PolylineEncoding.Default.GetCharCount(variance.Longitude)) {
+                && GetRemainingBufferSize(position, buffer.Length) < GetRequiredLength(variance)) {
                 builder
                     .Append(buffer[..position].ToString().AsMemory());
 
@@ -96,5 +96,11 @@ public Polyline Encode(IEnumerable<Coordinate> coordinates) {
             IEnumerable<Coordinate> enumerable => enumerable.Count(),
             _ => -1,
         };
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        static int GetRequiredLength(CoordinateVariance variance) => PolylineEncoding.Default.GetCharCount(variance.Latitude) + PolylineEncoding.Default.GetCharCount(variance.Longitude);
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        static int GetRemainingBufferSize(int position, int length) => length - position;
     }
 }