Merge from vector-overlay

Author: azrogers

Source/CesiumRuntime/Private/CesiumGeoJsonDocument.cpp

@@ -13,6 +13,15 @@ FCesiumGeoJsonDocument::FCesiumGeoJsonDocument(
     std::shared_ptr<CesiumVectorData::GeoJsonDocument>&& document)
     : _pDocument(std::move(document)) {}
 
+bool FCesiumGeoJsonDocument::IsValid() const {
+  return this->_pDocument != nullptr;
+}
+
+const std::shared_ptr<CesiumVectorData::GeoJsonDocument>&
+FCesiumGeoJsonDocument::GetDocument() const {
+  return this->_pDocument;
+}
+
 bool UCesiumGeoJsonDocumentBlueprintLibrary::LoadGeoJsonFromString(
     const FString& InString,
     FCesiumGeoJsonDocument& OutVectorDocument) {

Source/CesiumRuntime/Private/CesiumGeoJsonDocumentRasterOverlay.cpp

@@ -0,0 +1,93 @@
+// Copyright 2020-2024 CesiumGS, Inc. and Contributors
+
+#include "CesiumGeoJsonDocumentRasterOverlay.h"
+
+#include "CesiumCustomVersion.h"
+#include "CesiumGeometry/QuadtreeTilingScheme.h"
+#include "CesiumGeospatial/GlobeRectangle.h"
+#include "CesiumGeospatial/Projection.h"
+#include "CesiumRasterOverlays/GeoJsonDocumentRasterOverlay.h"
+#include "CesiumVectorData/VectorStyle.h"
+
+#include "CesiumRuntime.h"
+
+std::unique_ptr<CesiumRasterOverlays::RasterOverlay>
+UCesiumGeoJsonDocumentRasterOverlay::CreateOverlay(
+    const CesiumRasterOverlays::RasterOverlayOptions& options) {
+  if (this->Source == ECesiumGeoJsonDocumentRasterOverlaySource::FromDocument &&
+      !this->GeoJsonDocument.IsValid()) {
+    // Don't create an overlay with an invalid document.
+    return nullptr;
+  }
+
+  CesiumGeospatial::Projection projection;
+  if (this->Projection ==
+      ECesiumGeoJsonDocumentRasterOverlayProjection::Geographic) {
+    projection = CesiumGeospatial::GeographicProjection(options.ellipsoid);
+  } else {
+    projection = CesiumGeospatial::WebMercatorProjection(options.ellipsoid);
+  }
+
+  std::optional<CesiumRasterOverlays::GeoJsonDocumentRasterOverlayStyleCallback>
+      callbackOpt = std::nullopt;
+
+  if (this->StyleCallback.IsBound()) {
+    callbackOpt =
+        [Callback = this->StyleCallback](
+            const std::shared_ptr<CesiumVectorData::GeoJsonDocument>& doc,
+            const CesiumVectorData::GeoJsonObject* pNode)
+        -> std::optional<CesiumVectorData::VectorStyle> {
+      FCesiumVectorStyle style;
+      if (Callback.Execute(FCesiumGeoJsonObject(doc, pNode), style)) {
+        return style.toNative();
+      }
+
+      return std::nullopt;
+    };
+  }
+
+  CesiumRasterOverlays::GeoJsonDocumentRasterOverlayOptions vectorOptions{
+      this->DefaultStyle.toNative(),
+      callbackOpt,
+      std::move(projection),
+      options.ellipsoid,
+      this->MipLevels};
+
+  if (this->Source ==
+      ECesiumGeoJsonDocumentRasterOverlaySource::FromCesiumIon) {
+    if (!IsValid(this->CesiumIonServer)) {
+      this->CesiumIonServer = UCesiumIonServer::GetServerForNewObjects();
+    }
+
+    return std::make_unique<CesiumRasterOverlays::GeoJsonDocumentRasterOverlay>(
+        TCHAR_TO_UTF8(*this->MaterialLayerKey),
+        CesiumRasterOverlays::IonGeoJsonDocumentRasterOverlaySource{
+            this->IonAssetID,
+            TCHAR_TO_UTF8(*this->CesiumIonServer->DefaultIonAccessToken),
+            TCHAR_TO_UTF8(*this->CesiumIonServer->ApiUrl)},
+        vectorOptions,
+        options);
+  } else if (
+      this->Source == ECesiumGeoJsonDocumentRasterOverlaySource::FromUrl) {
+    std::vector<CesiumAsync::IAssetAccessor::THeader> headers;
+    headers.reserve(this->RequestHeaders.Num());
+
+    for (auto& [k, v] : this->RequestHeaders) {
+      headers.push_back({TCHAR_TO_UTF8(*k), TCHAR_TO_UTF8(*v)});
+    }
+
+    return std::make_unique<CesiumRasterOverlays::GeoJsonDocumentRasterOverlay>(
+        TCHAR_TO_UTF8(*this->MaterialLayerKey),
+        CesiumRasterOverlays::UrlGeoJsonDocumentRasterOverlaySource{
+            TCHAR_TO_UTF8(*this->Url),
+            std::move(headers)},
+        vectorOptions,
+        options);
+  }
+
+  return std::make_unique<CesiumRasterOverlays::GeoJsonDocumentRasterOverlay>(
+      TCHAR_TO_UTF8(*this->MaterialLayerKey),
+      this->GeoJsonDocument.GetDocument(),
+      vectorOptions,
+      options);
+}

Source/CesiumRuntime/Private/CesiumGeoJsonObject.cpp

@@ -1,10 +1,6 @@
 #include "CesiumGeoJsonObject.h"
 
 #include "CesiumGeospatial/Cartographic.h"
-<<<<<<< HEAD
-#include "CesiumGeospatial/CartographicPolygon.h"
-=======
->>>>>>> c9a4bb6e4f1d4f2a43a89eed2cb1e487dfa9a28b
 #include "Dom/JsonObject.h"
 #include "VecMath.h"
 

Source/CesiumRuntime/Private/CesiumVectorDocumentRasterOverlay.cpp

@@ -1,9 +1,11 @@
 #include "CesiumVectorStyle.h"
 
+#include "CesiumUtility/Color.h"
+
 CesiumVectorData::VectorStyle FCesiumVectorStyle::toNative() const {
   return CesiumVectorData::VectorStyle{
       CesiumVectorData::LineStyle{
-          CesiumVectorData::Color{
+          CesiumUtility::Color{
               this->LineStyle.Color.R,
               this->LineStyle.Color.G,
               this->LineStyle.Color.B,
@@ -12,7 +14,7 @@ CesiumVectorData::VectorStyle FCesiumVectorStyle::toNative() const {
           this->LineStyle.Width,
           (CesiumVectorData::LineWidthMode)this->LineStyle.WidthMode},
       CesiumVectorData::PolygonStyle{
-          CesiumVectorData::Color{
+          CesiumUtility::Color{
               this->PolygonStyle.Color.R,
               this->PolygonStyle.Color.G,
               this->PolygonStyle.Color.B,

Source/CesiumRuntime/Private/CesiumVectorStyle.cpp

@@ -35,18 +35,15 @@ struct FCesiumGeoJsonDocument {
       std::shared_ptr<CesiumVectorData::GeoJsonDocument>&& document);
 
   /**
-   * @brief Checks if this FCesiumVectorDocument is valid (document is not
+   * @brief Checks if this FCesiumGeoJsonDocument is valid (document is not
    * nullptr).
    */
-  bool IsValid() const { return this->_document != nullptr; }
+  bool IsValid() const;
 
   /**
-   * @brief Returns the `CesiumVectorData::VectorDocument` this wraps.
+   * @brief Returns the `CesiumVectorData::GeoJsonDocument` this wraps.
    */
-  const CesiumUtility::IntrusivePointer<CesiumVectorData::GeoJsonDocument>&
-  GetDocument() const {
-    return this->_document;
-  }
+  const std::shared_ptr<CesiumVectorData::GeoJsonDocument>& GetDocument() const;
 
 private:
   std::shared_ptr<CesiumVectorData::GeoJsonDocument> _pDocument;