From 12a49f0881b9666e40a9e9202c446b7fa2b78556 Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Fri, 31 May 2024 09:17:44 +0200
Subject: [PATCH] Sample applications DoubleTapped handling

---
 SampleApps/AvaloniaApp/MainWindow.axaml    | 4 ++--
 SampleApps/AvaloniaApp/MainWindow.axaml.cs | 6 +++---
 SampleApps/WinUiApp/MainWindow.xaml        | 6 ++++--
 SampleApps/WinUiApp/MainWindow.xaml.cs     | 9 +++++++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/SampleApps/AvaloniaApp/MainWindow.axaml b/SampleApps/AvaloniaApp/MainWindow.axaml
index 2b843cb1..6148cba6 100644
--- a/SampleApps/AvaloniaApp/MainWindow.axaml
+++ b/SampleApps/AvaloniaApp/MainWindow.axaml
@@ -14,12 +14,12 @@
                  ZoomLevel="11" MinZoomLevel="3"
                  Center="53.5,8.2"
                  ManipulationModes="All"
-                 DoubleTapped="OnMapDoubleTapped">
+                 DoubleTapped="MapDoubleTapped">
 
             <map:MapItemsControl ItemsSource="{Binding Pushpins}"
                                  SelectedItem="{Binding SelectedPushpin}"
                                  SelectionMode="Multiple"
-                                 DoubleTapped="OnMapItemsControlDoubleTapped">
+                                 DoubleTapped="MapItemsControlDoubleTapped">
                 <map:MapItemsControl.Styles>
                     <Style Selector="map|MapItem">
                         <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>
diff --git a/SampleApps/AvaloniaApp/MainWindow.axaml.cs b/SampleApps/AvaloniaApp/MainWindow.axaml.cs
index e0d05e3e..60932d43 100644
--- a/SampleApps/AvaloniaApp/MainWindow.axaml.cs
+++ b/SampleApps/AvaloniaApp/MainWindow.axaml.cs
@@ -72,12 +72,12 @@ namespace SampleApplication
 
         partial void AddTestLayers();
 
-        private void OnMapItemsControlDoubleTapped(object sender, TappedEventArgs e)
+        private void MapItemsControlDoubleTapped(object sender, TappedEventArgs e)
         {
-            e.Handled = true; // prevent OnMapDoubleTapped
+            e.Handled = true; // prevent MapDoubleTapped
         }
 
-        private void OnMapDoubleTapped(object sender, TappedEventArgs e)
+        private void MapDoubleTapped(object sender, TappedEventArgs e)
         {
             map.TargetCenter = map.ViewToLocation(e.GetPosition(map));
         }
diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml
index 6f60f29d..0eb863c6 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml
+++ b/SampleApps/WinUiApp/MainWindow.xaml
@@ -169,13 +169,15 @@
             <map:MapItemsControl ItemContainerStyle="{StaticResource PointItemStyle}"
                                  ItemsSource="{Binding Points}"
                                  SelectionMode="Multiple"
-                                 LocationMemberPath="Location"/>
+                                 LocationMemberPath="Location"
+                                 DoubleTapped="MapItemsControlDoubleTapped"/>
 
             <map:MapItemsControl ItemContainerStyle="{StaticResource PushpinItemStyle}"
                                  ItemsSource="{Binding Pushpins}"
                                  SelectedItem="{Binding SelectedPushpin, Mode=TwoWay}"
                                  SelectionMode="Multiple"
-                                 LocationMemberPath="Location"/>
+                                 LocationMemberPath="Location"
+                                 DoubleTapped="MapItemsControlDoubleTapped"/>
 
             <map:MapPath Location="53.5,8.2" Stroke="Blue" StrokeThickness="3" Fill="#1F007F00">
                 <map:MapPath.Data>
diff --git a/SampleApps/WinUiApp/MainWindow.xaml.cs b/SampleApps/WinUiApp/MainWindow.xaml.cs
index 28929020..e7c5640f 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml.cs
+++ b/SampleApps/WinUiApp/MainWindow.xaml.cs
@@ -82,9 +82,9 @@ namespace SampleApplication
 
         partial void AddTestLayers();
 
-        private void ResetHeadingButtonClick(object sender, RoutedEventArgs e)
+        private void MapItemsControlDoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
         {
-            map.TargetHeading = 0d;
+            e.Handled = true; // prevent MapDoubleTapped
         }
 
         private void MapDoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
@@ -92,6 +92,11 @@ namespace SampleApplication
             map.TargetCenter = map.ViewToLocation(e.GetPosition(map));
         }
 
+        private void ResetHeadingButtonClick(object sender, RoutedEventArgs e)
+        {
+            map.TargetHeading = 0d;
+        }
+
         private async void MapPointerPressed(object sender, PointerRoutedEventArgs e)
         {
             if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse)