From 4d5bf5a9af09985687a7852a3bc2a6bb70acc915 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Tue, 9 Aug 2022 10:35:47 +0200 Subject: [PATCH 01/76] adding some more mathematical shapes --- .../mathematicalShapes/sphere.schema.tpl.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 schemas/mathematicalShapes/sphere.schema.tpl.json diff --git a/schemas/mathematicalShapes/sphere.schema.tpl.json b/schemas/mathematicalShapes/sphere.schema.tpl.json new file mode 100644 index 000000000..19382312a --- /dev/null +++ b/schemas/mathematicalShapes/sphere.schema.tpl.json @@ -0,0 +1,17 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Sphere", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "radius" + ], + "properties": { + "radius": { + "_instruction": "Define the radius of this sphere.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From debfad1c1927b365b13031e6361b5500e60cf4db Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Tue, 9 Aug 2022 10:38:41 +0200 Subject: [PATCH 02/76] Create square.schema.tpl.json --- .../mathematicalShapes/square.schema.tpl.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 schemas/mathematicalShapes/square.schema.tpl.json diff --git a/schemas/mathematicalShapes/square.schema.tpl.json b/schemas/mathematicalShapes/square.schema.tpl.json new file mode 100644 index 000000000..4cded05ad --- /dev/null +++ b/schemas/mathematicalShapes/square.schema.tpl.json @@ -0,0 +1,17 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Square", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "length" + ], + "properties": { + "length": { + "_instruction": "Define the length of sides of this square.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 3c8d1580b5dc5b8e8d14f932e752a79a34f9319b Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Tue, 9 Aug 2022 11:05:12 +0200 Subject: [PATCH 03/76] Create kite.schema.tpl.json not sure if these parameter are the best to define a kite --- .../mathematicalShapes/kite.schema.tpl.json | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 schemas/mathematicalShapes/kite.schema.tpl.json diff --git a/schemas/mathematicalShapes/kite.schema.tpl.json b/schemas/mathematicalShapes/kite.schema.tpl.json new file mode 100644 index 000000000..c7d5f2775 --- /dev/null +++ b/schemas/mathematicalShapes/kite.schema.tpl.json @@ -0,0 +1,38 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Kite", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "majorAxis", + "majorSide", + "minorSide", + "minorAxis" + ], + "properties": { + "majorAxis": { + "_instruction": "Define the length of the major axis (diagonal) of this kite.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "majorSide": { + "_instruction": "Define the length of the major (long) side of this kite.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "minorAxis": { + "_instruction": "Define the length of the minor axis (diagonal) of this kite.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "minorSide": { + "_instruction": "Define the length of the minor (short) side of this kite.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 6f5e961d04f3f5c9e2a7a0d140b7e0c022deb4d2 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Tue, 9 Aug 2022 11:17:03 +0200 Subject: [PATCH 04/76] Create parallelogram.schema.tpl.json --- .../parallelogram.schema.tpl.json | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 schemas/mathematicalShapes/parallelogram.schema.tpl.json diff --git a/schemas/mathematicalShapes/parallelogram.schema.tpl.json b/schemas/mathematicalShapes/parallelogram.schema.tpl.json new file mode 100644 index 000000000..dc9586411 --- /dev/null +++ b/schemas/mathematicalShapes/parallelogram.schema.tpl.json @@ -0,0 +1,31 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Parallelogram", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "height", + "majorSide", + "minorSide" + ], + "properties": { + "height": { + "_instruction": "Define the height (distance between the major sides) of this parallelogram.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "majorSide": { + "_instruction": "Define the length of the major (long) side of this parallelogram.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "minorSide": { + "_instruction": "Define the length of the minor (short) side of this parallelogram.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 4a44a0e3679050ce2669b4c63d518c448be5009c Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Tue, 9 Aug 2022 11:20:49 +0200 Subject: [PATCH 05/76] Create rhombus.schema.tpl.json --- .../rhombus.schema.tpl.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 schemas/mathematicalShapes/rhombus.schema.tpl.json diff --git a/schemas/mathematicalShapes/rhombus.schema.tpl.json b/schemas/mathematicalShapes/rhombus.schema.tpl.json new file mode 100644 index 000000000..ef804edaf --- /dev/null +++ b/schemas/mathematicalShapes/rhombus.schema.tpl.json @@ -0,0 +1,24 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Rhombus", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "height", + "side" + ], + "properties": { + "height": { + "_instruction": "Define the height (distance between the major sides) of this rhombus.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "side": { + "_instruction": "Define the length of the sides of this rhombus.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 31fa0de35008007a1ff32a1abfce6ad02194397b Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 10:30:25 +0100 Subject: [PATCH 06/76] Update square.schema.tpl.json --- schemas/mathematicalShapes/square.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShapes/square.schema.tpl.json b/schemas/mathematicalShapes/square.schema.tpl.json index 4cded05ad..f4ab055e1 100644 --- a/schemas/mathematicalShapes/square.schema.tpl.json +++ b/schemas/mathematicalShapes/square.schema.tpl.json @@ -7,8 +7,8 @@ "length" ], "properties": { - "length": { - "_instruction": "Define the length of sides of this square.", + "sideLength": { + "_instruction": "Define the uniform length (s) of all four sides of this square.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From e87f904773ce871a6d895a8c3c6a6340f7aeb010 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 10:37:54 +0100 Subject: [PATCH 07/76] Create triangle.schema.tpl.json --- .../triangle.schema.tpl.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 schemas/mathematicalShapes/triangle.schema.tpl.json diff --git a/schemas/mathematicalShapes/triangle.schema.tpl.json b/schemas/mathematicalShapes/triangle.schema.tpl.json new file mode 100644 index 000000000..fb0e669a6 --- /dev/null +++ b/schemas/mathematicalShapes/triangle.schema.tpl.json @@ -0,0 +1,20 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Triangle", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "sideLengths" + ], + "properties": { + "sideLengths": { + "type": "array", + "minItems": 3, + "maxItems": 3, + "_instruction": "Enter the lengths of the three sides of the triangle.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} From 833f886c703099096588421769eacdd31a6ffb42 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 10:39:14 +0100 Subject: [PATCH 08/76] Update square.schema.tpl.json --- .../mathematicalShapes/square.schema.tpl.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/schemas/mathematicalShapes/square.schema.tpl.json b/schemas/mathematicalShapes/square.schema.tpl.json index f4ab055e1..1436f8002 100644 --- a/schemas/mathematicalShapes/square.schema.tpl.json +++ b/schemas/mathematicalShapes/square.schema.tpl.json @@ -1,17 +1,17 @@ { - "_type": "https://openminds.ebrains.eu/sands/Square", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "length" - ], - "properties": { - "sideLength": { - "_instruction": "Define the uniform length (s) of all four sides of this square.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - } + "_type": "https://openminds.ebrains.eu/sands/Square", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "sideLength" + ], + "properties": { + "sideLength": { + "_instruction": "Define the uniform length (s) of all four sides of this square.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] } + } } From 6089dd9864590ed287039499c8447e69f92dff38 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 10:40:12 +0100 Subject: [PATCH 09/76] Update triangle.schema.tpl.json --- schemas/mathematicalShapes/triangle.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShapes/triangle.schema.tpl.json b/schemas/mathematicalShapes/triangle.schema.tpl.json index fb0e669a6..e9c1179b0 100644 --- a/schemas/mathematicalShapes/triangle.schema.tpl.json +++ b/schemas/mathematicalShapes/triangle.schema.tpl.json @@ -11,7 +11,7 @@ "type": "array", "minItems": 3, "maxItems": 3, - "_instruction": "Enter the lengths of the three sides of the triangle.", + "_instruction": "Enter the lengths (a, b, c) of the three sides of the triangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] From 44acbebd8c9cf5cf79c7fa83fa4ce4b0e1d26dbc Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 10:42:22 +0100 Subject: [PATCH 10/76] Update rectangle.schema.tpl.json --- .../rectangle.schema.tpl.json | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/schemas/mathematicalShapes/rectangle.schema.tpl.json b/schemas/mathematicalShapes/rectangle.schema.tpl.json index 360ae6abb..7c939ac8b 100644 --- a/schemas/mathematicalShapes/rectangle.schema.tpl.json +++ b/schemas/mathematicalShapes/rectangle.schema.tpl.json @@ -1,24 +1,24 @@ { - "_type": "https://openminds.ebrains.eu/sands/Rectangle", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "length", - "width" - ], - "properties": { - "length": { - "_instruction": "Define the length of this rectangle.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - }, - "width": { - "_instruction": "Define the width of this rectangle.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - } + "_type": "https://openminds.ebrains.eu/sands/Rectangle", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "height", + "width" + ], + "properties": { + "height": { + "_instruction": "Define the height (h) of this rectangle.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "width": { + "_instruction": "Define the width (w) of this rectangle.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] } + } } From ed099ab75ee0dca6a4e4de839a61eb1319dd2fe5 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 10:47:04 +0100 Subject: [PATCH 11/76] Create rightTriangle.schema.tpl.json --- .../rightTriangle.schema.tpl.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 schemas/mathematicalShapes/rightTriangle.schema.tpl.json diff --git a/schemas/mathematicalShapes/rightTriangle.schema.tpl.json b/schemas/mathematicalShapes/rightTriangle.schema.tpl.json new file mode 100644 index 000000000..9c645ca3f --- /dev/null +++ b/schemas/mathematicalShapes/rightTriangle.schema.tpl.json @@ -0,0 +1,24 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/RightTriangle", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "baseLength", + "height" + ], + "properties": { + "baseLength": { + "_instruction": "Define the base length (b) of this right triangle.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "height": { + "_instruction": "Define the height (h) of this right triangle.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 8a137c20c7e99ce7f82621bc9af1e17ac34a167c Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 10:56:34 +0100 Subject: [PATCH 12/76] Update triangle.schema.tpl.json --- schemas/mathematicalShapes/triangle.schema.tpl.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/schemas/mathematicalShapes/triangle.schema.tpl.json b/schemas/mathematicalShapes/triangle.schema.tpl.json index e9c1179b0..2d044cb99 100644 --- a/schemas/mathematicalShapes/triangle.schema.tpl.json +++ b/schemas/mathematicalShapes/triangle.schema.tpl.json @@ -4,14 +4,21 @@ "mathematicalShapes" ], "required": [ + "baseLength", "sideLengths" ], "properties": { + "baseLength": { + "_instruction": "Define the length of the reference side of this triangle.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, "sideLengths": { "type": "array", - "minItems": 3, - "maxItems": 3, - "_instruction": "Enter the lengths (a, b, c) of the three sides of the triangle.", + "minItems": 2, + "maxItems": 2, + "_instruction": "Enter the lengths of the other two sides of the triangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] From 9bab91f113b9ac6c75d411fa23c6517a3e57b00a Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:07:03 +0100 Subject: [PATCH 13/76] Update parallelogram.schema.tpl.json --- .../parallelogram.schema.tpl.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/schemas/mathematicalShapes/parallelogram.schema.tpl.json b/schemas/mathematicalShapes/parallelogram.schema.tpl.json index dc9586411..1b1895a6d 100644 --- a/schemas/mathematicalShapes/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShapes/parallelogram.schema.tpl.json @@ -4,25 +4,25 @@ "mathematicalShapes" ], "required": [ + "baseLength", "height", - "majorSide", - "minorSide" + "sideLength" ], "properties": { - "height": { - "_instruction": "Define the height (distance between the major sides) of this parallelogram.", + "baseLength": { + "_instruction": "Define the length of the reference side of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, - "majorSide": { - "_instruction": "Define the length of the major (long) side of this parallelogram.", + "height": { + "_instruction": "Define the height (perpendicular distance) of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, - "minorSide": { - "_instruction": "Define the length of the minor (short) side of this parallelogram.", + "sideLength": { + "_instruction": "Define the uniform length of the slanted sides of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From d6fa4b162326adb01a1d95e3b2555040766b9b9c Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:13:50 +0100 Subject: [PATCH 14/76] Create trapezoid.schema.tpl.json --- .../trapezoid.schema.tpl.json | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 schemas/mathematicalShapes/trapezoid.schema.tpl.json diff --git a/schemas/mathematicalShapes/trapezoid.schema.tpl.json b/schemas/mathematicalShapes/trapezoid.schema.tpl.json new file mode 100644 index 000000000..bb11383d7 --- /dev/null +++ b/schemas/mathematicalShapes/trapezoid.schema.tpl.json @@ -0,0 +1,31 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Trapezoid", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "bottomBaseLength", + "height", + "topBaseLength" + ], + "properties": { + "bottomBaseLength": { + "_instruction": "Define the length of the bottom reference side of this trapezoid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "height": { + "_instruction": "Define the height of this trapezoid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "topBaseLength": { + "_instruction": "Define the length of the top reference side of this trapezoid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 7052abecea238c2de83bcfc47fc8e524b840f245 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:14:24 +0100 Subject: [PATCH 15/76] Update parallelogram.schema.tpl.json --- schemas/mathematicalShapes/parallelogram.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShapes/parallelogram.schema.tpl.json b/schemas/mathematicalShapes/parallelogram.schema.tpl.json index 1b1895a6d..00aa4fd1d 100644 --- a/schemas/mathematicalShapes/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShapes/parallelogram.schema.tpl.json @@ -10,7 +10,7 @@ ], "properties": { "baseLength": { - "_instruction": "Define the length of the reference side of this parallelogram.", + "_instruction": "Define the uniform length of the bottom and top reference sides of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From 95c63320aeb6d56b222852067690a5eb730de0d4 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:15:44 +0100 Subject: [PATCH 16/76] Update parallelogram.schema.tpl.json --- schemas/mathematicalShapes/parallelogram.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShapes/parallelogram.schema.tpl.json b/schemas/mathematicalShapes/parallelogram.schema.tpl.json index 00aa4fd1d..2bb576d05 100644 --- a/schemas/mathematicalShapes/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShapes/parallelogram.schema.tpl.json @@ -16,7 +16,7 @@ ] }, "height": { - "_instruction": "Define the height (perpendicular distance) of this parallelogram.", + "_instruction": "Define the height (perpendicular distance between the reference sides) of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From f91d4cc668450171610b51b1852abdd271f94fff Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:17:26 +0100 Subject: [PATCH 17/76] Update trapezoid.schema.tpl.json --- schemas/mathematicalShapes/trapezoid.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShapes/trapezoid.schema.tpl.json b/schemas/mathematicalShapes/trapezoid.schema.tpl.json index bb11383d7..4376a1536 100644 --- a/schemas/mathematicalShapes/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShapes/trapezoid.schema.tpl.json @@ -16,7 +16,7 @@ ] }, "height": { - "_instruction": "Define the height of this trapezoid.", + "_instruction": "Define the height (perpendicular distance between the reference sides) of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From a70c0c20e420142fac9b23ad431bc4fee3e5d402 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:22:54 +0100 Subject: [PATCH 18/76] Update rhombus.schema.tpl.json --- schemas/mathematicalShapes/rhombus.schema.tpl.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/schemas/mathematicalShapes/rhombus.schema.tpl.json b/schemas/mathematicalShapes/rhombus.schema.tpl.json index ef804edaf..34c243a9a 100644 --- a/schemas/mathematicalShapes/rhombus.schema.tpl.json +++ b/schemas/mathematicalShapes/rhombus.schema.tpl.json @@ -4,18 +4,18 @@ "mathematicalShapes" ], "required": [ - "height", - "side" + "longDiagonal", + "shortDiagonal" ], "properties": { - "height": { - "_instruction": "Define the height (distance between the major sides) of this rhombus.", + "longDiagonal": { + "_instruction": "Enter the length of the long diagonal of this rhombus.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, - "side": { - "_instruction": "Define the length of the sides of this rhombus.", + "shortDiagonal": { + "_instruction": "Enter the length of the short diagonal of this rhombus.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From 31e5fea3969cf63c843569a77c5cc2d0c4f29abf Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:23:08 +0100 Subject: [PATCH 19/76] Update triangle.schema.tpl.json --- schemas/mathematicalShapes/triangle.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShapes/triangle.schema.tpl.json b/schemas/mathematicalShapes/triangle.schema.tpl.json index 2d044cb99..49f720715 100644 --- a/schemas/mathematicalShapes/triangle.schema.tpl.json +++ b/schemas/mathematicalShapes/triangle.schema.tpl.json @@ -9,7 +9,7 @@ ], "properties": { "baseLength": { - "_instruction": "Define the length of the reference side of this triangle.", + "_instruction": "Enter the length of the reference side of this triangle.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From 7dbbcb34998dcc909c8c0db2d45981dbf70d24a0 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:23:25 +0100 Subject: [PATCH 20/76] Update rectangle.schema.tpl.json --- schemas/mathematicalShapes/rectangle.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShapes/rectangle.schema.tpl.json b/schemas/mathematicalShapes/rectangle.schema.tpl.json index 7c939ac8b..37e780e6a 100644 --- a/schemas/mathematicalShapes/rectangle.schema.tpl.json +++ b/schemas/mathematicalShapes/rectangle.schema.tpl.json @@ -9,13 +9,13 @@ ], "properties": { "height": { - "_instruction": "Define the height (h) of this rectangle.", + "_instruction": "Enter the height (h) of this rectangle.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, "width": { - "_instruction": "Define the width (w) of this rectangle.", + "_instruction": "Enter the width (w) of this rectangle.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From 6c68d828a7667892473723aa61c7f1eda58661ed Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:23:48 +0100 Subject: [PATCH 21/76] Update square.schema.tpl.json --- schemas/mathematicalShapes/square.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShapes/square.schema.tpl.json b/schemas/mathematicalShapes/square.schema.tpl.json index 1436f8002..c2e27ec51 100644 --- a/schemas/mathematicalShapes/square.schema.tpl.json +++ b/schemas/mathematicalShapes/square.schema.tpl.json @@ -8,7 +8,7 @@ ], "properties": { "sideLength": { - "_instruction": "Define the uniform length (s) of all four sides of this square.", + "_instruction": "Enter the uniform length of all four sides of this square.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From b38e668694207b808853c33ad763847205331eca Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:24:08 +0100 Subject: [PATCH 22/76] Update rectangle.schema.tpl.json --- schemas/mathematicalShapes/rectangle.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShapes/rectangle.schema.tpl.json b/schemas/mathematicalShapes/rectangle.schema.tpl.json index 37e780e6a..599bd89dd 100644 --- a/schemas/mathematicalShapes/rectangle.schema.tpl.json +++ b/schemas/mathematicalShapes/rectangle.schema.tpl.json @@ -9,13 +9,13 @@ ], "properties": { "height": { - "_instruction": "Enter the height (h) of this rectangle.", + "_instruction": "Enter the height of this rectangle.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, "width": { - "_instruction": "Enter the width (w) of this rectangle.", + "_instruction": "Enter the width of this rectangle.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From 14a090267b9fc68668bdf71ac3601af79e9cbb07 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:24:32 +0100 Subject: [PATCH 23/76] Update trapezoid.schema.tpl.json --- schemas/mathematicalShapes/trapezoid.schema.tpl.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/mathematicalShapes/trapezoid.schema.tpl.json b/schemas/mathematicalShapes/trapezoid.schema.tpl.json index 4376a1536..0e406a124 100644 --- a/schemas/mathematicalShapes/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShapes/trapezoid.schema.tpl.json @@ -10,19 +10,19 @@ ], "properties": { "bottomBaseLength": { - "_instruction": "Define the length of the bottom reference side of this trapezoid.", + "_instruction": "Enter the length of the bottom reference side of this trapezoid.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, "height": { - "_instruction": "Define the height (perpendicular distance between the reference sides) of this parallelogram.", + "_instruction": "Enter the height (perpendicular distance between the reference sides) of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, "topBaseLength": { - "_instruction": "Define the length of the top reference side of this trapezoid.", + "_instruction": "Enter the length of the top reference side of this trapezoid.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From a7e9e9a1b18f4ede770fabba4eb857904e19865c Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:24:57 +0100 Subject: [PATCH 24/76] Update rightTriangle.schema.tpl.json --- schemas/mathematicalShapes/rightTriangle.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShapes/rightTriangle.schema.tpl.json b/schemas/mathematicalShapes/rightTriangle.schema.tpl.json index 9c645ca3f..074e3af7f 100644 --- a/schemas/mathematicalShapes/rightTriangle.schema.tpl.json +++ b/schemas/mathematicalShapes/rightTriangle.schema.tpl.json @@ -9,13 +9,13 @@ ], "properties": { "baseLength": { - "_instruction": "Define the base length (b) of this right triangle.", + "_instruction": "Enter the base length of this right triangle.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, "height": { - "_instruction": "Define the height (h) of this right triangle.", + "_instruction": "Enter the height of this right triangle.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From 343aeb729bb8a810f49849feee7e389de9201fe0 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:25:19 +0100 Subject: [PATCH 25/76] Update parallelogram.schema.tpl.json --- schemas/mathematicalShapes/parallelogram.schema.tpl.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/mathematicalShapes/parallelogram.schema.tpl.json b/schemas/mathematicalShapes/parallelogram.schema.tpl.json index 2bb576d05..aa3445660 100644 --- a/schemas/mathematicalShapes/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShapes/parallelogram.schema.tpl.json @@ -10,19 +10,19 @@ ], "properties": { "baseLength": { - "_instruction": "Define the uniform length of the bottom and top reference sides of this parallelogram.", + "_instruction": "Enter the uniform length of the bottom and top reference sides of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, "height": { - "_instruction": "Define the height (perpendicular distance between the reference sides) of this parallelogram.", + "_instruction": "Enter the height (perpendicular distance between the reference sides) of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, "sideLength": { - "_instruction": "Define the uniform length of the slanted sides of this parallelogram.", + "_instruction": "Enter the uniform length of the slanted sides of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From f01334c9bd7be0cf90a6b83f2a0ed7dabe8fc1c7 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:43:23 +0100 Subject: [PATCH 26/76] Update kite.schema.tpl.json --- .../mathematicalShapes/kite.schema.tpl.json | 63 +++++++++---------- 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/schemas/mathematicalShapes/kite.schema.tpl.json b/schemas/mathematicalShapes/kite.schema.tpl.json index c7d5f2775..4f4c8ebfd 100644 --- a/schemas/mathematicalShapes/kite.schema.tpl.json +++ b/schemas/mathematicalShapes/kite.schema.tpl.json @@ -1,38 +1,31 @@ { - "_type": "https://openminds.ebrains.eu/sands/Kite", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "majorAxis", - "majorSide", - "minorSide", - "minorAxis" - ], - "properties": { - "majorAxis": { - "_instruction": "Define the length of the major axis (diagonal) of this kite.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - }, - "majorSide": { - "_instruction": "Define the length of the major (long) side of this kite.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - }, - "minorAxis": { - "_instruction": "Define the length of the minor axis (diagonal) of this kite.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - }, - "minorSide": { - "_instruction": "Define the length of the minor (short) side of this kite.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - } + "_type": "https://openminds.ebrains.eu/sands/Kite", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "baseDiagonal", + "bottomLegsLength", + "topLegsLength" + ], + "properties": { + "baseDiagonal": { + "_instruction": "Define the length of the base diagonal of this kite.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "bottomLegsLength": { + "_instruction": "Define the length of the bottom legs of this kite.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "topLegsLength": { + "_instruction": "Define the length of the top legs of this kite.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] } + } } From 3751c45e8cc46a345f1d12b923de8b529ce34a4b Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:44:32 +0100 Subject: [PATCH 27/76] Update rhombus.schema.tpl.json --- .../rhombus.schema.tpl.json | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/schemas/mathematicalShapes/rhombus.schema.tpl.json b/schemas/mathematicalShapes/rhombus.schema.tpl.json index 34c243a9a..f8c508f90 100644 --- a/schemas/mathematicalShapes/rhombus.schema.tpl.json +++ b/schemas/mathematicalShapes/rhombus.schema.tpl.json @@ -1,24 +1,24 @@ { - "_type": "https://openminds.ebrains.eu/sands/Rhombus", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "longDiagonal", - "shortDiagonal" - ], - "properties": { - "longDiagonal": { - "_instruction": "Enter the length of the long diagonal of this rhombus.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - }, - "shortDiagonal": { - "_instruction": "Enter the length of the short diagonal of this rhombus.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - } + "_type": "https://openminds.ebrains.eu/sands/Rhombus", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "longDiagonal", + "shortDiagonal" + ], + "properties": { + "longDiagonal": { + "_instruction": "Enter the length of the long diagonal of this rhombus.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "shortDiagonal": { + "_instruction": "Enter the length of the short diagonal of this rhombus.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] } + } } From 34b44a6c54c87ab76d9048d5b389035973ac2046 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:46:07 +0100 Subject: [PATCH 28/76] Update trapezoid.schema.tpl.json --- .../trapezoid.schema.tpl.json | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/schemas/mathematicalShapes/trapezoid.schema.tpl.json b/schemas/mathematicalShapes/trapezoid.schema.tpl.json index 0e406a124..08169ed16 100644 --- a/schemas/mathematicalShapes/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShapes/trapezoid.schema.tpl.json @@ -1,31 +1,31 @@ { - "_type": "https://openminds.ebrains.eu/sands/Trapezoid", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "bottomBaseLength", - "height", - "topBaseLength" - ], - "properties": { - "bottomBaseLength": { - "_instruction": "Enter the length of the bottom reference side of this trapezoid.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - }, - "height": { - "_instruction": "Enter the height (perpendicular distance between the reference sides) of this parallelogram.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - }, - "topBaseLength": { - "_instruction": "Enter the length of the top reference side of this trapezoid.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - } + "_type": "https://openminds.ebrains.eu/sands/Trapezoid", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "bottomBaseLength", + "height", + "topBaseLength" + ], + "properties": { + "bottomBaseLength": { + "_instruction": "Enter the length of the bottom reference side of this trapezoid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "height": { + "_instruction": "Enter the height (perpendicular distance between the reference sides) of this parallelogram.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "topBaseLength": { + "_instruction": "Enter the length of the top reference side of this trapezoid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] } + } } From 7deccdd3c1d1bcb78722e9179220765e09ce6595 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:46:59 +0100 Subject: [PATCH 29/76] Update sphere.schema.tpl.json --- .../mathematicalShapes/sphere.schema.tpl.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/schemas/mathematicalShapes/sphere.schema.tpl.json b/schemas/mathematicalShapes/sphere.schema.tpl.json index 19382312a..c4d706fde 100644 --- a/schemas/mathematicalShapes/sphere.schema.tpl.json +++ b/schemas/mathematicalShapes/sphere.schema.tpl.json @@ -1,17 +1,17 @@ { - "_type": "https://openminds.ebrains.eu/sands/Sphere", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "radius" - ], - "properties": { - "radius": { - "_instruction": "Define the radius of this sphere.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - } + "_type": "https://openminds.ebrains.eu/sands/Sphere", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "radius" + ], + "properties": { + "radius": { + "_instruction": "Define the radius of this sphere.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] } + } } From 5f7054aeb6382da151cb2136e626cdf415aa068b Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:48:44 +0100 Subject: [PATCH 30/76] Update parallelogram.schema.tpl.json --- .../parallelogram.schema.tpl.json | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/schemas/mathematicalShapes/parallelogram.schema.tpl.json b/schemas/mathematicalShapes/parallelogram.schema.tpl.json index aa3445660..7b350b35a 100644 --- a/schemas/mathematicalShapes/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShapes/parallelogram.schema.tpl.json @@ -1,31 +1,31 @@ { - "_type": "https://openminds.ebrains.eu/sands/Parallelogram", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "baseLength", - "height", - "sideLength" - ], - "properties": { - "baseLength": { - "_instruction": "Enter the uniform length of the bottom and top reference sides of this parallelogram.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - }, - "height": { - "_instruction": "Enter the height (perpendicular distance between the reference sides) of this parallelogram.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - }, - "sideLength": { - "_instruction": "Enter the uniform length of the slanted sides of this parallelogram.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - } + "_type": "https://openminds.ebrains.eu/sands/Parallelogram", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "baseLength", + "height", + "sideLength" + ], + "properties": { + "baseLength": { + "_instruction": "Enter the uniform length of the bottom and top reference sides of this parallelogram.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "height": { + "_instruction": "Enter the height (perpendicular distance between the reference sides) of this parallelogram.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "sideLength": { + "_instruction": "Enter the uniform length of the slanted sides of this parallelogram.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] } + } } From 1a164d16936229c542b46713429bf5140bc9122d Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:50:39 +0100 Subject: [PATCH 31/76] Update circle.schema.tpl.json --- .../mathematicalShapes/circle.schema.tpl.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/schemas/mathematicalShapes/circle.schema.tpl.json b/schemas/mathematicalShapes/circle.schema.tpl.json index 8f9ac5cd8..32a3928cf 100644 --- a/schemas/mathematicalShapes/circle.schema.tpl.json +++ b/schemas/mathematicalShapes/circle.schema.tpl.json @@ -1,17 +1,17 @@ { - "_type": "https://openminds.ebrains.eu/sands/Circle", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "radius" - ], - "properties": { - "radius": { - "_instruction": "Define the radius of this circle.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - } + "_type": "https://openminds.ebrains.eu/sands/Circle", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "radius" + ], + "properties": { + "radius": { + "_instruction": "Enter the radius of this circle.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] } + } } From 55cffb03c21791e043c782f69500e929bed8c128 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 11:50:59 +0100 Subject: [PATCH 32/76] Update kite.schema.tpl.json --- schemas/mathematicalShapes/kite.schema.tpl.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/mathematicalShapes/kite.schema.tpl.json b/schemas/mathematicalShapes/kite.schema.tpl.json index 4f4c8ebfd..91f8d2afc 100644 --- a/schemas/mathematicalShapes/kite.schema.tpl.json +++ b/schemas/mathematicalShapes/kite.schema.tpl.json @@ -10,19 +10,19 @@ ], "properties": { "baseDiagonal": { - "_instruction": "Define the length of the base diagonal of this kite.", + "_instruction": "Enter the length of the base diagonal of this kite.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, "bottomLegsLength": { - "_instruction": "Define the length of the bottom legs of this kite.", + "_instruction": "Enter the length of the bottom legs of this kite.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, "topLegsLength": { - "_instruction": "Define the length of the top legs of this kite.", + "_instruction": "Enter the length of the top legs of this kite.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] From 0043d85adaa24061f54eced0e5c5c15538f2055f Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 12:05:37 +0100 Subject: [PATCH 33/76] Update ellipse.schema.tpl.json --- .../ellipse.schema.tpl.json | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/schemas/mathematicalShapes/ellipse.schema.tpl.json b/schemas/mathematicalShapes/ellipse.schema.tpl.json index 734238f43..d7263e8a2 100644 --- a/schemas/mathematicalShapes/ellipse.schema.tpl.json +++ b/schemas/mathematicalShapes/ellipse.schema.tpl.json @@ -1,24 +1,24 @@ { - "_type": "https://openminds.ebrains.eu/sands/Ellipse", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "semiMinorAxis", - "semiMajorAxis" - ], - "properties": { - "semiMinorAxis": { - "_instruction": "Define the length of the semi-minor axis of this ellipse.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - }, - "semiMajorAxis": { - "_instruction": "Define the length of the semi-major axis of this ellipse.", - "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" - ] - } + "_type": "https://openminds.ebrains.eu/sands/Ellipse", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "longDiameter", + "shortDiameter" + ], + "properties": { + "longDiameter": { + "_instruction": "Enter the length of the longest diameter of this ellipse.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "shortDiameter": { + "_instruction": "Enter the length of the shortes diameter of this ellipse.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] } + } } From 21b6a5eb136af1b9ed46f817f795e01264931964 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 12:13:38 +0100 Subject: [PATCH 34/76] Create regularPolygon.schema.tpl.json --- .../regularPolygon.schema.tpl.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 schemas/mathematicalShapes/regularPolygon.schema.tpl.json diff --git a/schemas/mathematicalShapes/regularPolygon.schema.tpl.json b/schemas/mathematicalShapes/regularPolygon.schema.tpl.json new file mode 100644 index 000000000..16da0d231 --- /dev/null +++ b/schemas/mathematicalShapes/regularPolygon.schema.tpl.json @@ -0,0 +1,24 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/RegularPolygon", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "circumradius", + "sideLength" + ], + "properties": { + "circumradius": { + "_instruction": "Enter the length of the circumradius (distance from the center to any of the vertices) of this regular polygon.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "sideLength": { + "_instruction": "Enter the uniform length of all sides of this regular polygon.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From d04c9fe297349fc26561dac6973b84efa64c9ecf Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 12:21:12 +0100 Subject: [PATCH 35/76] Create circularSector.schema.tpl.json --- .../circularSector.schema.tpl.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 schemas/mathematicalShapes/circularSector.schema.tpl.json diff --git a/schemas/mathematicalShapes/circularSector.schema.tpl.json b/schemas/mathematicalShapes/circularSector.schema.tpl.json new file mode 100644 index 000000000..ee4fd3943 --- /dev/null +++ b/schemas/mathematicalShapes/circularSector.schema.tpl.json @@ -0,0 +1,24 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/CircularSector", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "centralAngle", + "radius" + ], + "properties": { + "centralAngle": { + "_instruction": "Enter the central angle of this circular sector.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "radius": { + "_instruction": "Enter the radius of this circular sector.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From c6b3ed23b9eee553e688f4a4d5dbf66f049399de Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:24:14 +0100 Subject: [PATCH 36/76] Create spheroid.schema.tpl.json --- .../spheroid.schema.tpl.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 schemas/mathematicalShapes/spheroid.schema.tpl.json diff --git a/schemas/mathematicalShapes/spheroid.schema.tpl.json b/schemas/mathematicalShapes/spheroid.schema.tpl.json new file mode 100644 index 000000000..db3f5c0ac --- /dev/null +++ b/schemas/mathematicalShapes/spheroid.schema.tpl.json @@ -0,0 +1,24 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Spheroid", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "equatorialDiameter", + "polarDiameter" + ], + "properties": { + "equatorialDiameter": { + "_instruction": "Enter the uniform length of the two equatorial diameters of this spheroid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "polarDiameter": { + "_instruction": "Enter the length of the polar diameter of this spheroid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 6565af51a3d6fbcfaaccb1ce76a610fb4ec88852 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:24:50 +0100 Subject: [PATCH 37/76] Update triangle.schema.tpl.json --- schemas/mathematicalShapes/triangle.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShapes/triangle.schema.tpl.json b/schemas/mathematicalShapes/triangle.schema.tpl.json index 49f720715..bd4bc8435 100644 --- a/schemas/mathematicalShapes/triangle.schema.tpl.json +++ b/schemas/mathematicalShapes/triangle.schema.tpl.json @@ -8,13 +8,13 @@ "sideLengths" ], "properties": { - "baseLength": { + "base": { "_instruction": "Enter the length of the reference side of this triangle.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, - "sideLengths": { + "sides": { "type": "array", "minItems": 2, "maxItems": 2, From 7a3beb894feec8ad8f855e268b644c1c9f3aa228 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:25:05 +0100 Subject: [PATCH 38/76] Update triangle.schema.tpl.json --- schemas/mathematicalShapes/triangle.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShapes/triangle.schema.tpl.json b/schemas/mathematicalShapes/triangle.schema.tpl.json index bd4bc8435..e49fecee3 100644 --- a/schemas/mathematicalShapes/triangle.schema.tpl.json +++ b/schemas/mathematicalShapes/triangle.schema.tpl.json @@ -4,8 +4,8 @@ "mathematicalShapes" ], "required": [ - "baseLength", - "sideLengths" + "base", + "sides" ], "properties": { "base": { From ebbc26c185bf0beb1154f1fb69e350bf6ca6f6d4 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:25:28 +0100 Subject: [PATCH 39/76] Update trapezoid.schema.tpl.json --- schemas/mathematicalShapes/trapezoid.schema.tpl.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/schemas/mathematicalShapes/trapezoid.schema.tpl.json b/schemas/mathematicalShapes/trapezoid.schema.tpl.json index 08169ed16..c54b86e05 100644 --- a/schemas/mathematicalShapes/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShapes/trapezoid.schema.tpl.json @@ -4,12 +4,12 @@ "mathematicalShapes" ], "required": [ - "bottomBaseLength", + "bottomBase", "height", - "topBaseLength" + "topBase" ], "properties": { - "bottomBaseLength": { + "bottomBase": { "_instruction": "Enter the length of the bottom reference side of this trapezoid.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" @@ -21,7 +21,7 @@ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, - "topBaseLength": { + "topBase": { "_instruction": "Enter the length of the top reference side of this trapezoid.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" From a53ef0c6ac560c2bfe8baf93da05668ab94ed364 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:25:50 +0100 Subject: [PATCH 40/76] Update square.schema.tpl.json --- schemas/mathematicalShapes/square.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShapes/square.schema.tpl.json b/schemas/mathematicalShapes/square.schema.tpl.json index c2e27ec51..794f4e90b 100644 --- a/schemas/mathematicalShapes/square.schema.tpl.json +++ b/schemas/mathematicalShapes/square.schema.tpl.json @@ -4,10 +4,10 @@ "mathematicalShapes" ], "required": [ - "sideLength" + "side" ], "properties": { - "sideLength": { + "side": { "_instruction": "Enter the uniform length of all four sides of this square.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" From 308b06428f63f0edfdfc5c3d71ac8fb06a99494e Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:26:24 +0100 Subject: [PATCH 41/76] Update rightTriangle.schema.tpl.json --- schemas/mathematicalShapes/rightTriangle.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShapes/rightTriangle.schema.tpl.json b/schemas/mathematicalShapes/rightTriangle.schema.tpl.json index 074e3af7f..804d63fab 100644 --- a/schemas/mathematicalShapes/rightTriangle.schema.tpl.json +++ b/schemas/mathematicalShapes/rightTriangle.schema.tpl.json @@ -4,11 +4,11 @@ "mathematicalShapes" ], "required": [ - "baseLength", + "base", "height" ], "properties": { - "baseLength": { + "base": { "_instruction": "Enter the base length of this right triangle.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" From 9c7dcb2d675a85769682c1db9641bd8a673f999a Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:26:55 +0100 Subject: [PATCH 42/76] Update regularPolygon.schema.tpl.json --- schemas/mathematicalShapes/regularPolygon.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShapes/regularPolygon.schema.tpl.json b/schemas/mathematicalShapes/regularPolygon.schema.tpl.json index 16da0d231..d4b3c125f 100644 --- a/schemas/mathematicalShapes/regularPolygon.schema.tpl.json +++ b/schemas/mathematicalShapes/regularPolygon.schema.tpl.json @@ -5,7 +5,7 @@ ], "required": [ "circumradius", - "sideLength" + "side" ], "properties": { "circumradius": { @@ -14,7 +14,7 @@ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, - "sideLength": { + "side": { "_instruction": "Enter the uniform length of all sides of this regular polygon.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" From 4e7861696f9c894ad2f15ba7eab68c0944d4643a Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:27:49 +0100 Subject: [PATCH 43/76] Update parallelogram.schema.tpl.json --- schemas/mathematicalShapes/parallelogram.schema.tpl.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/schemas/mathematicalShapes/parallelogram.schema.tpl.json b/schemas/mathematicalShapes/parallelogram.schema.tpl.json index 7b350b35a..d2d20bc79 100644 --- a/schemas/mathematicalShapes/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShapes/parallelogram.schema.tpl.json @@ -4,12 +4,12 @@ "mathematicalShapes" ], "required": [ - "baseLength", + "base", "height", - "sideLength" + "side" ], "properties": { - "baseLength": { + "base": { "_instruction": "Enter the uniform length of the bottom and top reference sides of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" @@ -21,7 +21,7 @@ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, - "sideLength": { + "side": { "_instruction": "Enter the uniform length of the slanted sides of this parallelogram.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" From ba540fcf74ddbfefa24c78ac3f900edd35657eed Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:28:35 +0100 Subject: [PATCH 44/76] Update kite.schema.tpl.json --- schemas/mathematicalShapes/kite.schema.tpl.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/mathematicalShapes/kite.schema.tpl.json b/schemas/mathematicalShapes/kite.schema.tpl.json index 91f8d2afc..f02556b8e 100644 --- a/schemas/mathematicalShapes/kite.schema.tpl.json +++ b/schemas/mathematicalShapes/kite.schema.tpl.json @@ -5,7 +5,7 @@ ], "required": [ "baseDiagonal", - "bottomLegsLength", + "bottomLeg", "topLegsLength" ], "properties": { @@ -15,13 +15,13 @@ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, - "bottomLegsLength": { + "bottomLeg": { "_instruction": "Enter the length of the bottom legs of this kite.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" ] }, - "topLegsLength": { + "topLeg": { "_instruction": "Enter the length of the top legs of this kite.", "_embeddedTypes": [ "https://openminds.ebrains.eu/core/QuantitativeValue" From 866feae98e7128cb9cf51fadd854b14e1416d055 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:29:06 +0100 Subject: [PATCH 45/76] Update kite.schema.tpl.json --- schemas/mathematicalShapes/kite.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShapes/kite.schema.tpl.json b/schemas/mathematicalShapes/kite.schema.tpl.json index f02556b8e..4eca11271 100644 --- a/schemas/mathematicalShapes/kite.schema.tpl.json +++ b/schemas/mathematicalShapes/kite.schema.tpl.json @@ -6,7 +6,7 @@ "required": [ "baseDiagonal", "bottomLeg", - "topLegsLength" + "topLeg" ], "properties": { "baseDiagonal": { From 76e1db3fe4ffbe14c08c354bb7638e68936cd06e Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:37:14 +0100 Subject: [PATCH 46/76] Create ellipsoid.schema.tpl.json --- .../ellipsoid.schema.tpl.json | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 schemas/mathematicalShapes/ellipsoid.schema.tpl.json diff --git a/schemas/mathematicalShapes/ellipsoid.schema.tpl.json b/schemas/mathematicalShapes/ellipsoid.schema.tpl.json new file mode 100644 index 000000000..bcc09ad18 --- /dev/null +++ b/schemas/mathematicalShapes/ellipsoid.schema.tpl.json @@ -0,0 +1,31 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Ellipsoid", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "longDiameter", + "intermediateDiameter", + "shortDiameter" + ], + "properties": { + "longDiameter": { + "_instruction": "Enter the length of the long diameter of this ellipsoid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "intermediateDiameter": { + "_instruction": "Enter the length of the intermediate diameter of this ellipsoid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "shortDiameter": { + "_instruction": "Enter the length of the short diameter of this ellipsoid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 3b5db5a3e3eaebe5f6e482ac7a0990da83612c86 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:42:59 +0100 Subject: [PATCH 47/76] Create cube.schema.tpl.json --- schemas/mathematicalShapes/cube.schema.tpl.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 schemas/mathematicalShapes/cube.schema.tpl.json diff --git a/schemas/mathematicalShapes/cube.schema.tpl.json b/schemas/mathematicalShapes/cube.schema.tpl.json new file mode 100644 index 000000000..e368d7ced --- /dev/null +++ b/schemas/mathematicalShapes/cube.schema.tpl.json @@ -0,0 +1,17 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Cube", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "side" + ], + "properties": { + "side": { + "_instruction": "Enter the uniform length of all twelve sides of this cube.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 23e1c8cf83e7d9c07bafec25601cc3f0fdb12af9 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:44:34 +0100 Subject: [PATCH 48/76] Create cuboid.schema.tpl.json --- .../mathematicalShapes/cuboid.schema.tpl.json | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 schemas/mathematicalShapes/cuboid.schema.tpl.json diff --git a/schemas/mathematicalShapes/cuboid.schema.tpl.json b/schemas/mathematicalShapes/cuboid.schema.tpl.json new file mode 100644 index 000000000..b2f0de0fa --- /dev/null +++ b/schemas/mathematicalShapes/cuboid.schema.tpl.json @@ -0,0 +1,31 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Cuboid", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "depth", + "height", + "width" + ], + "properties": { + "depth": { + "_instruction": "Enter the depth of this cuboid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "height": { + "_instruction": "Enter the height of this cuboid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "width": { + "_instruction": "Enter the width of this cuboid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 9e2d5ff803cb163d69a22b5ef2156b3fc475b783 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:46:38 +0100 Subject: [PATCH 49/76] Create squarePyramid.schema.tpl.json --- .../squarePyramid.schema.tpl.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 schemas/mathematicalShapes/squarePyramid.schema.tpl.json diff --git a/schemas/mathematicalShapes/squarePyramid.schema.tpl.json b/schemas/mathematicalShapes/squarePyramid.schema.tpl.json new file mode 100644 index 000000000..68fbf5823 --- /dev/null +++ b/schemas/mathematicalShapes/squarePyramid.schema.tpl.json @@ -0,0 +1,24 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/SquarePyramid", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "base", + "height" + ], + "properties": { + "base": { + "_instruction": "Enter the uniform length of all four sides of this square pyramid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "height": { + "_instruction": "Enter the height of this square pyramid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From be995f558d82a9ec1df84fb071e46f898da0be75 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 17:49:29 +0100 Subject: [PATCH 50/76] Create rectangularPyramid.schema.tpl.json --- .../rectangularPyramid.schema.tpl.json | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 schemas/mathematicalShapes/rectangularPyramid.schema.tpl.json diff --git a/schemas/mathematicalShapes/rectangularPyramid.schema.tpl.json b/schemas/mathematicalShapes/rectangularPyramid.schema.tpl.json new file mode 100644 index 000000000..ff0fd2008 --- /dev/null +++ b/schemas/mathematicalShapes/rectangularPyramid.schema.tpl.json @@ -0,0 +1,31 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/RectangularPyramid", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "baseDepth", + "baseWidth", + "height" + ], + "properties": { + "baseDepth": { + "_instruction": "Enter the depth of the base of this rectangular pyramid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "baseWidth": { + "_instruction": "Enter the width of the base of this rectangular pyramid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "height": { + "_instruction": "Enter the height of this rectangular pyramid.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From ad80843c7b000b5754d6f18b4a6ff3dca1d99588 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 18:05:26 +0100 Subject: [PATCH 51/76] Create rectangularFrustum.schema.tpl.json --- .../rectangularFrustum.schema.tpl.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 schemas/mathematicalShapes/rectangularFrustum.schema.tpl.json diff --git a/schemas/mathematicalShapes/rectangularFrustum.schema.tpl.json b/schemas/mathematicalShapes/rectangularFrustum.schema.tpl.json new file mode 100644 index 000000000..e62c90b99 --- /dev/null +++ b/schemas/mathematicalShapes/rectangularFrustum.schema.tpl.json @@ -0,0 +1,45 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/RectangularFrustum", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "bottomDepth", + "bottomWidth", + "height", + "topDepth", + "topWidth" + ], + "properties": { + "bottomDepth": { + "_instruction": "Enter the depth of the bottom base of this rectangular frustum.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "bottomWidth": { + "_instruction": "Enter the width of the bottom base of this rectangular frustum.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "height": { + "_instruction": "Enter the height of this rectangular frustum.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "topDepth": { + "_instruction": "Enter the depth of the top base of this rectangular frustum.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "topWidth": { + "_instruction": "Enter the width of the top base of this rectangular frustum.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 40eb3a04b8ea6d92386c954f74bc9fdde8bd04d3 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 18:16:03 +0100 Subject: [PATCH 52/76] Create cylinder.schema.tpl.json --- .../cylinder.schema.tpl.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 schemas/mathematicalShapes/cylinder.schema.tpl.json diff --git a/schemas/mathematicalShapes/cylinder.schema.tpl.json b/schemas/mathematicalShapes/cylinder.schema.tpl.json new file mode 100644 index 000000000..6888bc278 --- /dev/null +++ b/schemas/mathematicalShapes/cylinder.schema.tpl.json @@ -0,0 +1,24 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Cylinder", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "height", + "radius" + ], + "properties": { + "height": { + "_instruction": "Enter the height of this cylinder.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + }, + "radius": { + "_instruction": "Enter the radius of this cylinder.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From f854094784c35dba2a1e4166702da2f6cb6613f9 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 18:18:29 +0100 Subject: [PATCH 53/76] Create cone.schema.tpl.json --- .../mathematicalShapes/cone.schema.tpl.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 schemas/mathematicalShapes/cone.schema.tpl.json diff --git a/schemas/mathematicalShapes/cone.schema.tpl.json b/schemas/mathematicalShapes/cone.schema.tpl.json new file mode 100644 index 000000000..b86262833 --- /dev/null +++ b/schemas/mathematicalShapes/cone.schema.tpl.json @@ -0,0 +1,24 @@ +{ + "_type": "https://openminds.ebrains.eu/sands/Cone", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "baseRadius", + "height" + ], + "properties": { + "baseRadius": { + "_instruction": "Enter the radius of the base of this cone.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + "height": { + "_instruction": "Enter the height of this cone.", + "_embeddedTypes": [ + "https://openminds.ebrains.eu/core/QuantitativeValue" + ] + } + } +} From 68dd18701bf07102f889e985afbca575664e5dcd Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 19:06:41 +0100 Subject: [PATCH 54/76] Update circle.schema.tpl.json --- schemas/mathematicalShapes/circle.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShapes/circle.schema.tpl.json b/schemas/mathematicalShapes/circle.schema.tpl.json index 32a3928cf..2719a4474 100644 --- a/schemas/mathematicalShapes/circle.schema.tpl.json +++ b/schemas/mathematicalShapes/circle.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Circle", + "_type": "sands:Circle", "_categories": [ "mathematicalShapes" ], @@ -10,7 +10,7 @@ "radius": { "_instruction": "Enter the radius of this circle.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } From 8e5379c9804b00c81b8faf2438b9b2bb329cb89b Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 19:07:15 +0100 Subject: [PATCH 55/76] Update circularSector.schema.tpl.json --- schemas/mathematicalShapes/circularSector.schema.tpl.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/mathematicalShapes/circularSector.schema.tpl.json b/schemas/mathematicalShapes/circularSector.schema.tpl.json index ee4fd3943..be24bd0ed 100644 --- a/schemas/mathematicalShapes/circularSector.schema.tpl.json +++ b/schemas/mathematicalShapes/circularSector.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/CircularSector", + "_type": "sands:CircularSector", "_categories": [ "mathematicalShapes" ], @@ -11,13 +11,13 @@ "centralAngle": { "_instruction": "Enter the central angle of this circular sector.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "radius": { "_instruction": "Enter the radius of this circular sector.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } From bad20b53ac106bf13e9a6e352ebad5dc62efc84f Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 19:07:42 +0100 Subject: [PATCH 56/76] Update cone.schema.tpl.json --- schemas/mathematicalShapes/cone.schema.tpl.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/mathematicalShapes/cone.schema.tpl.json b/schemas/mathematicalShapes/cone.schema.tpl.json index b86262833..ef01bbe0a 100644 --- a/schemas/mathematicalShapes/cone.schema.tpl.json +++ b/schemas/mathematicalShapes/cone.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Cone", + "_type": "sands:Cone", "_categories": [ "mathematicalShapes" ], @@ -11,13 +11,13 @@ "baseRadius": { "_instruction": "Enter the radius of the base of this cone.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } "height": { "_instruction": "Enter the height of this cone.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } From 56d2da6f48fbe48eef17ec81b6e728f39ef09050 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 19:08:53 +0100 Subject: [PATCH 57/76] Update ellipse.schema.tpl.json --- .../ellipse.schema.tpl.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/schemas/mathematicalShapes/ellipse.schema.tpl.json b/schemas/mathematicalShapes/ellipse.schema.tpl.json index d7263e8a2..e76a81bba 100644 --- a/schemas/mathematicalShapes/ellipse.schema.tpl.json +++ b/schemas/mathematicalShapes/ellipse.schema.tpl.json @@ -1,23 +1,23 @@ { - "_type": "https://openminds.ebrains.eu/sands/Ellipse", + "_type": "sands:Ellipse", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ - "longDiameter", - "shortDiameter" + "semiMinorAxis", + "semiMajorAxis" ], "properties": { - "longDiameter": { - "_instruction": "Enter the length of the longest diameter of this ellipse.", + "semiMinorAxis": { + "_instruction": "Enter the length of the semi-major axis of this ellipse.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, - "shortDiameter": { - "_instruction": "Enter the length of the shortes diameter of this ellipse.", + "semiMajorAxis": { + "_instruction": "Enter the length of the semi-minor axis of this ellipse.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } From 6ec4273ff24bdb60ee41571a6f5ffa12140e2bfc Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 19:09:31 +0100 Subject: [PATCH 58/76] Update rectangle.schema.tpl.json --- .../mathematicalShapes/rectangle.schema.tpl.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/schemas/mathematicalShapes/rectangle.schema.tpl.json b/schemas/mathematicalShapes/rectangle.schema.tpl.json index 599bd89dd..39862e077 100644 --- a/schemas/mathematicalShapes/rectangle.schema.tpl.json +++ b/schemas/mathematicalShapes/rectangle.schema.tpl.json @@ -1,23 +1,23 @@ { - "_type": "https://openminds.ebrains.eu/sands/Rectangle", + "_type": "sands:Rectangle", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ - "height", + "length", "width" ], "properties": { - "height": { - "_instruction": "Enter the height of this rectangle.", + "length": { + "_instruction": "Enter the length of this rectangle.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "width": { "_instruction": "Enter the width of this rectangle.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } From acb81119f41443afd70a7d09e80550205ba33937 Mon Sep 17 00:00:00 2001 From: lzehl Date: Mon, 23 Feb 2026 19:19:56 +0100 Subject: [PATCH 59/76] fixed all namespace errors --- schemas/mathematicalShapes/cube.schema.tpl.json | 4 ++-- schemas/mathematicalShapes/cuboid.schema.tpl.json | 8 ++++---- schemas/mathematicalShapes/cylinder.schema.tpl.json | 6 +++--- schemas/mathematicalShapes/ellipsoid.schema.tpl.json | 8 ++++---- schemas/mathematicalShapes/kite.schema.tpl.json | 8 ++++---- .../mathematicalShapes/parallelogram.schema.tpl.json | 8 ++++---- .../rectangularFrustum.schema.tpl.json | 12 ++++++------ .../rectangularPyramid.schema.tpl.json | 8 ++++---- .../regularPolygon.schema.tpl.json | 6 +++--- schemas/mathematicalShapes/rhombus.schema.tpl.json | 6 +++--- .../mathematicalShapes/rightTriangle.schema.tpl.json | 6 +++--- schemas/mathematicalShapes/sphere.schema.tpl.json | 4 ++-- schemas/mathematicalShapes/spheroid.schema.tpl.json | 6 +++--- schemas/mathematicalShapes/square.schema.tpl.json | 4 ++-- .../mathematicalShapes/squarePyramid.schema.tpl.json | 6 +++--- schemas/mathematicalShapes/trapezoid.schema.tpl.json | 8 ++++---- schemas/mathematicalShapes/triangle.schema.tpl.json | 4 ++-- 17 files changed, 56 insertions(+), 56 deletions(-) diff --git a/schemas/mathematicalShapes/cube.schema.tpl.json b/schemas/mathematicalShapes/cube.schema.tpl.json index e368d7ced..14dc1d574 100644 --- a/schemas/mathematicalShapes/cube.schema.tpl.json +++ b/schemas/mathematicalShapes/cube.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Cube", + "_type": "sands:Cube", "_categories": [ "mathematicalShapes" ], @@ -10,7 +10,7 @@ "side": { "_instruction": "Enter the uniform length of all twelve sides of this cube.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/cuboid.schema.tpl.json b/schemas/mathematicalShapes/cuboid.schema.tpl.json index b2f0de0fa..f5c9ead21 100644 --- a/schemas/mathematicalShapes/cuboid.schema.tpl.json +++ b/schemas/mathematicalShapes/cuboid.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Cuboid", + "_type": "sands:Cuboid", "_categories": [ "mathematicalShapes" ], @@ -12,19 +12,19 @@ "depth": { "_instruction": "Enter the depth of this cuboid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "height": { "_instruction": "Enter the height of this cuboid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "width": { "_instruction": "Enter the width of this cuboid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/cylinder.schema.tpl.json b/schemas/mathematicalShapes/cylinder.schema.tpl.json index 6888bc278..dbbb0b6c5 100644 --- a/schemas/mathematicalShapes/cylinder.schema.tpl.json +++ b/schemas/mathematicalShapes/cylinder.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Cylinder", + "_type": "sands:Cylinder", "_categories": [ "mathematicalShapes" ], @@ -11,13 +11,13 @@ "height": { "_instruction": "Enter the height of this cylinder.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "radius": { "_instruction": "Enter the radius of this cylinder.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/ellipsoid.schema.tpl.json b/schemas/mathematicalShapes/ellipsoid.schema.tpl.json index bcc09ad18..554c242df 100644 --- a/schemas/mathematicalShapes/ellipsoid.schema.tpl.json +++ b/schemas/mathematicalShapes/ellipsoid.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Ellipsoid", + "_type": "sands:Ellipsoid", "_categories": [ "mathematicalShapes" ], @@ -12,19 +12,19 @@ "longDiameter": { "_instruction": "Enter the length of the long diameter of this ellipsoid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "intermediateDiameter": { "_instruction": "Enter the length of the intermediate diameter of this ellipsoid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "shortDiameter": { "_instruction": "Enter the length of the short diameter of this ellipsoid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/kite.schema.tpl.json b/schemas/mathematicalShapes/kite.schema.tpl.json index 4eca11271..da06e783b 100644 --- a/schemas/mathematicalShapes/kite.schema.tpl.json +++ b/schemas/mathematicalShapes/kite.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Kite", + "_type": "sands:Kite", "_categories": [ "mathematicalShapes" ], @@ -12,19 +12,19 @@ "baseDiagonal": { "_instruction": "Enter the length of the base diagonal of this kite.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "bottomLeg": { "_instruction": "Enter the length of the bottom legs of this kite.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "topLeg": { "_instruction": "Enter the length of the top legs of this kite.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/parallelogram.schema.tpl.json b/schemas/mathematicalShapes/parallelogram.schema.tpl.json index d2d20bc79..ea19b6e6d 100644 --- a/schemas/mathematicalShapes/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShapes/parallelogram.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Parallelogram", + "_type": "sands:Parallelogram", "_categories": [ "mathematicalShapes" ], @@ -12,19 +12,19 @@ "base": { "_instruction": "Enter the uniform length of the bottom and top reference sides of this parallelogram.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "height": { "_instruction": "Enter the height (perpendicular distance between the reference sides) of this parallelogram.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "side": { "_instruction": "Enter the uniform length of the slanted sides of this parallelogram.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/rectangularFrustum.schema.tpl.json b/schemas/mathematicalShapes/rectangularFrustum.schema.tpl.json index e62c90b99..6057493a3 100644 --- a/schemas/mathematicalShapes/rectangularFrustum.schema.tpl.json +++ b/schemas/mathematicalShapes/rectangularFrustum.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/RectangularFrustum", + "_type": "sands:RectangularFrustum", "_categories": [ "mathematicalShapes" ], @@ -14,31 +14,31 @@ "bottomDepth": { "_instruction": "Enter the depth of the bottom base of this rectangular frustum.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "bottomWidth": { "_instruction": "Enter the width of the bottom base of this rectangular frustum.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "height": { "_instruction": "Enter the height of this rectangular frustum.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "topDepth": { "_instruction": "Enter the depth of the top base of this rectangular frustum.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "topWidth": { "_instruction": "Enter the width of the top base of this rectangular frustum.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/rectangularPyramid.schema.tpl.json b/schemas/mathematicalShapes/rectangularPyramid.schema.tpl.json index ff0fd2008..9f6e4fd8f 100644 --- a/schemas/mathematicalShapes/rectangularPyramid.schema.tpl.json +++ b/schemas/mathematicalShapes/rectangularPyramid.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/RectangularPyramid", + "_type": "sands:RectangularPyramid", "_categories": [ "mathematicalShapes" ], @@ -12,19 +12,19 @@ "baseDepth": { "_instruction": "Enter the depth of the base of this rectangular pyramid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "baseWidth": { "_instruction": "Enter the width of the base of this rectangular pyramid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "height": { "_instruction": "Enter the height of this rectangular pyramid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/regularPolygon.schema.tpl.json b/schemas/mathematicalShapes/regularPolygon.schema.tpl.json index d4b3c125f..9d5b10c92 100644 --- a/schemas/mathematicalShapes/regularPolygon.schema.tpl.json +++ b/schemas/mathematicalShapes/regularPolygon.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/RegularPolygon", + "_type": "sands:RegularPolygon", "_categories": [ "mathematicalShapes" ], @@ -11,13 +11,13 @@ "circumradius": { "_instruction": "Enter the length of the circumradius (distance from the center to any of the vertices) of this regular polygon.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "side": { "_instruction": "Enter the uniform length of all sides of this regular polygon.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/rhombus.schema.tpl.json b/schemas/mathematicalShapes/rhombus.schema.tpl.json index f8c508f90..e773538de 100644 --- a/schemas/mathematicalShapes/rhombus.schema.tpl.json +++ b/schemas/mathematicalShapes/rhombus.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Rhombus", + "_type": "sands:Rhombus", "_categories": [ "mathematicalShapes" ], @@ -11,13 +11,13 @@ "longDiagonal": { "_instruction": "Enter the length of the long diagonal of this rhombus.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "shortDiagonal": { "_instruction": "Enter the length of the short diagonal of this rhombus.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/rightTriangle.schema.tpl.json b/schemas/mathematicalShapes/rightTriangle.schema.tpl.json index 804d63fab..1390150bd 100644 --- a/schemas/mathematicalShapes/rightTriangle.schema.tpl.json +++ b/schemas/mathematicalShapes/rightTriangle.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/RightTriangle", + "_type": "sands:RightTriangle", "_categories": [ "mathematicalShapes" ], @@ -11,13 +11,13 @@ "base": { "_instruction": "Enter the base length of this right triangle.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "height": { "_instruction": "Enter the height of this right triangle.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/sphere.schema.tpl.json b/schemas/mathematicalShapes/sphere.schema.tpl.json index c4d706fde..2656369dd 100644 --- a/schemas/mathematicalShapes/sphere.schema.tpl.json +++ b/schemas/mathematicalShapes/sphere.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Sphere", + "_type": "sands:Sphere", "_categories": [ "mathematicalShapes" ], @@ -10,7 +10,7 @@ "radius": { "_instruction": "Define the radius of this sphere.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/spheroid.schema.tpl.json b/schemas/mathematicalShapes/spheroid.schema.tpl.json index db3f5c0ac..e626c8c29 100644 --- a/schemas/mathematicalShapes/spheroid.schema.tpl.json +++ b/schemas/mathematicalShapes/spheroid.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Spheroid", + "_type": "sands:Spheroid", "_categories": [ "mathematicalShapes" ], @@ -11,13 +11,13 @@ "equatorialDiameter": { "_instruction": "Enter the uniform length of the two equatorial diameters of this spheroid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "polarDiameter": { "_instruction": "Enter the length of the polar diameter of this spheroid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/square.schema.tpl.json b/schemas/mathematicalShapes/square.schema.tpl.json index 794f4e90b..f736da16e 100644 --- a/schemas/mathematicalShapes/square.schema.tpl.json +++ b/schemas/mathematicalShapes/square.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Square", + "_type": "sands:Square", "_categories": [ "mathematicalShapes" ], @@ -10,7 +10,7 @@ "side": { "_instruction": "Enter the uniform length of all four sides of this square.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/squarePyramid.schema.tpl.json b/schemas/mathematicalShapes/squarePyramid.schema.tpl.json index 68fbf5823..67017052c 100644 --- a/schemas/mathematicalShapes/squarePyramid.schema.tpl.json +++ b/schemas/mathematicalShapes/squarePyramid.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/SquarePyramid", + "_type": "sands:SquarePyramid", "_categories": [ "mathematicalShapes" ], @@ -11,13 +11,13 @@ "base": { "_instruction": "Enter the uniform length of all four sides of this square pyramid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "height": { "_instruction": "Enter the height of this square pyramid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/trapezoid.schema.tpl.json b/schemas/mathematicalShapes/trapezoid.schema.tpl.json index c54b86e05..444799fb1 100644 --- a/schemas/mathematicalShapes/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShapes/trapezoid.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Trapezoid", + "_type": "sands:Trapezoid", "_categories": [ "mathematicalShapes" ], @@ -12,19 +12,19 @@ "bottomBase": { "_instruction": "Enter the length of the bottom reference side of this trapezoid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "height": { "_instruction": "Enter the height (perpendicular distance between the reference sides) of this parallelogram.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "topBase": { "_instruction": "Enter the length of the top reference side of this trapezoid.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] } } diff --git a/schemas/mathematicalShapes/triangle.schema.tpl.json b/schemas/mathematicalShapes/triangle.schema.tpl.json index e49fecee3..fb59d0f3d 100644 --- a/schemas/mathematicalShapes/triangle.schema.tpl.json +++ b/schemas/mathematicalShapes/triangle.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "https://openminds.ebrains.eu/sands/Triangle", + "_type": "sands:Triangle", "_categories": [ "mathematicalShapes" ], @@ -11,7 +11,7 @@ "base": { "_instruction": "Enter the length of the reference side of this triangle.", "_embeddedTypes": [ - "https://openminds.ebrains.eu/core/QuantitativeValue" + "core:QuantitativeValue" ] }, "sides": { From d610e4b5395022533cb06f9bb777920187f456b4 Mon Sep 17 00:00:00 2001 From: lzehl Date: Mon, 23 Feb 2026 19:23:12 +0100 Subject: [PATCH 60/76] updating props for rectangle and ellipse --- schemas/mathematicalShapes/ellipse.schema.tpl.json | 12 ++++++------ schemas/mathematicalShapes/rectangle.schema.tpl.json | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/schemas/mathematicalShapes/ellipse.schema.tpl.json b/schemas/mathematicalShapes/ellipse.schema.tpl.json index e76a81bba..361ad6308 100644 --- a/schemas/mathematicalShapes/ellipse.schema.tpl.json +++ b/schemas/mathematicalShapes/ellipse.schema.tpl.json @@ -4,18 +4,18 @@ "mathematicalShape" ], "required": [ - "semiMinorAxis", - "semiMajorAxis" + "longDiameter", + "shortDiameter" ], "properties": { - "semiMinorAxis": { - "_instruction": "Enter the length of the semi-major axis of this ellipse.", + "longDiameter": { + "_instruction": "Enter the length of the longest diameter of this ellipse.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "semiMajorAxis": { - "_instruction": "Enter the length of the semi-minor axis of this ellipse.", + "shortDiameter": { + "_instruction": "Enter the length of the shortest diameter of this ellipse.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShapes/rectangle.schema.tpl.json b/schemas/mathematicalShapes/rectangle.schema.tpl.json index 39862e077..96cc8d4f0 100644 --- a/schemas/mathematicalShapes/rectangle.schema.tpl.json +++ b/schemas/mathematicalShapes/rectangle.schema.tpl.json @@ -4,12 +4,12 @@ "mathematicalShape" ], "required": [ - "length", + "height", "width" ], "properties": { - "length": { - "_instruction": "Enter the length of this rectangle.", + "height": { + "_instruction": "Enter the height of this rectangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] From dd94b91e3fe03227d4d04f8a118094f6b5cd62e9 Mon Sep 17 00:00:00 2001 From: lzehl Date: Mon, 23 Feb 2026 20:21:07 +0100 Subject: [PATCH 61/76] final conflict resolution --- .../mathematicalShape/circle.schema.tpl.json | 2 +- .../circularSector.schema.tpl.json | 0 .../cone.schema.tpl.json | 0 .../cube.schema.tpl.json | 0 .../cuboid.schema.tpl.json | 0 .../cylinder.schema.tpl.json | 0 .../mathematicalShape/ellipse.schema.tpl.json | 12 +++++----- .../ellipsoid.schema.tpl.json | 0 .../kite.schema.tpl.json | 0 .../parallelogram.schema.tpl.json | 0 .../rectangle.schema.tpl.json | 6 ++--- .../rectangularFrustum.schema.tpl.json | 0 .../rectangularPyramid.schema.tpl.json | 0 .../regularPolygon.schema.tpl.json | 0 .../rhombus.schema.tpl.json | 0 .../rightTriangle.schema.tpl.json | 0 .../sphere.schema.tpl.json | 0 .../spheroid.schema.tpl.json | 0 .../square.schema.tpl.json | 0 .../squarePyramid.schema.tpl.json | 0 .../trapezoid.schema.tpl.json | 0 .../triangle.schema.tpl.json | 0 .../mathematicalShapes/circle.schema.tpl.json | 17 ------------- .../ellipse.schema.tpl.json | 24 ------------------- .../rectangle.schema.tpl.json | 24 ------------------- 25 files changed, 10 insertions(+), 75 deletions(-) rename schemas/{mathematicalShapes => mathematicalShape}/circularSector.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/cone.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/cube.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/cuboid.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/cylinder.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/ellipsoid.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/kite.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/parallelogram.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/rectangularFrustum.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/rectangularPyramid.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/regularPolygon.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/rhombus.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/rightTriangle.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/sphere.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/spheroid.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/square.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/squarePyramid.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/trapezoid.schema.tpl.json (100%) rename schemas/{mathematicalShapes => mathematicalShape}/triangle.schema.tpl.json (100%) delete mode 100644 schemas/mathematicalShapes/circle.schema.tpl.json delete mode 100644 schemas/mathematicalShapes/ellipse.schema.tpl.json delete mode 100644 schemas/mathematicalShapes/rectangle.schema.tpl.json diff --git a/schemas/mathematicalShape/circle.schema.tpl.json b/schemas/mathematicalShape/circle.schema.tpl.json index f6751aa91..2719a4474 100644 --- a/schemas/mathematicalShape/circle.schema.tpl.json +++ b/schemas/mathematicalShape/circle.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Circle", "_categories": [ - "mathematicalShape" + "mathematicalShapes" ], "required": [ "radius" diff --git a/schemas/mathematicalShapes/circularSector.schema.tpl.json b/schemas/mathematicalShape/circularSector.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/circularSector.schema.tpl.json rename to schemas/mathematicalShape/circularSector.schema.tpl.json diff --git a/schemas/mathematicalShapes/cone.schema.tpl.json b/schemas/mathematicalShape/cone.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/cone.schema.tpl.json rename to schemas/mathematicalShape/cone.schema.tpl.json diff --git a/schemas/mathematicalShapes/cube.schema.tpl.json b/schemas/mathematicalShape/cube.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/cube.schema.tpl.json rename to schemas/mathematicalShape/cube.schema.tpl.json diff --git a/schemas/mathematicalShapes/cuboid.schema.tpl.json b/schemas/mathematicalShape/cuboid.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/cuboid.schema.tpl.json rename to schemas/mathematicalShape/cuboid.schema.tpl.json diff --git a/schemas/mathematicalShapes/cylinder.schema.tpl.json b/schemas/mathematicalShape/cylinder.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/cylinder.schema.tpl.json rename to schemas/mathematicalShape/cylinder.schema.tpl.json diff --git a/schemas/mathematicalShape/ellipse.schema.tpl.json b/schemas/mathematicalShape/ellipse.schema.tpl.json index e76a81bba..361ad6308 100644 --- a/schemas/mathematicalShape/ellipse.schema.tpl.json +++ b/schemas/mathematicalShape/ellipse.schema.tpl.json @@ -4,18 +4,18 @@ "mathematicalShape" ], "required": [ - "semiMinorAxis", - "semiMajorAxis" + "longDiameter", + "shortDiameter" ], "properties": { - "semiMinorAxis": { - "_instruction": "Enter the length of the semi-major axis of this ellipse.", + "longDiameter": { + "_instruction": "Enter the length of the longest diameter of this ellipse.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "semiMajorAxis": { - "_instruction": "Enter the length of the semi-minor axis of this ellipse.", + "shortDiameter": { + "_instruction": "Enter the length of the shortest diameter of this ellipse.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShapes/ellipsoid.schema.tpl.json b/schemas/mathematicalShape/ellipsoid.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/ellipsoid.schema.tpl.json rename to schemas/mathematicalShape/ellipsoid.schema.tpl.json diff --git a/schemas/mathematicalShapes/kite.schema.tpl.json b/schemas/mathematicalShape/kite.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/kite.schema.tpl.json rename to schemas/mathematicalShape/kite.schema.tpl.json diff --git a/schemas/mathematicalShapes/parallelogram.schema.tpl.json b/schemas/mathematicalShape/parallelogram.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/parallelogram.schema.tpl.json rename to schemas/mathematicalShape/parallelogram.schema.tpl.json diff --git a/schemas/mathematicalShape/rectangle.schema.tpl.json b/schemas/mathematicalShape/rectangle.schema.tpl.json index 39862e077..96cc8d4f0 100644 --- a/schemas/mathematicalShape/rectangle.schema.tpl.json +++ b/schemas/mathematicalShape/rectangle.schema.tpl.json @@ -4,12 +4,12 @@ "mathematicalShape" ], "required": [ - "length", + "height", "width" ], "properties": { - "length": { - "_instruction": "Enter the length of this rectangle.", + "height": { + "_instruction": "Enter the height of this rectangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShapes/rectangularFrustum.schema.tpl.json b/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/rectangularFrustum.schema.tpl.json rename to schemas/mathematicalShape/rectangularFrustum.schema.tpl.json diff --git a/schemas/mathematicalShapes/rectangularPyramid.schema.tpl.json b/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/rectangularPyramid.schema.tpl.json rename to schemas/mathematicalShape/rectangularPyramid.schema.tpl.json diff --git a/schemas/mathematicalShapes/regularPolygon.schema.tpl.json b/schemas/mathematicalShape/regularPolygon.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/regularPolygon.schema.tpl.json rename to schemas/mathematicalShape/regularPolygon.schema.tpl.json diff --git a/schemas/mathematicalShapes/rhombus.schema.tpl.json b/schemas/mathematicalShape/rhombus.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/rhombus.schema.tpl.json rename to schemas/mathematicalShape/rhombus.schema.tpl.json diff --git a/schemas/mathematicalShapes/rightTriangle.schema.tpl.json b/schemas/mathematicalShape/rightTriangle.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/rightTriangle.schema.tpl.json rename to schemas/mathematicalShape/rightTriangle.schema.tpl.json diff --git a/schemas/mathematicalShapes/sphere.schema.tpl.json b/schemas/mathematicalShape/sphere.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/sphere.schema.tpl.json rename to schemas/mathematicalShape/sphere.schema.tpl.json diff --git a/schemas/mathematicalShapes/spheroid.schema.tpl.json b/schemas/mathematicalShape/spheroid.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/spheroid.schema.tpl.json rename to schemas/mathematicalShape/spheroid.schema.tpl.json diff --git a/schemas/mathematicalShapes/square.schema.tpl.json b/schemas/mathematicalShape/square.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/square.schema.tpl.json rename to schemas/mathematicalShape/square.schema.tpl.json diff --git a/schemas/mathematicalShapes/squarePyramid.schema.tpl.json b/schemas/mathematicalShape/squarePyramid.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/squarePyramid.schema.tpl.json rename to schemas/mathematicalShape/squarePyramid.schema.tpl.json diff --git a/schemas/mathematicalShapes/trapezoid.schema.tpl.json b/schemas/mathematicalShape/trapezoid.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/trapezoid.schema.tpl.json rename to schemas/mathematicalShape/trapezoid.schema.tpl.json diff --git a/schemas/mathematicalShapes/triangle.schema.tpl.json b/schemas/mathematicalShape/triangle.schema.tpl.json similarity index 100% rename from schemas/mathematicalShapes/triangle.schema.tpl.json rename to schemas/mathematicalShape/triangle.schema.tpl.json diff --git a/schemas/mathematicalShapes/circle.schema.tpl.json b/schemas/mathematicalShapes/circle.schema.tpl.json deleted file mode 100644 index 2719a4474..000000000 --- a/schemas/mathematicalShapes/circle.schema.tpl.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "_type": "sands:Circle", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "radius" - ], - "properties": { - "radius": { - "_instruction": "Enter the radius of this circle.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } - } -} diff --git a/schemas/mathematicalShapes/ellipse.schema.tpl.json b/schemas/mathematicalShapes/ellipse.schema.tpl.json deleted file mode 100644 index 361ad6308..000000000 --- a/schemas/mathematicalShapes/ellipse.schema.tpl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "_type": "sands:Ellipse", - "_categories": [ - "mathematicalShape" - ], - "required": [ - "longDiameter", - "shortDiameter" - ], - "properties": { - "longDiameter": { - "_instruction": "Enter the length of the longest diameter of this ellipse.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "shortDiameter": { - "_instruction": "Enter the length of the shortest diameter of this ellipse.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } - } -} diff --git a/schemas/mathematicalShapes/rectangle.schema.tpl.json b/schemas/mathematicalShapes/rectangle.schema.tpl.json deleted file mode 100644 index 96cc8d4f0..000000000 --- a/schemas/mathematicalShapes/rectangle.schema.tpl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "_type": "sands:Rectangle", - "_categories": [ - "mathematicalShape" - ], - "required": [ - "height", - "width" - ], - "properties": { - "height": { - "_instruction": "Enter the height of this rectangle.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "width": { - "_instruction": "Enter the width of this rectangle.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } - } -} From bfdf7abbe526727ecc370a00eb1136ebe862269e Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Mon, 23 Feb 2026 20:22:28 +0100 Subject: [PATCH 62/76] Update cone.schema.tpl.json --- schemas/mathematicalShape/cone.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShape/cone.schema.tpl.json b/schemas/mathematicalShape/cone.schema.tpl.json index ef01bbe0a..582c9b7d5 100644 --- a/schemas/mathematicalShape/cone.schema.tpl.json +++ b/schemas/mathematicalShape/cone.schema.tpl.json @@ -13,7 +13,7 @@ "_embeddedTypes": [ "core:QuantitativeValue" ] - } + }, "height": { "_instruction": "Enter the height of this cone.", "_embeddedTypes": [ From 245308273d29119839da652b6ef7d6d2935fc9b3 Mon Sep 17 00:00:00 2001 From: lzehl Date: Mon, 23 Feb 2026 21:56:50 +0100 Subject: [PATCH 63/76] added missing triangle types and corrected properties and instructions --- .../mathematicalShape/ellipse.schema.tpl.json | 16 +++++-------- .../equilateralTriangle.schema.tpl.json | 17 +++++++++++++ .../isoscelesTriangle.schema.tpl.json | 24 +++++++++++++++++++ .../mathematicalShape/kite.schema.tpl.json | 18 +++++++------- .../parallelogram.schema.tpl.json | 10 ++++---- .../regularPolygon.schema.tpl.json | 8 +++---- .../mathematicalShape/rhombus.schema.tpl.json | 16 +++++-------- .../rightTriangle.schema.tpl.json | 6 ++--- .../mathematicalShape/square.schema.tpl.json | 6 ++--- .../trapezoid.schema.tpl.json | 10 ++++---- .../triangle.schema.tpl.json | 17 ++++--------- 11 files changed, 87 insertions(+), 61 deletions(-) create mode 100644 schemas/mathematicalShape/equilateralTriangle.schema.tpl.json create mode 100644 schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json diff --git a/schemas/mathematicalShape/ellipse.schema.tpl.json b/schemas/mathematicalShape/ellipse.schema.tpl.json index 361ad6308..2696efc45 100644 --- a/schemas/mathematicalShape/ellipse.schema.tpl.json +++ b/schemas/mathematicalShape/ellipse.schema.tpl.json @@ -4,18 +4,14 @@ "mathematicalShape" ], "required": [ - "longDiameter", - "shortDiameter" + "diameters" ], "properties": { - "longDiameter": { - "_instruction": "Enter the length of the longest diameter of this ellipse.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "shortDiameter": { - "_instruction": "Enter the length of the shortest diameter of this ellipse.", + "diameters": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "_instruction": "Enter the lengths of the major and minor diameters of this ellipse.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json b/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json new file mode 100644 index 000000000..c1f336c8b --- /dev/null +++ b/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json @@ -0,0 +1,17 @@ +{ + "_type": "sands:EquilateralTriangle", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "sideLength" + ], + "properties": { + "sideLength": { + "_instruction": "Enter the uniform length of the sides of this equilateral triangle.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json b/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json new file mode 100644 index 000000000..8704db6f9 --- /dev/null +++ b/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json @@ -0,0 +1,24 @@ +{ + "_type": "sands:IsoscelesTriangle", + "_categories": [ + "mathematicalShapes" + ], + "required": [ + "baseLength", + "legLength" + ], + "properties": { + "baseLength": { + "_instruction": "Enter the length of the base of this isosceles triangle.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "legLength": { + "_instruction": "Enter the height of this isosceles triangle.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/kite.schema.tpl.json b/schemas/mathematicalShape/kite.schema.tpl.json index da06e783b..a8a02d85f 100644 --- a/schemas/mathematicalShape/kite.schema.tpl.json +++ b/schemas/mathematicalShape/kite.schema.tpl.json @@ -4,25 +4,25 @@ "mathematicalShapes" ], "required": [ - "baseDiagonal", - "bottomLeg", - "topLeg" + "bottomLegLength", + "symmetryDiagonalLength", + "topLegLength" ], "properties": { - "baseDiagonal": { - "_instruction": "Enter the length of the base diagonal of this kite.", + "bottomLegLength": { + "_instruction": "Enter the common length of the bottom legs of this kite.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "bottomLeg": { - "_instruction": "Enter the length of the bottom legs of this kite.", + "symmetryDiagonalLength": { + "_instruction": "Enter the length of the symmetry diagonal of this kite.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "topLeg": { - "_instruction": "Enter the length of the top legs of this kite.", + "topLegLength": { + "_instruction": "Enter the common length of the top legs of this kite.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/parallelogram.schema.tpl.json b/schemas/mathematicalShape/parallelogram.schema.tpl.json index ea19b6e6d..cbdbf6429 100644 --- a/schemas/mathematicalShape/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShape/parallelogram.schema.tpl.json @@ -9,20 +9,20 @@ "side" ], "properties": { - "base": { - "_instruction": "Enter the uniform length of the bottom and top reference sides of this parallelogram.", + "baseLength": { + "_instruction": "Enter the uniform length of the bottom and top sides (the base) of this parallelogram.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, "height": { - "_instruction": "Enter the height (perpendicular distance between the reference sides) of this parallelogram.", + "_instruction": "Enter the height (perpendicular distance to the base) of this parallelogram.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "side": { - "_instruction": "Enter the uniform length of the slanted sides of this parallelogram.", + "sideLength": { + "_instruction": "Enter the uniform length of the sides adjacent to the base of this parallelogram.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/regularPolygon.schema.tpl.json b/schemas/mathematicalShape/regularPolygon.schema.tpl.json index 9d5b10c92..cfc274724 100644 --- a/schemas/mathematicalShape/regularPolygon.schema.tpl.json +++ b/schemas/mathematicalShape/regularPolygon.schema.tpl.json @@ -5,17 +5,17 @@ ], "required": [ "circumradius", - "side" + "numberOfSides" ], "properties": { "circumradius": { - "_instruction": "Enter the length of the circumradius (distance from the center to any of the vertices) of this regular polygon.", + "_instruction": "Enter the circumradius (distance from the center to a vertex) of this regular polygon.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "side": { - "_instruction": "Enter the uniform length of all sides of this regular polygon.", + "numberOfSides": { + "_instruction": "Enter the number of sides of this regular polygon.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/rhombus.schema.tpl.json b/schemas/mathematicalShape/rhombus.schema.tpl.json index e773538de..6a371b7d2 100644 --- a/schemas/mathematicalShape/rhombus.schema.tpl.json +++ b/schemas/mathematicalShape/rhombus.schema.tpl.json @@ -4,18 +4,14 @@ "mathematicalShapes" ], "required": [ - "longDiagonal", - "shortDiagonal" + "diagonalLengths" ], "properties": { - "longDiagonal": { - "_instruction": "Enter the length of the long diagonal of this rhombus.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "shortDiagonal": { - "_instruction": "Enter the length of the short diagonal of this rhombus.", + "diagonalLengths": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "_instruction": "Enter the lengths of the two perpendicular diagonals of this rhombus.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/rightTriangle.schema.tpl.json b/schemas/mathematicalShape/rightTriangle.schema.tpl.json index 1390150bd..b8063d3fe 100644 --- a/schemas/mathematicalShape/rightTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/rightTriangle.schema.tpl.json @@ -4,12 +4,12 @@ "mathematicalShapes" ], "required": [ - "base", + "baseLength", "height" ], "properties": { - "base": { - "_instruction": "Enter the base length of this right triangle.", + "baseLength": { + "_instruction": "Enter the length of the base of this right triangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/square.schema.tpl.json b/schemas/mathematicalShape/square.schema.tpl.json index f736da16e..2d24fb74c 100644 --- a/schemas/mathematicalShape/square.schema.tpl.json +++ b/schemas/mathematicalShape/square.schema.tpl.json @@ -4,11 +4,11 @@ "mathematicalShapes" ], "required": [ - "side" + "sideLength" ], "properties": { - "side": { - "_instruction": "Enter the uniform length of all four sides of this square.", + "sideLength": { + "_instruction": "Enter the common length of the sides of this square.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/trapezoid.schema.tpl.json b/schemas/mathematicalShape/trapezoid.schema.tpl.json index 444799fb1..e3d68263d 100644 --- a/schemas/mathematicalShape/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShape/trapezoid.schema.tpl.json @@ -9,20 +9,20 @@ "topBase" ], "properties": { - "bottomBase": { - "_instruction": "Enter the length of the bottom reference side of this trapezoid.", + "bottomBaseLength": { + "_instruction": "Enter the length of the bottom base of this trapezoid.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, "height": { - "_instruction": "Enter the height (perpendicular distance between the reference sides) of this parallelogram.", + "_instruction": "Enter the height (perpendicular distance between the bases) of this trapezoid.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "topBase": { - "_instruction": "Enter the length of the top reference side of this trapezoid.", + "topBaseLength": { + "_instruction": "Enter the length of the top base of this trapezoid.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/triangle.schema.tpl.json b/schemas/mathematicalShape/triangle.schema.tpl.json index fb59d0f3d..4dd1f4919 100644 --- a/schemas/mathematicalShape/triangle.schema.tpl.json +++ b/schemas/mathematicalShape/triangle.schema.tpl.json @@ -4,21 +4,14 @@ "mathematicalShapes" ], "required": [ - "base", - "sides" + "sideLengths" ], "properties": { - "base": { - "_instruction": "Enter the length of the reference side of this triangle.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "sides": { + "sideLengths": { "type": "array", - "minItems": 2, - "maxItems": 2, - "_instruction": "Enter the lengths of the other two sides of the triangle.", + "minItems": 3, + "maxItems": 3, + "_instruction": "Enter the different lengths of the three sides of the triangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] From 9e6bea46841c723b0519b4b3d49708031bc365d3 Mon Sep 17 00:00:00 2001 From: lzehl Date: Mon, 23 Feb 2026 23:09:24 +0100 Subject: [PATCH 64/76] started cleanup of 3d shapes --- .../mathematicalShape/cone.schema.tpl.json | 24 ---------- .../mathematicalShape/cube.schema.tpl.json | 17 ------- .../mathematicalShape/cuboid.schema.tpl.json | 31 ------------- .../cylinder.schema.tpl.json | 24 ---------- .../ellipsoid.schema.tpl.json | 16 +++---- .../rectangularFrustum.schema.tpl.json | 45 ------------------- .../rectangularPyramid.schema.tpl.json | 31 ------------- .../rightTriangle.schema.tpl.json | 2 +- .../mathematicalShape/sphere.schema.tpl.json | 2 +- .../spheroid.schema.tpl.json | 4 +- .../squarePyramid.schema.tpl.json | 24 ---------- 11 files changed, 12 insertions(+), 208 deletions(-) delete mode 100644 schemas/mathematicalShape/cone.schema.tpl.json delete mode 100644 schemas/mathematicalShape/cube.schema.tpl.json delete mode 100644 schemas/mathematicalShape/cuboid.schema.tpl.json delete mode 100644 schemas/mathematicalShape/cylinder.schema.tpl.json delete mode 100644 schemas/mathematicalShape/rectangularFrustum.schema.tpl.json delete mode 100644 schemas/mathematicalShape/rectangularPyramid.schema.tpl.json delete mode 100644 schemas/mathematicalShape/squarePyramid.schema.tpl.json diff --git a/schemas/mathematicalShape/cone.schema.tpl.json b/schemas/mathematicalShape/cone.schema.tpl.json deleted file mode 100644 index 582c9b7d5..000000000 --- a/schemas/mathematicalShape/cone.schema.tpl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "_type": "sands:Cone", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "baseRadius", - "height" - ], - "properties": { - "baseRadius": { - "_instruction": "Enter the radius of the base of this cone.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "height": { - "_instruction": "Enter the height of this cone.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } - } -} diff --git a/schemas/mathematicalShape/cube.schema.tpl.json b/schemas/mathematicalShape/cube.schema.tpl.json deleted file mode 100644 index 14dc1d574..000000000 --- a/schemas/mathematicalShape/cube.schema.tpl.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "_type": "sands:Cube", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "side" - ], - "properties": { - "side": { - "_instruction": "Enter the uniform length of all twelve sides of this cube.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } - } -} diff --git a/schemas/mathematicalShape/cuboid.schema.tpl.json b/schemas/mathematicalShape/cuboid.schema.tpl.json deleted file mode 100644 index f5c9ead21..000000000 --- a/schemas/mathematicalShape/cuboid.schema.tpl.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "_type": "sands:Cuboid", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "depth", - "height", - "width" - ], - "properties": { - "depth": { - "_instruction": "Enter the depth of this cuboid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "height": { - "_instruction": "Enter the height of this cuboid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "width": { - "_instruction": "Enter the width of this cuboid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } - } -} diff --git a/schemas/mathematicalShape/cylinder.schema.tpl.json b/schemas/mathematicalShape/cylinder.schema.tpl.json deleted file mode 100644 index dbbb0b6c5..000000000 --- a/schemas/mathematicalShape/cylinder.schema.tpl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "_type": "sands:Cylinder", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "height", - "radius" - ], - "properties": { - "height": { - "_instruction": "Enter the height of this cylinder.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "radius": { - "_instruction": "Enter the radius of this cylinder.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } - } -} diff --git a/schemas/mathematicalShape/ellipsoid.schema.tpl.json b/schemas/mathematicalShape/ellipsoid.schema.tpl.json index 554c242df..902b84071 100644 --- a/schemas/mathematicalShape/ellipsoid.schema.tpl.json +++ b/schemas/mathematicalShape/ellipsoid.schema.tpl.json @@ -4,25 +4,25 @@ "mathematicalShapes" ], "required": [ - "longDiameter", "intermediateDiameter", - "shortDiameter" + "majorDiameter", + "minorDiameter" ], "properties": { - "longDiameter": { - "_instruction": "Enter the length of the long diameter of this ellipsoid.", + "intermediateDiameter": { + "_instruction": "Enter the intermediate diameter of this ellipsoid.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "intermediateDiameter": { - "_instruction": "Enter the length of the intermediate diameter of this ellipsoid.", + "majorDiameter": { + "_instruction": "Enter the major diameter of this ellipsoid.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "shortDiameter": { - "_instruction": "Enter the length of the short diameter of this ellipsoid.", + "minorDiameter": { + "_instruction": "Enter the minor diameter of this ellipsoid.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json b/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json deleted file mode 100644 index 6057493a3..000000000 --- a/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "_type": "sands:RectangularFrustum", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "bottomDepth", - "bottomWidth", - "height", - "topDepth", - "topWidth" - ], - "properties": { - "bottomDepth": { - "_instruction": "Enter the depth of the bottom base of this rectangular frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "bottomWidth": { - "_instruction": "Enter the width of the bottom base of this rectangular frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "height": { - "_instruction": "Enter the height of this rectangular frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "topDepth": { - "_instruction": "Enter the depth of the top base of this rectangular frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "topWidth": { - "_instruction": "Enter the width of the top base of this rectangular frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } - } -} diff --git a/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json b/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json deleted file mode 100644 index 9f6e4fd8f..000000000 --- a/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "_type": "sands:RectangularPyramid", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "baseDepth", - "baseWidth", - "height" - ], - "properties": { - "baseDepth": { - "_instruction": "Enter the depth of the base of this rectangular pyramid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseWidth": { - "_instruction": "Enter the width of the base of this rectangular pyramid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "height": { - "_instruction": "Enter the height of this rectangular pyramid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } - } -} diff --git a/schemas/mathematicalShape/rightTriangle.schema.tpl.json b/schemas/mathematicalShape/rightTriangle.schema.tpl.json index b8063d3fe..cefa7f4bc 100644 --- a/schemas/mathematicalShape/rightTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/rightTriangle.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:RightTriangle", "_categories": [ - "mathematicalShapes" + "mathematicalShapes" ], "required": [ "baseLength", diff --git a/schemas/mathematicalShape/sphere.schema.tpl.json b/schemas/mathematicalShape/sphere.schema.tpl.json index 2656369dd..3ad6e4d84 100644 --- a/schemas/mathematicalShape/sphere.schema.tpl.json +++ b/schemas/mathematicalShape/sphere.schema.tpl.json @@ -8,7 +8,7 @@ ], "properties": { "radius": { - "_instruction": "Define the radius of this sphere.", + "_instruction": "Enter the radius of this sphere.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/spheroid.schema.tpl.json b/schemas/mathematicalShape/spheroid.schema.tpl.json index e626c8c29..d3512b72a 100644 --- a/schemas/mathematicalShape/spheroid.schema.tpl.json +++ b/schemas/mathematicalShape/spheroid.schema.tpl.json @@ -9,13 +9,13 @@ ], "properties": { "equatorialDiameter": { - "_instruction": "Enter the uniform length of the two equatorial diameters of this spheroid.", + "_instruction": "Enter the equatorial diameters of this spheroid.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, "polarDiameter": { - "_instruction": "Enter the length of the polar diameter of this spheroid.", + "_instruction": "Enter the polar diameter of this spheroid.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/squarePyramid.schema.tpl.json b/schemas/mathematicalShape/squarePyramid.schema.tpl.json deleted file mode 100644 index 67017052c..000000000 --- a/schemas/mathematicalShape/squarePyramid.schema.tpl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "_type": "sands:SquarePyramid", - "_categories": [ - "mathematicalShapes" - ], - "required": [ - "base", - "height" - ], - "properties": { - "base": { - "_instruction": "Enter the uniform length of all four sides of this square pyramid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "height": { - "_instruction": "Enter the height of this square pyramid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } - } -} From 73d9537b664a3f46a184358a81c44586fdae3bb5 Mon Sep 17 00:00:00 2001 From: lzehl Date: Tue, 24 Feb 2026 08:55:55 +0100 Subject: [PATCH 65/76] fixed validation errors --- schemas/mathematicalShape/parallelogram.schema.tpl.json | 4 ++-- schemas/mathematicalShape/trapezoid.schema.tpl.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schemas/mathematicalShape/parallelogram.schema.tpl.json b/schemas/mathematicalShape/parallelogram.schema.tpl.json index cbdbf6429..6c5cfe5d6 100644 --- a/schemas/mathematicalShape/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShape/parallelogram.schema.tpl.json @@ -4,9 +4,9 @@ "mathematicalShapes" ], "required": [ - "base", + "baseLength", "height", - "side" + "sideLength" ], "properties": { "baseLength": { diff --git a/schemas/mathematicalShape/trapezoid.schema.tpl.json b/schemas/mathematicalShape/trapezoid.schema.tpl.json index e3d68263d..fde525126 100644 --- a/schemas/mathematicalShape/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShape/trapezoid.schema.tpl.json @@ -4,9 +4,9 @@ "mathematicalShapes" ], "required": [ - "bottomBase", + "bottomBaseLength", "height", - "topBase" + "topBaseLength" ], "properties": { "bottomBaseLength": { From 403d1c8cee187a286010048eb61c250729b7eaae Mon Sep 17 00:00:00 2001 From: lzehl Date: Tue, 24 Feb 2026 08:57:23 +0100 Subject: [PATCH 66/76] fixed category to singular --- schemas/mathematicalShape/circle.schema.tpl.json | 2 +- schemas/mathematicalShape/circularSector.schema.tpl.json | 2 +- schemas/mathematicalShape/ellipsoid.schema.tpl.json | 2 +- schemas/mathematicalShape/equilateralTriangle.schema.tpl.json | 2 +- schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json | 2 +- schemas/mathematicalShape/kite.schema.tpl.json | 2 +- schemas/mathematicalShape/parallelogram.schema.tpl.json | 2 +- schemas/mathematicalShape/regularPolygon.schema.tpl.json | 2 +- schemas/mathematicalShape/rhombus.schema.tpl.json | 2 +- schemas/mathematicalShape/rightTriangle.schema.tpl.json | 2 +- schemas/mathematicalShape/sphere.schema.tpl.json | 2 +- schemas/mathematicalShape/spheroid.schema.tpl.json | 2 +- schemas/mathematicalShape/square.schema.tpl.json | 2 +- schemas/mathematicalShape/trapezoid.schema.tpl.json | 2 +- schemas/mathematicalShape/triangle.schema.tpl.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/schemas/mathematicalShape/circle.schema.tpl.json b/schemas/mathematicalShape/circle.schema.tpl.json index 2719a4474..f6751aa91 100644 --- a/schemas/mathematicalShape/circle.schema.tpl.json +++ b/schemas/mathematicalShape/circle.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Circle", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "radius" diff --git a/schemas/mathematicalShape/circularSector.schema.tpl.json b/schemas/mathematicalShape/circularSector.schema.tpl.json index be24bd0ed..614b61d2c 100644 --- a/schemas/mathematicalShape/circularSector.schema.tpl.json +++ b/schemas/mathematicalShape/circularSector.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:CircularSector", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "centralAngle", diff --git a/schemas/mathematicalShape/ellipsoid.schema.tpl.json b/schemas/mathematicalShape/ellipsoid.schema.tpl.json index 902b84071..8f5d7f151 100644 --- a/schemas/mathematicalShape/ellipsoid.schema.tpl.json +++ b/schemas/mathematicalShape/ellipsoid.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Ellipsoid", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "intermediateDiameter", diff --git a/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json b/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json index c1f336c8b..8e69120a0 100644 --- a/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:EquilateralTriangle", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "sideLength" diff --git a/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json b/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json index 8704db6f9..cf3a2dd62 100644 --- a/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:IsoscelesTriangle", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "baseLength", diff --git a/schemas/mathematicalShape/kite.schema.tpl.json b/schemas/mathematicalShape/kite.schema.tpl.json index a8a02d85f..c6f448602 100644 --- a/schemas/mathematicalShape/kite.schema.tpl.json +++ b/schemas/mathematicalShape/kite.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Kite", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "bottomLegLength", diff --git a/schemas/mathematicalShape/parallelogram.schema.tpl.json b/schemas/mathematicalShape/parallelogram.schema.tpl.json index 6c5cfe5d6..9c7d73893 100644 --- a/schemas/mathematicalShape/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShape/parallelogram.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Parallelogram", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "baseLength", diff --git a/schemas/mathematicalShape/regularPolygon.schema.tpl.json b/schemas/mathematicalShape/regularPolygon.schema.tpl.json index cfc274724..5add0abd7 100644 --- a/schemas/mathematicalShape/regularPolygon.schema.tpl.json +++ b/schemas/mathematicalShape/regularPolygon.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:RegularPolygon", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "circumradius", diff --git a/schemas/mathematicalShape/rhombus.schema.tpl.json b/schemas/mathematicalShape/rhombus.schema.tpl.json index 6a371b7d2..52c2eb553 100644 --- a/schemas/mathematicalShape/rhombus.schema.tpl.json +++ b/schemas/mathematicalShape/rhombus.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Rhombus", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "diagonalLengths" diff --git a/schemas/mathematicalShape/rightTriangle.schema.tpl.json b/schemas/mathematicalShape/rightTriangle.schema.tpl.json index cefa7f4bc..edc092d3d 100644 --- a/schemas/mathematicalShape/rightTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/rightTriangle.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:RightTriangle", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "baseLength", diff --git a/schemas/mathematicalShape/sphere.schema.tpl.json b/schemas/mathematicalShape/sphere.schema.tpl.json index 3ad6e4d84..bc66595c4 100644 --- a/schemas/mathematicalShape/sphere.schema.tpl.json +++ b/schemas/mathematicalShape/sphere.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Sphere", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "radius" diff --git a/schemas/mathematicalShape/spheroid.schema.tpl.json b/schemas/mathematicalShape/spheroid.schema.tpl.json index d3512b72a..60081884c 100644 --- a/schemas/mathematicalShape/spheroid.schema.tpl.json +++ b/schemas/mathematicalShape/spheroid.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Spheroid", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "equatorialDiameter", diff --git a/schemas/mathematicalShape/square.schema.tpl.json b/schemas/mathematicalShape/square.schema.tpl.json index 2d24fb74c..e11655562 100644 --- a/schemas/mathematicalShape/square.schema.tpl.json +++ b/schemas/mathematicalShape/square.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Square", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "sideLength" diff --git a/schemas/mathematicalShape/trapezoid.schema.tpl.json b/schemas/mathematicalShape/trapezoid.schema.tpl.json index fde525126..522d97115 100644 --- a/schemas/mathematicalShape/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShape/trapezoid.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Trapezoid", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "bottomBaseLength", diff --git a/schemas/mathematicalShape/triangle.schema.tpl.json b/schemas/mathematicalShape/triangle.schema.tpl.json index 4dd1f4919..080954431 100644 --- a/schemas/mathematicalShape/triangle.schema.tpl.json +++ b/schemas/mathematicalShape/triangle.schema.tpl.json @@ -1,7 +1,7 @@ { "_type": "sands:Triangle", "_categories": [ - "mathematicalShapes" + "mathematicalShape" ], "required": [ "sideLengths" From a8c877f14f16c32d7789512b5908ddb95c95c70b Mon Sep 17 00:00:00 2001 From: lzehl Date: Tue, 24 Feb 2026 09:05:04 +0100 Subject: [PATCH 67/76] completed categories and fixed indentation --- schemas/mathematicalShape/circle.schema.tpl.json | 3 ++- schemas/mathematicalShape/circularSector.schema.tpl.json | 3 ++- schemas/mathematicalShape/ellipse.schema.tpl.json | 3 ++- schemas/mathematicalShape/ellipsoid.schema.tpl.json | 3 ++- schemas/mathematicalShape/equilateralTriangle.schema.tpl.json | 3 ++- schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json | 3 ++- schemas/mathematicalShape/kite.schema.tpl.json | 3 ++- schemas/mathematicalShape/parallelogram.schema.tpl.json | 3 ++- schemas/mathematicalShape/rectangle.schema.tpl.json | 3 ++- schemas/mathematicalShape/regularPolygon.schema.tpl.json | 3 ++- schemas/mathematicalShape/rhombus.schema.tpl.json | 3 ++- schemas/mathematicalShape/rightTriangle.schema.tpl.json | 3 ++- schemas/mathematicalShape/sphere.schema.tpl.json | 3 ++- schemas/mathematicalShape/spheroid.schema.tpl.json | 3 ++- schemas/mathematicalShape/square.schema.tpl.json | 3 ++- schemas/mathematicalShape/trapezoid.schema.tpl.json | 3 ++- schemas/mathematicalShape/triangle.schema.tpl.json | 3 ++- 17 files changed, 34 insertions(+), 17 deletions(-) diff --git a/schemas/mathematicalShape/circle.schema.tpl.json b/schemas/mathematicalShape/circle.schema.tpl.json index f6751aa91..7ad06a7d1 100644 --- a/schemas/mathematicalShape/circle.schema.tpl.json +++ b/schemas/mathematicalShape/circle.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Circle", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "radius" diff --git a/schemas/mathematicalShape/circularSector.schema.tpl.json b/schemas/mathematicalShape/circularSector.schema.tpl.json index 614b61d2c..1a9d8a244 100644 --- a/schemas/mathematicalShape/circularSector.schema.tpl.json +++ b/schemas/mathematicalShape/circularSector.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:CircularSector", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "centralAngle", diff --git a/schemas/mathematicalShape/ellipse.schema.tpl.json b/schemas/mathematicalShape/ellipse.schema.tpl.json index 2696efc45..de537f6da 100644 --- a/schemas/mathematicalShape/ellipse.schema.tpl.json +++ b/schemas/mathematicalShape/ellipse.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Ellipse", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "diameters" diff --git a/schemas/mathematicalShape/ellipsoid.schema.tpl.json b/schemas/mathematicalShape/ellipsoid.schema.tpl.json index 8f5d7f151..dfdf049c4 100644 --- a/schemas/mathematicalShape/ellipsoid.schema.tpl.json +++ b/schemas/mathematicalShape/ellipsoid.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Ellipsoid", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical3DShape" ], "required": [ "intermediateDiameter", diff --git a/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json b/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json index 8e69120a0..6710fdb48 100644 --- a/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:EquilateralTriangle", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "sideLength" diff --git a/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json b/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json index cf3a2dd62..b3e063445 100644 --- a/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:IsoscelesTriangle", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "baseLength", diff --git a/schemas/mathematicalShape/kite.schema.tpl.json b/schemas/mathematicalShape/kite.schema.tpl.json index c6f448602..b77d98b4a 100644 --- a/schemas/mathematicalShape/kite.schema.tpl.json +++ b/schemas/mathematicalShape/kite.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Kite", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "bottomLegLength", diff --git a/schemas/mathematicalShape/parallelogram.schema.tpl.json b/schemas/mathematicalShape/parallelogram.schema.tpl.json index 9c7d73893..4fe3069eb 100644 --- a/schemas/mathematicalShape/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShape/parallelogram.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Parallelogram", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "baseLength", diff --git a/schemas/mathematicalShape/rectangle.schema.tpl.json b/schemas/mathematicalShape/rectangle.schema.tpl.json index 96cc8d4f0..70865d773 100644 --- a/schemas/mathematicalShape/rectangle.schema.tpl.json +++ b/schemas/mathematicalShape/rectangle.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Rectangle", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "height", diff --git a/schemas/mathematicalShape/regularPolygon.schema.tpl.json b/schemas/mathematicalShape/regularPolygon.schema.tpl.json index 5add0abd7..9a21cd90f 100644 --- a/schemas/mathematicalShape/regularPolygon.schema.tpl.json +++ b/schemas/mathematicalShape/regularPolygon.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:RegularPolygon", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "circumradius", diff --git a/schemas/mathematicalShape/rhombus.schema.tpl.json b/schemas/mathematicalShape/rhombus.schema.tpl.json index 52c2eb553..27e8937c5 100644 --- a/schemas/mathematicalShape/rhombus.schema.tpl.json +++ b/schemas/mathematicalShape/rhombus.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Rhombus", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "diagonalLengths" diff --git a/schemas/mathematicalShape/rightTriangle.schema.tpl.json b/schemas/mathematicalShape/rightTriangle.schema.tpl.json index edc092d3d..7d646a718 100644 --- a/schemas/mathematicalShape/rightTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/rightTriangle.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:RightTriangle", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "baseLength", diff --git a/schemas/mathematicalShape/sphere.schema.tpl.json b/schemas/mathematicalShape/sphere.schema.tpl.json index bc66595c4..ff7055494 100644 --- a/schemas/mathematicalShape/sphere.schema.tpl.json +++ b/schemas/mathematicalShape/sphere.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Sphere", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical3DShape" ], "required": [ "radius" diff --git a/schemas/mathematicalShape/spheroid.schema.tpl.json b/schemas/mathematicalShape/spheroid.schema.tpl.json index 60081884c..39ff569b1 100644 --- a/schemas/mathematicalShape/spheroid.schema.tpl.json +++ b/schemas/mathematicalShape/spheroid.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Spheroid", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical3DShape" ], "required": [ "equatorialDiameter", diff --git a/schemas/mathematicalShape/square.schema.tpl.json b/schemas/mathematicalShape/square.schema.tpl.json index e11655562..a4c0463f1 100644 --- a/schemas/mathematicalShape/square.schema.tpl.json +++ b/schemas/mathematicalShape/square.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Square", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "sideLength" diff --git a/schemas/mathematicalShape/trapezoid.schema.tpl.json b/schemas/mathematicalShape/trapezoid.schema.tpl.json index 522d97115..210d2c948 100644 --- a/schemas/mathematicalShape/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShape/trapezoid.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Trapezoid", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "bottomBaseLength", diff --git a/schemas/mathematicalShape/triangle.schema.tpl.json b/schemas/mathematicalShape/triangle.schema.tpl.json index 080954431..694a70932 100644 --- a/schemas/mathematicalShape/triangle.schema.tpl.json +++ b/schemas/mathematicalShape/triangle.schema.tpl.json @@ -1,7 +1,8 @@ { "_type": "sands:Triangle", "_categories": [ - "mathematicalShape" + "mathematicalShape", + "mathematical2DShape" ], "required": [ "sideLengths" From e109092f2fb61d545c9f7d5ea27df6dd2748dcea Mon Sep 17 00:00:00 2001 From: lzehl Date: Tue, 24 Feb 2026 09:53:13 +0100 Subject: [PATCH 68/76] selection of 3d shapes added --- .../mathematicalShape/cone.schema.tpl.json | 25 ++++++++++++ .../cylinder.schema.tpl.json | 25 ++++++++++++ .../ellipticCone.schema.tpl.json | 25 ++++++++++++ .../ellipticCylinder.schema.tpl.json | 25 ++++++++++++ .../ellipticFrustum.schema.tpl.json | 28 +++++++++++++ .../rectangularFrustum.schema.tpl.json | 28 +++++++++++++ .../rectangularPrism.schema.tpl.json | 25 ++++++++++++ .../rectangularPyramid.schema.tpl.json | 25 ++++++++++++ .../regularPolygonFrustum.schema.tpl.json | 39 +++++++++++++++++++ .../regularPolygonPrism.schema.tpl.json | 25 ++++++++++++ .../regularPolygonPyramid.schema.tpl.json | 25 ++++++++++++ 11 files changed, 295 insertions(+) create mode 100644 schemas/mathematicalShape/cone.schema.tpl.json create mode 100644 schemas/mathematicalShape/cylinder.schema.tpl.json create mode 100644 schemas/mathematicalShape/ellipticCone.schema.tpl.json create mode 100644 schemas/mathematicalShape/ellipticCylinder.schema.tpl.json create mode 100644 schemas/mathematicalShape/ellipticFrustum.schema.tpl.json create mode 100644 schemas/mathematicalShape/rectangularFrustum.schema.tpl.json create mode 100644 schemas/mathematicalShape/rectangularPrism.schema.tpl.json create mode 100644 schemas/mathematicalShape/rectangularPyramid.schema.tpl.json create mode 100644 schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json create mode 100644 schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json create mode 100644 schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json diff --git a/schemas/mathematicalShape/cone.schema.tpl.json b/schemas/mathematicalShape/cone.schema.tpl.json new file mode 100644 index 000000000..690c5ab92 --- /dev/null +++ b/schemas/mathematicalShape/cone.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:Cone", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseShape", + "polarDiameter" + ], + "properties": { + "baseShape": { + "_instruction": "Enter the equatorial diameters of this cone.", + "_embeddedTypes": [ + "sands:Circle" + ] + }, + "depth": { + "_instruction": "Enter the depth of this cone.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/cylinder.schema.tpl.json b/schemas/mathematicalShape/cylinder.schema.tpl.json new file mode 100644 index 000000000..2088868d5 --- /dev/null +++ b/schemas/mathematicalShape/cylinder.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:Cylinder", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseShape", + "depth" + ], + "properties": { + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this cylinder.", + "_embeddedTypes": [ + "sands:Circle" + ] + }, + "depth": { + "_instruction": "Enter the depth of this cylinder.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/ellipticCone.schema.tpl.json b/schemas/mathematicalShape/ellipticCone.schema.tpl.json new file mode 100644 index 000000000..c61daf40e --- /dev/null +++ b/schemas/mathematicalShape/ellipticCone.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:EllipticCone", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseShape", + "depth" + ], + "properties": { + "baseShape": { + "_instruction": "Enter the two-dimensional base of this elliptic cone.", + "_embeddedTypes": [ + "sands:Ellipse" + ] + }, + "depth": { + "_instruction": "Enter the depth of this elliptic cone.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/ellipticCylinder.schema.tpl.json b/schemas/mathematicalShape/ellipticCylinder.schema.tpl.json new file mode 100644 index 000000000..fc5fba9b3 --- /dev/null +++ b/schemas/mathematicalShape/ellipticCylinder.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:EllipticCylinder", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseShape", + "depth" + ], + "properties": { + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this elliptic cylinder.", + "_embeddedTypes": [ + "sands:Ellipse" + ] + }, + "depth": { + "_instruction": "Enter the depth of this elliptic cylinder.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json b/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json new file mode 100644 index 000000000..0bd6c8c2f --- /dev/null +++ b/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json @@ -0,0 +1,28 @@ +{ + "_type": "sands:EllipticFrustum", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseShapes", + "depth" + ], + "properties": { + "baseShapes": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "_instruction": "Enter the minor and major two-dimensional base of this elliptic frustum.", + "_embeddedTypes": [ + "sands:Ellipse" + ] + }, + "depth": { + "_instruction": "Enter the depth of this elliptic frustum.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json b/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json new file mode 100644 index 000000000..4827b45bb --- /dev/null +++ b/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json @@ -0,0 +1,28 @@ +{ + "_type": "sands:RectangularFrustum", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseShapes", + "depth" + ], + "properties": { + "baseShapes": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "_instruction": "Enter the minor and major two-dimensional base of this rectangular frustum.", + "_embeddedTypes": [ + "sands:Rectangle" + ] + }, + "depth": { + "_instruction": "Enter the depth of this rectangular frustum.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/rectangularPrism.schema.tpl.json b/schemas/mathematicalShape/rectangularPrism.schema.tpl.json new file mode 100644 index 000000000..bee9803ed --- /dev/null +++ b/schemas/mathematicalShape/rectangularPrism.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:RectangularPrism", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseShape", + "depth" + ], + "properties": { + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this rectangular prism.", + "_embeddedTypes": [ + "sands:Rectangle" + ] + }, + "depth": { + "_instruction": "Enter the depth of this rectangular prism.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json b/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json new file mode 100644 index 000000000..e77bfa17b --- /dev/null +++ b/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:RectangularPyramid", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseShape", + "depth" + ], + "properties": { + "baseShape": { + "_instruction": "Enter the two-dimensional base of this rectangular pyramid.", + "_embeddedTypes": [ + "sands:Rectangle" + ] + }, + "depth": { + "_instruction": "Enter the depth of this rectangular pyramid.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json b/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json new file mode 100644 index 000000000..92fda4395 --- /dev/null +++ b/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json @@ -0,0 +1,39 @@ +{ + "_type": "sands:RegularPolygonFrustum", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "depth", + "majorCircumradius", + "minorCircumradius", + "numberOfSides" + ], + "properties": { + "depth": { + "_instruction": "Enter the depth of this regular polygon frustum.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "majorCircumradius": { + "_instruction": "Enter the major circumradius (distance from the center to a vertex of the larger two-dimensional base) of this regular polygon frustum.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "minorCircumradius": { + "_instruction": "Enter the minor circumradius (distance from the center to a vertex of the smaller two-dimensional base) of this regular polygon frustum.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "numberOfSides": { + "_instruction": "Enter the number of sides of this regular polygon frustum.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json b/schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json new file mode 100644 index 000000000..efdc76355 --- /dev/null +++ b/schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:RegularPolygonPrism", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseShape", + "depth" + ], + "properties": { + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this regular polygon prism.", + "_embeddedTypes": [ + "sands:RegularPolygon" + ] + }, + "depth": { + "_instruction": "Enter the depth of this regular polygon prism.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json b/schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json new file mode 100644 index 000000000..005c3293b --- /dev/null +++ b/schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:RegularPolygonPyramid", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseShape", + "depth" + ], + "properties": { + "baseShape": { + "_instruction": "Enter the two-dimensional base of this regular polygon pyramid.", + "_embeddedTypes": [ + "sands:RegularPolygon" + ] + }, + "depth": { + "_instruction": "Enter the depth of this regular polygon pyramid.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} From 76338611152c63d008d3142df26e4b07f2abb88b Mon Sep 17 00:00:00 2001 From: lzehl Date: Tue, 24 Feb 2026 09:55:13 +0100 Subject: [PATCH 69/76] fixed required props in cone --- schemas/mathematicalShape/cone.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShape/cone.schema.tpl.json b/schemas/mathematicalShape/cone.schema.tpl.json index 690c5ab92..a3fb91a32 100644 --- a/schemas/mathematicalShape/cone.schema.tpl.json +++ b/schemas/mathematicalShape/cone.schema.tpl.json @@ -6,7 +6,7 @@ ], "required": [ "baseShape", - "polarDiameter" + "depth" ], "properties": { "baseShape": { From 1baed687d61df91ef9f0c184b5184f68e900b79b Mon Sep 17 00:00:00 2001 From: lzehl Date: Tue, 24 Feb 2026 15:12:07 +0100 Subject: [PATCH 70/76] harmonizing and fixing stuff --- .../circularFrustum.schema.tpl.json | 32 ++++++++++++++++++ .../mathematicalShape/cone.schema.tpl.json | 16 ++++----- .../mathematicalShape/cube.schema.tpl.json | 18 ++++++++++ .../cylinder.schema.tpl.json | 16 ++++----- .../ellipticCone.schema.tpl.json | 16 ++++----- .../ellipticCylinder.schema.tpl.json | 16 ++++----- .../ellipticFrustum.schema.tpl.json | 26 ++++++++------- .../equilateralTriangle.schema.tpl.json | 2 +- ...equilateralTriangularPrism.schema.tpl.json | 25 ++++++++++++++ ...uilateralTriangularPyramid.schema.tpl.json | 25 ++++++++++++++ .../isoscelesTriangle.schema.tpl.json | 8 ++--- .../isoscelesTriangularPrism.schema.tpl.json | 25 ++++++++++++++ ...isoscelesTriangularPyramid.schema.tpl.json | 25 ++++++++++++++ .../mathematicalShape/kite.schema.tpl.json | 17 +++------- .../parallelogram.schema.tpl.json | 17 +++++----- .../rectangle.schema.tpl.json | 12 +++---- .../rectangularFrustum.schema.tpl.json | 26 ++++++++------- .../rectangularPrism.schema.tpl.json | 16 ++++----- .../rectangularPyramid.schema.tpl.json | 16 ++++----- .../regularPolygon.schema.tpl.json | 7 ++-- .../regularPolygonFrustum.schema.tpl.json | 33 ++++++++----------- .../regularPolygonPrism.schema.tpl.json | 16 ++++----- .../regularPolygonPyramid.schema.tpl.json | 16 ++++----- .../rightTriangle.schema.tpl.json | 16 ++++----- .../squareFrustum.schema.tpl.json | 32 ++++++++++++++++++ .../squarePyramid.schema.tpl.json | 25 ++++++++++++++ .../trapezoid.schema.tpl.json | 22 +++++-------- .../triangle.schema.tpl.json | 17 +++++++--- .../triangularPrism.schema.tpl.json | 25 ++++++++++++++ .../triangularPyramid.schema.tpl.json | 25 ++++++++++++++ 30 files changed, 419 insertions(+), 169 deletions(-) create mode 100644 schemas/mathematicalShape/circularFrustum.schema.tpl.json create mode 100644 schemas/mathematicalShape/cube.schema.tpl.json create mode 100644 schemas/mathematicalShape/equilateralTriangularPrism.schema.tpl.json create mode 100644 schemas/mathematicalShape/equilateralTriangularPyramid.schema.tpl.json create mode 100644 schemas/mathematicalShape/isoscelesTriangularPrism.schema.tpl.json create mode 100644 schemas/mathematicalShape/isoscelesTriangularPyramid.schema.tpl.json create mode 100644 schemas/mathematicalShape/squareFrustum.schema.tpl.json create mode 100644 schemas/mathematicalShape/squarePyramid.schema.tpl.json create mode 100644 schemas/mathematicalShape/triangularPrism.schema.tpl.json create mode 100644 schemas/mathematicalShape/triangularPyramid.schema.tpl.json diff --git a/schemas/mathematicalShape/circularFrustum.schema.tpl.json b/schemas/mathematicalShape/circularFrustum.schema.tpl.json new file mode 100644 index 000000000..e02c3cd4f --- /dev/null +++ b/schemas/mathematicalShape/circularFrustum.schema.tpl.json @@ -0,0 +1,32 @@ +{ + "_type": "sands:CircularFrustum", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseDistance", + "majorBaseShape", + "minorBaseScale" + ], + "properties": { + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the major and minor base planes of this circular frustum.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "majorBaseShape": { + "_instruction": "Enter the major two-dimensional base shape of this circular frustum.", + "_embeddedTypes": [ + "sands:Circle" + ] + }, + "minorBaseScale": { + "type": "float", + "exclusiveMinimum": 0, + "exclusiveMaximum": 1, + "_instruction": "Enter the ratio of the smaller to the larger base size of this circular frustum.", + } + } +} diff --git a/schemas/mathematicalShape/cone.schema.tpl.json b/schemas/mathematicalShape/cone.schema.tpl.json index a3fb91a32..0e8edfdc9 100644 --- a/schemas/mathematicalShape/cone.schema.tpl.json +++ b/schemas/mathematicalShape/cone.schema.tpl.json @@ -5,20 +5,20 @@ "mathematical3DShape" ], "required": [ - "baseShape", - "depth" + "apexBaseDistance", + "baseShape" ], "properties": { - "baseShape": { - "_instruction": "Enter the equatorial diameters of this cone.", + "apexBaseDistance": { + "_instruction": "Enter the perpendicular distance from the base plane to the apex of this cone.", "_embeddedTypes": [ - "sands:Circle" + "core:QuantitativeValue" ] }, - "depth": { - "_instruction": "Enter the depth of this cone.", + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this elliptic cone.", "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:Circle" ] } } diff --git a/schemas/mathematicalShape/cube.schema.tpl.json b/schemas/mathematicalShape/cube.schema.tpl.json new file mode 100644 index 000000000..d51de8480 --- /dev/null +++ b/schemas/mathematicalShape/cube.schema.tpl.json @@ -0,0 +1,18 @@ +{ + "_type": "sands:Cube", + "_categories": [ + "mathematicalShape", + "mathematical2DShape" + ], + "required": [ + "sideLength" + ], + "properties": { + "sideLength": { + "_instruction": "Enter the common length of the sides of this cube.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + } + } +} diff --git a/schemas/mathematicalShape/cylinder.schema.tpl.json b/schemas/mathematicalShape/cylinder.schema.tpl.json index 2088868d5..dbd9e6e76 100644 --- a/schemas/mathematicalShape/cylinder.schema.tpl.json +++ b/schemas/mathematicalShape/cylinder.schema.tpl.json @@ -5,20 +5,20 @@ "mathematical3DShape" ], "required": [ - "baseShape", - "depth" + "baseDistance", + "baseShape" ], "properties": { - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this cylinder.", + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the two base planes of this cylinder.", "_embeddedTypes": [ - "sands:Circle" + "core:QuantitativeValue" ] }, - "depth": { - "_instruction": "Enter the depth of this cylinder.", + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this cylinder.", "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:Circle" ] } } diff --git a/schemas/mathematicalShape/ellipticCone.schema.tpl.json b/schemas/mathematicalShape/ellipticCone.schema.tpl.json index c61daf40e..48a63a811 100644 --- a/schemas/mathematicalShape/ellipticCone.schema.tpl.json +++ b/schemas/mathematicalShape/ellipticCone.schema.tpl.json @@ -5,20 +5,20 @@ "mathematical3DShape" ], "required": [ - "baseShape", - "depth" + "apexBaseDistance", + "baseShape" ], "properties": { - "baseShape": { - "_instruction": "Enter the two-dimensional base of this elliptic cone.", + "apexBaseDistance": { + "_instruction": "Enter the perpendicular distance from the base plane to the apex of this elliptic cone.", "_embeddedTypes": [ - "sands:Ellipse" + "core:QuantitativeValue" ] }, - "depth": { - "_instruction": "Enter the depth of this elliptic cone.", + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this elliptic cone.", "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:Ellipse" ] } } diff --git a/schemas/mathematicalShape/ellipticCylinder.schema.tpl.json b/schemas/mathematicalShape/ellipticCylinder.schema.tpl.json index fc5fba9b3..f0ad797aa 100644 --- a/schemas/mathematicalShape/ellipticCylinder.schema.tpl.json +++ b/schemas/mathematicalShape/ellipticCylinder.schema.tpl.json @@ -5,20 +5,20 @@ "mathematical3DShape" ], "required": [ - "baseShape", - "depth" + "baseDistance", + "baseShape" ], "properties": { - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this elliptic cylinder.", + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the two base planes of this elliptic cylinder.", "_embeddedTypes": [ - "sands:Ellipse" + "core:QuantitativeValue" ] }, - "depth": { - "_instruction": "Enter the depth of this elliptic cylinder.", + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this elliptic cylinder.", "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:Ellipse" ] } } diff --git a/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json b/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json index 0bd6c8c2f..fb5a2b0ff 100644 --- a/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json +++ b/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json @@ -5,24 +5,28 @@ "mathematical3DShape" ], "required": [ - "baseShapes", - "depth" + "baseDistance", + "majorBaseShape", + "minorBaseScale" ], "properties": { - "baseShapes": { - "type": "array", - "minItems": 2, - "maxItems": 2, - "_instruction": "Enter the minor and major two-dimensional base of this elliptic frustum.", + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the major and minor base planes of this elliptic frustum.", "_embeddedTypes": [ - "sands:Ellipse" + "core:QuantitativeValue" ] }, - "depth": { - "_instruction": "Enter the depth of this elliptic frustum.", + "majorBaseShape": { + "_instruction": "Enter the major two-dimensional base shape of this elliptic frustum.", "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:Ellipse" ] + }, + "minorBaseScale": { + "type": "float", + "exclusiveMinimum": 0, + "exclusiveMaximum": 1, + "_instruction": "Enter the ratio of the smaller to the larger base size of this elliptic frustum.", } } } diff --git a/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json b/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json index 6710fdb48..767efb031 100644 --- a/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json @@ -9,7 +9,7 @@ ], "properties": { "sideLength": { - "_instruction": "Enter the uniform length of the sides of this equilateral triangle.", + "_instruction": "Enter the common length of the sides of this equilateral triangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/equilateralTriangularPrism.schema.tpl.json b/schemas/mathematicalShape/equilateralTriangularPrism.schema.tpl.json new file mode 100644 index 000000000..f06fdbb61 --- /dev/null +++ b/schemas/mathematicalShape/equilateralTriangularPrism.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:EquilateralTriangularPrism", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseDistance", + "baseShape" + ], + "properties": { + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the two base planes of this equilateral triangular prism.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this equilateral triangular prism.", + "_embeddedTypes": [ + "sands:EquilateralTriangle" + ] + } + } +} diff --git a/schemas/mathematicalShape/equilateralTriangularPyramid.schema.tpl.json b/schemas/mathematicalShape/equilateralTriangularPyramid.schema.tpl.json new file mode 100644 index 000000000..9469f4108 --- /dev/null +++ b/schemas/mathematicalShape/equilateralTriangularPyramid.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:EquilateralTriangularPyramid", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "apexBaseDistance", + "baseShape" + ], + "properties": { + "apexBaseDistance": { + "_instruction": "Enter the perpendicular distance from the base plane to the apex of this equilateral triangular pyramid.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this equilateral triangular pyramid.", + "_embeddedTypes": [ + "sands:EquilateralTriangle" + ] + } + } +} diff --git a/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json b/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json index b3e063445..aa769263d 100644 --- a/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json @@ -5,18 +5,18 @@ "mathematical2DShape" ], "required": [ - "baseLength", + "apexAngle", "legLength" ], "properties": { - "baseLength": { - "_instruction": "Enter the length of the base of this isosceles triangle.", + "apexAngle": { + "_instruction": "Enter the angle at the apex between the two equal sides of this isosceles triangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, "legLength": { - "_instruction": "Enter the height of this isosceles triangle.", + "_instruction": "Enter the common length of the two equal sides meeting at the apex of this isosceles triangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/isoscelesTriangularPrism.schema.tpl.json b/schemas/mathematicalShape/isoscelesTriangularPrism.schema.tpl.json new file mode 100644 index 000000000..6c15bf174 --- /dev/null +++ b/schemas/mathematicalShape/isoscelesTriangularPrism.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:IsoscelesTriangularPrism", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseDistance", + "baseShape" + ], + "properties": { + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the two base planes of this isosceles triangular prism.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this isosceles triangular prism.", + "_embeddedTypes": [ + "sands:IsoscelesTriangle" + ] + } + } +} diff --git a/schemas/mathematicalShape/isoscelesTriangularPyramid.schema.tpl.json b/schemas/mathematicalShape/isoscelesTriangularPyramid.schema.tpl.json new file mode 100644 index 000000000..1b0825bbc --- /dev/null +++ b/schemas/mathematicalShape/isoscelesTriangularPyramid.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:IsoscelesTriangularPyramid", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "apexBaseDistance", + "baseShape" + ], + "properties": { + "apexBaseDistance": { + "_instruction": "Enter the perpendicular distance from the base plane to the apex of this isosceles triangular pyramid.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this isosceles triangular pyramid.", + "_embeddedTypes": [ + "sands:IsoscelesTriangle" + ] + } + } +} diff --git a/schemas/mathematicalShape/kite.schema.tpl.json b/schemas/mathematicalShape/kite.schema.tpl.json index b77d98b4a..ccc0d2fdb 100644 --- a/schemas/mathematicalShape/kite.schema.tpl.json +++ b/schemas/mathematicalShape/kite.schema.tpl.json @@ -5,13 +5,12 @@ "mathematical2DShape" ], "required": [ - "bottomLegLength", - "symmetryDiagonalLength", - "topLegLength" + "legLengths", + "symmetryDiagonalLength" ], "properties": { - "bottomLegLength": { - "_instruction": "Enter the common length of the bottom legs of this kite.", + "legLengths": { + "_instruction": "Enter the two common leg lengths (for the shorter and longer leg pairs) of this kite.", "_embeddedTypes": [ "core:QuantitativeValue" ] @@ -21,12 +20,6 @@ "_embeddedTypes": [ "core:QuantitativeValue" ] - }, - "topLegLength": { - "_instruction": "Enter the common length of the top legs of this kite.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - } + } } } diff --git a/schemas/mathematicalShape/parallelogram.schema.tpl.json b/schemas/mathematicalShape/parallelogram.schema.tpl.json index 4fe3069eb..33c791672 100644 --- a/schemas/mathematicalShape/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShape/parallelogram.schema.tpl.json @@ -5,25 +5,26 @@ "mathematical2DShape" ], "required": [ + "baseDistance", "baseLength", - "height", - "sideLength" + "interiorAngle" ], "properties": { - "baseLength": { - "_instruction": "Enter the uniform length of the bottom and top sides (the base) of this parallelogram.", + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the parallel lines of the base of this parallelogram.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "height": { - "_instruction": "Enter the height (perpendicular distance to the base) of this parallelogram.", + "baseLength": { + "_instruction": "Enter the uniform length of the bottom and top sides (the base) of this parallelogram.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "sideLength": { - "_instruction": "Enter the uniform length of the sides adjacent to the base of this parallelogram.", + + "interiorAngle": { + "_instruction": "Enter an interior angle between the base and an adjacent side of this parallelogram.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/rectangle.schema.tpl.json b/schemas/mathematicalShape/rectangle.schema.tpl.json index 70865d773..705ecec53 100644 --- a/schemas/mathematicalShape/rectangle.schema.tpl.json +++ b/schemas/mathematicalShape/rectangle.schema.tpl.json @@ -5,18 +5,18 @@ "mathematical2DShape" ], "required": [ - "height", - "width" + "majorSideLength", + "minorSideLength" ], "properties": { - "height": { - "_instruction": "Enter the height of this rectangle.", + "majorSideLength": { + "_instruction": "Enter the common length of the major sides of this rectangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "width": { - "_instruction": "Enter the width of this rectangle.", + "minorSideLength": { + "_instruction": "Enter the common length of the minor sides of this rectangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json b/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json index 4827b45bb..2167e3c31 100644 --- a/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json +++ b/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json @@ -5,24 +5,28 @@ "mathematical3DShape" ], "required": [ - "baseShapes", - "depth" + "baseDistance", + "majorBaseShape", + "minorBaseScale" ], "properties": { - "baseShapes": { - "type": "array", - "minItems": 2, - "maxItems": 2, - "_instruction": "Enter the minor and major two-dimensional base of this rectangular frustum.", + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the major and minor base planes of this rectangular frustum.", "_embeddedTypes": [ - "sands:Rectangle" + "core:QuantitativeValue" ] }, - "depth": { - "_instruction": "Enter the depth of this rectangular frustum.", + "majorBaseShape": { + "_instruction": "Enter the major two-dimensional base shape of this rectangular frustum.", "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:Rectangle" ] + }, + "minorBaseScale": { + "type": "float", + "exclusiveMinimum": 0, + "exclusiveMaximum": 1, + "_instruction": "Enter the ratio of the smaller to the larger base size of this rectangular frustum.", } } } diff --git a/schemas/mathematicalShape/rectangularPrism.schema.tpl.json b/schemas/mathematicalShape/rectangularPrism.schema.tpl.json index bee9803ed..791db4b32 100644 --- a/schemas/mathematicalShape/rectangularPrism.schema.tpl.json +++ b/schemas/mathematicalShape/rectangularPrism.schema.tpl.json @@ -5,20 +5,20 @@ "mathematical3DShape" ], "required": [ - "baseShape", - "depth" + "baseDistance", + "baseShape" ], "properties": { - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this rectangular prism.", + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the two base planes of this rectangular prism.", "_embeddedTypes": [ - "sands:Rectangle" + "core:QuantitativeValue" ] }, - "depth": { - "_instruction": "Enter the depth of this rectangular prism.", + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this rectangular prism.", "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:Rectangle" ] } } diff --git a/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json b/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json index e77bfa17b..2361c51cb 100644 --- a/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json +++ b/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json @@ -5,20 +5,20 @@ "mathematical3DShape" ], "required": [ - "baseShape", - "depth" + "apexBaseDistance", + "baseShape" ], "properties": { - "baseShape": { - "_instruction": "Enter the two-dimensional base of this rectangular pyramid.", + "apexBaseDistance": { + "_instruction": "Enter the perpendicular distance from the base plane to the apex of this rectangular pyramid.", "_embeddedTypes": [ - "sands:Rectangle" + "core:QuantitativeValue" ] }, - "depth": { - "_instruction": "Enter the depth of this rectangular pyramid.", + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this rectangular pyramid.", "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:Rectangle" ] } } diff --git a/schemas/mathematicalShape/regularPolygon.schema.tpl.json b/schemas/mathematicalShape/regularPolygon.schema.tpl.json index 9a21cd90f..3b6438b8d 100644 --- a/schemas/mathematicalShape/regularPolygon.schema.tpl.json +++ b/schemas/mathematicalShape/regularPolygon.schema.tpl.json @@ -10,16 +10,15 @@ ], "properties": { "circumradius": { - "_instruction": "Enter the circumradius (distance from the center to a vertex) of this regular polygon.", + "_instruction": "Enter the common distance from the center to a vertex of this regular polygon.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, "numberOfSides": { + "type": "integer", + "minimum": 3, "_instruction": "Enter the number of sides of this regular polygon.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] } } } diff --git a/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json b/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json index 92fda4395..2ce0ebdd7 100644 --- a/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json +++ b/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json @@ -5,35 +5,28 @@ "mathematical3DShape" ], "required": [ - "depth", - "majorCircumradius", - "minorCircumradius", - "numberOfSides" + "baseDistance", + "majorBaseShape", + "minorBaseScale" ], "properties": { - "depth": { - "_instruction": "Enter the depth of this regular polygon frustum.", + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the major and minor base planes of this regular polygon frustum.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "majorCircumradius": { - "_instruction": "Enter the major circumradius (distance from the center to a vertex of the larger two-dimensional base) of this regular polygon frustum.", + "majorBaseShape": { + "_instruction": "Enter the major two-dimensional base shape of this regular polygon frustum.", "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "minorCircumradius": { - "_instruction": "Enter the minor circumradius (distance from the center to a vertex of the smaller two-dimensional base) of this regular polygon frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:RegularPolygon" ] }, - "numberOfSides": { - "_instruction": "Enter the number of sides of this regular polygon frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] + "minorBaseScale": { + "type": "float", + "exclusiveMinimum": 0, + "exclusiveMaximum": 1, + "_instruction": "Enter the ratio of the smaller to the larger base size of this regular polygon frustum.", } } } diff --git a/schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json b/schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json index efdc76355..75c3bb647 100644 --- a/schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json +++ b/schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json @@ -5,20 +5,20 @@ "mathematical3DShape" ], "required": [ - "baseShape", - "depth" + "baseDistance", + "baseShape" ], "properties": { - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this regular polygon prism.", + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the two base planes of this regular polygon prism.", "_embeddedTypes": [ - "sands:RegularPolygon" + "core:QuantitativeValue" ] }, - "depth": { - "_instruction": "Enter the depth of this regular polygon prism.", + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this regular polygon prism.", "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:RegularPolygon" ] } } diff --git a/schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json b/schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json index 005c3293b..8b53f6696 100644 --- a/schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json +++ b/schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json @@ -5,20 +5,20 @@ "mathematical3DShape" ], "required": [ - "baseShape", - "depth" + "apexBaseDistance", + "baseShape" ], "properties": { - "baseShape": { - "_instruction": "Enter the two-dimensional base of this regular polygon pyramid.", + "apexBaseDistance": { + "_instruction": "Enter the perpendicular distance from the base plane to the apex of this regular polygon pyramid.", "_embeddedTypes": [ - "sands:RegularPolygon" + "core:QuantitativeValue" ] }, - "depth": { - "_instruction": "Enter the depth of this regular polygon pyramid.", + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this regular polygon pyramid.", "_embeddedTypes": [ - "core:QuantitativeValue" + "sands:RegularPolygon" ] } } diff --git a/schemas/mathematicalShape/rightTriangle.schema.tpl.json b/schemas/mathematicalShape/rightTriangle.schema.tpl.json index 7d646a718..f25afcc7c 100644 --- a/schemas/mathematicalShape/rightTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/rightTriangle.schema.tpl.json @@ -5,18 +5,14 @@ "mathematical2DShape" ], "required": [ - "baseLength", - "height" + "perpendicularLegLengths" ], "properties": { - "baseLength": { - "_instruction": "Enter the length of the base of this right triangle.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "height": { - "_instruction": "Enter the height of this right triangle.", + "perpendicularLegLengths": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "_instruction": "Enter the lengths of the two perpendicular legs of this right triangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/squareFrustum.schema.tpl.json b/schemas/mathematicalShape/squareFrustum.schema.tpl.json new file mode 100644 index 000000000..26e5391fa --- /dev/null +++ b/schemas/mathematicalShape/squareFrustum.schema.tpl.json @@ -0,0 +1,32 @@ +{ + "_type": "sands:SquareFrustum", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseDistance", + "majorBaseShape", + "minorBaseScale" + ], + "properties": { + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the major and minor base planes of this square frustum.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "majorBaseShape": { + "_instruction": "Enter the major two-dimensional base shape of this square frustum.", + "_embeddedTypes": [ + "sands:Square" + ] + }, + "minorBaseScale": { + "type": "float", + "exclusiveMinimum": 0, + "exclusiveMaximum": 1, + "_instruction": "Enter the ratio of the smaller to the larger base size of this square frustum.", + } + } +} diff --git a/schemas/mathematicalShape/squarePyramid.schema.tpl.json b/schemas/mathematicalShape/squarePyramid.schema.tpl.json new file mode 100644 index 000000000..766e946c3 --- /dev/null +++ b/schemas/mathematicalShape/squarePyramid.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:SquarePyramid", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "apexBaseDistance", + "baseShape" + ], + "properties": { + "apexBaseDistance": { + "_instruction": "Enter the perpendicular distance from the base plane to the apex of this square pyramid.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this square pyramid.", + "_embeddedTypes": [ + "sands:Square" + ] + } + } +} diff --git a/schemas/mathematicalShape/trapezoid.schema.tpl.json b/schemas/mathematicalShape/trapezoid.schema.tpl.json index 210d2c948..79fc445b7 100644 --- a/schemas/mathematicalShape/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShape/trapezoid.schema.tpl.json @@ -5,25 +5,21 @@ "mathematical2DShape" ], "required": [ - "bottomBaseLength", - "height", - "topBaseLength" + "baseDistance", + "baseLengths" ], "properties": { - "bottomBaseLength": { - "_instruction": "Enter the length of the bottom base of this trapezoid.", + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the parallel lines of the major and minor bases of this trapezoid.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, - "height": { - "_instruction": "Enter the height (perpendicular distance between the bases) of this trapezoid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "topBaseLength": { - "_instruction": "Enter the length of the top base of this trapezoid.", + "baseLengths": { + "type": "array", + "minItems": 2, + "maxItems": 2, + "_instruction": "Enter the lengths of the major and minor bases of this trapezoid.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/triangle.schema.tpl.json b/schemas/mathematicalShape/triangle.schema.tpl.json index 694a70932..c626e7c34 100644 --- a/schemas/mathematicalShape/triangle.schema.tpl.json +++ b/schemas/mathematicalShape/triangle.schema.tpl.json @@ -5,14 +5,21 @@ "mathematical2DShape" ], "required": [ - "sideLengths" + "apexAngle", + "legLengths" ], "properties": { - "sideLengths": { + "apexAngle": { + "_instruction": "Enter the angle at the apex of this triangle.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "legLengths": { "type": "array", - "minItems": 3, - "maxItems": 3, - "_instruction": "Enter the different lengths of the three sides of the triangle.", + "minItems": 2, + "maxItems": 2, + "_instruction": "Enter the lengths of the two sides meeting at the apex of this triangle.", "_embeddedTypes": [ "core:QuantitativeValue" ] diff --git a/schemas/mathematicalShape/triangularPrism.schema.tpl.json b/schemas/mathematicalShape/triangularPrism.schema.tpl.json new file mode 100644 index 000000000..539f3f772 --- /dev/null +++ b/schemas/mathematicalShape/triangularPrism.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:TriangularPrism", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "baseDistance", + "baseShape" + ], + "properties": { + "baseDistance": { + "_instruction": "Enter the perpendicular distance between the two base planes of this triangular prism.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this triangular prism.", + "_embeddedTypes": [ + "sands:Triangle" + ] + } + } +} diff --git a/schemas/mathematicalShape/triangularPyramid.schema.tpl.json b/schemas/mathematicalShape/triangularPyramid.schema.tpl.json new file mode 100644 index 000000000..39aaba63f --- /dev/null +++ b/schemas/mathematicalShape/triangularPyramid.schema.tpl.json @@ -0,0 +1,25 @@ +{ + "_type": "sands:TriangularPyramid", + "_categories": [ + "mathematicalShape", + "mathematical3DShape" + ], + "required": [ + "apexBaseDistance", + "baseShape" + ], + "properties": { + "apexBaseDistance": { + "_instruction": "Enter the perpendicular distance from the base plane to the apex of this triangular pyramid.", + "_embeddedTypes": [ + "core:QuantitativeValue" + ] + }, + "baseShape": { + "_instruction": "Enter the two-dimensional base shape of this triangular pyramid.", + "_embeddedTypes": [ + "sands:Triangle" + ] + } + } +} From a03e656d88afb49ffd79da65906a942ceed1ae66 Mon Sep 17 00:00:00 2001 From: lzehl Date: Tue, 24 Feb 2026 15:15:31 +0100 Subject: [PATCH 71/76] fixing validation errors --- schemas/mathematicalShape/circularFrustum.schema.tpl.json | 2 +- schemas/mathematicalShape/ellipticFrustum.schema.tpl.json | 2 +- schemas/mathematicalShape/rectangularFrustum.schema.tpl.json | 2 +- schemas/mathematicalShape/regularPolygon.schema.tpl.json | 2 +- schemas/mathematicalShape/squareFrustum.schema.tpl.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/schemas/mathematicalShape/circularFrustum.schema.tpl.json b/schemas/mathematicalShape/circularFrustum.schema.tpl.json index e02c3cd4f..ad322c901 100644 --- a/schemas/mathematicalShape/circularFrustum.schema.tpl.json +++ b/schemas/mathematicalShape/circularFrustum.schema.tpl.json @@ -26,7 +26,7 @@ "type": "float", "exclusiveMinimum": 0, "exclusiveMaximum": 1, - "_instruction": "Enter the ratio of the smaller to the larger base size of this circular frustum.", + "_instruction": "Enter the ratio of the smaller to the larger base size of this circular frustum." } } } diff --git a/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json b/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json index fb5a2b0ff..cc4f150a7 100644 --- a/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json +++ b/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json @@ -26,7 +26,7 @@ "type": "float", "exclusiveMinimum": 0, "exclusiveMaximum": 1, - "_instruction": "Enter the ratio of the smaller to the larger base size of this elliptic frustum.", + "_instruction": "Enter the ratio of the smaller to the larger base size of this elliptic frustum." } } } diff --git a/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json b/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json index 2167e3c31..8a70dc81e 100644 --- a/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json +++ b/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json @@ -26,7 +26,7 @@ "type": "float", "exclusiveMinimum": 0, "exclusiveMaximum": 1, - "_instruction": "Enter the ratio of the smaller to the larger base size of this rectangular frustum.", + "_instruction": "Enter the ratio of the smaller to the larger base size of this rectangular frustum." } } } diff --git a/schemas/mathematicalShape/regularPolygon.schema.tpl.json b/schemas/mathematicalShape/regularPolygon.schema.tpl.json index 3b6438b8d..95aa4f5a2 100644 --- a/schemas/mathematicalShape/regularPolygon.schema.tpl.json +++ b/schemas/mathematicalShape/regularPolygon.schema.tpl.json @@ -18,7 +18,7 @@ "numberOfSides": { "type": "integer", "minimum": 3, - "_instruction": "Enter the number of sides of this regular polygon.", + "_instruction": "Enter the number of sides of this regular polygon." } } } diff --git a/schemas/mathematicalShape/squareFrustum.schema.tpl.json b/schemas/mathematicalShape/squareFrustum.schema.tpl.json index 26e5391fa..b558e0e12 100644 --- a/schemas/mathematicalShape/squareFrustum.schema.tpl.json +++ b/schemas/mathematicalShape/squareFrustum.schema.tpl.json @@ -26,7 +26,7 @@ "type": "float", "exclusiveMinimum": 0, "exclusiveMaximum": 1, - "_instruction": "Enter the ratio of the smaller to the larger base size of this square frustum.", + "_instruction": "Enter the ratio of the smaller to the larger base size of this square frustum." } } } From f917ccaa84c8501ad92b299853e883b5fac6ec68 Mon Sep 17 00:00:00 2001 From: lzehl Date: Tue, 24 Feb 2026 15:16:57 +0100 Subject: [PATCH 72/76] fixing validation errors - missed one --- schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json b/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json index 2ce0ebdd7..7f9182e60 100644 --- a/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json +++ b/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json @@ -26,7 +26,7 @@ "type": "float", "exclusiveMinimum": 0, "exclusiveMaximum": 1, - "_instruction": "Enter the ratio of the smaller to the larger base size of this regular polygon frustum.", + "_instruction": "Enter the ratio of the smaller to the larger base size of this regular polygon frustum." } } } From 5e48918e5afc553a1993c7112aa99d558a2cfbd3 Mon Sep 17 00:00:00 2001 From: lzehl Date: Tue, 24 Feb 2026 15:47:08 +0100 Subject: [PATCH 73/76] fixing wrong category --- schemas/mathematicalShape/cube.schema.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/mathematicalShape/cube.schema.tpl.json b/schemas/mathematicalShape/cube.schema.tpl.json index d51de8480..a62acd121 100644 --- a/schemas/mathematicalShape/cube.schema.tpl.json +++ b/schemas/mathematicalShape/cube.schema.tpl.json @@ -2,7 +2,7 @@ "_type": "sands:Cube", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical3DShape" ], "required": [ "sideLength" From 8cfbae23a3e5d5e5d8b2e8d2bd557ba25bedb72e Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Fri, 27 Feb 2026 11:58:07 +0100 Subject: [PATCH 74/76] Update kite.schema.tpl.json --- schemas/mathematicalShape/kite.schema.tpl.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/schemas/mathematicalShape/kite.schema.tpl.json b/schemas/mathematicalShape/kite.schema.tpl.json index ccc0d2fdb..401501211 100644 --- a/schemas/mathematicalShape/kite.schema.tpl.json +++ b/schemas/mathematicalShape/kite.schema.tpl.json @@ -10,6 +10,9 @@ ], "properties": { "legLengths": { + "type": "array", + "minItems": 2, + "maxItems": 2, "_instruction": "Enter the two common leg lengths (for the shorter and longer leg pairs) of this kite.", "_embeddedTypes": [ "core:QuantitativeValue" From 5a756901c7c6b70e3b4d68eb7d5e14ce6b0082b1 Mon Sep 17 00:00:00 2001 From: lzehl Date: Tue, 3 Mar 2026 12:28:07 +0100 Subject: [PATCH 75/76] simplification of 3D spaces --- ...json => centroidalPyramid.schema.tpl.json} | 6 ++-- .../circularFrustum.schema.tpl.json | 32 ------------------- .../mathematicalShape/cone.schema.tpl.json | 25 --------------- .../cylinder.schema.tpl.json | 25 --------------- .../ellipticFrustum.schema.tpl.json | 32 ------------------- .../equilateralTriangle.schema.tpl.json | 3 +- ...equilateralTriangularPrism.schema.tpl.json | 25 --------------- ...uilateralTriangularPyramid.schema.tpl.json | 25 --------------- ...chema.tpl.json => frustum.schema.tpl.json} | 12 +++---- .../isoscelesTriangle.schema.tpl.json | 3 +- .../isoscelesTriangularPrism.schema.tpl.json | 25 --------------- ...isoscelesTriangularPyramid.schema.tpl.json | 25 --------------- .../mathematicalShape/kite.schema.tpl.json | 3 +- .../parallelogram.schema.tpl.json | 3 +- .../rectangle.schema.tpl.json | 3 +- .../rectangularFrustum.schema.tpl.json | 32 ------------------- .../regularPolygon.schema.tpl.json | 3 +- .../regularPolygonFrustum.schema.tpl.json | 32 ------------------- .../regularPolygonPrism.schema.tpl.json | 25 --------------- .../regularPolygonPyramid.schema.tpl.json | 25 --------------- .../mathematicalShape/rhombus.schema.tpl.json | 3 +- ...ema.tpl.json => rightCone.schema.tpl.json} | 7 ++-- ...tpl.json => rightCylinder.schema.tpl.json} | 9 +++--- ...ma.tpl.json => rightPrism.schema.tpl.json} | 10 +++--- .../rightTriangle.schema.tpl.json | 3 +- .../mathematicalShape/square.schema.tpl.json | 3 +- .../squarePyramid.schema.tpl.json | 25 --------------- .../trapezoid.schema.tpl.json | 3 +- .../triangle.schema.tpl.json | 3 +- .../triangularPrism.schema.tpl.json | 25 --------------- .../triangularPyramid.schema.tpl.json | 25 --------------- 31 files changed, 45 insertions(+), 435 deletions(-) rename schemas/mathematicalShape/{rectangularPyramid.schema.tpl.json => centroidalPyramid.schema.tpl.json} (77%) delete mode 100644 schemas/mathematicalShape/circularFrustum.schema.tpl.json delete mode 100644 schemas/mathematicalShape/cone.schema.tpl.json delete mode 100644 schemas/mathematicalShape/cylinder.schema.tpl.json delete mode 100644 schemas/mathematicalShape/ellipticFrustum.schema.tpl.json delete mode 100644 schemas/mathematicalShape/equilateralTriangularPrism.schema.tpl.json delete mode 100644 schemas/mathematicalShape/equilateralTriangularPyramid.schema.tpl.json rename schemas/mathematicalShape/{squareFrustum.schema.tpl.json => frustum.schema.tpl.json} (75%) delete mode 100644 schemas/mathematicalShape/isoscelesTriangularPrism.schema.tpl.json delete mode 100644 schemas/mathematicalShape/isoscelesTriangularPyramid.schema.tpl.json delete mode 100644 schemas/mathematicalShape/rectangularFrustum.schema.tpl.json delete mode 100644 schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json delete mode 100644 schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json delete mode 100644 schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json rename schemas/mathematicalShape/{ellipticCone.schema.tpl.json => rightCone.schema.tpl.json} (66%) rename schemas/mathematicalShape/{rectangularPrism.schema.tpl.json => rightCylinder.schema.tpl.json} (61%) rename schemas/mathematicalShape/{ellipticCylinder.schema.tpl.json => rightPrism.schema.tpl.json} (71%) delete mode 100644 schemas/mathematicalShape/squarePyramid.schema.tpl.json delete mode 100644 schemas/mathematicalShape/triangularPrism.schema.tpl.json delete mode 100644 schemas/mathematicalShape/triangularPyramid.schema.tpl.json diff --git a/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json b/schemas/mathematicalShape/centroidalPyramid.schema.tpl.json similarity index 77% rename from schemas/mathematicalShape/rectangularPyramid.schema.tpl.json rename to schemas/mathematicalShape/centroidalPyramid.schema.tpl.json index 2361c51cb..6735346d8 100644 --- a/schemas/mathematicalShape/rectangularPyramid.schema.tpl.json +++ b/schemas/mathematicalShape/centroidalPyramid.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "sands:RectangularPyramid", + "_type": "sands:CentroidalPyramid", "_categories": [ "mathematicalShape", "mathematical3DShape" @@ -10,13 +10,13 @@ ], "properties": { "apexBaseDistance": { - "_instruction": "Enter the perpendicular distance from the base plane to the apex of this rectangular pyramid.", + "_instruction": "Enter the perpendicular distance from the centroid of the base plane to the apex of this centroidal pyramid.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this rectangular pyramid.", + "_instruction": "Enter the two-dimensional base shape of this centroidal pyramid.", "_embeddedTypes": [ "sands:Rectangle" ] diff --git a/schemas/mathematicalShape/circularFrustum.schema.tpl.json b/schemas/mathematicalShape/circularFrustum.schema.tpl.json deleted file mode 100644 index ad322c901..000000000 --- a/schemas/mathematicalShape/circularFrustum.schema.tpl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "_type": "sands:CircularFrustum", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "baseDistance", - "majorBaseShape", - "minorBaseScale" - ], - "properties": { - "baseDistance": { - "_instruction": "Enter the perpendicular distance between the major and minor base planes of this circular frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "majorBaseShape": { - "_instruction": "Enter the major two-dimensional base shape of this circular frustum.", - "_embeddedTypes": [ - "sands:Circle" - ] - }, - "minorBaseScale": { - "type": "float", - "exclusiveMinimum": 0, - "exclusiveMaximum": 1, - "_instruction": "Enter the ratio of the smaller to the larger base size of this circular frustum." - } - } -} diff --git a/schemas/mathematicalShape/cone.schema.tpl.json b/schemas/mathematicalShape/cone.schema.tpl.json deleted file mode 100644 index 0e8edfdc9..000000000 --- a/schemas/mathematicalShape/cone.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:Cone", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "apexBaseDistance", - "baseShape" - ], - "properties": { - "apexBaseDistance": { - "_instruction": "Enter the perpendicular distance from the base plane to the apex of this cone.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this elliptic cone.", - "_embeddedTypes": [ - "sands:Circle" - ] - } - } -} diff --git a/schemas/mathematicalShape/cylinder.schema.tpl.json b/schemas/mathematicalShape/cylinder.schema.tpl.json deleted file mode 100644 index dbd9e6e76..000000000 --- a/schemas/mathematicalShape/cylinder.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:Cylinder", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "baseDistance", - "baseShape" - ], - "properties": { - "baseDistance": { - "_instruction": "Enter the perpendicular distance between the two base planes of this cylinder.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this cylinder.", - "_embeddedTypes": [ - "sands:Circle" - ] - } - } -} diff --git a/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json b/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json deleted file mode 100644 index cc4f150a7..000000000 --- a/schemas/mathematicalShape/ellipticFrustum.schema.tpl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "_type": "sands:EllipticFrustum", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "baseDistance", - "majorBaseShape", - "minorBaseScale" - ], - "properties": { - "baseDistance": { - "_instruction": "Enter the perpendicular distance between the major and minor base planes of this elliptic frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "majorBaseShape": { - "_instruction": "Enter the major two-dimensional base shape of this elliptic frustum.", - "_embeddedTypes": [ - "sands:Ellipse" - ] - }, - "minorBaseScale": { - "type": "float", - "exclusiveMinimum": 0, - "exclusiveMaximum": 1, - "_instruction": "Enter the ratio of the smaller to the larger base size of this elliptic frustum." - } - } -} diff --git a/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json b/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json index 767efb031..8a8891bcb 100644 --- a/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/equilateralTriangle.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:EquilateralTriangle", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "sideLength" diff --git a/schemas/mathematicalShape/equilateralTriangularPrism.schema.tpl.json b/schemas/mathematicalShape/equilateralTriangularPrism.schema.tpl.json deleted file mode 100644 index f06fdbb61..000000000 --- a/schemas/mathematicalShape/equilateralTriangularPrism.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:EquilateralTriangularPrism", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "baseDistance", - "baseShape" - ], - "properties": { - "baseDistance": { - "_instruction": "Enter the perpendicular distance between the two base planes of this equilateral triangular prism.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this equilateral triangular prism.", - "_embeddedTypes": [ - "sands:EquilateralTriangle" - ] - } - } -} diff --git a/schemas/mathematicalShape/equilateralTriangularPyramid.schema.tpl.json b/schemas/mathematicalShape/equilateralTriangularPyramid.schema.tpl.json deleted file mode 100644 index 9469f4108..000000000 --- a/schemas/mathematicalShape/equilateralTriangularPyramid.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:EquilateralTriangularPyramid", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "apexBaseDistance", - "baseShape" - ], - "properties": { - "apexBaseDistance": { - "_instruction": "Enter the perpendicular distance from the base plane to the apex of this equilateral triangular pyramid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this equilateral triangular pyramid.", - "_embeddedTypes": [ - "sands:EquilateralTriangle" - ] - } - } -} diff --git a/schemas/mathematicalShape/squareFrustum.schema.tpl.json b/schemas/mathematicalShape/frustum.schema.tpl.json similarity index 75% rename from schemas/mathematicalShape/squareFrustum.schema.tpl.json rename to schemas/mathematicalShape/frustum.schema.tpl.json index b558e0e12..95442ce04 100644 --- a/schemas/mathematicalShape/squareFrustum.schema.tpl.json +++ b/schemas/mathematicalShape/frustum.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "sands:SquareFrustum", + "_type": "sands:Frustum", "_categories": [ "mathematicalShape", "mathematical3DShape" @@ -11,22 +11,22 @@ ], "properties": { "baseDistance": { - "_instruction": "Enter the perpendicular distance between the major and minor base planes of this square frustum.", + "_instruction": "Enter the perpendicular distance between the centered major and minor base planes of this frustum.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, "majorBaseShape": { - "_instruction": "Enter the major two-dimensional base shape of this square frustum.", - "_embeddedTypes": [ - "sands:Square" + "_instruction": "Enter the major two-dimensional base shape of this frustum.", + "_embeddedCategories": [ + "mathematical2DShape" ] }, "minorBaseScale": { "type": "float", "exclusiveMinimum": 0, "exclusiveMaximum": 1, - "_instruction": "Enter the ratio of the smaller to the larger base size of this square frustum." + "_instruction": "Enter the ratio of the smaller to the larger base size of this frustum." } } } diff --git a/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json b/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json index aa769263d..b664ded50 100644 --- a/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/isoscelesTriangle.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:IsoscelesTriangle", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "apexAngle", diff --git a/schemas/mathematicalShape/isoscelesTriangularPrism.schema.tpl.json b/schemas/mathematicalShape/isoscelesTriangularPrism.schema.tpl.json deleted file mode 100644 index 6c15bf174..000000000 --- a/schemas/mathematicalShape/isoscelesTriangularPrism.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:IsoscelesTriangularPrism", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "baseDistance", - "baseShape" - ], - "properties": { - "baseDistance": { - "_instruction": "Enter the perpendicular distance between the two base planes of this isosceles triangular prism.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this isosceles triangular prism.", - "_embeddedTypes": [ - "sands:IsoscelesTriangle" - ] - } - } -} diff --git a/schemas/mathematicalShape/isoscelesTriangularPyramid.schema.tpl.json b/schemas/mathematicalShape/isoscelesTriangularPyramid.schema.tpl.json deleted file mode 100644 index 1b0825bbc..000000000 --- a/schemas/mathematicalShape/isoscelesTriangularPyramid.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:IsoscelesTriangularPyramid", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "apexBaseDistance", - "baseShape" - ], - "properties": { - "apexBaseDistance": { - "_instruction": "Enter the perpendicular distance from the base plane to the apex of this isosceles triangular pyramid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this isosceles triangular pyramid.", - "_embeddedTypes": [ - "sands:IsoscelesTriangle" - ] - } - } -} diff --git a/schemas/mathematicalShape/kite.schema.tpl.json b/schemas/mathematicalShape/kite.schema.tpl.json index 401501211..5a68d47b5 100644 --- a/schemas/mathematicalShape/kite.schema.tpl.json +++ b/schemas/mathematicalShape/kite.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:Kite", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "legLengths", diff --git a/schemas/mathematicalShape/parallelogram.schema.tpl.json b/schemas/mathematicalShape/parallelogram.schema.tpl.json index 33c791672..3eaab6c72 100644 --- a/schemas/mathematicalShape/parallelogram.schema.tpl.json +++ b/schemas/mathematicalShape/parallelogram.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:Parallelogram", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "baseDistance", diff --git a/schemas/mathematicalShape/rectangle.schema.tpl.json b/schemas/mathematicalShape/rectangle.schema.tpl.json index 705ecec53..454eeb431 100644 --- a/schemas/mathematicalShape/rectangle.schema.tpl.json +++ b/schemas/mathematicalShape/rectangle.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:Rectangle", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "majorSideLength", diff --git a/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json b/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json deleted file mode 100644 index 8a70dc81e..000000000 --- a/schemas/mathematicalShape/rectangularFrustum.schema.tpl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "_type": "sands:RectangularFrustum", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "baseDistance", - "majorBaseShape", - "minorBaseScale" - ], - "properties": { - "baseDistance": { - "_instruction": "Enter the perpendicular distance between the major and minor base planes of this rectangular frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "majorBaseShape": { - "_instruction": "Enter the major two-dimensional base shape of this rectangular frustum.", - "_embeddedTypes": [ - "sands:Rectangle" - ] - }, - "minorBaseScale": { - "type": "float", - "exclusiveMinimum": 0, - "exclusiveMaximum": 1, - "_instruction": "Enter the ratio of the smaller to the larger base size of this rectangular frustum." - } - } -} diff --git a/schemas/mathematicalShape/regularPolygon.schema.tpl.json b/schemas/mathematicalShape/regularPolygon.schema.tpl.json index 95aa4f5a2..e2ebbe8dd 100644 --- a/schemas/mathematicalShape/regularPolygon.schema.tpl.json +++ b/schemas/mathematicalShape/regularPolygon.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:RegularPolygon", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "circumradius", diff --git a/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json b/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json deleted file mode 100644 index 7f9182e60..000000000 --- a/schemas/mathematicalShape/regularPolygonFrustum.schema.tpl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "_type": "sands:RegularPolygonFrustum", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "baseDistance", - "majorBaseShape", - "minorBaseScale" - ], - "properties": { - "baseDistance": { - "_instruction": "Enter the perpendicular distance between the major and minor base planes of this regular polygon frustum.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "majorBaseShape": { - "_instruction": "Enter the major two-dimensional base shape of this regular polygon frustum.", - "_embeddedTypes": [ - "sands:RegularPolygon" - ] - }, - "minorBaseScale": { - "type": "float", - "exclusiveMinimum": 0, - "exclusiveMaximum": 1, - "_instruction": "Enter the ratio of the smaller to the larger base size of this regular polygon frustum." - } - } -} diff --git a/schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json b/schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json deleted file mode 100644 index 75c3bb647..000000000 --- a/schemas/mathematicalShape/regularPolygonPrism.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:RegularPolygonPrism", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "baseDistance", - "baseShape" - ], - "properties": { - "baseDistance": { - "_instruction": "Enter the perpendicular distance between the two base planes of this regular polygon prism.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this regular polygon prism.", - "_embeddedTypes": [ - "sands:RegularPolygon" - ] - } - } -} diff --git a/schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json b/schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json deleted file mode 100644 index 8b53f6696..000000000 --- a/schemas/mathematicalShape/regularPolygonPyramid.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:RegularPolygonPyramid", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "apexBaseDistance", - "baseShape" - ], - "properties": { - "apexBaseDistance": { - "_instruction": "Enter the perpendicular distance from the base plane to the apex of this regular polygon pyramid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this regular polygon pyramid.", - "_embeddedTypes": [ - "sands:RegularPolygon" - ] - } - } -} diff --git a/schemas/mathematicalShape/rhombus.schema.tpl.json b/schemas/mathematicalShape/rhombus.schema.tpl.json index 27e8937c5..08ed6f076 100644 --- a/schemas/mathematicalShape/rhombus.schema.tpl.json +++ b/schemas/mathematicalShape/rhombus.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:Rhombus", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "diagonalLengths" diff --git a/schemas/mathematicalShape/ellipticCone.schema.tpl.json b/schemas/mathematicalShape/rightCone.schema.tpl.json similarity index 66% rename from schemas/mathematicalShape/ellipticCone.schema.tpl.json rename to schemas/mathematicalShape/rightCone.schema.tpl.json index 48a63a811..fd0f05f76 100644 --- a/schemas/mathematicalShape/ellipticCone.schema.tpl.json +++ b/schemas/mathematicalShape/rightCone.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "sands:EllipticCone", + "_type": "sands:RightCone", "_categories": [ "mathematicalShape", "mathematical3DShape" @@ -10,14 +10,15 @@ ], "properties": { "apexBaseDistance": { - "_instruction": "Enter the perpendicular distance from the base plane to the apex of this elliptic cone.", + "_instruction": "Enter the perpendicular distance from the center of the base plane to the apex of this right cone.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this elliptic cone.", + "_instruction": "Enter the two-dimensional elliptic base shape of this right cone.", "_embeddedTypes": [ + "sands:Circle", "sands:Ellipse" ] } diff --git a/schemas/mathematicalShape/rectangularPrism.schema.tpl.json b/schemas/mathematicalShape/rightCylinder.schema.tpl.json similarity index 61% rename from schemas/mathematicalShape/rectangularPrism.schema.tpl.json rename to schemas/mathematicalShape/rightCylinder.schema.tpl.json index 791db4b32..601e9c1e6 100644 --- a/schemas/mathematicalShape/rectangularPrism.schema.tpl.json +++ b/schemas/mathematicalShape/rightCylinder.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "sands:RectangularPrism", + "_type": "sands:RightCylinder", "_categories": [ "mathematicalShape", "mathematical3DShape" @@ -10,15 +10,16 @@ ], "properties": { "baseDistance": { - "_instruction": "Enter the perpendicular distance between the two base planes of this rectangular prism.", + "_instruction": "Enter the perpendicular distance between the two base planes of this right cylinder.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this rectangular prism.", + "_instruction": "Enter the two-dimensional elliptic base shape of the two planes of this right cylinder.", "_embeddedTypes": [ - "sands:Rectangle" + "sands:Circle", + "sands:Ellipse" ] } } diff --git a/schemas/mathematicalShape/ellipticCylinder.schema.tpl.json b/schemas/mathematicalShape/rightPrism.schema.tpl.json similarity index 71% rename from schemas/mathematicalShape/ellipticCylinder.schema.tpl.json rename to schemas/mathematicalShape/rightPrism.schema.tpl.json index f0ad797aa..291c17217 100644 --- a/schemas/mathematicalShape/ellipticCylinder.schema.tpl.json +++ b/schemas/mathematicalShape/rightPrism.schema.tpl.json @@ -1,5 +1,5 @@ { - "_type": "sands:EllipticCylinder", + "_type": "sands:RightPrism", "_categories": [ "mathematicalShape", "mathematical3DShape" @@ -10,15 +10,15 @@ ], "properties": { "baseDistance": { - "_instruction": "Enter the perpendicular distance between the two base planes of this elliptic cylinder.", + "_instruction": "Enter the perpendicular distance between the two base planes of this right prism.", "_embeddedTypes": [ "core:QuantitativeValue" ] }, "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this elliptic cylinder.", - "_embeddedTypes": [ - "sands:Ellipse" + "_instruction": "Enter the two-dimensional base shape of the two planes of this right prism.", + "_embeddedCategories": [ + "simplePolygon" ] } } diff --git a/schemas/mathematicalShape/rightTriangle.schema.tpl.json b/schemas/mathematicalShape/rightTriangle.schema.tpl.json index f25afcc7c..96a7c18b7 100644 --- a/schemas/mathematicalShape/rightTriangle.schema.tpl.json +++ b/schemas/mathematicalShape/rightTriangle.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:RightTriangle", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "perpendicularLegLengths" diff --git a/schemas/mathematicalShape/square.schema.tpl.json b/schemas/mathematicalShape/square.schema.tpl.json index a4c0463f1..2936baf25 100644 --- a/schemas/mathematicalShape/square.schema.tpl.json +++ b/schemas/mathematicalShape/square.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:Square", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "sideLength" diff --git a/schemas/mathematicalShape/squarePyramid.schema.tpl.json b/schemas/mathematicalShape/squarePyramid.schema.tpl.json deleted file mode 100644 index 766e946c3..000000000 --- a/schemas/mathematicalShape/squarePyramid.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:SquarePyramid", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "apexBaseDistance", - "baseShape" - ], - "properties": { - "apexBaseDistance": { - "_instruction": "Enter the perpendicular distance from the base plane to the apex of this square pyramid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this square pyramid.", - "_embeddedTypes": [ - "sands:Square" - ] - } - } -} diff --git a/schemas/mathematicalShape/trapezoid.schema.tpl.json b/schemas/mathematicalShape/trapezoid.schema.tpl.json index 79fc445b7..ea74c6c22 100644 --- a/schemas/mathematicalShape/trapezoid.schema.tpl.json +++ b/schemas/mathematicalShape/trapezoid.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:Trapezoid", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "baseDistance", diff --git a/schemas/mathematicalShape/triangle.schema.tpl.json b/schemas/mathematicalShape/triangle.schema.tpl.json index c626e7c34..aa0081b6c 100644 --- a/schemas/mathematicalShape/triangle.schema.tpl.json +++ b/schemas/mathematicalShape/triangle.schema.tpl.json @@ -2,7 +2,8 @@ "_type": "sands:Triangle", "_categories": [ "mathematicalShape", - "mathematical2DShape" + "mathematical2DShape", + "simplePolygon" ], "required": [ "apexAngle", diff --git a/schemas/mathematicalShape/triangularPrism.schema.tpl.json b/schemas/mathematicalShape/triangularPrism.schema.tpl.json deleted file mode 100644 index 539f3f772..000000000 --- a/schemas/mathematicalShape/triangularPrism.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:TriangularPrism", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "baseDistance", - "baseShape" - ], - "properties": { - "baseDistance": { - "_instruction": "Enter the perpendicular distance between the two base planes of this triangular prism.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this triangular prism.", - "_embeddedTypes": [ - "sands:Triangle" - ] - } - } -} diff --git a/schemas/mathematicalShape/triangularPyramid.schema.tpl.json b/schemas/mathematicalShape/triangularPyramid.schema.tpl.json deleted file mode 100644 index 39aaba63f..000000000 --- a/schemas/mathematicalShape/triangularPyramid.schema.tpl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_type": "sands:TriangularPyramid", - "_categories": [ - "mathematicalShape", - "mathematical3DShape" - ], - "required": [ - "apexBaseDistance", - "baseShape" - ], - "properties": { - "apexBaseDistance": { - "_instruction": "Enter the perpendicular distance from the base plane to the apex of this triangular pyramid.", - "_embeddedTypes": [ - "core:QuantitativeValue" - ] - }, - "baseShape": { - "_instruction": "Enter the two-dimensional base shape of this triangular pyramid.", - "_embeddedTypes": [ - "sands:Triangle" - ] - } - } -} From ef9981afbe20987a1ed84290136757ab6cc25980 Mon Sep 17 00:00:00 2001 From: Lyuba Zehl Date: Tue, 3 Mar 2026 17:51:08 +0100 Subject: [PATCH 76/76] Apply suggestion from @Raphael-Gazzotti Co-authored-by: Raphael-Gazzotti <125291580+Raphael-Gazzotti@users.noreply.github.com> --- schemas/mathematicalShape/centroidalPyramid.schema.tpl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/mathematicalShape/centroidalPyramid.schema.tpl.json b/schemas/mathematicalShape/centroidalPyramid.schema.tpl.json index 6735346d8..5f063b708 100644 --- a/schemas/mathematicalShape/centroidalPyramid.schema.tpl.json +++ b/schemas/mathematicalShape/centroidalPyramid.schema.tpl.json @@ -17,8 +17,8 @@ }, "baseShape": { "_instruction": "Enter the two-dimensional base shape of this centroidal pyramid.", - "_embeddedTypes": [ - "sands:Rectangle" + "_embeddedCategories": [ + "simplePolygon" ] } }