Start reading metadata and groups properties.

Cesium3DTilesReader/include/Cesium3DTilesReader/Readers.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <Cesium3DTiles/GroupMetadata.h>
+#include <Cesium3DTiles/MetadataEntity.h>
+#include <Cesium3DTiles/Schema.h>
+#include <CesiumJsonReader/JsonReader.h>
+#include <CesiumJsonReader/JsonReaderOptions.h>
+
+namespace Cesium3DTilesReader {
+
+CesiumJsonReader::ReadJsonResult<Cesium3DTiles::Schema> readSchema(
+    const rapidjson::Value& value,
+    const CesiumJsonReader::JsonReaderOptions& options = {});
+
+CesiumJsonReader::ReadJsonResult<Cesium3DTiles::MetadataEntity>
+readMetadataEntity(
+    const rapidjson::Value& value,
+    const CesiumJsonReader::JsonReaderOptions& options = {});
+
+CesiumJsonReader::ReadJsonResult<Cesium3DTiles::GroupMetadata>
+readGroupMetadata(
+    const rapidjson::Value& value,
+    const CesiumJsonReader::JsonReaderOptions& options = {});
+
+CesiumJsonReader::ReadJsonResult<std::vector<Cesium3DTiles::GroupMetadata>>
+readGroupMetadataArray(
+    const rapidjson::Value& value,
+    const CesiumJsonReader::JsonReaderOptions& options = {});
+
+} // namespace Cesium3DTilesReader

Cesium3DTilesReader/src/Readers.cpp

@@ -0,0 +1,43 @@
+#include "GroupMetadataJsonHandler.h"
+#include "MetadataEntityJsonHandler.h"
+#include "SchemaJsonHandler.h"
+
+#include <Cesium3DTilesReader/Readers.h>
+#include <CesiumJsonReader/ArrayJsonHandler.h>
+
+namespace Cesium3DTilesReader {
+
+CesiumJsonReader::ReadJsonResult<Cesium3DTiles::Schema> readSchema(
+    const rapidjson::Value& value,
+    const CesiumJsonReader::JsonReaderOptions& options) {
+  SchemaJsonHandler handler(options);
+  return CesiumJsonReader::JsonReader::readJson(value, handler);
+}
+
+CesiumJsonReader::ReadJsonResult<Cesium3DTiles::MetadataEntity>
+readMetadataEntity(
+    const rapidjson::Value& value,
+    const CesiumJsonReader::JsonReaderOptions& options) {
+  MetadataEntityJsonHandler handler(options);
+  return CesiumJsonReader::JsonReader::readJson(value, handler);
+}
+
+CesiumJsonReader::ReadJsonResult<Cesium3DTiles::GroupMetadata>
+readGroupMetadata(
+    const rapidjson::Value& value,
+    const CesiumJsonReader::JsonReaderOptions& options) {
+  GroupMetadataJsonHandler handler(options);
+  return CesiumJsonReader::JsonReader::readJson(value, handler);
+}
+
+CesiumJsonReader::ReadJsonResult<std::vector<Cesium3DTiles::GroupMetadata>>
+readGroupMetadataArray(
+    const rapidjson::Value& value,
+    const CesiumJsonReader::JsonReaderOptions& options) {
+  CesiumJsonReader::
+      ArrayJsonHandler<Cesium3DTiles::GroupMetadata, GroupMetadataJsonHandler>
+          handler(options);
+  return CesiumJsonReader::JsonReader::readJson(value, handler);
+}
+
+} // namespace Cesium3DTilesReader

Cesium3DTilesSelection/src/TilesetJsonLoader.cpp

@@ -4,7 +4,7 @@
 #include "ImplicitQuadtreeLoader.h"
 #include "logTileLoadResult.h"
 
-#include <Cesium3DTilesReader/SchemaReader.h>
+#include <Cesium3DTilesReader/Readers.h>
 #include <Cesium3DTilesSelection/GltfConverters.h>
 #include <Cesium3DTilesSelection/TileID.h>
 #include <CesiumAsync/AsyncSystem.h>
@@ -598,11 +598,27 @@ TilesetContentLoaderResult<TilesetJsonLoader> parseTilesetJson(
 
   const auto schemaIt = tilesetJson.FindMember("schema");
   if (schemaIt != tilesetJson.MemberEnd()) {
-    Cesium3DTilesReader::SchemaReader reader{};
-    Cesium3DTilesReader::SchemaReaderResult schemaResult =
-        reader.readSchema(schemaIt->value);
-    if (schemaResult.schema) {
-      pLoader->getSchema() = std::move(*schemaResult.schema);
+    auto schemaResult = Cesium3DTilesReader::readSchema(schemaIt->value);
+    if (schemaResult.value) {
+      pLoader->getSchema() = std::move(*schemaResult.value);
+    }
+  }
+
+  const auto metadataIt = tilesetJson.FindMember("metadata");
+  if (metadataIt != tilesetJson.MemberEnd()) {
+    auto metadataResult =
+        Cesium3DTilesReader::readMetadataEntity(metadataIt->value);
+    if (metadataResult.value) {
+      // pLoader->getSchema() = std::move(*schemaResult.value);
+    }
+  }
+
+  const auto groupsIt = tilesetJson.FindMember("groups");
+  if (groupsIt != tilesetJson.MemberEnd()) {
+    auto groupsResult =
+        Cesium3DTilesReader::readGroupMetadataArray(groupsIt->value);
+    if (groupsResult.value) {
+      // pLoader->getSchema() = std::move(*schemaResult.value);
     }
   }
 

CesiumJsonReader/include/CesiumJsonReader/ArrayJsonHandler.h

@@ -15,6 +15,8 @@ namespace CesiumJsonReader {
 template <typename T, typename THandler>
 class CESIUMJSONREADER_API ArrayJsonHandler : public JsonHandler {
 public:
+  using ValueType = std::vector<T>;
+
   template <typename... Ts>
   ArrayJsonHandler(Ts&&... args) noexcept
       : JsonHandler(),