@jupytergis/base 0.15.0 → 0.16.0-alpha.1

package/lib/commands/BaseCommandIDs.d.ts

@@ -17,6 +17,9 @@ export declare const openNewImageDialog = "jupytergis:openNewImageDialog";
 export declare const openNewVideoDialog = "jupytergis:openNewVideoDialog";
 export declare const openNewGeoTiffDialog = "jupytergis:openNewGeoTiffDialog";
 export declare const openNewGeoParquetDialog = "jupytergis:openNewGeoParquetDialog";
+export declare const newGeoPackageRasterEntry = "jupytergis:newGeoPackageRasterEntry";
+export declare const newGeoPackageVectorEntry = "jupytergis:newGeoPackageVectorEntry";
+export declare const toggleDrawFeatures = "jupytergis:toggleDrawFeatures";
 export declare const renameSelected = "jupytergis:renameSelected";
 export declare const removeSelected = "jupytergis:removeSelected";
 export declare const duplicateSelected = "jupytergis:duplicateSelected";
@@ -32,6 +35,7 @@ export declare const zoomToLayer = "jupytergis:zoomToLayer";
 export declare const downloadGeoJSON = "jupytergis:downloadGeoJSON";
 export declare const toggleLeftPanel = "jupytergis:toggleLeftPanel";
 export declare const toggleRightPanel = "jupytergis:toggleRightPanel";
+export declare const togglePanel = "jupytergis:togglePanel";
 export declare const showLayersTab = "jupytergis:showLayersTab";
 export declare const showStacBrowserTab = "jupytergis:showStacBrowserTab";
 export declare const showObjectPropertiesTab = "jupytergis:showObjectPropertiesTab";
@@ -39,5 +43,6 @@ export declare const showAnnotationsTab = "jupytergis:showAnnotationsTab";
 export declare const showIdentifyPanelTab = "jupytergis:showIdentifyPanelTab";
 export declare const addStorySegment = "jupytergis:addStorySegment";
 export declare const toggleStoryPresentationMode = "jupytergis:toggleStoryPresentationMode";
+export declare const createStorySegmentFromLayer = "jupytergis:createStorySegmentFromLayer";
 export declare const storyPrev = "jupytergis:storyPrev";
 export declare const storyNext = "jupytergis:storyNext";

package/lib/commands/BaseCommandIDs.js

@@ -25,6 +25,9 @@ export const openNewImageDialog = 'jupytergis:openNewImageDialog';
 export const openNewVideoDialog = 'jupytergis:openNewVideoDialog';
 export const openNewGeoTiffDialog = 'jupytergis:openNewGeoTiffDialog';
 export const openNewGeoParquetDialog = 'jupytergis:openNewGeoParquetDialog';
+export const newGeoPackageRasterEntry = 'jupytergis:newGeoPackageRasterEntry';
+export const newGeoPackageVectorEntry = 'jupytergis:newGeoPackageVectorEntry';
+export const toggleDrawFeatures = 'jupytergis:toggleDrawFeatures';
 // Layer and group actions
 export const renameSelected = 'jupytergis:renameSelected';
 export const removeSelected = 'jupytergis:removeSelected';
@@ -44,6 +47,7 @@ export const downloadGeoJSON = 'jupytergis:downloadGeoJSON';
 // Panel toggles
 export const toggleLeftPanel = 'jupytergis:toggleLeftPanel';
 export const toggleRightPanel = 'jupytergis:toggleRightPanel';
+export const togglePanel = 'jupytergis:togglePanel';
 // Left panel tabs
 export const showLayersTab = 'jupytergis:showLayersTab';
 export const showStacBrowserTab = 'jupytergis:showStacBrowserTab';
@@ -54,5 +58,6 @@ export const showIdentifyPanelTab = 'jupytergis:showIdentifyPanelTab';
 // Story maps
 export const addStorySegment = 'jupytergis:addStorySegment';
 export const toggleStoryPresentationMode = 'jupytergis:toggleStoryPresentationMode';
+export const createStorySegmentFromLayer = 'jupytergis:createStorySegmentFromLayer';
 export const storyPrev = 'jupytergis:storyPrev';
 export const storyNext = 'jupytergis:storyNext';

package/lib/commands/index.js

@@ -1,18 +1,18 @@
 import { UUID } from '@lumino/coreutils';
 import { fromLonLat } from 'ol/proj';
+import { targetWithCenterIcon } from "../shared/icons";
+import { addLayerCreationCommands } from './operationCommands';
 import { CommandIDs, icons } from '../constants';
-import { ProcessingFormDialog } from '../dialogs/ProcessingFormDialog';
-import { LayerBrowserWidget } from '../dialogs/layerBrowserDialog';
-import { LayerCreationFormDialog } from '../dialogs/layerCreationFormDialog';
-import { SymbologyWidget } from '../dialogs/symbology/symbologyDialog';
-import { targetWithCenterIcon } from '../icons';
+import { LayerBrowserWidget } from '../features/layer-browser';
+import { LayerCreationFormDialog } from '../features/layers/layerCreationFormDialog';
+import { SymbologyWidget } from '../features/layers/symbology/symbologyDialog';
+import { ProcessingFormDialog } from '../features/processing/ProcessingFormDialog';
+import { getSingleSelectedLayer } from '../features/processing/index';
+import { addProcessingCommands } from '../features/processing/processingCommands';
 import keybindings from '../keybindings.json';
-import { getSingleSelectedLayer } from '../processing/index';
-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';
+import { STORY_TYPE, SYMBOLOGY_VALID_LAYER_TYPES, } from '../types';
+import { JupyterGISDocumentWidget } from '../workspace/widget';
 const POINT_SELECTION_TOOL_CLASS = 'jGIS-point-selection-tool';
 function loadKeybindings(commands, keybindings) {
     keybindings.forEach(binding => {
@@ -156,7 +156,7 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             const canIdentify = [
                 'VectorLayer',
                 'ShapefileLayer',
-                'WebGlLayer',
+                'GeoTiffLayer',
                 'VectorTileLayer',
             ].includes(selectedLayer.type);
             if (current.model.currentMode === 'identifying' && !canIdentify) {
@@ -177,7 +177,7 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             return [
                 'VectorLayer',
                 'ShapefileLayer',
-                'WebGlLayer',
+                'GeoTiffLayer',
                 'VectorTileLayer',
             ].includes(selectedLayer.type);
         }, execute: args => {
@@ -230,16 +230,9 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             if (!layerType) {
                 return false;
             }
-            // Selection should only be one vector or heatmap layer
-            const isSelectionValid = Object.keys(selectedLayers).length === 1 &&
+            return (Object.keys(selectedLayers).length === 1 &&
                 !model.getSource(layerId) &&
-                ['VectorLayer', 'HeatmapLayer'].includes(layerType);
-            if (!isSelectionValid && model.isTemporalControllerActive) {
-                model.toggleTemporalController();
-                commands.notifyCommandChanged(CommandIDs.temporalController);
-                return false;
-            }
-            return true;
+                layerType === 'VectorLayer');
         }, execute: (args) => {
             const filePath = args === null || args === void 0 ? void 0 : args.filePath;
             const current = filePath
@@ -361,7 +354,7 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             createSource: true,
             layerData: { name: 'Custom WMS Layer' },
             sourceType: 'WmsTileSource',
-            layerType: 'WebGlLayer',
+            layerType: 'GeoTiffLayer',
         }) }, icons.get(CommandIDs.openNewWmsDialog)));
     //Add processing commands
     addProcessingCommands(app, commands, tracker, trans, formSchemaRegistry, Object.fromEntries(formSchemaRegistry.getSchemas()));
@@ -466,7 +459,7 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             },
             layerData: { name: 'Custom GeoTiff Layer' },
             sourceType: 'GeoTiffSource',
-            layerType: 'WebGlLayer',
+            layerType: 'GeoTiffLayer',
         }) }, icons.get(CommandIDs.openNewGeoTiffDialog)));
     commands.addCommand(CommandIDs.openNewShapefileDialog, Object.assign({ label: trans.__('Shapefile'), caption: 'Open a dialog to create a new shapefile layer and source in the current JupyterGIS document.', describedBy: {
             args: {
@@ -488,6 +481,36 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             sourceType: 'ShapefileSource',
             layerType: 'VectorLayer',
         }) }, icons.get(CommandIDs.openNewShapefileDialog)));
+    commands.addCommand(CommandIDs.newGeoPackageVectorEntry, Object.assign({ label: trans.__('GeoPackage'), isEnabled: () => {
+            return tracker.currentWidget
+                ? tracker.currentWidget.model.sharedModel.editable
+                : false;
+        }, execute: Private.createEntry({
+            tracker,
+            formSchemaRegistry,
+            title: 'Create GeoPackage Layer',
+            createLayer: true,
+            createSource: true,
+            sourceData: { name: 'Custom GeoPackage Vector Source' },
+            layerData: { name: 'Custom GeoPackage Vector Layer' },
+            sourceType: 'GeoPackageVectorSource',
+            layerType: 'VectorLayer',
+        }) }, icons.get(CommandIDs.newGeoPackageVectorEntry)));
+    commands.addCommand(CommandIDs.newGeoPackageRasterEntry, Object.assign({ label: trans.__('GeoPackage'), isEnabled: () => {
+            return tracker.currentWidget
+                ? tracker.currentWidget.model.sharedModel.editable
+                : false;
+        }, execute: Private.createEntry({
+            tracker,
+            formSchemaRegistry,
+            title: 'Create GeoPackage Layer',
+            createLayer: true,
+            createSource: true,
+            sourceData: { name: 'Custom GeoPackage Raster Source' },
+            layerData: { name: 'Custom GeoPackage Raster Layer' },
+            sourceType: 'GeoPackageRasterSource',
+            layerType: 'RasterLayer',
+        }) }, icons.get(CommandIDs.newGeoPackageRasterEntry)));
     /**
      * LAYERS and LAYER GROUP actions.
      */
@@ -965,23 +988,21 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
         isEnabled: () => Boolean(tracker.currentWidget),
         isToggled: () => {
             const current = tracker.currentWidget;
-            return current ? !current.model.jgisSettings.leftPanelDisabled : false;
+            if (!current) {
+                return false;
+            }
+            const open = current.model.getUIState().leftPanelOpen;
+            return open !== false;
         },
-        execute: async () => {
-            var _a, _b, _c;
+        execute: () => {
             const current = tracker.currentWidget;
             if (!current) {
                 return;
             }
-            try {
-                const settings = await current.model.getSettings();
-                const currentValue = (_c = (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.composite) === null || _a === void 0 ? void 0 : _a.leftPanelDisabled) !== null && _b !== void 0 ? _b : current.model.jgisSettings.leftPanelDisabled) !== null && _c !== void 0 ? _c : false;
-                await (settings === null || settings === void 0 ? void 0 : settings.set('leftPanelDisabled', !currentValue));
-                commands.notifyCommandChanged(CommandIDs.toggleLeftPanel);
-            }
-            catch (err) {
-                console.error('Failed to toggle Left Panel:', err);
-            }
+            const open = current.model.getUIState().leftPanelOpen;
+            current.model.setUIState({ leftPanelOpen: open === false });
+            commands.notifyCommandChanged(CommandIDs.toggleLeftPanel);
+            commands.notifyCommandChanged(CommandIDs.togglePanel);
         },
     });
     commands.addCommand(CommandIDs.toggleRightPanel, {
@@ -996,23 +1017,58 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
         isEnabled: () => Boolean(tracker.currentWidget),
         isToggled: () => {
             const current = tracker.currentWidget;
-            return current ? !current.model.jgisSettings.rightPanelDisabled : false;
+            if (!current) {
+                return false;
+            }
+            const open = current.model.getUIState().rightPanelOpen;
+            return open !== false;
+        },
+        execute: () => {
+            const current = tracker.currentWidget;
+            if (!current) {
+                return;
+            }
+            const open = current.model.getUIState().rightPanelOpen;
+            current.model.setUIState({ rightPanelOpen: open === false });
+            commands.notifyCommandChanged(CommandIDs.toggleRightPanel);
+            commands.notifyCommandChanged(CommandIDs.togglePanel);
+        },
+    });
+    commands.addCommand(CommandIDs.togglePanel, {
+        label: trans.__('Toggle Panel'),
+        caption: 'Toggle the panel in the current JupyterGIS document.',
+        iconClass: 'fa fa-layer-group',
+        isEnabled: () => Boolean(tracker.currentWidget),
+        isToggled: () => {
+            const current = tracker.currentWidget;
+            if (!current) {
+                return false;
+            }
+            const { leftPanelDisabled, rightPanelDisabled } = current.model.jgisSettings;
+            const { leftPanelOpen = true, rightPanelOpen = true } = current.model.getUIState();
+            const show = (!leftPanelDisabled && !leftPanelOpen) ||
+                (!rightPanelDisabled && !rightPanelOpen);
+            return !show;
         },
-        execute: async () => {
-            var _a, _b, _c;
+        execute: () => {
             const current = tracker.currentWidget;
             if (!current) {
                 return;
             }
-            try {
-                const settings = await current.model.getSettings();
-                const currentValue = (_c = (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.composite) === null || _a === void 0 ? void 0 : _a.rightPanelDisabled) !== null && _b !== void 0 ? _b : current.model.jgisSettings.rightPanelDisabled) !== null && _c !== void 0 ? _c : false;
-                await (settings === null || settings === void 0 ? void 0 : settings.set('rightPanelDisabled', !currentValue));
-                commands.notifyCommandChanged(CommandIDs.toggleRightPanel);
+            const { leftPanelDisabled, rightPanelDisabled } = current.model.jgisSettings;
+            const { leftPanelOpen = true, rightPanelOpen = true } = current.model.getUIState();
+            // Show all if any non-disabled panel is hidden; hide all otherwise.
+            const show = (!leftPanelDisabled && !leftPanelOpen) ||
+                (!rightPanelDisabled && !rightPanelOpen);
+            const newState = {};
+            if (!leftPanelDisabled) {
+                newState.leftPanelOpen = show;
             }
-            catch (err) {
-                console.error('Failed to toggle Right Panel:', err);
+            if (!rightPanelDisabled) {
+                newState.rightPanelOpen = show;
             }
+            current.model.setUIState(newState);
+            commands.notifyCommandChanged(CommandIDs.togglePanel);
         },
     });
     // Left panel tabs
@@ -1160,6 +1216,59 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             current.model.toggleMode('marking');
             commands.notifyCommandChanged(CommandIDs.addMarker);
         } }, icons.get(CommandIDs.addMarker)));
+    commands.addCommand(CommandIDs.toggleDrawFeatures, Object.assign({ label: trans.__('Edit Features'), caption: 'Toggle feature editing for the selected draw-compatible layer.', describedBy: {
+            args: {
+                type: 'object',
+                properties: {},
+            },
+        }, isToggled: () => {
+            var _a, _b, _c;
+            if (!(tracker.currentWidget instanceof JupyterGISDocumentWidget)) {
+                return false;
+            }
+            const model = (_c = (_b = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.currentViewModel) === null || _c === void 0 ? void 0 : _c.jGISModel;
+            if (!model) {
+                return false;
+            }
+            const selectedLayer = getSingleSelectedLayer(tracker);
+            if (!selectedLayer) {
+                return false;
+            }
+            if (!model.checkIfIsADrawVectorLayer(selectedLayer)) {
+                return false;
+            }
+            return model.editingVectorLayer;
+        }, isEnabled: () => {
+            var _a, _b, _c;
+            if (!(tracker.currentWidget instanceof JupyterGISDocumentWidget)) {
+                return false;
+            }
+            const model = (_c = (_b = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.currentViewModel) === null || _c === void 0 ? void 0 : _c.jGISModel;
+            if (!model) {
+                return false;
+            }
+            const selectedLayer = getSingleSelectedLayer(tracker);
+            if (!selectedLayer) {
+                return false;
+            }
+            return model.checkIfIsADrawVectorLayer(selectedLayer) === true;
+        }, execute: async () => {
+            var _a, _b;
+            if (!(tracker.currentWidget instanceof JupyterGISDocumentWidget)) {
+                return;
+            }
+            const model = (_b = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.content.currentViewModel) === null || _b === void 0 ? void 0 : _b.jGISModel;
+            if (!model) {
+                return false;
+            }
+            const selectedLayer = getSingleSelectedLayer(tracker);
+            if (!selectedLayer) {
+                return false;
+            }
+            model.editingVectorLayer = !model.editingVectorLayer;
+            model.updateEditingVectorLayer();
+            commands.notifyCommandChanged(CommandIDs.toggleDrawFeatures);
+        } }, icons.get(CommandIDs.toggleDrawFeatures)));
     commands.addCommand(CommandIDs.addStorySegment, Object.assign({ label: trans.__('Add Story Segment'), isEnabled: () => {
             const current = tracker.currentWidget;
             if (!current) {
@@ -1200,11 +1309,44 @@ 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)));
+    commands.addCommand(CommandIDs.createStorySegmentFromLayer, {
+        label: trans.__('Create Story Segment for Layer'),
+        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 (!model || !selected) {
+                return false;
+            }
+            if (Object.keys(selected).length !== 1) {
+                return false;
+            }
+            const layerId = Object.keys(selected)[0];
+            return !!model.getLayer(layerId);
+        },
+        execute: () => {
+            var _a, _b;
+            const current = tracker.currentWidget;
+            if (!current) {
+                return;
+            }
+            const model = current.model;
+            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) {
+                return;
+            }
+            const layerId = Object.keys(selected)[0];
+            const result = model.createStorySegmentFromLayer(layerId);
+            if (result) {
+                model.centerOnPosition(layerId);
+            }
+        },
+    });
     /* 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;
+            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 ||
@@ -1216,6 +1358,9 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             if (!model.isSpectaMode()) {
                 return false;
             }
+            if (((_c = model.getSelectedStory().story) === null || _c === void 0 ? void 0 : _c.storyType) === STORY_TYPE.verticalScroll) {
+                return false;
+            }
             return model.getCurrentSegmentIndex() > 0;
         },
         execute: () => {
@@ -1231,7 +1376,7 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     originalAddCommand(CommandIDs.storyNext, {
         label: trans.__('Next Story Segment'),
         isEnabled: () => {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             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 ||
@@ -1244,7 +1389,10 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             if (!isSpecta) {
                 return false;
             }
-            const current = (_c = model.getCurrentSegmentIndex()) !== null && _c !== void 0 ? _c : 0;
+            if (((_c = model.getSelectedStory().story) === null || _c === void 0 ? void 0 : _c.storyType) === STORY_TYPE.verticalScroll) {
+                return false;
+            }
+            const current = (_d = model.getCurrentSegmentIndex()) !== null && _d !== void 0 ? _d : 0;
             return current < storySegments.length - 1;
         },
         execute: () => {
@@ -1257,6 +1405,28 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             model.setCurrentSegmentIndex(current + 1);
         },
     });
+    const notifyCommandsChanged = () => {
+        for (const command of Object.values(CommandIDs)) {
+            try {
+                commands.notifyCommandChanged(command);
+            }
+            catch (_) {
+                // Do Continue if command is not registered
+            }
+        }
+    };
+    let cleanup = null;
+    tracker.currentChanged.connect(_ => {
+        var _a;
+        cleanup === null || cleanup === void 0 ? void 0 : cleanup();
+        cleanup = null;
+        const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
+        model === null || model === void 0 ? void 0 : model.selectedChanged.connect(notifyCommandsChanged);
+        cleanup = () => {
+            model === null || model === void 0 ? void 0 : model.selectedChanged.disconnect(notifyCommandsChanged);
+        };
+        notifyCommandsChanged();
+    });
     loadKeybindings(commands, keybindings);
 }
 var Private;

package/lib/commands/operationCommands.js

@@ -241,7 +241,7 @@ export function addLayerCreationCommands(options) {
             label: 'New GeoTIFF Layer From Parameters',
             caption: 'Add a new GeoTIFF layer (by file path or URL) and add it to the given JupyterGIS file',
             sourceType: 'GeoTiffSource',
-            layerType: 'WebGlLayer',
+            layerType: 'GeoTiffLayer',
             sourceSchema: {
                 type: 'object',
                 required: ['urls'],
@@ -296,7 +296,7 @@ export function addLayerCreationCommands(options) {
                     source: id,
                     color: (_a = p.color) !== null && _a !== void 0 ? _a : {},
                     opacity: (_b = p.opacity) !== null && _b !== void 0 ? _b : 1,
-                    symbologyState: (_c = p.symbologyState) !== null && _c !== void 0 ? _c : { renderType: 'Single Symbol' },
+                    symbologyState: (_c = p.symbologyState) !== null && _c !== void 0 ? _c : { layers: [] },
                 });
             },
         },

package/lib/constants.js

@@ -1,7 +1,7 @@
 import { ProcessingCommandIDs } from '@jupytergis/schema';
 import { redoIcon, undoIcon } from '@jupyterlab/ui-components';
 import * as BaseCommandIDs from './commands/BaseCommandIDs';
-import { bookOpenIcon, clockIcon, geoJSONIcon, infoIcon, moundIcon, rasterIcon, vectorSquareIcon, markerIcon, } from './icons';
+import { bookOpenIcon, clockIcon, geoJSONIcon, geoPackageIcon, infoIcon, moundIcon, rasterIcon, vectorSquareIcon, markerIcon, pencilSolidIcon, } from './shared/icons';
 /**
  * The command IDs.
  */
@@ -15,10 +15,15 @@ const iconObject = {
     VideoSource: { iconClass: 'fa fa-video' },
     ShapefileSource: { iconClass: 'fa fa-file' },
     RasterLayer: { icon: rasterIcon },
+    OpenEOTileLayer: { icon: rasterIcon },
     VectorLayer: { iconClass: 'fa fa-vector-square' },
+    VectorTileLayer: { iconClass: 'fa fa-vector-square' },
     HillshadeLayer: { icon: moundIcon },
+    GeoTiffLayer: { iconClass: 'fa fa-image' },
+    StacLayer: { icon: rasterIcon },
     ImageLayer: { iconClass: 'fa fa-image' },
     VideoLayer: { iconClass: 'fa fa-video' },
+    StorySegmentLayer: { iconClass: 'fa fa-link' },
     [CommandIDs.redo]: { icon: redoIcon },
     [CommandIDs.undo]: { icon: undoIcon },
     [CommandIDs.openLayerBrowser]: { icon: bookOpenIcon },
@@ -29,6 +34,8 @@ const iconObject = {
     [CommandIDs.openNewHillshadeDialog]: { icon: moundIcon },
     [CommandIDs.openNewImageDialog]: { iconClass: 'fa fa-image' },
     [CommandIDs.openNewVideoDialog]: { iconClass: 'fa fa-video' },
+    [CommandIDs.newGeoPackageVectorEntry]: { icon: geoPackageIcon },
+    [CommandIDs.newGeoPackageRasterEntry]: { icon: geoPackageIcon },
     [CommandIDs.openNewShapefileDialog]: { iconClass: 'fa fa-file' },
     [CommandIDs.openNewGeoTiffDialog]: { iconClass: 'fa fa-image' },
     [CommandIDs.openNewGeoParquetDialog]: { iconClass: 'fa fa-file' },
@@ -36,6 +43,7 @@ const iconObject = {
     [CommandIDs.identify]: { icon: infoIcon },
     [CommandIDs.temporalController]: { icon: clockIcon },
     [CommandIDs.addMarker]: { icon: markerIcon },
+    [CommandIDs.toggleDrawFeatures]: { icon: pencilSolidIcon },
     [CommandIDs.addStorySegment]: { iconClass: 'fa fa-link' },
     [CommandIDs.toggleStoryPresentationMode]: {
         iconClass: 'fa fa-book jgis-icon-adjust',

package/lib/{panelview/annotationPanel.js → features/annotations/AnnotationsPanel.js}

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import Annotation from "../annotations/components/Annotation";
+import Annotation from './components/Annotation';
 export class AnnotationsPanel extends Component {
     constructor(props) {
         var _a, _b;

package/lib/{annotations → features/annotations}/index.d.ts

@@ -1,3 +1,4 @@
 export * from './model';
 export * from './components/Annotation';
 export * from './components/AnnotationFloater';
+export * from './AnnotationsPanel';

package/lib/{annotations → features/annotations}/index.js

@@ -1,3 +1,4 @@
 export * from './model';
 export * from './components/Annotation';
 export * from './components/AnnotationFloater';
+export * from './AnnotationsPanel';

package/lib/{console → features/console}/consoleview.js

@@ -1,7 +1,7 @@
 import { ConsolePanel } from '@jupyterlab/console';
 import { closeIcon, CommandToolbarButton, expandIcon, Toolbar, } from '@jupyterlab/ui-components';
 import { BoxPanel } from '@lumino/widgets';
-import { debounce } from "../tools";
+import { debounce } from "../../tools";
 export class ConsoleView extends BoxPanel {
     constructor(options) {
         super({ direction: 'top-to-bottom' });

package/lib/{panelview/filter-panel → features/filter}/Filter.js

@@ -1,7 +1,7 @@
 import { Button } from '@jupyterlab/ui-components';
 import { cloneDeep } from 'lodash';
 import React, { useEffect, useRef, useState } from 'react';
-import { useOkSignal } from "../../dialogs/symbology/hooks/useOkSignal";
+import { useOkSignal } from "../layers/symbology/hooks/useOkSignal";
 import { debounce, loadFile } from "../../tools";
 import FilterRow from './FilterRow';
 const FilterComponent = ({ model, okSignalPromise, }) => {
@@ -19,7 +19,7 @@ const FilterComponent = ({ model, okSignalPromise, }) => {
         }
     }, []);
     useEffect(() => {
-        const handleClientStateChanged = () => {
+        const handleSelectedChanged = () => {
             var _a, _b, _c, _d;
             if (!((_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)) {
                 return;
@@ -40,12 +40,12 @@ const FilterComponent = ({ model, okSignalPromise, }) => {
                 buildFilterDebounce(currentLayer);
             }
         };
-        model === null || model === void 0 ? void 0 : model.clientStateChanged.connect(handleClientStateChanged);
+        model === null || model === void 0 ? void 0 : model.selectedChanged.connect(handleSelectedChanged);
         // Want to rebuild filter object when zoom changes to get values for that zoom level
         // This is because the filtering inputs may depend on the currently visible features
         model === null || model === void 0 ? void 0 : model.sharedOptionsChanged.connect(handleSharedOptionsChanged);
         return () => {
-            model === null || model === void 0 ? void 0 : model.clientStateChanged.disconnect(handleClientStateChanged);
+            model === null || model === void 0 ? void 0 : model.selectedChanged.disconnect(handleSelectedChanged);
             model === null || model === void 0 ? void 0 : model.sharedOptionsChanged.disconnect(handleSharedOptionsChanged);
         };
     }, [model]);

package/lib/{panelview/filter-panel → features/filter}/FilterRow.d.ts

@@ -1,9 +1,10 @@
+import { IJGISFilterItem } from '@jupytergis/schema';
 import React from 'react';
 declare const FilterRow: React.FC<{
     index: number;
     features: Record<string, Set<string | number>>;
-    filterRows: any;
-    setFilterRows: any;
+    filterRows: IJGISFilterItem[];
+    setFilterRows: React.Dispatch<React.SetStateAction<IJGISFilterItem[]>>;
     deleteRow: () => void;
 }>;
 export default FilterRow;

package/lib/{panelview/filter-panel → features/filter}/FilterRow.js

@@ -44,7 +44,8 @@ const FilterRow = ({ index, features, filterRows, setFilterRows, deleteRow }) =>
     };
     const handleOperatorChange = (event) => {
         const newFilters = [...filterRows];
-        newFilters[index].operator = event.target.value;
+        newFilters[index].operator = event.target
+            .value;
         setFilterRows(newFilters);
     };
     const handleValueChange = (event) => {

package/lib/{panelview/identify-panel → features/identify}/IdentifyPanel.d.ts

@@ -1,7 +1,9 @@
 import { IJupyterGISModel } from '@jupytergis/schema';
 import React from 'react';
+import { PatchGeoJSONFeatureProperties } from './types/editorTypes';
 interface IIdentifyComponentProps {
     model: IJupyterGISModel;
+    patchGeoJSONFeatureProperties?: PatchGeoJSONFeatureProperties;
 }
 export declare const IdentifyPanelComponent: React.FC<IIdentifyComponentProps>;
 export {};