Add BoundingRegionBuilder::expandToIncludeBoundingRegion

Author: lilleyse

CesiumGeospatial/include/CesiumGeospatial/BoundingRegionBuilder.h

@@ -82,6 +82,17 @@ class CESIUMGEOSPATIAL_API BoundingRegionBuilder {
    */
   bool expandToIncludeGlobeRectangle(const GlobeRectangle& rectangle);
 
+  /**
+   * @brief Expands the bounding region to include the given bounding region.
+   *
+   * The region will be kept as small as possible.
+   *
+   * @param region The region to be included in the region.
+   * @returns True if the region was modified, or false if the region already
+   * contained the region.
+   */
+  bool expandToIncludeBoundingRegion(const BoundingRegion& region);
+
 private:
   /**
    * @brief When a position's latitude is within this distance in radians from

CesiumGeospatial/src/BoundingRegionBuilder.cpp

@@ -145,4 +145,25 @@ bool BoundingRegionBuilder::expandToIncludeGlobeRectangle(
   return modified;
 }
 
+bool BoundingRegionBuilder::expandToIncludeBoundingRegion(
+    const BoundingRegion& region) {
+  bool modified = false;
+
+  if (expandToIncludeGlobeRectangle(region.getRectangle())) {
+    modified = true;
+  }
+
+  if (region.getMinimumHeight() < this->_minimumHeight) {
+    this->_minimumHeight = region.getMinimumHeight();
+    modified = true;
+  }
+
+  if (region.getMaximumHeight() > this->_maximumHeight) {
+    this->_maximumHeight = region.getMaximumHeight();
+    modified = true;
+  }
+
+  return modified;
+}
+
 } // namespace CesiumGeospatial

CesiumGeospatial/test/TestBoundingRegionBuilder.cpp

@@ -1,3 +1,4 @@
+#include <CesiumGeospatial/BoundingRegion.h>
 #include <CesiumGeospatial/BoundingRegionBuilder.h>
 #include <CesiumGeospatial/Ellipsoid.h>
 #include <CesiumGeospatial/GlobeRectangle.h>
@@ -183,3 +184,107 @@ TEST_CASE("BoundingRegionBuilder::expandToIncludeGlobeRectangle") {
         Math::Epsilon15));
   }
 }
+
+TEST_CASE("BoundingRegionBuilder::expandToIncludeBoundingRegion") {
+  SUBCASE("expands to include rectangle") {
+    BoundingRegionBuilder builder;
+    bool modified = builder.expandToIncludeBoundingRegion(
+        BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.0));
+    BoundingRegion region = builder.toRegion();
+    CHECK(BoundingRegion::equalsEpsilon(
+        region,
+        BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.0),
+        Math::Epsilon15));
+    CHECK(modified);
+
+    SUBCASE("does nothing if the rectangle is already included") {
+      modified = builder.expandToIncludeBoundingRegion(
+          BoundingRegion(GlobeRectangle(0.15, 0.25, 0.25, 0.35), -1.0, 2.0));
+      region = builder.toRegion();
+      CHECK(BoundingRegion::equalsEpsilon(
+          region,
+          BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.0),
+          Math::Epsilon15));
+      CHECK_FALSE(modified);
+    }
+
+    SUBCASE("expands if rectangle is not included") {
+      modified = builder.expandToIncludeBoundingRegion(
+          BoundingRegion(GlobeRectangle(0.05, 0.15, 0.35, 0.45), -1.0, 2.0));
+      region = builder.toRegion();
+      CHECK(BoundingRegion::equalsEpsilon(
+          region,
+          BoundingRegion(GlobeRectangle(0.05, 0.15, 0.35, 0.45), -1.0, 2.0),
+          Math::Epsilon15));
+      CHECK(modified);
+    }
+  }
+
+  SUBCASE("expands to include min height") {
+    BoundingRegionBuilder builder;
+    bool modified = builder.expandToIncludeBoundingRegion(
+        BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.0));
+    BoundingRegion region = builder.toRegion();
+    CHECK(BoundingRegion::equalsEpsilon(
+        region,
+        BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.0),
+        Math::Epsilon15));
+    CHECK(modified);
+
+    SUBCASE("does nothing if min height is already included") {
+      modified = builder.expandToIncludeBoundingRegion(
+          BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -0.5, 2.0));
+      region = builder.toRegion();
+      CHECK(BoundingRegion::equalsEpsilon(
+          region,
+          BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.0),
+          Math::Epsilon15));
+      CHECK_FALSE(modified);
+    }
+
+    SUBCASE("expands to include min height") {
+      modified = builder.expandToIncludeBoundingRegion(
+          BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.5, 2.0));
+      region = builder.toRegion();
+      CHECK(BoundingRegion::equalsEpsilon(
+          region,
+          BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.5, 2.0),
+          Math::Epsilon15));
+      CHECK(modified);
+    }
+  }
+
+  SUBCASE("expands to include max height") {
+    BoundingRegionBuilder builder;
+    bool modified = builder.expandToIncludeBoundingRegion(
+        BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.0));
+    BoundingRegion region = builder.toRegion();
+    CHECK(BoundingRegion::equalsEpsilon(
+        region,
+        BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.0),
+        Math::Epsilon15));
+    CHECK(modified);
+
+    SUBCASE("does nothing if max height is already included") {
+      modified = builder.expandToIncludeBoundingRegion(
+          BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 1.5));
+      region = builder.toRegion();
+      CHECK(BoundingRegion::equalsEpsilon(
+          region,
+          BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.0),
+          Math::Epsilon15));
+      CHECK_FALSE(modified);
+    }
+
+    SUBCASE("expands to include max height") {
+      modified = builder.expandToIncludeBoundingRegion(
+          BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.5));
+      region = builder.toRegion();
+      CHECK(BoundingRegion::equalsEpsilon(
+          region,
+          BoundingRegion(GlobeRectangle(0.1, 0.2, 0.3, 0.4), -1.0, 2.5),
+          Math::Epsilon15));
+      CHECK(modified);
+    }
+  }
+}