feat(geobase): recalculate bounds in project if bounds was available #…

…141

dart/geobase/lib/src/utils/bounds_builder.dart

@@ -38,7 +38,7 @@ class BoundsBuilder {
     Iterable<PositionArray>? arrays,
     Iterable<Position>? positions,
     required Coords type,
-    bool calculateChilds = false,
+    bool recalculateChilds = false,
   }) {
     if (item == null &&
         (collection == null || collection.isEmpty) &&
@@ -50,15 +50,19 @@ class BoundsBuilder {
     final builder = BoundsBuilder(type);
 
     if (item != null) {
-      final bounds = calculateChilds ? item.calculateBounds() : item.bounds;
+      final bounds = recalculateChilds || item.bounds == null
+          ? item.calculateBounds()
+          : item.bounds;
       if (bounds != null) {
         builder.addBounds(bounds);
       }
     }
 
     if (collection != null) {
       for (final elem in collection) {
-        final bounds = calculateChilds ? elem.calculateBounds() : elem.bounds;
+        final bounds = recalculateChilds || elem.bounds == null
+            ? elem.calculateBounds()
+            : elem.bounds;
         if (bounds != null) {
           builder.addBounds(bounds);
         }

dart/geobase/lib/src/vector_data/model/bounded/bounded.dart

@@ -60,9 +60,8 @@ abstract class Bounded {
   ///
   /// The returned subtype must be the same as the type of this.
   ///
-  /// Note that any available [bounds] object on this is not projected (that is
-  /// the bounds for a returned object is null).
+  /// If [bounds] object is available on this, it's recalculated after
+  /// projecting geometries. If [bounds] is null, then it's null after
+  /// projecting too.
   Bounded project(Projection projection);
-
-  // NOTE: add an optional param to "project" to ask calcuting bounds after op
 }

dart/geobase/lib/src/vector_data/model/feature/feature.dart

@@ -239,7 +239,7 @@ class Feature<T extends Geometry> extends FeatureObject {
         item: geometry, // the main geometry of Feature
         collection: customGeometries?.values, // other geoms of CustomFeature
         type: resolveCoordType(),
-        calculateChilds: true,
+        recalculateChilds: true,
       );
 
   @override
@@ -259,18 +259,31 @@ class Feature<T extends Geometry> extends FeatureObject {
           ? BoundsBuilder.calculateBounds(
               item: geom,
               type: resolveCoordTypeFrom(item: geom),
-              calculateChilds: false,
+              recalculateChilds: false,
             )
           : bounds,
     );
   }
 
   @override
-  Feature<T> project(Projection projection) => Feature<T>(
-        id: _id,
-        geometry: _geometry?.project(projection) as T?,
-        properties: _properties,
-      );
+  Feature<T> project(Projection projection) {
+    final projectedGeom = _geometry?.project(projection) as T?;
+
+    return Feature<T>(
+      id: _id,
+      geometry: projectedGeom,
+      properties: _properties,
+
+      // bounds calculated from projected geometry if there was bounds before
+      bounds: bounds != null && projectedGeom != null
+          ? BoundsBuilder.calculateBounds(
+              item: projectedGeom,
+              type: resolveCoordTypeFrom(item: projectedGeom),
+              recalculateChilds: false,
+            )
+          : null,
+    );
+  }
 
   @override
   void writeTo(FeatureContent writer) {
@@ -514,22 +527,41 @@ class _CustomFeature<T extends Geometry> extends Feature<T> {
                 item: geom,
                 collection: custGeom?.values,
               ),
-              calculateChilds: false,
+              recalculateChilds: false,
             )
           : bounds,
     );
   }
 
   @override
-  Feature<T> project(Projection projection) => _CustomFeature<T>(
-        id: _id,
-        geometry: _geometry?.project(projection) as T?,
-        properties: _properties,
-        custom: _custom,
-        customGeometries: _customGeometries?.map<String, Geometry>(
-          (key, geom) => MapEntry(key, geom.project(projection)),
-        ),
-      );
+  Feature<T> project(Projection projection) {
+    final projectedGeom = _geometry?.project(projection) as T?;
+    final projectedCustGeom = _customGeometries?.map<String, Geometry>(
+      (key, geom) => MapEntry(key, geom.project(projection)),
+    );
+
+    return _CustomFeature<T>(
+      id: _id,
+      geometry: projectedGeom,
+      properties: _properties,
+      custom: _custom,
+      customGeometries: projectedCustGeom,
+
+      // bounds calculated from projected geometries if there was bounds before
+      bounds:
+          bounds != null && (projectedGeom != null || projectedCustGeom != null)
+              ? BoundsBuilder.calculateBounds(
+                  item: projectedGeom,
+                  collection: projectedCustGeom?.values,
+                  type: resolveCoordTypeFrom(
+                    item: projectedGeom,
+                    collection: projectedCustGeom?.values,
+                  ),
+                  recalculateChilds: false,
+                )
+              : null,
+    );
+  }
 
   @override
   void writeTo(FeatureContent writer) {

dart/geobase/lib/src/vector_data/model/feature/feature_collection.dart

@@ -168,7 +168,7 @@ class FeatureCollection<E extends Feature> extends FeatureObject {
   BoxCoords? calculateBounds() => BoundsBuilder.calculateBounds(
         collection: features,
         type: resolveCoordType(),
-        calculateChilds: true,
+        recalculateChilds: true,
       );
 
   @override
@@ -189,19 +189,32 @@ class FeatureCollection<E extends Feature> extends FeatureObject {
           ? BoundsBuilder.calculateBounds(
               collection: collection,
               type: resolveCoordTypeFrom(collection: collection),
-              calculateChilds: false,
+              recalculateChilds: false,
             )
           : bounds,
     );
   }
 
   @override
-  FeatureCollection<E> project(Projection projection) => FeatureCollection<E>._(
-        _features
-            .map<E>((feature) => feature.project(projection) as E)
-            .toList(growable: false),
-        _custom,
-      );
+  FeatureCollection<E> project(Projection projection) {
+    final projected = _features
+        .map<E>((feature) => feature.project(projection) as E)
+        .toList(growable: false);
+
+    return FeatureCollection<E>._(
+      projected,
+      _custom,
+
+      // bounds calculated from projected collection if there was bounds before
+      bounds: bounds != null
+          ? BoundsBuilder.calculateBounds(
+              collection: projected,
+              type: resolveCoordTypeFrom(collection: projected),
+              recalculateChilds: false,
+            )
+          : null,
+    );
+  }
 
   @override
   void writeTo(FeatureContent writer) {

dart/geobase/lib/src/vector_data/model/feature/feature_object.dart

@@ -33,8 +33,9 @@ abstract class FeatureObject extends Bounded {
   /// Any custom data or properties (other than geometries) are not projected,
   /// just copied (by references).
   ///
-  /// Note that any available [bounds] object on this is not projected (that is
-  /// the bounds for a returned feature object is null).
+  /// If [bounds] object is available on this, it's recalculated after
+  /// projecting geometries. If [bounds] is null, then it's null after
+  /// projecting too.
   @override
   FeatureObject project(Projection projection);
 

dart/geobase/lib/src/vector_data/model/geometry/geometry.dart

@@ -48,8 +48,9 @@ abstract class Geometry extends Bounded {
   ///
   /// The returned geometry sub type must be the same as the type of this.
   ///
-  /// Note that any available [bounds] object on this is not projected (that is
-  /// the bounds for a returned geometry is null).
+  /// If [bounds] object is available on this, it's recalculated after
+  /// projecting geometries. If [bounds] is null, then it's null after
+  /// projecting too.
   @override
   Geometry project(Projection projection);
 

dart/geobase/lib/src/vector_data/model/geometry/geometry_collection.dart

@@ -140,7 +140,7 @@ class GeometryCollection<E extends Geometry> extends Geometry {
   BoxCoords? calculateBounds() => BoundsBuilder.calculateBounds(
         collection: _geometries,
         type: resolveCoordType(),
-        calculateChilds: true,
+        recalculateChilds: true,
       );
 
   @override
@@ -161,18 +161,31 @@ class GeometryCollection<E extends Geometry> extends Geometry {
           ? BoundsBuilder.calculateBounds(
               collection: collection,
               type: resolveCoordTypeFrom(collection: collection),
-              calculateChilds: false,
+              recalculateChilds: false,
             )
           : bounds,
     );
   }
 
   @override
-  GeometryCollection<E> project(Projection projection) => GeometryCollection<E>(
-        _geometries
-            .map<E>((geometry) => geometry.project(projection) as E)
-            .toList(growable: false),
-      );
+  GeometryCollection<E> project(Projection projection) {
+    final projected = _geometries
+        .map<E>((geometry) => geometry.project(projection) as E)
+        .toList(growable: false);
+
+    return GeometryCollection<E>(
+      projected,
+
+      // bounds calculated from projected collection if there was bounds before
+      bounds: bounds != null
+          ? BoundsBuilder.calculateBounds(
+              collection: projected,
+              type: resolveCoordTypeFrom(collection: projected),
+              recalculateChilds: false,
+            )
+          : null,
+    );
+  }
 
   @override
   void writeTo(GeometryContent writer, {String? name}) => isEmpty

dart/geobase/lib/src/vector_data/model/geometry/linestring.dart

@@ -190,8 +190,21 @@ class LineString extends SimpleGeometry {
   }
 
   @override
-  LineString project(Projection projection) =>
-      LineString(_chain.project(projection));
+  LineString project(Projection projection) {
+    final projected = _chain.project(projection);
+
+    return LineString(
+      projected,
+
+      // bounds calculated from projected chain if there was bounds before
+      bounds: bounds != null
+          ? BoundsBuilder.calculateBounds(
+              array: projected,
+              type: coordType,
+            )
+          : null,
+    );
+  }
 
   @override
   void writeTo(SimpleGeometryContent writer, {String? name}) => isEmpty

dart/geobase/lib/src/vector_data/model/geometry/multi_linestring.dart

@@ -223,12 +223,24 @@ class MultiLineString extends SimpleGeometry {
   }
 
   @override
-  MultiLineString project(Projection projection) => MultiLineString._(
-        _lineStrings
-            .map((chain) => chain.project(projection))
-            .toList(growable: false),
-        type: _type,
-      );
+  MultiLineString project(Projection projection) {
+    final projected = _lineStrings
+        .map((chain) => chain.project(projection))
+        .toList(growable: false);
+
+    return MultiLineString._(
+      projected,
+      type: _type,
+
+      // bounds calculated from projected geometry if there was bounds before
+      bounds: bounds != null
+          ? BoundsBuilder.calculateBounds(
+              arrays: projected,
+              type: coordType,
+            )
+          : null,
+    );
+  }
 
   @override
   void writeTo(SimpleGeometryContent writer, {String? name}) => isEmpty

dart/geobase/lib/src/vector_data/model/geometry/multi_point.dart

@@ -199,12 +199,24 @@ class MultiPoint extends SimpleGeometry {
   }
 
   @override
-  MultiPoint project(Projection projection) => MultiPoint._(
-        _points
-            .map((pos) => projection.project(pos, to: PositionCoords.create))
-            .toList(growable: false),
-        type: _type,
-      );
+  MultiPoint project(Projection projection) {
+    final projected = _points
+        .map((pos) => projection.project(pos, to: PositionCoords.create))
+        .toList(growable: false);
+
+    return MultiPoint._(
+      projected,
+      type: _type,
+
+      // bounds calculated from projected geometry if there was bounds before
+      bounds: bounds != null
+          ? BoundsBuilder.calculateBounds(
+              positions: projected,
+              type: coordType,
+            )
+          : null,
+    );
+  }
 
   @override
   void writeTo(SimpleGeometryContent writer, {String? name}) => isEmpty