Merge from geojson-support

Author: azrogers

Content/VectorIteratorMacros.uasset

@@ -1,20 +1,27 @@
 #include "CesiumGeoJsonDocument.h"
+#include "CesiumIonServer.h"
 #include "CesiumRuntime.h"
 
-#include "CesiumUtility/Result.h"
+#include <CesiumAsync/IAssetAccessor.h>
+#include <CesiumUtility/Result.h>
 
 #include <span>
 
+FCesiumGeoJsonDocument::FCesiumGeoJsonDocument() : _pDocument(nullptr) {}
+
+FCesiumGeoJsonDocument::FCesiumGeoJsonDocument(
+    std::shared_ptr<CesiumVectorData::GeoJsonDocument>&& document)
+    : _pDocument(std::move(document)) {}
+
 bool UCesiumGeoJsonDocumentBlueprintLibrary::LoadGeoJsonFromString(
     const FString& InString,
     FCesiumGeoJsonDocument& OutVectorDocument) {
   const std::string str = TCHAR_TO_UTF8(*InString);
   std::span<const std::byte> bytes(
       reinterpret_cast<const std::byte*>(str.data()),
       str.size());
-  CesiumUtility::Result<
-      CesiumUtility::IntrusivePointer<CesiumVectorData::GeoJsonDocument>>
-      documentResult = CesiumVectorData::GeoJsonDocument::fromGeoJson(bytes);
+  CesiumUtility::Result<CesiumVectorData::GeoJsonDocument> documentResult =
+      CesiumVectorData::GeoJsonDocument::fromGeoJson(bytes);
 
   if (!documentResult.errors.errors.empty()) {
     documentResult.errors.logError(
@@ -28,9 +35,10 @@ bool UCesiumGeoJsonDocumentBlueprintLibrary::LoadGeoJsonFromString(
         "Warnings while loading GeoJSON from string");
   }
 
-  if (documentResult.pValue) {
-    OutVectorDocument =
-        FCesiumGeoJsonDocument(std::move(documentResult.pValue));
+  if (documentResult.value) {
+    OutVectorDocument = FCesiumGeoJsonDocument(
+        std::make_shared<CesiumVectorData::GeoJsonDocument>(
+            std::move(*documentResult.value)));
     return true;
   }
 
@@ -39,39 +47,94 @@ bool UCesiumGeoJsonDocumentBlueprintLibrary::LoadGeoJsonFromString(
 
 FCesiumGeoJsonObject UCesiumGeoJsonDocumentBlueprintLibrary::GetRootObject(
     const FCesiumGeoJsonDocument& InVectorDocument) {
-  if (!InVectorDocument._document) {
+  if (!InVectorDocument._pDocument) {
     return FCesiumGeoJsonObject();
   }
 
   return FCesiumGeoJsonObject(
-      InVectorDocument._document,
-      &InVectorDocument._document->getRootObject());
+      InVectorDocument._pDocument,
+      &InVectorDocument._pDocument->rootObject);
 }
 
 UCesiumLoadVectorDocumentFromIonAsyncAction*
 UCesiumLoadVectorDocumentFromIonAsyncAction::LoadFromIon(
     int64 AssetId,
-    const FString& IonAccessToken,
-    const FString& IonAssetEndpointUrl) {
+    const UCesiumIonServer* CesiumIonServer,
+    const FString& IonAccessToken) {
   UCesiumLoadVectorDocumentFromIonAsyncAction* pAction =
       NewObject<UCesiumLoadVectorDocumentFromIonAsyncAction>();
   pAction->AssetId = AssetId;
   pAction->IonAccessToken = IonAccessToken;
-  pAction->IonAssetEndpointUrl = IonAssetEndpointUrl;
+  pAction->CesiumIonServer = CesiumIonServer;
   return pAction;
 }
 
 void UCesiumLoadVectorDocumentFromIonAsyncAction::Activate() {
+  const std::string token(
+      this->IonAccessToken.IsEmpty()
+          ? TCHAR_TO_UTF8(*this->CesiumIonServer->DefaultIonAccessToken)
+          : TCHAR_TO_UTF8(*this->IonAccessToken));
   CesiumVectorData::GeoJsonDocument::fromCesiumIonAsset(
       getAsyncSystem(),
       getAssetAccessor(),
       this->AssetId,
-      TCHAR_TO_UTF8(*this->IonAccessToken),
-      TCHAR_TO_UTF8(*this->IonAssetEndpointUrl))
+      token,
+      std::string(TCHAR_TO_UTF8(*this->CesiumIonServer->ApiUrl)) + "/")
+      .thenInMainThread(
+          [Callback = this->OnLoadResult](
+              CesiumUtility::Result<CesiumVectorData::GeoJsonDocument>&&
+                  result) {
+            if (result.errors.hasErrors()) {
+              result.errors.logError(
+                  spdlog::default_logger(),
+                  "Errors loading GeoJSON:");
+              result.errors.logWarning(
+                  spdlog::default_logger(),
+                  "Warnings loading GeoJSON:");
+            }
+
+            if (result.value) {
+              Callback.Broadcast(
+                  true,
+                  FCesiumGeoJsonDocument(
+                      std::make_shared<CesiumVectorData::GeoJsonDocument>(
+                          std::move(*result.value))));
+            } else {
+              Callback.Broadcast(false, {});
+            }
+          });
+}
+
+UCesiumLoadVectorDocumentFromUrlAsyncAction*
+UCesiumLoadVectorDocumentFromUrlAsyncAction::LoadFromUrl(
+    const FString& Url,
+    const TMap<FString, FString>& Headers) {
+  UCesiumLoadVectorDocumentFromUrlAsyncAction* pAction =
+      NewObject<UCesiumLoadVectorDocumentFromUrlAsyncAction>();
+  pAction->Url = Url;
+  pAction->Headers = Headers;
+  return pAction;
+}
+
+void UCesiumLoadVectorDocumentFromUrlAsyncAction::Activate() {
+  std::vector<CesiumAsync::IAssetAccessor::THeader> requestHeaders;
+  requestHeaders.reserve(this->Headers.Num());
+
+  for (const auto& [Key, Value] : this->Headers) {
+    requestHeaders.emplace_back(CesiumAsync::IAssetAccessor::THeader{
+        TCHAR_TO_UTF8(*Key),
+        TCHAR_TO_UTF8(*Value)});
+  }
+
+  CesiumVectorData::GeoJsonDocument::fromUrl(
+      getAsyncSystem(),
+      getAssetAccessor(),
+      TCHAR_TO_UTF8(*this->Url),
+      std::move(requestHeaders))
       .thenInMainThread(
           [Callback = this->OnLoadResult](
-              CesiumUtility::Result<CesiumUtility::IntrusivePointer<
-                  CesiumVectorData::GeoJsonDocument>>&& result) {
+              CesiumUtility::Result<CesiumVectorData::GeoJsonDocument>&&
+                  result) {
             if (result.errors.hasErrors()) {
               result.errors.logError(
                   spdlog::default_logger(),
@@ -81,10 +144,12 @@ void UCesiumLoadVectorDocumentFromIonAsyncAction::Activate() {
                   "Warnings loading GeoJSON:");
             }
 
-            if (result.pValue) {
+            if (result.value) {
               Callback.Broadcast(
                   true,
-                  FCesiumGeoJsonDocument(MoveTemp(result.pValue)));
+                  FCesiumGeoJsonDocument(
+                      std::make_shared<CesiumVectorData::GeoJsonDocument>(
+                          std::move(*result.value))));
             } else {
               Callback.Broadcast(false, {});
             }