Fixing some issues from validation + some additions

Common.json

@@ -1,53 +1,103 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "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": {
-    "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
-    }
-  }
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"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": {
+		"@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"
+		},
+		"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": {
+					"oneOf": [
+					{"type": "string"},
+					{ "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm" }]
+					}
+				},
+			"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
+		}
+	}
 }

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" ]

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": { },

MonitoringFeature.json

@@ -24,6 +24,12 @@
     }
   },
   "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",
+      "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 +38,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/peterataylor/om-json/master/Common.json#/definitions/geometryObject"
+      "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Geometry.json#/definitions/geometryObject"
     },
     "monitoringType": {
       "title": "monitoringType",

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",
@@ -30,17 +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.",
-      "$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" },
+		{ "$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",
@@ -67,7 +78,8 @@
         { "$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/peterataylor/om-json/master/TimeseriesTVP.json#/definitions/TVPairMeasure" },
+        { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesTVP.json#/definitions/TVPairCategory" }
       ]
     }
   },

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",

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",

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",
@@ -13,7 +14,8 @@
     "type": {
       "title": "type",
       "description": "Identifies the type of object",
-      "type": "enum"
+      "type": "string",
+      "enum": ["Specimen","Sampling","SpatialSampling"]
     },
     "sampledFeature": {
       "title": "sampledFeature",
@@ -28,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" },

SpatialSampling.json

@@ -1,6 +1,6 @@
 {
   "$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",
@@ -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": {},

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" ]

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",
@@ -41,7 +42,7 @@
           "title":"commentBlocks",
           "type":"array",
           "items" : { 
-            "$ref":"#/definitions/commentBlock"
+            "$ref":"#/definitions/TimeseriesMetadata/properties/commentBlock"
           }
         },
         "intendedObservationSpacing": {

TimeseriesTVP.json

@@ -21,7 +21,7 @@
           "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/TimeseriesMetadata.json#/definitions/PointMetadata"
         }
       },
-      "additionalProperties":"false"
+      "additionalProperties":false
     },
     "TVPairCategory" : {
       "type":"object",
@@ -36,10 +36,11 @@
           "$ref":"http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/vocabTerm"
         }
       },
-      "additionalProperties":"false"
+      "additionalProperties":false
     }
   },
   "properties": {
+  	"@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" },
     "id": {
       "title": "id",
       "description": "Identifier for the time-series",

json-ld/Context.json

@@ -0,0 +1,13 @@
+"@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",
+    "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"
+  }

ocean-acidification/Methodology.json

@@ -0,0 +1,33 @@
+{
+	"$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": {
+		"@context" : { "$ref": "http://raw.githubusercontent.com/peterataylor/om-json/master/Common.json#/definitions/@context" },
+		"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/ocean-acidification/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/ocean-acidification/PreparationStep.json" }
+			]
+		}
+	},
+	"required": [ "id"],
+	"additionalProperties": false
+}