Merge pull request #170 from ArnoldV/develop

Release 3.0.2
ArnoldV · Feb 9, 2024 · 14a636d · 14a636d
2 parents 099099c + 3e37d2a
commit 14a636d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/Our.Umbraco.GMaps.Core/Models/Legacy/LegacyAddress.cs b/Our.Umbraco.GMaps.Core/Models/Legacy/LegacyAddress.cs
@@ -1,10 +1,12 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 
 namespace Our.Umbraco.GMaps.Models.Legacy
 {
     internal class LegacyAddress : Address
     {
         [JsonProperty("latlng")]
-        internal string LatLng { get; set; }
+        [JsonPropertyName("latlng")]
+        public string LatLng { get; set; }
     }
 }
diff --git a/Our.Umbraco.GMaps.Core/Models/Legacy/LegacyMap.cs b/Our.Umbraco.GMaps.Core/Models/Legacy/LegacyMap.cs
@@ -1,16 +1,19 @@
 using Newtonsoft.Json;
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Our.Umbraco.GMaps.Models.Legacy
 {
     internal class LegacyMap
     {
         [DataMember(Name = "address")]
         [JsonProperty("address")]
+        [JsonPropertyName("address")]
         internal LegacyAddress Address { get; set; }
 
         [DataMember(Name = "mapconfig")]
         [JsonProperty("mapconfig")]
+        [JsonPropertyName("mapconfig")]
         internal LegacyMapConfig MapConfig { get; set; }
 
     }

diff --git a/Our.Umbraco.GMaps.Core/Models/Legacy/LegacyMapConfig.cs b/Our.Umbraco.GMaps.Core/Models/Legacy/LegacyMapConfig.cs
@@ -1,13 +1,16 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 
 namespace Our.Umbraco.GMaps.Models
 {
     internal class LegacyMapConfig : MapConfig
     {
         [JsonProperty("mapcenter")]
-        internal string MapCenter { get; set; }
+        [JsonPropertyName("mapcenter")]
+        public string MapCenter { get; set; }
 
         [JsonProperty("zoom")]
-        internal new string Zoom { get; set; }
+        [JsonPropertyName("zoom")]
+        public new string Zoom { get; set; }
     }
 }
diff --git a/Our.Umbraco.GMaps.Core/Our.Umbraco.GMaps.Core.csproj b/Our.Umbraco.GMaps.Core/Our.Umbraco.GMaps.Core.csproj
@@ -3,7 +3,7 @@
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-		<Version>3.0.1</Version>
+		<Version>3.0.2</Version>
 		<Authors>Arnold Visser</Authors>
 		<Company>Arnold Visser</Company>
 		<Description>Basic Google Maps with autocomplete property editor for Umbraco 8+.  This package contains the Core DLL only.</Description>

diff --git a/Our.Umbraco.GMaps.Core/PropertyValueConverter/SingleMapPropertyValueConverter.cs b/Our.Umbraco.GMaps.Core/PropertyValueConverter/SingleMapPropertyValueConverter.cs
@@ -50,7 +50,10 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, IPub
                     // Map the LatLng property.
                     model.Address.Coordinates = Location.Parse(intermediate.Address.LatLng);
                     model.MapConfig.CenterCoordinates = Location.Parse(intermediate.MapConfig.MapCenter);
-                    model.MapConfig.Zoom = string.IsNullOrEmpty(intermediate.MapConfig.Zoom) ? 17 : Convert.ToInt32(intermediate.MapConfig.Zoom);
+                    if (model.MapConfig.Zoom == 0)
+                    {
+                        model.MapConfig.Zoom = string.IsNullOrEmpty(intermediate.MapConfig.Zoom) ? 17 : Convert.ToInt32(intermediate.MapConfig.Zoom);
+                    }
                 }
                 else
                 {

diff --git a/Our.Umbraco.GMaps/Our.Umbraco.GMaps.csproj b/Our.Umbraco.GMaps/Our.Umbraco.GMaps.csproj
@@ -7,7 +7,7 @@
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 
-		<Version>3.0.1</Version>
+		<Version>3.0.2</Version>
 		<Authors>Arnold Visser</Authors>
 		<Company>Arnold Visser</Company>
 		<Description>Basic Google Maps with autocomplete property editor for Umbraco 8+</Description>