From c73c953c7d4f6d5cb48e9eb0b123fada68c53ee7 Mon Sep 17 00:00:00 2001
From: kchason <kchason@users.noreply.github.com>
Date: Tue, 25 Jan 2022 16:53:01 -0500
Subject: [PATCH 1/2] Initial creation of objects and vocab

---
 ontology/observable/observable.ttl | 76 ++++++++++++++++++++++++++++++
 ontology/vocabulary/vocabulary.ttl | 14 ++++++
 2 files changed, 90 insertions(+)

diff --git a/ontology/observable/observable.ttl b/ontology/observable/observable.ttl
index 0a318565..86d41c59 100644
--- a/ontology/observable/observable.ttl
+++ b/ontology/observable/observable.ttl
@@ -3376,6 +3376,61 @@ observable:MSISDNType
 	rdfs:range xsd:string ;
 	.
 
+observable:Measurement
+	a
+		owl:Class ,
+		sh:NodeShape
+		;
+	rdfs:subClassOf observable:ObservableObject ;
+	rdfs:label "Measurement"@en ;
+	rdfs:comment "Measurement is a particular discrete collected data point from a sensor or other device."@en ;
+	sh:targetClass observable:Measurement ;
+	.
+
+observable:MeasurementFacet
+	a
+		owl:Class ,
+		sh:NodeShape
+		;
+	rdfs:subClassOf core:Facet ;
+	rdfs:label "MeasurementFacet"@en ;
+	rdfs:comment "A measurement facet is a grouping of characteristics unique to a particular discrete collected data point from a sensor or other device."@en ;
+	sh:property
+		[
+			sh:datatype xsd:dateTime ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:nodeKind sh:Literal ;
+			sh:path observable:endTime ;
+		] ,
+		[
+			sh:datatype xsd:dateTime ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:nodeKind sh:Literal ;
+			sh:path observable:startTime ;
+		] ,
+		[
+			sh:datatype xsd:decimal ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:minCount "1"^^xsd:integer ;
+			sh:nodeKind sh:Literal ;
+			sh:path observable:measurement ;
+		] ,
+		[
+			sh:datatype xsd:integer ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:nodeKind sh:Literal ;
+			sh:path observable:measurementCount ;
+		] ,
+		[
+			sh:datatype vocabulary:MeasurementUnitVocab ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:nodeKind sh:Literal ;
+			sh:path observable:unitType ;
+		]
+		;
+	sh:targetClass observable:MeasurementFacet ;
+	.
+
 observable:Memory
 	a
 		owl:Class ,
@@ -10145,6 +10200,20 @@ observable:maxRunTime
 	rdfs:range xsd:integer ;
 	.
 
+observable:measurement
+	a owl:DatatypeProperty ;
+	rdfs:label "measurement"@en ;
+	rdfs:comment "The value of a discrete collected data point from a sensor or other device."@en ;
+	rdfs:range xsd:decimal ;
+	.
+
+observable:measurementCount
+	a owl:DatatypeProperty ;
+	rdfs:label "measurementCount"@en ;
+	rdfs:comment "The number of discrete collected data points from a sensor or other device."@en ;
+	rdfs:range xsd:integer ;
+	.
+
 observable:message
 	a owl:ObjectProperty ;
 	rdfs:label "message"@en ;
@@ -11777,6 +11846,13 @@ observable:twitterId
 	rdfs:range xsd:string ;
 	.
 
+observable:unitType
+	a owl:DatatypeProperty ;
+	rdfs:label "unitType"@en ;
+	rdfs:comment "Specifies the type of the measurement value."@en ;
+	rdfs:range vocabulary:MeasurementUnitVocab ;
+	.
+
 observable:updatedDate
 	a owl:DatatypeProperty ;
 	rdfs:label "updatedDate"@en ;
diff --git a/ontology/vocabulary/vocabulary.ttl b/ontology/vocabulary/vocabulary.ttl
index 83f6e472..168eb236 100644
--- a/ontology/vocabulary/vocabulary.ttl
+++ b/ontology/vocabulary/vocabulary.ttl
@@ -587,6 +587,20 @@ vocabulary:LibraryTypeVocab
 	) ;
 	.
 
+vocabulary:MeasurementUnitVocab
+	a rdfs:Datatype ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:label "Measurement Unit Vocabulary"@en-US ;
+	rdfs:comment "Defines an open-vocabulary of types of units for measurement values."@en ;
+	owl:oneOf (
+		"KilometersPerHour"^^vocabulary:MeasurementUnitVocab
+		"MilesPerHour"^^vocabulary:MeasurementUnitVocab
+		"OccurrencesPerHour"^^vocabulary:MeasurementUnitVocab
+		"OccurrencesPerMinute"^^vocabulary:MeasurementUnitVocab
+		"Occurrences"^^vocabulary:MeasurementUnitVocab
+	) ;
+	.
+
 vocabulary:MemoryBlockTypeVocab
 	a rdfs:Datatype ;
 	rdfs:subClassOf rdfs:Resource ;

From 4d5877eadec1d40b562df53e6f5563586b6eec93 Mon Sep 17 00:00:00 2001
From: kchason <kchason@users.noreply.github.com>
Date: Fri, 18 Feb 2022 17:40:16 -0500
Subject: [PATCH 2/2] Update units for measurement unit vocabulary

---
 ontology/vocabulary/vocabulary.ttl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ontology/vocabulary/vocabulary.ttl b/ontology/vocabulary/vocabulary.ttl
index 168eb236..efca73e1 100644
--- a/ontology/vocabulary/vocabulary.ttl
+++ b/ontology/vocabulary/vocabulary.ttl
@@ -593,11 +593,16 @@ vocabulary:MeasurementUnitVocab
 	rdfs:label "Measurement Unit Vocabulary"@en-US ;
 	rdfs:comment "Defines an open-vocabulary of types of units for measurement values."@en ;
 	owl:oneOf (
-		"KilometersPerHour"^^vocabulary:MeasurementUnitVocab
-		"MilesPerHour"^^vocabulary:MeasurementUnitVocab
+		"Calories"^^vocabulary:MeasurementUnitVocab
+		"Grams"^^vocabulary:MeasurementUnitVocab
+		"Joules"^^vocabulary:MeasurementUnitVocab
+		"Liters"^^vocabulary:MeasurementUnitVocab
+		"MetersPerHour"^^vocabulary:MeasurementUnitVocab
+		"Meters"^^vocabulary:MeasurementUnitVocab
 		"OccurrencesPerHour"^^vocabulary:MeasurementUnitVocab
 		"OccurrencesPerMinute"^^vocabulary:MeasurementUnitVocab
 		"Occurrences"^^vocabulary:MeasurementUnitVocab
+		"Pascals"^^vocabulary:MeasurementUnitVocab
 	) ;
 	.