From caf47209a32f41987010a1cd5a88925eef726e3a Mon Sep 17 00:00:00 2001 From: ClemensFischer Date: Sun, 26 Jan 2025 22:40:33 +0100 Subject: [PATCH] Private async method names --- MapControl/Avalonia/GeoImage.Avalonia.cs | 2 +- MapControl/Avalonia/TileImageLoader.Avalonia.cs | 2 +- MapControl/Shared/GeoImage.cs | 10 +++++----- MapControl/Shared/GroundOverlay.cs | 8 ++++---- MapControl/Shared/TileImageLoader.cs | 14 +++++++------- MapControl/UWP/TileImageLoader.UWP.cs | 2 +- MapControl/WPF/GeoImage.WPF.cs | 2 +- MapControl/WPF/TileImageLoader.WPF.cs | 2 +- MapControl/WinUI/GeoImage.WinUI.cs | 2 +- MapControl/WinUI/TileImageLoader.WinUI.cs | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/MapControl/Avalonia/GeoImage.Avalonia.cs b/MapControl/Avalonia/GeoImage.Avalonia.cs index cc666450..13d1c19f 100644 --- a/MapControl/Avalonia/GeoImage.Avalonia.cs +++ b/MapControl/Avalonia/GeoImage.Avalonia.cs @@ -9,7 +9,7 @@ namespace MapControl { public static partial class GeoImage { - private static Task LoadGeoTiffAsync(string sourcePath) + private static Task LoadGeoTiff(string sourcePath) { throw new InvalidOperationException("GeoTIFF is not supported."); } diff --git a/MapControl/Avalonia/TileImageLoader.Avalonia.cs b/MapControl/Avalonia/TileImageLoader.Avalonia.cs index 574a9d74..228b24a4 100644 --- a/MapControl/Avalonia/TileImageLoader.Avalonia.cs +++ b/MapControl/Avalonia/TileImageLoader.Avalonia.cs @@ -9,7 +9,7 @@ namespace MapControl { public partial class TileImageLoader { - private static async Task LoadTileAsync(Tile tile, Func> loadImageFunc) + private static async Task LoadTileImage(Tile tile, Func> loadImageFunc) { var image = await loadImageFunc().ConfigureAwait(false); diff --git a/MapControl/Shared/GeoImage.cs b/MapControl/Shared/GeoImage.cs index fc17cf04..36123450 100644 --- a/MapControl/Shared/GeoImage.cs +++ b/MapControl/Shared/GeoImage.cs @@ -92,7 +92,7 @@ namespace MapControl { try { - var geoBitmap = await LoadGeoBitmapAsync(sourcePath); + var geoBitmap = await LoadGeoBitmap(sourcePath); if (element is Image image) { @@ -122,7 +122,7 @@ namespace MapControl } } - private static async Task LoadGeoBitmapAsync(string sourcePath) + private static async Task LoadGeoBitmap(string sourcePath) { var ext = Path.GetExtension(sourcePath); @@ -136,15 +136,15 @@ namespace MapControl { return new GeoBitmap( (BitmapSource)await ImageLoader.LoadImageAsync(sourcePath), - await ReadWorldFileMatrixAsync(worldFilePath), + await ReadWorldFileMatrix(worldFilePath), null); } } - return await LoadGeoTiffAsync(sourcePath); + return await LoadGeoTiff(sourcePath); } - private static async Task ReadWorldFileMatrixAsync(string worldFilePath) + private static async Task ReadWorldFileMatrix(string worldFilePath) { using (var fileStream = File.OpenRead(worldFilePath)) using (var streamReader = new StreamReader(fileStream)) diff --git a/MapControl/Shared/GroundOverlay.cs b/MapControl/Shared/GroundOverlay.cs index 71429495..d38c04a4 100644 --- a/MapControl/Shared/GroundOverlay.cs +++ b/MapControl/Shared/GroundOverlay.cs @@ -75,11 +75,11 @@ namespace MapControl if (ext == ".kmz") { - imageOverlays = await LoadGroundOverlaysFromArchiveAsync(sourcePath); + imageOverlays = await LoadGroundOverlaysFromArchive(sourcePath); } else if (ext == ".kml") { - imageOverlays = await LoadGroundOverlaysFromFileAsync(sourcePath); + imageOverlays = await LoadGroundOverlaysFromFile(sourcePath); } } catch (Exception ex) @@ -107,7 +107,7 @@ namespace MapControl } } - private static async Task> LoadGroundOverlaysFromArchiveAsync(string archiveFilePath) + private static async Task> LoadGroundOverlaysFromArchive(string archiveFilePath) { using (var archive = ZipFile.OpenRead(archiveFilePath)) { @@ -150,7 +150,7 @@ namespace MapControl } } - private static async Task> LoadGroundOverlaysFromFileAsync(string docFilePath) + private static async Task> LoadGroundOverlaysFromFile(string docFilePath) { docFilePath = FilePath.GetFullPath(docFilePath); diff --git a/MapControl/Shared/TileImageLoader.cs b/MapControl/Shared/TileImageLoader.cs index fefc0d21..ed10176b 100644 --- a/MapControl/Shared/TileImageLoader.cs +++ b/MapControl/Shared/TileImageLoader.cs @@ -93,7 +93,7 @@ namespace MapControl try { - await LoadTileAsync(tile, tileSource, cacheName).ConfigureAwait(false); + await LoadTileImage(tile, tileSource, cacheName).ConfigureAwait(false); } catch (Exception ex) { @@ -112,14 +112,14 @@ namespace MapControl } } - private static async Task LoadTileAsync(Tile tile, TileSource tileSource, string cacheName) + private static async Task LoadTileImage(Tile tile, TileSource tileSource, string cacheName) { // Pass tileSource.LoadImageAsync calls to platform-specific method - // LoadTileAsync(Tile, Func>) for execution on the UI thread in WinUI/UWP. + // LoadTileImage(Tile, Func>) for execution on the UI thread in WinUI and UWP. if (string.IsNullOrEmpty(cacheName)) { - await LoadTileAsync(tile, () => tileSource.LoadImageAsync(tile.Column, tile.Row, tile.ZoomLevel)).ConfigureAwait(false); + await LoadTileImage(tile, () => tileSource.LoadImageAsync(tile.Column, tile.Row, tile.ZoomLevel)).ConfigureAwait(false); } else { @@ -127,17 +127,17 @@ namespace MapControl if (uri != null) { - var buffer = await LoadCachedBufferAsync(tile, uri, cacheName).ConfigureAwait(false); + var buffer = await LoadCachedBuffer(tile, uri, cacheName).ConfigureAwait(false); if (buffer != null && buffer.Length > 0) { - await LoadTileAsync(tile, () => tileSource.LoadImageAsync(buffer)).ConfigureAwait(false); + await LoadTileImage(tile, () => tileSource.LoadImageAsync(buffer)).ConfigureAwait(false); } } } } - private static async Task LoadCachedBufferAsync(Tile tile, Uri uri, string cacheName) + private static async Task LoadCachedBuffer(Tile tile, Uri uri, string cacheName) { byte[] buffer = null; diff --git a/MapControl/UWP/TileImageLoader.UWP.cs b/MapControl/UWP/TileImageLoader.UWP.cs index 2db8b346..f829fb11 100644 --- a/MapControl/UWP/TileImageLoader.UWP.cs +++ b/MapControl/UWP/TileImageLoader.UWP.cs @@ -11,7 +11,7 @@ namespace MapControl { public partial class TileImageLoader { - private static async Task LoadTileAsync(Tile tile, Func> loadImageFunc) + private static async Task LoadTileImage(Tile tile, Func> loadImageFunc) { var tcs = new TaskCompletionSource(); diff --git a/MapControl/WPF/GeoImage.WPF.cs b/MapControl/WPF/GeoImage.WPF.cs index 9457d328..5c94dede 100644 --- a/MapControl/WPF/GeoImage.WPF.cs +++ b/MapControl/WPF/GeoImage.WPF.cs @@ -13,7 +13,7 @@ namespace MapControl { public static partial class GeoImage { - private static Task LoadGeoTiffAsync(string sourcePath) + private static Task LoadGeoTiff(string sourcePath) { return Task.Run(() => { diff --git a/MapControl/WPF/TileImageLoader.WPF.cs b/MapControl/WPF/TileImageLoader.WPF.cs index c894fedd..a4720665 100644 --- a/MapControl/WPF/TileImageLoader.WPF.cs +++ b/MapControl/WPF/TileImageLoader.WPF.cs @@ -10,7 +10,7 @@ namespace MapControl { public partial class TileImageLoader { - private static async Task LoadTileAsync(Tile tile, Func> loadImageFunc) + private static async Task LoadTileImage(Tile tile, Func> loadImageFunc) { var image = await loadImageFunc().ConfigureAwait(false); diff --git a/MapControl/WinUI/GeoImage.WinUI.cs b/MapControl/WinUI/GeoImage.WinUI.cs index 92ea0326..fb0d3192 100644 --- a/MapControl/WinUI/GeoImage.WinUI.cs +++ b/MapControl/WinUI/GeoImage.WinUI.cs @@ -16,7 +16,7 @@ namespace MapControl { public static partial class GeoImage { - private static async Task LoadGeoTiffAsync(string sourcePath) + private static async Task LoadGeoTiff(string sourcePath) { BitmapSource bitmap; Matrix transform; diff --git a/MapControl/WinUI/TileImageLoader.WinUI.cs b/MapControl/WinUI/TileImageLoader.WinUI.cs index 44f18ce6..41152df2 100644 --- a/MapControl/WinUI/TileImageLoader.WinUI.cs +++ b/MapControl/WinUI/TileImageLoader.WinUI.cs @@ -11,7 +11,7 @@ namespace MapControl { public partial class TileImageLoader { - private static Task LoadTileAsync(Tile tile, Func> loadImageFunc) + private static Task LoadTileImage(Tile tile, Func> loadImageFunc) { var tcs = new TaskCompletionSource();