From 00ef9e0044c4a9ade3d8fc078b6409e74fb710f9 Mon Sep 17 00:00:00 2001 From: speckij Date: Thu, 16 Jan 2025 18:06:57 +0100 Subject: [PATCH 1/2] refactor to json schema 2020-12 --- api/part1/openapi/schemas/common/batch_delete.json | 2 +- api/part1/openapi/schemas/common/batch_response.json | 2 +- api/part1/openapi/schemas/common/commonDefs.json | 4 ++-- api/part1/openapi/schemas/common/links.json | 2 +- api/part1/openapi/schemas/common/uris.json | 4 ++-- api/part1/openapi/schemas/geojson/deployedSystem.json | 2 +- api/part1/openapi/schemas/geojson/deployedSystemArray.json | 2 +- .../openapi/schemas/geojson/deployedSystemCollection.json | 2 +- api/part1/openapi/schemas/geojson/deployment.json | 2 +- api/part1/openapi/schemas/geojson/deploymentArray.json | 2 +- api/part1/openapi/schemas/geojson/deploymentCollection.json | 2 +- api/part1/openapi/schemas/geojson/feature.json | 2 +- api/part1/openapi/schemas/geojson/procedure.json | 2 +- api/part1/openapi/schemas/geojson/procedureArray.json | 2 +- api/part1/openapi/schemas/geojson/procedureCollection.json | 2 +- api/part1/openapi/schemas/geojson/samplingFeature.json | 2 +- api/part1/openapi/schemas/geojson/samplingFeatureArray.json | 2 +- .../openapi/schemas/geojson/samplingFeatureCollection.json | 2 +- api/part1/openapi/schemas/geojson/system.json | 2 +- api/part1/openapi/schemas/geojson/systemArray.json | 2 +- api/part1/openapi/schemas/geojson/systemCollection.json | 2 +- api/part1/openapi/schemas/sensorml/deployedSystem.json | 2 +- api/part1/openapi/schemas/sensorml/deployedSystemArray.json | 2 +- .../openapi/schemas/sensorml/deployedSystemCollection.json | 2 +- api/part1/openapi/schemas/sensorml/deployment.json | 2 +- api/part1/openapi/schemas/sensorml/deploymentArray.json | 2 +- .../openapi/schemas/sensorml/deploymentCollection.json | 2 +- api/part1/openapi/schemas/sensorml/procedure.json | 2 +- api/part1/openapi/schemas/sensorml/procedureArray.json | 2 +- api/part1/openapi/schemas/sensorml/procedureCollection.json | 2 +- api/part1/openapi/schemas/sensorml/property.json | 2 +- api/part1/openapi/schemas/sensorml/propertyArray.json | 2 +- api/part1/openapi/schemas/sensorml/propertyCollection.json | 2 +- api/part1/openapi/schemas/sensorml/sensormlDefs.json | 4 ++-- api/part1/openapi/schemas/sensorml/system.json | 2 +- api/part1/openapi/schemas/sensorml/systemArray.json | 2 +- api/part1/openapi/schemas/sensorml/systemCollection.json | 2 +- .../schemas/commandSchema-ptz-jsonschema-byref.json | 2 +- .../observationSchema-scalar-json-jsonschema-byref.json | 2 +- .../schemas/observationSchema-scalar-json-jsonschema.json | 2 +- api/part2/openapi/schemas/common/commonDefs.json | 4 ++-- api/part2/openapi/schemas/common/sensormlDefs.json | 4 ++-- api/part2/openapi/schemas/common/sweCommonDefs.json | 4 ++-- api/part2/openapi/schemas/json/baseStream.json | 2 +- api/part2/openapi/schemas/json/command.json | 2 +- api/part2/openapi/schemas/json/commandCollection.json | 2 +- api/part2/openapi/schemas/json/commandResult.json | 2 +- api/part2/openapi/schemas/json/commandResultCollection.json | 2 +- api/part2/openapi/schemas/json/commandSchema.json | 2 +- api/part2/openapi/schemas/json/commandSchemaAnyOther.json | 2 +- api/part2/openapi/schemas/json/commandSchemaJson.json | 2 +- api/part2/openapi/schemas/json/commandSchemaProtobuf.json | 2 +- api/part2/openapi/schemas/json/commandSchemaSwe.json | 2 +- api/part2/openapi/schemas/json/commandStatus.json | 2 +- api/part2/openapi/schemas/json/commandStatusCode.json | 2 +- api/part2/openapi/schemas/json/commandStatusCollection.json | 2 +- api/part2/openapi/schemas/json/controlStream.json | 2 +- api/part2/openapi/schemas/json/controlStreamCollection.json | 2 +- api/part2/openapi/schemas/json/controlStream_create.json | 2 +- api/part2/openapi/schemas/json/dataStreamCollection.json | 2 +- api/part2/openapi/schemas/json/dataStreamSchemaDef.json | 2 +- api/part2/openapi/schemas/json/dataStream_create.json | 2 +- api/part2/openapi/schemas/json/observation.json | 2 +- api/part2/openapi/schemas/json/observationCollection.json | 2 +- api/part2/openapi/schemas/json/observationSchema.json | 2 +- .../openapi/schemas/json/observationSchemaAnyOther.json | 2 +- api/part2/openapi/schemas/json/observationSchemaJson.json | 2 +- .../openapi/schemas/json/observationSchemaProtobuf.json | 2 +- api/part2/openapi/schemas/json/observationSchemaSwe.json | 2 +- api/part2/openapi/schemas/json/systemEvent.json | 2 +- api/part2/openapi/schemas/json/systemEventCollection.json | 2 +- api/part4/openapi/schemas/anySamplingFeature.json | 2 +- api/part4/openapi/schemas/samplingCurve.json | 2 +- api/part4/openapi/schemas/samplingPart.json | 2 +- api/part4/openapi/schemas/samplingPoint.json | 2 +- api/part4/openapi/schemas/samplingPointXYZ.json | 2 +- api/part4/openapi/schemas/samplingProfile.json | 2 +- api/part4/openapi/schemas/samplingProxy.json | 2 +- api/part4/openapi/schemas/samplingSolid.json | 2 +- api/part4/openapi/schemas/samplingSpatial.json | 2 +- api/part4/openapi/schemas/samplingSpatialParametric.json | 2 +- api/part4/openapi/schemas/samplingSpecimen.json | 2 +- api/part4/openapi/schemas/samplingSphere.json | 2 +- api/part4/openapi/schemas/samplingSurface.json | 2 +- api/part4/openapi/schemas/sphericalSector.json | 2 +- api/part4/openapi/schemas/viewingFrustum.json | 2 +- api/profiles/sat-tasking/openapi/schemas/controlStream.yaml | 2 +- .../sat-tasking/openapi/schemas/coverageTaskingParams.yaml | 2 +- .../openapi/schemas/sat-coverage-tasking-jsonschema.json | 2 +- common/link.json | 2 +- common/timeInstant.json | 2 +- common/timeInstantOrNow.json | 2 +- common/timePeriod.json | 2 +- common/xlink.json | 2 +- sensorml/schemas/json/AbstractFeature.json | 2 +- sensorml/schemas/json/AbstractPhysicalProcess.json | 4 ++-- sensorml/schemas/json/AbstractProcess.json | 4 ++-- sensorml/schemas/json/AggregateProcess.json | 4 ++-- sensorml/schemas/json/ContactLink.json | 2 +- sensorml/schemas/json/DeployedSystem.json | 2 +- sensorml/schemas/json/Deployment.json | 2 +- sensorml/schemas/json/DerivedProperty.json | 2 +- sensorml/schemas/json/DescribedObject.json | 4 ++-- sensorml/schemas/json/Document.json | 2 +- sensorml/schemas/json/Event.json | 2 +- sensorml/schemas/json/LegalConstraint.json | 4 ++-- sensorml/schemas/json/Mode.json | 2 +- sensorml/schemas/json/PhysicalComponent.json | 2 +- sensorml/schemas/json/PhysicalSystem.json | 2 +- sensorml/schemas/json/Pose.json | 4 ++-- sensorml/schemas/json/ResponsibleParty.json | 4 ++-- sensorml/schemas/json/Settings.json | 2 +- sensorml/schemas/json/SimpleProcess.json | 4 ++-- sensorml/schemas/json/commonDefs.json | 4 ++-- sensorml/schemas/json/sweCommonDefs.json | 4 ++-- swecommon/experiments/jsonschema/BasicYPR_Schema.json | 2 +- swecommon/schemas/json/AbstractDataComponent.json | 2 +- swecommon/schemas/json/AbstractSimpleComponent.json | 2 +- swecommon/schemas/json/AbstractSweIdentifiable.json | 2 +- swecommon/schemas/json/Boolean.json | 2 +- swecommon/schemas/json/Category.json | 2 +- swecommon/schemas/json/CategoryRange.json | 2 +- swecommon/schemas/json/Count.json | 2 +- swecommon/schemas/json/CountRange.json | 2 +- swecommon/schemas/json/DataArray.json | 4 ++-- swecommon/schemas/json/DataChoice.json | 2 +- swecommon/schemas/json/DataRecord.json | 2 +- swecommon/schemas/json/DataStream.json | 2 +- swecommon/schemas/json/Geometry.json | 2 +- swecommon/schemas/json/Matrix.json | 2 +- swecommon/schemas/json/Quantity.json | 2 +- swecommon/schemas/json/QuantityRange.json | 2 +- swecommon/schemas/json/Text.json | 2 +- swecommon/schemas/json/Time.json | 2 +- swecommon/schemas/json/TimeRange.json | 2 +- swecommon/schemas/json/Vector.json | 2 +- swecommon/schemas/json/basicTypes.json | 6 +++--- swecommon/schemas/json/encodings.json | 4 ++-- swecommon/schemas/json/sweCommon.json | 4 ++-- 139 files changed, 160 insertions(+), 160 deletions(-) diff --git a/api/part1/openapi/schemas/common/batch_delete.json b/api/part1/openapi/schemas/common/batch_delete.json index 5846ae71..2f1a5d15 100644 --- a/api/part1/openapi/schemas/common/batch_delete.json +++ b/api/part1/openapi/schemas/common/batch_delete.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Batch Delete Request", "description": "List of resource URIs, local IDs or UIDs", "type": "array", diff --git a/api/part1/openapi/schemas/common/batch_response.json b/api/part1/openapi/schemas/common/batch_response.json index 2b67146d..76993d2c 100644 --- a/api/part1/openapi/schemas/common/batch_response.json +++ b/api/part1/openapi/schemas/common/batch_response.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Batch Operation Response", "type": "array", "minItems": 1, diff --git a/api/part1/openapi/schemas/common/commonDefs.json b/api/part1/openapi/schemas/common/commonDefs.json index 22168a8d..420cdaaf 100644 --- a/api/part1/openapi/schemas/common/commonDefs.json +++ b/api/part1/openapi/schemas/common/commonDefs.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "TimeInstant": { "$ref": "../../../../../common/timeInstant.json" }, diff --git a/api/part1/openapi/schemas/common/links.json b/api/part1/openapi/schemas/common/links.json index 7fc74487..3068e3f7 100644 --- a/api/part1/openapi/schemas/common/links.json +++ b/api/part1/openapi/schemas/common/links.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Link Collection", "type": "array", "minItems": 1, diff --git a/api/part1/openapi/schemas/common/uris.json b/api/part1/openapi/schemas/common/uris.json index aadf1a42..6b200df2 100644 --- a/api/part1/openapi/schemas/common/uris.json +++ b/api/part1/openapi/schemas/common/uris.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "SystemTypeUris": { "type": "string", "enum": [ diff --git a/api/part1/openapi/schemas/geojson/deployedSystem.json b/api/part1/openapi/schemas/geojson/deployedSystem.json index 92bcc330..58a926c8 100644 --- a/api/part1/openapi/schemas/geojson/deployedSystem.json +++ b/api/part1/openapi/schemas/geojson/deployedSystem.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "https://geojson.org/schema/Feature.json" }, { diff --git a/api/part1/openapi/schemas/geojson/deployedSystemArray.json b/api/part1/openapi/schemas/geojson/deployedSystemArray.json index 194c83d5..87882c55 100644 --- a/api/part1/openapi/schemas/geojson/deployedSystemArray.json +++ b/api/part1/openapi/schemas/geojson/deployedSystemArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "array", "items": { "title": "Deployed System Feature", diff --git a/api/part1/openapi/schemas/geojson/deployedSystemCollection.json b/api/part1/openapi/schemas/geojson/deployedSystemCollection.json index e1d48f5a..ee935a89 100644 --- a/api/part1/openapi/schemas/geojson/deployedSystemCollection.json +++ b/api/part1/openapi/schemas/geojson/deployedSystemCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "https://geojson.org/schema/FeatureCollection.json" }, { diff --git a/api/part1/openapi/schemas/geojson/deployment.json b/api/part1/openapi/schemas/geojson/deployment.json index 5e10c45f..794f2789 100644 --- a/api/part1/openapi/schemas/geojson/deployment.json +++ b/api/part1/openapi/schemas/geojson/deployment.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "feature.json" }, { diff --git a/api/part1/openapi/schemas/geojson/deploymentArray.json b/api/part1/openapi/schemas/geojson/deploymentArray.json index e63ef58f..f8d5c0f3 100644 --- a/api/part1/openapi/schemas/geojson/deploymentArray.json +++ b/api/part1/openapi/schemas/geojson/deploymentArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "array", "items": { "title": "Deployment Feature", diff --git a/api/part1/openapi/schemas/geojson/deploymentCollection.json b/api/part1/openapi/schemas/geojson/deploymentCollection.json index 92148714..9df6bf0d 100644 --- a/api/part1/openapi/schemas/geojson/deploymentCollection.json +++ b/api/part1/openapi/schemas/geojson/deploymentCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "https://geojson.org/schema/FeatureCollection.json" }, { diff --git a/api/part1/openapi/schemas/geojson/feature.json b/api/part1/openapi/schemas/geojson/feature.json index 9d6049da..dba7c00c 100644 --- a/api/part1/openapi/schemas/geojson/feature.json +++ b/api/part1/openapi/schemas/geojson/feature.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "https://geojson.org/schema/Feature.json" }, { diff --git a/api/part1/openapi/schemas/geojson/procedure.json b/api/part1/openapi/schemas/geojson/procedure.json index 0e6d401d..a771c8be 100644 --- a/api/part1/openapi/schemas/geojson/procedure.json +++ b/api/part1/openapi/schemas/geojson/procedure.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "feature.json" }, { diff --git a/api/part1/openapi/schemas/geojson/procedureArray.json b/api/part1/openapi/schemas/geojson/procedureArray.json index 08cc0e1e..f77626e0 100644 --- a/api/part1/openapi/schemas/geojson/procedureArray.json +++ b/api/part1/openapi/schemas/geojson/procedureArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "array", "items": { "title": "Procedure Feature", diff --git a/api/part1/openapi/schemas/geojson/procedureCollection.json b/api/part1/openapi/schemas/geojson/procedureCollection.json index 0203aa48..bad30058 100644 --- a/api/part1/openapi/schemas/geojson/procedureCollection.json +++ b/api/part1/openapi/schemas/geojson/procedureCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "https://geojson.org/schema/FeatureCollection.json" }, { diff --git a/api/part1/openapi/schemas/geojson/samplingFeature.json b/api/part1/openapi/schemas/geojson/samplingFeature.json index d5a156fa..7e817a6e 100644 --- a/api/part1/openapi/schemas/geojson/samplingFeature.json +++ b/api/part1/openapi/schemas/geojson/samplingFeature.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "SamplingFeature", "allOf": [ { "$ref": "feature.json" }, diff --git a/api/part1/openapi/schemas/geojson/samplingFeatureArray.json b/api/part1/openapi/schemas/geojson/samplingFeatureArray.json index f16a0458..bd58f718 100644 --- a/api/part1/openapi/schemas/geojson/samplingFeatureArray.json +++ b/api/part1/openapi/schemas/geojson/samplingFeatureArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "array", "items": { "title": "Sampling Feature", diff --git a/api/part1/openapi/schemas/geojson/samplingFeatureCollection.json b/api/part1/openapi/schemas/geojson/samplingFeatureCollection.json index 2a97627a..1cb301c3 100644 --- a/api/part1/openapi/schemas/geojson/samplingFeatureCollection.json +++ b/api/part1/openapi/schemas/geojson/samplingFeatureCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "https://geojson.org/schema/FeatureCollection.json" }, { diff --git a/api/part1/openapi/schemas/geojson/system.json b/api/part1/openapi/schemas/geojson/system.json index 2b463655..b7351176 100644 --- a/api/part1/openapi/schemas/geojson/system.json +++ b/api/part1/openapi/schemas/geojson/system.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "feature.json" }, { diff --git a/api/part1/openapi/schemas/geojson/systemArray.json b/api/part1/openapi/schemas/geojson/systemArray.json index 810deeae..40d0c6cd 100644 --- a/api/part1/openapi/schemas/geojson/systemArray.json +++ b/api/part1/openapi/schemas/geojson/systemArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "array", "items": { "title": "System Feature", diff --git a/api/part1/openapi/schemas/geojson/systemCollection.json b/api/part1/openapi/schemas/geojson/systemCollection.json index ad8a6aff..cb5b49b1 100644 --- a/api/part1/openapi/schemas/geojson/systemCollection.json +++ b/api/part1/openapi/schemas/geojson/systemCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "https://geojson.org/schema/FeatureCollection.json" }, { diff --git a/api/part1/openapi/schemas/sensorml/deployedSystem.json b/api/part1/openapi/schemas/sensorml/deployedSystem.json index d3c0e193..03c95793 100644 --- a/api/part1/openapi/schemas/sensorml/deployedSystem.json +++ b/api/part1/openapi/schemas/sensorml/deployedSystem.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "sensormlDefs.json#/definitions/DeployedSystem" }, { diff --git a/api/part1/openapi/schemas/sensorml/deployedSystemArray.json b/api/part1/openapi/schemas/sensorml/deployedSystemArray.json index 194c83d5..87882c55 100644 --- a/api/part1/openapi/schemas/sensorml/deployedSystemArray.json +++ b/api/part1/openapi/schemas/sensorml/deployedSystemArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "array", "items": { "title": "Deployed System Feature", diff --git a/api/part1/openapi/schemas/sensorml/deployedSystemCollection.json b/api/part1/openapi/schemas/sensorml/deployedSystemCollection.json index 270c8ada..214ccd3e 100644 --- a/api/part1/openapi/schemas/sensorml/deployedSystemCollection.json +++ b/api/part1/openapi/schemas/sensorml/deployedSystemCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part1/openapi/schemas/sensorml/deployment.json b/api/part1/openapi/schemas/sensorml/deployment.json index d9b717ac..0bb92eee 100644 --- a/api/part1/openapi/schemas/sensorml/deployment.json +++ b/api/part1/openapi/schemas/sensorml/deployment.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "sensormlDefs.json#/definitions/Deployment" }, { diff --git a/api/part1/openapi/schemas/sensorml/deploymentArray.json b/api/part1/openapi/schemas/sensorml/deploymentArray.json index e63ef58f..f8d5c0f3 100644 --- a/api/part1/openapi/schemas/sensorml/deploymentArray.json +++ b/api/part1/openapi/schemas/sensorml/deploymentArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "array", "items": { "title": "Deployment Feature", diff --git a/api/part1/openapi/schemas/sensorml/deploymentCollection.json b/api/part1/openapi/schemas/sensorml/deploymentCollection.json index 66d4b07d..68aced78 100644 --- a/api/part1/openapi/schemas/sensorml/deploymentCollection.json +++ b/api/part1/openapi/schemas/sensorml/deploymentCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part1/openapi/schemas/sensorml/procedure.json b/api/part1/openapi/schemas/sensorml/procedure.json index 75ebefac..33a9e15e 100644 --- a/api/part1/openapi/schemas/sensorml/procedure.json +++ b/api/part1/openapi/schemas/sensorml/procedure.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "oneOf": [ diff --git a/api/part1/openapi/schemas/sensorml/procedureArray.json b/api/part1/openapi/schemas/sensorml/procedureArray.json index 08cc0e1e..f77626e0 100644 --- a/api/part1/openapi/schemas/sensorml/procedureArray.json +++ b/api/part1/openapi/schemas/sensorml/procedureArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "array", "items": { "title": "Procedure Feature", diff --git a/api/part1/openapi/schemas/sensorml/procedureCollection.json b/api/part1/openapi/schemas/sensorml/procedureCollection.json index 257ffb28..76dfcd8c 100644 --- a/api/part1/openapi/schemas/sensorml/procedureCollection.json +++ b/api/part1/openapi/schemas/sensorml/procedureCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part1/openapi/schemas/sensorml/property.json b/api/part1/openapi/schemas/sensorml/property.json index 219c13bb..dd122428 100644 --- a/api/part1/openapi/schemas/sensorml/property.json +++ b/api/part1/openapi/schemas/sensorml/property.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "sensormlDefs.json#/definitions/DerivedProperty" diff --git a/api/part1/openapi/schemas/sensorml/propertyArray.json b/api/part1/openapi/schemas/sensorml/propertyArray.json index e61ed814..09eeb05c 100644 --- a/api/part1/openapi/schemas/sensorml/propertyArray.json +++ b/api/part1/openapi/schemas/sensorml/propertyArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "array", "items": { "title": "Property Resource", diff --git a/api/part1/openapi/schemas/sensorml/propertyCollection.json b/api/part1/openapi/schemas/sensorml/propertyCollection.json index 3f5566d2..b26ff2da 100644 --- a/api/part1/openapi/schemas/sensorml/propertyCollection.json +++ b/api/part1/openapi/schemas/sensorml/propertyCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part1/openapi/schemas/sensorml/sensormlDefs.json b/api/part1/openapi/schemas/sensorml/sensormlDefs.json index f64a9cdc..eb306631 100644 --- a/api/part1/openapi/schemas/sensorml/sensormlDefs.json +++ b/api/part1/openapi/schemas/sensorml/sensormlDefs.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "DescribedObject": { "$ref": "../../../../../sensorml/schemas/json/DescribedObject.json" }, diff --git a/api/part1/openapi/schemas/sensorml/system.json b/api/part1/openapi/schemas/sensorml/system.json index ead7d4eb..c58a14b2 100644 --- a/api/part1/openapi/schemas/sensorml/system.json +++ b/api/part1/openapi/schemas/sensorml/system.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "oneOf": [ diff --git a/api/part1/openapi/schemas/sensorml/systemArray.json b/api/part1/openapi/schemas/sensorml/systemArray.json index 810deeae..40d0c6cd 100644 --- a/api/part1/openapi/schemas/sensorml/systemArray.json +++ b/api/part1/openapi/schemas/sensorml/systemArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "array", "items": { "title": "System Feature", diff --git a/api/part1/openapi/schemas/sensorml/systemCollection.json b/api/part1/openapi/schemas/sensorml/systemCollection.json index 6db21dcf..9cbafb19 100644 --- a/api/part1/openapi/schemas/sensorml/systemCollection.json +++ b/api/part1/openapi/schemas/sensorml/systemCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part2/openapi/examples/schemas/commandSchema-ptz-jsonschema-byref.json b/api/part2/openapi/examples/schemas/commandSchema-ptz-jsonschema-byref.json index fcdc8863..35a2c36d 100644 --- a/api/part2/openapi/examples/schemas/commandSchema-ptz-jsonschema-byref.json +++ b/api/part2/openapi/examples/schemas/commandSchema-ptz-jsonschema-byref.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "https://raw.githubusercontent.com/opengeospatial/ogcapi-connected-systems/master/api/part2/openapi/schemas/json/command_view.json" }, { diff --git a/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema-byref.json b/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema-byref.json index 8c2e9eae..cf5fac0a 100644 --- a/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema-byref.json +++ b/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema-byref.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "https://raw.githubusercontent.com/opengeospatial/ogcapi-connected-systems/master/api/part2/openapi/schemas/json/observation_view.json" }, { diff --git a/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema.json b/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema.json index 578d32ce..e3cdc9a2 100644 --- a/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema.json +++ b/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "id": { diff --git a/api/part2/openapi/schemas/common/commonDefs.json b/api/part2/openapi/schemas/common/commonDefs.json index 8fdb4e9b..1737a2c6 100644 --- a/api/part2/openapi/schemas/common/commonDefs.json +++ b/api/part2/openapi/schemas/common/commonDefs.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "TimeInstant": { "$ref": "../../../../../common/timeInstant.json" }, diff --git a/api/part2/openapi/schemas/common/sensormlDefs.json b/api/part2/openapi/schemas/common/sensormlDefs.json index c8bd1c69..ab2e74e0 100644 --- a/api/part2/openapi/schemas/common/sensormlDefs.json +++ b/api/part2/openapi/schemas/common/sensormlDefs.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "Event": { "$ref": "../../../../../sensorml/schemas/json/Event.json" } diff --git a/api/part2/openapi/schemas/common/sweCommonDefs.json b/api/part2/openapi/schemas/common/sweCommonDefs.json index 14da684d..b8b53700 100644 --- a/api/part2/openapi/schemas/common/sweCommonDefs.json +++ b/api/part2/openapi/schemas/common/sweCommonDefs.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "AnyComponent": { "$ref": "../../../../../swecommon/schemas/json/sweCommon.json#/definitions/AnyComponent" }, diff --git a/api/part2/openapi/schemas/json/baseStream.json b/api/part2/openapi/schemas/json/baseStream.json index 1286323c..d5807c5f 100644 --- a/api/part2/openapi/schemas/json/baseStream.json +++ b/api/part2/openapi/schemas/json/baseStream.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "id": { diff --git a/api/part2/openapi/schemas/json/command.json b/api/part2/openapi/schemas/json/command.json index 14d5ae02..a324e063 100644 --- a/api/part2/openapi/schemas/json/command.json +++ b/api/part2/openapi/schemas/json/command.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "id": { diff --git a/api/part2/openapi/schemas/json/commandCollection.json b/api/part2/openapi/schemas/json/commandCollection.json index bd9fd7c5..ae4ead4d 100644 --- a/api/part2/openapi/schemas/json/commandCollection.json +++ b/api/part2/openapi/schemas/json/commandCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part2/openapi/schemas/json/commandResult.json b/api/part2/openapi/schemas/json/commandResult.json index c8d95472..7624dd6a 100644 --- a/api/part2/openapi/schemas/json/commandResult.json +++ b/api/part2/openapi/schemas/json/commandResult.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "id": { diff --git a/api/part2/openapi/schemas/json/commandResultCollection.json b/api/part2/openapi/schemas/json/commandResultCollection.json index baad7f32..7579d54b 100644 --- a/api/part2/openapi/schemas/json/commandResultCollection.json +++ b/api/part2/openapi/schemas/json/commandResultCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part2/openapi/schemas/json/commandSchema.json b/api/part2/openapi/schemas/json/commandSchema.json index f4c011a7..2de31e00 100644 --- a/api/part2/openapi/schemas/json/commandSchema.json +++ b/api/part2/openapi/schemas/json/commandSchema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "oneOf": [ { "title": "JSON", diff --git a/api/part2/openapi/schemas/json/commandSchemaAnyOther.json b/api/part2/openapi/schemas/json/commandSchemaAnyOther.json index adcc4763..fbbe1211 100644 --- a/api/part2/openapi/schemas/json/commandSchemaAnyOther.json +++ b/api/part2/openapi/schemas/json/commandSchemaAnyOther.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "commandFormat": { diff --git a/api/part2/openapi/schemas/json/commandSchemaJson.json b/api/part2/openapi/schemas/json/commandSchemaJson.json index 037b7740..9b5f3d7d 100644 --- a/api/part2/openapi/schemas/json/commandSchemaJson.json +++ b/api/part2/openapi/schemas/json/commandSchemaJson.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "commandFormat": { diff --git a/api/part2/openapi/schemas/json/commandSchemaProtobuf.json b/api/part2/openapi/schemas/json/commandSchemaProtobuf.json index 7a9d5c35..37c43488 100644 --- a/api/part2/openapi/schemas/json/commandSchemaProtobuf.json +++ b/api/part2/openapi/schemas/json/commandSchemaProtobuf.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "commandFormat": { diff --git a/api/part2/openapi/schemas/json/commandSchemaSwe.json b/api/part2/openapi/schemas/json/commandSchemaSwe.json index aec9e733..44052cef 100644 --- a/api/part2/openapi/schemas/json/commandSchemaSwe.json +++ b/api/part2/openapi/schemas/json/commandSchemaSwe.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "commandFormat": { diff --git a/api/part2/openapi/schemas/json/commandStatus.json b/api/part2/openapi/schemas/json/commandStatus.json index 76b57971..852d735b 100644 --- a/api/part2/openapi/schemas/json/commandStatus.json +++ b/api/part2/openapi/schemas/json/commandStatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "id": { diff --git a/api/part2/openapi/schemas/json/commandStatusCode.json b/api/part2/openapi/schemas/json/commandStatusCode.json index d4013ee6..327d97ff 100644 --- a/api/part2/openapi/schemas/json/commandStatusCode.json +++ b/api/part2/openapi/schemas/json/commandStatusCode.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "string", "oneOf": [ { "const": "PENDING", "description": "The command is pending, meaning it has been received by the system but no decision to accept or reject it has been taken." }, diff --git a/api/part2/openapi/schemas/json/commandStatusCollection.json b/api/part2/openapi/schemas/json/commandStatusCollection.json index c94bc4ee..25001496 100644 --- a/api/part2/openapi/schemas/json/commandStatusCollection.json +++ b/api/part2/openapi/schemas/json/commandStatusCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part2/openapi/schemas/json/controlStream.json b/api/part2/openapi/schemas/json/controlStream.json index d6d1777e..14d4e034 100644 --- a/api/part2/openapi/schemas/json/controlStream.json +++ b/api/part2/openapi/schemas/json/controlStream.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "baseStream.json" }, { diff --git a/api/part2/openapi/schemas/json/controlStreamCollection.json b/api/part2/openapi/schemas/json/controlStreamCollection.json index 063832c9..8e17ea80 100644 --- a/api/part2/openapi/schemas/json/controlStreamCollection.json +++ b/api/part2/openapi/schemas/json/controlStreamCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part2/openapi/schemas/json/controlStream_create.json b/api/part2/openapi/schemas/json/controlStream_create.json index cc30c7ec..1de2e57c 100644 --- a/api/part2/openapi/schemas/json/controlStream_create.json +++ b/api/part2/openapi/schemas/json/controlStream_create.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "controlStream.json" }, { diff --git a/api/part2/openapi/schemas/json/dataStreamCollection.json b/api/part2/openapi/schemas/json/dataStreamCollection.json index e53b60c3..ee87527a 100644 --- a/api/part2/openapi/schemas/json/dataStreamCollection.json +++ b/api/part2/openapi/schemas/json/dataStreamCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part2/openapi/schemas/json/dataStreamSchemaDef.json b/api/part2/openapi/schemas/json/dataStreamSchemaDef.json index 82d58a10..f00ac88a 100644 --- a/api/part2/openapi/schemas/json/dataStreamSchemaDef.json +++ b/api/part2/openapi/schemas/json/dataStreamSchemaDef.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "phenomenonTime": { diff --git a/api/part2/openapi/schemas/json/dataStream_create.json b/api/part2/openapi/schemas/json/dataStream_create.json index 5e48eaad..b0c9fc81 100644 --- a/api/part2/openapi/schemas/json/dataStream_create.json +++ b/api/part2/openapi/schemas/json/dataStream_create.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "dataStream.json" }, { diff --git a/api/part2/openapi/schemas/json/observation.json b/api/part2/openapi/schemas/json/observation.json index 6025082c..59a3d812 100644 --- a/api/part2/openapi/schemas/json/observation.json +++ b/api/part2/openapi/schemas/json/observation.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "id": { diff --git a/api/part2/openapi/schemas/json/observationCollection.json b/api/part2/openapi/schemas/json/observationCollection.json index 2a40d9ea..15ed4367 100644 --- a/api/part2/openapi/schemas/json/observationCollection.json +++ b/api/part2/openapi/schemas/json/observationCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part2/openapi/schemas/json/observationSchema.json b/api/part2/openapi/schemas/json/observationSchema.json index 8e85a410..0e49ad39 100644 --- a/api/part2/openapi/schemas/json/observationSchema.json +++ b/api/part2/openapi/schemas/json/observationSchema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "oneOf": [ { "title": "JSON", diff --git a/api/part2/openapi/schemas/json/observationSchemaAnyOther.json b/api/part2/openapi/schemas/json/observationSchemaAnyOther.json index 83bb3671..a5d24ac6 100644 --- a/api/part2/openapi/schemas/json/observationSchemaAnyOther.json +++ b/api/part2/openapi/schemas/json/observationSchemaAnyOther.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "obsFormat": { diff --git a/api/part2/openapi/schemas/json/observationSchemaJson.json b/api/part2/openapi/schemas/json/observationSchemaJson.json index d59321fa..92d73503 100644 --- a/api/part2/openapi/schemas/json/observationSchemaJson.json +++ b/api/part2/openapi/schemas/json/observationSchemaJson.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "obsFormat": { diff --git a/api/part2/openapi/schemas/json/observationSchemaProtobuf.json b/api/part2/openapi/schemas/json/observationSchemaProtobuf.json index 3067358e..574ad50b 100644 --- a/api/part2/openapi/schemas/json/observationSchemaProtobuf.json +++ b/api/part2/openapi/schemas/json/observationSchemaProtobuf.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "obsFormat": { diff --git a/api/part2/openapi/schemas/json/observationSchemaSwe.json b/api/part2/openapi/schemas/json/observationSchemaSwe.json index 14349da9..22a5bb39 100644 --- a/api/part2/openapi/schemas/json/observationSchemaSwe.json +++ b/api/part2/openapi/schemas/json/observationSchemaSwe.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "obsFormat": { diff --git a/api/part2/openapi/schemas/json/systemEvent.json b/api/part2/openapi/schemas/json/systemEvent.json index d9da9288..b7ddc551 100644 --- a/api/part2/openapi/schemas/json/systemEvent.json +++ b/api/part2/openapi/schemas/json/systemEvent.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "../common/sensormlDefs.json#/definitions/Event" }, { diff --git a/api/part2/openapi/schemas/json/systemEventCollection.json b/api/part2/openapi/schemas/json/systemEventCollection.json index a200e4de..33d7e48c 100644 --- a/api/part2/openapi/schemas/json/systemEventCollection.json +++ b/api/part2/openapi/schemas/json/systemEventCollection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "items": { diff --git a/api/part4/openapi/schemas/anySamplingFeature.json b/api/part4/openapi/schemas/anySamplingFeature.json index f568c4f2..8102563d 100644 --- a/api/part4/openapi/schemas/anySamplingFeature.json +++ b/api/part4/openapi/schemas/anySamplingFeature.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "oneOf": [ { "$ref": "samplingPoint.json" }, { "$ref": "samplingCurve.json" }, diff --git a/api/part4/openapi/schemas/samplingCurve.json b/api/part4/openapi/schemas/samplingCurve.json index 77dee1c8..862c1afa 100644 --- a/api/part4/openapi/schemas/samplingCurve.json +++ b/api/part4/openapi/schemas/samplingCurve.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "SamplingCurve", "allOf": [ { "$ref": "samplingSpatial.json" }, diff --git a/api/part4/openapi/schemas/samplingPart.json b/api/part4/openapi/schemas/samplingPart.json index f9205b93..c6c4b1e8 100644 --- a/api/part4/openapi/schemas/samplingPart.json +++ b/api/part4/openapi/schemas/samplingPart.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "SamplingPart", "allOf": [ { "$ref": "samplingFeature.json" }, diff --git a/api/part4/openapi/schemas/samplingPoint.json b/api/part4/openapi/schemas/samplingPoint.json index 1a02472d..1e8e9bbd 100644 --- a/api/part4/openapi/schemas/samplingPoint.json +++ b/api/part4/openapi/schemas/samplingPoint.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "SamplingPoint", "allOf": [ { "$ref": "samplingSpatial.json" }, diff --git a/api/part4/openapi/schemas/samplingPointXYZ.json b/api/part4/openapi/schemas/samplingPointXYZ.json index e5bfae20..7a385948 100644 --- a/api/part4/openapi/schemas/samplingPointXYZ.json +++ b/api/part4/openapi/schemas/samplingPointXYZ.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "SamplingPoint XYZ", "allOf": [ { "$ref": "samplingSpatialParametric.json" }, diff --git a/api/part4/openapi/schemas/samplingProfile.json b/api/part4/openapi/schemas/samplingProfile.json index e326f8dc..00cec2d4 100644 --- a/api/part4/openapi/schemas/samplingProfile.json +++ b/api/part4/openapi/schemas/samplingProfile.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "SamplingProfile", "allOf": [ { "$ref": "samplingSpatialParametric.json" }, diff --git a/api/part4/openapi/schemas/samplingProxy.json b/api/part4/openapi/schemas/samplingProxy.json index f02acbb4..6161f6d2 100644 --- a/api/part4/openapi/schemas/samplingProxy.json +++ b/api/part4/openapi/schemas/samplingProxy.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "FeatureProxy", "allOf": [ { "$ref": "samplingFeature.json" }, diff --git a/api/part4/openapi/schemas/samplingSolid.json b/api/part4/openapi/schemas/samplingSolid.json index 6c1971b7..b6b0cf3a 100644 --- a/api/part4/openapi/schemas/samplingSolid.json +++ b/api/part4/openapi/schemas/samplingSolid.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "SamplingSolid", "allOf": [ { "$ref": "samplingSpatial.json" }, diff --git a/api/part4/openapi/schemas/samplingSpatial.json b/api/part4/openapi/schemas/samplingSpatial.json index 836f73be..3424301c 100644 --- a/api/part4/openapi/schemas/samplingSpatial.json +++ b/api/part4/openapi/schemas/samplingSpatial.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "samplingFeature.json" }, { diff --git a/api/part4/openapi/schemas/samplingSpatialParametric.json b/api/part4/openapi/schemas/samplingSpatialParametric.json index dae3b911..0f8f86e7 100644 --- a/api/part4/openapi/schemas/samplingSpatialParametric.json +++ b/api/part4/openapi/schemas/samplingSpatialParametric.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "samplingSpatial.json" }, { diff --git a/api/part4/openapi/schemas/samplingSpecimen.json b/api/part4/openapi/schemas/samplingSpecimen.json index 111d6bbf..493f2ae0 100644 --- a/api/part4/openapi/schemas/samplingSpecimen.json +++ b/api/part4/openapi/schemas/samplingSpecimen.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Specimen", "allOf": [ { "$ref": "samplingFeature.json" }, diff --git a/api/part4/openapi/schemas/samplingSphere.json b/api/part4/openapi/schemas/samplingSphere.json index 87a9c229..c0e6d346 100644 --- a/api/part4/openapi/schemas/samplingSphere.json +++ b/api/part4/openapi/schemas/samplingSphere.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Sampling Sphere", "allOf": [ { "$ref": "samplingSpatialParametric.json" }, diff --git a/api/part4/openapi/schemas/samplingSurface.json b/api/part4/openapi/schemas/samplingSurface.json index 30f049c9..8940abf0 100644 --- a/api/part4/openapi/schemas/samplingSurface.json +++ b/api/part4/openapi/schemas/samplingSurface.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "SamplingSurface", "allOf": [ { "$ref": "samplingSpatial.json" }, diff --git a/api/part4/openapi/schemas/sphericalSector.json b/api/part4/openapi/schemas/sphericalSector.json index 10c871e0..9f5d683c 100644 --- a/api/part4/openapi/schemas/sphericalSector.json +++ b/api/part4/openapi/schemas/sphericalSector.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Spherical Sector", "allOf": [ { "$ref": "samplingSpatialParametric.json" }, diff --git a/api/part4/openapi/schemas/viewingFrustum.json b/api/part4/openapi/schemas/viewingFrustum.json index 40f530f5..c02dc292 100644 --- a/api/part4/openapi/schemas/viewingFrustum.json +++ b/api/part4/openapi/schemas/viewingFrustum.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Viewing Frustum", "allOf": [ { "$ref": "samplingSpatialParametric.json" }, diff --git a/api/profiles/sat-tasking/openapi/schemas/controlStream.yaml b/api/profiles/sat-tasking/openapi/schemas/controlStream.yaml index 66b57e37..7cc39018 100644 --- a/api/profiles/sat-tasking/openapi/schemas/controlStream.yaml +++ b/api/profiles/sat-tasking/openapi/schemas/controlStream.yaml @@ -1,4 +1,4 @@ -$schema: http://json-schema.org/draft-07/schema# +$schema: https://json-schema.org/draft/2020-12/schema type: object properties: id: diff --git a/api/profiles/sat-tasking/openapi/schemas/coverageTaskingParams.yaml b/api/profiles/sat-tasking/openapi/schemas/coverageTaskingParams.yaml index d30c87a7..5cfb1f6a 100644 --- a/api/profiles/sat-tasking/openapi/schemas/coverageTaskingParams.yaml +++ b/api/profiles/sat-tasking/openapi/schemas/coverageTaskingParams.yaml @@ -1,4 +1,4 @@ -$schema: http://json-schema.org/draft-07/schema# +$schema: https://json-schema.org/draft/2020-12/schema description: Profile schema for satellite coverage tasking type: object properties: diff --git a/api/profiles/sat-tasking/openapi/schemas/sat-coverage-tasking-jsonschema.json b/api/profiles/sat-tasking/openapi/schemas/sat-coverage-tasking-jsonschema.json index 32f45958..fbe817a9 100644 --- a/api/profiles/sat-tasking/openapi/schemas/sat-coverage-tasking-jsonschema.json +++ b/api/profiles/sat-tasking/openapi/schemas/sat-coverage-tasking-jsonschema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Profile schema for satellite coverage tasking", "type": "object", "properties": { diff --git a/common/link.json b/common/link.json index e3ab2f4c..526f009c 100644 --- a/common/link.json +++ b/common/link.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Link", "description": "Link object following standard Web Linking conventions (see RFC5988 and RFC6690)", "type": "object", diff --git a/common/timeInstant.json b/common/timeInstant.json index 3ed78ead..9d1bfb0a 100644 --- a/common/timeInstant.json +++ b/common/timeInstant.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Time Instant", "type": "string", "format": "date-time" diff --git a/common/timeInstantOrNow.json b/common/timeInstantOrNow.json index 9db57a5e..d5c22b82 100644 --- a/common/timeInstantOrNow.json +++ b/common/timeInstantOrNow.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Time Instant", "oneOf": [ { "$ref": "timeInstant.json" }, diff --git a/common/timePeriod.json b/common/timePeriod.json index eefac4fa..a8524a33 100644 --- a/common/timePeriod.json +++ b/common/timePeriod.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Time Period", "type": "array", "minItems": 2, diff --git a/common/xlink.json b/common/xlink.json index 9b92801a..ebf7dd8b 100644 --- a/common/xlink.json +++ b/common/xlink.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "href": { diff --git a/sensorml/schemas/json/AbstractFeature.json b/sensorml/schemas/json/AbstractFeature.json index a892abf2..cf876014 100644 --- a/sensorml/schemas/json/AbstractFeature.json +++ b/sensorml/schemas/json/AbstractFeature.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "type": { diff --git a/sensorml/schemas/json/AbstractPhysicalProcess.json b/sensorml/schemas/json/AbstractPhysicalProcess.json index e4555481..52ffd131 100644 --- a/sensorml/schemas/json/AbstractPhysicalProcess.json +++ b/sensorml/schemas/json/AbstractPhysicalProcess.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "allOf": [ { @@ -32,7 +32,7 @@ } } ], - "definitions": { + "$defs": { "SpatialFrame": { "description": "A general spatial Cartesian Reference Frame where the axes and origin will be defined textually relative to a physical component.", "type": "object", diff --git a/sensorml/schemas/json/AbstractProcess.json b/sensorml/schemas/json/AbstractProcess.json index 1169ea0d..4fb128ca 100644 --- a/sensorml/schemas/json/AbstractProcess.json +++ b/sensorml/schemas/json/AbstractProcess.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "allOf": [ { @@ -46,7 +46,7 @@ } } ], - "definitions": { + "$defs": { "FeatureList": { "type": "array", "minItems": 1, diff --git a/sensorml/schemas/json/AggregateProcess.json b/sensorml/schemas/json/AggregateProcess.json index ae2af80c..fa0eeb64 100644 --- a/sensorml/schemas/json/AggregateProcess.json +++ b/sensorml/schemas/json/AggregateProcess.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "allOf": [ { @@ -21,7 +21,7 @@ } } ], - "definitions": { + "$defs": { "ComponentList": { "type": "array", "minItems": 1, diff --git a/sensorml/schemas/json/ContactLink.json b/sensorml/schemas/json/ContactLink.json index 9392d5bd..81a782bc 100644 --- a/sensorml/schemas/json/ContactLink.json +++ b/sensorml/schemas/json/ContactLink.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "role": { diff --git a/sensorml/schemas/json/DeployedSystem.json b/sensorml/schemas/json/DeployedSystem.json index 093853c0..c439254b 100644 --- a/sensorml/schemas/json/DeployedSystem.json +++ b/sensorml/schemas/json/DeployedSystem.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "description": { diff --git a/sensorml/schemas/json/Deployment.json b/sensorml/schemas/json/Deployment.json index 7887d05a..b1dd69d6 100644 --- a/sensorml/schemas/json/Deployment.json +++ b/sensorml/schemas/json/Deployment.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "DescribedObject.json" }, { diff --git a/sensorml/schemas/json/DerivedProperty.json b/sensorml/schemas/json/DerivedProperty.json index e6152de6..fe260452 100644 --- a/sensorml/schemas/json/DerivedProperty.json +++ b/sensorml/schemas/json/DerivedProperty.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "allOf": [ { diff --git a/sensorml/schemas/json/DescribedObject.json b/sensorml/schemas/json/DescribedObject.json index ff942305..ab4ec530 100644 --- a/sensorml/schemas/json/DescribedObject.json +++ b/sensorml/schemas/json/DescribedObject.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "allOf": [ { @@ -99,7 +99,7 @@ } } ], - "definitions": { + "$defs": { "CharacteristicList": { "allOf": [ { diff --git a/sensorml/schemas/json/Document.json b/sensorml/schemas/json/Document.json index 7233ec35..5698c174 100644 --- a/sensorml/schemas/json/Document.json +++ b/sensorml/schemas/json/Document.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "role": { diff --git a/sensorml/schemas/json/Event.json b/sensorml/schemas/json/Event.json index 861c225c..c04abf56 100644 --- a/sensorml/schemas/json/Event.json +++ b/sensorml/schemas/json/Event.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "A time tagged event with description and relevant property values.", "type": "object", "allOf": [ diff --git a/sensorml/schemas/json/LegalConstraint.json b/sensorml/schemas/json/LegalConstraint.json index a3d88244..4a38304c 100644 --- a/sensorml/schemas/json/LegalConstraint.json +++ b/sensorml/schemas/json/LegalConstraint.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "useLimitations": { @@ -27,7 +27,7 @@ } } }, - "definitions": { + "$defs": { "CodeListValue": { "type": "object", "properties": { diff --git a/sensorml/schemas/json/Mode.json b/sensorml/schemas/json/Mode.json index 5f64c018..c6c7a614 100644 --- a/sensorml/schemas/json/Mode.json +++ b/sensorml/schemas/json/Mode.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "allOf": [ { diff --git a/sensorml/schemas/json/PhysicalComponent.json b/sensorml/schemas/json/PhysicalComponent.json index befb5dc6..9b877434 100644 --- a/sensorml/schemas/json/PhysicalComponent.json +++ b/sensorml/schemas/json/PhysicalComponent.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "allOf": [ { diff --git a/sensorml/schemas/json/PhysicalSystem.json b/sensorml/schemas/json/PhysicalSystem.json index f698a585..c1d51b37 100644 --- a/sensorml/schemas/json/PhysicalSystem.json +++ b/sensorml/schemas/json/PhysicalSystem.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "allOf": [ { diff --git a/sensorml/schemas/json/Pose.json b/sensorml/schemas/json/Pose.json index c76b4b68..dfd1f9e5 100644 --- a/sensorml/schemas/json/Pose.json +++ b/sensorml/schemas/json/Pose.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "A Pose object that can be either a GeoPose Basic instance of a relative pose.", "oneOf": [ { @@ -105,7 +105,7 @@ ] } ], - "definitions": { + "$defs": { "PositionGeo": { "description": "Geographic position in EPSG:4979 CRS (WGS84)", "properties": { diff --git a/sensorml/schemas/json/ResponsibleParty.json b/sensorml/schemas/json/ResponsibleParty.json index d571ce1e..0287062c 100644 --- a/sensorml/schemas/json/ResponsibleParty.json +++ b/sensorml/schemas/json/ResponsibleParty.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "individualName": { @@ -33,7 +33,7 @@ "required": ["organisationName"] } ], - "definitions": { + "$defs": { "Contact": { "type": "object", "properties": { diff --git a/sensorml/schemas/json/Settings.json b/sensorml/schemas/json/Settings.json index df220358..53110fa2 100644 --- a/sensorml/schemas/json/Settings.json +++ b/sensorml/schemas/json/Settings.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "setValues": { diff --git a/sensorml/schemas/json/SimpleProcess.json b/sensorml/schemas/json/SimpleProcess.json index c77aef79..c51432fb 100644 --- a/sensorml/schemas/json/SimpleProcess.json +++ b/sensorml/schemas/json/SimpleProcess.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "allOf": [ { @@ -16,7 +16,7 @@ } } ], - "definitions": { + "$defs": { "ProcessMethod": { "type": "object", "properties": { diff --git a/sensorml/schemas/json/commonDefs.json b/sensorml/schemas/json/commonDefs.json index abfdc3b2..94ce43a0 100644 --- a/sensorml/schemas/json/commonDefs.json +++ b/sensorml/schemas/json/commonDefs.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "XLink": { "$ref": "../../../common/link.json" }, diff --git a/sensorml/schemas/json/sweCommonDefs.json b/sensorml/schemas/json/sweCommonDefs.json index 9b420fd3..74b13f03 100644 --- a/sensorml/schemas/json/sweCommonDefs.json +++ b/sensorml/schemas/json/sweCommonDefs.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "AbstractSWE": { "$ref": "../../../swecommon/schemas/json/basicTypes.json#/definitions/AbstractSWE" }, diff --git a/swecommon/experiments/jsonschema/BasicYPR_Schema.json b/swecommon/experiments/jsonschema/BasicYPR_Schema.json index bdc7085f..ce5174de 100644 --- a/swecommon/experiments/jsonschema/BasicYPR_Schema.json +++ b/swecommon/experiments/jsonschema/BasicYPR_Schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "position": { diff --git a/swecommon/schemas/json/AbstractDataComponent.json b/swecommon/schemas/json/AbstractDataComponent.json index 514a6c3b..082cf26b 100644 --- a/swecommon/schemas/json/AbstractDataComponent.json +++ b/swecommon/schemas/json/AbstractDataComponent.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Abstract base class for all data components", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/AbstractSimpleComponent.json b/swecommon/schemas/json/AbstractSimpleComponent.json index 41c6b25f..b0621398 100644 --- a/swecommon/schemas/json/AbstractSimpleComponent.json +++ b/swecommon/schemas/json/AbstractSimpleComponent.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "allOf": [ { diff --git a/swecommon/schemas/json/AbstractSweIdentifiable.json b/swecommon/schemas/json/AbstractSweIdentifiable.json index 3bbc26ab..da409dfd 100644 --- a/swecommon/schemas/json/AbstractSweIdentifiable.json +++ b/swecommon/schemas/json/AbstractSweIdentifiable.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Base substitution groups for all SWE Common objects with identification metadata", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/Boolean.json b/swecommon/schemas/json/Boolean.json index ac373d11..1b2991db 100644 --- a/swecommon/schemas/json/Boolean.json +++ b/swecommon/schemas/json/Boolean.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Scalar component used to express truth: True or False, 0 or 1", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/Category.json b/swecommon/schemas/json/Category.json index 07b3b4c6..a2bfafac 100644 --- a/swecommon/schemas/json/Category.json +++ b/swecommon/schemas/json/Category.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Scalar component used to represent a categorical value as a simple token identifying a term in a code space", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/CategoryRange.json b/swecommon/schemas/json/CategoryRange.json index c2ebcf52..b59daf3a 100644 --- a/swecommon/schemas/json/CategoryRange.json +++ b/swecommon/schemas/json/CategoryRange.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Pair of categorical values used to specify a range in an ordinal reference system (specified by the code space)", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/Count.json b/swecommon/schemas/json/Count.json index e48bd503..4e4c611a 100644 --- a/swecommon/schemas/json/Count.json +++ b/swecommon/schemas/json/Count.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Scalar component with integer representation used for a discrete counting value", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/CountRange.json b/swecommon/schemas/json/CountRange.json index 34bc46dc..ff1e2e43 100644 --- a/swecommon/schemas/json/CountRange.json +++ b/swecommon/schemas/json/CountRange.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Integer pair used for specifying a count range", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/DataArray.json b/swecommon/schemas/json/DataArray.json index 4832e610..8cc8b389 100644 --- a/swecommon/schemas/json/DataArray.json +++ b/swecommon/schemas/json/DataArray.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Implementation of ISO-11404 Array datatype. This defines an array of identical data components with a elementCount. Values are given as a block and can be encoded in different ways", "allOf": [ { @@ -17,7 +17,7 @@ ] } ], - "definitions": { + "$defs": { "AbstractArray": { "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/DataChoice.json b/swecommon/schemas/json/DataChoice.json index 85a39939..b53fd692 100644 --- a/swecommon/schemas/json/DataChoice.json +++ b/swecommon/schemas/json/DataChoice.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Implementation of a choice of two or more Data Components (also called disjoint union)", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/DataRecord.json b/swecommon/schemas/json/DataRecord.json index 85bc8a9b..3532dd79 100644 --- a/swecommon/schemas/json/DataRecord.json +++ b/swecommon/schemas/json/DataRecord.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Implementation of ISO-11404 Record datatype. This allows grouping (sequence) of data components which can themselves be simple types, records, arrays or choices", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/DataStream.json b/swecommon/schemas/json/DataStream.json index bb68eeef..923ccc95 100644 --- a/swecommon/schemas/json/DataStream.json +++ b/swecommon/schemas/json/DataStream.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Defines the structure of the element that will be repeated in the stream", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/Geometry.json b/swecommon/schemas/json/Geometry.json index 40998dd3..90b8bea8 100644 --- a/swecommon/schemas/json/Geometry.json +++ b/swecommon/schemas/json/Geometry.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Geometry", "description": "Implementation of ISO-19107 geometry datatype. This allows embedding a geometry in a larger schema", "type": "object", diff --git a/swecommon/schemas/json/Matrix.json b/swecommon/schemas/json/Matrix.json index 252fc785..e851543e 100644 --- a/swecommon/schemas/json/Matrix.json +++ b/swecommon/schemas/json/Matrix.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Implementation of ISO-11404 Array datatype. This defines an array of identical data components with a elementCount. Values are given as a block and can be encoded in different ways", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/Quantity.json b/swecommon/schemas/json/Quantity.json index 432e2460..491abbe4 100644 --- a/swecommon/schemas/json/Quantity.json +++ b/swecommon/schemas/json/Quantity.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Scalar component with decimal representation and a unit of measure used to store value of a continuous quantity", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/QuantityRange.json b/swecommon/schemas/json/QuantityRange.json index 26b53a44..5c3b32f1 100644 --- a/swecommon/schemas/json/QuantityRange.json +++ b/swecommon/schemas/json/QuantityRange.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Decimal pair for specifying a quantity range with a unit of measure", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/Text.json b/swecommon/schemas/json/Text.json index c706849e..c8f8de55 100644 --- a/swecommon/schemas/json/Text.json +++ b/swecommon/schemas/json/Text.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Free text component used to store comments or any other type of textual statement", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/Time.json b/swecommon/schemas/json/Time.json index f6e5e1db..b0ffab41 100644 --- a/swecommon/schemas/json/Time.json +++ b/swecommon/schemas/json/Time.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Scalar component used to represent a time quantity either as ISO 8601 (e.g. 2004-04-18T12:03:04.6Z) or as a duration relative to a time of reference", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/TimeRange.json b/swecommon/schemas/json/TimeRange.json index b0b6845f..eaed9b50 100644 --- a/swecommon/schemas/json/TimeRange.json +++ b/swecommon/schemas/json/TimeRange.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Time value pair for specifying a time range (can be a decimal or ISO 8601)", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/Vector.json b/swecommon/schemas/json/Vector.json index f375eb61..1689e8e3 100644 --- a/swecommon/schemas/json/Vector.json +++ b/swecommon/schemas/json/Vector.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Implementation of a mathematical vector composed of a list of scalar coordinates expressed in the mandatory reference frame.", "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/basicTypes.json b/swecommon/schemas/json/basicTypes.json index c357170b..1fa883f0 100644 --- a/swecommon/schemas/json/basicTypes.json +++ b/swecommon/schemas/json/basicTypes.json @@ -1,8 +1,8 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "AbstractSWE": { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "description": "Base substitution groups for all SWE Common objects other than value objects", "type": "object", "properties": { diff --git a/swecommon/schemas/json/encodings.json b/swecommon/schemas/json/encodings.json index 9899d702..49ec4f36 100644 --- a/swecommon/schemas/json/encodings.json +++ b/swecommon/schemas/json/encodings.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "AbstractEncoding": { "type": "object", "allOf": [ diff --git a/swecommon/schemas/json/sweCommon.json b/swecommon/schemas/json/sweCommon.json index fddca970..7083d273 100644 --- a/swecommon/schemas/json/sweCommon.json +++ b/swecommon/schemas/json/sweCommon.json @@ -1,6 +1,6 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "definitions": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$defs": { "AnyComponent": { "oneOf": [ { From ea81e15344a2dcd221efe9a7bc7715e581c2063e Mon Sep 17 00:00:00 2001 From: speckij Date: Wed, 5 Feb 2025 22:30:44 +0100 Subject: [PATCH 2/2] refactor to json schema 2020-12 --- api/part1/openapi/schemas/common/links.json | 2 +- .../schemas/geojson/deployedSystem.json | 4 +-- .../openapi/schemas/geojson/deployment.json | 10 +++---- .../openapi/schemas/geojson/procedure.json | 2 +- .../schemas/geojson/samplingFeature.json | 4 +-- api/part1/openapi/schemas/geojson/system.json | 6 ++--- .../schemas/sensorml/deployedSystem.json | 2 +- .../openapi/schemas/sensorml/deployment.json | 4 +-- .../openapi/schemas/sensorml/procedure.json | 10 +++---- .../openapi/schemas/sensorml/property.json | 2 +- .../openapi/schemas/sensorml/system.json | 10 +++---- ...ervationSchema-scalar-json-jsonschema.json | 2 +- api/part2/openapi/requests/commandResult.yaml | 2 +- api/part2/openapi/requests/commandStatus.yaml | 2 +- api/part2/openapi/requests/systemEvent.yaml | 2 +- api/part2/openapi/responses/command.yaml | 2 +- .../openapi/responses/commandCollection.yaml | 2 +- .../openapi/responses/commandResult.yaml | 2 +- .../openapi/responses/commandStatus.yaml | 2 +- api/part2/openapi/responses/observation.yaml | 2 +- .../responses/observationCollection.yaml | 2 +- api/part2/openapi/responses/systemEvent.yaml | 2 +- .../openapi/schemas/common/sweCommonDefs.json | 8 +++--- .../openapi/schemas/json/baseStream.json | 2 +- api/part2/openapi/schemas/json/command.json | 6 ++--- .../schemas/json/commandCollection.json | 2 +- .../openapi/schemas/json/commandResult.json | 10 +++---- .../schemas/json/commandResultCollection.json | 2 +- .../schemas/json/commandSchemaJson.json | 6 ++--- .../schemas/json/commandSchemaProtobuf.json | 2 +- .../schemas/json/commandSchemaSwe.json | 10 +++---- .../openapi/schemas/json/commandStatus.json | 4 +-- .../schemas/json/commandStatusCollection.json | 2 +- .../openapi/schemas/json/controlStream.json | 16 +++++------ .../schemas/json/controlStreamCollection.json | 2 +- .../openapi/schemas/json/dataStream.json | 18 ++++++------- .../schemas/json/dataStreamCollection.json | 2 +- .../schemas/json/dataStreamSchemaDef.json | 10 +++---- .../openapi/schemas/json/observation.json | 8 +++--- .../schemas/json/observationCollection.json | 2 +- .../schemas/json/observationSchemaJson.json | 4 +-- .../json/observationSchemaProtobuf.json | 2 +- .../schemas/json/observationSchemaSwe.json | 10 +++---- .../openapi/schemas/json/systemEvent.json | 4 +-- .../schemas/json/systemEventCollection.json | 2 +- .../schemas/samplingSpatialParametric.json | 2 +- .../openapi/schemas/samplingSpecimen.json | 4 +-- .../schemas/json/AbstractPhysicalProcess.json | 22 +++++++-------- sensorml/schemas/json/AbstractProcess.json | 26 +++++++++--------- sensorml/schemas/json/AggregateProcess.json | 12 ++++----- sensorml/schemas/json/ContactLink.json | 2 +- sensorml/schemas/json/DeployedSystem.json | 2 +- sensorml/schemas/json/Deployment.json | 2 +- sensorml/schemas/json/DerivedProperty.json | 4 +-- sensorml/schemas/json/DescribedObject.json | 22 +++++++-------- sensorml/schemas/json/Document.json | 2 +- sensorml/schemas/json/Event.json | 10 +++---- sensorml/schemas/json/LegalConstraint.json | 4 +-- sensorml/schemas/json/PhysicalComponent.json | 2 +- sensorml/schemas/json/PhysicalSystem.json | 4 +-- sensorml/schemas/json/Pose.json | 16 +++++------ sensorml/schemas/json/ResponsibleParty.json | 6 ++--- sensorml/schemas/json/Settings.json | 12 ++++----- sensorml/schemas/json/SimpleProcess.json | 2 +- sensorml/schemas/json/commonDefs.json | 10 +++---- sensorml/schemas/json/sweCommonDefs.json | 14 +++++----- .../schemas/json/AbstractSimpleComponent.json | 27 ------------------- .../schemas/json/AbstractSweIdentifiable.json | 2 +- swecommon/schemas/json/Category.json | 4 +-- swecommon/schemas/json/CategoryRange.json | 4 +-- swecommon/schemas/json/Count.json | 4 +-- swecommon/schemas/json/CountRange.json | 4 +-- swecommon/schemas/json/DataArray.json | 22 +++++++-------- swecommon/schemas/json/DataChoice.json | 6 ++--- swecommon/schemas/json/DataRecord.json | 6 ++--- swecommon/schemas/json/DataStream.json | 16 +++++------ swecommon/schemas/json/Geometry.json | 2 +- swecommon/schemas/json/Matrix.json | 2 +- swecommon/schemas/json/Quantity.json | 8 +++--- swecommon/schemas/json/QuantityRange.json | 8 +++--- swecommon/schemas/json/Text.json | 4 +-- swecommon/schemas/json/Time.json | 8 +++--- swecommon/schemas/json/TimeRange.json | 8 +++--- swecommon/schemas/json/Vector.json | 2 +- swecommon/schemas/json/basicTypes.json | 20 +++++++------- swecommon/schemas/json/encodings.json | 24 ++++++++--------- swecommon/schemas/json/sweCommon.json | 6 ++--- .../clause_9.6_json_simple_encodings.adoc | 4 +-- .../clause_9.7_json_advanced_encodings.adoc | 2 +- 89 files changed, 279 insertions(+), 306 deletions(-) diff --git a/api/part1/openapi/schemas/common/links.json b/api/part1/openapi/schemas/common/links.json index 3068e3f7..386718bb 100644 --- a/api/part1/openapi/schemas/common/links.json +++ b/api/part1/openapi/schemas/common/links.json @@ -4,6 +4,6 @@ "type": "array", "minItems": 1, "items": { - "$ref": "commonDefs.json#/definitions/Link" + "$ref": "commonDefs.json#/$defs/Link" } } \ No newline at end of file diff --git a/api/part1/openapi/schemas/geojson/deployedSystem.json b/api/part1/openapi/schemas/geojson/deployedSystem.json index 58a926c8..6b9e97d1 100644 --- a/api/part1/openapi/schemas/geojson/deployedSystem.json +++ b/api/part1/openapi/schemas/geojson/deployedSystem.json @@ -9,11 +9,11 @@ "properties": { "system@link": { "description": "Link to the deployed system.", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "procedure@link": { "description": "Link to the procedure used by the system, or to operate the system, during the deployment (e.g. mission plan for an autonomous system, methodology for human operator).", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" } } } diff --git a/api/part1/openapi/schemas/geojson/deployment.json b/api/part1/openapi/schemas/geojson/deployment.json index 794f2789..e7692f98 100644 --- a/api/part1/openapi/schemas/geojson/deployment.json +++ b/api/part1/openapi/schemas/geojson/deployment.json @@ -8,21 +8,21 @@ "required": [ "validTime" ], "properties": { "featureType": { - "$ref": "../common/uris.json#/definitions/DeploymentTypeUris" + "$ref": "../common/uris.json#/$defs/DeploymentTypeUris" }, "validTime": { "description": "Time period during which the systems are deployed.", - "$ref": "../common/commonDefs.json#/definitions/TimePeriod" + "$ref": "../common/commonDefs.json#/$defs/TimePeriod" }, "platform@link": { "description": "Link to the platform on which the systems are deployed.", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "deployedSystems@link": { "type": "array", "items": { - "description": "Link to the system being deployed.", - "$ref": "../common/commonDefs.json#/definitions/Link" + "description": "Link to the system being deployed. Either a URN if the system is stored locally, or a URL if the system is hosted externally", + "$ref": "../common/commonDefs.json#/$defs/Link" } } } diff --git a/api/part1/openapi/schemas/geojson/procedure.json b/api/part1/openapi/schemas/geojson/procedure.json index a771c8be..a554bbba 100644 --- a/api/part1/openapi/schemas/geojson/procedure.json +++ b/api/part1/openapi/schemas/geojson/procedure.json @@ -10,7 +10,7 @@ "properties": { "properties": { "featureType": { - "$ref": "../common/uris.json#/definitions/ProcedureTypeUris" + "$ref": "../common/uris.json#/$defs/ProcedureTypeUris" } } } diff --git a/api/part1/openapi/schemas/geojson/samplingFeature.json b/api/part1/openapi/schemas/geojson/samplingFeature.json index 7e817a6e..af2d6d4c 100644 --- a/api/part1/openapi/schemas/geojson/samplingFeature.json +++ b/api/part1/openapi/schemas/geojson/samplingFeature.json @@ -11,10 +11,10 @@ "required": [ "featureType", "sampledFeature@link" ], "properties": { "validTime": { - "$ref": "../common/commonDefs.json#/definitions/TimePeriod" + "$ref": "../common/commonDefs.json#/$defs/TimePeriod" }, "sampledFeature@link": { - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" } } } diff --git a/api/part1/openapi/schemas/geojson/system.json b/api/part1/openapi/schemas/geojson/system.json index b7351176..efd59bd7 100644 --- a/api/part1/openapi/schemas/geojson/system.json +++ b/api/part1/openapi/schemas/geojson/system.json @@ -7,7 +7,7 @@ "properties": { "properties": { "featureType": { - "$ref": "../common/uris.json#/definitions/SystemTypeUris" + "$ref": "../common/uris.json#/$defs/SystemTypeUris" }, "assetType": { "description": "Type of asset represented by this system.", @@ -21,11 +21,11 @@ }, "validTime": { "description": "Time period during which the system description is valid.", - "$ref": "../common/commonDefs.json#/definitions/TimePeriod" + "$ref": "../common/commonDefs.json#/$defs/TimePeriod" }, "systemKind@link": { "description": "Link to the system kind description (i.e. its nature or specifications).", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" } } } diff --git a/api/part1/openapi/schemas/sensorml/deployedSystem.json b/api/part1/openapi/schemas/sensorml/deployedSystem.json index 03c95793..2bb32d7d 100644 --- a/api/part1/openapi/schemas/sensorml/deployedSystem.json +++ b/api/part1/openapi/schemas/sensorml/deployedSystem.json @@ -1,7 +1,7 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ - { "$ref": "sensormlDefs.json#/definitions/DeployedSystem" }, + { "$ref": "sensormlDefs.json#/$defs/DeployedSystem" }, { "properties": { "id": { diff --git a/api/part1/openapi/schemas/sensorml/deployment.json b/api/part1/openapi/schemas/sensorml/deployment.json index 0bb92eee..167e6f3c 100644 --- a/api/part1/openapi/schemas/sensorml/deployment.json +++ b/api/part1/openapi/schemas/sensorml/deployment.json @@ -1,11 +1,11 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ - { "$ref": "sensormlDefs.json#/definitions/Deployment" }, + { "$ref": "sensormlDefs.json#/$defs/Deployment" }, { "properties": { "definition": { - "$ref": "../common/uris.json#/definitions/DeploymentTypeUris" + "$ref": "../common/uris.json#/$defs/DeploymentTypeUris" }, "links": { "description": "Links to related resources", diff --git a/api/part1/openapi/schemas/sensorml/procedure.json b/api/part1/openapi/schemas/sensorml/procedure.json index 33a9e15e..ca720810 100644 --- a/api/part1/openapi/schemas/sensorml/procedure.json +++ b/api/part1/openapi/schemas/sensorml/procedure.json @@ -3,16 +3,16 @@ "allOf": [ { "oneOf": [ - { "$ref": "sensormlDefs.json#/definitions/SimpleProcess" }, - { "$ref": "sensormlDefs.json#/definitions/AggregateProcess" }, - { "$ref": "sensormlDefs.json#/definitions/PhysicalComponent" }, - { "$ref": "sensormlDefs.json#/definitions/PhysicalSystem" } + { "$ref": "sensormlDefs.json#/$defs/SimpleProcess" }, + { "$ref": "sensormlDefs.json#/$defs/AggregateProcess" }, + { "$ref": "sensormlDefs.json#/$defs/PhysicalComponent" }, + { "$ref": "sensormlDefs.json#/$defs/PhysicalSystem" } ] }, { "properties": { "definition": { - "$ref": "../common/uris.json#/definitions/ProcedureTypeUris" + "$ref": "../common/uris.json#/$defs/ProcedureTypeUris" }, "position": { "not": {} diff --git a/api/part1/openapi/schemas/sensorml/property.json b/api/part1/openapi/schemas/sensorml/property.json index dd122428..8ec6274c 100644 --- a/api/part1/openapi/schemas/sensorml/property.json +++ b/api/part1/openapi/schemas/sensorml/property.json @@ -2,7 +2,7 @@ "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { - "$ref": "sensormlDefs.json#/definitions/DerivedProperty" + "$ref": "sensormlDefs.json#/$defs/DerivedProperty" }, { "properties": { diff --git a/api/part1/openapi/schemas/sensorml/system.json b/api/part1/openapi/schemas/sensorml/system.json index c58a14b2..a61cc820 100644 --- a/api/part1/openapi/schemas/sensorml/system.json +++ b/api/part1/openapi/schemas/sensorml/system.json @@ -3,16 +3,16 @@ "allOf": [ { "oneOf": [ - { "$ref": "sensormlDefs.json#/definitions/SimpleProcess" }, - { "$ref": "sensormlDefs.json#/definitions/AggregateProcess" }, - { "$ref": "sensormlDefs.json#/definitions/PhysicalComponent" }, - { "$ref": "sensormlDefs.json#/definitions/PhysicalSystem" } + { "$ref": "sensormlDefs.json#/$defs/SimpleProcess" }, + { "$ref": "sensormlDefs.json#/$defs/AggregateProcess" }, + { "$ref": "sensormlDefs.json#/$defs/PhysicalComponent" }, + { "$ref": "sensormlDefs.json#/$defs/PhysicalSystem" } ] }, { "properties": { "definition": { - "$ref": "../common/uris.json#/definitions/SystemTypeUris" + "$ref": "../common/uris.json#/$defs/SystemTypeUris" }, "links": { "description": "Links to related resources", diff --git a/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema.json b/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema.json index e3cdc9a2..c70feec9 100644 --- a/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema.json +++ b/api/part2/openapi/examples/schemas/observationSchema-scalar-json-jsonschema.json @@ -15,7 +15,7 @@ }, "resultTime": { "description": "Time at which the observation result was generated.", - "$ref": "../common/commonDefs.json#/definitions/TimeInstant" + "$ref": "../common/commonDefs.json#/$defs/TimeInstant" }, "result": { "type": "number", diff --git a/api/part2/openapi/requests/commandResult.yaml b/api/part2/openapi/requests/commandResult.yaml index 699aeb4e..2479676a 100644 --- a/api/part2/openapi/requests/commandResult.yaml +++ b/api/part2/openapi/requests/commandResult.yaml @@ -7,4 +7,4 @@ content: - properties: links: description: Links to related resources - $ref: ../schemas/common/commonDefs.json#/definitions/Links \ No newline at end of file + $ref: ../schemas/common/commonDefs.json#/$defs/Links \ No newline at end of file diff --git a/api/part2/openapi/requests/commandStatus.yaml b/api/part2/openapi/requests/commandStatus.yaml index 77b05616..2d793183 100644 --- a/api/part2/openapi/requests/commandStatus.yaml +++ b/api/part2/openapi/requests/commandStatus.yaml @@ -6,4 +6,4 @@ content: properties: links: description: Links to related resources - $ref: ../schemas/common/commonDefs.json#/definitions/Links \ No newline at end of file + $ref: ../schemas/common/commonDefs.json#/$defs/Links \ No newline at end of file diff --git a/api/part2/openapi/requests/systemEvent.yaml b/api/part2/openapi/requests/systemEvent.yaml index f656aff0..83247638 100644 --- a/api/part2/openapi/requests/systemEvent.yaml +++ b/api/part2/openapi/requests/systemEvent.yaml @@ -6,4 +6,4 @@ content: properties: links: description: Links to related resources - $ref: ../schemas/common/commonDefs.json#/definitions/Links \ No newline at end of file + $ref: ../schemas/common/commonDefs.json#/$defs/Links \ No newline at end of file diff --git a/api/part2/openapi/responses/command.yaml b/api/part2/openapi/responses/command.yaml index eecfd68f..5524eda6 100644 --- a/api/part2/openapi/responses/command.yaml +++ b/api/part2/openapi/responses/command.yaml @@ -6,7 +6,7 @@ content: properties: links: description: Links to related resources - $ref: ../schemas/common/commonDefs.json#/definitions/Links + $ref: ../schemas/common/commonDefs.json#/$defs/Links examples: ptz: summary: PTZ Command diff --git a/api/part2/openapi/responses/commandCollection.yaml b/api/part2/openapi/responses/commandCollection.yaml index edc96d6c..c14861ef 100644 --- a/api/part2/openapi/responses/commandCollection.yaml +++ b/api/part2/openapi/responses/commandCollection.yaml @@ -14,4 +14,4 @@ content: type: object links: description: Links to related resources (including paging) - $ref: ../schemas/common/commonDefs.json#/definitions/Links \ No newline at end of file + $ref: ../schemas/common/commonDefs.json#/$defs/Links \ No newline at end of file diff --git a/api/part2/openapi/responses/commandResult.yaml b/api/part2/openapi/responses/commandResult.yaml index b3426a83..df99e83f 100644 --- a/api/part2/openapi/responses/commandResult.yaml +++ b/api/part2/openapi/responses/commandResult.yaml @@ -7,4 +7,4 @@ content: - properties: links: description: Links to related resources - $ref: ../schemas/common/commonDefs.json#/definitions/Links \ No newline at end of file + $ref: ../schemas/common/commonDefs.json#/$defs/Links \ No newline at end of file diff --git a/api/part2/openapi/responses/commandStatus.yaml b/api/part2/openapi/responses/commandStatus.yaml index f5837105..be53ce58 100644 --- a/api/part2/openapi/responses/commandStatus.yaml +++ b/api/part2/openapi/responses/commandStatus.yaml @@ -6,4 +6,4 @@ content: properties: links: description: Links to related resources - $ref: ../schemas/common/commonDefs.json#/definitions/Links \ No newline at end of file + $ref: ../schemas/common/commonDefs.json#/$defs/Links \ No newline at end of file diff --git a/api/part2/openapi/responses/observation.yaml b/api/part2/openapi/responses/observation.yaml index f2001466..441057fe 100644 --- a/api/part2/openapi/responses/observation.yaml +++ b/api/part2/openapi/responses/observation.yaml @@ -6,7 +6,7 @@ content: properties: links: description: Links to related resources - $ref: ../schemas/common/commonDefs.json#/definitions/Links + $ref: ../schemas/common/commonDefs.json#/$defs/Links examples: simple: summary: Scalar Observation (Measure) diff --git a/api/part2/openapi/responses/observationCollection.yaml b/api/part2/openapi/responses/observationCollection.yaml index 82376c8b..34b5921f 100644 --- a/api/part2/openapi/responses/observationCollection.yaml +++ b/api/part2/openapi/responses/observationCollection.yaml @@ -14,4 +14,4 @@ content: type: object links: description: Links to related resources (including paging) - $ref: ../schemas/common/commonDefs.json#/definitions/Links \ No newline at end of file + $ref: ../schemas/common/commonDefs.json#/$defs/Links \ No newline at end of file diff --git a/api/part2/openapi/responses/systemEvent.yaml b/api/part2/openapi/responses/systemEvent.yaml index 9ca50f77..d8666aaa 100644 --- a/api/part2/openapi/responses/systemEvent.yaml +++ b/api/part2/openapi/responses/systemEvent.yaml @@ -6,7 +6,7 @@ content: properties: links: description: Links to related resources - $ref: ../schemas/common/commonDefs.json#/definitions/Links + $ref: ../schemas/common/commonDefs.json#/$defs/Links examples: simple: summary: Scalar Observation (Measure) diff --git a/api/part2/openapi/schemas/common/sweCommonDefs.json b/api/part2/openapi/schemas/common/sweCommonDefs.json index b8b53700..d6af11a5 100644 --- a/api/part2/openapi/schemas/common/sweCommonDefs.json +++ b/api/part2/openapi/schemas/common/sweCommonDefs.json @@ -2,7 +2,7 @@ "$schema": "https://json-schema.org/draft/2020-12/schema", "$defs": { "AnyComponent": { - "$ref": "../../../../../swecommon/schemas/json/sweCommon.json#/definitions/AnyComponent" + "$ref": "../../../../../swecommon/schemas/json/sweCommon.json#/$defs/AnyComponent" }, "DataRecord": { "$ref": "../../../../../swecommon/schemas/json/DataRecord.json" @@ -17,13 +17,13 @@ "$ref": "../../../../../swecommon/schemas/json/encodings.json" }, "JSONEncoding": { - "$ref": "../../../../../swecommon/schemas/json/encodings.json#/definitions/JSONEncoding" + "$ref": "../../../../../swecommon/schemas/json/encodings.json#/$defs/JSONEncoding" }, "TextEncoding": { - "$ref": "../../../../../swecommon/schemas/json/encodings.json#/definitions/TextEncoding" + "$ref": "../../../../../swecommon/schemas/json/encodings.json#/$defs/TextEncoding" }, "BinaryEncoding": { - "$ref": "../../../../../swecommon/schemas/json/encodings.json#/definitions/BinaryEncoding" + "$ref": "../../../../../swecommon/schemas/json/encodings.json#/$defs/BinaryEncoding" } } } diff --git a/api/part2/openapi/schemas/json/baseStream.json b/api/part2/openapi/schemas/json/baseStream.json index d5807c5f..5b2462db 100644 --- a/api/part2/openapi/schemas/json/baseStream.json +++ b/api/part2/openapi/schemas/json/baseStream.json @@ -20,7 +20,7 @@ }, "validTime": { "description": "Validity period of the resource", - "$ref": "../common/commonDefs.json#/definitions/TimePeriod" + "$ref": "../common/commonDefs.json#/$defs/TimePeriod" }, "formats": { "description": "List of available formats", diff --git a/api/part2/openapi/schemas/json/command.json b/api/part2/openapi/schemas/json/command.json index a324e063..65c3cd4e 100644 --- a/api/part2/openapi/schemas/json/command.json +++ b/api/part2/openapi/schemas/json/command.json @@ -21,16 +21,16 @@ }, "procedure@link": { "description": "Link to the procedure/method used to process the command", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "issueTime": { "description": "Time at which the command was issued. If omitted on creation, the server sets it to the time the request was received.", - "$ref": "../common/commonDefs.json#/definitions/TimeInstant", + "$ref": "../common/commonDefs.json#/$defs/TimeInstant", "readOnly": true }, "executionTime": { "description": "Time period during which the command was executed", - "$ref": "../common/commonDefs.json#/definitions/TimePeriod", + "$ref": "../common/commonDefs.json#/$defs/TimePeriod", "readOnly": true }, "sender": { diff --git a/api/part2/openapi/schemas/json/commandCollection.json b/api/part2/openapi/schemas/json/commandCollection.json index ae4ead4d..1f2b6fee 100644 --- a/api/part2/openapi/schemas/json/commandCollection.json +++ b/api/part2/openapi/schemas/json/commandCollection.json @@ -10,7 +10,7 @@ }, "links": { "description": "Links to related resources (including paging)", - "$ref": "../common/commonDefs.json#/definitions/Links" + "$ref": "../common/commonDefs.json#/$defs/Links" } }, "required": [ "items" ] diff --git a/api/part2/openapi/schemas/json/commandResult.json b/api/part2/openapi/schemas/json/commandResult.json index 7624dd6a..2c984b63 100644 --- a/api/part2/openapi/schemas/json/commandResult.json +++ b/api/part2/openapi/schemas/json/commandResult.json @@ -37,7 +37,7 @@ "command@id": {}, "observation@link": { "description": "Link to an observation resulting from the execution of the command", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" } }, "required": ["observation@link"] @@ -49,7 +49,7 @@ "command@id": {}, "observationSet@link": { "description": "Link to a set of observations resulting from the execution of the command", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" } }, "required": ["observationSet@link"] @@ -62,12 +62,12 @@ "datastream@link": { "description": "Link to a datastream containing observations resulting from the execution of the command", "allOf": [ - { "$ref": "../common/commonDefs.json#/definitions/Link" }, + { "$ref": "../common/commonDefs.json#/$defs/Link" }, { "properties": { "resultTime": { "description": "Time range during which the resulting observations were generated (If not provided, the entire datastream is assumed to be the result)", - "$ref": "../common/commonDefs.json#/definitions/TimePeriod" + "$ref": "../common/commonDefs.json#/$defs/TimePeriod" } } } @@ -83,7 +83,7 @@ "command@id": {}, "external@link": { "description": "Link to an external dataset containing the result(s) of the command", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" } }, "required": ["external@link"] diff --git a/api/part2/openapi/schemas/json/commandResultCollection.json b/api/part2/openapi/schemas/json/commandResultCollection.json index 7579d54b..99fbbe79 100644 --- a/api/part2/openapi/schemas/json/commandResultCollection.json +++ b/api/part2/openapi/schemas/json/commandResultCollection.json @@ -10,7 +10,7 @@ }, "links": { "description": "Links to related resources (including paging)", - "$ref": "../common/commonDefs.json#/definitions/Links" + "$ref": "../common/commonDefs.json#/$defs/Links" } }, "required": [ "items" ] diff --git a/api/part2/openapi/schemas/json/commandSchemaJson.json b/api/part2/openapi/schemas/json/commandSchemaJson.json index 9b5f3d7d..47746798 100644 --- a/api/part2/openapi/schemas/json/commandSchemaJson.json +++ b/api/part2/openapi/schemas/json/commandSchemaJson.json @@ -7,13 +7,13 @@ "const": "application/json" }, "parametersSchema": { - "$ref": "../common/sweCommonDefs.json#/definitions/AnyComponent" + "$ref": "../common/sweCommonDefs.json#/$defs/AnyComponent" }, "resultSchema": { - "$ref": "../common/sweCommonDefs.json#/definitions/AnyComponent" + "$ref": "../common/sweCommonDefs.json#/$defs/AnyComponent" }, "feasibilityResultSchema": { - "$ref": "../common/sweCommonDefs.json#/definitions/AnyComponent" + "$ref": "../common/sweCommonDefs.json#/$defs/AnyComponent" } }, "required": [ diff --git a/api/part2/openapi/schemas/json/commandSchemaProtobuf.json b/api/part2/openapi/schemas/json/commandSchemaProtobuf.json index 37c43488..f76e713c 100644 --- a/api/part2/openapi/schemas/json/commandSchemaProtobuf.json +++ b/api/part2/openapi/schemas/json/commandSchemaProtobuf.json @@ -15,7 +15,7 @@ }, { "title": "Link to external file", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" } ] } diff --git a/api/part2/openapi/schemas/json/commandSchemaSwe.json b/api/part2/openapi/schemas/json/commandSchemaSwe.json index 44052cef..1e108da5 100644 --- a/api/part2/openapi/schemas/json/commandSchemaSwe.json +++ b/api/part2/openapi/schemas/json/commandSchemaSwe.json @@ -6,7 +6,7 @@ "type": "string" }, "recordSchema": { - "$ref": "../common/sweCommonDefs.json#/definitions/AnyComponent" + "$ref": "../common/sweCommonDefs.json#/$defs/AnyComponent" }, "encoding": {} }, @@ -21,7 +21,7 @@ "const": "application/swe+json" }, "encoding": { - "$ref": "../common/sweCommonDefs.json#/definitions/JSONEncoding" + "$ref": "../common/sweCommonDefs.json#/$defs/JSONEncoding" } } }, @@ -32,7 +32,7 @@ "const": "application/swe+text" }, "encoding": { - "$ref": "../common/sweCommonDefs.json#/definitions/TextEncoding" + "$ref": "../common/sweCommonDefs.json#/$defs/TextEncoding" } } }, @@ -44,7 +44,7 @@ }, "encoding": { "allOf": [ - { "$ref": "../common/sweCommonDefs.json#/definitions/TextEncoding" }, + { "$ref": "../common/sweCommonDefs.json#/$defs/TextEncoding" }, { "properties": { "tokenSeparator": { @@ -67,7 +67,7 @@ "const": "application/swe+binary" }, "encoding": { - "$ref": "../common/sweCommonDefs.json#/definitions/BinaryEncoding" + "$ref": "../common/sweCommonDefs.json#/$defs/BinaryEncoding" } } } diff --git a/api/part2/openapi/schemas/json/commandStatus.json b/api/part2/openapi/schemas/json/commandStatus.json index 852d735b..49b02359 100644 --- a/api/part2/openapi/schemas/json/commandStatus.json +++ b/api/part2/openapi/schemas/json/commandStatus.json @@ -16,7 +16,7 @@ }, "reportTime": { "description": "Time at which this report was generated. If omitted on creation, the server sets it to the time the request was received.", - "$ref": "../common/commonDefs.json#/definitions/TimeInstant", + "$ref": "../common/commonDefs.json#/$defs/TimeInstant", "readOnly": true }, "statusCode": { @@ -31,7 +31,7 @@ }, "executionTime": { "description": "Time period during which the command was executed or is scheduled to be executed (depending on status code)", - "$ref": "../common/commonDefs.json#/definitions/TimePeriod" + "$ref": "../common/commonDefs.json#/$defs/TimePeriod" }, "message": { "description": "Human readable message providing more details on the current status (can be both an error or information message depending on the status code)", diff --git a/api/part2/openapi/schemas/json/commandStatusCollection.json b/api/part2/openapi/schemas/json/commandStatusCollection.json index 25001496..70efa86a 100644 --- a/api/part2/openapi/schemas/json/commandStatusCollection.json +++ b/api/part2/openapi/schemas/json/commandStatusCollection.json @@ -10,7 +10,7 @@ }, "links": { "description": "Links to related resources (including paging)", - "$ref": "../common/commonDefs.json#/definitions/Links" + "$ref": "../common/commonDefs.json#/$defs/Links" } }, "required": [ "items" ] diff --git a/api/part2/openapi/schemas/json/controlStream.json b/api/part2/openapi/schemas/json/controlStream.json index 14d4e034..f7fe441c 100644 --- a/api/part2/openapi/schemas/json/controlStream.json +++ b/api/part2/openapi/schemas/json/controlStream.json @@ -6,7 +6,7 @@ "properties": { "system@link": { "description": "Link to the system receiving the commands", - "$ref": "../common/commonDefs.json#/definitions/Link", + "$ref": "../common/commonDefs.json#/$defs/Link", "readOnly": true }, "inputName": { @@ -15,19 +15,19 @@ }, "procedure@link": { "description": "Link to the procedure used to execute commands (only provided if all commands in the control stream share the same procedure)", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "deployment@link": { "description": "Link to the deployment during which the commands are/were received (only provided if all commands in the control stream share the same deployment)", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "featureOfInterest@link": { "description": "Link to the ultimate feature of interest (only provided if all commands in the control stream share the same feature of interest)", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "samplingFeature@link": { "description": "Link to the sampling feature (only provided if all commands in the control stream share the same sampling feature)", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "controlledProperties": { "description": "List of properties that are controllable through this control stream", @@ -52,12 +52,12 @@ }, "issueTime": { "description": "Time extent spanning all issue times of commands in this control stream", - "$ref": "../common/commonDefs.json#/definitions/TimePeriod", + "$ref": "../common/commonDefs.json#/$defs/TimePeriod", "readOnly": true }, "executionTime": { "description": "Time extent spanning all execution times of commands in this control stream", - "$ref": "../common/commonDefs.json#/definitions/TimePeriod", + "$ref": "../common/commonDefs.json#/$defs/TimePeriod", "readOnly": true }, "live": { @@ -76,7 +76,7 @@ }, "links": { "description": "Links to related resources", - "$ref": "../common/commonDefs.json#/definitions/Links" + "$ref": "../common/commonDefs.json#/$defs/Links" } } } diff --git a/api/part2/openapi/schemas/json/controlStreamCollection.json b/api/part2/openapi/schemas/json/controlStreamCollection.json index 8e17ea80..763ee164 100644 --- a/api/part2/openapi/schemas/json/controlStreamCollection.json +++ b/api/part2/openapi/schemas/json/controlStreamCollection.json @@ -10,7 +10,7 @@ }, "links": { "description": "Links to related resources (including paging)", - "$ref": "../common/commonDefs.json#/definitions/Links" + "$ref": "../common/commonDefs.json#/$defs/Links" } }, "required": [ "items" ] diff --git a/api/part2/openapi/schemas/json/dataStream.json b/api/part2/openapi/schemas/json/dataStream.json index e716273f..bfc1f98c 100644 --- a/api/part2/openapi/schemas/json/dataStream.json +++ b/api/part2/openapi/schemas/json/dataStream.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema", + "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ { "$ref": "baseStream.json" @@ -8,7 +8,7 @@ "properties": { "system@link": { "description": "Link to the system producing the observations", - "$ref": "../common/commonDefs.json#/definitions/Link", + "$ref": "../common/commonDefs.json#/$defs/Link", "readOnly": true }, "outputName": { @@ -17,19 +17,19 @@ }, "procedure@link": { "description": "Link to the procedure used to acquire observations (only provided if all observations in the datastream share the same procedure)", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "deployment@link": { "description": "Link to the deployment during which the observations are/were collected (only provided if all observations in the datastream share the same deployment)", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "featureOfInterest@link": { "description": "Link to the ultimate feature of interest (only provided if all observations in the datastream share the same feature of interest)", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "samplingFeature@link": { "description": "Link to the sampling feature (only provided if all observations in the datastream share the same sampling feature)", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "observedProperties": { "oneOf": [ @@ -66,7 +66,7 @@ }, { "description": "Time extent spanning all phenomenon times of observations in this datastream", - "$ref": "../common/commonDefs.json#/definitions/TimePeriod" + "$ref": "../common/commonDefs.json#/$defs/TimePeriod" } ], "readOnly": true @@ -83,7 +83,7 @@ }, { "description": "Time extent spanning all result times of observations in this datastream", - "$ref": "../common/commonDefs.json#/definitions/TimePeriod" + "$ref": "../common/commonDefs.json#/$defs/TimePeriod" } ], "readOnly": true @@ -136,7 +136,7 @@ }, "links": { "description": "Other links to related resources", - "$ref": "../common/commonDefs.json#/definitions/Links" + "$ref": "../common/commonDefs.json#/$defs/Links" } } } diff --git a/api/part2/openapi/schemas/json/dataStreamCollection.json b/api/part2/openapi/schemas/json/dataStreamCollection.json index ee87527a..9b9eaedd 100644 --- a/api/part2/openapi/schemas/json/dataStreamCollection.json +++ b/api/part2/openapi/schemas/json/dataStreamCollection.json @@ -10,7 +10,7 @@ }, "links": { "description": "Links to related resources (including paging)", - "$ref": "../common/commonDefs.json#/definitions/Links" + "$ref": "../common/commonDefs.json#/$defs/Links" } }, "required": [ "items" ] diff --git a/api/part2/openapi/schemas/json/dataStreamSchemaDef.json b/api/part2/openapi/schemas/json/dataStreamSchemaDef.json index f00ac88a..05c954ea 100644 --- a/api/part2/openapi/schemas/json/dataStreamSchemaDef.json +++ b/api/part2/openapi/schemas/json/dataStreamSchemaDef.json @@ -4,23 +4,23 @@ "properties": { "phenomenonTime": { "description": "Descriptor for the observation `phenomenonTime` property. If omitted, values for phenomenon time are not included in the datastream and are assumed to be equal to the observation result time.", - "$ref": "../common/sweCommonDefs.json#/definitions/Time" + "$ref": "../common/sweCommonDefs.json#/$defs/Time" }, "resultTime": { "description": "Descriptor for the observation `resultTime` property. If omitted, the result time is a fixed value provided in the datastream metadata and is not included in observations.", - "$ref": "../common/sweCommonDefs.json#/definitions/Time" + "$ref": "../common/sweCommonDefs.json#/$defs/Time" }, "featureOfInterest": { "description": "Descriptor for the `featureOfInterest` property. If omitted, the single fixed FOI is provided in the datastream metadata and is not included in observations.", - "$ref": "../common/sweCommonDefs.json#/definitions/Category" + "$ref": "../common/sweCommonDefs.json#/$defs/Category" }, "result": { "description": "Descriptor for the observation `result` property. This describes the observed properties included in the result and how they are structured if the result is a record, a vector quantity or a coverage.", - "$ref": "../common/sweCommonDefs.json#/definitions/AnyComponent" + "$ref": "../common/sweCommonDefs.json#/$defs/AnyComponent" }, "parameters": { "description": "Descriptor for the observation `parameters` property. If omitted, parameters are not included in the datastream.", - "$ref": "../common/sweCommonDefs.json#/definitions/DataRecord" + "$ref": "../common/sweCommonDefs.json#/$defs/DataRecord" } }, "required": [ diff --git a/api/part2/openapi/schemas/json/observation.json b/api/part2/openapi/schemas/json/observation.json index 59a3d812..653c03f5 100644 --- a/api/part2/openapi/schemas/json/observation.json +++ b/api/part2/openapi/schemas/json/observation.json @@ -21,15 +21,15 @@ }, "procedure@link": { "description": "Link to the procedure/method used to make the observation", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" }, "phenomenonTime": { "description": "Time at which the observation result is a valid estimate of the sampling feature property(ies). Defaults to the same value as `resultTime`.", - "$ref": "../common/commonDefs.json#/definitions/TimeInstant" + "$ref": "../common/commonDefs.json#/$defs/TimeInstant" }, "resultTime": { "description": "Time at which the observation result was generated.", - "$ref": "../common/commonDefs.json#/definitions/TimeInstant" + "$ref": "../common/commonDefs.json#/$defs/TimeInstant" }, "parameters": { "description": "Parameters of the observation. Must be valid according to the parameters schema provided in the datastream metadata.", @@ -40,7 +40,7 @@ }, "result@link": { "description": "Link to external result data (e.g. large raster dataset served by a tiling service)", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" } }, "required": [ diff --git a/api/part2/openapi/schemas/json/observationCollection.json b/api/part2/openapi/schemas/json/observationCollection.json index 15ed4367..b92f166b 100644 --- a/api/part2/openapi/schemas/json/observationCollection.json +++ b/api/part2/openapi/schemas/json/observationCollection.json @@ -10,7 +10,7 @@ }, "links": { "description": "Links to related resources (including paging)", - "$ref": "../common/commonDefs.json#/definitions/Links" + "$ref": "../common/commonDefs.json#/$defs/Links" } }, "required": [ "items" ] diff --git a/api/part2/openapi/schemas/json/observationSchemaJson.json b/api/part2/openapi/schemas/json/observationSchemaJson.json index 92d73503..a8fd4e61 100644 --- a/api/part2/openapi/schemas/json/observationSchemaJson.json +++ b/api/part2/openapi/schemas/json/observationSchemaJson.json @@ -7,11 +7,11 @@ }, "parametersSchema": { "description": "Record schema for the observation `parameters` property. If omitted, parameters are not included in the datastream.", - "$ref": "../common/sweCommonDefs.json#/definitions/DataRecord" + "$ref": "../common/sweCommonDefs.json#/$defs/DataRecord" }, "resultSchema": { "description": "Schema for the observation `result` property. This describes the observed properties included in the result and how they are structured if the result is a record, a vector quantity or a coverage.", - "$ref": "../common/sweCommonDefs.json#/definitions/AnyComponent" + "$ref": "../common/sweCommonDefs.json#/$defs/AnyComponent" } }, "required": [ diff --git a/api/part2/openapi/schemas/json/observationSchemaProtobuf.json b/api/part2/openapi/schemas/json/observationSchemaProtobuf.json index 574ad50b..b983b1e5 100644 --- a/api/part2/openapi/schemas/json/observationSchemaProtobuf.json +++ b/api/part2/openapi/schemas/json/observationSchemaProtobuf.json @@ -15,7 +15,7 @@ }, { "title": "Link to external file", - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" } ] } diff --git a/api/part2/openapi/schemas/json/observationSchemaSwe.json b/api/part2/openapi/schemas/json/observationSchemaSwe.json index 22a5bb39..68a57734 100644 --- a/api/part2/openapi/schemas/json/observationSchemaSwe.json +++ b/api/part2/openapi/schemas/json/observationSchemaSwe.json @@ -6,7 +6,7 @@ "type": "string" }, "recordSchema": { - "$ref": "../common/sweCommonDefs.json#/definitions/AnyComponent" + "$ref": "../common/sweCommonDefs.json#/$defs/AnyComponent" }, "encoding": {} }, @@ -21,7 +21,7 @@ "const": "application/swe+json" }, "encoding": { - "$ref": "../common/sweCommonDefs.json#/definitions/JSONEncoding" + "$ref": "../common/sweCommonDefs.json#/$defs/JSONEncoding" } } }, @@ -32,7 +32,7 @@ "const": "application/swe+text" }, "encoding": { - "$ref": "../common/sweCommonDefs.json#/definitions/TextEncoding" + "$ref": "../common/sweCommonDefs.json#/$defs/TextEncoding" } } }, @@ -44,7 +44,7 @@ }, "encoding": { "allOf": [ - { "$ref": "../common/sweCommonDefs.json#/definitions/TextEncoding" }, + { "$ref": "../common/sweCommonDefs.json#/$defs/TextEncoding" }, { "properties": { "tokenSeparator": { @@ -67,7 +67,7 @@ "const": "application/swe+binary" }, "encoding": { - "$ref": "../common/sweCommonDefs.json#/definitions/BinaryEncoding" + "$ref": "../common/sweCommonDefs.json#/$defs/BinaryEncoding" } } } diff --git a/api/part2/openapi/schemas/json/systemEvent.json b/api/part2/openapi/schemas/json/systemEvent.json index b7ddc551..4d2fa06b 100644 --- a/api/part2/openapi/schemas/json/systemEvent.json +++ b/api/part2/openapi/schemas/json/systemEvent.json @@ -1,7 +1,7 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", "allOf": [ - { "$ref": "../common/sensormlDefs.json#/definitions/Event" }, + { "$ref": "../common/sensormlDefs.json#/$defs/Event" }, { "properties": { "id": { @@ -9,7 +9,7 @@ }, "links": { "description": "Links to related resources", - "$ref": "../common/commonDefs.json#/definitions/Links" + "$ref": "../common/commonDefs.json#/$defs/Links" } }, "required": [ diff --git a/api/part2/openapi/schemas/json/systemEventCollection.json b/api/part2/openapi/schemas/json/systemEventCollection.json index 33d7e48c..04572850 100644 --- a/api/part2/openapi/schemas/json/systemEventCollection.json +++ b/api/part2/openapi/schemas/json/systemEventCollection.json @@ -10,7 +10,7 @@ }, "links": { "description": "Links to related resources (including paging)", - "$ref": "../common/commonDefs.json#/definitions/Links" + "$ref": "../common/commonDefs.json#/$defs/Links" } }, "required": [ "items" ] diff --git a/api/part4/openapi/schemas/samplingSpatialParametric.json b/api/part4/openapi/schemas/samplingSpatialParametric.json index 0f8f86e7..dab91c23 100644 --- a/api/part4/openapi/schemas/samplingSpatialParametric.json +++ b/api/part4/openapi/schemas/samplingSpatialParametric.json @@ -10,7 +10,7 @@ "properties": { "pose": { "description": "Pose relative to LTP frame or other local reference frame. If a point geometry is provided, the pose LTP frame is considered to be located at the point location", - "$ref": "../sensorml/sensormlDefs.json#/definitions/Pose" + "$ref": "../sensorml/sensormlDefs.json#/$defs/Pose" } } } diff --git a/api/part4/openapi/schemas/samplingSpecimen.json b/api/part4/openapi/schemas/samplingSpecimen.json index 493f2ae0..75135b88 100644 --- a/api/part4/openapi/schemas/samplingSpecimen.json +++ b/api/part4/openapi/schemas/samplingSpecimen.json @@ -15,7 +15,7 @@ "const": "http://www.opengis.net/def/samplingFeatureType/OGC-OM/2.0/SF_Specimen" }, "samplingTime": { - "$ref": "../common/commonDefs.json#/definitions/TimeInstant" + "$ref": "../common/commonDefs.json#/$defs/TimeInstant" }, "materialClass": { "type": "string", @@ -29,7 +29,7 @@ "type": "number" }, "samplingMethod@link": { - "$ref": "../common/commonDefs.json#/definitions/Link" + "$ref": "../common/commonDefs.json#/$defs/Link" } } } diff --git a/sensorml/schemas/json/AbstractPhysicalProcess.json b/sensorml/schemas/json/AbstractPhysicalProcess.json index 52ffd131..4f85e099 100644 --- a/sensorml/schemas/json/AbstractPhysicalProcess.json +++ b/sensorml/schemas/json/AbstractPhysicalProcess.json @@ -9,25 +9,25 @@ "properties": { "attachedTo": { "description": "References the physical component or system (e.g. platform) to which to which this component or system is attached.", - "$ref": "commonDefs.json#/definitions/XLink" + "$ref": "commonDefs.json#/$defs/XLink" }, "localReferenceFrames": { "description": "A list of spatial reference frames, attached to the physical component itself.", "type": "array", "items": { - "$ref": "#/definitions/SpatialFrame" + "$ref": "#/$defs/SpatialFrame" } }, "localTimeFrames": { "description": "Supports local time reference frames such as \"time past mission start\". Note that units are handled in timePosition so they are not specified in the TemporalFrame.", "type": "array", "items": { - "$ref": "#/definitions/TemporalFrame" + "$ref": "#/$defs/TemporalFrame" } }, "position": { "description": "Provides positional information relating the component's spatial reference frame to an external spatial reference frame.", - "$ref": "#/definitions/Position" + "$ref": "#/$defs/Position" } } } @@ -38,7 +38,7 @@ "type": "object", "allOf": [ { - "$ref": "sweCommonDefs.json#/definitions/AbstractSWEIdentifiable" + "$ref": "sweCommonDefs.json#/$defs/AbstractSWEIdentifiable" }, { "properties": { @@ -79,7 +79,7 @@ "type": "object", "allOf": [ { - "$ref": "sweCommonDefs.json#/definitions/AbstractSWEIdentifiable" + "$ref": "sweCommonDefs.json#/$defs/AbstractSWEIdentifiable" }, { "properties": { @@ -99,7 +99,7 @@ { "title": "by Text", "description": "A textual description of where the system is located (e.g. a building name, a room number, etc.)", - "$ref": "sweCommonDefs.json#/definitions/Text" + "$ref": "sweCommonDefs.json#/$defs/Text" }, { "title": "by Point", @@ -115,22 +115,22 @@ }, { "title": "by Datastream", - "$ref": "commonDefs.json#/definitions/XLink" + "$ref": "commonDefs.json#/$defs/XLink" }, { "title": "by Location Vector", "deprecated": true, - "$ref": "sweCommonDefs.json#/definitions/Vector" + "$ref": "sweCommonDefs.json#/$defs/Vector" }, { "title": "by Position (DataRecord)", "deprecated": true, - "$ref": "sweCommonDefs.json#/definitions/DataRecord" + "$ref": "sweCommonDefs.json#/$defs/DataRecord" }, { "title": "by Trajectory (DataArray)", "deprecated": true, - "$ref": "sweCommonDefs.json#/definitions/DataArray" + "$ref": "sweCommonDefs.json#/$defs/DataArray" } ] } diff --git a/sensorml/schemas/json/AbstractProcess.json b/sensorml/schemas/json/AbstractProcess.json index 4fb128ca..37639933 100644 --- a/sensorml/schemas/json/AbstractProcess.json +++ b/sensorml/schemas/json/AbstractProcess.json @@ -14,7 +14,7 @@ }, "typeOf": { "description": "A reference to a base process from which this process inherits properties and constraints (e.g. original equipment manufacturer's model description, generic equation, etc.).", - "$ref": "commonDefs.json#/definitions/XLink" + "$ref": "commonDefs.json#/$defs/XLink" }, "configuration": { "description": "Value settings that further constrain the properties of the base process.", @@ -22,19 +22,19 @@ }, "featuresOfInterest": { "description": "A collection of sampling features or domain features relevant to the process (e.g. the Gulf of Mexico, the White House, the Atmosphere, a vehicle, etc.).", - "$ref": "#/definitions/FeatureList" + "$ref": "#/$defs/FeatureList" }, "inputs": { "description": "The list of process or system inputs.", - "$ref": "#/definitions/InputList" + "$ref": "#/$defs/InputList" }, "outputs": { "description": "The list of process or system outputs.", - "$ref": "#/definitions/OutputList" + "$ref": "#/$defs/OutputList" }, "parameters": { "description": "The list of process or system parameters.", - "$ref": "#/definitions/ParameterList" + "$ref": "#/$defs/ParameterList" }, "modes": { "description": "A collection of parameters that can be set at once through the selection of a particular predefined mode.", @@ -51,28 +51,28 @@ "type": "array", "minItems": 1, "items": { - "$ref": "commonDefs.json#/definitions/XLink" + "$ref": "commonDefs.json#/$defs/XLink" } }, "InputList": { "type": "array", "minItems": 1, "items": { - "$ref": "#/definitions/IOComponentChoice" + "$ref": "#/$defs/IOComponentChoice" } }, "OutputList": { "type": "array", "minItems": 1, "items": { - "$ref": "#/definitions/IOComponentChoice" + "$ref": "#/$defs/IOComponentChoice" } }, "ParameterList": { "type": "array", "minItems": 1, "items": { - "$ref": "#/definitions/IOComponentChoice" + "$ref": "#/$defs/IOComponentChoice" } }, "ModeChoice": { @@ -92,15 +92,15 @@ { "title": "DataComponent", "allOf": [ - { "$ref": "sweCommonDefs.json#/definitions/SoftNamedProperty" }, - { "$ref": "sweCommonDefs.json#/definitions/AnyComponent" } + { "$ref": "sweCommonDefs.json#/$defs/SoftNamedProperty" }, + { "$ref": "sweCommonDefs.json#/$defs/AnyComponent" } ] }, { "title": "ObservableProperty", "allOf": [ - { "$ref": "sweCommonDefs.json#/definitions/SoftNamedProperty" }, - { "$ref": "commonDefs.json#/definitions/ObservableProperty" } + { "$ref": "sweCommonDefs.json#/$defs/SoftNamedProperty" }, + { "$ref": "commonDefs.json#/$defs/ObservableProperty" } ] } ] diff --git a/sensorml/schemas/json/AggregateProcess.json b/sensorml/schemas/json/AggregateProcess.json index fa0eeb64..538298fc 100644 --- a/sensorml/schemas/json/AggregateProcess.json +++ b/sensorml/schemas/json/AggregateProcess.json @@ -12,11 +12,11 @@ }, "components": { "description": "The list of sub-processes", - "$ref": "#/definitions/ComponentList" + "$ref": "#/$defs/ComponentList" }, "connections": { "description": "The explicit definition of data links between outputs, inputs, and parameters of the components within an aggregate process.", - "$ref": "#/definitions/ConnectionList" + "$ref": "#/$defs/ConnectionList" } } } @@ -27,7 +27,7 @@ "minItems": 1, "items": { "allOf": [ - { "$ref": "sweCommonDefs.json#/definitions/SoftNamedProperty" }, + { "$ref": "sweCommonDefs.json#/$defs/SoftNamedProperty" }, { "oneOf": [ { "$ref": "SimpleProcess.json" }, @@ -35,7 +35,7 @@ { "$ref": "PhysicalComponent.json" }, { "$ref": "PhysicalSystem.json" }, { - "$ref": "commonDefs.json#/definitions/XLink", + "$ref": "commonDefs.json#/$defs/XLink", "properties": { "type": { "const": "Link" @@ -54,10 +54,10 @@ "type": "object", "properties": { "source": { - "$ref": "commonDefs.json#/definitions/PathRef" + "$ref": "commonDefs.json#/$defs/PathRef" }, "destination": { - "$ref": "commonDefs.json#/definitions/PathRef" + "$ref": "commonDefs.json#/$defs/PathRef" } }, "required": ["source", "destination"] diff --git a/sensorml/schemas/json/ContactLink.json b/sensorml/schemas/json/ContactLink.json index 81a782bc..126298d0 100644 --- a/sensorml/schemas/json/ContactLink.json +++ b/sensorml/schemas/json/ContactLink.json @@ -13,7 +13,7 @@ }, "link": { "description": "Link to complete contact information", - "$ref": "commonDefs.json#/definitions/XLink" + "$ref": "commonDefs.json#/$defs/XLink" } }, "unevaluatedProperties": false, diff --git a/sensorml/schemas/json/DeployedSystem.json b/sensorml/schemas/json/DeployedSystem.json index c439254b..9dd9550a 100644 --- a/sensorml/schemas/json/DeployedSystem.json +++ b/sensorml/schemas/json/DeployedSystem.json @@ -9,7 +9,7 @@ }, "system": { "description": "Link to the system being deployed", - "$ref": "commonDefs.json#/definitions/XLink" + "$ref": "commonDefs.json#/$defs/XLink" }, "configuration": { "description": "The configuration of the system used during this deployment (e.g. sampling rate setting, etc.)", diff --git a/sensorml/schemas/json/Deployment.json b/sensorml/schemas/json/Deployment.json index b1dd69d6..a5256021 100644 --- a/sensorml/schemas/json/Deployment.json +++ b/sensorml/schemas/json/Deployment.json @@ -25,7 +25,7 @@ "type": "array", "items": { "allOf": [ - { "$ref": "sweCommonDefs.json#/definitions/SoftNamedProperty" }, + { "$ref": "sweCommonDefs.json#/$defs/SoftNamedProperty" }, { "$ref": "DeployedSystem.json" } ] } diff --git a/sensorml/schemas/json/DerivedProperty.json b/sensorml/schemas/json/DerivedProperty.json index fe260452..30bd51c2 100644 --- a/sensorml/schemas/json/DerivedProperty.json +++ b/sensorml/schemas/json/DerivedProperty.json @@ -3,7 +3,7 @@ "type": "object", "allOf": [ { - "$ref": "sweCommonDefs.json#/definitions/AbstractSWEIdentifiable" + "$ref": "sweCommonDefs.json#/$defs/AbstractSWEIdentifiable" }, { "properties": { @@ -42,7 +42,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "sweCommonDefs.json#/definitions/AnySimpleComponent" + "$ref": "sweCommonDefs.json#/$defs/AnySimpleComponent" } } }, diff --git a/sensorml/schemas/json/DescribedObject.json b/sensorml/schemas/json/DescribedObject.json index ab4ec530..0e88afae 100644 --- a/sensorml/schemas/json/DescribedObject.json +++ b/sensorml/schemas/json/DescribedObject.json @@ -23,18 +23,18 @@ "description": "Additional identifiers for the asset, useful for discovery (e.g. short name, mission id, model number, serial number, etc.).", "type": "array", "items": { - "$ref": "commonDefs.json#/definitions/Term" + "$ref": "commonDefs.json#/$defs/Term" } }, "classifiers": { "description": "Classifiers for the asset, useful for discovery (e.g. process type, sensor type, intended application, etc.).", "type": "array", "items": { - "$ref": "commonDefs.json#/definitions/Term" + "$ref": "commonDefs.json#/$defs/Term" } }, "validTime": { - "$ref": "commonDefs.json#/definitions/TimePeriod" + "$ref": "commonDefs.json#/$defs/TimePeriod" }, "securityConstraints": { "description": "Overall security tagging of process description; Individual tagging of properties can be done using extension properties.", @@ -62,14 +62,14 @@ "description": "Groups of characteristics applicable to this asset under various conditions", "type": "array", "items": { - "$ref": "#/definitions/CharacteristicList" + "$ref": "#/$defs/CharacteristicList" } }, "capabilities": { "description": "Groups of capabilities applicable to this asset under various conditions", "type": "array", "items": { - "$ref": "#/definitions/CapabilityList" + "$ref": "#/$defs/CapabilityList" } }, "contacts": { @@ -103,7 +103,7 @@ "CharacteristicList": { "allOf": [ { - "$ref": "sweCommonDefs.json#/definitions/AbstractSWEIdentifiable" + "$ref": "sweCommonDefs.json#/$defs/AbstractSWEIdentifiable" }, { "type": "object", @@ -117,14 +117,14 @@ "description": "The conditions under which the characteristics apply", "type": "array", "items": { - "$ref": "sweCommonDefs.json#/definitions/AnySimpleComponent" + "$ref": "sweCommonDefs.json#/$defs/AnySimpleComponent" } }, "characteristics": { "description": "The list of characteristics in this group", "type": "array", "items": { - "$ref": "commonDefs.json#/definitions/AnyProperty" + "$ref": "commonDefs.json#/$defs/AnyProperty" } } }, @@ -136,7 +136,7 @@ "CapabilityList": { "allOf": [ { - "$ref": "sweCommonDefs.json#/definitions/AbstractSWEIdentifiable" + "$ref": "sweCommonDefs.json#/$defs/AbstractSWEIdentifiable" }, { "description": "A group of capabilities.", @@ -151,14 +151,14 @@ "description": "The conditions under which the capabilities apply", "type": "array", "items": { - "$ref": "sweCommonDefs.json#/definitions/AnySimpleComponent" + "$ref": "sweCommonDefs.json#/$defs/AnySimpleComponent" } }, "capabilities": { "description": "The list of capabilities in this group", "type": "array", "items": { - "$ref": "commonDefs.json#/definitions/AnyProperty" + "$ref": "commonDefs.json#/$defs/AnyProperty" } } }, diff --git a/sensorml/schemas/json/Document.json b/sensorml/schemas/json/Document.json index 5698c174..e1e0e3f8 100644 --- a/sensorml/schemas/json/Document.json +++ b/sensorml/schemas/json/Document.json @@ -17,7 +17,7 @@ }, "link": { "description": "URI of the document (Favor a URL if the document is directly accessible online)", - "$ref": "commonDefs.json#/definitions/XLink" + "$ref": "commonDefs.json#/$defs/XLink" } }, "unevaluatedProperties": false, diff --git a/sensorml/schemas/json/Event.json b/sensorml/schemas/json/Event.json index c04abf56..cf923d34 100644 --- a/sensorml/schemas/json/Event.json +++ b/sensorml/schemas/json/Event.json @@ -4,7 +4,7 @@ "type": "object", "allOf": [ { - "$ref": "sweCommonDefs.json#/definitions/AbstractSWEIdentifiable" + "$ref": "sweCommonDefs.json#/$defs/AbstractSWEIdentifiable" }, { "properties": { @@ -17,14 +17,14 @@ "description": "Additional identifiers for the event, useful for discovery.", "type": "array", "items": { - "$ref": "commonDefs.json#/definitions/Term" + "$ref": "commonDefs.json#/$defs/Term" } }, "classifiers": { "description": "Additional classifiers for the event, useful for discovery.", "type": "array", "items": { - "$ref": "commonDefs.json#/definitions/Term" + "$ref": "commonDefs.json#/$defs/Term" } }, "contacts": { @@ -43,13 +43,13 @@ }, "time": { "description": "Time of the event", - "$ref": "commonDefs.json#/definitions/TimeInstantOrPeriod" + "$ref": "commonDefs.json#/$defs/TimeInstantOrPeriod" }, "properties": { "description": "A list of additional properties of interest to the event (e.g. calibration values, condition category, error codes, etc).", "type": "array", "items": { - "$ref": "commonDefs.json#/definitions/AnyProperty" + "$ref": "commonDefs.json#/$defs/AnyProperty" } }, "configuration": { diff --git a/sensorml/schemas/json/LegalConstraint.json b/sensorml/schemas/json/LegalConstraint.json index 4a38304c..3862d91f 100644 --- a/sensorml/schemas/json/LegalConstraint.json +++ b/sensorml/schemas/json/LegalConstraint.json @@ -11,13 +11,13 @@ "accessConstraints": { "type": "array", "items": { - "$ref": "#/definitions/CodeListValue" + "$ref": "#/$defs/CodeListValue" } }, "useConstraints": { "type": "array", "items": { - "$ref": "#/definitions/CodeListValue" + "$ref": "#/$defs/CodeListValue" } }, "otherConstraints": { diff --git a/sensorml/schemas/json/PhysicalComponent.json b/sensorml/schemas/json/PhysicalComponent.json index 9b877434..3ce89e86 100644 --- a/sensorml/schemas/json/PhysicalComponent.json +++ b/sensorml/schemas/json/PhysicalComponent.json @@ -11,7 +11,7 @@ "const": "PhysicalComponent" }, "method": { - "$ref": "SimpleProcess.json#/definitions/ProcessMethod" + "$ref": "SimpleProcess.json#/$defs/ProcessMethod" } } } diff --git a/sensorml/schemas/json/PhysicalSystem.json b/sensorml/schemas/json/PhysicalSystem.json index c1d51b37..dfd7d8e6 100644 --- a/sensorml/schemas/json/PhysicalSystem.json +++ b/sensorml/schemas/json/PhysicalSystem.json @@ -12,10 +12,10 @@ }, "components": { "description": "The list of sub-components", - "$ref": "AggregateProcess.json#/definitions/ComponentList" + "$ref": "AggregateProcess.json#/$defs/ComponentList" }, "connections": { - "$ref": "AggregateProcess.json#/definitions/ConnectionList" + "$ref": "AggregateProcess.json#/$defs/ConnectionList" } } } diff --git a/sensorml/schemas/json/Pose.json b/sensorml/schemas/json/Pose.json index dfd1f9e5..aa2c8c74 100644 --- a/sensorml/schemas/json/Pose.json +++ b/sensorml/schemas/json/Pose.json @@ -15,10 +15,10 @@ "format": "uri" }, "position": { - "$ref": "#/definitions/PositionGeo" + "$ref": "#/$defs/PositionGeo" }, "angles": { - "$ref": "#/definitions/AnglesYPR" + "$ref": "#/$defs/AnglesYPR" } }, "required": [ @@ -40,10 +40,10 @@ "format": "uri" }, "position": { - "$ref": "#/definitions/PositionGeo" + "$ref": "#/$defs/PositionGeo" }, "quaternion": { - "$ref": "#/definitions/Quaternion" + "$ref": "#/$defs/Quaternion" } }, "required": [ @@ -65,10 +65,10 @@ "format": "uri" }, "position": { - "$ref": "#/definitions/PositionXYZ" + "$ref": "#/$defs/PositionXYZ" }, "angles": { - "$ref": "#/definitions/AnglesYPR" + "$ref": "#/$defs/AnglesYPR" } }, "required": [ @@ -91,10 +91,10 @@ "format": "uri" }, "position": { - "$ref": "#/definitions/PositionXYZ" + "$ref": "#/$defs/PositionXYZ" }, "quaternion": { - "$ref": "#/definitions/Quaternion" + "$ref": "#/$defs/Quaternion" } }, "required": [ diff --git a/sensorml/schemas/json/ResponsibleParty.json b/sensorml/schemas/json/ResponsibleParty.json index 0287062c..99597fc1 100644 --- a/sensorml/schemas/json/ResponsibleParty.json +++ b/sensorml/schemas/json/ResponsibleParty.json @@ -12,7 +12,7 @@ "type": "string" }, "contactInfo": { - "$ref": "#/definitions/Contact" + "$ref": "#/$defs/Contact" }, "role": { "type": "string", @@ -38,10 +38,10 @@ "type": "object", "properties": { "phone": { - "$ref": "#/definitions/Phone" + "$ref": "#/$defs/Phone" }, "address": { - "$ref": "#/definitions/Address" + "$ref": "#/$defs/Address" }, "website": { "type": "string" diff --git a/sensorml/schemas/json/Settings.json b/sensorml/schemas/json/Settings.json index 53110fa2..d1b09a0c 100644 --- a/sensorml/schemas/json/Settings.json +++ b/sensorml/schemas/json/Settings.json @@ -9,7 +9,7 @@ "type": "object", "properties": { "ref": { - "$ref": "commonDefs.json#/definitions/PathRef" + "$ref": "commonDefs.json#/$defs/PathRef" }, "value": { "oneOf": [ @@ -35,7 +35,7 @@ "type": "object", "properties": { "ref": { - "$ref": "commonDefs.json#/definitions/PathRef" + "$ref": "commonDefs.json#/$defs/PathRef" }, "value": { "type": "array" @@ -52,7 +52,7 @@ "type": "object", "properties": { "ref": { - "$ref": "commonDefs.json#/definitions/PathRef" + "$ref": "commonDefs.json#/$defs/PathRef" }, "value": { "type": "string" @@ -70,12 +70,12 @@ { "properties": { "ref": { - "$ref": "commonDefs.json#/definitions/PathRef" + "$ref": "commonDefs.json#/$defs/PathRef" } } }, { - "$ref": "sweCommonDefs.json#/definitions/AnyConstraint" + "$ref": "sweCommonDefs.json#/$defs/AnyConstraint" } ], "required": ["type", "ref"], @@ -89,7 +89,7 @@ "type": "object", "properties": { "ref": { - "$ref": "commonDefs.json#/definitions/PathRef" + "$ref": "commonDefs.json#/$defs/PathRef" }, "value": { "type": "string", diff --git a/sensorml/schemas/json/SimpleProcess.json b/sensorml/schemas/json/SimpleProcess.json index c51432fb..a4beb2b7 100644 --- a/sensorml/schemas/json/SimpleProcess.json +++ b/sensorml/schemas/json/SimpleProcess.json @@ -11,7 +11,7 @@ "const": "SimpleProcess" }, "method": { - "$ref": "#/definitions/ProcessMethod" + "$ref": "#/$defs/ProcessMethod" } } } diff --git a/sensorml/schemas/json/commonDefs.json b/sensorml/schemas/json/commonDefs.json index 94ce43a0..a9f000e9 100644 --- a/sensorml/schemas/json/commonDefs.json +++ b/sensorml/schemas/json/commonDefs.json @@ -21,7 +21,7 @@ "type": "object", "allOf": [ { - "$ref": "sweCommonDefs.json#/definitions/AbstractSWEIdentifiable" + "$ref": "sweCommonDefs.json#/$defs/AbstractSWEIdentifiable" }, { "properties": { @@ -72,10 +72,10 @@ }, "AnyProperty": { "oneOf": [ - { "$ref": "sweCommonDefs.json#/definitions/AnySimpleComponent" }, - { "$ref": "sweCommonDefs.json#/definitions/Vector" }, - { "$ref": "sweCommonDefs.json#/definitions/DataArray" }, - { "$ref": "sweCommonDefs.json#/definitions/Matrix" } + { "$ref": "sweCommonDefs.json#/$defs/AnySimpleComponent" }, + { "$ref": "sweCommonDefs.json#/$defs/Vector" }, + { "$ref": "sweCommonDefs.json#/$defs/DataArray" }, + { "$ref": "sweCommonDefs.json#/$defs/Matrix" } ] }, "PathRef": { diff --git a/sensorml/schemas/json/sweCommonDefs.json b/sensorml/schemas/json/sweCommonDefs.json index 74b13f03..d67f2821 100644 --- a/sensorml/schemas/json/sweCommonDefs.json +++ b/sensorml/schemas/json/sweCommonDefs.json @@ -2,7 +2,7 @@ "$schema": "https://json-schema.org/draft/2020-12/schema", "$defs": { "AbstractSWE": { - "$ref": "../../../swecommon/schemas/json/basicTypes.json#/definitions/AbstractSWE" + "$ref": "../../../swecommon/schemas/json/basicTypes.json#/$defs/AbstractSWE" }, "AbstractSWEIdentifiable": { "$ref": "../../../swecommon/schemas/json/AbstractSweIdentifiable.json" @@ -26,19 +26,19 @@ "$ref": "../../../swecommon/schemas/json/Category.json" }, "AnySimpleComponent": { - "$ref": "../../../swecommon/schemas/json/sweCommon.json#/definitions/AnySimpleComponent" + "$ref": "../../../swecommon/schemas/json/sweCommon.json#/$defs/AnySimpleComponent" }, "AnyComponent": { - "$ref": "../../../swecommon/schemas/json/sweCommon.json#/definitions/AnyComponent" + "$ref": "../../../swecommon/schemas/json/sweCommon.json#/$defs/AnyComponent" }, "SoftNamedProperty": { - "$ref": "../../../swecommon/schemas/json/basicTypes.json#/definitions/SoftNamedProperty" + "$ref": "../../../swecommon/schemas/json/basicTypes.json#/$defs/SoftNamedProperty" }, "AnyConstraint": { "oneOf": [ - { "$ref": "../../../swecommon/schemas/json/basicTypes.json#/definitions/AllowedTokens" }, - { "$ref": "../../../swecommon/schemas/json/basicTypes.json#/definitions/AllowedValues" }, - { "$ref": "../../../swecommon/schemas/json/basicTypes.json#/definitions/AllowedTimes" } + { "$ref": "../../../swecommon/schemas/json/basicTypes.json#/$defs/AllowedTokens" }, + { "$ref": "../../../swecommon/schemas/json/basicTypes.json#/$defs/AllowedValues" }, + { "$ref": "../../../swecommon/schemas/json/basicTypes.json#/$defs/AllowedTimes" } ] } } diff --git a/swecommon/schemas/json/AbstractSimpleComponent.json b/swecommon/schemas/json/AbstractSimpleComponent.json index b0621398..f23c62fd 100644 --- a/swecommon/schemas/json/AbstractSimpleComponent.json +++ b/swecommon/schemas/json/AbstractSimpleComponent.json @@ -17,33 +17,6 @@ "type": "string", "minLength": 1 }, - "quality": { - "description": "Provides an indication of the reliability of the component value in the form of a decimal number (e.g. relative accuracy), a range (e.g. bidirectional tolerance), a categorical value (e.g. good, bad) or plain textual statement", - "type": "array", - "items": { - "allOf": [ - { - "$ref": "basicTypes.json#/definitions/AssociationAttributeGroup" - }, - { - "oneOf": [ - { - "$ref": "Quantity.json" - }, - { - "$ref": "QuantityRange.json" - }, - { - "$ref": "Category.json" - }, - { - "$ref": "Text.json" - } - ] - } - ] - } - }, "nilValues": { "description": "Defines reserved values with special meaning (e.g. missing, out-of-range, etc.)" }, diff --git a/swecommon/schemas/json/AbstractSweIdentifiable.json b/swecommon/schemas/json/AbstractSweIdentifiable.json index da409dfd..33c9e80f 100644 --- a/swecommon/schemas/json/AbstractSweIdentifiable.json +++ b/swecommon/schemas/json/AbstractSweIdentifiable.json @@ -4,7 +4,7 @@ "type": "object", "allOf": [ { - "$ref": "basicTypes.json#/definitions/AbstractSWE" + "$ref": "basicTypes.json#/$defs/AbstractSWE" }, { "properties": { diff --git a/swecommon/schemas/json/Category.json b/swecommon/schemas/json/Category.json index a2bfafac..1f63c7d3 100644 --- a/swecommon/schemas/json/Category.json +++ b/swecommon/schemas/json/Category.json @@ -17,10 +17,10 @@ "format": "uri" }, "constraint": { - "$ref": "basicTypes.json#/definitions/AllowedTokens" + "$ref": "basicTypes.json#/$defs/AllowedTokens" }, "nilValues": { - "$ref": "basicTypes.json#/definitions/NilValuesText" + "$ref": "basicTypes.json#/$defs/NilValuesText" }, "value": { "type": "string" diff --git a/swecommon/schemas/json/CategoryRange.json b/swecommon/schemas/json/CategoryRange.json index b59daf3a..fa1294ef 100644 --- a/swecommon/schemas/json/CategoryRange.json +++ b/swecommon/schemas/json/CategoryRange.json @@ -17,10 +17,10 @@ "format": "uri" }, "constraint": { - "$ref": "basicTypes.json#/definitions/AllowedTokens" + "$ref": "basicTypes.json#/$defs/AllowedTokens" }, "nilValues": { - "$ref": "basicTypes.json#/definitions/NilValuesText" + "$ref": "basicTypes.json#/$defs/NilValuesText" }, "value": { "type": "array", diff --git a/swecommon/schemas/json/Count.json b/swecommon/schemas/json/Count.json index 4e4c611a..df3c3d66 100644 --- a/swecommon/schemas/json/Count.json +++ b/swecommon/schemas/json/Count.json @@ -12,10 +12,10 @@ "const": "Count" }, "constraint": { - "$ref": "basicTypes.json#/definitions/AllowedValues" + "$ref": "basicTypes.json#/$defs/AllowedValues" }, "nilValues": { - "$ref": "basicTypes.json#/definitions/NilValuesInteger" + "$ref": "basicTypes.json#/$defs/NilValuesInteger" }, "value": { "type": "integer" diff --git a/swecommon/schemas/json/CountRange.json b/swecommon/schemas/json/CountRange.json index ff1e2e43..68dea3f1 100644 --- a/swecommon/schemas/json/CountRange.json +++ b/swecommon/schemas/json/CountRange.json @@ -12,10 +12,10 @@ "const": "CountRange" }, "constraint": { - "$ref": "basicTypes.json#/definitions/AllowedValues" + "$ref": "basicTypes.json#/$defs/AllowedValues" }, "nilValues": { - "$ref": "basicTypes.json#/definitions/NilValuesText" + "$ref": "basicTypes.json#/$defs/NilValuesText" }, "value": { "type": "array", diff --git a/swecommon/schemas/json/DataArray.json b/swecommon/schemas/json/DataArray.json index 8cc8b389..e1177e12 100644 --- a/swecommon/schemas/json/DataArray.json +++ b/swecommon/schemas/json/DataArray.json @@ -3,7 +3,7 @@ "description": "Implementation of ISO-11404 Array datatype. This defines an array of identical data components with a elementCount. Values are given as a block and can be encoded in different ways", "allOf": [ { - "$ref": "#/definitions/AbstractArray" + "$ref": "#/$defs/AbstractArray" }, { "properties": { @@ -29,18 +29,18 @@ "elementCount": { "description": "Specifies the size of the array (i.e. the number of elements of the defined type it contains)", "oneOf": [ - { "$ref": "basicTypes.json#/definitions/AssociationAttributeGroup" }, - { "$ref": "basicTypes.json#/definitions/ElementCount" } + { "$ref": "basicTypes.json#/$defs/AssociationAttributeGroup" }, + { "$ref": "basicTypes.json#/$defs/ElementCount" } ] }, "elementType": { "description": "Defines the structure of the element that will be repeated in the array", "allOf": [ - { "$ref": "basicTypes.json#/definitions/SoftNamedProperty" }, + { "$ref": "basicTypes.json#/$defs/SoftNamedProperty" }, { "oneOf": [ - { "$ref": "basicTypes.json#/definitions/AssociationAttributeGroup" }, - { "$ref": "sweCommon.json#/definitions/AnyComponent" } + { "$ref": "basicTypes.json#/$defs/AssociationAttributeGroup" }, + { "$ref": "sweCommon.json#/$defs/AnyComponent" } ] } ] @@ -48,15 +48,15 @@ "encoding": { "description": "Specifies the type of method used to encode the array values", "oneOf": [ - { "$ref": "encodings.json#/definitions/BinaryEncoding" }, - { "$ref": "encodings.json#/definitions/TextEncoding" }, - { "$ref": "encodings.json#/definitions/XMLEncoding" }, - { "$ref": "encodings.json#/definitions/JSONEncoding" } + { "$ref": "encodings.json#/$defs/BinaryEncoding" }, + { "$ref": "encodings.json#/$defs/TextEncoding" }, + { "$ref": "encodings.json#/$defs/XMLEncoding" }, + { "$ref": "encodings.json#/$defs/JSONEncoding" } ] }, "values": { "description": "If present, contains an encoded block of the values contained in the array. Values are optional so that the array definition can be used a as a schema for values provided separately", - "$ref": "basicTypes.json#/definitions/EncodedValues" + "$ref": "basicTypes.json#/$defs/EncodedValues" } } } diff --git a/swecommon/schemas/json/DataChoice.json b/swecommon/schemas/json/DataChoice.json index b53fd692..2ef59ee0 100644 --- a/swecommon/schemas/json/DataChoice.json +++ b/swecommon/schemas/json/DataChoice.json @@ -20,11 +20,11 @@ "type": "array", "items": { "allOf": [ - { "$ref": "basicTypes.json#/definitions/SoftNamedProperty" }, + { "$ref": "basicTypes.json#/$defs/SoftNamedProperty" }, { "oneOf": [ - { "$ref": "basicTypes.json#/definitions/AssociationAttributeGroup" }, - { "$ref": "sweCommon.json#/definitions/AnyComponent" } + { "$ref": "basicTypes.json#/$defs/AssociationAttributeGroup" }, + { "$ref": "sweCommon.json#/$defs/AnyComponent" } ] } ] diff --git a/swecommon/schemas/json/DataRecord.json b/swecommon/schemas/json/DataRecord.json index 3532dd79..b92d0b49 100644 --- a/swecommon/schemas/json/DataRecord.json +++ b/swecommon/schemas/json/DataRecord.json @@ -17,11 +17,11 @@ "minItems": 1, "items": { "allOf": [ - { "$ref": "basicTypes.json#/definitions/SoftNamedProperty" }, + { "$ref": "basicTypes.json#/$defs/SoftNamedProperty" }, { "oneOf": [ - { "$ref": "basicTypes.json#/definitions/AssociationAttributeGroup" }, - { "$ref": "sweCommon.json#/definitions/AnyComponent" } + { "$ref": "basicTypes.json#/$defs/AssociationAttributeGroup" }, + { "$ref": "sweCommon.json#/$defs/AnyComponent" } ] } ] diff --git a/swecommon/schemas/json/DataStream.json b/swecommon/schemas/json/DataStream.json index 923ccc95..e1407e2f 100644 --- a/swecommon/schemas/json/DataStream.json +++ b/swecommon/schemas/json/DataStream.json @@ -14,11 +14,11 @@ "elementType": { "description": "Definition and structure of one stream element", "allOf": [ - { "$ref": "basicTypes.json#/definitions/SoftNamedProperty" }, + { "$ref": "basicTypes.json#/$defs/SoftNamedProperty" }, { "oneOf": [ - { "$ref": "basicTypes.json#/definitions/AssociationAttributeGroup" }, - { "$ref": "sweCommon.json#/definitions/AnyComponent" } + { "$ref": "basicTypes.json#/$defs/AssociationAttributeGroup" }, + { "$ref": "sweCommon.json#/$defs/AnyComponent" } ] } ] @@ -27,22 +27,22 @@ "description": "Method used to encode the stream values", "oneOf": [ { - "$ref": "encodings.json#/definitions/BinaryEncoding" + "$ref": "encodings.json#/$defs/BinaryEncoding" }, { - "$ref": "encodings.json#/definitions/TextEncoding" + "$ref": "encodings.json#/$defs/TextEncoding" }, { - "$ref": "encodings.json#/definitions/XMLEncoding" + "$ref": "encodings.json#/$defs/XMLEncoding" }, { - "$ref": "encodings.json#/definitions/JSONEncoding" + "$ref": "encodings.json#/$defs/JSONEncoding" } ] }, "values": { "description": "Encoded values for the stream (can be out of band)", - "$ref": "basicTypes.json#/definitions/AssociationAttributeGroup" + "$ref": "basicTypes.json#/$defs/AssociationAttributeGroup" } }, "required": [ diff --git a/swecommon/schemas/json/Geometry.json b/swecommon/schemas/json/Geometry.json index 90b8bea8..41e9cc55 100644 --- a/swecommon/schemas/json/Geometry.json +++ b/swecommon/schemas/json/Geometry.json @@ -34,7 +34,7 @@ "additionalProperties": false }, "nilValues": { - "$ref": "basicTypes.json#/definitions/NilValuesText" + "$ref": "basicTypes.json#/$defs/NilValuesText" }, "srs": { "description": "Coordinate reference system with respect to which the coordinates of this geometry are expressed", diff --git a/swecommon/schemas/json/Matrix.json b/swecommon/schemas/json/Matrix.json index e851543e..7e7d89b1 100644 --- a/swecommon/schemas/json/Matrix.json +++ b/swecommon/schemas/json/Matrix.json @@ -4,7 +4,7 @@ "type": "object", "allOf": [ { - "$ref": "./DataArray.json#/definitions/AbstractArray" + "$ref": "./DataArray.json#/$defs/AbstractArray" }, { "properties": { diff --git a/swecommon/schemas/json/Quantity.json b/swecommon/schemas/json/Quantity.json index 491abbe4..df300c4d 100644 --- a/swecommon/schemas/json/Quantity.json +++ b/swecommon/schemas/json/Quantity.json @@ -13,16 +13,16 @@ }, "uom": { "description": "Unit of measure used to express the value of this data component", - "$ref": "basicTypes.json#/definitions/UnitReference" + "$ref": "basicTypes.json#/$defs/UnitReference" }, "constraint": { - "$ref": "basicTypes.json#/definitions/AllowedValues" + "$ref": "basicTypes.json#/$defs/AllowedValues" }, "nilValues": { - "$ref": "basicTypes.json#/definitions/NilValuesNumber" + "$ref": "basicTypes.json#/$defs/NilValuesNumber" }, "value": { - "$ref": "basicTypes.json#/definitions/NumberOrSpecial" + "$ref": "basicTypes.json#/$defs/NumberOrSpecial" } }, "required": [ diff --git a/swecommon/schemas/json/QuantityRange.json b/swecommon/schemas/json/QuantityRange.json index 5c3b32f1..6ea38d55 100644 --- a/swecommon/schemas/json/QuantityRange.json +++ b/swecommon/schemas/json/QuantityRange.json @@ -13,20 +13,20 @@ }, "uom": { "description": "Unit of measure used to express the value of this data component", - "$ref": "basicTypes.json#/definitions/UnitReference" + "$ref": "basicTypes.json#/$defs/UnitReference" }, "constraint": { - "$ref": "basicTypes.json#/definitions/AllowedValues" + "$ref": "basicTypes.json#/$defs/AllowedValues" }, "nilValues": { - "$ref": "basicTypes.json#/definitions/NilValuesNumber" + "$ref": "basicTypes.json#/$defs/NilValuesNumber" }, "value": { "type": "array", "minItems": 2, "maxItems": 2, "items": { - "$ref": "basicTypes.json#/definitions/NumberOrSpecial" + "$ref": "basicTypes.json#/$defs/NumberOrSpecial" } } }, diff --git a/swecommon/schemas/json/Text.json b/swecommon/schemas/json/Text.json index c8f8de55..2a6aec20 100644 --- a/swecommon/schemas/json/Text.json +++ b/swecommon/schemas/json/Text.json @@ -12,10 +12,10 @@ "const": "Text" }, "constraint": { - "$ref": "basicTypes.json#/definitions/AllowedTokens" + "$ref": "basicTypes.json#/$defs/AllowedTokens" }, "nilValues": { - "$ref": "basicTypes.json#/definitions/NilValuesText" + "$ref": "basicTypes.json#/$defs/NilValuesText" }, "value": { "type": "string" diff --git a/swecommon/schemas/json/Time.json b/swecommon/schemas/json/Time.json index b0ffab41..a1d70f8e 100644 --- a/swecommon/schemas/json/Time.json +++ b/swecommon/schemas/json/Time.json @@ -23,16 +23,16 @@ }, "uom": { "description": "Temporal unit of measure used to express the value of this data component", - "$ref": "basicTypes.json#/definitions/UnitReference" + "$ref": "basicTypes.json#/$defs/UnitReference" }, "constraint": { - "$ref": "basicTypes.json#/definitions/AllowedTimes" + "$ref": "basicTypes.json#/$defs/AllowedTimes" }, "nilValues": { - "$ref": "basicTypes.json#/definitions/NilValuesTime" + "$ref": "basicTypes.json#/$defs/NilValuesTime" }, "value": { - "$ref": "basicTypes.json#/definitions/DateTimeNumberOrSpecial" + "$ref": "basicTypes.json#/$defs/DateTimeNumberOrSpecial" } }, "required": [ diff --git a/swecommon/schemas/json/TimeRange.json b/swecommon/schemas/json/TimeRange.json index eaed9b50..927db8a4 100644 --- a/swecommon/schemas/json/TimeRange.json +++ b/swecommon/schemas/json/TimeRange.json @@ -23,20 +23,20 @@ }, "uom": { "description": "Temporal unit of measure used to express the value of this data component", - "$ref": "basicTypes.json#/definitions/UnitReference" + "$ref": "basicTypes.json#/$defs/UnitReference" }, "constraint": { - "$ref": "basicTypes.json#/definitions/AllowedTimes" + "$ref": "basicTypes.json#/$defs/AllowedTimes" }, "nilValues": { - "$ref": "basicTypes.json#/definitions/NilValuesTime" + "$ref": "basicTypes.json#/$defs/NilValuesTime" }, "value": { "type": "array", "minItems": 2, "maxItems": 2, "items": { - "$ref": "basicTypes.json#/definitions/DateTimeNumberOrSpecial" + "$ref": "basicTypes.json#/$defs/DateTimeNumberOrSpecial" } } }, diff --git a/swecommon/schemas/json/Vector.json b/swecommon/schemas/json/Vector.json index 1689e8e3..808d3bea 100644 --- a/swecommon/schemas/json/Vector.json +++ b/swecommon/schemas/json/Vector.json @@ -26,7 +26,7 @@ "type": "array", "items": { "allOf": [ - { "$ref": "basicTypes.json#/definitions/SoftNamedProperty" }, + { "$ref": "basicTypes.json#/$defs/SoftNamedProperty" }, { "oneOf": [ { "$ref": "Count.json" }, diff --git a/swecommon/schemas/json/basicTypes.json b/swecommon/schemas/json/basicTypes.json index 1fa883f0..bc7a0c0e 100644 --- a/swecommon/schemas/json/basicTypes.json +++ b/swecommon/schemas/json/basicTypes.json @@ -95,7 +95,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/definitions/NumberOrSpecial" + "$ref": "#/$defs/NumberOrSpecial" } }, "intervals": { @@ -106,7 +106,7 @@ "minItems": 2, "maxItems": 2, "items": { - "$ref": "#/definitions/NumberOrSpecial" + "$ref": "#/$defs/NumberOrSpecial" } } }, @@ -138,7 +138,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/definitions/DateTimeNumberOrSpecial" + "$ref": "#/$defs/DateTimeNumberOrSpecial" } }, "intervals": { @@ -148,7 +148,7 @@ "minItems": 2, "maxItems": 2, "items": { - "$ref": "#/definitions/DateTimeNumberOrSpecial" + "$ref": "#/$defs/DateTimeNumberOrSpecial" } } }, @@ -228,7 +228,7 @@ }, "value": { "description": "The reserved value itself", - "$ref": "#/definitions/NumberOrSpecial" + "$ref": "#/$defs/NumberOrSpecial" } }, "required": [ @@ -251,7 +251,7 @@ }, "value": { "description": "The reserved value itself", - "$ref": "#/definitions/DateTimeNumberOrSpecial" + "$ref": "#/$defs/DateTimeNumberOrSpecial" } }, "required": [ @@ -265,7 +265,7 @@ "type": "object", "properties": { "name": { - "$ref": "#/definitions/NameToken" + "$ref": "#/$defs/NameToken" } }, "required": [ "name" ] @@ -318,7 +318,7 @@ "format": "date-time" }, { - "$ref": "#/definitions/NumberOrSpecial" + "$ref": "#/$defs/NumberOrSpecial" } ] }, @@ -331,7 +331,7 @@ { "properties": { "constraint": { - "$ref": "basicTypes.json#/definitions/AllowedValues" + "$ref": "basicTypes.json#/$defs/AllowedValues" }, "value": { "description": "Value is optional, to enable structure to act as a schema for values provided using other encodings", @@ -347,7 +347,7 @@ "type": "array" }, { - "$ref": "#/definitions/AssociationAttributeGroup" + "$ref": "#/$defs/AssociationAttributeGroup" } ] } diff --git a/swecommon/schemas/json/encodings.json b/swecommon/schemas/json/encodings.json index 49ec4f36..7e640ccf 100644 --- a/swecommon/schemas/json/encodings.json +++ b/swecommon/schemas/json/encodings.json @@ -5,7 +5,7 @@ "type": "object", "allOf": [ { - "$ref": "basicTypes.json#/definitions/AbstractSWE" + "$ref": "basicTypes.json#/$defs/AbstractSWE" }, { "properties": {} @@ -17,7 +17,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/AbstractEncoding" + "$ref": "#/$defs/AbstractEncoding" }, { "properties": { @@ -57,7 +57,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/AbstractEncoding" + "$ref": "#/$defs/AbstractEncoding" }, { "properties": { @@ -76,7 +76,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/AbstractEncoding" + "$ref": "#/$defs/AbstractEncoding" }, { "properties": { @@ -99,7 +99,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/AbstractEncoding" + "$ref": "#/$defs/AbstractEncoding" }, { "properties": { @@ -133,10 +133,10 @@ "items": { "oneOf": [ { - "$ref": "#/definitions/Component" + "$ref": "#/$defs/Component" }, { - "$ref": "#/definitions/Block" + "$ref": "#/$defs/Block" } ] } @@ -156,7 +156,7 @@ "type": "object", "allOf": [ { - "$ref": "basicTypes.json#/definitions/AbstractSWE" + "$ref": "basicTypes.json#/$defs/AbstractSWE" }, { "properties": { @@ -202,7 +202,7 @@ "type": "object", "allOf": [ { - "$ref": "basicTypes.json#/definitions/AbstractSWE" + "$ref": "basicTypes.json#/$defs/AbstractSWE" }, { "properties": { @@ -245,8 +245,8 @@ } }, "oneOf": [ - { "$ref": "#/definitions/TextEncoding" }, - { "$ref": "#/definitions/XMLEncoding" }, - { "$ref": "#/definitions/JSONEncoding" } + { "$ref": "#/$defs/TextEncoding" }, + { "$ref": "#/$defs/XMLEncoding" }, + { "$ref": "#/$defs/JSONEncoding" } ] } \ No newline at end of file diff --git a/swecommon/schemas/json/sweCommon.json b/swecommon/schemas/json/sweCommon.json index 7083d273..cef0dde6 100644 --- a/swecommon/schemas/json/sweCommon.json +++ b/swecommon/schemas/json/sweCommon.json @@ -4,7 +4,7 @@ "AnyComponent": { "oneOf": [ { - "$ref": "#/definitions/AnySimpleComponent" + "$ref": "#/$defs/AnySimpleComponent" }, { "$ref": "./DataRecord.json" @@ -29,7 +29,7 @@ "AnySimpleComponent": { "oneOf": [ { - "$ref": "#/definitions/AnyScalarComponent" + "$ref": "#/$defs/AnyScalarComponent" }, { "$ref": "./CountRange.json" @@ -69,7 +69,7 @@ } }, "oneOf": [ - { "$ref": "#/definitions/AnyComponent" }, + { "$ref": "#/$defs/AnyComponent" }, { "$ref": "./DataStream.json" } ] } \ No newline at end of file diff --git a/swecommon/standard/sections/clause_9.6_json_simple_encodings.adoc b/swecommon/standard/sections/clause_9.6_json_simple_encodings.adoc index 3daf7c9a..e3fd6990 100644 --- a/swecommon/standard/sections/clause_9.6_json_simple_encodings.adoc +++ b/swecommon/standard/sections/clause_9.6_json_simple_encodings.adoc @@ -15,7 +15,7 @@ When datastream or data array values are provided out-of-band (i.e. not inline i include::../requirements/json/simple_encodings/requirement2.adoc[] -The “JSONEncoding” object is the JSON schema implementation of the “JSONEncoding” UML class defined in <>. The schema for this class is provided in {jsonschema-base-url}/encodings.json[encodings.json#/definitions/JSONEncoding]. +The “JSONEncoding” object is the JSON schema implementation of the “JSONEncoding” UML class defined in <>. The schema for this class is provided in {jsonschema-base-url}/encodings.json[encodings.json#/$defs/JSONEncoding]. [source%unnumbered,json] ---- @@ -30,7 +30,7 @@ The JSON encoding method is the default method when the data component tree is i include::../requirements/json/simple_encodings/requirement3.adoc[] -The “TextEncoding” object is the JSON schema implementation of the “TextEncoding” UML class defined in <>. The schema for this class is provided in {jsonschema-base-url}/encodings.json[encodings.json#/definitions/TextEncoding]. +The “TextEncoding” object is the JSON schema implementation of the “TextEncoding” UML class defined in <>. The schema for this class is provided in {jsonschema-base-url}/encodings.json[encodings.json#/$defs/TextEncoding]. [source%unnumbered,json] ---- diff --git a/swecommon/standard/sections/clause_9.7_json_advanced_encodings.adoc b/swecommon/standard/sections/clause_9.7_json_advanced_encodings.adoc index e11b5015..f28291cf 100644 --- a/swecommon/standard/sections/clause_9.7_json_advanced_encodings.adoc +++ b/swecommon/standard/sections/clause_9.7_json_advanced_encodings.adoc @@ -12,7 +12,7 @@ This requirement class defines an additional encoding method that can be used to include::../requirements/json/advanced_encodings/requirement2.adoc[] -The “BinaryEncoding” object is the JSON schema implementation of the “BinaryEncoding” UML class defined in <>. The schema for this class is provided in {jsonschema-base-url}/encodings.json[encodings.json#/definitions/BinaryEncoding]. +The “BinaryEncoding” object is the JSON schema implementation of the “BinaryEncoding” UML class defined in <>. The schema for this class is provided in {jsonschema-base-url}/encodings.json[encodings.json#/$defs/BinaryEncoding]. An example instance is provided below: