From 49bd02863aa72bbce48e0e5ca9c7e658e27c24bc Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Sun, 25 Aug 2024 18:02:23 +0200
Subject: [PATCH] Sample Applications DoubleTapped

---
 SampleApps/AvaloniaApp/MainWindow.axaml    |  3 +--
 SampleApps/AvaloniaApp/MainWindow.axaml.cs | 19 ++++++-------------
 SampleApps/WinUiApp/MainWindow.xaml        |  6 ++----
 SampleApps/WinUiApp/MainWindow.xaml.cs     | 10 ++++------
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/SampleApps/AvaloniaApp/MainWindow.axaml b/SampleApps/AvaloniaApp/MainWindow.axaml
index bf1a4743..a13230c9 100644
--- a/SampleApps/AvaloniaApp/MainWindow.axaml
+++ b/SampleApps/AvaloniaApp/MainWindow.axaml
@@ -64,8 +64,7 @@
             <map:MapItemsControl ItemsSource="{Binding Pushpins}"
                                  SelectedItem="{Binding SelectedPushpin}"
                                  SelectionMode="Multiple"
-                                 SelectionChanged="MapItemsControlSelectionChanged"
-                                 DoubleTapped="MapItemsControlDoubleTapped">
+                                 SelectionChanged="MapItemsControlSelectionChanged">
                 <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 f5993c56..997d3ec1 100644
--- a/SampleApps/AvaloniaApp/MainWindow.axaml.cs
+++ b/SampleApps/AvaloniaApp/MainWindow.axaml.cs
@@ -36,14 +36,12 @@ namespace SampleApplication
             map.TargetHeading = 0d;
         }
 
-        private void MapItemsControlDoubleTapped(object sender, TappedEventArgs e)
-        {
-            e.Handled = true; // prevent MapDoubleTapped
-        }
-
         private void MapDoubleTapped(object sender, TappedEventArgs e)
         {
-            map.TargetCenter = map.ViewToLocation(e.GetPosition(map));
+            if (e.Source == map)
+            {
+                map.TargetCenter = map.ViewToLocation(e.GetPosition(map));
+            }
         }
 
         private void MapPointerPressed(object sender, PointerPressedEventArgs e)
@@ -52,11 +50,7 @@ namespace SampleApplication
             {
                 var point = e.GetCurrentPoint(map);
 
-                if (point.Properties.IsLeftButtonPressed)
-                {
-                    map.Cursor = new Cursor(StandardCursorType.Hand);
-                }
-                else if (point.Properties.IsRightButtonPressed)
+                if (point.Properties.IsRightButtonPressed)
                 {
                     e.Pointer.Capture(map);
                     var location = map.ViewToLocation(point.Position);
@@ -76,11 +70,10 @@ namespace SampleApplication
             if (e.Pointer.Captured == map)
             {
                 e.Pointer.Capture(null);
+                map.Cursor = null;
                 measurementLine.IsVisible = false;
                 measurementLine.Locations = null;
             }
-
-            map.Cursor = null;
         }
 
         private void MapPointerMoved(object sender, PointerEventArgs e)
diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml
index def0d22a..9cbcd873 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml
+++ b/SampleApps/WinUiApp/MainWindow.xaml
@@ -163,16 +163,14 @@
             <map:MapItemsControl ItemContainerStyle="{StaticResource PointItemStyle}"
                                  ItemsSource="{Binding Points}"
                                  SelectionMode="Multiple"
-                                 LocationMemberPath="Location"
-                                 DoubleTapped="MapItemsControlDoubleTapped"/>
+                                 LocationMemberPath="Location"/>
 
             <map:MapItemsControl ItemContainerStyle="{StaticResource PushpinItemStyle}"
                                  ItemsSource="{Binding Pushpins}"
                                  SelectedItem="{Binding SelectedPushpin, Mode=TwoWay}"
                                  SelectionMode="Multiple"
                                  LocationMemberPath="Location"
-                                 SelectionChanged="MapItemsControlSelectionChanged"
-                                 DoubleTapped="MapItemsControlDoubleTapped"/>
+                                 SelectionChanged="MapItemsControlSelectionChanged"/>
 
             <map:MapPath Location="53.5,8.2" Stroke="Blue" StrokeThickness="3" Fill="#1F007F00" IsHitTestVisible="False">
                 <map:MapPath.Data>
diff --git a/SampleApps/WinUiApp/MainWindow.xaml.cs b/SampleApps/WinUiApp/MainWindow.xaml.cs
index 661ad9ff..cc203d27 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml.cs
+++ b/SampleApps/WinUiApp/MainWindow.xaml.cs
@@ -36,14 +36,12 @@ namespace SampleApplication
             Debug.WriteLine("SelectedItems: " + string.Join(", ", ((MapItemsControl)sender).SelectedItems.OfType<PointItem>().Select(item => item.Name)));
         }
 
-        private void MapItemsControlDoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
-        {
-            e.Handled = true; // prevent MapDoubleTapped
-        }
-
         private void MapDoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
         {
-            map.TargetCenter = map.ViewToLocation(e.GetPosition(map));
+            if (e.OriginalSource is Map map)
+            {
+                map.TargetCenter = map.ViewToLocation(e.GetPosition(map));
+            }
         }
 
         private void ResetHeadingButtonClick(object sender, RoutedEventArgs e)