Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup pass for 1.1 - JSON schema #677

Merged
merged 10 commits into from
Mar 28, 2022
Merged

Cleanup pass for 1.1 - JSON schema #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3de0179
Marked legacy JSON schemas as 'deprecated'
javagl Mar 22, 2022
72fd2c3
Minor wording pass for JSON schema descriptions
javagl Mar 22, 2022
d3b6491
Replaced single-allOf with ref except for root properties
javagl Mar 22, 2022
090e50a
Removed deprecation for tile content
javagl Mar 26, 2022
d7707c7
Formatting for deprecated property
javagl Mar 26, 2022
1c1cad4
Replaced single-element allOf with ref
javagl Mar 26, 2022
dd3f436
Cases where replacing allOf with ref changed the structure
javagl Mar 26, 2022
641d3de
Merge remote-tracking branch 'upstream/draft-1.1' into draft-1.1-stru…
javagl Mar 28, 2022
d1d3dbd
Removed obsolete empty property definitions
javagl Mar 28, 2022
4735974
Removed obsolete empty property definitions in extensions
javagl Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 8 additions & 36 deletions extensions/3DTILES_batch_table_hierarchy/schema/3DTILES_batch_table_hierarchy.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,13 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "3DTILES_batch_table_hierarchy.schema.json",
"title": "3DTILES_batch_table_hierarchy extension",
"type": "object",
"$ref": "rootProperty.schema.json",
"description": "3D Tiles extension for representing metadata hierarchies.",
"allOf": [
{
"$ref": "rootProperty.schema.json"
}
],
"properties": {
"classes": {
"type": "array",
"items": {
"type": "object",
"allOf": [
{
"$ref": "rootProperty.schema.json"
}
],
"$ref": "rootProperty.schema.json",
"properties": {
"name": {
"type": "string"
Expand All @@ -32,9 +22,7 @@
"additionalProperties": {
"$ref": "#/definitions/property"
}
},
"extensions": {},
"extras": {}
}
},
"required": [
"name",
Expand All @@ -55,18 +43,11 @@
},
"parentIds": {
"$ref": "#/definitions/integerProperty"
},
"extensions": {},
"extras": {}
}
},
"definitions": {
"binaryBodyReference": {
"type": "object",
"allOf": [
{
"$ref": "rootProperty.schema.json"
}
],
"$ref": "rootProperty.schema.json",
"properties": {
"byteOffset": {
"type": "integer",
Expand Down Expand Up @@ -121,9 +102,7 @@
"type": "string"
}
]
},
"extensions": {},
"extras": {}
}
},
"required": [
"byteOffset",
Expand All @@ -149,12 +128,7 @@
}
},
"integerBinaryBodyReference": {
"type": "object",
"allOf": [
{
"$ref": "rootProperty.schema.json"
}
],
"$ref": "rootProperty.schema.json",
"properties": {
"byteOffset": {
"type": "integer",
Expand All @@ -175,9 +149,7 @@
"type": "string"
}
]
},
"extensions": {},
"extras": {}
}
},
"required": [
"byteOffset"
Expand Down
11 changes: 2 additions & 9 deletions ...s/3DTILES_bounding_volume_S2/schema/boundingVolume.3DTILES_bounding_volume_S2.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "boundingVolume.3DTILES_bounding_volume_S2.schema.json",
"title": "3DTILES_bounding_volume_S2 extension",
"type": "object",
"description": "3D Tiles extension for S2 bounding volumes.",
"allOf": [
{
"$ref": "rootProperty.schema.json"
}
],
"$ref": "rootProperty.schema.json",
"properties": {
"token": {
"type": "string",
Expand All @@ -21,9 +16,7 @@
"maximumHeight": {
"type": "number",
"description": "The maximum height of the tile, specified in meters above (or below) the WGS84 ellipsoid."
},
"extensions": {},
"extras": {}
}
},
"required": [
"token",
Expand Down
11 changes: 2 additions & 9 deletions extensions/3DTILES_content_gltf/schema/tileset.3DTILES_content_gltf.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "tileset.3DTILES_content_gltf.schema.json",
"title": "3DTILES_content_gltf extension",
"type": "object",
"$ref": "rootProperty.schema.json",
"description": "3D Tiles extension that allows a tileset to use glTF models directly as tile content.",
"allOf": [
{
"$ref": "rootProperty.schema.json"
}
],
"properties": {
"extensionsUsed": {
"type": "array",
Expand All @@ -25,8 +20,6 @@
"type": "string"
},
"minItems": 1
},
"extensions": {},
"extras": {}
}
}
}
11 changes: 2 additions & 9 deletions ...LES_draco_point_compression/schema/3DTILES_draco_point_compression.batchTable.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "3DTILES_draco_point_compression.batchTable.schema.json",
"title": "3DTILES_draco_point_compression Batch Table extension",
"type": "object",
"$ref": "rootProperty.schema.json",
"description": "Specifies the compressed Batch Table properties.",
"allOf": [
{
"$ref": "rootProperty.schema.json"
}
],
"properties": {
"properties": {
"type": "object",
Expand All @@ -18,9 +13,7 @@
"type": "integer",
"minimum": 0
}
},
"extensions": {},
"extras": {}
}
},
"required": [
"properties"
Expand Down
11 changes: 2 additions & 9 deletions ...S_draco_point_compression/schema/3DTILES_draco_point_compression.featureTable.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "3DTILES_draco_point_compression.featureTable.schema.json",
"title": "3DTILES_draco_point_compression Feature Table extension",
"type": "object",
"$ref": "rootProperty.schema.json",
"description": "Specifies the compressed Feature Table properties and the location of the compressed data in the Feature Table binary.",
"allOf": [
{
"$ref": "rootProperty.schema.json"
}
],
"properties": {
"properties": {
"type": "object",
Expand All @@ -28,9 +23,7 @@
"type": "integer",
"description": "The length, in bytes, of the compressed data.",
"minimum": 0
},
"extensions": {},
"extras": {}
}
},
"required": [
"properties",
Expand Down
11 changes: 2 additions & 9 deletions extensions/3DTILES_implicit_tiling/schema/subtree/availability.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "availability.schema.json",
"title": "Availability",
"type": "object",
"$ref": "subtreeProperty.schema.json",
"description": "An object describing the availability of a set of elements.",
"allOf": [
{
"$ref": "subtreeProperty.schema.json"
}
],
"properties": {
"bitstream": {
"description": "Index of a buffer view that indicates whether each element is available. The bitstream conforms to the boolean array encoding described in the [3D Metadata specification](../../specification/Metadata). If an element is available, its bit is 1, and if it is unavailable, its bit is 0.",
Expand Down Expand Up @@ -37,9 +32,7 @@
"type": "integer"
}
]
},
"extensions": {},
"extras": {}
}
},
"oneOf": [
{
Expand Down
11 changes: 2 additions & 9 deletions extensions/3DTILES_implicit_tiling/schema/subtree/buffer.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "buffer.schema.json",
"title": "Buffer",
"type": "object",
"$ref": "subtreeProperty.schema.json",
"description": "A buffer is a binary blob. It is either the binary chunk of the subtree file, or an external buffer referenced by a URI.",
"allOf": [
{
"$ref": "subtreeProperty.schema.json"
}
],
"properties": {
"uri": {
"type": "string",
Expand All @@ -24,9 +19,7 @@
"type": "string",
"minLength": 1,
"description": "The name of the buffer."
},
"extensions": {},
"extras": {}
}
},
"required": [
"byteLength"
Expand Down
11 changes: 2 additions & 9 deletions extensions/3DTILES_implicit_tiling/schema/subtree/bufferView.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "bufferView.schema.json",
"title": "Buffer View",
"type": "object",
"$ref": "subtreeProperty.schema.json",
"description": "A contiguous subset of a buffer",
"allOf": [
{
"$ref": "subtreeProperty.schema.json"
}
],
"properties": {
"buffer": {
"type": "integer",
Expand All @@ -29,9 +24,7 @@
"type": "string",
"minLength": 1,
"description": "The name of the `bufferView`."
},
"extensions": {},
"extras": {}
}
},
"required": [
"buffer",
Expand Down
1 change: 0 additions & 1 deletion extensions/3DTILES_implicit_tiling/schema/subtree/extension.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"title": "Extension",
"type": "object",
"description": "Dictionary object with extension-specific objects.",
"properties": {},
"additionalProperties": {
"type": "object"
}
Expand Down
35 changes: 6 additions & 29 deletions extensions/3DTILES_implicit_tiling/schema/subtree/propertyTable.property.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "propertyTable.property.schema.json",
"title": "Property Table Property",
"type": "object",
"$ref": "subtreeProperty.schema.json",
"description": "An array of binary property values.",
"allOf": [
{
"$ref": "subtreeProperty.schema.json"
}
],
"properties": {
"values": {
"type": "integer",
Expand Down Expand Up @@ -68,39 +63,21 @@
]
},
"offset": {
"allOf": [
{
"$ref": "definitions.schema.json#/definitions/numericValue"
}
],
"$ref": "definitions.schema.json#/definitions/numericValue",
"description": "An offset to apply to property values. Only applicable when the component type is `FLOAT32` or `FLOAT64`, or when the property is `normalized`. Overrides the class property's `offset` if both are defined."
},
"scale": {
"allOf": [
{
"$ref": "definitions.schema.json#/definitions/numericValue"
}
],
"$ref": "definitions.schema.json#/definitions/numericValue",
"description": "A scale to apply to property values. Only applicable when the component type is `FLOAT32` or `FLOAT64`, or when the property is `normalized`. Overrides the class property's `scale` if both are defined."
},
"max": {
"allOf": [
{
"$ref": "definitions.schema.json#/definitions/numericValue"
}
],
"$ref": "definitions.schema.json#/definitions/numericValue",
"description": "Maximum value present in the property values. Only applicable to `SCALAR`, `VECN`, and `MATN` types. This is the maximum of all property values, after the transforms based on the `normalized`, `offset`, and `scale` properties have been applied."
},
"min": {
"allOf": [
{
"$ref": "definitions.schema.json#/definitions/numericValue"
}
],
"$ref": "definitions.schema.json#/definitions/numericValue",
"description": "Minimum value present in the property values. Only applicable to `SCALAR`, `VECN`, and `MATN` types. This is the minimum of all property values, after the transforms based on the `normalized`, `offset`, and `scale` properties have been applied."
},
"extensions": {},
"extras": {}
}
},
"required": [
"values"
Expand Down
11 changes: 2 additions & 9 deletions extensions/3DTILES_implicit_tiling/schema/subtree/propertyTable.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "propertyTable.schema.json",
"title": "Property Table",
"type": "object",
"$ref": "subtreeProperty.schema.json",
"description": "Properties conforming to a class, organized as property values stored in binary columnar arrays.",
"allOf": [
{
"$ref": "subtreeProperty.schema.json"
}
],
"properties": {
"name": {
"type": "string",
Expand All @@ -31,9 +26,7 @@
"additionalProperties": {
"$ref": "propertyTable.property.schema.json"
}
},
"extensions": {},
"extras": {}
}
},
"required": [
"class",
Expand Down
Loading