ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-04 22:18:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

91
MBTiles/Shared/MBTileLayer.cs
View file

@ -2,6 +2,7 @@
// © 2018 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
using System.Threading.Tasks;
#if WINDOWS_UWP
using Windows.UI.Xaml;
#else
@ -14,7 +15,7 @@ namespace MapControl
{
public static readonly DependencyProperty FileProperty = DependencyProperty.Register(
nameof(File), typeof(string), typeof(MBTileLayer),
new PropertyMetadata(null, (o, e) => ((MBTileLayer)o).FilePropertyChanged((string)e.NewValue)));
new PropertyMetadata(null, async (o, e) => await ((MBTileLayer)o).FilePropertyChanged((string)e.NewValue)));
public MBTileLayer()
: this(new TileImageLoader())
@ -32,67 +33,67 @@ namespace MapControl
set { SetValue(FileProperty, value); }
}
private void FilePropertyChanged(string file)
private async Task FilePropertyChanged(string file)
{
MBTileSource ts;
var mbTileSource = TileSource as MBTileSource;
if (mbTileSource != null)
{
if (file == null)
{
ClearValue(TileSourceProperty);
if (mbTileSource.Name != null)
{
ClearValue(SourceNameProperty);
}
if (mbTileSource.Description != null)
{
ClearValue(DescriptionProperty);
}
if (mbTileSource.MinZoom.HasValue)
{
ClearValue(MinZoomLevelProperty);
}
if (mbTileSource.MaxZoom.HasValue)
{
ClearValue(MaxZoomLevelProperty);
}
}
mbTileSource.Dispose();
}
if (file != null)
{
ts = new MBTileSource(file);
mbTileSource = new MBTileSource(file);
if (ts.Metadata.ContainsKey("name"))
await mbTileSource.Initialize();
if (mbTileSource.Name != null)
{
SourceName = ts.Metadata["name"];
SourceName = mbTileSource.Name;
}
if (ts.Metadata.ContainsKey("description"))
if (mbTileSource.Description != null)
{
Description = ts.Metadata["description"];
Description = mbTileSource.Description;
}
if (ts.Metadata.ContainsKey("minzoom"))
if (mbTileSource.MinZoom.HasValue)
{
int minZoom;
if (int.TryParse(ts.Metadata["minzoom"], out minZoom))
{
MinZoomLevel = minZoom;
}
MinZoomLevel = mbTileSource.MinZoom.Value;
}
if (ts.Metadata.ContainsKey("maxzoom"))
if (mbTileSource.MaxZoom.HasValue)
{
int maxZoom;
if (int.TryParse(ts.Metadata["maxzoom"], out maxZoom))
{
MaxZoomLevel = maxZoom;
}
MaxZoomLevel = mbTileSource.MaxZoom.Value;
}
TileSource = ts;
}
else if ((ts = TileSource as MBTileSource) != null)
{
ClearValue(TileSourceProperty);
if (ts.Metadata.ContainsKey("name"))
{
ClearValue(SourceNameProperty);
}
if (ts.Metadata.ContainsKey("description"))
{
ClearValue(DescriptionProperty);
}
if (ts.Metadata.ContainsKey("minzoom"))
{
ClearValue(MinZoomLevelProperty);
}
if (ts.Metadata.ContainsKey("maxzoom"))
{
ClearValue(MaxZoomLevelProperty);
}
TileSource = mbTileSource;
}
}
}