Moving MapControl.GetPinchValues from shared to iOS and Android

pauldendulk · pauldendulk · commit a3ff0c5baa2e · 2018-06-25T17:48:24.000+02:00
diff --git a/Mapsui.UI.Android/MapControl.cs b/Mapsui.UI.Android/MapControl.cs
@@ -6,10 +6,12 @@
 using Android.OS;
 using Android.Util;
 using Android.Views;
+using Mapsui.Geometries.Utilities;
 using Mapsui.Logging;
 using Mapsui.Widgets;
 using SkiaSharp.Views.Android;
 using Math = System.Math;
+using Point = Mapsui.Geometries.Point;
 
 namespace Mapsui.UI.Android
 {
@@ -327,5 +329,29 @@ protected override void Dispose(bool disposing)
             Unsubscribe();
             base.Dispose(disposing);
         }
+
+        private static (Point centre, double radius, double angle) GetPinchValues(List<Point> locations)
+        {
+            if (locations.Count < 2)
+                throw new ArgumentException();
+
+            double centerX = 0;
+            double centerY = 0;
+
+            foreach (var location in locations)
+            {
+                centerX += location.X;
+                centerY += location.Y;
+            }
+
+            centerX = centerX / locations.Count;
+            centerY = centerY / locations.Count;
+
+            var radius = Algorithms.Distance(centerX, centerY, locations[0].X, locations[0].Y);
+
+            var angle = Math.Atan2(locations[1].Y - locations[0].Y, locations[1].X - locations[0].X) * 180.0 / Math.PI;
+
+            return (new Point(centerX, centerY), radius, angle);
+        }
     }
 }
diff --git a/Mapsui.UI.Shared/MapControl.cs b/Mapsui.UI.Shared/MapControl.cs
@@ -1,7 +1,5 @@
 ﻿using Mapsui.Geometries;
-using Mapsui.Geometries.Utilities;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Net;
 using Mapsui.Fetcher;
@@ -61,30 +59,6 @@ public void Unsubscribe()
             UnsubscribeFromMapEvents(_map);
         }
 
-        private static (Point centre, double radius, double angle) GetPinchValues(List<Point> locations)
-        {
-            if (locations.Count < 2)
-                throw new ArgumentException();
-
-            double centerX = 0;
-            double centerY = 0;
-
-            foreach (var location in locations)
-            {
-                centerX += location.X;
-                centerY += location.Y;
-            }
-
-            centerX = centerX / locations.Count;
-            centerY = centerY / locations.Count;
-
-            var radius = Algorithms.Distance(centerX, centerY, locations[0].X, locations[0].Y);
-
-            var angle = Math.Atan2(locations[1].Y - locations[0].Y, locations[1].X - locations[0].X) * 180.0 / Math.PI;
-
-            return (new Point(centerX, centerY), radius, angle);
-        }
-
         /// <summary>
         /// Subscribe to map events
         /// </summary>
diff --git a/Mapsui.UI.iOS/MapControl.cs b/Mapsui.UI.iOS/MapControl.cs
@@ -2,10 +2,12 @@
 using Foundation;
 using UIKit;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using CoreGraphics;
 using Mapsui.Geometries;
+using Mapsui.Geometries.Utilities;
 using Mapsui.Widgets;
 using SkiaSharp.Views.iOS;
 
@@ -258,5 +260,29 @@ protected override void Dispose(bool disposing)
             Unsubscribe();
             base.Dispose(disposing);
         }
+
+        private static (Point centre, double radius, double angle) GetPinchValues(List<Point> locations)
+        {
+            if (locations.Count < 2)
+                throw new ArgumentException();
+
+            double centerX = 0;
+            double centerY = 0;
+
+            foreach (var location in locations)
+            {
+                centerX += location.X;
+                centerY += location.Y;
+            }
+
+            centerX = centerX / locations.Count;
+            centerY = centerY / locations.Count;
+
+            var radius = Algorithms.Distance(centerX, centerY, locations[0].X, locations[0].Y);
+
+            var angle = Math.Atan2(locations[1].Y - locations[0].Y, locations[1].X - locations[0].X) * 180.0 / Math.PI;
+
+            return (new Point(centerX, centerY), radius, angle);
+        }
     }
 }
