Version 2.11.0: Fixed TargetCenter animation.

This commit is contained in:
ClemensF 2016-07-03 00:03:38 +02:00
parent 90ad98df33
commit 43672bb693
18 changed files with 57 additions and 64 deletions

View file

@ -618,6 +618,7 @@ namespace MapControl
// animate private CenterPoint property by PointAnimation
centerAnimation = new PointAnimation
{
From = mapTransform.Transform(Center),
To = mapTransform.Transform(new Location(
targetCenter.Latitude,
Location.NearestLongitude(targetCenter.Longitude, Center.Longitude))),
@ -647,6 +648,7 @@ namespace MapControl
private void CenterPointPropertyChanged(Point centerPoint)
{
System.Diagnostics.Debug.WriteLine("CenterPoint: {0}", centerPoint);
if (!internalPropertyChange)
{
centerPoint.X = Location.NormalizeLongitude(centerPoint.X);
@ -862,12 +864,7 @@ namespace MapControl
{
base.OnViewportChanged();
var viewportChanged = ViewportChanged;
if (viewportChanged != null)
{
viewportChanged(this, EventArgs.Empty);
}
ViewportChanged?.Invoke(this, EventArgs.Empty);
}
}
}

View file

@ -14,8 +14,8 @@ using System.Windows;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2016 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.10.0")]
[assembly: AssemblyFileVersion("2.10.0")]
[assembly: AssemblyVersion("2.11.0")]
[assembly: AssemblyFileVersion("2.11.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

View file

@ -271,11 +271,6 @@ namespace MapControl
return image;
}
private static string TileKey(TileSource tileSource, Tile tile)
{
return string.Format("{0:X}/{1:X}/{2:X}/{3:X}", tileSource.GetHashCode(), tile.ZoomLevel, tile.XIndex, tile.Y);
}
private static string CacheKey(string sourceName, Tile tile)
{
return string.IsNullOrEmpty(sourceName) ? null : string.Format("{0}/{1}/{2}/{3}", sourceName, tile.ZoomLevel, tile.XIndex, tile.Y);

View file

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