From c5e77616a8c901cdaa5d4f849ed53aaee432cd76 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Wed, 5 May 2021 19:01:58 +1000 Subject: [PATCH 1/4] Don't use non-standard not.required mechanism. Also don't mark any properties of gltf.EXT_feature_metadata required, because I don't think they are. --- .../schema/gltf.EXT_feature_metadata.schema.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/extensions/2.0/Vendor/EXT_feature_metadata/schema/gltf.EXT_feature_metadata.schema.json b/extensions/2.0/Vendor/EXT_feature_metadata/schema/gltf.EXT_feature_metadata.schema.json index d3d5b382a2..5325a1b308 100644 --- a/extensions/2.0/Vendor/EXT_feature_metadata/schema/gltf.EXT_feature_metadata.schema.json +++ b/extensions/2.0/Vendor/EXT_feature_metadata/schema/gltf.EXT_feature_metadata.schema.json @@ -35,11 +35,5 @@ }, "extensions": {}, "extras": {} - }, - "not": { - "required": [ - "schema", - "schemaUri" - ] } } From f626a4951f2d2cb621af43089604efdff0d53e2c Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 6 May 2021 00:00:57 +1000 Subject: [PATCH 2/4] Specify item type of statistic arrays. --- .../statistics.class.property.schema.json | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/extensions/2.0/Vendor/EXT_feature_metadata/schema/statistics.class.property.schema.json b/extensions/2.0/Vendor/EXT_feature_metadata/schema/statistics.class.property.schema.json index 3e672c1e9e..db52cd9513 100644 --- a/extensions/2.0/Vendor/EXT_feature_metadata/schema/statistics.class.property.schema.json +++ b/extensions/2.0/Vendor/EXT_feature_metadata/schema/statistics.class.property.schema.json @@ -9,6 +9,9 @@ "number", "array" ], + "items": { + "type": "number" + }, "description": "The minimum property value. Only applicable for numeric types and fixed-length arrays of numeric types. For numeric types this is a single number. For fixed-length arrays this is an array with `componentCount` number of elements. The `normalized` property has no effect on these values." }, "max": { @@ -16,6 +19,9 @@ "number", "array" ], + "items": { + "type": "number" + }, "description": "The maximum property value. Only applicable for numeric types and fixed-length arrays of numeric types. For numeric types this is a single number. For fixed-length arrays this is an array with `componentCount` number of elements. The `normalized` property has no effect on these values." }, "mean": { @@ -23,6 +29,9 @@ "number", "array" ], + "items": { + "type": "number" + }, "description": "The arithmetic mean of the property values. Only applicable for numeric types and fixed-length arrays of numeric types. For numeric types this is a single number. For fixed-length arrays this is an array with `componentCount` number of elements. The `normalized` property has no effect on these values." }, "median": { @@ -30,6 +39,9 @@ "number", "array" ], + "items": { + "type": "number" + }, "description": "The median of the property values. Only applicable for numeric types and fixed-length arrays of numeric types. For numeric types this is a single number. For fixed-length arrays this is an array with `componentCount` number of elements. The `normalized` property has no effect on these values." }, "standardDeviation": { @@ -37,6 +49,9 @@ "number", "array" ], + "items": { + "type": "number" + }, "description": "The standard deviation of the property values. Only applicable for numeric types and fixed-length arrays of numeric types. For numeric types this is a single number. For fixed-length arrays this is an array with `componentCount` number of elements. The `normalized` property has no effect on these values." }, "variance": { @@ -44,6 +59,9 @@ "number", "array" ], + "items": { + "type": "number" + }, "description": "The variance of the property values. Only applicable for numeric types and fixed-length arrays of numeric types. For numeric types this is a single number. For fixed-length arrays this is an array with `componentCount` number of elements. The `normalized` property has no effect on these values." }, "sum": { @@ -51,6 +69,9 @@ "number", "array" ], + "items": { + "type": "number" + }, "description": "The sum of the property values. Only applicable for numeric types and fixed-length arrays of numeric types. For numeric types this is a single number. For fixed-length arrays this is an array with `componentCount` number of elements. The `normalized` property has no effect on these values." }, "occurrences": { @@ -61,7 +82,10 @@ "type": [ "integer", "array" - ] + ], + "items": { + "type": "number" + } } }, "extensions": {}, From 060a834b64c4b33eb83832c6e77f226df1191424 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 6 May 2021 00:20:48 +1000 Subject: [PATCH 3/4] Add item types to class properties schema. --- .../EXT_feature_metadata/schema/class.property.schema.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extensions/2.0/Vendor/EXT_feature_metadata/schema/class.property.schema.json b/extensions/2.0/Vendor/EXT_feature_metadata/schema/class.property.schema.json index c04dcbbd84..ed66422235 100644 --- a/extensions/2.0/Vendor/EXT_feature_metadata/schema/class.property.schema.json +++ b/extensions/2.0/Vendor/EXT_feature_metadata/schema/class.property.schema.json @@ -71,6 +71,9 @@ "number", "array" ], + "items": { + "type": "number" + }, "description": "Maximum allowed values for property values. Only applicable for numeric types and fixed-length arrays of numeric types. For numeric types this is a single number. For fixed-length arrays this is an array with `componentCount` number of elements. The `normalized` property has no effect on these values: they always correspond to the integer values." }, "min": { @@ -78,6 +81,9 @@ "number", "array" ], + "items": { + "type": "number" + }, "description": "Minimum allowed values for property values. Only applicable for numeric types and fixed-length arrays of numeric types. For numeric types this is a single number. For fixed-length arrays this is an array with `componentCount` number of elements. The `normalized` property has no effect on these values: they always correspond to the integer values." }, "default": { From d0930a273d0c140b3f25978a8d5425dbd2a86022 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Fri, 14 May 2021 15:49:14 +1000 Subject: [PATCH 4/4] Avoid duplicate title. --- .../schema/featureIdAttribute.featureIds.schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/2.0/Vendor/EXT_feature_metadata/schema/featureIdAttribute.featureIds.schema.json b/extensions/2.0/Vendor/EXT_feature_metadata/schema/featureIdAttribute.featureIds.schema.json index 3a32a65ca3..8dca861aa7 100644 --- a/extensions/2.0/Vendor/EXT_feature_metadata/schema/featureIdAttribute.featureIds.schema.json +++ b/extensions/2.0/Vendor/EXT_feature_metadata/schema/featureIdAttribute.featureIds.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema", - "title": "Feature ID attribute", + "title": "Feature IDs", "type": "object", "description": "Feature IDs to be used as indices to property arrays in the feature table.", "properties": {