Add AvailableFor layer filter for selectors

alexeyvyduykin · Oct 3, 2022 · d94638e · d94638e
1 parent b1e03c9
commit d94638e
Show file tree

Hide file tree

Showing 11 changed files with 229 additions and 9 deletions.
diff --git a/samples/MapsuiInteractivitySample/ViewModels/MainWindowViewModel.cs b/samples/MapsuiInteractivitySample/ViewModels/MainWindowViewModel.cs
@@ -39,6 +39,8 @@ public MainWindowViewModel()
             radioButtonList.Register(new RadioButtonItem("Circle"), DrawingCircleCommand, Reset);
             radioButtonList.Register(new RadioButtonItem("Polygon"), DrawingPolygonCommand, Reset);
             radioButtonList.Register(new RadioButtonItem("Route"), DrawingRouteCommand, Reset);
+            radioButtonList.Register(new RadioButtonItem("Select|Filter"), SelectWithFilterCommand, Reset);
+            radioButtonList.Register(new RadioButtonItem("Translate|Filter"), TranslateWithFilterCommand, Reset);
 
             RadioButtons = new List<RadioButtonItem>(radioButtonList.Items);
 
@@ -115,18 +117,64 @@ public void PointeroverLeaveImpl()
 
         private void Reset()
         {
-            _selector?.Unselected();
+            Interactive?.Cancel();
+            Interactive = null;
+
             _selector = null;
 
-            Interactive = null;
             State = States.Default;
 
             Tip = string.Empty;
         }
 
         private void SelectCommand()
         {
-            _selector = new InteractiveBuilder().SelectSelector<Selector>().Build();
+            _selector = new InteractiveBuilder()
+                .SelectSelector<Selector>()
+                .AttachTo(Map)
+                .Build();
+
+            _selector.Select.Subscribe(s =>
+            {
+                Tip = $"Select{Environment.NewLine}{s.SelectedFeature?.ToFeatureInfo()}";
+
+                if (IsWktInfo == true)
+                {
+                    WktInfo = s.SelectedFeature?.ToWkt();
+                }
+            });
+
+            _selector.Unselect.Subscribe(s =>
+            {
+                Tip = string.Empty;
+
+                if (IsWktInfo == true)
+                {
+                    WktInfo = string.Empty;
+                }
+            });
+
+            _selector.HoverBegin.Subscribe(s =>
+            {
+                Tip = $"HoveringBegin{Environment.NewLine}{s.HoveringFeature?.ToFeatureInfo()}";
+            });
+
+            _selector.HoverEnd.Subscribe(s =>
+            {
+                Tip = string.Empty;
+            });
+
+            Interactive = _selector;
+            State = States.Selecting;
+        }
+
+        private void SelectWithFilterCommand()
+        {
+            _selector = new InteractiveBuilder()
+                .SelectSelector<Selector>()
+                .AttachTo(Map)
+                .AvailableFor(_userLayer)
+                .Build();
 
             _selector.Select.Subscribe(s =>
             {
@@ -188,6 +236,33 @@ private void TranslateCommand()
             State = States.Selecting;
         }
 
+        private void TranslateWithFilterCommand()
+        {
+            _selector = new InteractiveBuilder()
+                .SelectDecorator<TranslateDecorator>()
+                .AttachTo(Map)
+                .WithSelector<Selector>()
+                .AvailableFor(_userLayer)
+                .Build();
+
+            ((IDecoratorSelector)_selector).DecoratorSelecting.Subscribe(s =>
+            {
+                Interactive = s;
+                State = States.Editing;
+                Tip = $"Translate mode";
+            });
+
+            _selector.Unselect.Subscribe(s =>
+            {
+                Interactive = s;
+                State = States.Selecting;
+                Tip = String.Empty;
+            });
+
+            Interactive = _selector;
+            State = States.Selecting;
+        }
+
         private void ScaleCommand()
         {
             _selector = new InteractiveBuilder()

diff --git a/samples/MapsuiInteractivitySample/Views/MainView.axaml b/samples/MapsuiInteractivitySample/Views/MainView.axaml
@@ -117,6 +117,9 @@
 					<Style Selector="ItemsControl > ContentPresenter:nth-child(5)">
 						<Setter Property="Margin" Value="0,0,0,10"></Setter>
 					</Style>
+					<Style Selector="ItemsControl > ContentPresenter:nth-child(10)">
+						<Setter Property="Margin" Value="0,0,0,10"></Setter>
+					</Style>
 				</ItemsControl.Styles>
 
 				<ItemsControl.ItemTemplate>

diff --git a/src/Mapsui.Interactivity.UI/CustomManipulators/EditingManipulator.cs b/src/Mapsui.Interactivity.UI/CustomManipulators/EditingManipulator.cs
@@ -35,7 +35,7 @@ public override void Completed(MouseEventArgs e)
                     && IsClick(clickPoint, _clickPoint) == true
                     && IFeature.Equals(_clickFeature, clickFeature) == true)
                 {
-                    View.Interactive.Canceling.Execute().Subscribe();
+                    View.Interactive.Cancel();
                 }
             }
 

diff --git a/src/Mapsui.Interactivity/BaseInteractive.cs b/src/Mapsui.Interactivity/BaseInteractive.cs
@@ -31,5 +31,10 @@ public virtual void Hovering(MapInfo? mapInfo) { }
         public virtual void HoveringBegin(MapInfo? mapInfo) { }
 
         public virtual void HoveringEnd() { }
+
+        public virtual void Cancel()
+        {
+            Canceling.Execute().Subscribe();
+        }
     }
 }
diff --git a/src/Mapsui.Interactivity/InteractiveBuilder.cs b/src/Mapsui.Interactivity/InteractiveBuilder.cs
@@ -8,6 +8,7 @@ namespace Mapsui.Interactivity
 {
     public class InteractiveBuilder
     {
+        // TODO: to IDictionary<Type, Func<IArgs, IInteractive>> _cache
         private static readonly IDictionary<Type, Func<IInteractive>> _cache1 = new Dictionary<Type, Func<IInteractive>>();
         private static readonly IDictionary<Type, Func<GeometryFeature, IDecorator>> _cache2 = new Dictionary<Type, Func<GeometryFeature, IDecorator>>();
 

diff --git a/src/Mapsui.Interactivity/Interfaces/IBuilder.cs b/src/Mapsui.Interactivity/Interfaces/IBuilder.cs
@@ -17,7 +17,14 @@ public interface IAttachable<T> where T : IBuilder
         T AttachTo(IMap map);
     }
 
-    public interface ISelectorBuilder : IBuilder<ISelector> { }
+    public interface IFilterable<T> where T : IBuilder
+    {
+        T AvailableFor(ILayer[] layers);
+
+        T AvailableFor(ILayer layer);
+    }
+
+    public interface ISelectorBuilder : IBuilder<ISelector>, IAttachable<ISelectorBuilder>, IFilterable<ISelectorBuilder> { }
 
     public interface IDesignerBuilder : IBuilder<IDesigner>, IAttachable<IDesignerBuilder> { }
 
@@ -28,5 +35,5 @@ public interface IDecoratorBuilder : IBuilder<IDecorator>, IAttachable<IDecorato
         IDecoratorBuilder WithFeature(GeometryFeature feature);
     }
 
-    public interface ISelectorWithDecoratorBuilder : ISelectorBuilder { }
+    public interface ISelectorWithDecoratorBuilder : IBuilder<ISelector>, IFilterable<ISelectorWithDecoratorBuilder> { }
 }
diff --git a/src/Mapsui.Interactivity/Interfaces/IInteractive.cs b/src/Mapsui.Interactivity/Interfaces/IInteractive.cs
@@ -25,5 +25,7 @@ public interface IInteractive
         void HoveringBegin(MapInfo? mapInfo);
 
         void HoveringEnd();
+
+        void Cancel();
     }
 }
diff --git a/src/Mapsui.Interactivity/SelectorBuilder.cs b/src/Mapsui.Interactivity/SelectorBuilder.cs
@@ -1,19 +1,89 @@
 using Mapsui.Interactivity.Interfaces;
+using Mapsui.Layers;
 
 namespace Mapsui.Interactivity
 {
     internal class SelectorBuilder : ISelectorBuilder
     {
         private readonly Func<IInteractive> _builder;
+        private IList<string>? _availableLayers;
+        private readonly IList<ILayer> _dirtyLayers = new List<ILayer>();
 
         public SelectorBuilder(Func<IInteractive> builder)
         {
             _builder = builder;
         }
 
+        internal LayerCollection? Layers { get; set; }
+
+        public ISelectorBuilder AvailableFor(ILayer[] layers)
+        {
+            _availableLayers = layers.Select(s => s.Name).ToList();
+
+            return this;
+        }
+
+        public ISelectorBuilder AvailableFor(ILayer layer)
+        {
+            _availableLayers = new List<string>() { layer.Name };
+
+            return this;
+        }
+
+        public ISelectorBuilder AttachTo(LayerCollection layers)
+        {
+            Layers = layers;
+
+            return this;
+        }
+
+        public ISelectorBuilder AttachTo(IMap map)
+        {
+            Layers = map.Layers;
+
+            return this;
+        }
+
         public ISelector Build()
         {
-            return (ISelector)_builder.Invoke();
+            var selector = (ISelector)_builder.Invoke();
+
+            if (_availableLayers != null && Layers != null)
+            {
+                foreach (var item in Layers)
+                {
+                    if (_availableLayers.Contains(item.Name) == true)
+                    {
+                        if (item.IsMapInfoLayer == false)
+                        {
+                            item.IsMapInfoLayer = true;
+
+                            _dirtyLayers.Add(item);
+                        }
+                    }
+                    else
+                    {
+                        if (item.IsMapInfoLayer == true)
+                        {
+                            item.IsMapInfoLayer = false; 
+
+                            _dirtyLayers.Add(item);
+                        }
+                    }
+                }
+            }
+
+            selector.Canceling.Subscribe(s => 
+            {
+                foreach (var item in _dirtyLayers)
+                {
+                    item.IsMapInfoLayer = !item.IsMapInfoLayer;
+                }
+
+                _dirtyLayers.Clear();
+            });
+
+            return selector;
         }
     }
 }
diff --git a/src/Mapsui.Interactivity/SelectorWithDecoratorBuilder.cs b/src/Mapsui.Interactivity/SelectorWithDecoratorBuilder.cs
@@ -10,13 +10,29 @@ internal class SelectorWithDecoratorBuilder : ISelectorWithDecoratorBuilder
     {
         private readonly Func<GeometryFeature, IDecorator> _builder;
         private readonly LayerCollection? _layers;
+        private IList<string>? _availableLayers;
+        private readonly IList<ILayer> _dirtyLayers = new List<ILayer>();
 
         public SelectorWithDecoratorBuilder(LayerCollection? layers, Func<GeometryFeature, IDecorator> builder)
         {
             _builder = builder;
             _layers = layers;
         }
 
+        public ISelectorWithDecoratorBuilder AvailableFor(ILayer[] layers)
+        {
+            _availableLayers = layers.Select(s => s.Name).ToList();
+
+            return this;
+        }
+
+        public ISelectorWithDecoratorBuilder AvailableFor(ILayer layer)
+        {
+            _availableLayers = new List<string>() { layer.Name };
+
+            return this;
+        }
+
         public ISelector Build()
         {
             ISelector selector = new DecoratorSelector(_builder);
@@ -29,6 +45,41 @@ public ISelector Build()
                 selector.Unselect.Subscribe(_ => _layers.RemoveInteractiveLayer());
             }
 
+            if (_availableLayers != null && _layers != null)
+            {
+                foreach (var item in _layers)
+                {
+                    if (_availableLayers.Contains(item.Name) == true)
+                    {
+                        if (item.IsMapInfoLayer == false)
+                        {
+                            item.IsMapInfoLayer = true;
+
+                            _dirtyLayers.Add(item);
+                        }
+                    }
+                    else
+                    {
+                        if (item.IsMapInfoLayer == true)
+                        {
+                            item.IsMapInfoLayer = false;
+
+                            _dirtyLayers.Add(item);
+                        }
+                    }
+                }
+            }
+
+            selector.Canceling.Subscribe(s =>
+            {
+                foreach (var item in _dirtyLayers)
+                {
+                    item.IsMapInfoLayer = !item.IsMapInfoLayer;
+                }
+
+                _dirtyLayers.Clear();
+            });
+
             return selector;
         }
     }

diff --git a/src/Mapsui.Interactivity/Selectors/DecoratorSelector.cs b/src/Mapsui.Interactivity/Selectors/DecoratorSelector.cs
@@ -33,8 +33,7 @@ internal DecoratorSelector(Func<GeometryFeature, IDecorator> builder)
 
         public override void Unselected()
         {
-            _decorator?.Canceling.Execute().Subscribe();
-
+            _decorator?.Cancel();
             _decorator = null;
 
             base.Unselected();

diff --git a/src/Mapsui.Interactivity/Selectors/Selector.cs b/src/Mapsui.Interactivity/Selectors/Selector.cs
@@ -164,5 +164,12 @@ public override void HoveringEnd()
                 HoverEnd?.Execute().Subscribe();
             }
         }
+
+        public override void Cancel()
+        {
+            Unselected();
+
+            base.Cancel();
+        }
     }
 }