Allow geobox to be constructed from 4 coordinates (#3341)

Realm/Realm/DatabaseTypes/Geospatial/GeoBox.cs

@@ -26,16 +26,28 @@ namespace Realms
     public class GeoBox : GeoShapeBase
     {
         /// <summary>
-        /// Gets the bottom left corner of the rectangle.
+        /// Gets the longitude of the left edge of the rectangle.
         /// </summary>
-        /// <value>The box's bottom left corner.</value>
-        public GeoPoint BottomLeftCorner { get; }
+        /// <value>The box's left edge.</value>
+        public double Left { get; }
 
         /// <summary>
-        /// Gets the top right corner of the rectangle.
+        /// Gets the latitude of the top edge of the rectangle.
         /// </summary>
-        /// <value>The box's top right corner.</value>
-        public GeoPoint TopRightCorner { get; }
+        /// <value>The box's top edge.</value>
+        public double Top { get; }
+
+        /// <summary>
+        /// Gets the longitude of the right edge of the rectangle.
+        /// </summary>
+        /// <value>The box's right edge.</value>
+        public double Right { get; }
+
+        /// <summary>
+        /// Gets the latitude of the bottom edge of the rectangle.
+        /// </summary>
+        /// <value>The box's bottom edge.</value>
+        public double Bottom { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GeoBox"/> class from the provided coordinates.
@@ -44,13 +56,30 @@ public class GeoBox : GeoShapeBase
         /// <param name="topRightCorner">The top right corner of the rectangle.</param>
         public GeoBox(GeoPoint bottomLeftCorner, GeoPoint topRightCorner)
         {
-            BottomLeftCorner = bottomLeftCorner;
-            TopRightCorner = topRightCorner;
+            Left = bottomLeftCorner.Longitude;
+            Bottom = bottomLeftCorner.Latitude;
+            Right = topRightCorner.Longitude;
+            Top = topRightCorner.Latitude;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GeoBox"/> class from the provided coordinates.
+        /// </summary>
+        /// <param name="left">The longitude of the left edge of the rectangle.</param>
+        /// <param name="top">The latitude of the top edge of the rectangle.</param>
+        /// <param name="right">The longitude of the right edge of the rectangle.</param>
+        /// <param name="bottom">The latitude of the bottom edge of the rectangle.</param>
+        public GeoBox(double left, double top, double right, double bottom)
+        {
+            Left = left;
+            Top = top;
+            Right = right;
+            Bottom = bottom;
         }
 
-        internal NativeGeoBox ToNative() => new(BottomLeftCorner.ToNative(), TopRightCorner.ToNative());
+        internal NativeGeoBox ToNative() => new(Left, Top, Right, Bottom);
 
         /// <inheritdoc />
-        public override string ToString() => $"Box: {{ {BottomLeftCorner}, {TopRightCorner} }}";
+        public override string ToString() => $"Box: {{ left: {Left}, top: {Top}, right: {Right}, bottom: {Bottom} }}";
     }
 }

Realm/Realm/Native/Queries/NativeGeoBox.cs

@@ -23,15 +23,19 @@ namespace Realms.Native
     [StructLayout(LayoutKind.Sequential)]
     internal readonly struct NativeGeoBox
     {
-        private readonly NativeGeoPoint _bottom_left_corner;
-        private readonly NativeGeoPoint _top_right_corner;
+        private readonly double _left;
+        private readonly double _top;
+        private readonly double _right;
+        private readonly double _bottom;
 
-        public NativeGeoBox(NativeGeoPoint bottom_left, NativeGeoPoint top_right)
+        public NativeGeoBox(double left, double top, double right, double bottom)
         {
-            _bottom_left_corner = bottom_left;
-            _top_right_corner = top_right;
+            _left = left;
+            _top = top;
+            _right = right;
+            _bottom = bottom;
         }
 
-        public override string ToString() => $"Box {{bl: {_bottom_left_corner}, tr: {_top_right_corner}}}";
+        public override string ToString() => $"Box {{ {_left}, {_top}, {_right}, {_bottom} }}";
     }
 }

Tests/Realm.Tests/Database/GeospatialTests.cs

@@ -327,10 +327,10 @@ public void NativeGeoPoint_ToString()
         public void NativeGeoBox_ToString()
         {
             var box = new GeoBox((1, 2), (3, 4));
-            Assert.That(box.ToNative().ToString(), Does.Contain("Box").And.Contains("[1, 2]").And.Contains("[3, 4]"));
+            Assert.That(box.ToNative().ToString(), Does.Contain("Box").And.Contains("{ 2, 3, 4, 1 }"));
 
             QueryArgument arg = box;
-            Assert.That(arg.ToNative().ToString(), Does.Contain("QueryArgument").And.Contains("[1, 2]").And.Contains("[3, 4]"));
+            Assert.That(arg.ToNative().ToString(), Does.Contain("QueryArgument").And.Contains("{ 2, 3, 4, 1 }"));
         }
 
         [Test]

wrappers/src/marshalling.hpp

@@ -118,8 +118,10 @@ struct geo_point {
 };
 
 struct geo_box {
-    geo_point bottom_left;
-    geo_point top_right;
+    double left;
+    double top;
+    double right;
+    double bottom;
 };
 
 struct geo_circle {
@@ -256,7 +258,7 @@ static inline GeoPoint from_capi(geo_point point)
 
 static inline GeoBox from_capi(geo_box box)
 {
-    return GeoBox{ from_capi(box.bottom_left), from_capi(box.top_right) };
+    return GeoBox{ GeoPoint(box.left, box.bottom), GeoPoint(box.right, box.top) };
 }
 
 static inline GeoCircle from_capi(geo_circle circle)