ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-05 14:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Version 4.10.0: Improved ImageLoader and MBTiles.

Browse source
This commit is contained in:
ClemensF 2018-08-15 23:29:03 +02:00
parent eca9178971
commit bdcd2597a1
13 changed files with 403 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

23
MapControl/Shared/ImageLoader.cs
View file

@ -51,27 +51,20 @@ namespace MapControl
return imageSource;
}
public static async Task<ImageSource> LoadHttpImageAsync(Uri uri)
private static async Task<ImageSource> LoadHttpImageAsync(Uri uri)
{
ImageSource imageSource = null;
try
using (var response = await HttpClient.GetAsync(uri))
{
using (var response = await HttpClient.GetAsync(uri))
if (!response.IsSuccessStatusCode)
{
if (!response.IsSuccessStatusCode)
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else if (IsTileAvailable(response.Headers))
{
imageSource = await CreateImageSourceAsync(response.Content);
}
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else if (IsTileAvailable(response.Headers))
{
imageSource = await CreateImageSourceAsync(response.Content);
}
}
catch (Exception ex)
{
Debug.WriteLine("ImageLoader: {0}: {1}", uri, ex.Message);
}
return imageSource;

10
MapControl/Shared/Tile.cs
View file

@ -4,9 +4,13 @@
using System;
#if WINDOWS_UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media.Animation;
#else
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media.Animation;
#endif
namespace MapControl
@ -37,5 +41,11 @@ namespace MapControl
return ((X % numTiles) + numTiles) % numTiles;
}
}
private void FadeIn()
{
Image.BeginAnimation(UIElement.OpacityProperty, new DoubleAnimation { From = 0d, To = 1d, Duration = FadeDuration, FillBehavior = FillBehavior.Stop });
Image.Opacity = 1d;
}
}
}

91
MapControl/UWP/ImageLoader.UWP.cs
View file

@ -5,6 +5,7 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Threading.Tasks;
using Windows.Storage;
using Windows.Storage.Streams;
@ -17,7 +18,52 @@ namespace MapControl
{
public static partial class ImageLoader
{
public static async Task<Tuple<IBuffer, TimeSpan?>> LoadHttpBufferAsync(Uri uri)
public static async Task<ImageSource> CreateImageSourceAsync(IRandomAccessStream stream)
{
var bitmapImage = new BitmapImage();
await bitmapImage.SetSourceAsync(stream);
return bitmapImage;
}
public static async Task<ImageSource> CreateImageSourceAsync(byte[] buffer)
{
using (var stream = new InMemoryRandomAccessStream())
{
await stream.WriteAsync(buffer.AsBuffer());
stream.Seek(0);
return await CreateImageSourceAsync(stream);
}
}
private static async Task<ImageSource> CreateImageSourceAsync(IHttpContent content)
{
using (var stream = new InMemoryRandomAccessStream())
{
await content.WriteToStreamAsync(stream);
stream.Seek(0);
return await CreateImageSourceAsync(stream);
}
}
private static async Task<ImageSource> LoadLocalImageAsync(Uri uri)
{
ImageSource imageSource = null;
var path = uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString;
if (File.Exists(path))
{
var file = await StorageFile.GetFileFromPathAsync(path);
using (var stream = await file.OpenReadAsync())
{
imageSource = await CreateImageSourceAsync(stream);
}
}
return imageSource;
}
internal static async Task<Tuple<IBuffer, TimeSpan?>> LoadHttpBufferAsync(Uri uri)
{
Tuple<IBuffer, TimeSpan?> result = null;
@ -52,49 +98,6 @@ namespace MapControl
return result;
}
public static async Task<ImageSource> LoadLocalImageAsync(Uri uri)
{
ImageSource imageSource = null;
try
{
var path = uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString;
if (File.Exists(path))
{
var file = await StorageFile.GetFileFromPathAsync(path);
using (var stream = await file.OpenReadAsync())
{
imageSource = await CreateImageSourceAsync(stream);
}
}
}
catch (Exception ex)
{
Debug.WriteLine("ImageLoader: {0}: {1}", uri, ex.Message);
}
return imageSource;
}
public static async Task<ImageSource> CreateImageSourceAsync(IRandomAccessStream stream)
{
var bitmapImage = new BitmapImage();
await bitmapImage.SetSourceAsync(stream);
return bitmapImage;
}
private static async Task<ImageSource> CreateImageSourceAsync(IHttpContent content)
{
using (var stream = new InMemoryRandomAccessStream())
{
await content.WriteToStreamAsync(stream);
stream.Seek(0);
return await CreateImageSourceAsync(stream);
}
}
private static bool IsTileAvailable(HttpResponseHeaderCollection responseHeaders)
{
return !responseHeaders.TryGetValue("X-VE-Tile-Info", out string tileInfo) || tileInfo != "no-tile";

7
MapControl/UWP/Tile.UWP.cs
View file

@ -6,7 +6,6 @@ using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Animation;
using Windows.UI.Xaml.Media.Imaging;
namespace MapControl
@ -28,8 +27,7 @@ namespace MapControl
}
else
{
Image.BeginAnimation(UIElement.OpacityProperty, new DoubleAnimation { From = 0d, To = 1d, Duration = FadeDuration, FillBehavior = FillBehavior.Stop });
Image.Opacity = 1d;
FadeIn();
}
}
else
@ -47,8 +45,7 @@ namespace MapControl
bitmapImage.ImageOpened -= BitmapImageOpened;
bitmapImage.ImageFailed -= BitmapImageFailed;
Image.BeginAnimation(UIElement.OpacityProperty, new DoubleAnimation { From = 0d, To = 1d, Duration = FadeDuration, FillBehavior = FillBehavior.Stop });
Image.Opacity = 1d;
FadeIn();
}
private void BitmapImageFailed(object sender, ExceptionRoutedEventArgs e)

117
MapControl/WPF/ImageLoader.WPF.cs
View file

@ -17,7 +17,67 @@ namespace MapControl
{
public static partial class ImageLoader
{
public static async Task<Tuple<MemoryStream, TimeSpan?>> LoadHttpStreamAsync(Uri uri)
public static ImageSource CreateImageSource(Stream stream)
{
var bitmapImage = new BitmapImage();
bitmapImage.BeginInit();
bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
bitmapImage.StreamSource = stream;
bitmapImage.EndInit();
bitmapImage.Freeze();
return bitmapImage;
}
public static Task<ImageSource> CreateImageSourceAsync(Stream stream)
{
return Task.Run(() => CreateImageSource(stream));
}
public static ImageSource CreateImageSource(byte[] buffer)
{
using (var stream = new MemoryStream(buffer))
{
return CreateImageSource(stream);
}
}
public static Task<ImageSource> CreateImageSourceAsync(byte[] buffer)
{
return Task.Run(() => CreateImageSource(buffer));
}
private static async Task<ImageSource> CreateImageSourceAsync(HttpContent content)
{
using (var stream = new MemoryStream())
{
await content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
return await CreateImageSourceAsync(stream);
}
}
private static ImageSource LoadLocalImage(Uri uri)
{
ImageSource imageSource = null;
var path = uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString;
if (File.Exists(path))
{
using (var stream = File.OpenRead(path))
{
imageSource = CreateImageSource(stream);
}
}
return imageSource;
}
private static Task<ImageSource> LoadLocalImageAsync(Uri uri)
{
return Task.Run(() => LoadLocalImage(uri));
}
internal static async Task<Tuple<MemoryStream, TimeSpan?>> LoadHttpStreamAsync(Uri uri)
{
Tuple<MemoryStream, TimeSpan?> result = null;
@ -54,61 +114,6 @@ namespace MapControl
return result;
}
public static ImageSource LoadLocalImage(Uri uri)
{
ImageSource imageSource = null;
try
{
var path = uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString;
if (File.Exists(path))
{
using (var stream = File.OpenRead(path))
{
imageSource = CreateImageSource(stream);
}
}
}
catch (Exception ex)
{
Debug.WriteLine("ImageLoader: {0}: {1}", uri, ex.Message);
}
return imageSource;
}
public static Task<ImageSource> LoadLocalImageAsync(Uri uri)
{
return Task.Run(() => LoadLocalImage(uri));
}
public static ImageSource CreateImageSource(Stream stream)
{
var bitmapImage = new BitmapImage();
bitmapImage.BeginInit();
bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
bitmapImage.StreamSource = stream;
bitmapImage.EndInit();
bitmapImage.Freeze();
return bitmapImage;
}
public static Task<ImageSource> CreateImageSourceAsync(Stream stream)
{
return Task.Run(() => CreateImageSource(stream));
}
private static async Task<ImageSource> CreateImageSourceAsync(HttpContent content)
{
using (var stream = new MemoryStream())
{
await content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
return await CreateImageSourceAsync(stream);
}
}
private static bool IsTileAvailable(HttpResponseHeaders responseHeaders)
{
IEnumerable<string> tileInfo;

8
MapControl/WPF/Tile.WPF.cs
View file

@ -3,10 +3,8 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Imaging;
namespace MapControl
@ -28,8 +26,7 @@ namespace MapControl
}
else
{
Image.BeginAnimation(UIElement.OpacityProperty, new DoubleAnimation(0d, 1d, FadeDuration, FillBehavior.Stop));
Image.Opacity = 1d;
FadeIn();
}
}
else
@ -47,8 +44,7 @@ namespace MapControl
bitmapSource.DownloadCompleted -= BitmapDownloadCompleted;
bitmapSource.DownloadFailed -= BitmapDownloadFailed;
Image.BeginAnimation(UIElement.OpacityProperty, new DoubleAnimation(0d, 1d, FadeDuration, FillBehavior.Stop));
Image.Opacity = 1d;
FadeIn();
}
private void BitmapDownloadFailed(object sender, ExceptionEventArgs e)