From 51407592e612c2ffb5edf31200c001c4ddf3b6e6 Mon Sep 17 00:00:00 2001 From: ClemensFischer Date: Mon, 12 Jan 2026 11:58:26 +0100 Subject: [PATCH] Reverted commit --- .gitignore | 12 ------- SampleApps/AvaloniaApp/MainWindow.axaml.cs | 6 ++-- SampleApps/WinUiApp/MainWindow.xaml.cs | 6 ++-- SampleApps/WpfApplication/MainWindow.xaml.cs | 35 ++------------------ 4 files changed, 9 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 6b4a36b5..66ccd8d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,4 @@ .vs/ bin/ obj/ -Experimental/ -TestApps/ -TestData/ -Win2D/ -Caches/ZoneTreeCache/ -SampleApps/Shared/TestLayers.cs -MapControlExperimental.sln -MapControlTestApps.sln *.user -*.nupkg -*.pdf -*.txt -*.cmd diff --git a/SampleApps/AvaloniaApp/MainWindow.axaml.cs b/SampleApps/AvaloniaApp/MainWindow.axaml.cs index 9180a363..9a4b023f 100644 --- a/SampleApps/AvaloniaApp/MainWindow.axaml.cs +++ b/SampleApps/AvaloniaApp/MainWindow.axaml.cs @@ -16,9 +16,9 @@ namespace SampleApplication var loggerFactory = LoggerFactory.Create(builder => builder.AddDebug().SetMinimumLevel(LogLevel.Information)); ImageLoader.LoggerFactory = loggerFactory; - var tileCache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder, loggerFactory); - TileImageLoader.Cache = tileCache; - Closed += (s, e) => tileCache.Dispose(); + //var tileCache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder, loggerFactory); + //TileImageLoader.Cache = tileCache; + //Closed += (s, e) => tileCache.Dispose(); InitializeComponent(); AddTestLayers(); diff --git a/SampleApps/WinUiApp/MainWindow.xaml.cs b/SampleApps/WinUiApp/MainWindow.xaml.cs index e31cd70e..2e11119e 100644 --- a/SampleApps/WinUiApp/MainWindow.xaml.cs +++ b/SampleApps/WinUiApp/MainWindow.xaml.cs @@ -19,9 +19,9 @@ namespace SampleApplication var loggerFactory = LoggerFactory.Create(builder => builder.AddDebug().SetMinimumLevel(LogLevel.Information)); ImageLoader.LoggerFactory = loggerFactory; - var tileCache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder, loggerFactory); - TileImageLoader.Cache = tileCache; - Closed += (s, e) => tileCache.Dispose(); + //var tileCache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder, loggerFactory); + //TileImageLoader.Cache = tileCache; + //Closed += (s, e) => tileCache.Dispose(); InitializeComponent(); AddTestLayers(); diff --git a/SampleApps/WpfApplication/MainWindow.xaml.cs b/SampleApps/WpfApplication/MainWindow.xaml.cs index f34f287e..206f0536 100644 --- a/SampleApps/WpfApplication/MainWindow.xaml.cs +++ b/SampleApps/WpfApplication/MainWindow.xaml.cs @@ -10,41 +10,16 @@ using System.Windows.Input; namespace SampleApplication { -#if NET - using System.Net.Http; - using System.Threading; - using System.Threading.Tasks; - - class HttpHandler : DelegatingHandler - { - public HttpHandler() : base(new SocketsHttpHandler()) - { - } - - protected override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) - { - Debug.WriteLine(request.RequestUri); - - return base.SendAsync(request, cancellationToken); - } - } -#endif - public partial class MainWindow : Window { public MainWindow() { -#if NET - var httpClient = new HttpClient(new HttpHandler()) { Timeout = TimeSpan.FromSeconds(10) }; - httpClient.DefaultRequestHeaders.Add("User-Agent", $"XAML Map Control Test Application"); - ImageLoader.HttpClient = httpClient; -#endif var loggerFactory = LoggerFactory.Create(builder => builder.AddDebug().SetMinimumLevel(LogLevel.Information)); ImageLoader.LoggerFactory = loggerFactory; - var tileCache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder, loggerFactory); - TileImageLoader.Cache = tileCache; - Closed += (s, e) => tileCache.Dispose(); + //var tileCache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder, loggerFactory); + //TileImageLoader.Cache = tileCache; + //Closed += (s, e) => tileCache.Dispose(); InitializeComponent(); AddTestLayers(); @@ -68,10 +43,6 @@ namespace SampleApplication { map.TargetCenter = map.ViewToLocation(e.GetPosition(map)); } - else if (Keyboard.Modifiers.HasFlag(ModifierKeys.Shift)) - { - map.ProjectionCenter = map.ViewToLocation(e.GetPosition(map)); - } else if (Keyboard.Modifiers.HasFlag(ModifierKeys.Control) && map.MapLayer is WmsImageLayer wmsLayer) {