fix map schema

FZJ-INM1-BDA · Jul 16, 2024 · 11acb9b · 11acb9b
1 parent f5af323
commit 11acb9b
Show file tree

Hide file tree

Showing 7 changed files with 120 additions and 40 deletions.
diff --git a/code/validate.py b/code/validate.py
@@ -20,7 +20,7 @@ class ValidationResult(Enum):
 
 ROOT_DIR = os.path.abspath(f"{os.path.dirname(os.path.realpath(__file__))}/..")
 
-skip_path = ("venv", "siibra-configurations/maps")
+skip_path = ("venv",)
 
 skip_types = (
     "siibra/feature/timeseries/activity/v0.1",

diff --git a/siibra/atlases/parcellationmap/v0.1.json b/siibra/atlases/parcellationmap/v0.1.json
@@ -3,7 +3,7 @@
     "type": "object",
     "properties": {
         "@type": {
-            "const": "siibra/atlases/parcellation_map/v0.1"
+            "const": "siibra/atlases/parcellationmap/v0.1"
         },
         "maptype": {
             "type": "string",
@@ -29,26 +29,13 @@
             "items": {
                 "$ref": "urn:siibra-local:siibra/attr/v0.1.json"
             }
-        },
-        "region_attributes": {
-            "type": "object",
-            "attributes": {
-                "type": "array",
-                "items": {
-                    "$ref": "urn:siibra-local:siibra/attr/v0.1.json"
-                }
-            },
-            "required": [
-                "attributes"
-            ]
         }
     },
     "required": [
         "@type",
         "maptype",
         "parcellation_id",
-        "space_id",
-        "region_attributes"
+        "space_id"
     ],
     "additionalProperties": false
 }
diff --git a/siibra/attr/data/_volume_base/v0.1.json b/siibra/attr/data/_volume_base/v0.1.json
@@ -0,0 +1,72 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "space_id": {
+            "type": "string"
+        },
+        "colormap": {
+            "$ref": "#/definitions/colormap"
+        },
+        "mapping": {
+            "type": "object",
+            "patternProperties": {
+                ".+": {
+                    "$ref": "#/definitions/mappingValue"
+                }
+            }
+        }
+    },
+    "required": [
+        "url"
+    ],
+    "definitions": {
+        "format": {
+            "oneOf": [
+                {
+                    "const": "neuroglancer/precomputed"
+                },
+                {
+                    "const": "neuroglancer/precompmesh"
+                },
+                {
+                    "const": "nii"
+                },
+                {
+                    "const": "gii-mesh"
+                },
+                {
+                    "const": "gii-label"
+                }
+            ]
+        },
+        "colormap": {
+            "oneOf": [
+                {
+                    "const": "magma"
+                }
+            ]
+        },
+        "mappingValue": {
+            "type": "object",
+            "properties": {
+                "range": {
+                    "type": "array",
+                    "items": {
+                        "type": "number"
+                    }
+                },
+                "color": {
+                    "type": "string"
+                },
+                "label": {
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false
+        }
+    }
+}
diff --git a/siibra/attr/data/image/v0.1.json b/siibra/attr/data/image/v0.1.json
@@ -7,36 +7,20 @@
         },
         "format": {
             "$ref": "#/definitions/format"
-        },
-        "url": {
-            "type": "string"
-        },
-        "space_id": {
-            "type": "string"
         }
     },
     "required": [
         "@type",
-        "format",
-        "url"
+        "format"
     ],
     "definitions": {
         "format": {
             "oneOf": [
                 {
                     "const": "neuroglancer/precomputed"
                 },
-                {
-                    "const": "neuroglancer/precompmesh"
-                },
                 {
                     "const": "nii"
-                },
-                {
-                    "const": "gii-mesh"
-                },
-                {
-                    "const": "gii-label"
                 }
             ]
         }

diff --git a/siibra/attr/data/mesh/v0.1.json b/siibra/attr/data/mesh/v0.1.json
@@ -0,0 +1,40 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "object",
+    "allOf": [
+        {
+            "$ref": "urn:siibra-local:siibra/attr/data/_volume_base/v0.1.json"
+        }
+    ],
+    "properties": {
+        "@type": {
+            "const": "siibra/attr/data/mesh/v0.1"
+        },
+        "format": {
+            "$ref": "#/definitions/format"
+        }
+    },
+    "required": [
+        "@type",
+        "format",
+        "url"
+    ],
+    "definitions": {
+        "format": {
+            "oneOf": [
+                {
+                    "const": "neuroglancer/precompmesh"
+                },
+                {
+                    "const": "gii-mesh"
+                },
+                {
+                    "const": "gii-label"
+                },
+                {
+                    "const": "freesurfer-annot"
+                }
+            ]
+        }
+    }
+}
diff --git a/siibra/attr/data/v0.1.json b/siibra/attr/data/v0.1.json
@@ -17,6 +17,9 @@
                 {
                     "$ref": "urn:siibra-local:siibra/attr/data/image/v0.1.json"
                 },
+                {
+                    "$ref": "urn:siibra-local:siibra/attr/data/mesh/v0.1.json"
+                },
                 {
                     "$ref": "urn:siibra-local:siibra/attr/data/tabular/v0.1.json"
                 }

diff --git a/siibra/attr/desc/v0.1.json b/siibra/attr/desc/v0.1.json
@@ -38,13 +38,7 @@
             "$ref": "urn:siibra-local:siibra/attr/desc/description/v0.1.json"
         },
         {
-            "$ref": "urn:siibra-local:siibra/attr/desc/cohort/v0.1.json"
-        },
-        {
-            "$ref": "urn:siibra-local:siibra/attr/desc/paradigm/v0.1.json"
-        },
-        {
-            "$ref": "urn:siibra-local:siibra/attr/desc/aggregateby/v0.1.json"
+            "$ref": "urn:siibra-local:siibra/attr/desc/facet/v0.1.json"
         }
     ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,9 @@ @@
                     {
                         "$ref": "urn:siibra-local:siibra/attr/data/image/v0.1.json"
                     },
+                    {
+                        "$ref": "urn:siibra-local:siibra/attr/data/mesh/v0.1.json"
+                    },
                     {
                         "$ref": "urn:siibra-local:siibra/attr/data/tabular/v0.1.json"
                     }
@@ Expand Down @@