Merge pull request #1057 from CesiumGS/request-headers-tileset

Allow specifying request headers in `TilesetOptions`

Author: kring

CHANGES.md

@@ -12,6 +12,7 @@
 - Added `CesiumIonClient::Connection::geocode` method for making geocoding queries against the Cesium ion geocoder API.
 - Added `UrlTemplateRasterOverlay` for requesting raster tiles from services using a templated URL.
 - `upsampleGltfForRasterOverlays` is now compatible with meshes using TRIANGLE_STRIP, TRIANGLE_FAN, or non-indexed TRIANGLES primitives.
+- Added `requestHeaders` field to `TilesetOptions` to allow per-tileset request headers to be specified.
 
 ##### Fixes :wrench:
 

Cesium3DTilesSelection/include/Cesium3DTilesSelection/TilesetOptions.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Cesium3DTilesSelection/Library.h>
+#include <CesiumAsync/IAssetAccessor.h>
 #include <CesiumGeospatial/Ellipsoid.h>
 #include <CesiumGltf/Ktx2TranscodeTargets.h>
 
@@ -328,6 +329,11 @@ struct CESIUM3DTILESSELECTION_API TilesetOptions {
    * If no ellipsoid is set, Ellipsoid::WGS84 will be used by default.
    */
   CesiumGeospatial::Ellipsoid ellipsoid = CesiumGeospatial::Ellipsoid::WGS84;
+
+  /**
+   * @brief HTTP headers to attach to requests made for this tileset.
+   */
+  std::vector<CesiumAsync::IAssetAccessor::THeader> requestHeaders;
 };
 
 } // namespace Cesium3DTilesSelection

Cesium3DTilesSelection/src/Tileset.cpp

@@ -74,7 +74,6 @@ Tileset::Tileset(
                   _loadedTiles,
                   externals,
                   options.ellipsoid},
-              std::vector<CesiumAsync::IAssetAccessor::THeader>{},
               std::move(pCustomLoader),
               std::move(pRootTile)),
       } {}

Cesium3DTilesSelection/src/TilesetContentManager.cpp

@@ -705,11 +705,10 @@ TilesetContentManager::TilesetContentManager(
     const TilesetExternals& externals,
     const TilesetOptions& tilesetOptions,
     RasterOverlayCollection&& overlayCollection,
-    std::vector<CesiumAsync::IAssetAccessor::THeader>&& requestHeaders,
     std::unique_ptr<TilesetContentLoader>&& pLoader,
     std::unique_ptr<Tile>&& pRootTile)
     : _externals{externals},
-      _requestHeaders{std::move(requestHeaders)},
+      _requestHeaders{tilesetOptions.requestHeaders},
       _pLoader{std::move(pLoader)},
       _pRootTile{std::move(pRootTile)},
       _userCredit(
@@ -739,7 +738,7 @@ TilesetContentManager::TilesetContentManager(
     RasterOverlayCollection&& overlayCollection,
     const std::string& url)
     : _externals{externals},
-      _requestHeaders{},
+      _requestHeaders{tilesetOptions.requestHeaders},
       _pLoader{},
       _pRootTile{},
       _userCredit(
@@ -891,7 +890,7 @@ TilesetContentManager::TilesetContentManager(
     const std::string& ionAccessToken,
     const std::string& ionAssetEndpointUrl)
     : _externals{externals},
-      _requestHeaders{},
+      _requestHeaders{tilesetOptions.requestHeaders},
       _pLoader{},
       _pRootTile{},
       _userCredit(

Cesium3DTilesSelection/src/TilesetContentManager.h

@@ -28,7 +28,6 @@ class TilesetContentManager
       const TilesetExternals& externals,
       const TilesetOptions& tilesetOptions,
       RasterOverlayCollection&& overlayCollection,
-      std::vector<CesiumAsync::IAssetAccessor::THeader>&& requestHeaders,
       std::unique_ptr<TilesetContentLoader>&& pLoader,
       std::unique_ptr<Tile>&& pRootTile);
 

Cesium3DTilesSelection/test/TestTilesetContentManager.cpp

@@ -506,7 +506,6 @@ TEST_CASE("Test tile state machine") {
             externals,
             options,
             RasterOverlayCollection{loadedTiles, externals},
-            {},
             std::move(pMockedLoader),
             std::move(pRootTile)};
 
@@ -612,7 +611,6 @@ TEST_CASE("Test tile state machine") {
             externals,
             options,
             RasterOverlayCollection{loadedTiles, externals},
-            {},
             std::move(pMockedLoader),
             std::move(pRootTile)};
 
@@ -689,7 +687,6 @@ TEST_CASE("Test tile state machine") {
             externals,
             options,
             RasterOverlayCollection{loadedTiles, externals},
-            {},
             std::move(pMockedLoader),
             std::move(pRootTile)};
 
@@ -792,7 +789,6 @@ TEST_CASE("Test tile state machine") {
             externals,
             options,
             RasterOverlayCollection{loadedTiles, externals},
-            {},
             std::move(pMockedLoader),
             std::move(pRootTile)};
 
@@ -947,7 +943,6 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
             externals,
             {},
             RasterOverlayCollection{loadedTiles, externals},
-            {},
             std::move(pMockedLoader),
             std::move(pRootTile)};
 
@@ -1017,7 +1012,6 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
             externals,
             options,
             RasterOverlayCollection{loadedTiles, externals},
-            {},
             std::move(pMockedLoader),
             std::move(pRootTile)};
 
@@ -1083,7 +1077,6 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
             externals,
             {},
             RasterOverlayCollection{loadedTiles, externals},
-            {},
             std::move(pMockedLoader),
             std::move(pRootTile)};
 
@@ -1134,7 +1127,6 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
             externals,
             {},
             std::move(rasterOverlayCollection),
-            {},
             std::move(pMockedLoader),
             std::move(pRootTile)};
 
@@ -1428,7 +1420,6 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
             externals,
             {},
             std::move(rasterOverlayCollection),
-            {},
             std::move(pMockedLoader),
             std::move(pRootTile)};
 
@@ -1651,7 +1642,6 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
             externals,
             {},
             std::move(rasterOverlayCollection),
-            {},
             std::move(pMockedLoader),
             std::move(pRootTile)};
 
@@ -1720,7 +1710,6 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
             externals,
             {},
             RasterOverlayCollection{loadedTiles, externals},
-            {},
             std::move(loaderResult.pLoader),
             std::move(loaderResult.pRootTile)};