Do not serialize each string as a datetime

Author: arnaudleclerc

samples/AzureMapsControl.Sample/Pages/Layers/SymbolLayerWithFeatures.razor

@@ -7,7 +7,6 @@
                                 .None()
                                 .Enable(MapEventType.Ready, MapEventType.Click)"
           OnReady="OnMapReady" />
-i
 @code  {
     public async Task OnMapReady(MapEventArgs eventArgs)
     {
@@ -18,7 +17,7 @@ i
         var feature = new AzureMapsControl.Components.Atlas.Feature<AzureMapsControl.Components.Atlas.Point>(new AzureMapsControl.Components.Atlas.Point(
                     new AzureMapsControl.Components.Atlas.Position(-122.13284, 47.63699)
                 ), new Dictionary<string, object> {
-                { "title", "Cafeteria" },
+                { "title", new DateTime(2021, 6, 3) },
                 { "subtitle", "Building 40"}
                 });
 

src/AzureMapsControl.Components/Atlas/Feature.cs

@@ -9,9 +9,10 @@
     [ExcludeFromCodeCoverage]
     public abstract class Feature
     {
-        [JsonConverter(typeof(StringConverter))]
+        [JsonConverter(typeof(FeatureIdConverter))]
         public string Id { get; set; }
 
+        [JsonConverter(typeof(FeaturePropertiesConverter))]
         public IDictionary<string, object> Properties { get; set; }
         public BoundingBox BBox { get; set; }
 
@@ -30,8 +31,7 @@ public sealed class Feature<TGeometry> : Feature
 
         public TGeometry Geometry
         {
-            get 
-            {
+            get {
                 if (_geometry != null && _geometry.Id != Id)
                 {
                     _geometry.Id = Id;
@@ -55,7 +55,7 @@ public Feature(TGeometry geometry, IDictionary<string, object> properties) : thi
         public Feature(string id, TGeometry geometry, IDictionary<string, object> properties) : base(id, properties) => Geometry = geometry;
     }
 
-    internal sealed class StringConverter : JsonConverter<string>
+    internal sealed class FeatureIdConverter : JsonConverter<string>
     {
         public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
@@ -70,4 +70,27 @@ public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
 
         public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options) => writer.WriteStringValue(value);
     }
+
+    internal sealed class FeaturePropertiesConverter : JsonConverter<IDictionary<string, object>>
+    {
+        public override IDictionary<string, object> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => JsonSerializer.Deserialize<Dictionary<string, object>>(ref reader, options);
+        public override void Write(Utf8JsonWriter writer, IDictionary<string, object> value, JsonSerializerOptions options)
+        {
+            writer.WriteStartObject();
+            foreach (var kvp in value)
+            {
+                writer.WritePropertyName(kvp.Key);
+                if (kvp.Value.GetType() == typeof(DateTime) ||
+                    (kvp.Value.GetType() == typeof(string) && DateTime.TryParse(kvp.Value.ToString(), out _)))
+                {
+                    writer.WriteStringValue($"azureMapsControl.datetime:{kvp.Value}");
+                }
+                else
+                {
+                    writer.WriteStringValue(JsonSerializer.Serialize(kvp.Value));
+                }
+            }
+            writer.WriteEndObject();
+        }
+    }
 }

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

@@ -569,8 +569,8 @@ export class Core {
     public static formatProperties(properties: { [key: string]: any }): { [key: string]: any } {
         if (properties) {
             for (const key in properties) {
-                if (typeof properties[key] === 'string') {
-                    const date = Date.parse(properties[key]);
+                if (typeof properties[key] === 'string' && properties[key].startsWith('azureMapsControl.datetime:')) {
+                    const date = Date.parse(properties[key].replace('azureMapsControl.datetime:', ''));
                     if (!isNaN(date)) {
                         properties[key] = new Date(date);
                     }