ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-05 06:26:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Version 7.3. Added tile and map image progress reporting.

Browse source
This commit is contained in:
Clemens 2022-08-05 18:54:19 +02:00
parent b423cc2d36
commit 3119c0fc9b
32 changed files with 252 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SampleApps/ProjectionDemo/ProjectionDemo.csproj
View file

@ -6,7 +6,7 @@
<RootNamespace>ProjectionDemo</RootNamespace>
<AssemblyTitle>XAML Map Control Projection Demo Application</AssemblyTitle>
<Product>XAML Map Control</Product>
<Version>7.2.1</Version>
<Version>7.3.0</Version>
<Authors>Clemens Fischer</Authors>
<Copyright>Copyright © 2022 Clemens Fischer</Copyright>
</PropertyGroup>

11
SampleApps/Shared/ValueConverters.cs
View file

@ -13,11 +13,18 @@ using System.Windows.Data;
namespace SampleApplication
{
public class HeadingToVisibilityConverter : IValueConverter
public class DoubleToVisibilityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{
return (double)value != 0d ? Visibility.Visible : Visibility.Collapsed;
if (!(parameter is double p))
{
p = double.Parse(parameter.ToString());
}
//System.Diagnostics.Debug.WriteLine((double)value);
return (double)value != p ? Visibility.Visible : Visibility.Collapsed;
}
public object ConvertBack(object value, Type targetType, object parameter, string language)

12
SampleApps/UniversalApp/MainPage.xaml
View file

@ -80,6 +80,8 @@
</Setter.Value>
</Setter>
</Style>
<local:DoubleToVisibilityConverter x:Key="DoubleToVisibilityConverter"/>
</Grid.Resources>
<Grid.DataContext>
@ -214,14 +216,8 @@
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>
<Button Margin="2" Padding="8" ToolTipService.ToolTip="Reset Heading" Click="ResetHeadingButtonClick"
Visibility="{Binding Heading, ElementName=map, Converter={StaticResource DoubleToVisibilityConverter}, ConverterParameter=0}">
<FontIcon Glyph="&#xEBE6;"/>
</Button>
</StackPanel>

4
SampleApps/UniversalApp/Properties/AssemblyInfo.cs
View file

@ -6,8 +6,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("7.2.1")]
[assembly: AssemblyFileVersion("7.2.1")]
[assembly: AssemblyVersion("7.3.0")]
[assembly: AssemblyFileVersion("7.3.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

20
SampleApps/WinUiApp/MainWindow.xaml
View file

@ -81,6 +81,7 @@
</Setter>
</Style>
<local:DoubleToVisibilityConverter x:Key="DoubleToVisibilityConverter"/>
</Grid.Resources>
<Grid.DataContext>
@ -112,10 +113,15 @@
</map:Pushpin>
</map:Map>
<Border HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="#AFFFFFFF">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="#AFFFFFFF">
<ProgressBar Width="100" Height="10" Margin="4,2" Maximum="1"
Value="{Binding MapLayer.LoadingProgress, ElementName=map}"
Visibility="{Binding Value, RelativeSource={RelativeSource Self}, Converter={StaticResource DoubleToVisibilityConverter}, ConverterParameter=1}"/>
<TextBlock Margin="4,2" FontSize="10"
local:HyperlinkText.InlinesSource="{Binding MapLayer.Description, ElementName=map}"/>
</Border>
</StackPanel>
<Border HorizontalAlignment="Center" VerticalAlignment="Top" Margin="4"
Background="#AFFFFFFF" IsHitTestVisible="False">
@ -214,14 +220,8 @@
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>
<Button Margin="2" Padding="8" ToolTipService.ToolTip="Reset Heading" Click="ResetHeadingButtonClick"
Visibility="{Binding Heading, ElementName=map, Converter={StaticResource DoubleToVisibilityConverter}, ConverterParameter=0}">
<FontIcon Glyph="&#xEBE6;"/>
</Button>
</StackPanel>

2
SampleApps/WinUiApp/WinUiApp.csproj
View file

@ -11,7 +11,7 @@
<RootNamespace>SampleApplication</RootNamespace>
<AssemblyTitle>XAML Map Control WinUI Sample Application</AssemblyTitle>
<Product>XAML Map Control</Product>
<Version>7.2.1</Version>
<Version>7.3.0</Version>
<Authors>Clemens Fischer</Authors>
<Copyright>Copyright © 2022 Clemens Fischer</Copyright>
<AnalysisLevel>none</AnalysisLevel>

36
SampleApps/WpfApplication/MainWindow.xaml
View file

@ -138,10 +138,26 @@
<map:Pushpin AutoCollapse="True" Location="53.5,8.2" Content="N 53°30' E 8°12'"/>
</map:Map>
<Border HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="#AFFFFFFF">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="#AFFFFFFF">
<ProgressBar Width="100" Height="8" Margin="4,2" VerticalAlignment="Center" Maximum="1"
Value="{Binding MapLayer.LoadingProgress, ElementName=map}">
<ProgressBar.Style>
<Style TargetType="ProgressBar">
<Style.Triggers>
<Trigger Property="Value" Value="0">
<Setter Property="IsIndeterminate" Value="True"/>
</Trigger>
<Trigger Property="Value" Value="1">
<Setter Property="Visibility" Value="Collapsed"/>
</Trigger>
</Style.Triggers>
</Style>
</ProgressBar.Style>
</ProgressBar>
<TextBlock Margin="4,2" FontSize="10"
local:HyperlinkText.InlinesSource="{Binding MapLayer.Description, ElementName=map}"/>
</Border>
</StackPanel>
<local:OutlinedText
x:Name="mouseLocation" Margin="4" FontFamily="Consolas"
@ -191,13 +207,15 @@
<Button Margin="2" Padding="8" ToolTip="Reset Heading" Click="ResetHeadingButtonClick"
FontSize="20" FontFamily="Segoe MDL2 Assets" Content="&#xEBE6;">
<Button.Visibility>
<Binding Path="Heading" ElementName="map">
<Binding.Converter>
<local:HeadingToVisibilityConverter/>
</Binding.Converter>
</Binding>
</Button.Visibility>
<Button.Style>
<Style TargetType="Button">
<Style.Triggers>
<DataTrigger Binding="{Binding Heading, ElementName=map}" Value="0">
<Setter Property="Visibility" Value="Collapsed"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Button.Style>
</Button>
</StackPanel>
</Grid>

2
SampleApps/WpfApplication/WpfApplication.csproj
View file

@ -6,7 +6,7 @@
<RootNamespace>SampleApplication</RootNamespace>
<AssemblyTitle>XAML Map Control WPF Sample Application</AssemblyTitle>
<Product>XAML Map Control</Product>
<Version>7.2.1</Version>
<Version>7.3.0</Version>
<Authors>Clemens Fischer</Authors>
<Copyright>Copyright © 2022 Clemens Fischer</Copyright>
<DefineConstants></DefineConstants>