Bug fixes and support for pro freatures

samples/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/Bookmarks.razor

@@ -30,6 +30,7 @@
 
     private void OnLayerViewCreate(LayerViewCreateEvent evt)
     {
+        if (evt.Layer is not FeatureLayer layer) return;
         _layerView = evt.LayerView as FeatureLayerView;
     }
 

samples/dymaptic.GeoBlazor.Core.Sample.Shared/Shared/NavMenu.razor

@@ -77,8 +77,8 @@
         new("basemaps", "Basemaps", "oi-map"),
         new("feature-layers", "Feature Layers", "oi-layers"),
         new("popups", "Popups", "oi-chat"),
-        new("bookmarks", "Bookmarks", "oi-bookmark"),
         new("popup-actions", "Popup Actions", "oi-bullhorn"),
+        new("bookmarks", "Bookmarks", "oi-bookmark"),
         new("vector-layer", "Vector Layer", "oi-arrow-right"),
         new("layer-lists", "Layer Lists", "oi-list"),
         new("basemap-layer-lists", "Basemap Layer Lists", "oi-spreadsheet"),

src/dymaptic.GeoBlazor.Core/Components/Widgets/LegendWidget.cs

@@ -1,4 +1,5 @@
 using dymaptic.GeoBlazor.Core.Components.Layers;
+using dymaptic.GeoBlazor.Core.Serialization;
 using Microsoft.AspNetCore.Components;
 using System.Text.Json.Serialization;
 
@@ -26,6 +27,17 @@ public class LegendWidget : Widget
     /// </summary>
     public HashSet<LayerInfo> LayerInfos { get; set; } = new();
 
+    /// <summary>
+    /// Indicates the style of the legend. The style determines the legend's layout and behavior.
+    /// You can either specify a string or an object to indicate the style.
+    /// The known string values are the same values listed in the table within the type property.
+    /// <a target="_blank" href=" https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#style">
+    ///         ArcGIS
+    ///         JS API
+    ///     </a>
+    /// </summary>
+    public LegendStyle? Style { get; set; }
+
     /// <inheritdoc />
     public override async Task RegisterChildComponent(MapComponent child)
     {
@@ -34,6 +46,10 @@ public override async Task RegisterChildComponent(MapComponent child)
             case LayerInfo layerInfo:
                 LayerInfos.Add(layerInfo);
 
+                break;
+            case LegendStyle style:
+                Style = style;
+
                 break;
             default:
                 await base.RegisterChildComponent(child);
@@ -50,6 +66,10 @@ public override async Task UnregisterChildComponent(MapComponent child)
             case LayerInfo layerInfo:
                 LayerInfos.Remove(layerInfo);
 
+                break;
+            case LegendStyle:
+                Style = null;
+
                 break;
             default:
                 await base.UnregisterChildComponent(child);
@@ -67,6 +87,8 @@ internal override void ValidateRequiredChildren()
             layerInfo.ValidateRequiredChildren();
         }
 
+        Style?.ValidateRequiredChildren();
+
         base.ValidateRequiredChildren();
     }
 }
@@ -99,4 +121,60 @@ public class LayerInfo : MapComponent
     [Parameter]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public int[]? SublayerIds { get; set; }
-}
+}
+
+/// <summary>
+/// The widget legend style, sets the display style of the legend widget.
+/// <a target="_blank" href=" https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#style">
+///         ArcGIS
+///         JS API
+///     </a>
+/// </summary>
+public class LegendStyle : MapComponent
+{
+    /// <summary>
+    /// The Legend style type.
+    /// </summary>
+    [Parameter]
+    public LegendStyleType? Type { get; set; }
+
+    /// <summary>
+    /// The legend style layout when there are multiple legends
+    /// </summary>
+    [Parameter]
+    public LegendStyleLayout? Layout { get; set; }
+}
+
+
+/// <summary>
+/// The Legend style type.
+/// <a target="_blank" href=" https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#style">
+///         ArcGIS
+///         JS API
+///     </a>
+/// </summary>
+[JsonConverter(typeof(EnumToKebabCaseStringConverter<LegendStyleType>))]
+public enum LegendStyleType
+{
+#pragma warning disable CS1591
+    Card,
+    Classic,
+#pragma warning restore CS1591
+}
+
+/// <summary>
+/// The legend style layout when there are multiple legends
+/// <a target="_blank" href=" https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#style">
+///         ArcGIS
+///         JS API
+///     </a>
+/// </summary>
+[JsonConverter(typeof(EnumToKebabCaseStringConverter<LegendStyleLayout>))]
+public enum LegendStyleLayout
+{
+#pragma warning disable CS1591
+    Auto,
+    SideBySide,
+    Stack
+#pragma warning restore CS1591
+}

src/dymaptic.GeoBlazor.Core/Objects/TimeInterval.cs

@@ -1,4 +1,6 @@
-using dymaptic.GeoBlazor.Core.Serialization;
+using dymaptic.GeoBlazor.Core.Extensions;
+using dymaptic.GeoBlazor.Core.Serialization;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 
@@ -35,9 +37,7 @@ public class TimeInterval
 ///     </a>
 /// Used by Feature Layer.
 /// </summary>
-
-
-[JsonConverter(typeof(EnumToKebabCaseStringConverter<TemporalTime>))]
+[JsonConverter(typeof(TimeEnumToKebabCaseStringConverter<TemporalTime>))]
 public enum TemporalTime
 {
 #pragma warning disable CS1591
@@ -52,4 +52,4 @@ public enum TemporalTime
     Decades,
     Centuries
 #pragma warning restore CS1591
-}
+}

src/dymaptic.GeoBlazor.Core/Scripts/arcGisJsInterop.ts

@@ -1014,7 +1014,9 @@ export async function updateWidget(widgetObject: any, viewId: string): Promise<v
         switch (widgetObject.type) {
             case 'bookmarks':
                 let bookmarks = currentWidget as Bookmarks;
-                bookmarks.bookmarks = widgetObject.bookmarks.map(buildJsBookmark)
+                if (hasValue(widgetObject.bookmarks)) {
+                    bookmarks.bookmarks = widgetObject.bookmarks.map(buildJsBookmark);
+                }
                 break;
         }
         unsetWaitCursor(viewId);
@@ -1653,6 +1655,17 @@ async function createWidget(widget: any, viewId: string): Promise<Widget | null>
                     return jsLayerInfo;
                 });
             }
+            if (hasValue(widget.style)) {
+                if (hasValue(widget.style.layout)) {
+                    legend.style = {
+                        type: widget.style.type,
+                        layout: widget.style.layout
+                    };
+                }
+                else {
+                    legend.style = widget.style.type;
+                }
+            }
             break;
         case 'home':
             const homeBtn = new Home({

src/dymaptic.GeoBlazor.Core/Scripts/jsBuilder.ts

@@ -1237,7 +1237,7 @@ export function buildJsFeatureEffect(dnFeatureEffect: DotNetFeatureEffect): Feat
         }
     }
     featureEffect.excludedLabelsVisible = dnFeatureEffect.excludedLabelsVisible ?? undefined;
-    if (hasValue(dnFeatureEffect?.excludedLabelsVisible)) {
+    if (hasValue(dnFeatureEffect?.filter)) {
         featureEffect.filter = buildJsFeatureFilter(dnFeatureEffect.filter) as FeatureFilter;
     }
 

src/dymaptic.GeoBlazor.Core/Serialization/EnumToKebabCaseStringConverter.cs

@@ -40,4 +40,32 @@ public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions
         string resultString = stringVal!.ToKebabCase();
         writer.WriteStringValue(resultString);
     }
+}
+
+
+/// <summary>
+/// Converts an enum to a kebab case string for serialization. Used with TimeInerval which returns esriTimeUnits from the ESRI JS.
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class TimeEnumToKebabCaseStringConverter<T> : EnumToKebabCaseStringConverter<T> where T : notnull
+{
+    /// <inheritdoc />
+    public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        string? value = reader.GetString()
+            ?.Replace("-", string.Empty)
+            .Replace("esriTimeUnits", string.Empty)
+            .Replace(typeof(T).Name, string.Empty);
+
+        try
+        {
+            return value is not null ? (T)Enum.Parse(typeof(T), value, true) : default(T)!;
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex);
+
+            return default(T)!;
+        }
+    }
 }