From d041fecce933f57f6816182e6cbc45792ee06f24 Mon Sep 17 00:00:00 2001 From: ClemensF Date: Sun, 24 May 2020 21:00:07 +0200 Subject: [PATCH] Version 5.2.1. Fixed Map.UWP OnManipulationDelta --- FileDbCache/UWP/Properties/AssemblyInfo.cs | 4 +-- FileDbCache/WPF/FileDbCache.WPF.csproj | 2 +- MBTiles/UWP/Properties/AssemblyInfo.cs | 4 +-- MBTiles/WPF/MBTiles.WPF.csproj | 2 +- MapControl/UWP/Map.UWP.cs | 28 +++++++++++++++++-- MapControl/UWP/Properties/AssemblyInfo.cs | 4 +-- MapControl/WPF/MapControl.WPF.csproj | 2 +- MapImages/UWP/Properties/AssemblyInfo.cs | 4 +-- MapImages/WPF/MapImages.WPF.csproj | 2 +- MapProjections/UWP/Properties/AssemblyInfo.cs | 4 +-- MapProjections/WPF/MapProjections.WPF.csproj | 2 +- SQLiteCache/UWP/Properties/AssemblyInfo.cs | 4 +-- SQLiteCache/WPF/SQLiteCache.WPF.csproj | 2 +- .../UniversalApp/Properties/AssemblyInfo.cs | 4 +-- .../WpfApplication/WpfApplication.csproj | 2 +- 15 files changed, 47 insertions(+), 23 deletions(-) diff --git a/FileDbCache/UWP/Properties/AssemblyInfo.cs b/FileDbCache/UWP/Properties/AssemblyInfo.cs index 3a05b37f..46793698 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("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.2.0")] -[assembly: AssemblyFileVersion("5.2.0")] +[assembly: AssemblyVersion("5.2.1")] +[assembly: AssemblyFileVersion("5.2.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/FileDbCache/WPF/FileDbCache.WPF.csproj b/FileDbCache/WPF/FileDbCache.WPF.csproj index 38382ce4..e9a56c2f 100644 --- a/FileDbCache/WPF/FileDbCache.WPF.csproj +++ b/FileDbCache/WPF/FileDbCache.WPF.csproj @@ -9,7 +9,7 @@ ..\..\MapControl.snk false XAML Map Control - 5.2.0 + 5.2.1 ObjectCache implementation based on EzTools FileDb Clemens Fischer Copyright © 2020 Clemens Fischer diff --git a/MBTiles/UWP/Properties/AssemblyInfo.cs b/MBTiles/UWP/Properties/AssemblyInfo.cs index fad219e5..3a0d930b 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("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.2.0")] -[assembly: AssemblyFileVersion("5.2.0")] +[assembly: AssemblyVersion("5.2.1")] +[assembly: AssemblyFileVersion("5.2.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MBTiles/WPF/MBTiles.WPF.csproj b/MBTiles/WPF/MBTiles.WPF.csproj index 512473f4..f986f1f1 100644 --- a/MBTiles/WPF/MBTiles.WPF.csproj +++ b/MBTiles/WPF/MBTiles.WPF.csproj @@ -9,7 +9,7 @@ ..\..\MapControl.snk false XAML Map Control - 5.2.0 + 5.2.1 MBTiles Support Library for XAML Map Control Clemens Fischer Copyright © 2020 Clemens Fischer diff --git a/MapControl/UWP/Map.UWP.cs b/MapControl/UWP/Map.UWP.cs index 3d21c01c..cd0f8209 100644 --- a/MapControl/UWP/Map.UWP.cs +++ b/MapControl/UWP/Map.UWP.cs @@ -2,6 +2,8 @@ // © 2020 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) +using System; +using Windows.UI.Core; using Windows.UI.Xaml; using Windows.UI.Xaml.Input; @@ -15,6 +17,11 @@ namespace MapControl public static readonly DependencyProperty MouseWheelZoomDeltaProperty = DependencyProperty.Register( nameof(MouseWheelZoomDelta), typeof(double), typeof(Map), new PropertyMetadata(1d)); + private Vector transformTranslation; + private double transformRotation; + private double transformScale = 1d; + private bool transformPending; + public Map() { ManipulationMode = ManipulationModes.Scale @@ -36,9 +43,26 @@ namespace MapControl set { SetValue(MouseWheelZoomDeltaProperty, value); } } - private void OnManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e) + private async void OnManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e) { - TransformMap(e.Position, e.Delta.Translation, e.Delta.Rotation, e.Delta.Scale); + transformTranslation.X += e.Delta.Translation.X; + transformTranslation.Y += e.Delta.Translation.Y; + transformRotation += e.Delta.Rotation; + transformScale *= e.Delta.Scale; + + if (!transformPending) + { + transformPending = true; + + await Dispatcher.RunAsync(CoreDispatcherPriority.Low, + () => TransformMap(e.Position, transformTranslation, transformRotation, transformScale)); + + transformTranslation.X = 0d; + transformTranslation.Y = 0d; + transformRotation = 0d; + transformScale = 1d; + transformPending = false; + } } private void OnPointerWheelChanged(object sender, PointerRoutedEventArgs e) diff --git a/MapControl/UWP/Properties/AssemblyInfo.cs b/MapControl/UWP/Properties/AssemblyInfo.cs index 76cc5935..93ff48b6 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("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.2.0")] -[assembly: AssemblyFileVersion("5.2.0")] +[assembly: AssemblyVersion("5.2.1")] +[assembly: AssemblyFileVersion("5.2.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj index f9f0be75..d1bf9dee 100644 --- a/MapControl/WPF/MapControl.WPF.csproj +++ b/MapControl/WPF/MapControl.WPF.csproj @@ -9,7 +9,7 @@ ..\..\MapControl.snk false XAML Map Control - 5.2.0 + 5.2.1 XAML Map Control Library Clemens Fischer Copyright © 2020 Clemens Fischer diff --git a/MapImages/UWP/Properties/AssemblyInfo.cs b/MapImages/UWP/Properties/AssemblyInfo.cs index e1ca5c47..1f14c66f 100644 --- a/MapImages/UWP/Properties/AssemblyInfo.cs +++ b/MapImages/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.2.0")] -[assembly: AssemblyFileVersion("5.2.0")] +[assembly: AssemblyVersion("5.2.1")] +[assembly: AssemblyFileVersion("5.2.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapImages/WPF/MapImages.WPF.csproj b/MapImages/WPF/MapImages.WPF.csproj index 2511bb37..301ba869 100644 --- a/MapImages/WPF/MapImages.WPF.csproj +++ b/MapImages/WPF/MapImages.WPF.csproj @@ -9,7 +9,7 @@ ..\..\MapControl.snk false XAML Map Control - 5.2.0 + 5.2.1 Image Support Library for XAML Map Control Clemens Fischer Copyright © 2020 Clemens Fischer diff --git a/MapProjections/UWP/Properties/AssemblyInfo.cs b/MapProjections/UWP/Properties/AssemblyInfo.cs index 060a1bf1..e0bfb34c 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("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.2.0")] -[assembly: AssemblyFileVersion("5.2.0")] +[assembly: AssemblyVersion("5.2.1")] +[assembly: AssemblyFileVersion("5.2.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapProjections/WPF/MapProjections.WPF.csproj b/MapProjections/WPF/MapProjections.WPF.csproj index 9c0c23b5..11d5517c 100644 --- a/MapProjections/WPF/MapProjections.WPF.csproj +++ b/MapProjections/WPF/MapProjections.WPF.csproj @@ -9,7 +9,7 @@ ..\..\MapControl.snk false XAML Map Control - 5.2.0 + 5.2.1 Map Projections Library for XAML Map Control Clemens Fischer Copyright © 2020 Clemens Fischer diff --git a/SQLiteCache/UWP/Properties/AssemblyInfo.cs b/SQLiteCache/UWP/Properties/AssemblyInfo.cs index 94237413..18692cbb 100644 --- a/SQLiteCache/UWP/Properties/AssemblyInfo.cs +++ b/SQLiteCache/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.2.0")] -[assembly: AssemblyFileVersion("5.2.0")] +[assembly: AssemblyVersion("5.2.1")] +[assembly: AssemblyFileVersion("5.2.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SQLiteCache/WPF/SQLiteCache.WPF.csproj b/SQLiteCache/WPF/SQLiteCache.WPF.csproj index f22b9dfb..4f4621e9 100644 --- a/SQLiteCache/WPF/SQLiteCache.WPF.csproj +++ b/SQLiteCache/WPF/SQLiteCache.WPF.csproj @@ -9,7 +9,7 @@ ..\..\MapControl.snk false XAML Map Control - 5.2.0 + 5.2.1 ObjectCache implementation based on SQLite Clemens Fischer Copyright © 2020 Clemens Fischer diff --git a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs index 6ed6e7ed..41860168 100644 --- a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs +++ b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("5.2.0")] -[assembly: AssemblyFileVersion("5.2.0")] +[assembly: AssemblyVersion("5.2.1")] +[assembly: AssemblyFileVersion("5.2.1")] [assembly: AssemblyConfiguration("")] [assembly: ComVisible(false)] diff --git a/SampleApps/WpfApplication/WpfApplication.csproj b/SampleApps/WpfApplication/WpfApplication.csproj index 4afc4b79..2a5523db 100644 --- a/SampleApps/WpfApplication/WpfApplication.csproj +++ b/SampleApps/WpfApplication/WpfApplication.csproj @@ -6,7 +6,7 @@ true WpfApplication XAML Map Control - 5.2.0 + 5.2.1 XAML Map Control WPF Sample Application Clemens Fischer Copyright © 2020 Clemens Fischer