ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-05 22:46:58 +00:00
Code Issues Projects Releases Packages 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-08 23:31:52 +02:00
parent 63a4c1f0a7
commit 6a1653056f
36 changed files with 272 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,72 +15,24 @@ using Windows.Web.Http.Headers;
namespace MapControl
{
public static class ImageLoader
public static partial class ImageLoader
{
/// <summary>
/// The HttpClient instance used when image data is downloaded from a web resource.
/// </summary>
public static HttpClient HttpClient { get; set; } = new HttpClient();
public static async Task<ImageSource> LoadImageAsync(Uri uri, bool isTileImage)
{
if (!uri.IsAbsoluteUri || uri.Scheme == "file")
{
return await LoadLocalImageAsync(uri);
}
if (uri.Scheme == "http")
{
return await LoadHttpImageAsync(uri, isTileImage);
}
return new BitmapImage(uri);
}
public static async Task<ImageSource> LoadLocalImageAsync(Uri uri)
{
ImageSource imageSource = null;
var path = uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString;
if (!File.Exists(path))
if (File.Exists(path))
{
return null;
}
var file = await StorageFile.GetFileFromPathAsync(path);
var file = await StorageFile.GetFileFromPathAsync(path);
using (var stream = await file.OpenReadAsync())
{
var bitmapImage = new BitmapImage();
await bitmapImage.SetSourceAsync(stream);
return bitmapImage;
}
}
public static async Task<ImageSource> LoadHttpImageAsync(Uri uri, bool isTileImage)
{
using (var response = await HttpClient.GetAsync(uri))
{
if (!response.IsSuccessStatusCode)
using (var stream = await file.OpenReadAsync())
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
imageSource = await CreateImageSourceAsync(stream);
}
else if (!isTileImage || IsTileAvailable(response.Headers))
{
using (var stream = new InMemoryRandomAccessStream())
{
await response.Content.WriteToStreamAsync(stream);
stream.Seek(0);
var bitmapImage = new BitmapImage();
await bitmapImage.SetSourceAsync(stream);
return bitmapImage;
}
}
return null;
}
return imageSource;
}
public static async Task<bool> LoadHttpTileImageAsync(Uri uri, Func<IBuffer, TimeSpan?, Task> tileCallback)
@ -102,6 +54,21 @@ namespace MapControl
}
}
public static async Task<ImageSource> CreateImageSourceAsync(IRandomAccessStream stream)
{
var bitmapImage = new BitmapImage();
await bitmapImage.SetSourceAsync(stream);
return bitmapImage;
}
private static async Task<InMemoryRandomAccessStream> GetResponseStreamAsync(IHttpContent content)
{
var stream = new InMemoryRandomAccessStream();
await content.WriteToStreamAsync(stream);
stream.Seek(0);
return stream;
}
private static bool IsTileAvailable(HttpResponseHeaderCollection responseHeaders)
{
return !responseHeaders.TryGetValue("X-VE-Tile-Info", out string tileInfo) || tileInfo != "no-tile";

5
MapControl/UWP/MapControl.UWP.csproj
View file

@ -67,6 +67,9 @@
<Compile Include="..\Shared\HyperlinkText.cs">
<Link>HyperlinkText.cs</Link>
</Compile>
<Compile Include="..\Shared\ImageLoader.cs">
<Link>ImageLoader.cs</Link>
</Compile>
<Compile Include="..\Shared\Intersections.cs">
<Link>Intersections.cs</Link>
</Compile>
@ -168,7 +171,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.1.5</Version>
<Version>6.1.7</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>

4
MapControl/UWP/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2018 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.9.0")]
[assembly: AssemblyFileVersion("4.9.0")]
[assembly: AssemblyVersion("4.10.0")]
[assembly: AssemblyFileVersion("4.10.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

20
MapControl/UWP/TileImageLoader.UWP.cs
View file

@ -8,11 +8,10 @@ using System.Threading.Tasks;
using Windows.Storage;
using Windows.Storage.Streams;
using Windows.UI.Core;
using Windows.UI.Xaml.Media.Imaging;
namespace MapControl
{
public partial class TileImageLoader : ITileImageLoader
public partial class TileImageLoader
{
/// <summary>
/// Default StorageFolder where an IImageCache instance may save cached data,
@ -43,12 +42,12 @@ namespace MapControl
{
try
{
loaded = await ImageLoader.LoadHttpTileImageAsync(uri, async (buffer, maxAge) =>
{
await SetTileImageAsync(tile, buffer); // create BitmapImage before caching
await Cache.SetAsync(cacheKey, buffer, GetExpiration(maxAge));
});
loaded = await ImageLoader.LoadHttpTileImageAsync(uri,
async (buffer, maxAge) =>
{
await SetTileImageAsync(tile, buffer); // create BitmapImage before caching
await Cache.SetAsync(cacheKey, buffer, GetExpiration(maxAge));
});
}
catch (Exception ex)
{
@ -76,10 +75,7 @@ namespace MapControl
{
try
{
var bitmapImage = new BitmapImage();
await bitmapImage.SetSourceAsync(stream);
tile.SetImage(bitmapImage);
tile.SetImage(await ImageLoader.CreateImageSourceAsync(stream));
tcs.SetResult(null);
}
catch (Exception ex)

81
MapControl/UWP/TileSource.UWP.cs
View file

@ -1,81 +0,0 @@
// XAML Map Control - https://github.com/ClemensFischer/XAML-Map-Control
// © 2018 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
using System;
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
using Windows.Storage;
using Windows.Storage.Streams;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Imaging;
using Windows.Web.Http;
using Windows.Web.Http.Headers;
namespace MapControl
{
public partial class TileSource
{
/// <summary>
/// The HttpClient instance used when image data is downloaded from a web resource.
/// </summary>
public static HttpClient HttpClient { get; set; } = new HttpClient();
/// <summary>
/// Check HTTP response headers for tile availability, e.g. X-VE-Tile-Info=no-tile
/// </summary>
public static bool IsTileAvailable(HttpResponseHeaderCollection responseHeaders)
{
string tileInfo;
return !responseHeaders.TryGetValue("X-VE-Tile-Info", out tileInfo) || tileInfo != "no-tile";
}
protected static async Task<ImageSource> LoadLocalImageAsync(Uri uri)
{
var path = uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString;
if (!await Task.Run(() => File.Exists(path)))
{
return null;
}
var file = await StorageFile.GetFileFromPathAsync(path);
using (var stream = await file.OpenReadAsync())
{
var bitmapImage = new BitmapImage();
await bitmapImage.SetSourceAsync(stream);
return bitmapImage;
}
}
protected static async Task<ImageSource> LoadHttpImageAsync(Uri uri)
{
using (var response = await HttpClient.GetAsync(uri))
{
if (!response.IsSuccessStatusCode)
{
Debug.WriteLine("TileSource: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else if (IsTileAvailable(response.Headers))
{
using (var stream = new InMemoryRandomAccessStream())
{
await response.Content.WriteToStreamAsync(stream);
stream.Seek(0);
var bitmapImage = new BitmapImage();
await bitmapImage.SetSourceAsync(stream);
return bitmapImage;
}
}
}
return null;
}
}
}