ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version 4.10.0: Updated target framework versions. Cleanup of TypeConverters, ImageLoader, MBTileSource.

Browse source
This commit is contained in:
ClemensF 2018-08-10 00:20:35 +02:00
parent 1359cea83c
commit f2a9dd9d0d
2 changed files with 55 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,32 +17,6 @@ namespace MapControl
{ {
public static partial class ImageLoader public static partial class ImageLoader
{ {
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<Tuple<IBuffer, TimeSpan?>> LoadHttpBufferAsync(Uri uri) public static async Task<Tuple<IBuffer, TimeSpan?>> LoadHttpBufferAsync(Uri uri)
{ {
Tuple<IBuffer, TimeSpan?> result = null; Tuple<IBuffer, TimeSpan?> result = null;
@ -78,6 +52,32 @@ namespace MapControl
return result; 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) public static async Task<ImageSource> CreateImageSourceAsync(IRandomAccessStream stream)
{ {
var bitmapImage = new BitmapImage(); var bitmapImage = new BitmapImage();

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

@ -17,35 +17,6 @@ namespace MapControl
{ {
public static partial class ImageLoader public static partial class ImageLoader
{ {
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 async Task<Tuple<MemoryStream, TimeSpan?>> LoadHttpStreamAsync(Uri uri) public static async Task<Tuple<MemoryStream, TimeSpan?>> LoadHttpStreamAsync(Uri uri)
{ {
Tuple<MemoryStream, TimeSpan?> result = null; Tuple<MemoryStream, TimeSpan?> result = null;
@ -83,6 +54,35 @@ namespace MapControl
return result; 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) public static ImageSource CreateImageSource(Stream stream)
{ {
var bitmapImage = new BitmapImage(); var bitmapImage = new BitmapImage();