Reverted to not awaitable TileImageLoader

This commit is contained in:
ClemensFischer 2025-08-21 21:25:04 +02:00
parent 775d584df7
commit 178cec8e66
5 changed files with 68 additions and 66 deletions

View file

@ -28,7 +28,7 @@ namespace MapControl
static ImageLoader()
{
HttpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(30) };
HttpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(10) };
HttpClient.DefaultRequestHeaders.Add("User-Agent", $"XAML-Map-Control/{typeof(ImageLoader).Assembly.GetName().Version}");
}
@ -126,13 +126,13 @@ namespace MapControl
}
catch (OperationCanceledException ex)
{
if (ex.InnerException is TimeoutException timeout)
if (ex.CancellationToken.IsCancellationRequested)
{
Logger?.LogError(timeout, "Failed loading image from {uri}", uri);
Logger?.LogTrace("Cancelled loading image from {uri}", uri);
}
else
{
Logger?.LogTrace("Cancelled loading image from {uri}", uri);
Logger?.LogError(ex, "Failed loading image from {uri}", uri);
}
}
catch (Exception ex)