Merge pull request #2336 from Mapsui/feature/remove-dispose-of-feature

Remove RenderedGeometry and IDisposable from IFeature

Mapsui.Nts/GeometryFeature.cs

@@ -1,12 +1,11 @@
 using System;
-using System.Diagnostics;
 using Mapsui.Layers;
 using Mapsui.Nts.Extensions;
 using NetTopologySuite.Geometries;
 
 namespace Mapsui.Nts;
 
-public class GeometryFeature : BaseFeature, IFeature, IDisposable
+public class GeometryFeature : BaseFeature, IFeature
 {
  private bool _disposed;
 
@@ -37,13 +36,6 @@ public GeometryFeature(Geometry? geometry)
 
  public MRect? Extent => Geometry?.EnvelopeInternal.ToMRect();
 
- public override void Dispose()
- {
- if (_disposed) return;
- base.Dispose();
- _disposed = true;
- }
-
  public void CoordinateVisitor(Action<double, double, CoordinateSetter> visit)
  {
  if (Geometry is null) return;

Mapsui.Nts/Providers/Shapefile/ShapeFile.cs

@@ -452,8 +452,7 @@ private Collection<uint> GetObjectIDsInViewPrivate(MRect? bbox)
  {
  if (FilterDelegate != null) //Apply filtering
  {
- using var fdr = GetFeature(oid);
- return fdr?.Geometry;
+ return GetFeature(oid)?.Geometry;
  }
 
  return ReadGeometry(oid);

Mapsui.UI.MapView/Objects/Callout.cs

@@ -15,7 +15,7 @@
 
 namespace Mapsui.UI.Maui;
 
-public class Callout : IFeatureProvider, IDisposable, INotifyPropertyChanged
+public class Callout : IFeatureProvider, INotifyPropertyChanged
 {
  private readonly Pin _pin;
 
@@ -602,11 +602,6 @@ internal void Update()
  UpdateCalloutStyle();
  }
 
- public virtual void Dispose()
- {
- Feature.Dispose();
- }
-
  public event PropertyChangedEventHandler? PropertyChanged;
 
  protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)

Mapsui.UI.MapView/Objects/MyLocationLayer.cs

@@ -16,7 +16,7 @@ namespace Mapsui.UI.Objects;
 /// A layer to display a symbol for own location
 /// </summary>
 /// <remarks>
-/// There are two different symbols for own loaction: one is used when there isn't a change in position (still),
+/// There are two different symbols for own location: one is used when there isn't a change in position (still),
 /// and one is used, if the position changes (moving).
 /// </remarks>
 public class MyLocationLayer : BaseLayer
@@ -485,16 +485,6 @@ public void UpdateMyViewDirection(double newDirection, double newViewportRotatio
  }
  }
 
- protected override void Dispose(bool disposing)
- {
- if (disposing)
- {
- _feature.Dispose();
- }
-
- base.Dispose(disposing);
- }
-
  private bool InternalUpdateMyLocation(Position newLocation)
  {
  var modified = false;

Mapsui.UI.MapView/Objects/Pin.cs

@@ -14,7 +14,7 @@
 
 namespace Mapsui.UI.Maui;
 
-public class Pin : IFeatureProvider, IDisposable, INotifyPropertyChanged
+public class Pin : IFeatureProvider, INotifyPropertyChanged
 {
  // Cache for used bitmaps
  private static readonly Dictionary<string, int> _bitmapIds = new Dictionary<string, int>();
@@ -57,7 +57,6 @@ public Pin()
  _mapView?.RemoveCallout(_callout);
  }
 
- Feature?.Dispose();
  Feature = null;
  _mapView = value;
 
@@ -603,12 +602,6 @@ private void CreateFeature()
  }
  }
 
- public virtual void Dispose()
- {
- _callout?.Dispose();
- Feature?.Dispose();
- }
-
  public event PropertyChangedEventHandler? PropertyChanged;
 
  protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)

Mapsui/Features/BaseFeature.cs

@@ -1,14 +1,12 @@
-using System;
-using System.Collections.Concurrent;
+using Mapsui.Styles;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
-using Mapsui.Styles;
 
 namespace Mapsui.Layers;
 
-public abstract class BaseFeature : IDisposable
+public abstract class BaseFeature
 {
  // last used feature id
  private static long _currentFeatureId;
@@ -48,7 +46,6 @@ private void Copy(BaseFeature baseFeature)
  }
 
  private readonly Dictionary<string, object?> _dictionary = new();
- private IDictionary<IStyle, object>? _renderedGeometry;
 
  public ICollection<IStyle> Styles { get; set; } = new Collection<IStyle>();
  public IEnumerable<string> Fields => _dictionary.Keys;
@@ -59,37 +56,9 @@ private void Copy(BaseFeature baseFeature)
  set => _dictionary[key] = value;
  }
 
- public IDictionary<IStyle, object> RenderedGeometry
- {
- get => _renderedGeometry ??= new ConcurrentDictionary<IStyle, object>();
- set => _renderedGeometry = value;
- }
-
  public void Modified()
  {
  // is modified needs a new id.
  Id = NextId();
- ClearRenderedGeometry();
- }
-
- public virtual void Dispose()
- {
- ClearRenderedGeometry();
- }
-
- public void ClearRenderedGeometry()
- {
- if (_renderedGeometry != null)
- {
- var values = _renderedGeometry.Values.ToArray();
- _renderedGeometry = null;
- foreach (var value in values)
- {
- if (value is IDisposable disposable)
- {
- disposable.Dispose();
- }
- }
- }
  }
 }

Mapsui/IFeature.cs

@@ -6,13 +6,12 @@ namespace Mapsui;
 
 public delegate void CoordinateSetter(double x, double y);
 
-public interface IFeature : IDisposable
+public interface IFeature
 {
  ICollection<IStyle> Styles { get; }
  object? this[string key] { get; set; }
  IEnumerable<string> Fields { get; }
  MRect? Extent { get; }
- public IDictionary<IStyle, object> RenderedGeometry { get; }
  void CoordinateVisitor(Action<double, double, CoordinateSetter> visit);
  long Id => 0;
  void Modified() { } // default implementation

Mapsui/Layers/MyLocationLayer.cs

@@ -490,16 +490,6 @@ public override IEnumerable<IFeature> GetFeatures(MRect box, double resolution)
  return _features;
  }
 
- protected override void Dispose(bool disposing)
- {
- if (disposing)
- {
- _feature.Dispose();
- }
-
- base.Dispose(disposing);
- }
-
  private bool InternalUpdateMyLocation(MPoint newLocation)
  {
  var modified = false;

Mapsui/Layers/RasterizingLayer.cs

@@ -18,7 +18,6 @@ public class RasterizingLayer : BaseLayer, IAsyncDataFetcher, ISourceLayer
  private bool _busy;
  private MSection? _currentSection;
  private bool _modified;
- private IEnumerable<IFeature>? _previousFeatures;
  private readonly IRenderer _rasterizer = DefaultRendererFactory.Create();
  private FetchInfo? _fetchInfo;
  public Delayer Delayer { get; } = new();
@@ -95,8 +94,6 @@ private void Rasterize()
  using var bitmapStream = _rasterizer.RenderToBitmapStream(ToViewport(_currentSection),
  new[] { _layer }, pixelDensity: _pixelDensity, renderFormat: _renderFormat);
 
- RemoveExistingFeatures();
-
  _cache.Clear();
  var features = new RasterFeature[1];
  features[0] = new RasterFeature(new MRaster(bitmapStream.ToArray(), _currentSection.Extent));
@@ -116,24 +113,6 @@ private void Rasterize()
  }
  }
 
- private void RemoveExistingFeatures()
- {
- var features = _cache.ToArray();
- _cache.Clear(); // clear before dispose to prevent possible null disposed exception on render
-
- // Disposing previous and storing current in the previous field to prevent dispose during rendering.
- if (_previousFeatures != null) DisposeRenderedGeometries(_previousFeatures);
- _previousFeatures = features;
- }
-
- private static void DisposeRenderedGeometries(IEnumerable<IFeature> features)
- {
- foreach (var feature in features.Cast<RasterFeature>())
- {
- feature.ClearRenderedGeometry();
- }
- }
-
  public static double SymbolSize { get; set; } = 64;
 
  public override IEnumerable<IFeature> GetFeatures(MRect box, double resolution)

Tests/Mapsui.Rendering.Skia.Tests/LabelStyleFeatureSizeTests.cs

@@ -25,7 +25,7 @@ public void DefaultSizeFeatureSize()
  LabelColumn = "test",
  };
 
- using var feature = new PointFeature(new MPoint(0, 0));
+ var feature = new PointFeature(new MPoint(0, 0));
  feature["test"] = "Mapsui";
 
  using var skPaint = new SKPaint();
@@ -44,7 +44,7 @@ public void DefaultSizeFeatureSize_Font()
 
  labelStyle.Font.Size *= 2;
 
- using var feature = new PointFeature(new MPoint(0, 0));
+ var feature = new PointFeature(new MPoint(0, 0));
  feature["test"] = "Mapsui";
 
  using var skPaint = new SKPaint();
@@ -70,7 +70,7 @@ public void DefaultSizeFeatureSize_Offset_x()
  Offset = new Offset(2, 0),
  };
 
- using var feature = new PointFeature(new MPoint(0, 0));
+ var feature = new PointFeature(new MPoint(0, 0));
  feature["test"] = "Mapsui";
 
  using var skPaint = new SKPaint();
@@ -88,7 +88,7 @@ public void DefaultSizeFeatureSize_Offset_y()
  Offset = new Offset(0, 2),
  };
 
- using var feature = new PointFeature(new MPoint(0, 0));
+ var feature = new PointFeature(new MPoint(0, 0));
  feature["test"] = "Mapsui";
 
  using var skPaint = new SKPaint();
@@ -106,7 +106,7 @@ public void DefaultSizeFeatureSize_Offset_x_y()
  Offset = new Offset(2, 2),
  };
 
- using var feature = new PointFeature(new MPoint(0, 0));
+ var feature = new PointFeature(new MPoint(0, 0));
  feature["test"] = "Mapsui";
 
  using var skPaint = new SKPaint();

Tests/Mapsui.Tests/Projections/ProjectionTests.cs

@@ -49,7 +49,7 @@ public void CoordinateProjectionTest()
  // arrange
  var multiPolygon = (MultiPolygon)_wktReader.Read("MULTIPOLYGON (((40 40, 20 45, 45 30, 40 40)), ((20 35, 10 30, 10 10, 30 5, 45 20, 20 35), (30 20, 20 15, 20 25, 30 20)))");
  var projectedMultiPolygon = multiPolygon.Copy();
- using var feature = new GeometryFeature(projectedMultiPolygon);
+ var feature = new GeometryFeature(projectedMultiPolygon);
  var projection = new Projection();
 
  // act
@@ -72,7 +72,7 @@ public void CoordinateNtsProjectionTest()
  // arrange
  var multiPolygon = (MultiPolygon)_wktReader.Read("MULTIPOLYGON (((40 40, 20 45, 45 30, 40 40)), ((20 35, 10 30, 10 10, 30 5, 45 20, 20 35), (30 20, 20 15, 20 25, 30 20)))");
  var projectedMultiPolygon = multiPolygon.Copy();
- using var feature = new GeometryFeature(projectedMultiPolygon);
+ var feature = new GeometryFeature(projectedMultiPolygon);
  var projection = new DotSpatialProjection();
 
  // act