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

Version 2.4.4: Fixed image swapping in MapImageLayer

Browse source
This commit is contained in:
ClemensF 2015-01-26 19:45:05 +01:00
parent 9f9669ea00
commit 6c4dc65bd4
17 changed files with 94 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs
View file

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

4
Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs
View file

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

4
Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs
View file

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

4
Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs
View file

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

16
MapControl/MapBase.cs
View file

@ -32,6 +32,7 @@ namespace MapControl
private const double MaximumZoomLevel = 22d; private const double MaximumZoomLevel = 22d;
public static double ZoomLevelSwitchDelta = 0d; public static double ZoomLevelSwitchDelta = 0d;
public static bool UpdateTilesWhileViewportChanging = true;
public static TimeSpan TileUpdateInterval = TimeSpan.FromSeconds(0.5); public static TimeSpan TileUpdateInterval = TimeSpan.FromSeconds(0.5);
public static TimeSpan AnimationDuration = TimeSpan.FromSeconds(0.3); public static TimeSpan AnimationDuration = TimeSpan.FromSeconds(0.3);
public static EasingFunctionBase AnimationEasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseOut }; public static EasingFunctionBase AnimationEasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseOut };
@ -594,8 +595,7 @@ namespace MapControl
From = mapTransform.Transform(Center), From = mapTransform.Transform(Center),
To = mapTransform.Transform(targetCenter, Center.Longitude), To = mapTransform.Transform(targetCenter, Center.Longitude),
Duration = AnimationDuration, Duration = AnimationDuration,
EasingFunction = AnimationEasingFunction, EasingFunction = AnimationEasingFunction
FillBehavior = FillBehavior.HoldEnd
}; };
centerAnimation.Completed += CenterAnimationCompleted; centerAnimation.Completed += CenterAnimationCompleted;
@ -699,8 +699,7 @@ namespace MapControl
{ {
To = targetZoomLevel, To = targetZoomLevel,
Duration = AnimationDuration, Duration = AnimationDuration,
EasingFunction = AnimationEasingFunction, EasingFunction = AnimationEasingFunction
FillBehavior = FillBehavior.HoldEnd
}; };
zoomLevelAnimation.Completed += ZoomLevelAnimationCompleted; zoomLevelAnimation.Completed += ZoomLevelAnimationCompleted;
@ -774,8 +773,7 @@ namespace MapControl
{ {
By = delta, By = delta,
Duration = AnimationDuration, Duration = AnimationDuration,
EasingFunction = AnimationEasingFunction, EasingFunction = AnimationEasingFunction
FillBehavior = FillBehavior.HoldEnd
}; };
headingAnimation.Completed += HeadingAnimationCompleted; headingAnimation.Completed += HeadingAnimationCompleted;
@ -872,6 +870,12 @@ namespace MapControl
else else
{ {
SetTileLayerTransform(); SetTileLayerTransform();
if (!UpdateTilesWhileViewportChanging)
{
tileUpdateTimer.Stop();
}
tileUpdateTimer.Start(); tileUpdateTimer.Start();
} }
} }

6
MapControl/MapImageLayer.Silverlight.WinRT.cs
View file

@ -25,7 +25,7 @@ namespace MapControl
} }
else else
{ {
BlendImages(); SwapImages();
} }
} }
@ -35,7 +35,7 @@ namespace MapControl
bitmap.ImageOpened -= BitmapImageOpened; bitmap.ImageOpened -= BitmapImageOpened;
bitmap.ImageFailed -= BitmapImageFailed; bitmap.ImageFailed -= BitmapImageFailed;
BlendImages(); SwapImages();
} }
private void BitmapImageFailed(object sender, ExceptionRoutedEventArgs e) private void BitmapImageFailed(object sender, ExceptionRoutedEventArgs e)
@ -47,7 +47,7 @@ namespace MapControl
var mapImage = (MapImage)Children[currentImageIndex]; var mapImage = (MapImage)Children[currentImageIndex];
mapImage.Source = null; mapImage.Source = null;
BlendImages(); SwapImages();
} }
} }
} }

6
MapControl/MapImageLayer.WPF.cs
View file

@ -19,7 +19,7 @@ namespace MapControl
} }
else else
{ {
BlendImages(); SwapImages();
} }
} }
@ -29,7 +29,7 @@ namespace MapControl
bitmap.DownloadCompleted -= BitmapDownloadCompleted; bitmap.DownloadCompleted -= BitmapDownloadCompleted;
bitmap.DownloadFailed -= BitmapDownloadFailed; bitmap.DownloadFailed -= BitmapDownloadFailed;
BlendImages(); SwapImages();
} }
private void BitmapDownloadFailed(object sender, ExceptionEventArgs e) private void BitmapDownloadFailed(object sender, ExceptionEventArgs e)
@ -41,7 +41,7 @@ namespace MapControl
var mapImage = (MapImage)Children[currentImageIndex]; var mapImage = (MapImage)Children[currentImageIndex];
mapImage.Source = null; mapImage.Source = null;
BlendImages(); SwapImages();
} }
} }
} }

40
MapControl/MapImageLayer.cs
View file

@ -7,10 +7,12 @@ using System.Globalization;
#if WINDOWS_RUNTIME #if WINDOWS_RUNTIME
using Windows.Foundation; using Windows.Foundation;
using Windows.UI.Xaml; using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media.Imaging; using Windows.UI.Xaml.Media.Imaging;
using Windows.UI.Xaml.Media.Animation; using Windows.UI.Xaml.Media.Animation;
#else #else
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Media.Animation; using System.Windows.Media.Animation;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using System.Windows.Threading; using System.Windows.Threading;
@ -157,37 +159,39 @@ namespace MapControl
currentImageIndex = (currentImageIndex + 1) % 2; currentImageIndex = (currentImageIndex + 1) % 2;
var mapImage = (MapImage)Children[currentImageIndex]; var mapImage = (MapImage)Children[currentImageIndex];
mapImage.North = double.NaN; // avoid frequent MapRectangle.UpdateData() calls mapImage.SetBoundingBox(west, east, south, north);
mapImage.West = west;
mapImage.East = east;
mapImage.South = south;
mapImage.North = north;
mapImage.Source = bitmap; mapImage.Source = bitmap;
ImageUpdated(bitmap); ImageUpdated(bitmap);
} }
private void BlendImages() private void SwapImages()
{ {
var topImage = (MapImage)Children[currentImageIndex]; var topImage = (MapImage)Children[currentImageIndex];
var bottomImage = (MapImage)Children[(currentImageIndex + 1) % 2]; var bottomImage = (MapImage)Children[(currentImageIndex + 1) % 2];
Canvas.SetZIndex(topImage, 1);
Canvas.SetZIndex(bottomImage, 0);
if (topImage.Source != null) if (topImage.Source != null)
{ {
topImage.BeginAnimation(UIElement.OpacityProperty, var fadeAnimation = new DoubleAnimation
new DoubleAnimation { To = 1d, Duration = Tile.OpacityAnimationDuration });
}
if (bottomImage.Source != null)
{
var fadeOutAnimation = new DoubleAnimation { To = 0d, Duration = Tile.OpacityAnimationDuration };
if (topImage.Source != null)
{ {
fadeOutAnimation.BeginTime = Tile.OpacityAnimationDuration; From = 0d,
} To = 1d,
Duration = Tile.OpacityAnimationDuration,
FillBehavior = FillBehavior.Stop
};
bottomImage.BeginAnimation(UIElement.OpacityProperty, fadeOutAnimation); fadeAnimation.Completed += (s, e) => bottomImage.Opacity = 0d;
topImage.BeginAnimation(UIElement.OpacityProperty, fadeAnimation);
topImage.Opacity = 1d;
}
else
{
topImage.Opacity = 0d;
bottomImage.Opacity = 0d;
} }
updateInProgress = false; updateInProgress = false;

49
MapControl/MapRectangle.cs
View file

@ -34,6 +34,8 @@ namespace MapControl
"North", typeof(double), typeof(MapRectangle), "North", typeof(double), typeof(MapRectangle),
new PropertyMetadata(double.NaN, (o, e) => ((MapRectangle)o).UpdateData())); new PropertyMetadata(double.NaN, (o, e) => ((MapRectangle)o).UpdateData()));
private bool updatingBoundBox;
public MapRectangle() public MapRectangle()
{ {
Data = new RectangleGeometry(); Data = new RectangleGeometry();
@ -64,28 +66,41 @@ namespace MapControl
set { SetValue(NorthProperty, value); } set { SetValue(NorthProperty, value); }
} }
public void SetBoundingBox(double west, double east, double south, double north)
{
updatingBoundBox = true;
West = west;
East = east;
South = south;
updatingBoundBox = false;
North = north;
}
protected override void UpdateData() protected override void UpdateData()
{ {
var geometry = (RectangleGeometry)Data; if (!updatingBoundBox)
if (ParentMap != null &&
!double.IsNaN(South) && !double.IsNaN(North) &&
!double.IsNaN(West) && !double.IsNaN(East) &&
South < North && West < East)
{ {
var rect = new Rect(ParentMap.MapTransform.Transform(new Location(South, West)), var geometry = (RectangleGeometry)Data;
ParentMap.MapTransform.Transform(new Location(North, East)));
var transform = ParentMap.ViewportTransform;
ScaleRect(ref rect, ref transform); if (ParentMap != null &&
!double.IsNaN(South) && !double.IsNaN(North) &&
!double.IsNaN(West) && !double.IsNaN(East) &&
South < North && West < East)
{
var rect = new Rect(ParentMap.MapTransform.Transform(new Location(South, West)),
ParentMap.MapTransform.Transform(new Location(North, East)));
var transform = ParentMap.ViewportTransform;
geometry.Rect = rect; ScaleRect(ref rect, ref transform);
RenderTransform = transform;
} geometry.Rect = rect;
else RenderTransform = transform;
{ }
geometry.ClearValue(RectangleGeometry.RectProperty); else
ClearValue(RenderTransformProperty); {
geometry.ClearValue(RectangleGeometry.RectProperty);
ClearValue(RenderTransformProperty);
}
} }
} }

4
MapControl/Properties/AssemblyInfo.cs
View file

@ -17,8 +17,8 @@ using System.Windows;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.4.3")] [assembly: AssemblyVersion("2.4.4")]
[assembly: AssemblyFileVersion("2.4.3")] [assembly: AssemblyFileVersion("2.4.4")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
MapControl/TileLayer.cs
View file

@ -222,10 +222,10 @@ namespace MapControl
var maxZoomLevel = Math.Min(zoomLevel, MaxZoomLevel); var maxZoomLevel = Math.Min(zoomLevel, MaxZoomLevel);
var minZoomLevel = MinZoomLevel; var minZoomLevel = MinZoomLevel;
if (parentMap.TileLayers.FirstOrDefault() != this) if (minZoomLevel < maxZoomLevel && this != parentMap.TileLayers.FirstOrDefault())
{ {
// do not load background tiles if this is not the base layer // do not load background tiles if this is not the base layer
minZoomLevel = Math.Max(maxZoomLevel, minZoomLevel); minZoomLevel = maxZoomLevel;
} }
for (var z = minZoomLevel; z <= maxZoomLevel; z++) for (var z = minZoomLevel; z <= maxZoomLevel; z++)

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

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

4
SampleApps/PhoneApplication/Properties/AssemblyInfo.cs
View file

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

4
SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
View file

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

4
SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
View file

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

4
SampleApps/StoreApplication/Properties/AssemblyInfo.cs
View file

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

4
SampleApps/WpfApplication/Properties/AssemblyInfo.cs
View file

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