From 62a2561e40a9dd4782c5bf7cd861b2fd0468d7ea Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 5 Oct 2015 16:25:16 +0100 Subject: [PATCH 01/46] Created the ocean-acidification schema directory Initial commit of the Ocean Acidification fork of om-json. Intention is to push this back to the master with a pull request when ready. --- Observation.json | 5 ++++- ocean-acidification/Protocol.json | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 ocean-acidification/Protocol.json diff --git a/Observation.json b/Observation.json index ae9403b..0eaed83 100644 --- a/Observation.json +++ b/Observation.json @@ -35,7 +35,10 @@ "procedure": { "title": "procedure", "description": "procedure used in making observation. Typically a sensor or sensor-system, algorithm, computational procedure.", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "oneOf": [ + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json" }, + ] }, "featureOfInterest": { "title": "featureOfInterest", diff --git a/ocean-acidification/Protocol.json b/ocean-acidification/Protocol.json new file mode 100644 index 0000000..c633120 --- /dev/null +++ b/ocean-acidification/Protocol.json @@ -0,0 +1,21 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json", + "title": "Protocol" + "description": "Specialised version of the Observations and Measurements procedure, for particular use in Ocean Acidification projects", + "type": "object", + "properties": { + "id": { + "title": "id", + "description": "A unique identifier for the protocol", + "type": "string" + }, + "instrument": { + "title": "instrument", + "description": "Instrument used within the analysis - URL links to a common vocabulary of make and model", + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + } + }, + "required": [ "id"], + "additionalProperties": false +} \ No newline at end of file From 08629e1a5f1b3f9e45f860fde97c30ff86e7a96f Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 5 Oct 2015 16:58:06 +0100 Subject: [PATCH 02/46] Add the Reference object --- Common.json | 13 +++++++++++-- ocean-acidification/Protocol.json | 15 ++++++++++----- ocean-acidification/Reference.json | 29 +++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 ocean-acidification/Reference.json diff --git a/Common.json b/Common.json index fb55398..4a93635 100644 --- a/Common.json +++ b/Common.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json", "title": "Common", "description": "A collection of commonly used types. Should maybe come from somehwere else, one day.", "definitions": { @@ -48,6 +48,15 @@ }, "required": [ "href" ], "additionalProperties":false - } + }, + "doi": { + "title": "link", + "type": "object", + "properties": { + "doi": { "type": "string", "format": "uri" } + }, + "required": [ "href" ], + "additionalProperties":false + } } } diff --git a/ocean-acidification/Protocol.json b/ocean-acidification/Protocol.json index c633120..da05445 100644 --- a/ocean-acidification/Protocol.json +++ b/ocean-acidification/Protocol.json @@ -2,20 +2,25 @@ "$schema": "http://json-schema.org/draft-04/schema#", "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json", "title": "Protocol" - "description": "Specialised version of the Observations and Measurements procedure, for particular use in Ocean Acidification projects", + "description": "A specialisation of O&M's process, initially defined for the analytical chemistry domain of the UNESCO-IOC Ocean Acidificiation project", "type": "object", "properties": { "id": { "title": "id", - "description": "A unique identifier for the protocol", + "description": "A unique identifier for this protocol", "type": "string" }, "instrument": { "title": "instrument", - "description": "Instrument used within the analysis - URL links to a common vocabulary of make and model", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "description": "A URL linking to a controlled vocabulary term defining the instrument make and model used in this instance of the protocol", + "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + }, + "laboratory": { + "title": "laboratory", + "description": "A URL to a controlled vocabulary term defining the laboratory responsible for the observation made using this instance of the protocol", + "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } }, - "required": [ "id"], + "required": [ "id", "laboratory"], "additionalProperties": false } \ No newline at end of file diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json new file mode 100644 index 0000000..bdc9f7a --- /dev/null +++ b/ocean-acidification/Reference.json @@ -0,0 +1,29 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Reference.json", + "title": "Reference" + "description": "Describes the recommended citation text for a reference, and provides a link to the journal paper or methodology description", + "type": "object", + "properties": { + "id": { + "title": "id", + "description": "A unique identifier for this reference", + "type": "string" + }, + "doiOrWebAddress": { + "title": "doiOrWebAddress", + "description": "Either a formal Digital Object Identifier, or a link to any other web resource, describing the protocol", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" } + ] + }, + "citation": { + "title": "citation", + "description": "A plain text representation of the recommended citation text to be used in referencing the protocol description", + "type": "string" + } + }, + "required": [ "id", "doiOrWebAddress", "citation"], + "additionalProperties": false +} \ No newline at end of file From 71ea97e9ba204324c242f834473be78dc6837854 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Tue, 6 Oct 2015 12:56:07 +0100 Subject: [PATCH 03/46] First draft of the Ocean Acidification schema completed --- ocean-acidification/Methodology.json | 32 ++++++++++++++ ocean-acidification/PreparationStep.json | 56 ++++++++++++++++++++++++ ocean-acidification/Protocol.json | 18 +++++++- ocean-acidification/Quality.json | 48 ++++++++++++++++++++ ocean-acidification/Reference.json | 2 +- 5 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 ocean-acidification/Methodology.json create mode 100644 ocean-acidification/PreparationStep.json create mode 100644 ocean-acidification/Quality.json diff --git a/ocean-acidification/Methodology.json b/ocean-acidification/Methodology.json new file mode 100644 index 0000000..fac1fb0 --- /dev/null +++ b/ocean-acidification/Methodology.json @@ -0,0 +1,32 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Methodology.json", + "title": "Methodology", + "description": "A description of a reference to, for example, a journal article and some descriptive parameters for an analytical methodology", + "type": "object", + "properties": { + "id": { + "title": "id", + "description": "A unique identifier for this protocol", + "type": "string" + }, + "reference": { + "title": "reference", + "description": "Either an object defining the academic literature reference or a URL linking to such an object", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Reference.json" } + ] + }, + "preparationStep": { + "title": "preparation step", + "description": "Either an object defining the sample preparation steps taken reference or a URL linking to such an object", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/PreparationStep.json" } + ] + } + }, + "required": [ "id", "reference", "preparationStep"], + "additionalProperties": false +} \ No newline at end of file diff --git a/ocean-acidification/PreparationStep.json b/ocean-acidification/PreparationStep.json new file mode 100644 index 0000000..13953e5 --- /dev/null +++ b/ocean-acidification/PreparationStep.json @@ -0,0 +1,56 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/PreparationStep.json", + "title": "PreparationStep", + "description": "Describes the sample preparation", + "type": "object", + "properties": { + "id": { + "title": "id", + "description": "A unique identifier for this sample preparation", + "type": "string" + }, + "fixation": { + "title": "fixation", + "description": "Either a plain text description of the fixation method, or a URL to a description of the fixation method in a controlled vocabulary entry", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "type" : "string" } + ] + }, + "storage": { + "title": "storage", + "description": "Either a plain text description of the storage method, or a URL to a description of the storage method in a controlled vocabulary entry", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "type" : "string" } + ] + }, + "extraction": { + "title": "extraction", + "description": "Either a plain text description of the extraction method, or a URL to a description of the extraction method in a controlled vocabulary entry", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "type" : "string" } + ] + }, + "pretreatment": { + "title": "pretreatment", + "description": "Either a plain text description of the pretreatment method, or a URL to a description of the pretreatment method in a controlled vocabulary entry", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "type" : "string" } + ] + }, + "analysis": { + "title": "analysis", + "description": "Either a plain text description of the analysis method, or a URL to a description of the analysis method in a controlled vocabulary entry", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "type" : "string" } + ] + } + }, + "required": [ "id"], + "additionalProperties": false +} \ No newline at end of file diff --git a/ocean-acidification/Protocol.json b/ocean-acidification/Protocol.json index da05445..ba3b3c3 100644 --- a/ocean-acidification/Protocol.json +++ b/ocean-acidification/Protocol.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json", - "title": "Protocol" + "title": "Protocol", "description": "A specialisation of O&M's process, initially defined for the analytical chemistry domain of the UNESCO-IOC Ocean Acidificiation project", "type": "object", "properties": { @@ -19,6 +19,22 @@ "title": "laboratory", "description": "A URL to a controlled vocabulary term defining the laboratory responsible for the observation made using this instance of the protocol", "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + }, + "methodology": { + "title": "methodology", + "description": "Either an object or a URL giving a description of a reference to, for example, a journal article and some descriptive parameters for an analytical methodology", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Methodology.json" } + ] + }, + "quality": { + "title": "quality", + "description": "Either an object or a URL giving a description of the quality (limits of detection, accuracy, precision, uncertainty) of an analytical protocol", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Quality.json" } + ] } }, "required": [ "id", "laboratory"], diff --git a/ocean-acidification/Quality.json b/ocean-acidification/Quality.json new file mode 100644 index 0000000..65b0db1 --- /dev/null +++ b/ocean-acidification/Quality.json @@ -0,0 +1,48 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Quality.json", + "title": "Quality", + "description": "A description of the quality (limits of detection, accuracy, precision, uncertainty) of an analytical protocol", + "type": "object", + "properties": { + "id": { + "title": "id", + "description": "A unique identifier for this protocol", + "type": "string" + }, + "limitOfDetection": { + "title": "limit of detection", + "description": "Either a URL or a string describing the limit of detection for the analytical method", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } + { "type" : "string" } + ] + }, + "accuracy": { + "title": "accuracy", + "description": "Either a URL or a string describing the accuracy of the analytical method", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } + { "type" : "string" } + ] + }, + "precision": { + "title": "precision", + "description": "Either a URL or a string describing the precision of the analytical method", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } + { "type" : "string" } + ] + }, + "uncertainty": { + "title": "uncertainty", + "description": "Either a URL or a string describing the uncertainty of the analytical method", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } + { "type" : "string" } + ] + } + }, + "required": [ "id"], + "additionalProperties": false +} \ No newline at end of file diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index bdc9f7a..30aa092 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Reference.json", - "title": "Reference" + "title": "Reference", "description": "Describes the recommended citation text for a reference, and provides a link to the journal paper or methodology description", "type": "object", "properties": { From 5fcaff838e1335077d9b3deec62cd487003d6450 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 12 Oct 2015 21:26:41 +0100 Subject: [PATCH 04/46] Create Context.json --- Context.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Context.json diff --git a/Context.json b/Context.json new file mode 100644 index 0000000..84e529f --- /dev/null +++ b/Context.json @@ -0,0 +1,8 @@ +"@context": { + "observedProperty": "http://def.seegrid.csiro.au/isotc211/iso19156/2011/observation#observedProperty", + "href": "@id", + "foi": "http://def.seegrid.csiro.au/isotc211/iso19156/2011/observation#featureOfInterest", + "id": "@id", + "phenomenonTime": "http://def.seegrid.csiro.au/isotc211/iso19156/2011/observation#phenomenonTime", + "instant": "@value" + } From 927860c6fabd56a06623bcee2c6a6a9d4470cb50 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 12 Oct 2015 21:51:15 +0100 Subject: [PATCH 05/46] Update Context.json --- Context.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Context.json b/Context.json index 84e529f..721395e 100644 --- a/Context.json +++ b/Context.json @@ -4,5 +4,10 @@ "foi": "http://def.seegrid.csiro.au/isotc211/iso19156/2011/observation#featureOfInterest", "id": "@id", "phenomenonTime": "http://def.seegrid.csiro.au/isotc211/iso19156/2011/observation#phenomenonTime", - "instant": "@value" + "instant": "@value", + "member": "http://def.seegrid.csiro.au/isotc211/iso19156/2011/observation#relatedObservation", + "procedure": "http://def.seegrid.csiro.au/isotc211/iso19156/2011/observation#Process", + "resultTime": "http://def.seegrid.csiro.au/isotc211/iso19156/2011/observation#resultTime", + "result": "http://def.seegrid.csiro.au/isotc211/iso19156/2011/observation#result", + "value": "@value" } From aa7889e7cf6fa8baad1129f3c7a68eee35d08dd7 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Tue, 13 Oct 2015 16:17:49 +0100 Subject: [PATCH 06/46] Fixed errors in Quality.json "oneOf" --- ocean-acidification/Quality.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ocean-acidification/Quality.json b/ocean-acidification/Quality.json index 65b0db1..74b511a 100644 --- a/ocean-acidification/Quality.json +++ b/ocean-acidification/Quality.json @@ -14,7 +14,7 @@ "title": "limit of detection", "description": "Either a URL or a string describing the limit of detection for the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -22,7 +22,7 @@ "title": "accuracy", "description": "Either a URL or a string describing the accuracy of the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -30,7 +30,7 @@ "title": "precision", "description": "Either a URL or a string describing the precision of the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -38,11 +38,11 @@ "title": "uncertainty", "description": "Either a URL or a string describing the uncertainty of the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] } }, "required": [ "id"], "additionalProperties": false -} \ No newline at end of file +} From 7288da914ac7586cec172445310e4835084220c2 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Tue, 13 Oct 2015 16:19:26 +0100 Subject: [PATCH 07/46] Switched "required" in Protocol.json No requires "id" and "methodology" --- ocean-acidification/Protocol.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ocean-acidification/Protocol.json b/ocean-acidification/Protocol.json index ba3b3c3..f63182c 100644 --- a/ocean-acidification/Protocol.json +++ b/ocean-acidification/Protocol.json @@ -37,6 +37,6 @@ ] } }, - "required": [ "id", "laboratory"], + "required": [ "id", "methodology"], "additionalProperties": false -} \ No newline at end of file +} From e39c6c52103c573cc2f3e92023507b1eb3551801 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Tue, 13 Oct 2015 16:20:01 +0100 Subject: [PATCH 08/46] Methodology.json only requires "id" --- ocean-acidification/Methodology.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ocean-acidification/Methodology.json b/ocean-acidification/Methodology.json index fac1fb0..c6c460c 100644 --- a/ocean-acidification/Methodology.json +++ b/ocean-acidification/Methodology.json @@ -27,6 +27,6 @@ ] } }, - "required": [ "id", "reference", "preparationStep"], + "required": [ "id"], "additionalProperties": false -} \ No newline at end of file +} From f6b6cd0849b189ec986c8fcf345192bb343677bf Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Tue, 13 Oct 2015 16:21:08 +0100 Subject: [PATCH 09/46] Removed required: "doi" from Reference.json --- ocean-acidification/Reference.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index 30aa092..66eebea 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -24,6 +24,6 @@ "type": "string" } }, - "required": [ "id", "doiOrWebAddress", "citation"], + "required": [ "id", "citation"], "additionalProperties": false -} \ No newline at end of file +} From 038a36a5c3bde7e325436486f6f805b92809194a Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Tue, 13 Oct 2015 16:47:51 +0100 Subject: [PATCH 10/46] Update Reference.json --- ocean-acidification/Reference.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index 66eebea..43c3ebc 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -22,8 +22,13 @@ "title": "citation", "description": "A plain text representation of the recommended citation text to be used in referencing the protocol description", "type": "string" + }, + "informalReference": { + "title": "informalReference", + "description": "For use only if a non-citable and non-machine referenceable document exists, a written description may be provided", + "type": "string" } }, - "required": [ "id", "citation"], + "required": [ "id"], "additionalProperties": false } From c99b9414dc03c50bc1d24ed5aabbf810c271ecc6 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Thu, 15 Oct 2015 13:45:27 +0100 Subject: [PATCH 11/46] Reference only the adamml repoistory Removed the peterataylor repository references to fix the issues faced by XMLSpy and Oasis. Will need to revert this prior to the pull request being issued and will log as an issue. --- Geometry.json | 2 +- Measurement.json | 6 +++--- MonitoringFeature.json | 10 +++++----- Observation.json | 36 ++++++++++++++++++------------------ ObservationCollection.json | 22 +++++++++++----------- Sampling.json | 6 +++--- SamplingCollection.json | 12 ++++++------ 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Geometry.json b/Geometry.json index df3d3a4..26f19cf 100644 --- a/Geometry.json +++ b/Geometry.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json", "title": "geometry", "description": "One geometry object, as defined in GeoJSON", "definitions": { diff --git a/Measurement.json b/Measurement.json index eba1e97..1bfda76 100644 --- a/Measurement.json +++ b/Measurement.json @@ -1,11 +1,11 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Measuement.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/Measuement.json", "title": "Measurement", "description": "A measurement is an observation whose result is a scaled quantity. An observation is an act associated with a discrete time instant or period through which a number, term or other symbol is assigned to a phenomenon. It involves application of a specified procedure, such as a sensor, instrument, algorithm or process chain. The procedure may be applied in-situ, remotely, or ex-situ with respect to the sampling location. The result of an observation is an estimate of the value of a property of some feature. Use of a common model allows observation data using different procedures to be combined unambiguously. The observation itself is also a feature, since it has properties and identity. Observation details are important for data discovery and for data quality estimation. The observation could be considered to carry âœproperty-level❠instance metadata, which complements the dataset-level and feature-level metadata that have been conventionally considered (e.g. ISO 19115)", "type": "object", "allOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Observation.json" } + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Observation.json" } ], "properties": { "id": { }, @@ -17,7 +17,7 @@ "samplingStrategy": { }, "resultTime": { }, "context": { }, - "result": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/measure" } + "result": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" } }, "required": [ "id", "phenomenonTime", "result" ], "additionalProperties": false diff --git a/MonitoringFeature.json b/MonitoringFeature.json index 0399397..12eb287 100644 --- a/MonitoringFeature.json +++ b/MonitoringFeature.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/MonitoringFeature.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/MonitoringFeature.json", "title": "MonitoringFeature", "description": "A TimeseriesML MonitoringFeature", "type": "object", @@ -32,22 +32,22 @@ "representativePoint": { "title": "representativePoint", "description": "A point location that is representative of the monitoring feature's location. Typically this is used when the shape of the monitoring feature is an area or other non-point geometry. It may also be used to provide an approximate point location in sensitive observation scenarios.", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/geometryObject" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/geometryObject" }, "monitoringType": { "title": "monitoringType", "description": "A thematic characterisation of the type of monitoring feature. E.g. meteorological, surface water, groundwater, water quality etc.", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "descriptionReference": { "title": "descriptionReference", "description": "Provide extra descriptive information about a monitoring feature. This could be a link to an HTML page describing the location, photos of a monitoring point, history records etc.", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "verticalDatum": { "title": "verticalDatum", "description": "Specifies the elevation that is used as the zero point, or datum, for height-related measurements. The datum is defined using a vertical datum, which may be defined using the ISO19111 type CD_VerticalDatum, or an agreed upon datum may be reference by its identifier. E.g. the Australian Height Datum (AHD), Tasmania = “EPSG::5112”. The CD_VerticalDatum type allows specification of the local vertical datum as a height above another reference datum. E.g. local vertical datum is 23m above the AHD.", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "timeZone": { "title": "timeZone", diff --git a/Observation.json b/Observation.json index 0eaed83..29cbcce 100644 --- a/Observation.json +++ b/Observation.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Observation.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/Observation.json", "title": "Observation", "description": "An observation is an act associated with a discrete time instant or period through which a number, term or other symbol is assigned to a phenomenon. It involves application of a specified procedure, such as a sensor, instrument, algorithm or process chain. The procedure may be applied in-situ, remotely, or ex-situ with respect to the sampling location. The result of an observation is an estimate of the value of a property of some feature.", "type": "object", @@ -19,58 +19,58 @@ "title": "context", "description": "links to observations that provide the context for this observation - use 'rel' for 'role'", "type": "array", - "items": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + "items": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "minItems": 1 }, "phenomenonTime": { "title": "phenomenonTime", "description": "Time at which the estimate of the property that is the result of the observation is associated with the feature of interest", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalPrimitive" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalPrimitive" }, "observedProperty": { "title": "observedProperty", "description": "property whose value is the result of the observation", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "procedure": { "title": "procedure", "description": "procedure used in making observation. Typically a sensor or sensor-system, algorithm, computational procedure.", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json" }, ] }, "featureOfInterest": { "title": "featureOfInterest", "description": "subject of the observation, whose type may carry the observed property", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "samplingStrategy": { "title": "samplingStrategy", "description": "a strategy, such as a sampling feature, which mediates between the procedure and the ultimate feature of interest", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" } + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json" } ] }, "resultTime": { "title": "resultTime", "description": "time at which the result became available, after all processing steps were completed", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimePosition" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimePosition" }, "result": { "title": "result", "description": "result of the observation", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/measure" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/truth" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/count" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/text" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalObject" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json#/definitions/geometryObject" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesTVP.json#/definitions/TimeseriesTVP" } + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/vocabTerm" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/truth" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/count" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/text" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalObject" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesTVP.json#/definitions/TimeseriesTVP" } ] } }, diff --git a/ObservationCollection.json b/ObservationCollection.json index 78d3d18..5d18e94 100644 --- a/ObservationCollection.json +++ b/ObservationCollection.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/ObservationCollection.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/ObservationCollection.json", "title": "Observation collection", "description": "Collection of observations which may have a common (a) feature of interest (b) observed property (c) observation procedure.", "type": "object", @@ -22,35 +22,35 @@ "procedure": { "title": "featureOfInterest", "description": "the observation procedure used in all observations in the collection", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "featureOfInterest": { "title": "featureOfInterest", "description": "the single feature which all observations in the collection are concerned with", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "samplingStrategy": { "title": "samplingStrategy", "description": "a strategy, such as a sampling feature, which mediates between the procedure and the ultimate feature of interest for all observations in the collection", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" } + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json" } ] }, "observedProperty": { "title": "observedProperty", "description": "the property measured or estimated by all observations in the collection", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "phenomenonTime": { "title": "phenomenonTime", "description": "Time at which the estimate of the property that is the result of the observation is associated with the feature of interest for all observations in the collection", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalPrimitive" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalPrimitive" }, "resultTime": { "title": "resultTime", "description": "time at which the result became available, after all processing steps were completed, for all observations in the collection", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/date-time" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/date-time" }, "uom": { "title": "unit-of-measure", @@ -60,7 +60,7 @@ "vocabulary": { "title": "vocabulary", "description": "vocabulary for all categorical result valuesfor observations in the collection", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "member": { "title": "member", @@ -68,8 +68,8 @@ "type": "array", "items": { "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Observation.json" } + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Observation.json" } ] }, "minItems": 1, diff --git a/Sampling.json b/Sampling.json index 42a1b43..3d2f6c0 100644 --- a/Sampling.json +++ b/Sampling.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json", "title": "Sampling feature", "description": "Feature on which observations may be made, which is intended to be representative of a different (usually larger) feature that is not fully accessible for some reason.", "type": "object", @@ -19,7 +19,7 @@ "title": "sampledFeature", "description": "the feature which the sampling feature was designed to sample", "type": "array", - "items": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + "items": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "minItems": 1, "uniqueItems": true }, @@ -27,7 +27,7 @@ "title": "complex", "description": "link to related sampling features", "type": "array", - "items": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + "items": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "minItems": 1 } }, diff --git a/SamplingCollection.json b/SamplingCollection.json index a895093..55b5d28 100644 --- a/SamplingCollection.json +++ b/SamplingCollection.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/SamplingCollection.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/SamplingCollection.json", "title": "Sampling feature collection", "description": "Collection of features on which observations may be made.", "type": "object", @@ -19,7 +19,7 @@ "title": "sampledFeature", "description": "the feature which the sampling feature collection was designed to sample", "type": "array", - "items": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + "items": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "minItems": 1, "uniqueItems": true }, @@ -29,10 +29,10 @@ "type": "array", "items": { "anyOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Specimen.json" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/SpatialSampling.json" } + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Specimen.json" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/SpatialSampling.json" } ] }, "minItems": 1, From 58a7c5caad62a31ac13fb7525bbe70ee766700b2 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Thu, 15 Oct 2015 13:52:07 +0100 Subject: [PATCH 12/46] Created a json-ld folder Moved the Context.json file to ./json-ld for file structuring clarity --- Context.json => json-ld/Context.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Context.json => json-ld/Context.json (100%) diff --git a/Context.json b/json-ld/Context.json similarity index 100% rename from Context.json rename to json-ld/Context.json From 24aa33024754e6fdd9a072073a88ab1b481de3ea Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Thu, 15 Oct 2015 16:18:44 +0100 Subject: [PATCH 13/46] Created examples folder --- ocean-acidification/examples/TotalAlkalinity.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 ocean-acidification/examples/TotalAlkalinity.json diff --git a/ocean-acidification/examples/TotalAlkalinity.json b/ocean-acidification/examples/TotalAlkalinity.json new file mode 100644 index 0000000..c35988a --- /dev/null +++ b/ocean-acidification/examples/TotalAlkalinity.json @@ -0,0 +1,5 @@ +{ + "id": "exampleTotalAlkalinity", + "featureOfInterest": {"href": "http://vocab.nerc.ac.uk/collection/C19/current/1_6/"}, + "phenomenonTime": {"instant": "2015-09-23T12:51:11.421Z"} +} \ No newline at end of file From 1bebedca3422b25e9ad4001892fdd17001f53a80 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Thu, 15 Oct 2015 16:20:27 +0100 Subject: [PATCH 14/46] Upated DOI pattern --- Common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common.json b/Common.json index 4a93635..797ca31 100644 --- a/Common.json +++ b/Common.json @@ -50,7 +50,7 @@ "additionalProperties":false }, "doi": { - "title": "link", + "title": "doi", "type": "object", "properties": { "doi": { "type": "string", "format": "uri" } From fcfdf8d1833ab7859f5ffa9416ab822e11bf7593 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 20:12:45 +0100 Subject: [PATCH 15/46] Added required instrument and laboratory --- ocean-acidification/Protocol.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocean-acidification/Protocol.json b/ocean-acidification/Protocol.json index f63182c..72810fe 100644 --- a/ocean-acidification/Protocol.json +++ b/ocean-acidification/Protocol.json @@ -37,6 +37,6 @@ ] } }, - "required": [ "id", "methodology"], + "required": [ "id", "methodology","instrument","laboratory"], "additionalProperties": false } From cd409b24e5f6f334e33988dc56073b8ef4fdecff Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 20:17:05 +0100 Subject: [PATCH 16/46] Update Reference.json --- ocean-acidification/Reference.json | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index 43c3ebc..182ba96 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -10,24 +10,8 @@ "description": "A unique identifier for this reference", "type": "string" }, - "doiOrWebAddress": { - "title": "doiOrWebAddress", - "description": "Either a formal Digital Object Identifier, or a link to any other web resource, describing the protocol", - "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" } - ] - }, - "citation": { - "title": "citation", - "description": "A plain text representation of the recommended citation text to be used in referencing the protocol description", - "type": "string" - }, - "informalReference": { - "title": "informalReference", - "description": "For use only if a non-citable and non-machine referenceable document exists, a written description may be provided", - "type": "string" - } + "anyOf":[ + ] }, "required": [ "id"], "additionalProperties": false From e0aa08e1429fb37a91884095d0468dc712884ef3 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 20:20:30 +0100 Subject: [PATCH 17/46] Create Common.json --- ocean-acidification/Common.json | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 ocean-acidification/Common.json diff --git a/ocean-acidification/Common.json b/ocean-acidification/Common.json new file mode 100644 index 0000000..3610f56 --- /dev/null +++ b/ocean-acidification/Common.json @@ -0,0 +1,23 @@ +{"$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json", + "title": "Common", + "description": "A collection of commonly used types. Should maybe come from somehwere else, one day.", + "definitions": "doiOrWebAddress": { + "title": "doiOrWebAddress", + "description": "Either a formal Digital Object Identifier, or a link to any other web resource, describing the protocol", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" } + ] + }, + "citation": { + "title": "citation", + "description": "A plain text representation of the recommended citation text to be used in referencing the protocol description", + "type": "string" + }, + "informalReference": { + "title": "informalReference", + "description": "For use only if a non-citable and non-machine referenceable document exists, a written description may be provided", + "type": "string" + } +} From 42b1c328a8825edc48c5296946bbb1b02f327b08 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 20:21:46 +0100 Subject: [PATCH 18/46] Update Common.json --- ocean-acidification/Common.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ocean-acidification/Common.json b/ocean-acidification/Common.json index 3610f56..b9d7393 100644 --- a/ocean-acidification/Common.json +++ b/ocean-acidification/Common.json @@ -2,7 +2,7 @@ "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json", "title": "Common", "description": "A collection of commonly used types. Should maybe come from somehwere else, one day.", - "definitions": "doiOrWebAddress": { + "definitions": {"doiOrWebAddress": { "title": "doiOrWebAddress", "description": "Either a formal Digital Object Identifier, or a link to any other web resource, describing the protocol", "oneOf": [ @@ -20,4 +20,5 @@ "description": "For use only if a non-citable and non-machine referenceable document exists, a written description may be provided", "type": "string" } + } } From 5e4c8442a091525c002656fd4ab96d91b096eb4c Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 20:26:00 +0100 Subject: [PATCH 19/46] Update Reference.json --- ocean-acidification/Reference.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index 182ba96..bc32fd3 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -11,6 +11,9 @@ "type": "string" }, "anyOf":[ + {"$ref","http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/doiOrWebAddress"}, + {"$ref","http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/citation"}, + {"$ref","http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/informalReference"} ] }, "required": [ "id"], From 2b77d9c0c5090bca30c0fdc3074ccbd572ac4311 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 20:26:38 +0100 Subject: [PATCH 20/46] Update Reference.json --- ocean-acidification/Reference.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index bc32fd3..9b95317 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -11,9 +11,9 @@ "type": "string" }, "anyOf":[ - {"$ref","http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/doiOrWebAddress"}, - {"$ref","http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/citation"}, - {"$ref","http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/informalReference"} + {"$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/doiOrWebAddress"}, + {"$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/citation"}, + {"$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/informalReference"} ] }, "required": [ "id"], From 7d7389ec8397f7fcf17bc452ae8e1ef59bc8970b Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 20:49:45 +0100 Subject: [PATCH 21/46] Update Reference.json --- ocean-acidification/Reference.json | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index 9b95317..43c3ebc 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -10,11 +10,24 @@ "description": "A unique identifier for this reference", "type": "string" }, - "anyOf":[ - {"$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/doiOrWebAddress"}, - {"$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/citation"}, - {"$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json#/definitions/informalReference"} - ] + "doiOrWebAddress": { + "title": "doiOrWebAddress", + "description": "Either a formal Digital Object Identifier, or a link to any other web resource, describing the protocol", + "oneOf": [ + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" } + ] + }, + "citation": { + "title": "citation", + "description": "A plain text representation of the recommended citation text to be used in referencing the protocol description", + "type": "string" + }, + "informalReference": { + "title": "informalReference", + "description": "For use only if a non-citable and non-machine referenceable document exists, a written description may be provided", + "type": "string" + } }, "required": [ "id"], "additionalProperties": false From 396fe9fb50a17a93c1b7283713200e6603c53a4a Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 20:50:53 +0100 Subject: [PATCH 22/46] Delete Common.json --- ocean-acidification/Common.json | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 ocean-acidification/Common.json diff --git a/ocean-acidification/Common.json b/ocean-acidification/Common.json deleted file mode 100644 index b9d7393..0000000 --- a/ocean-acidification/Common.json +++ /dev/null @@ -1,24 +0,0 @@ -{"$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Common.json", - "title": "Common", - "description": "A collection of commonly used types. Should maybe come from somehwere else, one day.", - "definitions": {"doiOrWebAddress": { - "title": "doiOrWebAddress", - "description": "Either a formal Digital Object Identifier, or a link to any other web resource, describing the protocol", - "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" } - ] - }, - "citation": { - "title": "citation", - "description": "A plain text representation of the recommended citation text to be used in referencing the protocol description", - "type": "string" - }, - "informalReference": { - "title": "informalReference", - "description": "For use only if a non-citable and non-machine referenceable document exists, a written description may be provided", - "type": "string" - } - } -} From fce1725abc863bc28e0cf9c1fa5a90cf16e19758 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 21:36:53 +0100 Subject: [PATCH 23/46] Update Observation.json --- Observation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Observation.json b/Observation.json index 29cbcce..75efdd7 100644 --- a/Observation.json +++ b/Observation.json @@ -37,7 +37,7 @@ "description": "procedure used in making observation. Typically a sensor or sensor-system, algorithm, computational procedure.", "oneOf": [ { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json" } ] }, "featureOfInterest": { From ad73ad06f1b45b26b7a743a02ade0e5895f321b4 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 21:44:09 +0100 Subject: [PATCH 24/46] Update TotalAlkalinity.json --- ocean-acidification/examples/TotalAlkalinity.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ocean-acidification/examples/TotalAlkalinity.json b/ocean-acidification/examples/TotalAlkalinity.json index c35988a..d691a63 100644 --- a/ocean-acidification/examples/TotalAlkalinity.json +++ b/ocean-acidification/examples/TotalAlkalinity.json @@ -1,5 +1,7 @@ { "id": "exampleTotalAlkalinity", "featureOfInterest": {"href": "http://vocab.nerc.ac.uk/collection/C19/current/1_6/"}, - "phenomenonTime": {"instant": "2015-09-23T12:51:11.421Z"} -} \ No newline at end of file + "phenomenonTime": {"instant": "2015-09-23T12:51:11.421Z"}, + "type": "measure", + "result": {"value": 12, "uom":"http://example.com/foo"} +} From da17f0e93a2d4e678e8f4ed383519ab0b935d93b Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 21:57:23 +0100 Subject: [PATCH 25/46] Updated doi pattern --- Common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common.json b/Common.json index 797ca31..8a3ccbc 100644 --- a/Common.json +++ b/Common.json @@ -55,7 +55,7 @@ "properties": { "doi": { "type": "string", "format": "uri" } }, - "required": [ "href" ], + "required": [ "doi" ], "additionalProperties":false } } From 0e209c47b2fb8ec82cb21cb1d28cd432e07146b1 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 22:08:53 +0100 Subject: [PATCH 26/46] Update Methodology.json --- ocean-acidification/Methodology.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ocean-acidification/Methodology.json b/ocean-acidification/Methodology.json index c6c460c..97467d8 100644 --- a/ocean-acidification/Methodology.json +++ b/ocean-acidification/Methodology.json @@ -15,7 +15,7 @@ "description": "Either an object defining the academic literature reference or a URL linking to such an object", "oneOf": [ { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Reference.json" } + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Reference.json" } ] }, "preparationStep": { @@ -23,7 +23,7 @@ "description": "Either an object defining the sample preparation steps taken reference or a URL linking to such an object", "oneOf": [ { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/PreparationStep.json" } + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/PreparationStep.json" } ] } }, From 2e090139b908486bdf65524c19807e3f1b2c0b87 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 22:10:17 +0100 Subject: [PATCH 27/46] Update Protocol.json --- ocean-acidification/Protocol.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ocean-acidification/Protocol.json b/ocean-acidification/Protocol.json index 72810fe..b1924e5 100644 --- a/ocean-acidification/Protocol.json +++ b/ocean-acidification/Protocol.json @@ -25,7 +25,7 @@ "description": "Either an object or a URL giving a description of a reference to, for example, a journal article and some descriptive parameters for an analytical methodology", "oneOf": [ { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Methodology.json" } + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Methodology.json" } ] }, "quality": { @@ -33,7 +33,7 @@ "description": "Either an object or a URL giving a description of the quality (limits of detection, accuracy, precision, uncertainty) of an analytical protocol", "oneOf": [ { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Quality.json" } + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Quality.json" } ] } }, From 02b8110c746b9761711091474bcb15e42f9e65d2 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 22:20:34 +0100 Subject: [PATCH 28/46] Update TotalAlkalinity.json --- ocean-acidification/examples/TotalAlkalinity.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ocean-acidification/examples/TotalAlkalinity.json b/ocean-acidification/examples/TotalAlkalinity.json index d691a63..f6b0a3e 100644 --- a/ocean-acidification/examples/TotalAlkalinity.json +++ b/ocean-acidification/examples/TotalAlkalinity.json @@ -3,5 +3,11 @@ "featureOfInterest": {"href": "http://vocab.nerc.ac.uk/collection/C19/current/1_6/"}, "phenomenonTime": {"instant": "2015-09-23T12:51:11.421Z"}, "type": "measure", - "result": {"value": 12, "uom":"http://example.com/foo"} + "result": {"value": 12, "uom":"http://example.com/foo"}, + "procedure": { + "id": "exampleTotalAlkalinity", + "methodology": {"id": "foo"}, + "instrument": {"href": "http://bar"}, + "laboratory": {"href": "http://baz"} + } } From 27a3072ea04f6a73e4b18a03d6c5de0d32049189 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 16 Oct 2015 22:29:34 +0100 Subject: [PATCH 29/46] Update Observation.json --- Observation.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Observation.json b/Observation.json index 75efdd7..c5ce00e 100644 --- a/Observation.json +++ b/Observation.json @@ -35,7 +35,7 @@ "procedure": { "title": "procedure", "description": "procedure used in making observation. Typically a sensor or sensor-system, algorithm, computational procedure.", - "oneOf": [ + "anyOf": [ { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json" } ] @@ -61,7 +61,7 @@ "result": { "title": "result", "description": "result of the observation", - "oneOf": [ + "anyOf": [ { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/vocabTerm" }, From 0efe17d8820a6d4ad4886fe7fc681c5db7c490c3 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 19 Oct 2015 15:37:05 +0100 Subject: [PATCH 30/46] Fixed validation issues --- SpatialSampling.json | 8 ++--- Specimen.json | 26 +++++++------- Temporal.json | 2 +- TimeseriesMetadata.json | 46 ++++++++++++------------ TimeseriesTVP.json | 18 +++++----- ocean-acidification/Methodology.json | 4 +-- ocean-acidification/PreparationStep.json | 10 +++--- ocean-acidification/Protocol.json | 8 ++--- ocean-acidification/Quality.json | 8 ++--- ocean-acidification/Reference.json | 2 +- 10 files changed, 66 insertions(+), 66 deletions(-) diff --git a/SpatialSampling.json b/SpatialSampling.json index 9dd275a..392bfab 100644 --- a/SpatialSampling.json +++ b/SpatialSampling.json @@ -1,23 +1,23 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/SpatialSampling.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/SpatialSampling.json", "title": "Spatial Sampling Feature", "description": " ## EXTENDS SAMPLING FEATURE ## Sampling feature whose defining characteristic is that it samples the intended feature by geometric subsetting. ", "type": "object", "allOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json" }, { "properties": { "shape": { "title": "shape", "description": "Spatial location and extent of the sampling feature", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json#/definitions/geometryObject" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" }, "hostedProcedure": { "title": "hostedProcedure", "description": "Observation procedure (instrument, sensor, observer) associated with or hosted by this spatial sampling feature.", "type": "array", - "items": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + "items": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "minItems": 1 } } diff --git a/Specimen.json b/Specimen.json index 94a5975..e249004 100644 --- a/Specimen.json +++ b/Specimen.json @@ -1,38 +1,38 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Specimen.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/Specimen.json", "title": "Specimen", "description": " ## EXTENDS SAMPLING FEATURE ## A Specimen is a physical sample, obtained for observation(s) normally carried out ex-situ, sometimes in a laboratory.", "type": "object", "allOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json" }, { "properties": { "samplingTime": { "title": "samplingTime", "description": "time the specimen was taken from the sampled feature", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalPrimitive" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalPrimitive" }, "samplingMethod": { "title": "samplingMethod", "description": "Process used to take the specimen from the sampled feature.", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "samplingLocation": { "title": "samplingLocation", "description": "Location from which the specimen was taken within the sampled feature", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/text" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json#/definitions/geometryObject" } + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/text" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" } ] }, "samplingElevation": { "title": "samplingElevation", "description": "Elevation from which the specimen was taken at the sampling location", "properties": { - "elevation": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/measure" }, - "verticalDatum": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } + "elevation": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" }, + "verticalDatum": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" } }, "required": [ "elevation"] }, @@ -40,15 +40,15 @@ "title": "currentLocation", "description": "Location where the specimen is currently", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/text" }, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json#/definitions/geometryObject" } + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/text" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" } ] }, "size": { "title": "size", "description": "Physical extent of the specimen (length, mass, etc)", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/measure" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" } } } diff --git a/Temporal.json b/Temporal.json index abe73b4..7ccc5c6 100644 --- a/Temporal.json +++ b/Temporal.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json", "title": "Temporal", "description": "Temporal objects", "definitions": { diff --git a/TimeseriesMetadata.json b/TimeseriesMetadata.json index ddaf953..9d51c8c 100644 --- a/TimeseriesMetadata.json +++ b/TimeseriesMetadata.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesMetadata.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesMetadata.json", "title": "TimeseriesMetadata", "description": "Schema for metadata relating to Timeseries", "type": "object", @@ -12,17 +12,17 @@ "temporalExtent": { "title":"temporalExtent", "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInterval" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInterval" }, "baseTime": { "title":"baseTime", "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInstant" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInstant" }, "spacing": { "title":"spacing", "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/duration" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/duration" }, "commentBlock" : { "title" : "commentBlock", @@ -30,7 +30,7 @@ "properties" : { "applicablePeriod" : { "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInterval" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInterval" }, "comment" : { "type" : "string" @@ -41,20 +41,20 @@ "title":"commentBlocks", "type":"array", "items" : { - "$ref":"#/definitions/commentBlock" + "$ref":"#/definitions/TimeseriesMetadata/properties/commentBlock" } }, "intendedObservationSpacing": { "title":"intendedObservationSpacing", "description": "The intended temporal spacing of the time series points. This may vary from the actual spacing.", "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/duration" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/duration" }, "status": { "title":"status", "description": "Indicates the statues of the observation. E.g. unreleased, verified etc.", "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "cumulative": { "title":"cumulative", @@ -64,22 +64,22 @@ "accumulationAnchorTime": { "title":"accumulationAnchorTime", "description": "Defines the time at which accumulation begins. e.g. 9am.", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInstant" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInstant" }, "startAnchorPoint": { "title":"startAnchorPoint", "description": "Specifies a ‘ghost’ point to allow the first value of the timeseries to be interpolated correctly.", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInstant" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInstant" }, "endAnchorPoint": { "title":"endAnchorPoint", "description": "Specifies a ‘ghost’ point to allow the last value of the timeseries to be interpolated correctly.", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInstant" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInstant" }, "maxGapPeriod": { "title":"maxGapPeriod", "description": "When any analysis is run over a timeseries it is important to know if it is possible to interpolate between any two adjoining points. If the join period between two adjoining points is greater than the maxGapPeriod then the series should not be interpolated between these adjoining points.", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/duration" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/duration" } }, "additionalProperties": false @@ -91,27 +91,27 @@ "quality": { "title":"quality", "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "uom": { "title":"uom", "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "interpolationType": { "title":"interpolationType", "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "nilReason": { "title":"nilReason", "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "censoredReason": { "title":"censoredReason", "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "comment": { "title":"comment", @@ -119,27 +119,27 @@ }, "accuracy": { "title":"accuracy", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/measure" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" }, "relatedObservation": { "title":"relatedObservation", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "aggregationDuration": { "title":"aggregationDuration", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/duration" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/duration" }, "qualifier": { "title":"qualifier", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "processing": { "title":"processing", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "source": { "title":"source", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" } }, "additionalProperties": false diff --git a/TimeseriesTVP.json b/TimeseriesTVP.json index 88615b0..0b5eac1 100644 --- a/TimeseriesTVP.json +++ b/TimeseriesTVP.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesTVP.json", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesTVP.json", "title": "TimeseriesTVP", "description": "A TimeseriesML time-value pair encoded timeseries", "type": "object", @@ -11,17 +11,17 @@ "properties" : { "time": { "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalPrimitive" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalPrimitive" }, "value": { "type":"number" }, "metadata": { "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesMetadata.json#/definitions/PointMetadata" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesMetadata.json#/definitions/PointMetadata" } }, - "additionalProperties":"false" + "additionalProperties":false }, "TVPairCategory" : { "type":"object", @@ -29,14 +29,14 @@ "properties" : { "time": { "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalPrimitive" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalPrimitive" }, "value": { "type":"object", - "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" + "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/vocabTerm" } }, - "additionalProperties":"false" + "additionalProperties":false } }, "properties": { @@ -53,12 +53,12 @@ "metadata": { "title": "metadata", "description": "Metadata about the timeseries.", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesMetadata.json#/definitions/TimeseriesMetadata" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesMetadata.json#/definitions/TimeseriesMetadata" }, "defaultPointMetadata": { "title": "defaultPointMetadata", "description": "Default metadata for each point in the timeseries (can be overridden on a per-point basis).", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesMetadata.json#/definitions/PointMetadata" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesMetadata.json#/definitions/PointMetadata" }, "points": { "title": "points", diff --git a/ocean-acidification/Methodology.json b/ocean-acidification/Methodology.json index 97467d8..aca9865 100644 --- a/ocean-acidification/Methodology.json +++ b/ocean-acidification/Methodology.json @@ -14,7 +14,7 @@ "title": "reference", "description": "Either an object defining the academic literature reference or a URL linking to such an object", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Reference.json" } ] }, @@ -22,7 +22,7 @@ "title": "preparation step", "description": "Either an object defining the sample preparation steps taken reference or a URL linking to such an object", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/PreparationStep.json" } ] } diff --git a/ocean-acidification/PreparationStep.json b/ocean-acidification/PreparationStep.json index 13953e5..06ada2a 100644 --- a/ocean-acidification/PreparationStep.json +++ b/ocean-acidification/PreparationStep.json @@ -14,7 +14,7 @@ "title": "fixation", "description": "Either a plain text description of the fixation method, or a URL to a description of the fixation method in a controlled vocabulary entry", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -22,7 +22,7 @@ "title": "storage", "description": "Either a plain text description of the storage method, or a URL to a description of the storage method in a controlled vocabulary entry", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -30,7 +30,7 @@ "title": "extraction", "description": "Either a plain text description of the extraction method, or a URL to a description of the extraction method in a controlled vocabulary entry", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -38,7 +38,7 @@ "title": "pretreatment", "description": "Either a plain text description of the pretreatment method, or a URL to a description of the pretreatment method in a controlled vocabulary entry", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -46,7 +46,7 @@ "title": "analysis", "description": "Either a plain text description of the analysis method, or a URL to a description of the analysis method in a controlled vocabulary entry", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] } diff --git a/ocean-acidification/Protocol.json b/ocean-acidification/Protocol.json index b1924e5..533f908 100644 --- a/ocean-acidification/Protocol.json +++ b/ocean-acidification/Protocol.json @@ -13,18 +13,18 @@ "instrument": { "title": "instrument", "description": "A URL linking to a controlled vocabulary term defining the instrument make and model used in this instance of the protocol", - "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "laboratory": { "title": "laboratory", "description": "A URL to a controlled vocabulary term defining the laboratory responsible for the observation made using this instance of the protocol", - "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, "methodology": { "title": "methodology", "description": "Either an object or a URL giving a description of a reference to, for example, a journal article and some descriptive parameters for an analytical methodology", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Methodology.json" } ] }, @@ -32,7 +32,7 @@ "title": "quality", "description": "Either an object or a URL giving a description of the quality (limits of detection, accuracy, precision, uncertainty) of an analytical protocol", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Quality.json" } ] } diff --git a/ocean-acidification/Quality.json b/ocean-acidification/Quality.json index 74b511a..0e11c16 100644 --- a/ocean-acidification/Quality.json +++ b/ocean-acidification/Quality.json @@ -14,7 +14,7 @@ "title": "limit of detection", "description": "Either a URL or a string describing the limit of detection for the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -22,7 +22,7 @@ "title": "accuracy", "description": "Either a URL or a string describing the accuracy of the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -30,7 +30,7 @@ "title": "precision", "description": "Either a URL or a string describing the precision of the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -38,7 +38,7 @@ "title": "uncertainty", "description": "Either a URL or a string describing the uncertainty of the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] } diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index 43c3ebc..e09e5ed 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -14,7 +14,7 @@ "title": "doiOrWebAddress", "description": "Either a formal Digital Object Identifier, or a link to any other web resource, describing the protocol", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" } ] }, From c7d7862504cd0da04a129cf6fe0b817ba709f234 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 19 Oct 2015 16:06:14 +0100 Subject: [PATCH 31/46] Update Reference.json --- ocean-acidification/Reference.json | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index e09e5ed..c5c9f71 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -10,13 +10,17 @@ "description": "A unique identifier for this reference", "type": "string" }, - "doiOrWebAddress": { - "title": "doiOrWebAddress", - "description": "Either a formal Digital Object Identifier, or a link to any other web resource, describing the protocol", - "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" } - ] + "doi": { + "title": "doi", + "description": "A formal Digital Object Identifier to a resource describing the protocol", + + "items": { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" } + }, + "url": { + "title": "url", + "description": "A web address of a resource describing the protocol", + + "items": { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" } }, "citation": { "title": "citation", From 6b999f924d5b50d7fa44bacfebb6bf960752f67a Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 19 Oct 2015 16:11:08 +0100 Subject: [PATCH 32/46] Create Reference_Examle.json --- ocean-acidification/examples/Reference_Examle.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 ocean-acidification/examples/Reference_Examle.json diff --git a/ocean-acidification/examples/Reference_Examle.json b/ocean-acidification/examples/Reference_Examle.json new file mode 100644 index 0000000..5a5d877 --- /dev/null +++ b/ocean-acidification/examples/Reference_Examle.json @@ -0,0 +1,7 @@ +{ + "id": "Leadbetter&Vodden2015", + "doi": {"doi": "10.1080/17538947.2015.1033483"}, + "url": {"href": "http://www.tandfonline.com/doi/abs/10.1080/17538947.2015.1033483"}, + "citation": "Leadbetter, A.M. & Vodden, P.N. (2015). Semantic linking of complex properties, monitoring processes and facilities in web-based representations of the environment. International Journal of Digital Earth.", + "informalReference": "Leadbetter & Vodden, 2015." +} From 68749444beca230ad26fded17095d353b1c05ea5 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 19 Oct 2015 16:22:44 +0100 Subject: [PATCH 33/46] Update TotalAlkalinity.json --- ocean-acidification/examples/TotalAlkalinity.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ocean-acidification/examples/TotalAlkalinity.json b/ocean-acidification/examples/TotalAlkalinity.json index f6b0a3e..7957188 100644 --- a/ocean-acidification/examples/TotalAlkalinity.json +++ b/ocean-acidification/examples/TotalAlkalinity.json @@ -6,8 +6,13 @@ "result": {"value": 12, "uom":"http://example.com/foo"}, "procedure": { "id": "exampleTotalAlkalinity", - "methodology": {"id": "foo"}, + "methodology": { + "id": "someChemicalAnalysisMethod", + "reference": {"href": "https://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/examples/Reference_Examle.json"}, + "preparationStep": {"id": "The Prepartory work for method above"} + }, "instrument": {"href": "http://bar"}, - "laboratory": {"href": "http://baz"} + "laboratory": {"href": "http://baz"}, + "quality": {"href": "http://blahblah"} } } From 4ac1b2a43f59d3375a2500b68baac8bd87e4055c Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 19 Oct 2015 16:23:04 +0100 Subject: [PATCH 34/46] Rename TotalAlkalinity.json to Observation.json --- .../examples/{TotalAlkalinity.json => Observation.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ocean-acidification/examples/{TotalAlkalinity.json => Observation.json} (100%) diff --git a/ocean-acidification/examples/TotalAlkalinity.json b/ocean-acidification/examples/Observation.json similarity index 100% rename from ocean-acidification/examples/TotalAlkalinity.json rename to ocean-acidification/examples/Observation.json From 2178ad811bd6544d61aee8bdd9ceb55d981a0560 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 19 Oct 2015 16:23:23 +0100 Subject: [PATCH 35/46] Rename Observation.json to Observation_Example.json --- .../examples/{Observation.json => Observation_Example.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ocean-acidification/examples/{Observation.json => Observation_Example.json} (100%) diff --git a/ocean-acidification/examples/Observation.json b/ocean-acidification/examples/Observation_Example.json similarity index 100% rename from ocean-acidification/examples/Observation.json rename to ocean-acidification/examples/Observation_Example.json From 9f4471ec9b4c94b53c918198477785b1cfb50bfa Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 19 Oct 2015 16:42:29 +0100 Subject: [PATCH 36/46] Create PreparationStep_Example.json --- ocean-acidification/examples/PreparationStep_Example.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 ocean-acidification/examples/PreparationStep_Example.json diff --git a/ocean-acidification/examples/PreparationStep_Example.json b/ocean-acidification/examples/PreparationStep_Example.json new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/ocean-acidification/examples/PreparationStep_Example.json @@ -0,0 +1 @@ + From 18f121d6763071c85e201aadeb3bc87f45392b99 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Tue, 20 Oct 2015 09:05:44 +0100 Subject: [PATCH 37/46] Update Observation --- Observation.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Observation.json b/Observation.json index c5ce00e..aad2d46 100644 --- a/Observation.json +++ b/Observation.json @@ -70,7 +70,8 @@ { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/text" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalObject" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesTVP.json#/definitions/TimeseriesTVP" } + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesTVP.json#/definitions/TVPairMeasure" }, + { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesTVP.json#/definitions/TVPairCategory" } ] } }, From 692cc164bd95ca2efe2fe9c223e4ef56b9ae4ba1 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Tue, 20 Oct 2015 09:21:58 +0100 Subject: [PATCH 38/46] Example creation --- Observation.json | 4 ++-- ocean-acidification/Reference.json | 12 +++--------- .../examples/Observation_Example.json | 18 +++++++++++++----- .../examples/PreparationStep_Example.json | 1 - .../examples/Reference_Examle.json | 3 +-- 5 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 ocean-acidification/examples/PreparationStep_Example.json diff --git a/Observation.json b/Observation.json index aad2d46..1f0ad77 100644 --- a/Observation.json +++ b/Observation.json @@ -35,7 +35,7 @@ "procedure": { "title": "procedure", "description": "procedure used in making observation. Typically a sensor or sensor-system, algorithm, computational procedure.", - "anyOf": [ + "oneOf": [ { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json" } ] @@ -61,7 +61,7 @@ "result": { "title": "result", "description": "result of the observation", - "anyOf": [ + "oneOf": [ { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/vocabTerm" }, diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index c5c9f71..3817658 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -10,17 +10,11 @@ "description": "A unique identifier for this reference", "type": "string" }, - "doi": { + "doiOrWebAddress": { "title": "doi", - "description": "A formal Digital Object Identifier to a resource describing the protocol", + "description": "A formal Digital Object Identifier, or a plain web link, to a resource describing the protocol", - "items": { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" } - }, - "url": { - "title": "url", - "description": "A web address of a resource describing the protocol", - - "items": { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" } + "oneOf": [{ "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" },{ "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }] }, "citation": { "title": "citation", diff --git a/ocean-acidification/examples/Observation_Example.json b/ocean-acidification/examples/Observation_Example.json index 7957188..1e344cb 100644 --- a/ocean-acidification/examples/Observation_Example.json +++ b/ocean-acidification/examples/Observation_Example.json @@ -3,16 +3,24 @@ "featureOfInterest": {"href": "http://vocab.nerc.ac.uk/collection/C19/current/1_6/"}, "phenomenonTime": {"instant": "2015-09-23T12:51:11.421Z"}, "type": "measure", - "result": {"value": 12, "uom":"http://example.com/foo"}, + "result": {"value": 12, "uom":"http://vocab.nerc.ac.uk/collection/P06/current/UEQL/"}, + "resultTime": "2015-10-23T11:10:10Z", + "observedProperty": {"href": "http://vocab.nerc.ac.uk/collection/P01/current/ALKYZZXX/"}, "procedure": { "id": "exampleTotalAlkalinity", "methodology": { "id": "someChemicalAnalysisMethod", "reference": {"href": "https://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/examples/Reference_Examle.json"}, - "preparationStep": {"id": "The Prepartory work for method above"} + "preparationStep": { + "id": "The Prepartory work for method above", + "analysis": {"href": "http://vocab.nerc.ac.uk/collection/S04/current/S0475/"} + } }, - "instrument": {"href": "http://bar"}, - "laboratory": {"href": "http://baz"}, - "quality": {"href": "http://blahblah"} + "instrument": {"href": "http://vocab.nerc.ac.uk/collection/L22/current/TOOL0481/"}, + "laboratory": {"href": "SDN:EDMO:396"}, + "quality": { + "id": "A general example of how quality could work", + "limitOfDetection": "0 - 15" + } } } diff --git a/ocean-acidification/examples/PreparationStep_Example.json b/ocean-acidification/examples/PreparationStep_Example.json deleted file mode 100644 index 8b13789..0000000 --- a/ocean-acidification/examples/PreparationStep_Example.json +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ocean-acidification/examples/Reference_Examle.json b/ocean-acidification/examples/Reference_Examle.json index 5a5d877..d98fa1b 100644 --- a/ocean-acidification/examples/Reference_Examle.json +++ b/ocean-acidification/examples/Reference_Examle.json @@ -1,7 +1,6 @@ { "id": "Leadbetter&Vodden2015", - "doi": {"doi": "10.1080/17538947.2015.1033483"}, - "url": {"href": "http://www.tandfonline.com/doi/abs/10.1080/17538947.2015.1033483"}, + "doiOrWebAddress": {"doi": "10.1080/17538947.2015.1033483"}, "citation": "Leadbetter, A.M. & Vodden, P.N. (2015). Semantic linking of complex properties, monitoring processes and facilities in web-based representations of the environment. International Journal of Digital Earth.", "informalReference": "Leadbetter & Vodden, 2015." } From 7b46fc45bc0a42c11c0a3412b0b36ccbf872e12d Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Tue, 20 Oct 2015 12:35:28 +0100 Subject: [PATCH 39/46] Validation errors fixed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - MonitoringFeature contain an incorrect link to geometryObject. This is in Geometry.json, not Common.json - MonitoringFeature lists id as required, but there is no definition provided (does this duplicate the id definition in SamplingCollection, or do we pull the definition out into Common and reference it from there in both SamplingCollection and MonitoringFeature… - SamplingCollection contains type class which is of type “enum”: "type": { "title": "type", "description": "Identifies the type of object", "type": "enum" }, he reference example file filename contains a type (Reference_Examle.json instead of Reference_Example.json) --- Common.json | 147 +++++++++++------- MonitoringFeature.json | 7 +- SamplingCollection.json | 3 +- ...nce_Examle.json => Reference_Example.json} | 0 4 files changed, 96 insertions(+), 61 deletions(-) rename ocean-acidification/examples/{Reference_Examle.json => Reference_Example.json} (100%) diff --git a/Common.json b/Common.json index 8a3ccbc..f7b29ce 100644 --- a/Common.json +++ b/Common.json @@ -1,62 +1,91 @@ { - "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json", - "title": "Common", - "description": "A collection of commonly used types. Should maybe come from somehwere else, one day.", - "definitions": { - "count": { - "title": "count", - "type": "integer" - }, - "measure": { - "title": "measure", - "description": "scaled number - uom is optional, to support the case where a common uom is used in a collection", - "type": "object", - "properties": { - "value": { "type": "number" }, - "uom": { "type": "string" } - }, - "required": [ "value" ], - "additionalProperties": false - }, - "text": { - "title": "text", - "type": "string" - }, - "truth": { - "title": "truth", - "type": "boolean" - }, - "vocabTerm": { - "title": "vocabTerm", - "description": "term with optional vocabulary source", - "type": "object", - "properties": { - "term": { "type": "string" }, - "vocabulary": { "type": "string", "format": "uri" } - }, - "required": [ "term" ], - "additionalProperties": false - }, - "link": { - "title": "link", - "type": "object", - "properties": { - "href": { "type": "string", "format": "uri" }, - "rel": { "type": "string", "format": "uri" }, - "title": { "type": "string" } - }, - "required": [ "href" ], - "additionalProperties":false - }, - "doi": { - "title": "doi", - "type": "object", - "properties": { - "doi": { "type": "string", "format": "uri" } + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json", + "title": "Common", + "description": "A collection of commonly used types. Should maybe come from somehwere else, one day.", + "definitions": { + "count": { + "title": "count", + "type": "integer" }, - "required": [ "doi" ], - "additionalProperties":false + "measure": { + "title": "measure", + "description": "scaled number - uom is optional, to support the case where a common uom is used in a collection", + "type": "object", + "properties": { + "value": { + "type": "number" + }, + "uom": { + "type": "string" + } + }, + "required": [ + "value" + ], + "additionalProperties": false + }, + "text": { + "title": "text", + "type": "string" + }, + "truth": { + "title": "truth", + "type": "boolean" + }, + "vocabTerm": { + "title": "vocabTerm", + "description": "term with optional vocabulary source", + "type": "object", + "properties": { + "term": { + "type": "string" + }, + "vocabulary": { + "type": "string", + "format": "uri" + } + }, + "required": [ + "term" + ], + "additionalProperties": false + }, + "link": { + "title": "link", + "type": "object", + "properties": { + "href": { + "type": "string", + "format": "uri" + }, + "rel": { + "type": "string", + "format": "uri" + }, + "title": { + "type": "string" + } + }, + "required": [ + "href" + ], + "additionalProperties": false + }, + "doi": { + "title": "doi", + "description": "A Digital Object Identifer to define a resource", + "type": "object", + "properties": { + "doi": { + "type": "string", + "format": "uri" + } + }, + "required": [ + "doi" + ], + "additionalProperties": false + } } - } -} +} \ No newline at end of file diff --git a/MonitoringFeature.json b/MonitoringFeature.json index 12eb287..3de993b 100644 --- a/MonitoringFeature.json +++ b/MonitoringFeature.json @@ -24,6 +24,11 @@ } }, "properties": { + "id": { + "title": "id", + "description": "A unique identifier for the observation", + "type": "string" + }, "relatedParty": { "title": "relatedParty", "description": "The details of a party related to this MonitoringFeature. Multiple related parties may be described using the role code list (from ISO 19115). The most common relationships are likely to be: owner, originator, pointOfContact, principalInvestigator and distributor.", @@ -32,7 +37,7 @@ "representativePoint": { "title": "representativePoint", "description": "A point location that is representative of the monitoring feature's location. Typically this is used when the shape of the monitoring feature is an area or other non-point geometry. It may also be used to provide an approximate point location in sensitive observation scenarios.", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/geometryObject" + "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" }, "monitoringType": { "title": "monitoringType", diff --git a/SamplingCollection.json b/SamplingCollection.json index 55b5d28..ffa860f 100644 --- a/SamplingCollection.json +++ b/SamplingCollection.json @@ -13,7 +13,8 @@ "type": { "title": "type", "description": "Identifies the type of object", - "type": "enum" + "type": "string", + "enum": ["Specimen","Sampling","SpatialSampling"] }, "sampledFeature": { "title": "sampledFeature", diff --git a/ocean-acidification/examples/Reference_Examle.json b/ocean-acidification/examples/Reference_Example.json similarity index 100% rename from ocean-acidification/examples/Reference_Examle.json rename to ocean-acidification/examples/Reference_Example.json From 080ab04a6e8c90474b4c6cfbab12c0daf4259505 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 14 Dec 2015 19:45:09 +0000 Subject: [PATCH 40/46] Fixed #1 --- Common.json | 2 +- Geometry.json | 2 +- Measurement.json | 6 ++-- MonitoringFeature.json | 10 +++--- Observation.json | 38 ++++++++++---------- ObservationCollection.json | 22 ++++++------ Sampling.json | 6 ++-- SamplingCollection.json | 12 +++---- SpatialSampling.json | 6 ++-- Specimen.json | 26 +++++++------- Temporal.json | 2 +- TimeseriesMetadata.json | 44 ++++++++++++------------ TimeseriesTVP.json | 14 ++++---- ocean-acidification/Methodology.json | 4 +-- ocean-acidification/PreparationStep.json | 10 +++--- ocean-acidification/Protocol.json | 8 ++--- ocean-acidification/Quality.json | 8 ++--- ocean-acidification/Reference.json | 2 +- 18 files changed, 111 insertions(+), 111 deletions(-) diff --git a/Common.json b/Common.json index f7b29ce..1295489 100644 --- a/Common.json +++ b/Common.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json", "title": "Common", "description": "A collection of commonly used types. Should maybe come from somehwere else, one day.", "definitions": { diff --git a/Geometry.json b/Geometry.json index 26f19cf..df3d3a4 100644 --- a/Geometry.json +++ b/Geometry.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json", "title": "geometry", "description": "One geometry object, as defined in GeoJSON", "definitions": { diff --git a/Measurement.json b/Measurement.json index 1bfda76..eba1e97 100644 --- a/Measurement.json +++ b/Measurement.json @@ -1,11 +1,11 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/Measuement.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Measuement.json", "title": "Measurement", "description": "A measurement is an observation whose result is a scaled quantity. An observation is an act associated with a discrete time instant or period through which a number, term or other symbol is assigned to a phenomenon. It involves application of a specified procedure, such as a sensor, instrument, algorithm or process chain. The procedure may be applied in-situ, remotely, or ex-situ with respect to the sampling location. The result of an observation is an estimate of the value of a property of some feature. Use of a common model allows observation data using different procedures to be combined unambiguously. The observation itself is also a feature, since it has properties and identity. Observation details are important for data discovery and for data quality estimation. The observation could be considered to carry âœproperty-level❠instance metadata, which complements the dataset-level and feature-level metadata that have been conventionally considered (e.g. ISO 19115)", "type": "object", "allOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Observation.json" } + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Observation.json" } ], "properties": { "id": { }, @@ -17,7 +17,7 @@ "samplingStrategy": { }, "resultTime": { }, "context": { }, - "result": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" } + "result": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/measure" } }, "required": [ "id", "phenomenonTime", "result" ], "additionalProperties": false diff --git a/MonitoringFeature.json b/MonitoringFeature.json index 3de993b..9cd9fb0 100644 --- a/MonitoringFeature.json +++ b/MonitoringFeature.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/MonitoringFeature.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/MonitoringFeature.json", "title": "MonitoringFeature", "description": "A TimeseriesML MonitoringFeature", "type": "object", @@ -37,22 +37,22 @@ "representativePoint": { "title": "representativePoint", "description": "A point location that is representative of the monitoring feature's location. Typically this is used when the shape of the monitoring feature is an area or other non-point geometry. It may also be used to provide an approximate point location in sensitive observation scenarios.", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json#/definitions/geometryObject" }, "monitoringType": { "title": "monitoringType", "description": "A thematic characterisation of the type of monitoring feature. E.g. meteorological, surface water, groundwater, water quality etc.", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "descriptionReference": { "title": "descriptionReference", "description": "Provide extra descriptive information about a monitoring feature. This could be a link to an HTML page describing the location, photos of a monitoring point, history records etc.", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "verticalDatum": { "title": "verticalDatum", "description": "Specifies the elevation that is used as the zero point, or datum, for height-related measurements. The datum is defined using a vertical datum, which may be defined using the ISO19111 type CD_VerticalDatum, or an agreed upon datum may be reference by its identifier. E.g. the Australian Height Datum (AHD), Tasmania = “EPSG::5112”. The CD_VerticalDatum type allows specification of the local vertical datum as a height above another reference datum. E.g. local vertical datum is 23m above the AHD.", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "timeZone": { "title": "timeZone", diff --git a/Observation.json b/Observation.json index 1f0ad77..577f8b5 100644 --- a/Observation.json +++ b/Observation.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/Observation.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Observation.json", "title": "Observation", "description": "An observation is an act associated with a discrete time instant or period through which a number, term or other symbol is assigned to a phenomenon. It involves application of a specified procedure, such as a sensor, instrument, algorithm or process chain. The procedure may be applied in-situ, remotely, or ex-situ with respect to the sampling location. The result of an observation is an estimate of the value of a property of some feature.", "type": "object", @@ -19,59 +19,59 @@ "title": "context", "description": "links to observations that provide the context for this observation - use 'rel' for 'role'", "type": "array", - "items": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + "items": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "minItems": 1 }, "phenomenonTime": { "title": "phenomenonTime", "description": "Time at which the estimate of the property that is the result of the observation is associated with the feature of interest", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalPrimitive" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalPrimitive" }, "observedProperty": { "title": "observedProperty", "description": "property whose value is the result of the observation", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "procedure": { "title": "procedure", "description": "procedure used in making observation. Typically a sensor or sensor-system, algorithm, computational procedure.", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json" } ] }, "featureOfInterest": { "title": "featureOfInterest", "description": "subject of the observation, whose type may carry the observed property", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "samplingStrategy": { "title": "samplingStrategy", "description": "a strategy, such as a sampling feature, which mediates between the procedure and the ultimate feature of interest", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json" } + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" } ] }, "resultTime": { "title": "resultTime", "description": "time at which the result became available, after all processing steps were completed", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimePosition" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimePosition" }, "result": { "title": "result", "description": "result of the observation", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/vocabTerm" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/truth" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/count" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/text" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalObject" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesTVP.json#/definitions/TVPairMeasure" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesTVP.json#/definitions/TVPairCategory" } + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/measure" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/truth" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/count" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/text" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalObject" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json#/definitions/geometryObject" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesTVP.json#/definitions/TVPairMeasure" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesTVP.json#/definitions/TVPairCategory" } ] } }, diff --git a/ObservationCollection.json b/ObservationCollection.json index 5d18e94..78d3d18 100644 --- a/ObservationCollection.json +++ b/ObservationCollection.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/ObservationCollection.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/ObservationCollection.json", "title": "Observation collection", "description": "Collection of observations which may have a common (a) feature of interest (b) observed property (c) observation procedure.", "type": "object", @@ -22,35 +22,35 @@ "procedure": { "title": "featureOfInterest", "description": "the observation procedure used in all observations in the collection", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "featureOfInterest": { "title": "featureOfInterest", "description": "the single feature which all observations in the collection are concerned with", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "samplingStrategy": { "title": "samplingStrategy", "description": "a strategy, such as a sampling feature, which mediates between the procedure and the ultimate feature of interest for all observations in the collection", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json" } + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" } ] }, "observedProperty": { "title": "observedProperty", "description": "the property measured or estimated by all observations in the collection", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "phenomenonTime": { "title": "phenomenonTime", "description": "Time at which the estimate of the property that is the result of the observation is associated with the feature of interest for all observations in the collection", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalPrimitive" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalPrimitive" }, "resultTime": { "title": "resultTime", "description": "time at which the result became available, after all processing steps were completed, for all observations in the collection", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/date-time" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/date-time" }, "uom": { "title": "unit-of-measure", @@ -60,7 +60,7 @@ "vocabulary": { "title": "vocabulary", "description": "vocabulary for all categorical result valuesfor observations in the collection", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "member": { "title": "member", @@ -68,8 +68,8 @@ "type": "array", "items": { "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Observation.json" } + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Observation.json" } ] }, "minItems": 1, diff --git a/Sampling.json b/Sampling.json index 3d2f6c0..42a1b43 100644 --- a/Sampling.json +++ b/Sampling.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json", "title": "Sampling feature", "description": "Feature on which observations may be made, which is intended to be representative of a different (usually larger) feature that is not fully accessible for some reason.", "type": "object", @@ -19,7 +19,7 @@ "title": "sampledFeature", "description": "the feature which the sampling feature was designed to sample", "type": "array", - "items": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + "items": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "minItems": 1, "uniqueItems": true }, @@ -27,7 +27,7 @@ "title": "complex", "description": "link to related sampling features", "type": "array", - "items": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + "items": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "minItems": 1 } }, diff --git a/SamplingCollection.json b/SamplingCollection.json index ffa860f..230675d 100644 --- a/SamplingCollection.json +++ b/SamplingCollection.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/SamplingCollection.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/SamplingCollection.json", "title": "Sampling feature collection", "description": "Collection of features on which observations may be made.", "type": "object", @@ -20,7 +20,7 @@ "title": "sampledFeature", "description": "the feature which the sampling feature collection was designed to sample", "type": "array", - "items": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + "items": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "minItems": 1, "uniqueItems": true }, @@ -30,10 +30,10 @@ "type": "array", "items": { "anyOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Specimen.json" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/SpatialSampling.json" } + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Specimen.json" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/SpatialSampling.json" } ] }, "minItems": 1, diff --git a/SpatialSampling.json b/SpatialSampling.json index 392bfab..95f5f77 100644 --- a/SpatialSampling.json +++ b/SpatialSampling.json @@ -5,19 +5,19 @@ "description": " ## EXTENDS SAMPLING FEATURE ## Sampling feature whose defining characteristic is that it samples the intended feature by geometric subsetting. ", "type": "object", "allOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" }, { "properties": { "shape": { "title": "shape", "description": "Spatial location and extent of the sampling feature", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json#/definitions/geometryObject" }, "hostedProcedure": { "title": "hostedProcedure", "description": "Observation procedure (instrument, sensor, observer) associated with or hosted by this spatial sampling feature.", "type": "array", - "items": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + "items": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "minItems": 1 } } diff --git a/Specimen.json b/Specimen.json index e249004..94a5975 100644 --- a/Specimen.json +++ b/Specimen.json @@ -1,38 +1,38 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/Specimen.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Specimen.json", "title": "Specimen", "description": " ## EXTENDS SAMPLING FEATURE ## A Specimen is a physical sample, obtained for observation(s) normally carried out ex-situ, sometimes in a laboratory.", "type": "object", "allOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Sampling.json" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" }, { "properties": { "samplingTime": { "title": "samplingTime", "description": "time the specimen was taken from the sampled feature", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalPrimitive" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalPrimitive" }, "samplingMethod": { "title": "samplingMethod", "description": "Process used to take the specimen from the sampled feature.", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "samplingLocation": { "title": "samplingLocation", "description": "Location from which the specimen was taken within the sampled feature", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/text" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" } + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/text" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json#/definitions/geometryObject" } ] }, "samplingElevation": { "title": "samplingElevation", "description": "Elevation from which the specimen was taken at the sampling location", "properties": { - "elevation": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" }, - "verticalDatum": { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" } + "elevation": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/measure" }, + "verticalDatum": { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } }, "required": [ "elevation"] }, @@ -40,15 +40,15 @@ "title": "currentLocation", "description": "Location where the specimen is currently", "oneOf": [ - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/text" }, - { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Geometry.json#/definitions/geometryObject" } + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/text" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json#/definitions/geometryObject" } ] }, "size": { "title": "size", "description": "Physical extent of the specimen (length, mass, etc)", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/measure" } } } diff --git a/Temporal.json b/Temporal.json index 7ccc5c6..abe73b4 100644 --- a/Temporal.json +++ b/Temporal.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json", "title": "Temporal", "description": "Temporal objects", "definitions": { diff --git a/TimeseriesMetadata.json b/TimeseriesMetadata.json index 9d51c8c..ac83667 100644 --- a/TimeseriesMetadata.json +++ b/TimeseriesMetadata.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesMetadata.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesMetadata.json", "title": "TimeseriesMetadata", "description": "Schema for metadata relating to Timeseries", "type": "object", @@ -12,17 +12,17 @@ "temporalExtent": { "title":"temporalExtent", "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInterval" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInterval" }, "baseTime": { "title":"baseTime", "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInstant" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInstant" }, "spacing": { "title":"spacing", "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/duration" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/duration" }, "commentBlock" : { "title" : "commentBlock", @@ -30,7 +30,7 @@ "properties" : { "applicablePeriod" : { "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInterval" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInterval" }, "comment" : { "type" : "string" @@ -48,13 +48,13 @@ "title":"intendedObservationSpacing", "description": "The intended temporal spacing of the time series points. This may vary from the actual spacing.", "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/duration" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/duration" }, "status": { "title":"status", "description": "Indicates the statues of the observation. E.g. unreleased, verified etc.", "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "cumulative": { "title":"cumulative", @@ -64,22 +64,22 @@ "accumulationAnchorTime": { "title":"accumulationAnchorTime", "description": "Defines the time at which accumulation begins. e.g. 9am.", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInstant" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInstant" }, "startAnchorPoint": { "title":"startAnchorPoint", "description": "Specifies a ‘ghost’ point to allow the first value of the timeseries to be interpolated correctly.", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInstant" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInstant" }, "endAnchorPoint": { "title":"endAnchorPoint", "description": "Specifies a ‘ghost’ point to allow the last value of the timeseries to be interpolated correctly.", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/dateTimeInstant" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/dateTimeInstant" }, "maxGapPeriod": { "title":"maxGapPeriod", "description": "When any analysis is run over a timeseries it is important to know if it is possible to interpolate between any two adjoining points. If the join period between two adjoining points is greater than the maxGapPeriod then the series should not be interpolated between these adjoining points.", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/duration" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/duration" } }, "additionalProperties": false @@ -91,27 +91,27 @@ "quality": { "title":"quality", "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "uom": { "title":"uom", "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "interpolationType": { "title":"interpolationType", "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "nilReason": { "title":"nilReason", "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "censoredReason": { "title":"censoredReason", "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "comment": { "title":"comment", @@ -119,27 +119,27 @@ }, "accuracy": { "title":"accuracy", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/measure" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/measure" }, "relatedObservation": { "title":"relatedObservation", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "aggregationDuration": { "title":"aggregationDuration", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/duration" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/duration" }, "qualifier": { "title":"qualifier", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "processing": { "title":"processing", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "source": { "title":"source", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" } }, "additionalProperties": false diff --git a/TimeseriesTVP.json b/TimeseriesTVP.json index 0b5eac1..14091e6 100644 --- a/TimeseriesTVP.json +++ b/TimeseriesTVP.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesTVP.json", + "id": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesTVP.json", "title": "TimeseriesTVP", "description": "A TimeseriesML time-value pair encoded timeseries", "type": "object", @@ -11,14 +11,14 @@ "properties" : { "time": { "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalPrimitive" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalPrimitive" }, "value": { "type":"number" }, "metadata": { "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesMetadata.json#/definitions/PointMetadata" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesMetadata.json#/definitions/PointMetadata" } }, "additionalProperties":false @@ -29,11 +29,11 @@ "properties" : { "time": { "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Temporal.json#/definitions/temporalPrimitive" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Temporal.json#/definitions/temporalPrimitive" }, "value": { "type":"object", - "$ref":"http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/vocabTerm" + "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" } }, "additionalProperties":false @@ -53,12 +53,12 @@ "metadata": { "title": "metadata", "description": "Metadata about the timeseries.", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesMetadata.json#/definitions/TimeseriesMetadata" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesMetadata.json#/definitions/TimeseriesMetadata" }, "defaultPointMetadata": { "title": "defaultPointMetadata", "description": "Default metadata for each point in the timeseries (can be overridden on a per-point basis).", - "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/TimeseriesMetadata.json#/definitions/PointMetadata" + "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesMetadata.json#/definitions/PointMetadata" }, "points": { "title": "points", diff --git a/ocean-acidification/Methodology.json b/ocean-acidification/Methodology.json index aca9865..97467d8 100644 --- a/ocean-acidification/Methodology.json +++ b/ocean-acidification/Methodology.json @@ -14,7 +14,7 @@ "title": "reference", "description": "Either an object defining the academic literature reference or a URL linking to such an object", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Reference.json" } ] }, @@ -22,7 +22,7 @@ "title": "preparation step", "description": "Either an object defining the sample preparation steps taken reference or a URL linking to such an object", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/PreparationStep.json" } ] } diff --git a/ocean-acidification/PreparationStep.json b/ocean-acidification/PreparationStep.json index 06ada2a..13953e5 100644 --- a/ocean-acidification/PreparationStep.json +++ b/ocean-acidification/PreparationStep.json @@ -14,7 +14,7 @@ "title": "fixation", "description": "Either a plain text description of the fixation method, or a URL to a description of the fixation method in a controlled vocabulary entry", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -22,7 +22,7 @@ "title": "storage", "description": "Either a plain text description of the storage method, or a URL to a description of the storage method in a controlled vocabulary entry", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -30,7 +30,7 @@ "title": "extraction", "description": "Either a plain text description of the extraction method, or a URL to a description of the extraction method in a controlled vocabulary entry", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -38,7 +38,7 @@ "title": "pretreatment", "description": "Either a plain text description of the pretreatment method, or a URL to a description of the pretreatment method in a controlled vocabulary entry", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -46,7 +46,7 @@ "title": "analysis", "description": "Either a plain text description of the analysis method, or a URL to a description of the analysis method in a controlled vocabulary entry", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] } diff --git a/ocean-acidification/Protocol.json b/ocean-acidification/Protocol.json index 533f908..b1924e5 100644 --- a/ocean-acidification/Protocol.json +++ b/ocean-acidification/Protocol.json @@ -13,18 +13,18 @@ "instrument": { "title": "instrument", "description": "A URL linking to a controlled vocabulary term defining the instrument make and model used in this instance of the protocol", - "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "laboratory": { "title": "laboratory", "description": "A URL to a controlled vocabulary term defining the laboratory responsible for the observation made using this instance of the protocol", - "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" + "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, "methodology": { "title": "methodology", "description": "Either an object or a URL giving a description of a reference to, for example, a journal article and some descriptive parameters for an analytical methodology", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Methodology.json" } ] }, @@ -32,7 +32,7 @@ "title": "quality", "description": "Either an object or a URL giving a description of the quality (limits of detection, accuracy, precision, uncertainty) of an analytical protocol", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Quality.json" } ] } diff --git a/ocean-acidification/Quality.json b/ocean-acidification/Quality.json index 0e11c16..74b511a 100644 --- a/ocean-acidification/Quality.json +++ b/ocean-acidification/Quality.json @@ -14,7 +14,7 @@ "title": "limit of detection", "description": "Either a URL or a string describing the limit of detection for the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -22,7 +22,7 @@ "title": "accuracy", "description": "Either a URL or a string describing the accuracy of the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -30,7 +30,7 @@ "title": "precision", "description": "Either a URL or a string describing the precision of the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] }, @@ -38,7 +38,7 @@ "title": "uncertainty", "description": "Either a URL or a string describing the uncertainty of the analytical method", "oneOf": [ - { "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }, + { "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "type" : "string" } ] } diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index 3817658..54d8666 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -14,7 +14,7 @@ "title": "doi", "description": "A formal Digital Object Identifier, or a plain web link, to a resource describing the protocol", - "oneOf": [{ "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/doi" },{ "$ref" : "http://raw.githubusercontent.com/adamml/om-json/master/Common.json#/definitions/link" }] + "oneOf": [{ "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/doi" },{ "$ref" : "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }] }, "citation": { "title": "citation", From 80c0a0a2923c0613a859107f10f89baca28b2f21 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 14 Dec 2015 20:07:39 +0000 Subject: [PATCH 41/46] Added JSON-LD context to everything. --- Common.json | 10 ++++++++++ Geometry.json | 1 + Measurement.json | 1 + MonitoringFeature.json | 1 + Observation.json | 1 + ObservationCollection.json | 1 + Sampling.json | 1 + SamplingCollection.json | 1 + SpatialSampling.json | 1 + Temporal.json | 1 + TimeseriesMetadata.json | 1 + TimeseriesTVP.json | 1 + ocean-acidification/Methodology.json | 1 + ocean-acidification/PreparationStep.json | 1 + ocean-acidification/Protocol.json | 1 + ocean-acidification/Quality.json | 1 + ocean-acidification/Reference.json | 1 + 17 files changed, 26 insertions(+) diff --git a/Common.json b/Common.json index 1295489..0b00b0e 100644 --- a/Common.json +++ b/Common.json @@ -4,6 +4,16 @@ "title": "Common", "description": "A collection of commonly used types. Should maybe come from somehwere else, one day.", "definitions": { + "@context": { + oneOf: [{ + "title": "@context", + "description": "A context header for JSON-LD applications - using string here to allow for a remote context", + "type": "string"}, + {"title": "@context", + "description": "A context header for JSON-LD applications - using array here to allow for a local context", + "type": "array"} + ] + }, "count": { "title": "count", "type": "integer" diff --git a/Geometry.json b/Geometry.json index df3d3a4..df557ad 100644 --- a/Geometry.json +++ b/Geometry.json @@ -113,6 +113,7 @@ } }, "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "geometry": { "$ref": "#/definitions/geometryObject"} }, "required": [ "geometry" ] diff --git a/Measurement.json b/Measurement.json index eba1e97..c1326f8 100644 --- a/Measurement.json +++ b/Measurement.json @@ -8,6 +8,7 @@ { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Observation.json" } ], "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { }, "type": { "enum": [ "Measurement" ] } , "phenomenonTime": { }, diff --git a/MonitoringFeature.json b/MonitoringFeature.json index 9cd9fb0..df11766 100644 --- a/MonitoringFeature.json +++ b/MonitoringFeature.json @@ -24,6 +24,7 @@ } }, "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "A unique identifier for the observation", diff --git a/Observation.json b/Observation.json index 577f8b5..e32e73b 100644 --- a/Observation.json +++ b/Observation.json @@ -5,6 +5,7 @@ "description": "An observation is an act associated with a discrete time instant or period through which a number, term or other symbol is assigned to a phenomenon. It involves application of a specified procedure, such as a sensor, instrument, algorithm or process chain. The procedure may be applied in-situ, remotely, or ex-situ with respect to the sampling location. The result of an observation is an estimate of the value of a property of some feature.", "type": "object", "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "A unique identifier for the observation", diff --git a/ObservationCollection.json b/ObservationCollection.json index 78d3d18..29c7fa6 100644 --- a/ObservationCollection.json +++ b/ObservationCollection.json @@ -9,6 +9,7 @@ "member" ], "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "A unique identifier for the observation collection", diff --git a/Sampling.json b/Sampling.json index 42a1b43..9a5ebba 100644 --- a/Sampling.json +++ b/Sampling.json @@ -5,6 +5,7 @@ "description": "Feature on which observations may be made, which is intended to be representative of a different (usually larger) feature that is not fully accessible for some reason.", "type": "object", "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "A unique identifier for the sampling feature", diff --git a/SamplingCollection.json b/SamplingCollection.json index 230675d..8fb74d3 100644 --- a/SamplingCollection.json +++ b/SamplingCollection.json @@ -5,6 +5,7 @@ "description": "Collection of features on which observations may be made.", "type": "object", "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "A unique identifier for the sampling feature collection", diff --git a/SpatialSampling.json b/SpatialSampling.json index 95f5f77..a1af24d 100644 --- a/SpatialSampling.json +++ b/SpatialSampling.json @@ -24,6 +24,7 @@ } ], "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": {}, "type": { "enum": [ "SamplingPoint" , "SamplingCurve" , "SamplingSurface" , "SamplingSolid" ] }, "sampledFeature": {}, diff --git a/Temporal.json b/Temporal.json index abe73b4..0cde42a 100644 --- a/Temporal.json +++ b/Temporal.json @@ -71,6 +71,7 @@ } }, "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "time": { "$ref": "#/definitions/temporalObject" } }, "required": [ "time" ] diff --git a/TimeseriesMetadata.json b/TimeseriesMetadata.json index ac83667..d1d06c3 100644 --- a/TimeseriesMetadata.json +++ b/TimeseriesMetadata.json @@ -9,6 +9,7 @@ "description":"Metadata for the whole timeseries", "type":"object", "properties" : { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "temporalExtent": { "title":"temporalExtent", "type":"object", diff --git a/TimeseriesTVP.json b/TimeseriesTVP.json index 14091e6..f94cab2 100644 --- a/TimeseriesTVP.json +++ b/TimeseriesTVP.json @@ -40,6 +40,7 @@ } }, "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "Identifier for the time-series", diff --git a/ocean-acidification/Methodology.json b/ocean-acidification/Methodology.json index 97467d8..5633797 100644 --- a/ocean-acidification/Methodology.json +++ b/ocean-acidification/Methodology.json @@ -5,6 +5,7 @@ "description": "A description of a reference to, for example, a journal article and some descriptive parameters for an analytical methodology", "type": "object", "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "A unique identifier for this protocol", diff --git a/ocean-acidification/PreparationStep.json b/ocean-acidification/PreparationStep.json index 13953e5..6a02059 100644 --- a/ocean-acidification/PreparationStep.json +++ b/ocean-acidification/PreparationStep.json @@ -5,6 +5,7 @@ "description": "Describes the sample preparation", "type": "object", "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "A unique identifier for this sample preparation", diff --git a/ocean-acidification/Protocol.json b/ocean-acidification/Protocol.json index b1924e5..d960545 100644 --- a/ocean-acidification/Protocol.json +++ b/ocean-acidification/Protocol.json @@ -5,6 +5,7 @@ "description": "A specialisation of O&M's process, initially defined for the analytical chemistry domain of the UNESCO-IOC Ocean Acidificiation project", "type": "object", "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "A unique identifier for this protocol", diff --git a/ocean-acidification/Quality.json b/ocean-acidification/Quality.json index 74b511a..cce2adc 100644 --- a/ocean-acidification/Quality.json +++ b/ocean-acidification/Quality.json @@ -5,6 +5,7 @@ "description": "A description of the quality (limits of detection, accuracy, precision, uncertainty) of an analytical protocol", "type": "object", "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "A unique identifier for this protocol", diff --git a/ocean-acidification/Reference.json b/ocean-acidification/Reference.json index 54d8666..34da288 100644 --- a/ocean-acidification/Reference.json +++ b/ocean-acidification/Reference.json @@ -5,6 +5,7 @@ "description": "Describes the recommended citation text for a reference, and provides a link to the journal paper or methodology description", "type": "object", "properties": { + "@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" }, "id": { "title": "id", "description": "A unique identifier for this reference", From f2a84f815cc83b57db52e16bdd3cc98c5c5765e4 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Mon, 14 Dec 2015 20:18:08 +0000 Subject: [PATCH 42/46] Fixed #2 --- SamplingCollection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SamplingCollection.json b/SamplingCollection.json index 8fb74d3..dcdf7fc 100644 --- a/SamplingCollection.json +++ b/SamplingCollection.json @@ -30,7 +30,7 @@ "description": "Member of this sampling feature collection", "type": "array", "items": { - "anyOf": [ + "oneOf": [ { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Sampling.json" }, { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Specimen.json" }, From b05bd9f41ea9c353efa8c49d0becf27ca70eed0b Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 13 May 2016 15:21:02 +0100 Subject: [PATCH 43/46] Added vocabTerm to observedProperty; uom; procedure; featureOfInterest --- Common.json | 5 ++++- Observation.json | 11 +++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Common.json b/Common.json index 0b00b0e..0cc80bc 100644 --- a/Common.json +++ b/Common.json @@ -27,7 +27,10 @@ "type": "number" }, "uom": { - "type": "string" + oneOf: [ + {"type": "string"}, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" } + } } }, "required": [ diff --git a/Observation.json b/Observation.json index e32e73b..bd13b1f 100644 --- a/Observation.json +++ b/Observation.json @@ -31,20 +31,27 @@ "observedProperty": { "title": "observedProperty", "description": "property whose value is the result of the observation", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "oneOf": [ + {"$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link"}, + {"$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm"} + ] }, "procedure": { "title": "procedure", "description": "procedure used in making observation. Typically a sensor or sensor-system, algorithm, computational procedure.", "oneOf": [ { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" }, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" }, { "$ref": "http://raw.githubusercontent.com/adamml/om-json/master/ocean-acidification/Protocol.json" } ] }, "featureOfInterest": { "title": "featureOfInterest", "description": "subject of the observation, whose type may carry the observed property", - "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link" + "oneOf": [ + {"$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/link"}, + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" } + ] }, "samplingStrategy": { "title": "samplingStrategy", From 5f6d10d78046d11fef38a70af8660e5272b01625 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 13 May 2016 15:28:30 +0100 Subject: [PATCH 44/46] Fixed a typo in common.json introduced in b05bd9f41ea9c353efa8c49d0becf27ca70eed0b --- Common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common.json b/Common.json index 0cc80bc..9ffd4f9 100644 --- a/Common.json +++ b/Common.json @@ -29,7 +29,7 @@ "uom": { oneOf: [ {"type": "string"}, - { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" } + { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" }] } } }, From 43c333b1bccee8acd942548e1c274f647d0735c0 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Fri, 13 May 2016 15:35:42 +0100 Subject: [PATCH 45/46] Still fixing Common.json from b05bd9f41ea9c353efa8c49d0becf27ca70eed0b --- Common.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Common.json b/Common.json index 9ffd4f9..a86003b 100644 --- a/Common.json +++ b/Common.json @@ -31,8 +31,7 @@ {"type": "string"}, { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" }] } - } - }, + }, "required": [ "value" ], From c6ebdd084a3228a3c86dd2066a05abe698d266f3 Mon Sep 17 00:00:00 2001 From: Adam Leadbetter Date: Wed, 28 Sep 2016 10:13:53 +0100 Subject: [PATCH 46/46] Fixed oneOfs unenclosed by double quotes --- Common.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Common.json b/Common.json index a86003b..1354e84 100644 --- a/Common.json +++ b/Common.json @@ -5,7 +5,7 @@ "description": "A collection of commonly used types. Should maybe come from somehwere else, one day.", "definitions": { "@context": { - oneOf: [{ + "oneOf": [{ "title": "@context", "description": "A context header for JSON-LD applications - using string here to allow for a remote context", "type": "string"}, @@ -27,7 +27,7 @@ "type": "number" }, "uom": { - oneOf: [ + "oneOf": [ {"type": "string"}, { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" }] } @@ -100,4 +100,4 @@ "additionalProperties": false } } -} \ No newline at end of file +}