Update IDesigner

alexeyvyduykin · May 30, 2023 · cdca21b · cdca21b
1 parent bc70245
commit cdca21b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/samples/MapsuiInteractivitySample/ViewModels/MainWindowViewModel.cs b/samples/MapsuiInteractivitySample/ViewModels/MainWindowViewModel.cs
@@ -1,5 +1,4 @@
 using Mapsui;
-using Mapsui.Extensions;
 using Mapsui.Interactivity;
 using Mapsui.Interactivity.Extensions;
 using Mapsui.Interactivity.UI;
@@ -404,7 +403,8 @@ private void DrawingPointCommand()
 
         designer.EndCreating.Subscribe(s =>
         {
-            _userLayer.Add(s.Feature.Copy());
+            _userLayer.Add(s);
+            _userLayer.DataHasChanged();
         });
 
         Tip = "Нажмите, чтобы нарисовать точку";
@@ -427,7 +427,7 @@ private void DrawingRectangleCommand()
 
         designer.EndCreating.Subscribe(s =>
         {
-            _userLayer.Add(s.Feature.Copy());
+            _userLayer.Add(s);
 
             Tip = string.Empty;
 
@@ -454,7 +454,7 @@ private void DrawingCircleCommand()
 
         designer.EndCreating.Subscribe(s =>
         {
-            _userLayer.Add(s.Feature.Copy());
+            _userLayer.Add(s);
 
             Tip = string.Empty;
 
@@ -485,7 +485,7 @@ private void DrawingRouteCommand()
 
         designer.EndCreating.Subscribe(s =>
         {
-            _userLayer.Add(s.Feature.Copy());
+            _userLayer.Add(s);
 
             Tip = string.Empty;
 
@@ -522,7 +522,7 @@ private void DrawingPolygonCommand()
 
         designer.EndCreating.Subscribe(s =>
         {
-            _userLayer.Add(s.Feature.Copy());
+            _userLayer.Add(s);
 
             Tip = string.Empty;
 

diff --git a/src/Mapsui.Interactivity/Designers/BaseDesigner.cs b/src/Mapsui.Interactivity/Designers/BaseDesigner.cs
@@ -1,4 +1,5 @@
-using Mapsui.Nts;
+using Mapsui.Extensions;
+using Mapsui.Nts;
 using Mapsui.Nts.Extensions;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
@@ -10,7 +11,7 @@ public abstract class BaseDesigner : BaseInteractive, IDesigner
     private readonly Subject<IDesigner> _beginCreatingSubj = new();
     private readonly Subject<IDesigner> _creatingSubj = new();
     private readonly Subject<IDesigner> _hoverCreatingSubj = new();
-    private readonly Subject<IDesigner> _endCreatingSubj = new();
+    private readonly Subject<IFeature> _endCreatingSubj = new();
 
     public GeometryFeature Feature { get; protected set; } = new GeometryFeature();
 
@@ -22,7 +23,7 @@ public abstract class BaseDesigner : BaseInteractive, IDesigner
 
     public IObservable<IDesigner> HoverCreating => _hoverCreatingSubj.AsObservable();
 
-    public IObservable<IDesigner> EndCreating => _endCreatingSubj.AsObservable();
+    public IObservable<IFeature> EndCreating => _endCreatingSubj.AsObservable();
 
     public override IEnumerable<IFeature> GetFeatures()
     {
@@ -58,6 +59,6 @@ protected void OnHoverCreating()
 
     protected void OnEndCreating()
     {
-        _endCreatingSubj.OnNext(this);
+        _endCreatingSubj.OnNext(Feature.Copy());
     }
 }
diff --git a/src/Mapsui.Interactivity/Interfaces/IDesigner.cs b/src/Mapsui.Interactivity/Interfaces/IDesigner.cs
@@ -14,5 +14,5 @@ public interface IDesigner : IInteractive
 
     IObservable<IDesigner> HoverCreating { get; }
 
-    IObservable<IDesigner> EndCreating { get; }
+    IObservable<IFeature> EndCreating { get; }
 }