Cleanup of global usings

MapControl/Avalonia/DependencyPropertyHelper.Avalonia.cs

@@ -1,4 +1,7 @@
-using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Data;
+using System;
 
 #pragma warning disable AVP1001
 

MapControl/Avalonia/ImageLoader.Avalonia.cs

@@ -1,4 +1,8 @@
-using System;
+using Avalonia;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 

MapControl/Avalonia/LocationAnimator.Avalonia.cs

@@ -1,4 +1,6 @@
-namespace MapControl
+using Avalonia.Animation;
+
+namespace MapControl
 {
     public class LocationAnimator : InterpolatingAnimator<Location>
     {

MapControl/Avalonia/Map.Avalonia.cs

@@ -1,4 +1,6 @@
-using System;
+using Avalonia;
+using Avalonia.Input;
+using System;
 
 namespace MapControl
 {

MapControl/Avalonia/MapBase.Avalonia.cs

@@ -1,29 +1,16 @@
-global using Avalonia;
+global using DependencyProperty = Avalonia.AvaloniaProperty;
-global using Avalonia.Animation;
-global using Avalonia.Animation.Easings;
-global using Avalonia.Controls;
-global using Avalonia.Controls.Documents;
-global using Avalonia.Data;
-global using Avalonia.Data.Converters;
-global using Avalonia.Input;
-global using Avalonia.Interactivity;
-global using Avalonia.Media;
-global using Avalonia.Media.Imaging;
-global using Avalonia.Platform;
-global using Avalonia.Styling;
-global using Avalonia.Threading;
-global using DependencyObject = Avalonia.AvaloniaObject;
-global using DependencyProperty = Avalonia.AvaloniaProperty;
 global using FrameworkElement = Avalonia.Controls.Control;
-global using HorizontalAlignment = Avalonia.Layout.HorizontalAlignment;
-global using VerticalAlignment = Avalonia.Layout.VerticalAlignment;
 global using Brush = Avalonia.Media.IBrush;
 global using ImageSource = Avalonia.Media.IImage;
-global using BitmapSource = Avalonia.Media.Imaging.Bitmap;
-global using PathFigureCollection = Avalonia.Media.PathFigures;
-global using PointCollection = System.Collections.Generic.List<Avalonia.Point>;
 global using PropertyPath = System.String;
-
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
+using Avalonia.Controls;
+using Avalonia.Controls.Documents;
+using Avalonia.Data;
+using Avalonia.Media;
+using Avalonia.Styling;
 using System.Threading;
 using System.Threading.Tasks;
 

MapControl/Avalonia/MapContentControl.Avalonia.cs

@@ -1,4 +1,7 @@
-namespace MapControl
+using Avalonia;
+using Avalonia.Controls;
+
+namespace MapControl
 {
     /// <summary>
     /// ContentControl placed on a MapPanel at a geographic location specified by the Location property.

MapControl/Avalonia/MapGraticule.Avalonia.cs

@@ -1,4 +1,8 @@
-using System.Collections.Generic;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Documents;
+using Avalonia.Media;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 

MapControl/Avalonia/MapImageLayer.Avalonia.cs

@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using Avalonia.Animation;
+using Avalonia.Styling;
+using System.Threading.Tasks;
 
 namespace MapControl
 {

MapControl/Avalonia/MapItem.Avalonia.cs

@@ -1,4 +1,8 @@
-namespace MapControl
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+
+namespace MapControl
 {
     public partial class MapItem
     {

MapControl/Avalonia/MapItemsControl.Avalonia.cs

@@ -1,5 +1,8 @@
-using Avalonia.Controls.Presenters;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Media;
 
 namespace MapControl
 {
@@ -40,13 +43,13 @@ namespace MapControl
         protected override void PrepareContainerForItemOverride(Control container, object item, int index)
         {
             base.PrepareContainerForItemOverride(container, item, index);
-            PrepareContainer(container, item);
+            PrepareContainer((MapItem)container, item);
         }
 
         protected override void ClearContainerForItemOverride(Control container)
         {
             base.ClearContainerForItemOverride(container);
-            ClearContainer(container);
+            ClearContainer((MapItem)container);
         }
 
         internal void UpdateSelection(MapItem mapItem, PointerEventArgs e)

MapControl/Avalonia/MapPanel.Avalonia.cs

@@ -1,4 +1,8 @@
-namespace MapControl
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+
+namespace MapControl
 {
     public partial class MapPanel
     {

MapControl/Avalonia/MapPath.Avalonia.cs

@@ -1,4 +1,6 @@
-using Avalonia.Controls.Shapes;
+using Avalonia;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
 
 namespace MapControl
 {

MapControl/Avalonia/MapPolypoint.Avalonia.cs

@@ -1,4 +1,6 @@
-using System;
+using Avalonia;
+using Avalonia.Media;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;

MapControl/Avalonia/PushpinBorder.Avalonia.cs

@@ -1,4 +1,7 @@
-using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+using System;
 
 namespace MapControl
 {

MapControl/Avalonia/Tile.Avalonia.cs

@@ -1,4 +1,7 @@
-using System;
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Styling;
+using System;
 
 namespace MapControl
 {

MapControl/Avalonia/TileImageLoader.Avalonia.cs

@@ -1,4 +1,6 @@
-using System;
+using Avalonia.Media;
+using Avalonia.Threading;
+using System;
 using System.Threading.Tasks;
 
 namespace MapControl

MapControl/Avalonia/ViewTransform.Avalonia.cs

@@ -1,4 +1,6 @@
-namespace MapControl
+using Avalonia;
+
+namespace MapControl
 {
     public partial class ViewTransform
     {

MapControl/Shared/AutoEquirectangularProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/AzimuthalEquidistantProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/AzimuthalProjection.cs

@@ -1,5 +1,7 @@
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/DispatcherTimerHelper.cs

@@ -6,6 +6,9 @@ using Windows.UI.Xaml;
 #elif WINUI
 global using DispatcherTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
 using Microsoft.UI.Xaml;
+#elif AVALONIA
+using DependencyObject = Avalonia.AvaloniaObject;
+using Avalonia.Threading;
 #endif
 using System;
 

MapControl/Shared/EquirectangularProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/FilePath.cs

@@ -1,13 +1,15 @@
-namespace MapControl
+using System.IO;
+
+namespace MapControl
 {
     public static class FilePath
     {
         public static string GetFullPath(string path)
         {
 #if NET6_0_OR_GREATER
-            return System.IO.Path.GetFullPath(path, System.AppDomain.CurrentDomain.BaseDirectory);
+            return Path.GetFullPath(path, System.AppDomain.CurrentDomain.BaseDirectory);
 #else
-            return System.IO.Path.GetFullPath(path);
+            return Path.GetFullPath(path);
 #endif
         }
     }

MapControl/Shared/GeoImage.cs

@@ -22,7 +22,11 @@ using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Shape = Microsoft.UI.Xaml.Shapes.Shape;
 #elif AVALONIA
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
 using Shape = Avalonia.Controls.Shapes.Shape;
+using BitmapSource = Avalonia.Media.Imaging.Bitmap;
 #endif
 
 namespace MapControl
@@ -43,6 +47,26 @@ namespace MapControl
                 LatLonBox = projection != null
                     ? new LatLonBox(projection.MapToBoundingBox(new Rect(p1, p2)))
                     : new LatLonBox(p1.Y, p1.X, p2.Y, p2.X);
+
+#if DEBUG && NET6_0_OR_GREATER && !AVALONIA
+                System.Diagnostics.Debug.WriteLine(
+                    string.Create(CultureInfo.InvariantCulture,
+                    $"proj  {projection?.CrsId ?? "-"}\n" +
+                    $"SizeX {bitmap.PixelWidth}\n" +
+                    $"SizeY {bitmap.PixelHeight}\n" +
+                    $"M11   {transform.M11}\n" +
+                    $"M22   {transform.M22}\n" +
+                    $"OfsX  {transform.OffsetX}\n" +
+                    $"OfsY  {transform.OffsetY}\n" +
+                    $"X1    {p1.X}\n" +
+                    $"Y1    {p1.Y}\n" +
+                    $"X2    {p2.X}\n" +
+                    $"Y2    {p2.Y}\n" +
+                    $"West  {LatLonBox.West}\n" +
+                    $"South {LatLonBox.South}\n" +
+                    $"East  {LatLonBox.East}\n" +
+                    $"North {LatLonBox.North}\n"));
+#endif
             }
 
             public BitmapSource BitmapSource { get; }
@@ -119,7 +143,7 @@ namespace MapControl
 
         private static async Task<GeoBitmap> LoadGeoBitmap(string sourcePath)
         {
-            var ext = Path.GetExtension(sourcePath);
+            var ext = System.IO.Path.GetExtension(sourcePath);
 
             if (ext.Length >= 4)
             {

MapControl/Shared/GnomonicProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/GroundOverlay.cs

@@ -19,6 +19,9 @@ using Windows.UI.Xaml.Media;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia.Controls;
+using Avalonia.Media;
 #endif
 
 namespace MapControl

MapControl/Shared/Map.cs

@@ -5,6 +5,8 @@ using System.Windows;
 using Windows.UI.Xaml;
 #elif WINUI
 using Microsoft.UI.Xaml;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/MapBase.MapLayer.cs

@@ -12,6 +12,8 @@ using Windows.UI.Xaml.Media;
 #elif WINUI
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia.Controls;
 #endif
 
 namespace MapControl

MapControl/Shared/MapBase.cs

@@ -8,6 +8,8 @@ using Windows.UI.Xaml.Media;
 #elif WINUI
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/MapBorderPanel.cs

@@ -4,6 +4,8 @@ using System.Windows;
 using Windows.UI.Xaml;
 #elif WINUI
 using Microsoft.UI.Xaml;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/MapGraticule.cs

@@ -11,6 +11,10 @@ using Windows.UI.Xaml.Media;
 #elif WINUI
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia;
+using Avalonia.Media;
+using PathFigureCollection = Avalonia.Media.PathFigures;
 #endif
 
 namespace MapControl

MapControl/Shared/MapImageLayer.cs

@@ -14,6 +14,11 @@ using Windows.UI.Xaml.Media;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Threading;
 #endif
 
 namespace MapControl

MapControl/Shared/MapItem.cs

@@ -7,10 +7,11 @@ using Windows.UI.Xaml.Media;
 #elif WINUI
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia.Controls;
+using Avalonia.Media;
 #endif
 
-using System;
-
 namespace MapControl
 {
     /// <summary>

MapControl/Shared/MapItemsControl.cs

@@ -11,6 +11,10 @@ using Windows.UI.Xaml.Data;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
+#elif AVALONIA
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Data;
 #endif
 
 namespace MapControl
@@ -118,18 +122,18 @@ namespace MapControl
             }
         }
 
-        private void PrepareContainer(DependencyObject container, object item)
+        private void PrepareContainer(MapItem mapItem, object item)
         {
-            if (LocationMemberPath != null && container is MapItem mapItem)
+            if (LocationMemberPath != null)
             {
                 mapItem.SetBinding(MapItem.LocationProperty,
                     new Binding { Source = item, Path = new PropertyPath(LocationMemberPath) });
             }
         }
 
-        private void ClearContainer(DependencyObject container)
+        private void ClearContainer(MapItem mapItem)
         {
-            if (LocationMemberPath != null && container is MapItem mapItem)
+            if (LocationMemberPath != null)
             {
                 mapItem.ClearValue(MapItem.LocationProperty);
             }

MapControl/Shared/MapPanel.cs

@@ -13,6 +13,11 @@ using Windows.Foundation;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
 #endif
 
 /// <summary>

MapControl/Shared/MapPath.cs

@@ -4,6 +4,8 @@ using System.Windows;
 using Windows.UI.Xaml;
 #elif WINUI
 using Microsoft.UI.Xaml;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/MapProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/MapScale.cs

@@ -21,7 +21,12 @@ using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Shapes;
 #elif AVALONIA
+using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
+using Avalonia.Data;
+using Avalonia.Layout;
+using PointCollection = System.Collections.Generic.List<Avalonia.Point>;
 #endif
 
 namespace MapControl

MapControl/Shared/MapTileLayer.cs

@@ -11,6 +11,9 @@ using Windows.UI.Xaml.Media;
 using Windows.Foundation;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia;
+using Avalonia.Media;
 #endif
 
 namespace MapControl

MapControl/Shared/MapTileLayerBase.cs

@@ -18,6 +18,10 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Hosting;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Threading;
 #endif
 
 namespace MapControl

MapControl/Shared/OrthographicProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/PolarStereographicProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/PushpinBorder.cs

@@ -10,6 +10,10 @@ using Windows.UI.Xaml.Media;
 using Windows.Foundation;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia;
+using Avalonia.Layout;
+using Avalonia.Media;
 #endif
 
 namespace MapControl

MapControl/Shared/StereographicProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/Tile.cs

@@ -8,6 +8,9 @@ using Windows.UI.Xaml.Media;
 #elif WINUI
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia.Controls;
+using Avalonia.Media;
 #endif
 
 namespace MapControl

MapControl/Shared/TransverseMercatorProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/TypeConverters.cs

@@ -7,6 +7,8 @@ using System.Windows.Data;
 using Windows.UI.Xaml.Data;
 #elif WINUI
 using Microsoft.UI.Xaml.Data;
+#elif AVALONIA
+using Avalonia.Data.Converters;
 #endif
 #if UWP || WINUI
 using ConverterCulture = System.String;

MapControl/Shared/ViewTransform.cs

@@ -5,6 +5,8 @@ using System.Windows.Media;
 using Windows.UI.Xaml.Media;
 #elif WINUI
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/WebMercatorProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/WmsImageLayer.cs

@@ -14,6 +14,8 @@ using Windows.UI.Xaml.Media;
 #elif WINUI
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/WmtsCapabilities.cs

@@ -6,6 +6,8 @@ using System.Threading.Tasks;
 using System.Xml.Linq;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/WmtsTileLayer.cs

@@ -11,6 +11,9 @@ using Windows.UI.Xaml;
 #elif WINUI
 using Windows.Foundation;
 using Microsoft.UI.Xaml;
+#elif AVALONIA
+using Avalonia;
+using Avalonia.Interactivity;
 #endif
 
 namespace MapControl

MapControl/Shared/WmtsTileMatrix.cs

@@ -1,5 +1,7 @@
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/Shared/WmtsTileMatrixLayer.cs

@@ -11,6 +11,10 @@ using Windows.UI.Xaml.Media;
 using Windows.Foundation;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
 #endif
 
 namespace MapControl

MapControl/Shared/WorldMercatorProjection.cs

@@ -1,6 +1,8 @@
 using System;
 #if WPF
 using System.Windows;
+#elif AVALONIA
+using Avalonia;
 #endif
 
 namespace MapControl

MapControl/WPF/MapItemsControl.WPF.cs

@@ -39,13 +39,13 @@ namespace MapControl
         protected override void PrepareContainerForItemOverride(DependencyObject container, object item)
         {
             base.PrepareContainerForItemOverride(container, item);
-            PrepareContainer(container, item);
+            PrepareContainer((MapItem)container, item);
         }
 
         protected override void ClearContainerForItemOverride(DependencyObject container, object item)
         {
             base.ClearContainerForItemOverride(container, item);
-            ClearContainer(container);
+            ClearContainer((MapItem)container);
         }
     }
 }

MapControl/WinUI/MapItemsControl.WinUI.cs

@@ -32,13 +32,13 @@ namespace MapControl
         protected override void PrepareContainerForItemOverride(DependencyObject container, object item)
         {
             base.PrepareContainerForItemOverride(container, item);
-            PrepareContainer(container, item);
+            PrepareContainer((MapItem)container, item);
         }
 
         protected override void ClearContainerForItemOverride(DependencyObject container, object item)
         {
             base.ClearContainerForItemOverride(container, item);
-            ClearContainer(container);
+            ClearContainer((MapItem)container);
         }
     }
 }