Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fix/issue #87 #124

Merged
merged 3 commits into from
Feb 26, 2025
Merged

Fix/issue #87 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00ef9e0
refactor to json schema 2020-12
SpeckiJ Jan 16, 2025
ea81e15
refactor to json schema 2020-12
SpeckiJ Feb 5, 2025
d528c70
Merge branch 'master' into fix/issue-87
SpeckiJ Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/common/batch_delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/common/batch_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions api/part1/openapi/schemas/common/commonDefs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions api/part1/openapi/schemas/common/links.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Link Collection",
"type": "array",
"minItems": 1,
"items": {
"$ref": "commonDefs.json#/definitions/Link"
"$ref": "commonDefs.json#/$defs/Link"
}
}
4 changes: 2 additions & 2 deletions api/part1/openapi/schemas/common/uris.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
6 changes: 3 additions & 3 deletions api/part1/openapi/schemas/geojson/deployedSystem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
{
Expand All @@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/deployedSystemArray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/deployedSystemCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
{
Expand Down
12 changes: 6 additions & 6 deletions api/part1/openapi/schemas/geojson/deployment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
{
Expand All @@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/deploymentArray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/deploymentCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
{
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
{
Expand Down
4 changes: 2 additions & 2 deletions api/part1/openapi/schemas/geojson/procedure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
{
Expand All @@ -10,7 +10,7 @@
"properties": {
"properties": {
"featureType": {
"$ref": "../common/uris.json#/definitions/ProcedureTypeUris"
"$ref": "../common/uris.json#/$defs/ProcedureTypeUris"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/procedureArray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/procedureCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
{
Expand Down
6 changes: 3 additions & 3 deletions api/part1/openapi/schemas/geojson/samplingFeature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
Expand All @@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/samplingFeatureArray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/samplingFeatureCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
{
Expand Down
8 changes: 4 additions & 4 deletions api/part1/openapi/schemas/geojson/system.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"allOf": [
{ "$ref": "feature.json" },
{
"properties": {
"properties": {
"properties": {
"featureType": {
"$ref": "../common/uris.json#/definitions/SystemTypeUris"
"$ref": "../common/uris.json#/$defs/SystemTypeUris"
},
"assetType": {
"description": "Type of asset represented by this system.",
Expand All @@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/systemArray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/geojson/systemCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
{
Expand Down
4 changes: 2 additions & 2 deletions api/part1/openapi/schemas/sensorml/deployedSystem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"allOf": [
{ "$ref": "sensormlDefs.json#/definitions/DeployedSystem" },
{ "$ref": "sensormlDefs.json#/$defs/DeployedSystem" },
{
"properties": {
"id": {
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/sensorml/deployedSystemArray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/sensorml/deployedSystemCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions api/part1/openapi/schemas/sensorml/deployment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/sensorml/deploymentArray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/sensorml/deploymentCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
12 changes: 6 additions & 6 deletions api/part1/openapi/schemas/sensorml/procedure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"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": {}
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/sensorml/procedureArray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/sensorml/procedureCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions api/part1/openapi/schemas/sensorml/property.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"allOf": [
{
"$ref": "sensormlDefs.json#/definitions/DerivedProperty"
"$ref": "sensormlDefs.json#/$defs/DerivedProperty"
},
{
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/sensorml/propertyArray.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/part1/openapi/schemas/sensorml/propertyCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions api/part1/openapi/schemas/sensorml/sensormlDefs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
},
Expand Down
12 changes: 6 additions & 6 deletions api/part1/openapi/schemas/sensorml/system.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"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",
Expand Down
Loading