From 02e138eb7c5d4d88adee757b1d2e6027bee3d5dd Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Fri, 30 Aug 2024 16:37:40 +0200
Subject: [PATCH] Fixed using Path = System.IO.Path

---
 MapControl/Avalonia/MapBase.Avalonia.cs      | 1 -
 MapControl/Avalonia/MapGraticule.Avalonia.cs | 1 +
 MapControl/Avalonia/MapPath.Avalonia.cs      | 2 ++
 MapControl/Shared/GeoImage.cs                | 1 -
 MapControl/Shared/GroundOverlay.cs           | 1 -
 MapControl/Shared/ImageFileCache.cs          | 1 -
 MapControl/Shared/MapOverlaysPanel.cs        | 2 +-
 MapControl/Shared/MapScale.cs                | 2 ++
 MapControl/Shared/TileImageLoader.cs         | 5 +++--
 9 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/MapControl/Avalonia/MapBase.Avalonia.cs b/MapControl/Avalonia/MapBase.Avalonia.cs
index 4c4f127f..31cd6b33 100644
--- a/MapControl/Avalonia/MapBase.Avalonia.cs
+++ b/MapControl/Avalonia/MapBase.Avalonia.cs
@@ -7,7 +7,6 @@ global using Avalonia.Animation;
 global using Avalonia.Animation.Easings;
 global using Avalonia.Controls;
 global using Avalonia.Controls.Documents;
-global using Avalonia.Controls.Shapes;
 global using Avalonia.Data;
 global using Avalonia.Input;
 global using Avalonia.Interactivity;
diff --git a/MapControl/Avalonia/MapGraticule.Avalonia.cs b/MapControl/Avalonia/MapGraticule.Avalonia.cs
index ed629495..e5657611 100644
--- a/MapControl/Avalonia/MapGraticule.Avalonia.cs
+++ b/MapControl/Avalonia/MapGraticule.Avalonia.cs
@@ -2,6 +2,7 @@
 // Copyright © 2024 Clemens Fischer
 // Licensed under the Microsoft Public License (Ms-PL)
 
+using Avalonia.Controls.Shapes;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/MapControl/Avalonia/MapPath.Avalonia.cs b/MapControl/Avalonia/MapPath.Avalonia.cs
index b20c18a6..4c6afa8f 100644
--- a/MapControl/Avalonia/MapPath.Avalonia.cs
+++ b/MapControl/Avalonia/MapPath.Avalonia.cs
@@ -2,6 +2,8 @@
 // Copyright © 2024 Clemens Fischer
 // Licensed under the Microsoft Public License (Ms-PL)
 
+using Avalonia.Controls.Shapes;
+
 namespace MapControl
 {
     public partial class MapPath : Shape
diff --git a/MapControl/Shared/GeoImage.cs b/MapControl/Shared/GeoImage.cs
index ed2971c3..583abe84 100644
--- a/MapControl/Shared/GeoImage.cs
+++ b/MapControl/Shared/GeoImage.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Globalization;
 using System.IO;
-using Path = System.IO.Path;
 using System.Linq;
 using System.Threading.Tasks;
 #if WPF
diff --git a/MapControl/Shared/GroundOverlay.cs b/MapControl/Shared/GroundOverlay.cs
index 078e4879..85b95dc0 100644
--- a/MapControl/Shared/GroundOverlay.cs
+++ b/MapControl/Shared/GroundOverlay.cs
@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using Path = System.IO.Path;
 using System.IO.Compression;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/MapControl/Shared/ImageFileCache.cs b/MapControl/Shared/ImageFileCache.cs
index 81c27908..ff0b6aaa 100644
--- a/MapControl/Shared/ImageFileCache.cs
+++ b/MapControl/Shared/ImageFileCache.cs
@@ -12,7 +12,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Path = System.IO.Path;
 
 namespace MapControl.Caching
 {
diff --git a/MapControl/Shared/MapOverlaysPanel.cs b/MapControl/Shared/MapOverlaysPanel.cs
index 7a81d9fe..86168425 100644
--- a/MapControl/Shared/MapOverlaysPanel.cs
+++ b/MapControl/Shared/MapOverlaysPanel.cs
@@ -6,8 +6,8 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
-using Path = System.IO.Path;
 #if WPF
 using System.Windows;
 #elif UWP
diff --git a/MapControl/Shared/MapScale.cs b/MapControl/Shared/MapScale.cs
index 9a55b9f2..6badb086 100644
--- a/MapControl/Shared/MapScale.cs
+++ b/MapControl/Shared/MapScale.cs
@@ -24,6 +24,8 @@ using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Shapes;
+#elif AVALONIA
+using Avalonia.Controls.Shapes;
 #endif
 
 namespace MapControl
diff --git a/MapControl/Shared/TileImageLoader.cs b/MapControl/Shared/TileImageLoader.cs
index f8cf1c76..4ca12341 100644
--- a/MapControl/Shared/TileImageLoader.cs
+++ b/MapControl/Shared/TileImageLoader.cs
@@ -9,6 +9,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -48,7 +49,7 @@ namespace MapControl
         /// Default folder path where a persistent cache implementation may save data, i.e. "C:\ProgramData\MapControl\TileCache".
         /// </summary>
         public static string DefaultCacheFolder =>
-            System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "MapControl", "TileCache");
+            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "MapControl", "TileCache");
 
         /// <summary>
         /// An IDistributedCache implementation used to cache tile images.
@@ -152,7 +153,7 @@ namespace MapControl
 
         private static async Task LoadCachedTileAsync(Tile tile, Uri uri, string cacheName)
         {
-            var extension = System.IO.Path.GetExtension(uri.LocalPath);
+            var extension = Path.GetExtension(uri.LocalPath);
 
             if (string.IsNullOrEmpty(extension) || extension.Equals(".jpeg", StringComparison.OrdinalIgnoreCase))
             {