Merge pull request #1302 from CesiumGS/geojson-fixes

Fix more GeoJSON rasterization issues

Author: azrogers

CHANGES.md

@@ -1,5 +1,14 @@
 # Change Log
 
+### ? - ?
+
+##### Fixes :wrench:
+
+- Fixed various bugs with `CesiumRasterOverlays::GeoJsonDocumentRasterOverlay`:
+  - Line width is now factored in to calculations of what geometry is visible in any given tile, reducing the possibility that certain geometry (like perfectly vertical or horizontal lines) would be incorrectly ignored.
+  - Geometry near the antimeridian, such as lines that need to wrap around the entire globe, will now render correctly without gaps.
+  - Geometry contained in other objects, such as polygons within feature collections, will no longer cause the geometry to be incorrectly rendered multiple times.
+
 ### v0.57.0 - 2026-02-02
 
 ##### Additions :tada:

CesiumGeospatial/src/GlobeRectangle.cpp

@@ -131,10 +131,19 @@ GlobeRectangle::computeUnion(const GlobeRectangle& other) const noexcept {
     rectangleWest += CesiumUtility::Math::TwoPi;
   }
 
-  const double west = CesiumUtility::Math::convertLongitudeRange(
-      glm::min(rectangleWest, otherRectangleWest));
-  const double east = CesiumUtility::Math::convertLongitudeRange(
-      glm::max(rectangleEast, otherRectangleEast));
+  double west = glm::min(rectangleWest, otherRectangleWest);
+  double east = glm::max(rectangleEast, otherRectangleEast);
+
+  // convertLongitudeRange will wrap values that are greater *or equal* to PI,
+  // which means a rectangle from [-PI, PI] would be wrapped to [-PI, -PI] - a
+  // completely different result. This is not what we want.
+  if (west != CesiumUtility::Math::OnePi) {
+    west = CesiumUtility::Math::convertLongitudeRange(west);
+  }
+
+  if (east != CesiumUtility::Math::OnePi) {
+    east = CesiumUtility::Math::convertLongitudeRange(east);
+  }
 
   return GlobeRectangle(
       west,

CesiumNativeTests/include/CesiumNativeTests/checkFilesEqual.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <filesystem>
+
+namespace CesiumNativeTests {
+/**
+ * @brief Tests that the contents of `fileA` are equal to the contents of
+ * `fileB`.
+ */
+void checkFilesEqual(
+    const std::filesystem::path& fileA,
+    const std::filesystem::path& fileB);
+} // namespace CesiumNativeTests

CesiumNativeTests/src/checkFilesEqual.cpp

@@ -0,0 +1,19 @@
+#include <CesiumNativeTests/checkFilesEqual.h>
+#include <CesiumNativeTests/readFile.h>
+
+#include <doctest/doctest.h>
+
+#include <cstddef>
+#include <filesystem>
+#include <vector>
+
+namespace CesiumNativeTests {
+void checkFilesEqual(
+    const std::filesystem::path& fileA,
+    const std::filesystem::path& fileB) {
+  const std::vector<std::byte>& bytes = readFile(fileA);
+  const std::vector<std::byte>& bytes2 = readFile(fileB);
+
+  REQUIRE(bytes == bytes2);
+}
+} // namespace CesiumNativeTests