Serialize BoundingBox to number array

Author: arnaudleclerc

samples/AzureMapsControl.Sample/Pages/WithCameraOptions.razor

@@ -2,7 +2,7 @@
 
 @using AzureMapsControl.Components.Map
 <AzureMap Id="map"
-          CameraOptions="new CameraOptions { Center= new AzureMapsControl.Components.Atlas.Position(11.581990, 48.143534), Zoom= 8.5, MinZoom = 3, MaxZoom = 12.5 }"
+          CameraOptions="new CameraOptions { Bounds = new Components.Atlas.BoundingBox(-9, 38, 38, -9), Zoom= 8.5, MinZoom = 3, MaxZoom = 12.5 }"
           StyleOptions="StyleOptions"
             EventActivationFlags="MapEventActivationFlags
                                 .None()

src/AzureMapsControl.Components/Atlas/BoundingBox.cs

@@ -1,8 +1,12 @@
 namespace AzureMapsControl.Components.Atlas
 {
+    using System;
     using System.Diagnostics.CodeAnalysis;
+    using System.Text.Json;
+    using System.Text.Json.Serialization;
 
     [ExcludeFromCodeCoverage]
+    [JsonConverter(typeof(BoundingBoxJsonConverter))]
     public sealed class BoundingBox
     {
         /// <summary>
@@ -40,4 +44,44 @@ public BoundingBox(double west, double south, double east, double north)
             North = north;
         }
     }
+
+    internal sealed class BoundingBoxJsonConverter : JsonConverter<BoundingBox>
+    {
+        public override BoundingBox Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.None)
+            {
+                reader.Read();
+            }
+
+            if (reader.TokenType == JsonTokenType.StartArray)
+            {
+                reader.Read();
+                var west = reader.GetDouble();
+                reader.Read();
+                var south = reader.GetDouble();
+                reader.Read();
+                var east = reader.GetDouble();
+                reader.Read();
+                var north = reader.GetDouble();
+                reader.Read();
+                return new BoundingBox(west, south, east, north);
+            }
+
+            return null;
+        }
+
+        public override void Write(Utf8JsonWriter writer, BoundingBox value, JsonSerializerOptions options)
+        {
+            if (value is not null)
+            {
+                writer.WriteStartArray();
+                writer.WriteNumberValue(value.West);
+                writer.WriteNumberValue(value.South);
+                writer.WriteNumberValue(value.East);
+                writer.WriteNumberValue(value.North);
+                writer.WriteEndArray();
+            }
+        }
+    }
 }

src/AzureMapsControl.Components/typescript/controls/geolocation-control.ts

@@ -36,12 +36,7 @@ export class GeolocationControl {
                     code: args.code,
                     message: args.message,
                     feature: {
-                        bbox: args.bbox ? {
-                            west: args.bbox[0],
-                            south: args.bbox[1],
-                            east: args.bbox[2],
-                            north: args.bbox[3]
-                        } : null,
+                        bbox: args.bbox,
                         geometry: args.geometry,
                         properties: Core.formatProperties(args.properties)
                     },

src/AzureMapsControl.Components/typescript/core/core.ts

@@ -582,12 +582,7 @@ export class Core {
 
     private static _getSerializableFeature(feature: azmaps.data.Feature<azmaps.data.Geometry, any>): Feature {
         return {
-            bbox: feature.bbox ? {
-                west: feature.bbox[0],
-                south: feature.bbox[1],
-                east: feature.bbox[2],
-                north: feature.bbox[3]
-            } : null,
+            bbox: feature.bbox,
             geometry: feature.geometry,
             id: feature.id,
             properties: feature.properties

src/AzureMapsControl.Components/typescript/geometries/geometry-builder.ts

@@ -7,11 +7,7 @@ export class GeometryBuilder {
     public static buildFeature(feature: Feature): azmaps.data.Feature<azmaps.data.Geometry, any> {
         const geometry = this.buildGeometry(feature.geometry);
         return new azmaps.data.Feature(geometry, Core.formatProperties(feature.properties), feature.id,
-            feature.bbox ?
-                new azmaps.data.BoundingBox(
-                    new azmaps.data.Position(feature.bbox.south, feature.bbox.west)
-                    , new azmaps.data.Position(feature.bbox.north, feature.bbox.east)
-                ) : null
+            feature.bbox ? new azmaps.data.BoundingBox(feature.bbox) : null
         );
     }
 
@@ -48,50 +44,35 @@ export class GeometryBuilder {
     public static buildLineString(geometry: Geometry): azmaps.data.LineString {
         return new azmaps.data.LineString(
             geometry.coordinates,
-            geometry.bbox ? new azmaps.data.BoundingBox(
-                new azmaps.data.Position(geometry.bbox.south, geometry.bbox.west)
-                , new azmaps.data.Position(geometry.bbox.north, geometry.bbox.east)
-            ) : null
+            geometry.bbox ? new azmaps.data.BoundingBox(geometry.bbox) : null
         );
     }
 
     public static buildPolygon(geometry: Geometry): azmaps.data.Polygon {
         return new azmaps.data.Polygon(
             geometry.coordinates,
-            geometry.bbox ? new azmaps.data.BoundingBox(
-                new azmaps.data.Position(geometry.bbox.south, geometry.bbox.west)
-                , new azmaps.data.Position(geometry.bbox.north, geometry.bbox.east)
-            ) : null
+            geometry.bbox ? new azmaps.data.BoundingBox(geometry.bbox) : null
         );
     }
 
     public static buildMultiPoint(geometry: Geometry): azmaps.data.MultiPoint {
         return new azmaps.data.MultiPoint(
             geometry.coordinates,
-            geometry.bbox ? new azmaps.data.BoundingBox(
-                new azmaps.data.Position(geometry.bbox.south, geometry.bbox.west)
-                , new azmaps.data.Position(geometry.bbox.north, geometry.bbox.east)
-            ) : null
+            geometry.bbox ? new azmaps.data.BoundingBox(geometry.bbox) : null
         );
     }
 
     public static buildMultiLineString(geometry: Geometry): azmaps.data.MultiLineString {
         return new azmaps.data.MultiLineString(
             geometry.coordinates,
-            geometry.bbox ? new azmaps.data.BoundingBox(
-                new azmaps.data.Position(geometry.bbox.south, geometry.bbox.west)
-                , new azmaps.data.Position(geometry.bbox.north, geometry.bbox.east)
-            ) : null
+            geometry.bbox ? new azmaps.data.BoundingBox(geometry.bbox) : null
         );
     }
 
     public static buildMultiPolygon(geometry: Geometry): azmaps.data.MultiPolygon {
         return new azmaps.data.MultiPolygon(
             geometry.coordinates,
-            geometry.bbox ? new azmaps.data.BoundingBox(
-                new azmaps.data.Position(geometry.bbox.south, geometry.bbox.west)
-                , new azmaps.data.Position(geometry.bbox.north, geometry.bbox.east)
-            ) : null
+            geometry.bbox ? new azmaps.data.BoundingBox(geometry.bbox) : null
         );
     }
 }

src/AzureMapsControl.Components/typescript/geometries/geometry.ts

@@ -1,22 +1,12 @@
 export interface Geometry {
     coordinates: any;
-    bbox: {
-        east: number;
-        north: number;
-        south: number;
-        west: number;
-    },
+    bbox: number[],
     type: 'LineString' | 'MultiLineString' | 'MultiPoint' | 'MultiPolygon' | 'Point' | 'Polygon';
 }
 
 export interface Feature {
     id?: string;
-    bbox: {
-        east: number;
-        north: number;
-        south: number;
-        west: number;
-    },
+    bbox: number[],
     geometry: Geometry,
     properties: { [key: string]: any }
 }

tests/AzureMapsControl.Components.Tests/Atlas/BoundingBox.cs

@@ -0,0 +1,36 @@
+namespace AzureMapsControl.Components.Tests.Atlas
+{
+
+    using AzureMapsControl.Components.Atlas;
+    using AzureMapsControl.Components.Tests.Json;
+
+    using Xunit;
+
+    public class BoundingBoxJsonConverterTests : JsonConverterTests<BoundingBox>
+    {
+        public BoundingBoxJsonConverterTests() : base(new BoundingBoxJsonConverter())
+        {
+        }
+
+        [Fact]
+        public void Should_Write()
+        {
+            var boundingBox = new BoundingBox(1, 2, 3, 4);
+            var expectedJson = "[1,2,3,4]";
+
+            TestAndAssertWrite(boundingBox, expectedJson);
+        }
+
+        [Fact]
+        public void Should_Read()
+        {
+            var json = "[1,2,3,4]";
+
+            var boundingBox = Read(json);
+            Assert.Equal(1, boundingBox.West);
+            Assert.Equal(2, boundingBox.South);
+            Assert.Equal(3, boundingBox.East);
+            Assert.Equal(4, boundingBox.North);
+        }
+    }
+}