Merge pull request #30

Fix deserializing of LatLng and LatLngBounds
bjtrounson · Nov 13, 2023 · 1bef2ee · 1bef2ee
2 parents a2e5a34 + 40ee865
commit 1bef2ee
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/BlazorLeafletInterop/Components/Layers/Misc/FeatureGroup.razor.cs b/BlazorLeafletInterop/Components/Layers/Misc/FeatureGroup.razor.cs
@@ -45,7 +45,7 @@ public async Task<FeatureGroup> BringToBack()
     /// <summary>
     /// Returns the LatLngBounds of the Feature Group (created from bounds and coordinates of its children).
     /// </summary>
-    /// <returns>IJSObjectReference</returns>
+    /// <returns>LatLngBounds</returns>
     /// <exception cref="NullReferenceException"></exception>
     public async Task<LatLngBounds?> GetBounds()
     {

diff --git a/BlazorLeafletInterop/Models/Basics/LatLng.cs b/BlazorLeafletInterop/Models/Basics/LatLng.cs
@@ -1,4 +1,6 @@
-namespace BlazorLeafletInterop.Models.Basics;
+using System.Text.Json.Serialization;
+
+namespace BlazorLeafletInterop.Models.Basics;
 
 public class LatLng
 {
@@ -20,8 +22,11 @@ public LatLng(double lat, double lng, double alt)
         Alt = alt;
     }
 
+    [JsonPropertyName("lat")]
     public double Lat { get; set; }
+    [JsonPropertyName("lng")]
     public double Lng { get; set; }
+    [JsonPropertyName("alt")]
     public double Alt { get; set; }
 
     public double GetDistanceToPointInMiles(LatLng to)

diff --git a/BlazorLeafletInterop/Models/Basics/LatLngBounds.cs b/BlazorLeafletInterop/Models/Basics/LatLngBounds.cs
@@ -1,4 +1,6 @@
-namespace BlazorLeafletInterop.Models.Basics;
+using System.Text.Json.Serialization;
+
+namespace BlazorLeafletInterop.Models.Basics;
 
 public class LatLngBounds
 {
@@ -15,8 +17,10 @@ public LatLngBounds(LatLng southwest, LatLng northeast)
     }
 
     // ReSharper disable once MemberCanBePrivate.Global
+    [JsonPropertyName("_southWest")]
     public LatLng SouthWest { get; set; }
     // ReSharper disable once MemberCanBePrivate.Global
+    [JsonPropertyName("_northEast")]
     public LatLng NorthEast { get; set; }
 
     public LatLngBounds Extend(LatLng point)

diff --git a/ExampleApp/Pages/GeoJsonTest.razor b/ExampleApp/Pages/GeoJsonTest.razor
@@ -18,6 +18,7 @@
 	<h3>Blazor Leaflet Interop GeoJson Test</h3>
 	<button @onclick="@(() => GeoJsonLayer?.EachLayer(_onEachLayer))">Open Popup</button>
 	<button @onclick=GenerateNewFeatureCollection>Generate More Markers</button>
+	<button @onclick=GetBounds>Get GeoJSON bounds</button>
 </div>
 
 @code {
@@ -61,6 +62,13 @@
 		base.OnInitialized();
 		CreateRandomMarkersForFeatureCollection();
 	}
+
+	private async Task GetBounds()
+	{
+		if (GeoJsonLayer == null) return;
+		var bounds = await GeoJsonLayer.GetBounds();
+		if (bounds != null) Console.WriteLine(bounds.ToBBoxString());
+	}
 
 	private void GenerateNewFeatureCollection()
 	{