@jupytergis/base 0.13.2 → 0.14.0

package/lib/commands/index.js

@@ -1,4 +1,4 @@
-import { showErrorMessage } from '@jupyterlab/apputils';
+import { UUID } from '@lumino/coreutils';
 import { fromLonLat } from 'ol/proj';
 import { CommandIDs, icons } from '../constants';
 import { ProcessingFormDialog } from '../dialogs/ProcessingFormDialog';
@@ -12,6 +12,7 @@ import { addProcessingCommands } from '../processing/processingCommands';
 import { getGeoJSONDataFromLayerSource, downloadFile } from '../tools';
 import { SYMBOLOGY_VALID_LAYER_TYPES } from '../types';
 import { JupyterGISDocumentWidget } from '../widget';
+import { addLayerCreationCommands } from './operationCommands';
 const POINT_SELECTION_TOOL_CLASS = 'jGIS-point-selection-tool';
 function loadKeybindings(commands, keybindings) {
     keybindings.forEach(binding => {
@@ -29,6 +30,7 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     var _a;
     const trans = translator.load('jupyterlab');
     const { commands } = app;
+    addLayerCreationCommands({ tracker, commands, trans });
     /**
      * Wraps a command definition to automatically disable it in Specta mode
      */
@@ -54,7 +56,17 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     commands.addCommand = (id, options) => {
         return originalAddCommand(id, createSpectaAwareCommand(options));
     };
-    commands.addCommand(CommandIDs.symbology, Object.assign({ label: trans.__('Edit Symbology'), isEnabled: () => {
+    commands.addCommand(CommandIDs.symbology, Object.assign({ label: trans.__('Edit Symbology'), caption: 'Open the symbology editor for the currently selected layer.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {
+                    selected: {
+                        type: 'object',
+                        description: 'Currently selected layer(s) in the map view',
+                    },
+                },
+            },
+        }, isEnabled: () => {
             var _a, _b;
             const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
             const localState = model === null || model === void 0 ? void 0 : model.sharedModel.awareness.getLocalState();
@@ -74,27 +86,65 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             const isValidLayer = SYMBOLOGY_VALID_LAYER_TYPES.includes(layer.type);
             return isValidLayer;
         }, execute: Private.createSymbologyDialog(tracker, state) }, icons.get(CommandIDs.symbology)));
-    commands.addCommand(CommandIDs.redo, Object.assign({ label: trans.__('Redo'), isEnabled: () => {
+    commands.addCommand(CommandIDs.redo, Object.assign({ label: trans.__('Redo'), caption: 'Redo the last undone operation in the specified JupyterGIS document. If filePath is omitted, use the active document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {
+                    filePath: {
+                        type: 'string',
+                        description: 'Optional .jGIS file path. If omitted, uses active widget.',
+                    },
+                },
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
-        }, execute: () => {
-            const current = tracker.currentWidget;
+        }, execute: (args) => {
+            const filePath = args === null || args === void 0 ? void 0 : args.filePath;
+            const current = filePath
+                ? tracker.find(w => w.model.filePath === filePath)
+                : tracker.currentWidget;
             if (current) {
                 return current.model.sharedModel.redo();
             }
         } }, (_a = icons.get(CommandIDs.redo)) === null || _a === void 0 ? void 0 : _a.icon));
-    commands.addCommand(CommandIDs.undo, Object.assign({ label: trans.__('Undo'), isEnabled: () => {
+    commands.addCommand(CommandIDs.undo, Object.assign({ label: trans.__('Undo'), caption: 'Undo the last operation in the specified JupyterGIS document. If filePath is omitted, use the active document.', describedBy: {
+            args: {
+                type: 'object',
+                required: [],
+                properties: {
+                    filePath: {
+                        type: 'string',
+                        description: 'Optional .jGIS file path. If omitted, uses active widget.',
+                    },
+                },
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
-        }, execute: () => {
-            const current = tracker.currentWidget;
+        }, execute: (args) => {
+            const filePath = args === null || args === void 0 ? void 0 : args.filePath;
+            const current = filePath
+                ? tracker.find(w => w.model.filePath === filePath)
+                : tracker.currentWidget;
             if (current) {
                 return current.model.sharedModel.undo();
             }
         } }, icons.get(CommandIDs.undo)));
-    commands.addCommand(CommandIDs.identify, Object.assign({ label: trans.__('Identify'), isToggled: () => {
+    commands.addCommand(CommandIDs.identify, Object.assign({ label: trans.__('Identify'), caption: 'Toggle identify mode for the selected vector-compatible layer in the specified JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                required: [],
+                properties: {
+                    filePath: {
+                        type: 'string',
+                        description: 'Optional .jGIS file path. If omitted, uses active widget.',
+                    },
+                },
+            },
+        }, isToggled: () => {
             const current = tracker.currentWidget;
             if (!current) {
                 return false;
@@ -131,7 +181,10 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
                 'VectorTileLayer',
             ].includes(selectedLayer.type);
         }, execute: args => {
-            const current = tracker.currentWidget;
+            const filePath = args === null || args === void 0 ? void 0 : args.filePath;
+            const current = filePath
+                ? tracker.find(w => w.model.filePath === filePath)
+                : tracker.currentWidget;
             if (!current) {
                 return;
             }
@@ -149,7 +202,17 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             current.model.toggleMode('identifying');
             commands.notifyCommandChanged(CommandIDs.identify);
         } }, icons.get(CommandIDs.identify)));
-    commands.addCommand(CommandIDs.temporalController, Object.assign({ label: trans.__('Temporal Controller'), isToggled: () => {
+    commands.addCommand(CommandIDs.temporalController, Object.assign({ label: trans.__('Temporal Controller'), caption: 'Toggle the temporal controller for the selected vector or heatmap layer in the specified JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {
+                    filePath: {
+                        type: 'string',
+                        description: 'Optional path to the .jGIS file',
+                    },
+                },
+            },
+        }, isToggled: () => {
             var _a;
             return ((_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model.isTemporalControllerActive) || false;
         }, isEnabled: () => {
@@ -177,8 +240,11 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
                 return false;
             }
             return true;
-        }, execute: () => {
-            const current = tracker.currentWidget;
+        }, execute: (args) => {
+            const filePath = args === null || args === void 0 ? void 0 : args.filePath;
+            const current = filePath
+                ? tracker.find(w => w.model.filePath === filePath)
+                : tracker.currentWidget;
             if (!current) {
                 return;
             }
@@ -188,7 +254,12 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     /**
      * SOURCES and LAYERS creation commands.
      */
-    commands.addCommand(CommandIDs.openLayerBrowser, Object.assign({ label: trans.__('Open Layer Browser'), isEnabled: () => {
+    commands.addCommand(CommandIDs.openLayerBrowser, Object.assign({ label: trans.__('Open Layer Browser'), caption: 'Open the layer browser dialog to browse and add available layers to the current JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -196,7 +267,12 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     /**
      * Source and layers
      */
-    commands.addCommand(CommandIDs.newRasterEntry, Object.assign({ label: trans.__('New Raster Tile Layer'), isEnabled: () => {
+    commands.addCommand(CommandIDs.openNewRasterDialog, Object.assign({ label: trans.__('Open New Raster Tile Layer Creation Dialog'), caption: 'Open a dialog to create a new raster tile layer and source in the current JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -206,15 +282,16 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             title: 'Create Raster Tile Layer',
             createLayer: true,
             createSource: true,
-            sourceData: {
-                minZoom: 0,
-                maxZoom: 24,
-            },
             layerData: { name: 'Custom Raster Tile Layer' },
             sourceType: 'RasterSource',
             layerType: 'RasterLayer',
-        }) }, icons.get(CommandIDs.newRasterEntry)));
-    commands.addCommand(CommandIDs.newVectorTileEntry, Object.assign({ label: trans.__('New Vector Tile Layer'), isEnabled: () => {
+        }) }, icons.get(CommandIDs.openNewRasterDialog)));
+    commands.addCommand(CommandIDs.openNewVectorTileDialog, Object.assign({ label: trans.__('Open New Vector Tile Layer Creation Dialog'), caption: 'Open a dialog to create a new vector tile layer and source in the current JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -224,12 +301,16 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             title: 'Create Vector Tile Layer',
             createLayer: true,
             createSource: true,
-            sourceData: { minZoom: 0, maxZoom: 24 },
             layerData: { name: 'Custom Vector Tile Layer' },
             sourceType: 'VectorTileSource',
             layerType: 'VectorTileLayer',
-        }) }, icons.get(CommandIDs.newVectorTileEntry)));
-    commands.addCommand(CommandIDs.newGeoParquetEntry, Object.assign({ label: trans.__('New GeoParquet Layer'), isEnabled: () => {
+        }) }, icons.get(CommandIDs.openNewVectorTileDialog)));
+    commands.addCommand(CommandIDs.openNewGeoParquetDialog, Object.assign({ label: trans.__('Open New GeoParquet Layer Creation Dialog'), caption: 'Open a dialog to create a new GeoParquet layer and source in the current JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -243,8 +324,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             layerData: { name: 'Custom GeoParquet Layer' },
             sourceType: 'GeoParquetSource',
             layerType: 'VectorLayer',
-        }) }, icons.get(CommandIDs.newGeoParquetEntry)));
-    commands.addCommand(CommandIDs.newGeoJSONEntry, Object.assign({ label: trans.__('New GeoJSON layer'), isEnabled: () => {
+        }) }, icons.get(CommandIDs.openNewGeoParquetDialog)));
+    commands.addCommand(CommandIDs.openNewGeoJSONDialog, Object.assign({ label: trans.__('Open New GeoJSON Layer Creation Dialog'), caption: 'Open a dialog to create a new GeoJSON layer and source in the current JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -257,10 +343,15 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             layerData: { name: 'Custom GeoJSON Layer' },
             sourceType: 'GeoJSONSource',
             layerType: 'VectorLayer',
-        }) }, icons.get(CommandIDs.newGeoJSONEntry)));
+        }) }, icons.get(CommandIDs.openNewGeoJSONDialog)));
     //Add processing commands
-    addProcessingCommands(app, commands, tracker, trans, formSchemaRegistry);
-    commands.addCommand(CommandIDs.newHillshadeEntry, Object.assign({ label: trans.__('New Hillshade layer'), isEnabled: () => {
+    addProcessingCommands(app, commands, tracker, trans, formSchemaRegistry, Object.fromEntries(formSchemaRegistry.getSchemas()));
+    commands.addCommand(CommandIDs.openNewHillshadeDialog, Object.assign({ label: trans.__('Open New Hillshade Layer Creation Dialog'), caption: 'Open a dialog to create a new hillshade layer and source in the current JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -273,8 +364,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             layerData: { name: 'Custom Hillshade Layer' },
             sourceType: 'RasterDemSource',
             layerType: 'HillshadeLayer',
-        }) }, icons.get(CommandIDs.newHillshadeEntry)));
-    commands.addCommand(CommandIDs.newImageEntry, Object.assign({ label: trans.__('New Image layer'), isEnabled: () => {
+        }) }, icons.get(CommandIDs.openNewHillshadeDialog)));
+    commands.addCommand(CommandIDs.openNewImageDialog, Object.assign({ label: trans.__('Open New Image Layer Creation Dialog'), caption: 'Open a dialog to create a new image layer and source in the current JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -297,8 +393,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             layerData: { name: 'Custom Image Layer' },
             sourceType: 'ImageSource',
             layerType: 'ImageLayer',
-        }) }, icons.get(CommandIDs.newImageEntry)));
-    commands.addCommand(CommandIDs.newVideoEntry, Object.assign({ label: trans.__('New Video layer'), isEnabled: () => {
+        }) }, icons.get(CommandIDs.openNewImageDialog)));
+    commands.addCommand(CommandIDs.openNewVideoDialog, Object.assign({ label: trans.__('Open New Video Layer Creation Dialog'), caption: 'Open a dialog to create a new video layer and source in the current JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -324,8 +425,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             layerData: { name: 'Custom Video Layer' },
             sourceType: 'VideoSource',
             layerType: 'RasterLayer',
-        }) }, icons.get(CommandIDs.newVideoEntry)));
-    commands.addCommand(CommandIDs.newGeoTiffEntry, Object.assign({ label: trans.__('New GeoTiff layer'), isEnabled: () => {
+        }) }, icons.get(CommandIDs.openNewVideoDialog)));
+    commands.addCommand(CommandIDs.openNewGeoTiffDialog, Object.assign({ label: trans.__('Open New GeoTiff Layer Creation Dialog'), caption: 'Open a dialog to create a new GeoTiff layer and source in the current JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -342,8 +448,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             layerData: { name: 'Custom GeoTiff Layer' },
             sourceType: 'GeoTiffSource',
             layerType: 'WebGlLayer',
-        }) }, icons.get(CommandIDs.newGeoTiffEntry)));
-    commands.addCommand(CommandIDs.newShapefileEntry, Object.assign({ label: trans.__('New Shapefile Layer'), isEnabled: () => {
+        }) }, icons.get(CommandIDs.openNewGeoTiffDialog)));
+    commands.addCommand(CommandIDs.openNewShapefileDialog, Object.assign({ label: trans.__('Open New Shapefile Layer Creation Dialog'), caption: 'Open a dialog to create a new shapefile layer and source in the current JupyterGIS document.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -357,19 +468,16 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             layerData: { name: 'Custom Shapefile Layer' },
             sourceType: 'ShapefileSource',
             layerType: 'VectorLayer',
-        }) }, icons.get(CommandIDs.newShapefileEntry)));
+        }) }, icons.get(CommandIDs.openNewShapefileDialog)));
     /**
      * LAYERS and LAYER GROUP actions.
      */
-    commands.addCommand(CommandIDs.renameSelected, {
-        label: trans.__('Rename'),
-        isEnabled: () => {
+    commands.addCommand(CommandIDs.renameSelected, Object.assign({ label: trans.__('Rename'), isEnabled: () => {
             var _a, _b, _c;
             const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
             const selected = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
             return !!selected && Object.keys(selected).length === 1;
-        },
-        execute: async () => {
+        }, execute: async () => {
             var _a, _b, _c;
             const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
             const selected = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
@@ -377,17 +485,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
                 return;
             }
             await Private.renameSelectedItem(model);
-        },
-    });
-    commands.addCommand(CommandIDs.removeSelected, {
-        label: trans.__('Remove'),
-        isEnabled: () => {
+        } }, icons.get(CommandIDs.renameSelected)));
+    commands.addCommand(CommandIDs.removeSelected, Object.assign({ label: trans.__('Remove'), isEnabled: () => {
             var _a, _b, _c;
             const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
             const selected = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
             return !!selected && Object.keys(selected).length > 0;
-        },
-        execute: async () => {
+        }, execute: async () => {
             var _a, _b, _c;
             const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
             const selected = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
@@ -395,27 +499,117 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
                 return;
             }
             await Private.removeSelectedItems(model);
+        } }, icons.get(CommandIDs.removeSelected)));
+    commands.addCommand(CommandIDs.duplicateSelected, {
+        label: trans.__('Duplicate'),
+        isEnabled: () => {
+            var _a, _b, _c;
+            const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
+            const selected = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
+            if (!selected) {
+                return false;
+            }
+            return Object.values(selected).some(item => item.type === 'layer');
         },
-    });
-    commands.addCommand(CommandIDs.moveLayersToGroup, {
-        label: args => args['label'] ? args['label'] : trans.__('Move to Root'),
-        execute: args => {
+        execute: () => {
             var _a, _b, _c;
             const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
-            const groupName = args['label'];
-            const selectedLayers = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
+            const selected = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
+            if (!model || !selected) {
+                return;
+            }
+            for (const [layerId, selectedItem] of Object.entries(selected)) {
+                if (selectedItem.type !== 'layer') {
+                    continue;
+                }
+                const layer = model.getLayer(layerId);
+                if (!layer) {
+                    continue;
+                }
+                const clonedLayer = Object.assign(Object.assign({}, layer), { name: Private.generateCopyName(layer.name, model) });
+                model.addLayer(UUID.uuid4(), clonedLayer);
+            }
+        },
+    });
+    commands.addCommand(CommandIDs.moveSelectedToGroup, {
+        label: args => args['label']
+            ? args['label']
+            : trans.__('Move Selection to Root Group'),
+        caption: 'Group layers together in a new group with name "groupName" for the JupyterGIS document "filepath"',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {
+                    label: { type: 'string' },
+                    filePath: { type: 'string' },
+                    layerIds: {
+                        type: 'array',
+                        items: { type: 'string' },
+                    },
+                    groupName: { type: 'string' },
+                },
+            },
+        },
+        execute: (args) => {
+            var _a, _b, _c, _d;
+            const { filePath, layerIds, groupName } = args !== null && args !== void 0 ? args : {};
+            // Resolve model based on filePath or current widget
+            const model = filePath
+                ? (_a = tracker.find(w => w.model.filePath === filePath)) === null || _a === void 0 ? void 0 : _a.model
+                : (_b = tracker.currentWidget) === null || _b === void 0 ? void 0 : _b.model;
+            if (!model || !model.sharedModel.editable) {
+                return;
+            }
+            if (filePath && layerIds && groupName !== undefined) {
+                model.moveItemsToGroup(layerIds, groupName);
+                return;
+            }
+            const selectedLayers = (_d = (_c = model.localState) === null || _c === void 0 ? void 0 : _c.selected) === null || _d === void 0 ? void 0 : _d.value;
             if (!selectedLayers) {
                 return;
             }
-            model.moveItemsToGroup(Object.keys(selectedLayers), groupName);
+            const targetGroup = args === null || args === void 0 ? void 0 : args.label;
+            model.moveItemsToGroup(Object.keys(selectedLayers), targetGroup);
         },
     });
-    commands.addCommand(CommandIDs.moveLayerToNewGroup, {
-        label: trans.__('Move Selected Layers to New Group'),
-        execute: async () => {
-            var _a, _b, _c;
-            const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
-            const selectedLayers = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
+    commands.addCommand(CommandIDs.moveSelectedToNewGroup, {
+        label: trans.__('Move Selection to New Group'),
+        caption: 'Move selected layers to a new group in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {
+                    filePath: { type: 'string' },
+                    groupName: { type: 'string' },
+                    layerIds: {
+                        type: 'array',
+                        items: { type: 'string' },
+                    },
+                },
+            },
+        },
+        execute: async (args) => {
+            var _a, _b, _c, _d;
+            const { filePath, groupName, layerIds } = args !== null && args !== void 0 ? args : {};
+            const model = filePath
+                ? (_a = tracker.find(w => w.model.filePath === filePath)) === null || _a === void 0 ? void 0 : _a.model
+                : (_b = tracker.currentWidget) === null || _b === void 0 ? void 0 : _b.model;
+            if (!model || !model.sharedModel.editable) {
+                return;
+            }
+            if (filePath && groupName && layerIds) {
+                const layerMap = {};
+                layerIds.forEach(id => {
+                    layerMap[id] = { type: 'layer', selectedNodeId: id };
+                });
+                const newGroup = {
+                    name: groupName,
+                    layers: layerIds,
+                };
+                model.addNewLayerGroup(layerMap, newGroup);
+                return;
+            }
+            const selectedLayers = (_d = (_c = model.localState) === null || _c === void 0 ? void 0 : _c.selected) === null || _d === void 0 ? void 0 : _d.value;
             if (!selectedLayers) {
                 return;
             }
@@ -464,28 +658,16 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             model.addNewLayerGroup(selectedLayers, newLayerGroup);
         },
     });
-    /**
-     * Source actions
-     */
-    commands.addCommand(CommandIDs.renameSource, {
-        label: trans.__('Rename Source'),
-        execute: async () => {
-            var _a;
-            const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
-            await Private.renameSelectedItem(model);
-        },
-    });
-    commands.addCommand(CommandIDs.removeSource, {
-        label: trans.__('Remove Source'),
-        execute: () => {
-            var _a;
-            const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
-            Private.removeSelectedSources(model);
-        },
-    });
     // Console commands
     commands.addCommand(CommandIDs.toggleConsole, {
         label: trans.__('Toggle console'),
+        caption: 'Toggle the console in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isVisible: () => tracker.currentWidget instanceof JupyterGISDocumentWidget,
         isEnabled: () => {
             return tracker.currentWidget
@@ -508,6 +690,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     });
     commands.addCommand(CommandIDs.executeConsole, {
         label: trans.__('Execute console'),
+        caption: 'Execute the console in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isVisible: () => tracker.currentWidget instanceof JupyterGISDocumentWidget,
         isEnabled: () => {
             return tracker.currentWidget
@@ -518,6 +707,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     });
     commands.addCommand(CommandIDs.removeConsole, {
         label: trans.__('Remove console'),
+        caption: 'Remove the console from the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isVisible: () => tracker.currentWidget instanceof JupyterGISDocumentWidget,
         isEnabled: () => {
             return tracker.currentWidget
@@ -528,6 +724,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     });
     commands.addCommand(CommandIDs.invokeCompleter, {
         label: trans.__('Display the completion helper.'),
+        caption: 'Display the completion helper in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isVisible: () => tracker.currentWidget instanceof JupyterGISDocumentWidget,
         execute: () => {
             var _a;
@@ -545,6 +748,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     });
     commands.addCommand(CommandIDs.selectCompleter, {
         label: trans.__('Select the completion suggestion.'),
+        caption: 'Select the completion suggestion in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isVisible: () => tracker.currentWidget instanceof JupyterGISDocumentWidget,
         execute: () => {
             var _a;
@@ -562,37 +772,98 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     });
     commands.addCommand(CommandIDs.zoomToLayer, {
         label: trans.__('Zoom to Layer'),
-        execute: () => {
-            var _a;
-            const currentWidget = tracker.currentWidget;
-            if (!currentWidget || !completionProviderManager) {
+        caption: 'Zoom to the selected layer in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {
+                    filePath: { type: 'string' },
+                    layerId: { type: 'string' },
+                },
+            },
+        },
+        execute: (args) => {
+            var _a, _b;
+            const { filePath, layerId } = args !== null && args !== void 0 ? args : {};
+            // Determine model from provided file path or fallback to current widget
+            const current = filePath
+                ? tracker.find(w => w.model.filePath === filePath)
+                : tracker.currentWidget;
+            if (!current || !current.model.sharedModel.editable) {
+                return;
+            }
+            const model = current.model;
+            if (filePath && layerId) {
+                model.centerOnPosition(layerId);
                 return;
             }
-            const model = tracker.currentWidget.model;
-            const selectedItems = (_a = model.localState) === null || _a === void 0 ? void 0 : _a.selected.value;
+            const selectedItems = (_b = (_a = model.localState) === null || _a === void 0 ? void 0 : _a.selected) === null || _b === void 0 ? void 0 : _b.value;
             if (!selectedItems) {
                 return;
             }
-            const layerId = Object.keys(selectedItems)[0];
-            model.centerOnPosition(layerId);
+            const selLayerId = Object.keys(selectedItems)[0];
+            model.centerOnPosition(selLayerId);
         },
     });
     commands.addCommand(CommandIDs.downloadGeoJSON, {
         label: trans.__('Download as GeoJSON'),
+        caption: 'Download the selected layer as a GeoJSON file in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {
+                    filePath: { type: 'string' },
+                    layerId: { type: 'string' },
+                    exportFileName: { type: 'string' },
+                },
+            },
+        },
         isEnabled: () => {
-            const selectedLayer = getSingleSelectedLayer(tracker);
-            return selectedLayer
-                ? ['VectorLayer', 'ShapefileLayer'].includes(selectedLayer.type)
-                : false;
+            const layer = getSingleSelectedLayer(tracker);
+            return !!layer && ['VectorLayer', 'ShapefileLayer'].includes(layer.type);
         },
-        execute: async () => {
-            var _a, _b;
+        execute: async (args) => {
+            var _a;
+            const exportLayer = async (model, layer, exportFileName) => {
+                var _a, _b;
+                if (!['VectorLayer', 'ShapefileLayer'].includes(layer.type)) {
+                    console.warn('Layer type not supported for GeoJSON export');
+                    return;
+                }
+                const sources = (_a = model.sharedModel.sources) !== null && _a !== void 0 ? _a : {};
+                const sourceId = (_b = layer.parameters) === null || _b === void 0 ? void 0 : _b.source;
+                const source = sources[sourceId];
+                if (!source) {
+                    console.warn('Source not found for selected layer');
+                    return;
+                }
+                const geojsonString = await getGeoJSONDataFromLayerSource(source, model);
+                if (!geojsonString) {
+                    console.warn('Failed to generate GeoJSON data');
+                    return;
+                }
+                downloadFile(geojsonString, `${exportFileName}.geojson`, 'application/geo+json');
+            };
+            const { filePath, layerId, exportFileName } = args !== null && args !== void 0 ? args : {};
+            if (filePath && layerId && exportFileName) {
+                const widget = tracker.find(w => w.model.filePath === filePath);
+                if (!widget || !widget.model.sharedModel.editable) {
+                    console.warn('Invalid or non-editable document');
+                    return;
+                }
+                const model = widget.model;
+                const layer = model.getLayer(layerId);
+                if (!layer) {
+                    console.warn('Layer not found');
+                    return;
+                }
+                return exportLayer(model, layer, exportFileName);
+            }
             const selectedLayer = getSingleSelectedLayer(tracker);
-            if (!selectedLayer) {
+            const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
+            if (!selectedLayer || !model) {
                 return;
             }
-            const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
-            const sources = (_b = model.sharedModel.sources) !== null && _b !== void 0 ? _b : {};
             const exportSchema = Object.assign({}, formSchemaRegistry
                 .getSchemas()
                 .get('ExportGeoJSONSchema'));
@@ -614,21 +885,31 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             if (!formValues || !selectedLayer.parameters) {
                 return;
             }
-            const exportFileName = formValues.exportFileName;
-            const sourceId = selectedLayer.parameters.source;
-            const source = sources[sourceId];
-            const geojsonString = await getGeoJSONDataFromLayerSource(source, model);
-            if (!geojsonString) {
-                return;
-            }
-            downloadFile(geojsonString, `${exportFileName}.geojson`, 'application/geo+json');
+            return exportLayer(model, selectedLayer, formValues.exportFileName);
         },
     });
     commands.addCommand(CommandIDs.getGeolocation, {
         label: trans.__('Center on Geolocation'),
-        execute: async () => {
-            var _a;
-            const viewModel = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
+        caption: "Center the map on the user's current geolocation.",
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {
+                    filePath: { type: 'string' },
+                },
+            },
+        },
+        execute: async (args) => {
+            const { filePath } = args !== null && args !== void 0 ? args : {};
+            // Resolve widget once
+            const current = filePath
+                ? tracker.find(w => w.model.filePath === filePath)
+                : tracker.currentWidget;
+            if (!current) {
+                console.warn('No document found');
+                return;
+            }
+            const viewModel = current.model;
             const options = {
                 enableHighAccuracy: true,
                 timeout: 5000,
@@ -639,16 +920,14 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
                     pos.coords.longitude,
                     pos.coords.latitude,
                 ]);
-                const Jgislocation = {
+                const jgisLocation = {
                     x: location[0],
                     y: location[1],
                 };
-                if (viewModel) {
-                    viewModel.geolocationChanged.emit(Jgislocation);
-                }
+                viewModel.geolocationChanged.emit(jgisLocation);
             };
             const error = (err) => {
-                console.warn(`ERROR(${err.code}): ${err.message}`);
+                console.warn(`Geolocation error (${err.code}): ${err.message}`);
             };
             navigator.geolocation.getCurrentPosition(success, error, options);
         },
@@ -657,6 +936,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     // Panel visibility commands
     commands.addCommand(CommandIDs.toggleLeftPanel, {
         label: trans.__('Toggle Left Panel'),
+        caption: 'Toggle the left panel in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isEnabled: () => Boolean(tracker.currentWidget),
         isToggled: () => {
             const current = tracker.currentWidget;
@@ -681,6 +967,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     });
     commands.addCommand(CommandIDs.toggleRightPanel, {
         label: trans.__('Toggle Right Panel'),
+        caption: 'Toggle the right panel in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isEnabled: () => Boolean(tracker.currentWidget),
         isToggled: () => {
             const current = tracker.currentWidget;
@@ -706,6 +999,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     // Left panel tabs
     commands.addCommand(CommandIDs.showLayersTab, {
         label: trans.__('Show Layers Tab'),
+        caption: 'Show the layers tab in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isEnabled: () => Boolean(tracker.currentWidget),
         isToggled: () => tracker.currentWidget
             ? !tracker.currentWidget.model.jgisSettings.layersDisabled
@@ -724,6 +1024,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     });
     commands.addCommand(CommandIDs.showStacBrowserTab, {
         label: trans.__('Show STAC Browser Tab'),
+        caption: 'Show the STAC browser tab in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isEnabled: () => Boolean(tracker.currentWidget),
         isToggled: () => tracker.currentWidget
             ? !tracker.currentWidget.model.jgisSettings.stacBrowserDisabled
@@ -742,6 +1049,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     });
     commands.addCommand(CommandIDs.showFiltersTab, {
         label: trans.__('Show Filters Tab'),
+        caption: 'Show the filters tab in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isEnabled: () => Boolean(tracker.currentWidget),
         isToggled: () => tracker.currentWidget
             ? !tracker.currentWidget.model.jgisSettings.filtersDisabled
@@ -761,6 +1075,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     // Right panel tabs
     commands.addCommand(CommandIDs.showObjectPropertiesTab, {
         label: trans.__('Show Object Properties Tab'),
+        caption: 'Show the object properties tab in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isEnabled: () => Boolean(tracker.currentWidget),
         isToggled: () => tracker.currentWidget
             ? !tracker.currentWidget.model.jgisSettings.objectPropertiesDisabled
@@ -779,6 +1100,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     });
     commands.addCommand(CommandIDs.showAnnotationsTab, {
         label: trans.__('Show Annotations Tab'),
+        caption: 'Show the annotations tab in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isEnabled: () => Boolean(tracker.currentWidget),
         isToggled: () => tracker.currentWidget
             ? !tracker.currentWidget.model.jgisSettings.annotationsDisabled
@@ -797,6 +1125,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     });
     commands.addCommand(CommandIDs.showIdentifyPanelTab, {
         label: trans.__('Show Identify Panel Tab'),
+        caption: 'Show the identify panel tab in the current JupyterGIS document.',
+        describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        },
         isEnabled: () => Boolean(tracker.currentWidget),
         isToggled: () => tracker.currentWidget
             ? !tracker.currentWidget.model.jgisSettings.identifyDisabled
@@ -871,6 +1206,63 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             current.model.setOptions(Object.assign(Object.assign({}, currentOptions), { storyMapPresentationMode: !currentOptions.storyMapPresentationMode }));
             commands.notifyCommandChanged(CommandIDs.toggleStoryPresentationMode);
         } }, icons.get(CommandIDs.toggleStoryPresentationMode)));
+    /* Needs to be enabled in Specta mode, so add without Specta-aware wrapper */
+    originalAddCommand(CommandIDs.storyPrev, {
+        label: trans.__('Previous Story Segment'),
+        isEnabled: () => {
+            var _a, _b;
+            const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
+            const storySegments = (_b = model === null || model === void 0 ? void 0 : model.getSelectedStory().story) === null || _b === void 0 ? void 0 : _b.storySegments;
+            if (!model ||
+                model.jgisSettings.storyMapsDisabled ||
+                !storySegments ||
+                storySegments.length < 1) {
+                return false;
+            }
+            if (!model.isSpectaMode()) {
+                return false;
+            }
+            return model.getCurrentSegmentIndex() > 0;
+        },
+        execute: () => {
+            var _a, _b;
+            const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
+            if (!model) {
+                return;
+            }
+            const current = (_b = model.getCurrentSegmentIndex()) !== null && _b !== void 0 ? _b : 0;
+            model.setCurrentSegmentIndex(current - 1);
+        },
+    });
+    originalAddCommand(CommandIDs.storyNext, {
+        label: trans.__('Next Story Segment'),
+        isEnabled: () => {
+            var _a, _b, _c;
+            const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
+            const storySegments = (_b = model === null || model === void 0 ? void 0 : model.getSelectedStory().story) === null || _b === void 0 ? void 0 : _b.storySegments;
+            if (!model ||
+                model.jgisSettings.storyMapsDisabled ||
+                !storySegments ||
+                storySegments.length < 1) {
+                return false;
+            }
+            const isSpecta = model.isSpectaMode();
+            if (!isSpecta) {
+                return false;
+            }
+            const current = (_c = model.getCurrentSegmentIndex()) !== null && _c !== void 0 ? _c : 0;
+            return current < storySegments.length - 1;
+        },
+        execute: () => {
+            var _a, _b;
+            const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
+            if (!model) {
+                return;
+            }
+            const current = (_b = model.getCurrentSegmentIndex()) !== null && _b !== void 0 ? _b : 0;
+            model.setCurrentSegmentIndex(current + 1);
+        },
+    });
     loadKeybindings(commands, keybindings);
 }
 var Private;
@@ -964,21 +1356,6 @@ var Private;
         model.setEditingItem(item.type, itemId);
     }
     Private.renameSelectedItem = renameSelectedItem;
-    function removeSelectedSources(model) {
-        var _a, _b;
-        const selected = (_b = (_a = model === null || model === void 0 ? void 0 : model.localState) === null || _a === void 0 ? void 0 : _a.selected) === null || _b === void 0 ? void 0 : _b.value;
-        if (!selected || !model) {
-            return;
-        }
-        for (const id of Object.keys(selected)) {
-            if (model.getLayersBySource(id).length > 0) {
-                showErrorMessage('Remove source error', 'The source is used by a layer.');
-                continue;
-            }
-            model.sharedModel.removeSource(id);
-        }
-    }
-    Private.removeSelectedSources = removeSelectedSources;
     function executeConsole(tracker) {
         const current = tracker.currentWidget;
         if (!current || !(current instanceof JupyterGISDocumentWidget)) {
@@ -1003,4 +1380,25 @@ var Private;
         await current.content.toggleConsole(current.model.filePath);
     }
     Private.toggleConsole = toggleConsole;
+    function generateCopyName(baseName, model) {
+        const layers = model.getLayers();
+        const existingNames = Object.values(layers).map(l => l.name);
+        const copyRegex = /(.*?)( Copy(_\d+)?)?$/;
+        const match = baseName.match(copyRegex);
+        const cleanBase = match ? match[1].trim() : baseName;
+        const firstCopyName = `${cleanBase} Copy`;
+        if (!existingNames.includes(firstCopyName)) {
+            return firstCopyName;
+        }
+        const pattern = new RegExp(`^${cleanBase} Copy_(\\d+)$`);
+        const numbers = existingNames
+            .map(name => {
+            const m = name.match(pattern);
+            return m ? parseInt(m[1], 10) : null;
+        })
+            .filter((n) => n !== null);
+        const nextNumber = numbers.length > 0 ? Math.max(...numbers) + 1 : 1;
+        return `${cleanBase} Copy_${nextNumber}`;
+    }
+    Private.generateCopyName = generateCopyName;
 })(Private || (Private = {}));