Substitute placeholders before manipulating layer.json URLs.

Cesium3DTilesSelection/src/LayerJsonTerrainLoader.cpp

@@ -340,13 +340,6 @@ Future<LoadLayersResult> loadLayersRecursive(
   std::string extensionsToRequest =
       createExtensionsQueryParameter(knownExtensions, extensions);
 
-  if (!extensionsToRequest.empty()) {
-    for (std::string& url : urls) {
-      url =
-          CesiumUtility::Uri::addQuery(url, "extensions", extensionsToRequest);
-    }
-  }
-
   const auto availabilityLevelsIt =
       layerJson.FindMember("metadataAvailability");
 
@@ -379,6 +372,7 @@ Future<LoadLayersResult> loadLayersRecursive(
       baseUrl,
       std::move(version),
       std::move(urls),
+      std::move(extensionsToRequest),
       std::move(availability),
       static_cast<uint32_t>(maxZoom),
       availabilityLevels);
@@ -648,12 +642,14 @@ LayerJsonTerrainLoader::Layer::Layer(
     const std::string& baseUrl_,
     std::string&& version_,
     std::vector<std::string>&& tileTemplateUrls_,
+    std::string&& extensionsToRequest_,
     CesiumGeometry::QuadtreeRectangleAvailability&& contentAvailability_,
     uint32_t maxZooms_,
     int32_t availabilityLevels_)
     : baseUrl{baseUrl_},
       version{std::move(version_)},
       tileTemplateUrls{std::move(tileTemplateUrls_)},
+      extensionsToRequest{std::move(extensionsToRequest_)},
       contentAvailability{std::move(contentAvailability_)},
       loadedSubtrees(maxSubtreeInLayer(maxZooms_, availabilityLevels_)),
       availabilityLevels{availabilityLevels_} {}
@@ -675,9 +671,9 @@ std::string resolveTileUrl(
     return std::string();
   }
 
-  return CesiumUtility::Uri::resolve(
+  Uri uri(
       layer.baseUrl,
-      CesiumUtility::Uri::substituteTemplateParameters(
+      Uri::substituteTemplateParameters(
           layer.tileTemplateUrls[0],
           [&tileID, &layer](const std::string& placeholder) -> std::string {
             if (placeholder == "level" || placeholder == "z") {
@@ -695,6 +691,12 @@ std::string resolveTileUrl(
 
             return placeholder;
           }));
+
+  if (!layer.extensionsToRequest.empty()) {
+    uri.setQueryValue("extensions", layer.extensionsToRequest);
+  }
+
+  return uri.toString();
 }
 
 Future<QuantizedMeshLoadResult> requestTileContent(

Cesium3DTilesSelection/src/LayerJsonTerrainLoader.h

@@ -52,13 +52,15 @@ class LayerJsonTerrainLoader : public TilesetContentLoader {
         const std::string& baseUrl,
         std::string&& version,
         std::vector<std::string>&& tileTemplateUrls,
+        std::string&& extensionsToRequest,
         CesiumGeometry::QuadtreeRectangleAvailability&& contentAvailability,
         uint32_t maxZooms,
         int32_t availabilityLevels);
 
     std::string baseUrl;
     std::string version;
     std::vector<std::string> tileTemplateUrls;
+    std::string extensionsToRequest;
     CesiumGeometry::QuadtreeRectangleAvailability contentAvailability;
     std::vector<std::unordered_set<uint64_t>> loadedSubtrees;
     int32_t availabilityLevels;

Cesium3DTilesSelection/test/TestLayerJsonTerrainLoader.cpp

@@ -261,8 +261,8 @@ TEST_CASE("Test create layer json terrain loader") {
     CHECK(layers[0].version == "1.33.0");
     CHECK(
         layers[0].tileTemplateUrls.front() ==
-        "%7Bz%7D/%7Bx%7D/"
-        "%7By%7D.terrain?v=%7Bversion%7D&extensions=octvertexnormals-metadata");
+        "{z}/{x}/{y}.terrain?v={version}");
+    CHECK(layers[0].extensionsToRequest == "octvertexnormals-metadata");
     CHECK(layers[0].loadedSubtrees.size() == 2);
     CHECK(layers[0].availabilityLevels == 10);
   }
@@ -291,8 +291,8 @@ TEST_CASE("Test create layer json terrain loader") {
     CHECK(layers[0].version == "1.0.0");
     CHECK(
         layers[0].tileTemplateUrls.front() ==
-        "%7Bz%7D/%7Bx%7D/"
-        "%7By%7D.terrain?v=%7Bversion%7D&extensions=octvertexnormals");
+        "{z}/{x}/{y}.terrain?v={version}");
+    CHECK(layers[0].extensionsToRequest == "octvertexnormals");
     CHECK(layers[0].loadedSubtrees.empty());
     CHECK(layers[0].availabilityLevels == -1);
 
@@ -411,11 +411,8 @@ TEST_CASE("Test create layer json terrain loader") {
     const auto& layers = loaderResult.pLoader->getLayers();
     CHECK(layers.size() == 1);
     CHECK(layers[0].tileTemplateUrls.size() == 1);
-    CHECK(
-        layers[0].tileTemplateUrls[0] ==
-        "%7Bz%7D/%7Bx%7D/"
-        "%7By%7D.terrain?v=%7Bversion%7D&extensions=octvertexnormals-"
-        "watermask");
+    CHECK(layers[0].tileTemplateUrls[0] == "{z}/{x}/{y}.terrain?v={version}");
+    CHECK(layers[0].extensionsToRequest == "octvertexnormals-watermask");
   }
 }
 
@@ -446,6 +443,7 @@ TEST_CASE("Test load layer json tile content") {
         "layer.json",
         "1.0.0",
         std::vector<std::string>{"{level}.{x}.{y}/{version}.terrain"},
+        "one-two",
         std::move(contentAvailability),
         maxZoom,
         10);
@@ -454,7 +452,7 @@ TEST_CASE("Test load layer json tile content") {
 
     // mock tile content request
     pMockedAssetAccessor->mockCompletedRequests.insert(
-        {"0.0.0/1.0.0.terrain",
+        {"0.0.0/1.0.0.terrain?extensions=one-two",
          createMockAssetRequest(
              testDataPath / "CesiumTerrainTileJson" /
              "tile.metadataavailability.terrain")});
@@ -496,6 +494,7 @@ TEST_CASE("Test load layer json tile content") {
         "layer.json",
         "1.0.0",
         std::vector<std::string>{"{level}.{x}.{y}/{version}.terrain"},
+        std::string(),
         std::move(contentAvailability),
         maxZoom,
         -1);
@@ -557,6 +556,7 @@ TEST_CASE("Test load layer json tile content") {
         "layer.json",
         "1.0.0",
         std::vector<std::string>{"{level}.{x}.{y}/{version}_layer0.terrain"},
+        std::string(),
         std::move(layer0ContentAvailability),
         maxZoom,
         -1);
@@ -571,6 +571,7 @@ TEST_CASE("Test load layer json tile content") {
         "layer.json",
         "1.0.0",
         std::vector<std::string>{"{level}.{x}.{y}/{version}_layer1.terrain"},
+        std::string(),
         std::move(layer1ContentAvailability),
         maxZoom,
         -1);
@@ -633,6 +634,7 @@ TEST_CASE("Test load layer json tile content") {
         "layer.json",
         "1.0.0",
         std::vector<std::string>{"{level}.{x}.{y}/{version}_layer0.terrain"},
+        std::string(),
         std::move(layer0ContentAvailability),
         maxZoom,
         10);
@@ -644,6 +646,7 @@ TEST_CASE("Test load layer json tile content") {
         "layer.json",
         "1.0.0",
         std::vector<std::string>{"{level}.{x}.{y}/{version}_layer1.terrain"},
+        std::string(),
         std::move(layer1ContentAvailability),
         maxZoom,
         10);
@@ -739,6 +742,7 @@ TEST_CASE("Test creating tile children for layer json") {
       "layer.json",
       "1.0.0",
       std::vector<std::string>{"{level}.{x}.{y}/{version}_layer0.terrain"},
+      std::string(),
       std::move(layer0ContentAvailability),
       maxZoom,
       10);
@@ -754,6 +758,7 @@ TEST_CASE("Test creating tile children for layer json") {
       "layer.json",
       "1.0.0",
       std::vector<std::string>{"{level}.{x}.{y}/{version}_layer1.terrain"},
+      std::string(),
       std::move(layer1ContentAvailability),
       maxZoom,
       10);