Revert "Error fixes and cleanup for i3dm metadata"

This reverts commit a43ef7b.

Author: timoore

Cesium3DTilesContent/src/BatchTableToGltfStructuralMetadata.cpp

@@ -2034,16 +2034,9 @@ template <> int32_t componentTypeFromCpp<uint32_t>() {
   return Accessor::ComponentType::UNSIGNED_INT;
 }
 
-template <class... Ts> struct overloaded : Ts... {
-  using Ts::operator()...;
-};
-template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
-
-// encapsulation of the binary batch id data in an I3dm. If byteSize is 0, then
-// the semantic is invalid for some reason.
+// encapsulation of the binary batch id data in an I3dm
 struct BatchIdSemantic {
   std::variant<
-      std::monostate,
       std::span<const uint8_t>,
       std::span<const uint16_t>,
       std::span<const uint32_t>>
@@ -2073,65 +2066,62 @@ struct BatchIdSemantic {
     const auto byteOffsetIt = batchIdIt->value.FindMember("byteOffset");
     if (byteOffsetIt == batchIdIt->value.MemberEnd() ||
         !byteOffsetIt->value.IsUint()) {
-      return;
+      // Warning
     }
     uint32_t byteOffset = byteOffsetIt->value.GetUint();
     const auto componentTypeIt = batchIdIt->value.FindMember("componentType");
-    if (componentTypeIt != batchIdIt->value.MemberEnd() &&
+    if (componentTypeIt != featureTableJson.MemberEnd() &&
         componentTypeIt->value.IsString()) {
       const std::string& componentTypeString =
           componentTypeIt->value.GetString();
-      if (MetadataProperty::stringToMetadataComponentType.count(
-              componentTypeString) == 0) {
-        return;
+      if (MetadataProperty::stringToMetadataComponentType.find(
+              componentTypeString) ==
+          MetadataProperty::stringToMetadataComponentType.end()) {
+        // Warning
       }
       MetadataProperty::ComponentType componentType =
           MetadataProperty::stringToMetadataComponentType.at(
               componentTypeString);
       rawData = featureTableJsonData.data();
-      numElements = numInstances;
       if (componentType == MetadataProperty::ComponentType::UNSIGNED_BYTE) {
         batchSpan = makeSpan<uint8_t>(rawData, byteOffset, numInstances);
+        numElements = numInstances;
         byteSize = numElements * sizeof(uint8_t);
       } else if (
           componentType == MetadataProperty::ComponentType::UNSIGNED_SHORT) {
-        batchSpan = makeSpan<uint16_t>(rawData, byteOffset, numInstances);
+        batchSpan = makeSpan<uint8_t>(rawData, byteOffset, numInstances);
+        numElements = numInstances;
         byteSize = numElements * sizeof(uint16_t);
       } else if (
           componentType == MetadataProperty::ComponentType::UNSIGNED_INT) {
         batchSpan = makeSpan<uint32_t>(rawData, byteOffset, numInstances);
+        numElements = numInstances;
         byteSize = numElements * sizeof(uint32_t);
       }
     }
   }
 
   size_t idSize() const {
     return std::visit(
-        overloaded(
-            [](const std::monostate&) -> size_t { return 0; },
-            [](auto&& batchIds) -> size_t { return sizeof(batchIds[0]); }),
+        [](auto&& batchIds) { return sizeof(batchIds[0]); },
         batchSpan);
   }
 
   uint32_t maxBatchId() const {
     return std::visit(
-        overloaded(
-            [](const std::monostate&) -> uint32_t { return 0; },
-            [](auto&& batchIds) -> uint32_t {
-              auto itr = std::max_element(batchIds.begin(), batchIds.end());
-              return *itr;
-            }),
+        [](auto&& batchIds) {
+          auto itr = std::max_element(batchIds.begin(), batchIds.end());
+          return static_cast<uint32_t>(*itr);
+        },
         batchSpan);
   }
 
   int32_t componentType() const {
     return std::visit(
-        overloaded(
-            [](const std::monostate&) { return -1; },
-            [](auto&& batchIds) {
-              using span_type = std::remove_reference_t<decltype(batchIds)>;
-              return componentTypeFromCpp<typename span_type::value_type>();
-            }),
+        [](auto&& batchIds) {
+          using span_type = std::remove_reference_t<decltype(batchIds)>;
+          return componentTypeFromCpp<typename span_type::value_type>();
+        },
         batchSpan);
   }
 };
@@ -2185,7 +2175,7 @@ ErrorList BatchTableToGltfStructuralMetadata::convertFromI3dm(
   // IDs, the number of instances.
   int64_t featureCount = 0;
   std::optional<BatchIdSemantic> optBatchIds;
-  bool hasBatchIds = featureTableJson.HasMember("BATCH_ID");
+  const auto batchIdIt = featureTableJson.FindMember("BATCH_ID");
   std::optional<uint32_t> optInstancesLength =
       GltfConverterUtility::getValue<uint32_t>(
           featureTableJson,
@@ -2194,20 +2184,15 @@ ErrorList BatchTableToGltfStructuralMetadata::convertFromI3dm(
     result.emplaceError("Required INSTANCES_LENGTH semantic is missing");
     return result;
   }
-  featureCount = *optInstancesLength;
-  if (hasBatchIds) {
+  if (batchIdIt == featureTableJson.MemberEnd()) {
+    featureCount = *optInstancesLength;
+  } else {
     optBatchIds = BatchIdSemantic(
         featureTableJson,
         *optInstancesLength,
         featureTableJsonData);
-    if (optBatchIds->byteSize == 0) {
-      result.emplaceError("Invalid Batch ID Semantic");
-      optBatchIds.reset();
-    } else {
-      featureCount = optBatchIds->maxBatchId() + 1;
-    }
-  } else {
-    featureCount = *optInstancesLength;
+    uint32_t maxBatchId = optBatchIds->maxBatchId();
+    featureCount = maxBatchId + 1;
   }
 
   convertBatchTableToGltfStructuralMetadataExtension(

Cesium3DTilesContent/src/I3dmToGltfConverter.cpp

@@ -256,7 +256,7 @@ void validateI3dmDataSections(
     return;
   }
   dataSectionOffset += header.batchTableJsonByteLength;
-  if (dataSectionOffset + header.batchTableBinaryByteLength >
+  if (dataSectionOffset + header.batchTableJsonByteLength >
       instancesBinary.size()) {
     errors.emplaceError(fmt::format(
         "Invalid I3dm batch table binary offset {} length {} "