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

Check format in MBTileSource

Browse source
This commit is contained in:
Clemens 2021-11-10 22:31:06 +01:00
parent 8c4952f83b
commit f2204fa6c0
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MBTiles/Shared/MBTileLayer.cs
View file

@ -39,7 +39,7 @@ namespace MapControl.MBTiles
}
/// <summary>
/// May be overridden to create a derived MBTileSource that handles other tile formats than png and jpg, e.g. pbf.
/// May be overridden to create a derived MBTileSource that handles other tile formats than png and jpg.
/// </summary>
protected virtual MBTileSource CreateTileSource(MBTileData tileData)
{

29
MBTiles/Shared/MBTileSource.cs
View file

@ -3,6 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
using System.Diagnostics;
using System.Threading.Tasks;
#if WINUI
using Microsoft.UI.Xaml.Media;
@ -20,17 +21,27 @@ namespace MapControl.MBTiles
public MBTileSource(MBTileData tiledata)
{
TileData = tiledata;
var format = tiledata.Metadata["format"];
if (format == "png" || format == "jpg")
{
TileData = tiledata;
}
else
{
Debug.WriteLine($"MBTileSource: unsupported format '{format}'");
}
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing)
{
if (disposing)
if (disposing && TileData != null)
{
TileData.Dispose();
}
@ -38,9 +49,19 @@ namespace MapControl.MBTiles
public override async Task<ImageSource> LoadImageAsync(int x, int y, int zoomLevel)
{
var buffer = await TileData.ReadImageBufferAsync(x, y, zoomLevel);
ImageSource image = null;
return buffer != null ? await ImageLoader.LoadImageAsync(buffer) : null;
if (TileData != null)
{
var buffer = await TileData.ReadImageBufferAsync(x, y, zoomLevel);
if (buffer != null)
{
image = await ImageLoader.LoadImageAsync(buffer);
}
}
return image;
}
}
}