From 40305cf9c063cff451e297b8a93b56b3984b191c Mon Sep 17 00:00:00 2001 From: ClemensF Date: Sun, 2 Dec 2018 20:22:59 +0100 Subject: [PATCH] Version 4.12. --- FileDbCache/UWP/Properties/AssemblyInfo.cs | 4 ++-- FileDbCache/WPF/Properties/AssemblyInfo.cs | 4 ++-- MBTiles/UWP/Properties/AssemblyInfo.cs | 4 ++-- MBTiles/WPF/Properties/AssemblyInfo.cs | 4 ++-- MapControl/Shared/MapPanel.cs | 10 ++++++---- MapControl/Shared/Tile.cs | 4 +++- MapControl/UWP/Properties/AssemblyInfo.cs | 4 ++-- MapControl/WPF/Properties/AssemblyInfo.cs | 4 ++-- MapProjections/UWP/Properties/AssemblyInfo.cs | 4 ++-- MapProjections/WPF/Properties/AssemblyInfo.cs | 4 ++-- SampleApps/UniversalApp/Properties/AssemblyInfo.cs | 4 ++-- SampleApps/UniversalApp/UniversalApp.csproj | 2 +- SampleApps/WpfApplication/Properties/AssemblyInfo.cs | 4 ++-- 13 files changed, 30 insertions(+), 26 deletions(-) diff --git a/FileDbCache/UWP/Properties/AssemblyInfo.cs b/FileDbCache/UWP/Properties/AssemblyInfo.cs index 13aca78a..44713270 100644 --- a/FileDbCache/UWP/Properties/AssemblyInfo.cs +++ b/FileDbCache/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2018 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.11.0")] -[assembly: AssemblyFileVersion("4.11.0")] +[assembly: AssemblyVersion("4.12.0")] +[assembly: AssemblyFileVersion("4.12.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/FileDbCache/WPF/Properties/AssemblyInfo.cs b/FileDbCache/WPF/Properties/AssemblyInfo.cs index ef794a5e..f27e68d3 100644 --- a/FileDbCache/WPF/Properties/AssemblyInfo.cs +++ b/FileDbCache/WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2018 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.11.0")] -[assembly: AssemblyFileVersion("4.11.0")] +[assembly: AssemblyVersion("4.12.0")] +[assembly: AssemblyFileVersion("4.12.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MBTiles/UWP/Properties/AssemblyInfo.cs b/MBTiles/UWP/Properties/AssemblyInfo.cs index 2113eeaa..21b90c00 100644 --- a/MBTiles/UWP/Properties/AssemblyInfo.cs +++ b/MBTiles/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2018 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.11.0")] -[assembly: AssemblyFileVersion("4.11.0")] +[assembly: AssemblyVersion("4.12.0")] +[assembly: AssemblyFileVersion("4.12.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MBTiles/WPF/Properties/AssemblyInfo.cs b/MBTiles/WPF/Properties/AssemblyInfo.cs index 6cba3820..933f3c1a 100644 --- a/MBTiles/WPF/Properties/AssemblyInfo.cs +++ b/MBTiles/WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2018 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.11.0")] -[assembly: AssemblyFileVersion("4.11.0")] +[assembly: AssemblyVersion("4.12.0")] +[assembly: AssemblyFileVersion("4.12.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs index 6e1db748..ba6cab41 100644 --- a/MapControl/Shared/MapPanel.cs +++ b/MapControl/Shared/MapPanel.cs @@ -341,14 +341,16 @@ namespace MapControl var rotateTransform = element.RenderTransform as RotateTransform; - if (rotateTransform == null) + if (rotateTransform != null) { - rotateTransform = new RotateTransform(); + rotateTransform.Angle = rotation; + } + else if (rotation != 0d) + { + rotateTransform = new RotateTransform { Angle = rotation }; element.RenderTransform = rotateTransform; element.RenderTransformOrigin = new Point(0.5, 0.5); } - - rotateTransform.Angle = rotation; } } } diff --git a/MapControl/Shared/Tile.cs b/MapControl/Shared/Tile.cs index a22f631d..ee373db8 100644 --- a/MapControl/Shared/Tile.cs +++ b/MapControl/Shared/Tile.cs @@ -6,10 +6,12 @@ using System; #if WINDOWS_UWP using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Media.Animation; #else using System.Windows; using System.Windows.Controls; +using System.Windows.Media; using System.Windows.Media.Animation; #endif @@ -22,7 +24,7 @@ namespace MapControl public readonly int ZoomLevel; public readonly int X; public readonly int Y; - public readonly Image Image = new Image { Opacity = 0d }; + public readonly Image Image = new Image { Opacity = 0d, Stretch = Stretch.Fill }; public Tile(int zoomLevel, int x, int y) { diff --git a/MapControl/UWP/Properties/AssemblyInfo.cs b/MapControl/UWP/Properties/AssemblyInfo.cs index b9cc54f3..44dde4f1 100644 --- a/MapControl/UWP/Properties/AssemblyInfo.cs +++ b/MapControl/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2018 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.11.0")] -[assembly: AssemblyFileVersion("4.11.0")] +[assembly: AssemblyVersion("4.12.0")] +[assembly: AssemblyFileVersion("4.12.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WPF/Properties/AssemblyInfo.cs b/MapControl/WPF/Properties/AssemblyInfo.cs index d25b20f1..91950dd4 100644 --- a/MapControl/WPF/Properties/AssemblyInfo.cs +++ b/MapControl/WPF/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ using System.Windows; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2018 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.11.0")] -[assembly: AssemblyFileVersion("4.11.0")] +[assembly: AssemblyVersion("4.12.0")] +[assembly: AssemblyFileVersion("4.12.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapProjections/UWP/Properties/AssemblyInfo.cs b/MapProjections/UWP/Properties/AssemblyInfo.cs index d79ec4aa..97f7b754 100644 --- a/MapProjections/UWP/Properties/AssemblyInfo.cs +++ b/MapProjections/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2018 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.11.0")] -[assembly: AssemblyFileVersion("4.11.0")] +[assembly: AssemblyVersion("4.12.0")] +[assembly: AssemblyFileVersion("4.12.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapProjections/WPF/Properties/AssemblyInfo.cs b/MapProjections/WPF/Properties/AssemblyInfo.cs index d1dff1cc..05c9b638 100644 --- a/MapProjections/WPF/Properties/AssemblyInfo.cs +++ b/MapProjections/WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2018 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.11.0")] -[assembly: AssemblyFileVersion("4.11.0")] +[assembly: AssemblyVersion("4.12.0")] +[assembly: AssemblyFileVersion("4.12.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs index 6b41befb..11747a8f 100644 --- a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs +++ b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("© 2018 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("4.11.0")] -[assembly: AssemblyFileVersion("4.11.0")] +[assembly: AssemblyVersion("4.12.0")] +[assembly: AssemblyFileVersion("4.12.0")] [assembly: AssemblyConfiguration("")] [assembly: ComVisible(false)] diff --git a/SampleApps/UniversalApp/UniversalApp.csproj b/SampleApps/UniversalApp/UniversalApp.csproj index d71fe532..dcc7a537 100644 --- a/SampleApps/UniversalApp/UniversalApp.csproj +++ b/SampleApps/UniversalApp/UniversalApp.csproj @@ -152,7 +152,7 @@ - 6.1.9 + 6.2.2 diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs index 14c4ece5..e8ecc673 100644 --- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2018 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.11.0")] -[assembly: AssemblyFileVersion("4.11.0")] +[assembly: AssemblyVersion("4.12.0")] +[assembly: AssemblyFileVersion("4.12.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)]