ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup of global usings

Browse source
This commit is contained in:
ClemensFischer 2025-08-19 19:43:02 +02:00
parent 0a427a90de
commit 81eabef257
57 changed files with 207 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
MapControl/Avalonia/DependencyPropertyHelper.Avalonia.cs
View file

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

6
MapControl/Avalonia/ImageLoader.Avalonia.cs
View file

@ -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;

4
MapControl/Avalonia/LocationAnimator.Avalonia.cs
View file

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

4
MapControl/Avalonia/Map.Avalonia.cs
View file

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

31
MapControl/Avalonia/MapBase.Avalonia.cs
View file

@ -1,29 +1,16 @@
global using Avalonia;
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 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;

5
MapControl/Avalonia/MapContentControl.Avalonia.cs
View file

@ -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.

6
MapControl/Avalonia/MapGraticule.Avalonia.cs
View file

@ -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;

4
MapControl/Avalonia/MapImageLayer.Avalonia.cs
View file

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

6
MapControl/Avalonia/MapItem.Avalonia.cs
View file

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

9
MapControl/Avalonia/MapItemsControl.Avalonia.cs
View file

@ -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)

6
MapControl/Avalonia/MapPanel.Avalonia.cs
View file

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

4
MapControl/Avalonia/MapPath.Avalonia.cs
View file

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

4
MapControl/Avalonia/MapPolypoint.Avalonia.cs
View file

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

5
MapControl/Avalonia/PushpinBorder.Avalonia.cs
View file

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

5
MapControl/Avalonia/Tile.Avalonia.cs
View file

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

4
MapControl/Avalonia/TileImageLoader.Avalonia.cs
View file

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

4
MapControl/Avalonia/ViewTransform.Avalonia.cs
View file

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

2
MapControl/Shared/AutoEquirectangularProjection.cs
View file

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

2
MapControl/Shared/AzimuthalEquidistantProjection.cs
View file

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

2
MapControl/Shared/AzimuthalProjection.cs
View file

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

3
MapControl/Shared/DispatcherTimerHelper.cs
View file

@ -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;

2
MapControl/Shared/EquirectangularProjection.cs
View file

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

8
MapControl/Shared/FilePath.cs
View file

@ -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
}
}

26
MapControl/Shared/GeoImage.cs
View file

@ -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)
{

2
MapControl/Shared/GnomonicProjection.cs
View file

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

3
MapControl/Shared/GroundOverlay.cs
View file

@ -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

2
MapControl/Shared/Map.cs
View file

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

2
MapControl/Shared/MapBase.MapLayer.cs
View file

@ -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

2
MapControl/Shared/MapBase.cs
View file

@ -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

2
MapControl/Shared/MapBorderPanel.cs
View file

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

4
MapControl/Shared/MapGraticule.cs
View file

@ -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

5
MapControl/Shared/MapImageLayer.cs
View file

@ -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

5
MapControl/Shared/MapItem.cs
View file

@ -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>

12
MapControl/Shared/MapItemsControl.cs
View file

@ -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);
}

5
MapControl/Shared/MapPanel.cs
View file

@ -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>

2
MapControl/Shared/MapPath.cs
View file

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

2
MapControl/Shared/MapProjection.cs
View file

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

5
MapControl/Shared/MapScale.cs
View file

@ -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

3
MapControl/Shared/MapTileLayer.cs
View file

@ -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

4
MapControl/Shared/MapTileLayerBase.cs
View file

@ -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

2
MapControl/Shared/OrthographicProjection.cs
View file

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

2
MapControl/Shared/PolarStereographicProjection.cs
View file

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

4
MapControl/Shared/PushpinBorder.cs
View file

@ -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

2
MapControl/Shared/StereographicProjection.cs
View file

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

3
MapControl/Shared/Tile.cs
View file

@ -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

2
MapControl/Shared/TransverseMercatorProjection.cs
View file

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

2
MapControl/Shared/TypeConverters.cs
View file

@ -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;

2
MapControl/Shared/ViewTransform.cs
View file

@ -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

2
MapControl/Shared/WebMercatorProjection.cs
View file

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

2
MapControl/Shared/WmsImageLayer.cs
View file

@ -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

2
MapControl/Shared/WmtsCapabilities.cs
View file

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

3
MapControl/Shared/WmtsTileLayer.cs
View file

@ -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

2
MapControl/Shared/WmtsTileMatrix.cs
View file

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

4
MapControl/Shared/WmtsTileMatrixLayer.cs
View file

@ -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

2
MapControl/Shared/WorldMercatorProjection.cs
View file

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

4
MapControl/WPF/MapItemsControl.WPF.cs
View file

@ -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);
}
}
}

4
MapControl/WinUI/MapItemsControl.WinUI.cs
View file

@ -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);
}
}
}