From f478bf5c3bf1a0e35711c9e210578dc9af485354 Mon Sep 17 00:00:00 2001
From: Clemens <fischer.clemens@gmail.com>
Date: Mon, 6 Dec 2021 17:54:46 +0100
Subject: [PATCH] Added Heading Reset Button to sample applications

---
 SampleApps/Shared/ValueConverters.cs         | 38 ++++++++++++++++++++
 SampleApps/UniversalApp/MainPage.xaml        | 26 +++++++++-----
 SampleApps/UniversalApp/MainPage.xaml.cs     |  7 +++-
 SampleApps/UniversalApp/UniversalApp.csproj  |  3 ++
 SampleApps/WinUiApp/MainWindow.xaml          | 26 +++++++++-----
 SampleApps/WinUiApp/MainWindow.xaml.cs       |  7 +++-
 SampleApps/WpfApplication/MainWindow.xaml    | 12 +++++++
 SampleApps/WpfApplication/MainWindow.xaml.cs |  7 +++-
 8 files changed, 107 insertions(+), 19 deletions(-)
 create mode 100644 SampleApps/Shared/ValueConverters.cs

diff --git a/SampleApps/Shared/ValueConverters.cs b/SampleApps/Shared/ValueConverters.cs
new file mode 100644
index 00000000..dced2c50
--- /dev/null
+++ b/SampleApps/Shared/ValueConverters.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Globalization;
+#if WINUI
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+#elif UWP
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+#else
+using System.Windows;
+using System.Windows.Data;
+#endif
+
+namespace SampleApplication
+{
+    public class HeadingToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            return (double)value != 0d ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Convert(value, targetType, parameter, "");
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return ConvertBack(value, targetType, parameter, "");
+        }
+    }
+}
\ No newline at end of file
diff --git a/SampleApps/UniversalApp/MainPage.xaml b/SampleApps/UniversalApp/MainPage.xaml
index 46483743..ab28fcde 100644
--- a/SampleApps/UniversalApp/MainPage.xaml
+++ b/SampleApps/UniversalApp/MainPage.xaml
@@ -1,9 +1,8 @@
-<Page
-    x:Class="SampleApplication.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:map="using:MapControl"
-    xmlns:local="using:SampleApplication">
+<Page x:Class="SampleApplication.MainPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:map="using:MapControl"
+      xmlns:local="using:SampleApplication">
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.Resources>
@@ -84,8 +83,8 @@
             <local:MapViewModel/>
         </Grid.DataContext>
 
-        <map:Map x:Name="map"
-                 MinZoomLevel="2" MaxZoomLevel="21" ZoomLevel="11" ManipulationMode="All"
+        <map:Map x:Name="map" ManipulationMode="All"
+                 MinZoomLevel="2" MaxZoomLevel="21" ZoomLevel="11"
                  MapLayer="{Binding MapLayers[OpenStreetMap]}"
                  PointerMoved="MapPointerMoved"
                  PointerExited="MapPointerExited">
@@ -131,6 +130,17 @@
                     Minimum="{Binding MinZoomLevel, ElementName=map}"
                     Maximum="{Binding MaxZoomLevel, ElementName=map}"
                     Value="{Binding TargetZoomLevel, ElementName=map, Mode=TwoWay}"/>
+
+            <Button Margin="2" Padding="8" ToolTipService.ToolTip="Reset Heading" Click="ResetHeadingButtonClick">
+                <Button.Visibility>
+                    <Binding Path="Heading" ElementName="map">
+                        <Binding.Converter>
+                            <local:HeadingToVisibilityConverter/>
+                        </Binding.Converter>
+                    </Binding>
+                </Button.Visibility>
+                <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xEBE6;"/>
+            </Button>
         </StackPanel>
 
         <Border HorizontalAlignment="Center" VerticalAlignment="Top" Margin="4"
diff --git a/SampleApps/UniversalApp/MainPage.xaml.cs b/SampleApps/UniversalApp/MainPage.xaml.cs
index 6a96af14..4dfc33cb 100644
--- a/SampleApps/UniversalApp/MainPage.xaml.cs
+++ b/SampleApps/UniversalApp/MainPage.xaml.cs
@@ -17,7 +17,7 @@ namespace SampleApplication
             {
                 ImageLoader.HttpClient.DefaultRequestHeaders.Add("User-Agent", "XAML Map Control Test Application");
 
-                //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
+                TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
                 //TileImageLoader.Cache = new MapControl.Caching.FileDbCache(TileImageLoader.DefaultCacheFolder);
                 //TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder);
 
@@ -34,6 +34,11 @@ namespace SampleApplication
             InitializeComponent();
         }
 
+        private void ResetHeadingButtonClick(object sender, RoutedEventArgs e)
+        {
+            map.TargetHeading = 0d;
+        }
+
         private void MapPointerMoved(object sender, PointerRoutedEventArgs e)
         {
             var location = map.ViewToLocation(e.GetCurrentPoint(map).Position);
diff --git a/SampleApps/UniversalApp/UniversalApp.csproj b/SampleApps/UniversalApp/UniversalApp.csproj
index dea63180..fa470c14 100644
--- a/SampleApps/UniversalApp/UniversalApp.csproj
+++ b/SampleApps/UniversalApp/UniversalApp.csproj
@@ -63,6 +63,9 @@
     <Compile Include="..\Shared\MenuButton.cs">
       <Link>MenuButton.cs</Link>
     </Compile>
+    <Compile Include="..\Shared\ValueConverters.cs">
+      <Link>ValueConverters.cs</Link>
+    </Compile>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml
index c62f46bd..6d2ab09e 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml
+++ b/SampleApps/WinUiApp/MainWindow.xaml
@@ -1,9 +1,8 @@
-<Window
-    x:Class="SampleApplication.MainWindow"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:map="using:MapControl"
-    xmlns:local="using:SampleApplication">
+<Window x:Class="SampleApplication.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:map="using:MapControl"
+        xmlns:local="using:SampleApplication">
 
     <Grid>
         <Grid.Resources>
@@ -85,8 +84,8 @@
             <local:MapViewModel/>
         </Grid.DataContext>
 
-        <map:Map x:Name="map"
-                 MinZoomLevel="2" MaxZoomLevel="21" ZoomLevel="11" MouseWheelZoomDelta="1"
+        <map:Map x:Name="map" ManipulationMode="All"
+                 MinZoomLevel="2" MaxZoomLevel="21" ZoomLevel="11"
                  MapLayer="{Binding MapLayers[OpenStreetMap]}"
                  PointerMoved="MapPointerMoved"
                  PointerExited="MapPointerExited">
@@ -132,6 +131,17 @@
                     Minimum="{Binding MinZoomLevel, ElementName=map}"
                     Maximum="{Binding MaxZoomLevel, ElementName=map}"
                     Value="{Binding TargetZoomLevel, ElementName=map, Mode=TwoWay}"/>
+
+            <Button Margin="2" Padding="8" ToolTipService.ToolTip="Reset Heading" Click="ResetHeadingButtonClick">
+                <Button.Visibility>
+                    <Binding Path="Heading" ElementName="map">
+                        <Binding.Converter>
+                            <local:HeadingToVisibilityConverter/>
+                        </Binding.Converter>
+                    </Binding>
+                </Button.Visibility>
+                <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xEBE6;"/>
+            </Button>
         </StackPanel>
 
         <Border HorizontalAlignment="Center" VerticalAlignment="Top" Margin="4"
diff --git a/SampleApps/WinUiApp/MainWindow.xaml.cs b/SampleApps/WinUiApp/MainWindow.xaml.cs
index 3b9853b6..79934378 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml.cs
+++ b/SampleApps/WinUiApp/MainWindow.xaml.cs
@@ -18,7 +18,7 @@ namespace SampleApplication
             {
                 ImageLoader.HttpClient.DefaultRequestHeaders.Add("User-Agent", "XAML Map Control Test Application");
 
-                //TileImageLoader.Cache = new ImageFileCache(TileImageLoader.DefaultCacheFolder);
+                TileImageLoader.Cache = new ImageFileCache(TileImageLoader.DefaultCacheFolder);
                 //TileImageLoader.Cache = new FileDbCache(TileImageLoader.DefaultCacheFolder);
                 //TileImageLoader.Cache = new SQLiteCache(TileImageLoader.DefaultCacheFolder);
 
@@ -53,6 +53,11 @@ namespace SampleApplication
             await ((ImageFileCache)TileImageLoader.Cache).Clean();
         }
 
+        private void ResetHeadingButtonClick(object sender, RoutedEventArgs e)
+        {
+            map.TargetHeading = 0d;
+        }
+
         private void MapPointerMoved(object sender, PointerRoutedEventArgs e)
         {
             var location = map.ViewToLocation(e.GetCurrentPoint(map).Position);
diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index 69d53c23..c227b1be 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -5,6 +5,7 @@
         xmlns:local="clr-namespace:SampleApplication"
         Title="XAML MapControl - WPF Sample Application" Height="600" Width="900"
         Stylus.IsPressAndHoldEnabled="False">
+
     <Grid>
         <Grid.Resources>
             <DataTemplate DataType="{x:Type local:PolylineItem}">
@@ -159,6 +160,17 @@
                     Value="{Binding TargetZoomLevel, ElementName=map}"
                     SmallChange="0.1"
                     AutoToolTipPlacement="BottomRight" AutoToolTipPrecision="0"/>
+
+            <Button Margin="2" Padding="8" ToolTipService.ToolTip="Reset Heading" Click="ResetHeadingButtonClick"
+                    FontSize="16" FontFamily="Segoe MDL2 Assets" Content="&#xEBE6;">
+                <Button.Visibility>
+                    <Binding Path="Heading" ElementName="map">
+                        <Binding.Converter>
+                            <local:HeadingToVisibilityConverter/>
+                        </Binding.Converter>
+                    </Binding>
+                </Button.Visibility>
+            </Button>
         </StackPanel>
 
         <local:OutlinedText
diff --git a/SampleApps/WpfApplication/MainWindow.xaml.cs b/SampleApps/WpfApplication/MainWindow.xaml.cs
index 78df6f32..b86794ec 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml.cs
+++ b/SampleApps/WpfApplication/MainWindow.xaml.cs
@@ -18,7 +18,7 @@ namespace SampleApplication
             {
                 ImageLoader.HttpClient.DefaultRequestHeaders.Add("User-Agent", "XAML Map Control Test Application");
 
-                //TileImageLoader.Cache = new ImageFileCache(TileImageLoader.DefaultCacheFolder);
+                TileImageLoader.Cache = new ImageFileCache(TileImageLoader.DefaultCacheFolder);
                 //TileImageLoader.Cache = new FileDbCache(TileImageLoader.DefaultCacheFolder);
                 //TileImageLoader.Cache = new SQLiteCache(TileImageLoader.DefaultCacheFolder);
                 //TileImageLoader.Cache = null;
@@ -48,6 +48,11 @@ namespace SampleApplication
             }
         }
 
+        private void ResetHeadingButtonClick(object sender, RoutedEventArgs e)
+        {
+            map.TargetHeading = 0d;
+        }
+
         private void MapMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             if (e.ClickCount == 2)