use updated measured property for hdruk221 only

HDRUK · May 16, 2024 · 4fa1ceb · 4fa1ceb
1 parent 450c3a8
commit 4fa1ceb
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 27 deletions.
diff --git a/hdr_schemata/definitions/HDRUK/MeasuredProperty.py b/hdr_schemata/definitions/HDRUK/MeasuredProperty.py
@@ -1,6 +1,5 @@
-from pydantic import RootModel, constr
+from pydantic import RootModel
 
 class MeasuredProperty(RootModel):
-    root: constr(min_length=1, max_length=100)
-
+    pass
 
diff --git a/hdr_schemata/models/GWDM/1.0/schema.json b/hdr_schemata/models/GWDM/1.0/schema.json
@@ -744,10 +744,7 @@
                   "title": "LongDescription"
             },
             "MeasuredProperty": {
-                  "maxLength": 100,
-                  "minLength": 1,
-                  "title": "MeasuredProperty",
-                  "type": "string"
+                  "title": "MeasuredProperty"
             },
             "Name": {
                   "title": "Name"

diff --git a/hdr_schemata/models/GWDM/1.1/schema.json b/hdr_schemata/models/GWDM/1.1/schema.json
@@ -820,10 +820,7 @@
                   "title": "LongDescription"
             },
             "MeasuredProperty": {
-                  "maxLength": 100,
-                  "minLength": 1,
-                  "title": "MeasuredProperty",
-                  "type": "string"
+                  "title": "MeasuredProperty"
             },
             "Name": {
                   "title": "Name"

diff --git a/hdr_schemata/models/GWDM/1.2/schema.json b/hdr_schemata/models/GWDM/1.2/schema.json
@@ -849,10 +849,7 @@
                   "title": "LongDescription"
             },
             "MeasuredProperty": {
-                  "maxLength": 100,
-                  "minLength": 1,
-                  "title": "MeasuredProperty",
-                  "type": "string"
+                  "title": "MeasuredProperty"
             },
             "Name": {
                   "title": "Name"

diff --git a/hdr_schemata/models/HDRUK/2.1.2/schema.json b/hdr_schemata/models/HDRUK/2.1.2/schema.json
@@ -1050,10 +1050,7 @@
                   "title": "LongDescription"
             },
             "MeasuredProperty": {
-                  "maxLength": 100,
-                  "minLength": 1,
-                  "title": "MeasuredProperty",
-                  "type": "string"
+                  "title": "MeasuredProperty"
             },
             "MemberOf": {
                   "enum": [

diff --git a/hdr_schemata/models/HDRUK/2.1.3/schema.json b/hdr_schemata/models/HDRUK/2.1.3/schema.json
@@ -1050,10 +1050,7 @@
                   "title": "LongDescription"
             },
             "MeasuredProperty": {
-                  "maxLength": 100,
-                  "minLength": 1,
-                  "title": "MeasuredProperty",
-                  "type": "string"
+                  "title": "MeasuredProperty"
             },
             "MemberOf": {
                   "enum": [

diff --git a/hdr_schemata/models/HDRUK/2.2.0/schema.json b/hdr_schemata/models/HDRUK/2.2.0/schema.json
@@ -1226,10 +1226,7 @@
                   "type": "string"
             },
             "MeasuredProperty": {
-                  "maxLength": 100,
-                  "minLength": 1,
-                  "title": "MeasuredProperty",
-                  "type": "string"
+                  "title": "MeasuredProperty"
             },
             "MemberOf": {
                   "enum": [

diff --git a/hdr_schemata/models/HDRUK/v2_2_1/MeasuredProperty.py b/hdr_schemata/models/HDRUK/v2_2_1/MeasuredProperty.py
@@ -0,0 +1,5 @@
+from pydantic import RootModel, constr
+
+class MeasuredProperty(RootModel):
+    root: constr(min_length=1, max_length=100)
+
diff --git a/hdr_schemata/models/HDRUK/v2_2_1/Observations.py b/hdr_schemata/models/HDRUK/v2_2_1/Observations.py
@@ -0,0 +1,10 @@
+from hdr_schemata.models.HDRUK.v2_2_0 import Observation as BaseObservation
+from pydantic import Field
+from .MeasuredProperty import MeasuredProperty
+
+from .annotations import annotations
+
+an = annotations.observations
+
+class Observation(BaseObservation):
+    measuredProperty: MeasuredProperty = Field(..., **an.measuredProperty.__dict__)
diff --git a/hdr_schemata/models/HDRUK/v2_2_1/__init__.py b/hdr_schemata/models/HDRUK/v2_2_1/__init__.py
@@ -6,6 +6,7 @@
 from .EnrichmentAndLinkage import EnrichmentAndLinkage
 from .Accessibility import Accessibility
 from .Provenance import Provenance
+from .Observations import Observation
 
 from .annotations import annotations as an
 
@@ -28,6 +29,10 @@ class Hdruk221(Hdruk220):
         None, description=an.provenance.description, title=an.provenance.title
     )
 
+    observations: List[Observation] = Field(
+        ..., description=an.observations.description, title=an.observations.title
+    )
+
     @classmethod
     def save_schema(cls, location="./2.2.1/schema.json"):
         with open(location, "w") as f: