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

Version 4.12.2 Improved TileImageLoader.Cache

Browse source
This commit is contained in:
ClemensF 2019-07-18 21:09:54 +02:00
parent a25cc91c2f
commit 85287118a5
8 changed files with 139 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

25
MBTiles/Shared/MBTileData.cs
View file

@ -20,12 +20,12 @@ namespace MapControl.MBTiles
{
private readonly SQLiteConnection connection;
public MBTileData(string file)
private MBTileData(string file)
{
connection = new SQLiteConnection("Data Source=" + Path.GetFullPath(file));
}
public async Task OpenAsync()
private async Task OpenAsync()
{
await connection.OpenAsync();
@ -40,6 +40,15 @@ namespace MapControl.MBTiles
}
}
public static async Task<MBTileData> CreateAsync(string file)
{
var tileData = new MBTileData(file);
await tileData.OpenAsync();
return tileData;
}
public void Close()
{
connection.Close();
@ -50,9 +59,9 @@ namespace MapControl.MBTiles
connection.Dispose();
}
public async Task<IDictionary<string, string>> ReadMetadataAsync()
public async Task<IDictionary<string, string>> ReadMetaDataAsync()
{
var metadata = new Dictionary<string, string>();
var metaData = new Dictionary<string, string>();
try
{
@ -62,7 +71,7 @@ namespace MapControl.MBTiles
while (await reader.ReadAsync())
{
metadata[(string)reader["name"]] = (string)reader["value"];
metaData[(string)reader["name"]] = (string)reader["value"];
}
}
}
@ -71,16 +80,16 @@ namespace MapControl.MBTiles
Debug.WriteLine("MBTileData: " + ex.Message);
}
return metadata;
return metaData;
}
public async Task WriteMetadataAsync(IDictionary<string, string> metadata)
public async Task WriteMetaDataAsync(IDictionary<string, string> metaData)
{
try
{
using (var command = new SQLiteCommand("insert or replace into metadata (name, value) values (@n, @v)", connection))
{
foreach (var keyValue in metadata)
foreach (var keyValue in metaData)
{
command.Parameters.AddWithValue("@n", keyValue.Key);
command.Parameters.AddWithValue("@v", keyValue.Value);

4
MBTiles/Shared/MBTileLayer.cs
View file

@ -72,9 +72,7 @@ namespace MapControl.MBTiles
if (file != null)
{
mbTileSource = new MBTileSource(file);
await mbTileSource.Initialize();
mbTileSource = await MBTileSource.CreateAsync(file);
if (mbTileSource.Name != null)
{

51
MBTiles/Shared/MBTileSource.cs
View file

@ -3,6 +3,7 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
#if WINDOWS_UWP
using Windows.UI.Xaml.Media;
@ -16,47 +17,45 @@ namespace MapControl.MBTiles
{
private readonly MBTileData tileData;
public MBTileSource(string file)
public string Name { get; }
public string Description { get; }
public int? MinZoom { get; }
public int? MaxZoom { get; }
private MBTileSource(MBTileData tileData, IDictionary<string, string> metaData)
{
tileData = new MBTileData(file);
}
public string Name { get; private set; }
public string Description { get; private set; }
public int? MinZoom { get; private set; }
public int? MaxZoom { get; private set; }
public async Task Initialize()
{
await tileData.OpenAsync();
var metadata = await tileData.ReadMetadataAsync();
this.tileData = tileData;
string s;
int minZoom;
int maxZoom;
Name = (metadata.TryGetValue("name", out s)) ? s : null;
if (metaData.TryGetValue("name", out s))
{
Name = s;
}
Description = (metadata.TryGetValue("description", out s)) ? s : null;
if (metaData.TryGetValue("description", out s))
{
Description = s;
}
if (metadata.TryGetValue("minzoom", out s) && int.TryParse(s, out minZoom))
if (metaData.TryGetValue("minzoom", out s) && int.TryParse(s, out minZoom))
{
MinZoom = minZoom;
}
else
{
MinZoom = null;
}
if (metadata.TryGetValue("maxzoom", out s) && int.TryParse(s, out maxZoom))
if (metaData.TryGetValue("maxzoom", out s) && int.TryParse(s, out maxZoom))
{
MaxZoom = maxZoom;
}
else
{
MaxZoom = null;
}
}
public static async Task<MBTileSource> CreateAsync(string file)
{
var tileData = await MBTileData.CreateAsync(file);
return new MBTileSource(tileData, await tileData.ReadMetaDataAsync());
}
public void Dispose()