Fix 6 failing examples: remove null stub properties and fix material encoding

avillar · avillar · commit 1bfda78d6a2b · 2026-05-13T10:59:42.000+01:00
Three classes of bug were present:

1. stContactDescription / stFoldDescription set to null (contact.json, fold.json,
   contacts_complex_scenario.json): the schema defines these stub properties as
   type:object (ContactAbstractDescription / FoldAbstractDescription), so null
   fails validation.  The properties are optional in GeoSciML Basic — removed
   them entirely.

2. material objects encoded as flat { "properties": {...}, "lithology": "..." }
   (geologic_unit.json, geologic_units_isle_of_wight.json,
   geologic_units_british_columbia.json): CompoundMaterial extends EarthMaterial
   which extends the JSON-FG Feature schema, so each material must be a full
   Feature object with type/featureType/id/geometry/properties.  Converted to
   { "type": "Feature", "featureType": "RockMaterial", "id": "...",
     "geometry": null, "properties": { "lithology": "..." } }.

3. role / proportion set to null in geologic_units_british_columbia.json:
   CompositionPartRoleTerm is type:string and proportion refs QuantityRange
   (type:object); neither accepts null.  Both fields are optional — removed
   the null entries.
diff --git a/examples/json/4.1/basic/contact.json b/examples/json/4.1/basic/contact.json
@@ -62,7 +62,6 @@
         "rel": "olderHost"
       }
     ],
-    "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity",
-    "stContactDescription": null
+    "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity"
   }
 }
diff --git a/examples/json/4.1/basic/fold.json b/examples/json/4.1/basic/fold.json
@@ -11,7 +11,6 @@
     "name": "is test fold",
     "description": "Test fold properties — an antiform. Hinge line plunges 33° toward azimuth 330°; axial surface dips 78° toward 310° (Plane_Dip_Dip_Direction convention); fold amplitude 10 m. (Structured orientation and amplitude values are carried in GeoSciML Extension's FoldDescription, not in this Basic encoding.)",
     "purpose": "instance",
-    "profileType": "http://resource.geosciml.org/classifier/cgi/foldprofiletype/antiform",
-    "stFoldDescription": null
+    "profileType": "http://resource.geosciml.org/classifier/cgi/foldprofiletype/antiform"
   }
 }
diff --git a/examples/json/4.1/basic/geologic_unit.json b/examples/json/4.1/basic/geologic_unit.json
@@ -70,10 +70,13 @@
       {
         "role": "http://resource.geosciml.org/classifier/cgi/compoundmaterialconstituentpartrole/unspecifiedPartRole",
         "material": {
+          "type": "Feature",
+          "featureType": "RockMaterial",
+          "id": "hervey-group-mudstone",
+          "geometry": null,
           "properties": {
-            "purpose": "instance"
-          },
-          "lithology": "http://resource.geosciml.org/classifier/cgi/simplelithology/mudstone"
+            "lithology": "http://resource.geosciml.org/classifier/cgi/simplelithology/mudstone"
+          }
         },
         "proportion": {
           "type": "QuantityRange",
@@ -86,10 +89,13 @@
       {
         "role": "http://resource.geosciml.org/classifier/cgi/compoundmaterialconstituentpartrole/unspecifiedPartRole",
         "material": {
+          "type": "Feature",
+          "featureType": "RockMaterial",
+          "id": "hervey-group-sandstone",
+          "geometry": null,
           "properties": {
-            "purpose": "instance"
-          },
-          "lithology": "http://resource.geosciml.org/classifier/cgi/simplelithology/sandstone"
+            "lithology": "http://resource.geosciml.org/classifier/cgi/simplelithology/sandstone"
+          }
         },
         "proportion": {
           "type": "QuantityRange",
diff --git a/examples/json/4.1/featurecollections/basic/contacts_complex_scenario.json b/examples/json/4.1/featurecollections/basic/contacts_complex_scenario.json
@@ -47,8 +47,7 @@
           { "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — younger host", "rel": "youngerHost" },
           { "href": "https://example.org/loop3d/OsFormation", "title": "Os Formation (Ordovician) — older host", "rel": "olderHost" }
         ],
-        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/angular_unconformity",
-        "stContactDescription": null
+        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/angular_unconformity"
       }
     },
     {
@@ -78,8 +77,7 @@
           { "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — younger host", "rel": "youngerHost" },
           { "href": "https://example.org/loop3d/SsFormation", "title": "Ss Formation (Silurian) — older host", "rel": "olderHost" }
         ],
-        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/angular_unconformity",
-        "stContactDescription": null
+        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/angular_unconformity"
       }
     },
     {
@@ -109,8 +107,7 @@
           { "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — younger host", "rel": "youngerHost" },
           { "href": "https://example.org/loop3d/XmRockBody", "title": "Xm Rock Body (Early Proterozoic gneiss) — older host", "rel": "olderHost" }
         ],
-        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity",
-        "stContactDescription": null
+        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity"
       }
     },
     {
@@ -142,8 +139,7 @@
           { "href": "https://example.org/loop3d/KdDike",      "title": "Kd Mafic Dike (Cretaceous) — younger host (intrusive)", "rel": "youngerHost" },
           { "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — older host (country rock)", "rel": "olderHost" }
         ],
-        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/igneous_intrusive_contact",
-        "stContactDescription": null
+        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/igneous_intrusive_contact"
       }
     },
     {
@@ -175,8 +171,7 @@
           { "href": "https://example.org/loop3d/KgGranite",   "title": "Kg Granite (Cretaceous) — younger host (intrusive)", "rel": "youngerHost" },
           { "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — older host (country rock)", "rel": "olderHost" }
         ],
-        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/igneous_intrusive_contact",
-        "stContactDescription": null
+        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/igneous_intrusive_contact"
       }
     },
     {
@@ -220,8 +215,7 @@
           { "href": "https://example.org/loop3d/MsFormation", "title": "Ms Formation (Late Miocene) — younger host", "rel": "youngerHost" },
           { "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — older host", "rel": "olderHost" }
         ],
-        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/disconformity",
-        "stContactDescription": null
+        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/disconformity"
       }
     },
     {
@@ -265,8 +259,7 @@
           { "href": "https://example.org/loop3d/MsFormation", "title": "Ms Formation (Late Miocene) — younger host", "rel": "youngerHost" },
           { "href": "https://example.org/loop3d/KgGranite",   "title": "Kg Granite (Cretaceous) — older host", "rel": "olderHost" }
         ],
-        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity",
-        "stContactDescription": null
+        "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity"
       }
     }
   ]
diff --git a/examples/json/4.1/featurecollections/basic/geologic_units_british_columbia.json b/examples/json/4.1/featurecollections/basic/geologic_units_british_columbia.json
diff --git a/examples/json/4.1/featurecollections/basic/geologic_units_isle_of_wight.json b/examples/json/4.1/featurecollections/basic/geologic_units_isle_of_wight.json

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@`
`62`	`62`	`"rel": "olderHost"`
`63`	`63`	`}`
`64`	`64`	`],`
`65`		`- "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity",`
`66`		`- "stContactDescription": null`
	`65`	`+ "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity"`
`67`	`66`	`}`
`68`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`"name": "is test fold",`
`12`	`12`	`"description": "Test fold properties — an antiform. Hinge line plunges 33° toward azimuth 330°; axial surface dips 78° toward 310° (Plane_Dip_Dip_Direction convention); fold amplitude 10 m. (Structured orientation and amplitude values are carried in GeoSciML Extension's FoldDescription, not in this Basic encoding.)",`
`13`	`13`	`"purpose": "instance",`
`14`		`- "profileType": "http://resource.geosciml.org/classifier/cgi/foldprofiletype/antiform",`
`15`		`- "stFoldDescription": null`
	`14`	`+ "profileType": "http://resource.geosciml.org/classifier/cgi/foldprofiletype/antiform"`
`16`	`15`	`}`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@`
`47`	`47`	`{ "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — younger host", "rel": "youngerHost" },`
`48`	`48`	`{ "href": "https://example.org/loop3d/OsFormation", "title": "Os Formation (Ordovician) — older host", "rel": "olderHost" }`
`49`	`49`	`],`
`50`		`- "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/angular_unconformity",`
`51`		`- "stContactDescription": null`
	`50`	`+ "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/angular_unconformity"`
`52`	`51`	`}`
`53`	`52`	`},`
`54`	`53`	`{`
`@@ -78,8 +77,7 @@`
`78`	`77`	`{ "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — younger host", "rel": "youngerHost" },`
`79`	`78`	`{ "href": "https://example.org/loop3d/SsFormation", "title": "Ss Formation (Silurian) — older host", "rel": "olderHost" }`
`80`	`79`	`],`
`81`		`- "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/angular_unconformity",`
`82`		`- "stContactDescription": null`
	`80`	`+ "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/angular_unconformity"`
`83`	`81`	`}`
`84`	`82`	`},`
`85`	`83`	`{`
`@@ -109,8 +107,7 @@`
`109`	`107`	`{ "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — younger host", "rel": "youngerHost" },`
`110`	`108`	`{ "href": "https://example.org/loop3d/XmRockBody", "title": "Xm Rock Body (Early Proterozoic gneiss) — older host", "rel": "olderHost" }`
`111`	`109`	`],`
`112`		`- "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity",`
`113`		`- "stContactDescription": null`
	`110`	`+ "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity"`
`114`	`111`	`}`
`115`	`112`	`},`
`116`	`113`	`{`
`@@ -142,8 +139,7 @@`
`142`	`139`	`{ "href": "https://example.org/loop3d/KdDike", "title": "Kd Mafic Dike (Cretaceous) — younger host (intrusive)", "rel": "youngerHost" },`
`143`	`140`	`{ "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — older host (country rock)", "rel": "olderHost" }`
`144`	`141`	`],`
`145`		`- "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/igneous_intrusive_contact",`
`146`		`- "stContactDescription": null`
	`142`	`+ "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/igneous_intrusive_contact"`
`147`	`143`	`}`
`148`	`144`	`},`
`149`	`145`	`{`
`@@ -175,8 +171,7 @@`
`175`	`171`	`{ "href": "https://example.org/loop3d/KgGranite", "title": "Kg Granite (Cretaceous) — younger host (intrusive)", "rel": "youngerHost" },`
`176`	`172`	`{ "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — older host (country rock)", "rel": "olderHost" }`
`177`	`173`	`],`
`178`		`- "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/igneous_intrusive_contact",`
`179`		`- "stContactDescription": null`
	`174`	`+ "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/igneous_intrusive_contact"`
`180`	`175`	`}`
`181`	`176`	`},`
`182`	`177`	`{`
`@@ -220,8 +215,7 @@`
`220`	`215`	`{ "href": "https://example.org/loop3d/MsFormation", "title": "Ms Formation (Late Miocene) — younger host", "rel": "youngerHost" },`
`221`	`216`	`{ "href": "https://example.org/loop3d/JsFormation", "title": "Js Formation (Jurassic) — older host", "rel": "olderHost" }`
`222`	`217`	`],`
`223`		`- "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/disconformity",`
`224`		`- "stContactDescription": null`
	`218`	`+ "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/disconformity"`
`225`	`219`	`}`
`226`	`220`	`},`
`227`	`221`	`{`
`@@ -265,8 +259,7 @@`
`265`	`259`	`{ "href": "https://example.org/loop3d/MsFormation", "title": "Ms Formation (Late Miocene) — younger host", "rel": "youngerHost" },`
`266`	`260`	`{ "href": "https://example.org/loop3d/KgGranite", "title": "Kg Granite (Cretaceous) — older host", "rel": "olderHost" }`
`267`	`261`	`],`
`268`		`- "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity",`
`269`		`- "stContactDescription": null`
	`262`	`+ "contactType": "http://resource.geosciml.org/classifier/cgi/contacttype/nonconformity"`
`270`	`263`	`}`
`271`	`264`	`}`
`272`	`265`	`]`