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

Update MapBase.MapLayer.cs

Browse source
This commit is contained in:
ClemensFischer 2025-08-13 10:58:27 +02:00
parent c41c1a0b6d
commit e006cbedc6
1 changed files with 46 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
MapControl/Shared/MapBase.MapLayer.cs
View file

@ -24,9 +24,6 @@ namespace MapControl
public partial class MapBase public partial class MapBase
{ {
private bool hasMapLayerBackground;
private bool hasMapLayerForeground;
public static readonly DependencyProperty MapLayerProperty = public static readonly DependencyProperty MapLayerProperty =
DependencyPropertyHelper.Register<MapBase, object>(nameof(MapLayer), null, DependencyPropertyHelper.Register<MapBase, object>(nameof(MapLayer), null,
(map, oldValue, newValue) => map.MapLayerPropertyChanged(oldValue, newValue)); (map, oldValue, newValue) => map.MapLayerPropertyChanged(oldValue, newValue));
@ -65,52 +62,18 @@ namespace MapControl
private void MapLayerPropertyChanged(object oldLayer, object newLayer) private void MapLayerPropertyChanged(object oldLayer, object newLayer)
{ {
if (oldLayer != null) bool IsMapLayer(object layer) => Children.Count > 0 &&
(Children[0] == layer as FrameworkElement ||
((FrameworkElement)Children[0]).DataContext == layer);
if (oldLayer != null && IsMapLayer(oldLayer))
{ {
if (Children.Count > 0 && RemoveChildElement(0);
(Children[0] == oldLayer as FrameworkElement ||
((FrameworkElement)Children[0]).DataContext == oldLayer))
{
Children.RemoveAt(0);
}
if (hasMapLayerBackground)
{
ClearValue(BackgroundProperty);
}
if (hasMapLayerForeground)
{
ClearValue(ForegroundProperty);
}
} }
hasMapLayerBackground = false; if (newLayer != null && !IsMapLayer(newLayer))
hasMapLayerForeground = false;
if (newLayer != null)
{ {
if (Children.Count == 0 || InsertChildElement(0, GetMapLayer(newLayer));
(Children[0] != newLayer as FrameworkElement &&
((FrameworkElement)Children[0]).DataContext != newLayer))
{
Children.Insert(0, GetMapLayer(newLayer));
}
if (Children[0] is IMapLayer mapLayer)
{
if (mapLayer.MapBackground != null)
{
Background = mapLayer.MapBackground;
hasMapLayerBackground = true;
}
if (mapLayer.MapForeground != null)
{
Foreground = mapLayer.MapForeground;
hasMapLayerForeground = true;
}
}
} }
} }
@ -181,7 +144,7 @@ namespace MapControl
{ {
foreach (var mapLayer in mapLayers) foreach (var mapLayer in mapLayers)
{ {
Children.Insert(index, mapLayer); InsertChildElement(index, mapLayer);
if (index++ == 0) if (index++ == 0)
{ {
@ -194,7 +157,7 @@ namespace MapControl
{ {
foreach (var _ in layers) foreach (var _ in layers)
{ {
Children.RemoveAt(index); RemoveChildElement(index);
} }
if (index == 0) if (index == 0)
@ -203,6 +166,42 @@ namespace MapControl
} }
} }
private void InsertChildElement(int index, FrameworkElement element)
{
if (index == 0 && element is IMapLayer mapLayer)
{
if (mapLayer.MapBackground != null)
{
Background = mapLayer.MapBackground;
}
if (mapLayer.MapForeground != null)
{
Foreground = mapLayer.MapForeground;
}
}
Children.Insert(index, element);
}
private void RemoveChildElement(int index)
{
if (index == 0 && Children[0] is IMapLayer mapLayer)
{
if (mapLayer.MapBackground != null)
{
ClearValue(BackgroundProperty);
}
if (mapLayer.MapForeground != null)
{
ClearValue(ForegroundProperty);
}
}
Children.RemoveAt(index);
}
private FrameworkElement GetMapLayer(object layer) private FrameworkElement GetMapLayer(object layer)
{ {
FrameworkElement mapLayer = null; FrameworkElement mapLayer = null;