From 40034d58d1d1e963a447c09cc4fe1685cea08ce9 Mon Sep 17 00:00:00 2001
From: William Moore <w.moore@dundee.ac.uk>
Date: Wed, 2 Nov 2022 16:56:11 +0000
Subject: [PATCH] Fix 'units' -> 'unit' in 0.4 and latest schemas, examples and
 test files

---
 .../multiscales_transformations.json          |  4 +-
 0.4/schemas/image.schema                      |  2 +-
 0.4/tests/image_suite.json                    | 92 +++++++++----------
 0.4/tests/strict_image_suite.json             | 18 ++--
 .../multiscales_transformations.json          |  4 +-
 latest/schemas/image.schema                   |  2 +-
 latest/tests/image_suite.json                 | 92 +++++++++----------
 latest/tests/strict_image_suite.json          | 18 ++--
 8 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/0.4/examples/multiscales_strict/multiscales_transformations.json b/0.4/examples/multiscales_strict/multiscales_transformations.json
index 82836d0f..0097c47c 100644
--- a/0.4/examples/multiscales_strict/multiscales_transformations.json
+++ b/0.4/examples/multiscales_strict/multiscales_transformations.json
@@ -5,12 +5,12 @@
                 {
                     "name": "y",
                     "type": "space",
-                    "units": "micrometer"
+                    "unit": "micrometer"
                 },
                 {
                     "name": "x",
                     "type": "space",
-                    "units": "micrometer"
+                    "unit": "micrometer"
                 }
             ],
             "datasets": [
diff --git a/0.4/schemas/image.schema b/0.4/schemas/image.schema
index 59e8e28e..aec5db5f 100644
--- a/0.4/schemas/image.schema
+++ b/0.4/schemas/image.schema
@@ -124,7 +124,7 @@
             "type": "string",
             "enum": ["space"]
           },
-          "units": {
+          "unit": {
             "type": "string"
           }
         }
diff --git a/0.4/tests/image_suite.json b/0.4/tests/image_suite.json
index f22fa67f..42906985 100644
--- a/0.4/tests/image_suite.json
+++ b/0.4/tests/image_suite.json
@@ -14,17 +14,17 @@
               {
                 "name": "t",
                 "type": "time",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -60,12 +60,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -115,12 +115,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ]
           }
@@ -138,12 +138,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micron"
+                "unit": "micron"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -204,12 +204,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ]
           }
@@ -231,12 +231,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -270,12 +270,12 @@
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -344,12 +344,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -382,12 +382,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -476,12 +476,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -530,11 +530,11 @@
             "axes": [
               {
                 "type": "space",
-                "units": "micron"
+                "unit": "micron"
               },
               {
                 "type": "space",
-                "units": "micron"
+                "unit": "micron"
               }
             ],
             "datasets": [
@@ -567,7 +567,7 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -641,12 +641,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -679,12 +679,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -725,12 +725,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -754,12 +754,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [],
@@ -779,12 +779,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "version": "0.4"
@@ -829,12 +829,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -867,12 +867,12 @@
               {
                 "name": "y",
                 "type": "invalid",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -905,12 +905,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -1032,12 +1032,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -1087,12 +1087,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -1117,12 +1117,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
diff --git a/0.4/tests/strict_image_suite.json b/0.4/tests/strict_image_suite.json
index 22b34c5e..ec6295d3 100644
--- a/0.4/tests/strict_image_suite.json
+++ b/0.4/tests/strict_image_suite.json
@@ -122,12 +122,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -205,12 +205,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ]
           }
@@ -228,12 +228,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -279,17 +279,17 @@
               {
                 "name": "z",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
diff --git a/latest/examples/multiscales_strict/multiscales_transformations.json b/latest/examples/multiscales_strict/multiscales_transformations.json
index c99040c2..80dbedab 100644
--- a/latest/examples/multiscales_strict/multiscales_transformations.json
+++ b/latest/examples/multiscales_strict/multiscales_transformations.json
@@ -5,12 +5,12 @@
                 {
                     "name": "y",
                     "type": "space",
-                    "units": "micrometer"
+                    "unit": "micrometer"
                 },
                 {
                     "name": "x",
                     "type": "space",
-                    "units": "micrometer"
+                    "unit": "micrometer"
                 }
             ],
             "datasets": [
diff --git a/latest/schemas/image.schema b/latest/schemas/image.schema
index 3926c4f4..055b058a 100644
--- a/latest/schemas/image.schema
+++ b/latest/schemas/image.schema
@@ -124,7 +124,7 @@
             "type": "string",
             "enum": ["space"]
           },
-          "units": {
+          "unit": {
             "type": "string"
           }
         }
diff --git a/latest/tests/image_suite.json b/latest/tests/image_suite.json
index 39cb73d5..7c3300b5 100644
--- a/latest/tests/image_suite.json
+++ b/latest/tests/image_suite.json
@@ -14,17 +14,17 @@
               {
                 "name": "t",
                 "type": "time",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -60,12 +60,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -115,12 +115,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ]
           }
@@ -138,12 +138,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micron"
+                "unit": "micron"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -204,12 +204,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ]
           }
@@ -231,12 +231,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -270,12 +270,12 @@
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -344,12 +344,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -382,12 +382,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -476,12 +476,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -530,11 +530,11 @@
             "axes": [
               {
                 "type": "space",
-                "units": "micron"
+                "unit": "micron"
               },
               {
                 "type": "space",
-                "units": "micron"
+                "unit": "micron"
               }
             ],
             "datasets": [
@@ -567,7 +567,7 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -641,12 +641,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -679,12 +679,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -725,12 +725,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -754,12 +754,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [],
@@ -779,12 +779,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "version": "0.5-dev"
@@ -829,12 +829,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -867,12 +867,12 @@
               {
                 "name": "y",
                 "type": "invalid",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -905,12 +905,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -1032,12 +1032,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -1087,12 +1087,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -1117,12 +1117,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
diff --git a/latest/tests/strict_image_suite.json b/latest/tests/strict_image_suite.json
index b8aeebe1..7bff90ca 100644
--- a/latest/tests/strict_image_suite.json
+++ b/latest/tests/strict_image_suite.json
@@ -122,12 +122,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -205,12 +205,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ]
           }
@@ -228,12 +228,12 @@
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [
@@ -279,17 +279,17 @@
               {
                 "name": "z",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "y",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               },
               {
                 "name": "x",
                 "type": "space",
-                "units": "micrometer"
+                "unit": "micrometer"
               }
             ],
             "datasets": [