ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avalonia GroundOverlay

Browse source
This commit is contained in:
ClemensFischer 2024-05-22 17:04:31 +02:00
parent 294e98c6aa
commit ac6f3df75a
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MapControl/Avalonia/MapControl.Avalonia.csproj
View file

@ -24,7 +24,6 @@
<ItemGroup> <ItemGroup>
<Compile Remove="..\Shared\BindingHelper.cs" /> <Compile Remove="..\Shared\BindingHelper.cs" />
<Compile Remove="..\Shared\GeoImage.cs" /> <Compile Remove="..\Shared\GeoImage.cs" />
<Compile Remove="..\Shared\GroundOverlay.cs" />
<Compile Remove="..\Shared\MapBorderPanel.cs" /> <Compile Remove="..\Shared\MapBorderPanel.cs" />
<Compile Remove="..\Shared\MapGraticule.cs" /> <Compile Remove="..\Shared\MapGraticule.cs" />
<Compile Remove="..\Shared\MapItem.cs" /> <Compile Remove="..\Shared\MapItem.cs" />

24
MapControl/Shared/GroundOverlay.cs
View file

@ -23,6 +23,12 @@ using Windows.UI.Xaml.Media;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media;
#elif AVALONIA
using Avalonia.Controls;
using Avalonia.Media;
using DependencyProperty = Avalonia.AvaloniaProperty;
using FrameworkElement = Avalonia.Controls.Control;
using ImageSource = Avalonia.Media.IImage;
#endif #endif
namespace MapControl namespace MapControl
@ -55,8 +61,9 @@ namespace MapControl
public ImageSource ImageSource { get; set; } public ImageSource ImageSource { get; set; }
} }
public static readonly DependencyProperty SourcePathProperty = DependencyProperty.Register( public static readonly DependencyProperty SourcePathProperty =
nameof(SourcePath), typeof(string), typeof(GroundOverlay), new PropertyMetadata(null, SourcePathPropertyChanged)); DependencyPropertyHelper.Register<GroundOverlay, string>(nameof(SourcePath), null, false,
async (overlay, oldValue, newValue) => await overlay.SourcePathPropertyChanged(newValue));
public string SourcePath public string SourcePath
{ {
@ -64,10 +71,8 @@ namespace MapControl
set => SetValue(SourcePathProperty, value); set => SetValue(SourcePathProperty, value);
} }
private static async void SourcePathPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e) private async Task SourcePathPropertyChanged(string sourcePath)
{ {
var groundOverlay = (GroundOverlay)obj;
var sourcePath = (string)e.NewValue;
IEnumerable<ImageOverlay> imageOverlays = null; IEnumerable<ImageOverlay> imageOverlays = null;
if (!string.IsNullOrEmpty(sourcePath)) if (!string.IsNullOrEmpty(sourcePath))
@ -91,11 +96,11 @@ namespace MapControl
} }
} }
groundOverlay.Children.Clear(); Children.Clear();
if (imageOverlays != null) if (imageOverlays != null)
{ {
groundOverlay.AddImageOverlays(imageOverlays); AddImageOverlays(imageOverlays);
} }
} }
@ -111,8 +116,7 @@ namespace MapControl
if (imageOverlay.LatLonBox.Rotation != 0d) if (imageOverlay.LatLonBox.Rotation != 0d)
{ {
overlay.RenderTransform = new RotateTransform { Angle = -imageOverlay.LatLonBox.Rotation }; SetRenderTransform(overlay, new RotateTransform { Angle = -imageOverlay.LatLonBox.Rotation }, 0.5, 0.5);
overlay.RenderTransformOrigin = new Point(0.5, 0.5);
// Additional Panel for map rotation, see MapPanel.ArrangeElement(FrameworkElement, ViewRect). // Additional Panel for map rotation, see MapPanel.ArrangeElement(FrameworkElement, ViewRect).
// //
@ -122,7 +126,7 @@ namespace MapControl
} }
SetBoundingBox(overlay, imageOverlay.LatLonBox); SetBoundingBox(overlay, imageOverlay.LatLonBox);
Canvas.SetZIndex(overlay, imageOverlay.ZIndex); overlay.SetValue(Canvas.ZIndexProperty, imageOverlay.ZIndex);
Children.Add(overlay); Children.Add(overlay);
} }
} }