diff --git a/FileDbCache/UWP/Properties/AssemblyInfo.cs b/FileDbCache/UWP/Properties/AssemblyInfo.cs index 1e68a6d6..1a040c97 100644 --- a/FileDbCache/UWP/Properties/AssemblyInfo.cs +++ b/FileDbCache/UWP/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.3.0")] -[assembly: AssemblyFileVersion("7.3.0")] +[assembly: AssemblyVersion("7.3.1")] +[assembly: AssemblyFileVersion("7.3.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/FileDbCache/WPF/FileDbCache.WPF.csproj b/FileDbCache/WPF/FileDbCache.WPF.csproj index 3b636e09..940ac014 100644 --- a/FileDbCache/WPF/FileDbCache.WPF.csproj +++ b/FileDbCache/WPF/FileDbCache.WPF.csproj @@ -5,7 +5,7 @@ MapControl.Caching XAML Map Control FileDbCache Library for WPF XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/FileDbCache/WinUI/FileDbCache.WinUI.csproj b/FileDbCache/WinUI/FileDbCache.WinUI.csproj index b961f875..9181d7f7 100644 --- a/FileDbCache/WinUI/FileDbCache.WinUI.csproj +++ b/FileDbCache/WinUI/FileDbCache.WinUI.csproj @@ -7,7 +7,7 @@ MapControl.Caching XAML Map Control FileDbCache Library for WinUI XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/MBTiles/UWP/Properties/AssemblyInfo.cs b/MBTiles/UWP/Properties/AssemblyInfo.cs index 36499c37..06916085 100644 --- a/MBTiles/UWP/Properties/AssemblyInfo.cs +++ b/MBTiles/UWP/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.3.0")] -[assembly: AssemblyFileVersion("7.3.0")] +[assembly: AssemblyVersion("7.3.1")] +[assembly: AssemblyFileVersion("7.3.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MBTiles/WPF/MBTiles.WPF.csproj b/MBTiles/WPF/MBTiles.WPF.csproj index 44af15b5..93cca5e7 100644 --- a/MBTiles/WPF/MBTiles.WPF.csproj +++ b/MBTiles/WPF/MBTiles.WPF.csproj @@ -5,7 +5,7 @@ MapControl.MBTiles XAML Map Control MBTiles Library for WPF XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/MBTiles/WinUI/MBTiles.WinUI.csproj b/MBTiles/WinUI/MBTiles.WinUI.csproj index bd2e154f..f6256972 100644 --- a/MBTiles/WinUI/MBTiles.WinUI.csproj +++ b/MBTiles/WinUI/MBTiles.WinUI.csproj @@ -7,7 +7,7 @@ MapControl.MBTiles XAML Map Control MBTiles Library for WinUI XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs index c1fb5d7e..7ef39b36 100644 --- a/MapControl/Shared/MapPanel.cs +++ b/MapControl/Shared/MapPanel.cs @@ -109,16 +109,12 @@ namespace MapControl /// /// Returns the view position of a Location. /// - public Point? GetViewPosition(Location location) + public Point GetViewPosition(Location location) { - if (location == null) - { - return null; - } - var position = parentMap.LocationToView(location); - if (parentMap.MapProjection.Type <= MapProjectionType.NormalCylindrical && IsOutsideViewport(position)) + if (parentMap.MapProjection.Type <= MapProjectionType.NormalCylindrical && + IsOutsideViewport(position)) { location = new Location(location.Latitude, parentMap.ConstrainedLongitude(location.Longitude)); @@ -144,9 +140,11 @@ namespace MapControl var center = new Point(rect.X + rect.Width / 2d, rect.Y + rect.Height / 2d); var position = parentMap.ViewTransform.MapToView(center); - if (parentMap.MapProjection.Type <= MapProjectionType.NormalCylindrical && IsOutsideViewport(position)) + if (parentMap.MapProjection.Type <= MapProjectionType.NormalCylindrical && + IsOutsideViewport(position)) { var location = parentMap.MapProjection.MapToLocation(center); + if (location != null) { location.Longitude = parentMap.ConstrainedLongitude(location.Longitude); @@ -207,7 +205,13 @@ namespace MapControl { foreach (var element in Children.OfType()) { - var position = GetViewPosition(GetLocation(element)); + Point? position = null; + var location = GetLocation(element); + + if (location != null) + { + position = GetViewPosition(location); + } SetViewPosition(element, position); diff --git a/MapControl/UWP/Properties/AssemblyInfo.cs b/MapControl/UWP/Properties/AssemblyInfo.cs index 00f234b2..7bd4d495 100644 --- a/MapControl/UWP/Properties/AssemblyInfo.cs +++ b/MapControl/UWP/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.3.0")] -[assembly: AssemblyFileVersion("7.3.0")] +[assembly: AssemblyVersion("7.3.1")] +[assembly: AssemblyFileVersion("7.3.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj index 7ddf2e3d..72d1659a 100644 --- a/MapControl/WPF/MapControl.WPF.csproj +++ b/MapControl/WPF/MapControl.WPF.csproj @@ -5,7 +5,7 @@ MapControl XAML Map Control Library for WPF XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj index 375abdb2..4c28bbcb 100644 --- a/MapControl/WinUI/MapControl.WinUI.csproj +++ b/MapControl/WinUI/MapControl.WinUI.csproj @@ -7,7 +7,7 @@ MapControl XAML Map Control Library for WinUI XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/MapProjections/UWP/Properties/AssemblyInfo.cs b/MapProjections/UWP/Properties/AssemblyInfo.cs index da4b4731..b0744eb2 100644 --- a/MapProjections/UWP/Properties/AssemblyInfo.cs +++ b/MapProjections/UWP/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.3.0")] -[assembly: AssemblyFileVersion("7.3.0")] +[assembly: AssemblyVersion("7.3.1")] +[assembly: AssemblyFileVersion("7.3.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapProjections/WPF/MapProjections.WPF.csproj b/MapProjections/WPF/MapProjections.WPF.csproj index 072b55ca..36f1c242 100644 --- a/MapProjections/WPF/MapProjections.WPF.csproj +++ b/MapProjections/WPF/MapProjections.WPF.csproj @@ -5,7 +5,7 @@ MapControl.Projections XAML Map Control Projections Library for WPF XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/MapProjections/WinUI/MapProjections.WinUI.csproj b/MapProjections/WinUI/MapProjections.WinUI.csproj index ba9872db..4dd9acd5 100644 --- a/MapProjections/WinUI/MapProjections.WinUI.csproj +++ b/MapProjections/WinUI/MapProjections.WinUI.csproj @@ -7,7 +7,7 @@ MapControl.Projections XAML Map Control Projections Library for WinUI XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/MapUiTools/UWP/Properties/AssemblyInfo.cs b/MapUiTools/UWP/Properties/AssemblyInfo.cs index 9f2abc6e..bef4d881 100644 --- a/MapUiTools/UWP/Properties/AssemblyInfo.cs +++ b/MapUiTools/UWP/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.3.0")] -[assembly: AssemblyFileVersion("7.3.0")] +[assembly: AssemblyVersion("7.3.1")] +[assembly: AssemblyFileVersion("7.3.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapUiTools/WPF/MapUiTools.WPF.csproj b/MapUiTools/WPF/MapUiTools.WPF.csproj index 65bfd448..1c31a40c 100644 --- a/MapUiTools/WPF/MapUiTools.WPF.csproj +++ b/MapUiTools/WPF/MapUiTools.WPF.csproj @@ -5,7 +5,7 @@ MapControl.UiTools XAML Map Control UI Tools Library for WPF XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/MapUiTools/WinUI/MapUiTools.WinUI.csproj b/MapUiTools/WinUI/MapUiTools.WinUI.csproj index e75ef913..3235d036 100644 --- a/MapUiTools/WinUI/MapUiTools.WinUI.csproj +++ b/MapUiTools/WinUI/MapUiTools.WinUI.csproj @@ -7,7 +7,7 @@ MapControl.UiTools XAML Map Control UI Tools Library for WinUI XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/SQLiteCache/UWP/Properties/AssemblyInfo.cs b/SQLiteCache/UWP/Properties/AssemblyInfo.cs index bf869fdd..7134fc37 100644 --- a/SQLiteCache/UWP/Properties/AssemblyInfo.cs +++ b/SQLiteCache/UWP/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.3.0")] -[assembly: AssemblyFileVersion("7.3.0")] +[assembly: AssemblyVersion("7.3.1")] +[assembly: AssemblyFileVersion("7.3.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SQLiteCache/WPF/SQLiteCache.WPF.csproj b/SQLiteCache/WPF/SQLiteCache.WPF.csproj index 8d7f7e0d..c7cba29f 100644 --- a/SQLiteCache/WPF/SQLiteCache.WPF.csproj +++ b/SQLiteCache/WPF/SQLiteCache.WPF.csproj @@ -5,7 +5,7 @@ MapControl.Caching XAML Map Control SQLiteCache Library for WPF XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj index e5987c13..93742a64 100644 --- a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj +++ b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj @@ -7,7 +7,7 @@ MapControl.Caching XAML Map Control SQLiteCache Library for WinUI XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer true diff --git a/SampleApps/ProjectionDemo/ProjectionDemo.csproj b/SampleApps/ProjectionDemo/ProjectionDemo.csproj index 3e71b436..959e7a5e 100644 --- a/SampleApps/ProjectionDemo/ProjectionDemo.csproj +++ b/SampleApps/ProjectionDemo/ProjectionDemo.csproj @@ -6,7 +6,7 @@ ProjectionDemo XAML Map Control Projection Demo Application XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer diff --git a/SampleApps/UniversalApp/MainPage.xaml b/SampleApps/UniversalApp/MainPage.xaml index 7f0a7280..10ac3536 100644 --- a/SampleApps/UniversalApp/MainPage.xaml +++ b/SampleApps/UniversalApp/MainPage.xaml @@ -197,7 +197,7 @@ - + diff --git a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs index ef270005..dad3a637 100644 --- a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs +++ b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.3.0")] -[assembly: AssemblyFileVersion("7.3.0")] +[assembly: AssemblyVersion("7.3.1")] +[assembly: AssemblyFileVersion("7.3.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml index f817f09b..3f5a7b22 100644 --- a/SampleApps/WinUiApp/MainWindow.xaml +++ b/SampleApps/WinUiApp/MainWindow.xaml @@ -204,7 +204,7 @@ - + diff --git a/SampleApps/WinUiApp/WinUiApp.csproj b/SampleApps/WinUiApp/WinUiApp.csproj index 91b39f90..80766ea2 100644 --- a/SampleApps/WinUiApp/WinUiApp.csproj +++ b/SampleApps/WinUiApp/WinUiApp.csproj @@ -11,7 +11,7 @@ SampleApplication XAML Map Control WinUI Sample Application XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer none diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml index 671bacdc..f7a540df 100644 --- a/SampleApps/WpfApplication/MainWindow.xaml +++ b/SampleApps/WpfApplication/MainWindow.xaml @@ -111,7 +111,6 @@ MinZoomLevel="2" MaxZoomLevel="21" ZoomLevel="11" MouseWheelZoomDelta="1" Center="53.5,8.2" MouseLeftButtonDown="MapMouseLeftButtonDown" - MouseRightButtonDown="MapMouseRightButtonDown" MouseMove="MapMouseMove" MouseLeave="MapMouseLeave" ManipulationInertiaStarting="MapManipulationInertiaStarting"> @@ -179,7 +178,8 @@ - + diff --git a/SampleApps/WpfApplication/MainWindow.xaml.cs b/SampleApps/WpfApplication/MainWindow.xaml.cs index 6c4c56a8..45624ce9 100644 --- a/SampleApps/WpfApplication/MainWindow.xaml.cs +++ b/SampleApps/WpfApplication/MainWindow.xaml.cs @@ -78,20 +78,10 @@ namespace SampleApplication { if (e.ClickCount == 2) { - //map.ZoomMap(e.GetPosition(map), Math.Floor(map.ZoomLevel + 1.5)); - //map.ZoomToBounds(new BoundingBox(53, 7, 54, 9)); map.TargetCenter = map.ViewToLocation(e.GetPosition(map)); } } - private void MapMouseRightButtonDown(object sender, MouseButtonEventArgs e) - { - if (e.ClickCount == 2) - { - //map.ZoomMap(e.GetPosition(map), Math.Ceiling(map.ZoomLevel - 1.5)); - } - } - private void MapMouseMove(object sender, MouseEventArgs e) { var location = map.ViewToLocation(e.GetPosition(map)); diff --git a/SampleApps/WpfApplication/WpfApplication.csproj b/SampleApps/WpfApplication/WpfApplication.csproj index a77d9798..55f11d05 100644 --- a/SampleApps/WpfApplication/WpfApplication.csproj +++ b/SampleApps/WpfApplication/WpfApplication.csproj @@ -6,7 +6,7 @@ SampleApplication XAML Map Control WPF Sample Application XAML Map Control - 7.3.0 + 7.3.1 Clemens Fischer Copyright © 2022 Clemens Fischer