@jupytergis/jupytergis-lab 0.4.5 → 0.6.0

package/lib/index.js

@@ -1,6 +1,6 @@
-import { CommandIDs, ControlPanelModel, GlobalStateDbManager, LeftPanelWidget, RightPanelWidget, addCommands, createDefaultLayerRegistry, logoMiniIcon } from '@jupytergis/base';
-import { IAnnotationToken, IJGISFormSchemaRegistryToken, IJGISLayerBrowserRegistryToken, IJupyterGISDocTracker } from '@jupytergis/schema';
-import { ILayoutRestorer } from '@jupyterlab/application';
+import { CommandIDs, ControlPanelModel, GlobalStateDbManager, LeftPanelWidget, RightPanelWidget, addCommands, createDefaultLayerRegistry, logoMiniIcon, rasterSubMenu, vectorSubMenu, } from '@jupytergis/base';
+import { IAnnotationToken, IJGISFormSchemaRegistryToken, IJGISLayerBrowserRegistryToken, IJupyterGISDocTracker, ProcessingMerge, } from '@jupytergis/schema';
+import { ILayoutRestorer, } from '@jupyterlab/application';
 import { ICompletionProviderManager } from '@jupyterlab/completer';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { IStateDB } from '@jupyterlab/statedb';
@@ -15,7 +15,7 @@ const plugin = {
         IJupyterGISDocTracker,
         IJGISFormSchemaRegistryToken,
         IJGISLayerBrowserRegistryToken,
-        IStateDB
+        IStateDB,
     ],
     optional: [IMainMenu, ITranslator, ICompletionProviderManager],
     activate: (app, tracker, formSchemaRegistry, layerBrowserRegistry, state, mainMenu, translator, completionProviderManager) => {
@@ -29,93 +29,56 @@ const plugin = {
         const stateDbManager = GlobalStateDbManager.getInstance();
         stateDbManager.initialize(state);
         addCommands(app, tracker, translator, formSchemaRegistry, layerBrowserRegistry, state, completionProviderManager);
-        // SOURCES context menu
-        const newSourceSubMenu = new Menu({ commands: app.commands });
-        newSourceSubMenu.title.label = translator
-            .load('jupyterlab')
-            .__('Add Source');
-        newSourceSubMenu.id = 'jp-gis-contextmenu-addSource';
-        app.contextMenu.addItem({
-            type: 'submenu',
-            selector: '.jp-gis-sourcePanel',
-            rank: 3,
-            submenu: newSourceSubMenu
-        });
-        newSourceSubMenu.addItem({
-            command: CommandIDs.newRasterSource,
-            args: { from: 'contextMenu' }
-        });
-        newSourceSubMenu.addItem({
-            command: CommandIDs.newVectorSource,
-            args: { from: 'contextMenu' }
-        });
-        newSourceSubMenu.addItem({
-            command: CommandIDs.newGeoJSONSource,
-            args: { from: 'contextMenu' }
-        });
-        newSourceSubMenu.addItem({
-            command: CommandIDs.newRasterDemSource,
-            args: { from: 'contextMenu' }
-        });
-        newSourceSubMenu.addItem({
-            command: CommandIDs.newImageSource,
-            args: { from: 'contextMenu' }
-        });
-        app.contextMenu.addItem({
-            type: 'separator',
-            selector: '.jp-gis-sourcePanel',
-            rank: 2
-        });
         app.contextMenu.addItem({
             selector: '.jp-gis-source.jp-gis-sourceUnused',
             rank: 1,
-            command: CommandIDs.removeSource
+            command: CommandIDs.removeSource,
         });
         app.contextMenu.addItem({
             selector: '.jp-gis-source',
             rank: 1,
-            command: CommandIDs.renameSource
+            command: CommandIDs.renameSource,
         });
         // LAYERS and LAYER GROUPS context menu
         app.contextMenu.addItem({
             command: CommandIDs.symbology,
             selector: '.jp-gis-layerItem',
-            rank: 1
+            rank: 1,
         });
         // Separator
         app.contextMenu.addItem({
             type: 'separator',
             selector: '.jp-gis-layerPanel',
-            rank: 1
+            rank: 1,
         });
         app.contextMenu.addItem({
             command: CommandIDs.removeLayer,
             selector: '.jp-gis-layerItem',
-            rank: 2
+            rank: 2,
         });
         app.contextMenu.addItem({
             command: CommandIDs.renameLayer,
             selector: '.jp-gis-layerItem',
-            rank: 2
+            rank: 2,
         });
         app.contextMenu.addItem({
             command: CommandIDs.zoomToLayer,
             selector: '.jp-gis-layerItem',
-            rank: 2
+            rank: 2,
         });
         // Create the Download submenu
         const downloadSubmenu = new Menu({ commands: app.commands });
         downloadSubmenu.title.label = translator.load('jupyterlab').__('Download');
         downloadSubmenu.id = 'jp-gis-contextmenu-download';
         downloadSubmenu.addItem({
-            command: CommandIDs.downloadGeoJSON
+            command: CommandIDs.downloadGeoJSON,
         });
         // Add the Download submenu to the context menu
         app.contextMenu.addItem({
             type: 'submenu',
             selector: '.jp-gis-layerItem',
             rank: 2,
-            submenu: downloadSubmenu
+            submenu: downloadSubmenu,
         });
         // Create the Processing submenu
         const processingSubmenu = new Menu({ commands: app.commands });
@@ -123,17 +86,16 @@ const plugin = {
             .load('jupyterlab')
             .__('Processing');
         processingSubmenu.id = 'jp-gis-contextmenu-processing';
-        processingSubmenu.addItem({
-            command: CommandIDs.buffer
-        });
-        processingSubmenu.addItem({
-            command: CommandIDs.dissolve
-        });
+        for (const processingElement of ProcessingMerge) {
+            processingSubmenu.addItem({
+                command: processingElement.name,
+            });
+        }
         app.contextMenu.addItem({
             type: 'submenu',
             selector: '.jp-gis-layerItem',
             rank: 2,
-            submenu: processingSubmenu
+            submenu: processingSubmenu,
         });
         const moveLayerSubmenu = new Menu({ commands: app.commands });
         moveLayerSubmenu.title.label = translator
@@ -144,58 +106,46 @@ const plugin = {
             type: 'submenu',
             selector: '.jp-gis-layerItem',
             rank: 2,
-            submenu: moveLayerSubmenu
+            submenu: moveLayerSubmenu,
         });
         app.contextMenu.opened.connect(() => buildGroupsMenu(app.contextMenu, tracker));
         app.contextMenu.addItem({
             command: CommandIDs.removeGroup,
             selector: '.jp-gis-layerGroupHeader',
-            rank: 2
+            rank: 2,
         });
         app.contextMenu.addItem({
             command: CommandIDs.renameGroup,
             selector: '.jp-gis-layerGroupHeader',
-            rank: 2
+            rank: 2,
         });
         // Separator
         app.contextMenu.addItem({
             type: 'separator',
             selector: '.jp-gis-layerPanel',
-            rank: 2
+            rank: 2,
         });
         const newLayerSubMenu = new Menu({ commands: app.commands });
         newLayerSubMenu.title.label = translator.load('jupyterlab').__('Add Layer');
         newLayerSubMenu.id = 'jp-gis-contextmenu-addLayer';
-        app.contextMenu.addItem({
-            type: 'submenu',
-            selector: '.jp-gis-layerPanel',
-            rank: 3,
-            submenu: newLayerSubMenu
-        });
         newLayerSubMenu.addItem({
-            command: CommandIDs.newRasterLayer,
-            args: { from: 'contextMenu' }
-        });
-        newLayerSubMenu.addItem({
-            command: CommandIDs.newVectorLayer,
-            args: { from: 'contextMenu' }
-        });
-        newLayerSubMenu.addItem({
-            command: CommandIDs.newHillshadeLayer,
-            args: { from: 'contextMenu' }
+            type: 'submenu',
+            submenu: rasterSubMenu(app.commands),
         });
         newLayerSubMenu.addItem({
-            command: CommandIDs.newImageLayer,
-            args: { from: 'contextMenu' }
+            type: 'submenu',
+            submenu: vectorSubMenu(app.commands),
         });
-        newLayerSubMenu.addItem({
-            command: CommandIDs.newHeatmapLayer,
-            args: { from: 'contextMenu' }
+        app.contextMenu.addItem({
+            type: 'submenu',
+            selector: '.jp-gis-layerPanel',
+            rank: 3,
+            submenu: newLayerSubMenu,
         });
         if (mainMenu) {
             populateMenus(mainMenu, isEnabled);
         }
-    }
+    },
 };
 const controlPanel = {
     id: 'jupytergis:lab:controlpanel',
@@ -205,7 +155,7 @@ const controlPanel = {
         IJupyterGISDocTracker,
         IJGISFormSchemaRegistryToken,
         IStateDB,
-        IAnnotationToken
+        IAnnotationToken,
     ],
     activate: (app, restorer, tracker, formSchemaRegistry, state, annotationModel) => {
         const controlModel = new ControlPanelModel({ tracker });
@@ -213,7 +163,7 @@ const controlPanel = {
             model: controlModel,
             tracker,
             state,
-            commands: app.commands
+            commands: app.commands,
         });
         leftControlPanel.id = 'jupytergis::leftControlPanel';
         leftControlPanel.title.caption = 'JupyterGIS Control Panel';
@@ -222,18 +172,18 @@ const controlPanel = {
             model: controlModel,
             tracker,
             formSchemaRegistry,
-            annotationModel
+            annotationModel,
         });
         rightControlPanel.id = 'jupytergis::rightControlPanel';
         rightControlPanel.title.caption = 'JupyterGIS Control Panel';
         rightControlPanel.title.icon = logoMiniIcon;
         if (restorer) {
-            restorer.add(leftControlPanel, NAME_SPACE);
-            restorer.add(rightControlPanel, NAME_SPACE);
+            restorer.add(leftControlPanel, `${NAME_SPACE}-left`);
+            restorer.add(rightControlPanel, `${NAME_SPACE}-right`);
         }
         app.shell.add(leftControlPanel, 'left', { rank: 2000 });
         app.shell.add(rightControlPanel, 'right', { rank: 2000 });
-    }
+    },
 };
 /**
  * Populates the application menus for the notebook.
@@ -242,11 +192,11 @@ function populateMenus(mainMenu, isEnabled) {
     // Add undo/redo hooks to the edit menu.
     mainMenu.editMenu.undoers.redo.add({
         id: CommandIDs.redo,
-        isEnabled
+        isEnabled,
     });
     mainMenu.editMenu.undoers.undo.add({
         id: CommandIDs.undo,
-        isEnabled
+        isEnabled,
     });
 }
 /**
@@ -291,16 +241,16 @@ function buildGroupsMenu(contextMenu, tracker) {
     }
     submenu.addItem({
         command: CommandIDs.moveLayersToGroup,
-        args: { label: '' }
+        args: { label: '' },
     });
     groupNames.forEach(name => {
         submenu.addItem({
             command: CommandIDs.moveLayersToGroup,
-            args: { label: name }
+            args: { label: name },
         });
     });
     submenu.addItem({
-        command: CommandIDs.moveLayerToNewGroup
+        command: CommandIDs.moveLayerToNewGroup,
     });
 }
 export default [plugin, controlPanel, notebookRendererPlugin];

package/lib/notebookrenderer.js

@@ -1,13 +1,13 @@
 import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
-import { JupyterGISOutputWidget, JupyterGISPanel, ToolbarWidget } from '@jupytergis/base';
-import { IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISModel } from '@jupytergis/schema';
+import { JupyterGISOutputWidget, JupyterGISPanel, ToolbarWidget, } from '@jupytergis/base';
+import { IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISModel, } from '@jupytergis/schema';
 import { showErrorMessage } from '@jupyterlab/apputils';
 import { ConsolePanel } from '@jupyterlab/console';
 import { PathExt } from '@jupyterlab/coreutils';
 import { NotebookPanel } from '@jupyterlab/notebook';
 import { MessageLoop } from '@lumino/messaging';
 import { Panel, Widget } from '@lumino/widgets';
-import { IJupyterYWidgetManager, JupyterYDoc, JupyterYModel } from 'yjs-widgets';
+import { IJupyterYWidgetManager, JupyterYDoc, JupyterYModel, } from 'yjs-widgets';
 export const CLASS_NAME = 'jupytergis-notebook-widget';
 export class YJupyterGISModel extends JupyterYModel {
 }
@@ -26,13 +26,13 @@ export class YJupyterGISLuminoWidget extends Panel {
                 toolbar = new ToolbarWidget({
                     commands,
                     model,
-                    externalCommands: (externalCommands === null || externalCommands === void 0 ? void 0 : externalCommands.getCommands()) || []
+                    externalCommands: (externalCommands === null || externalCommands === void 0 ? void 0 : externalCommands.getCommands()) || [],
                 });
             }
             this._jgisWidget = new JupyterGISOutputWidget({
                 model,
                 content,
-                toolbar
+                toolbar,
             });
             this.addWidget(this._jgisWidget);
             tracker === null || tracker === void 0 ? void 0 : tracker.add(this._jgisWidget);
@@ -67,7 +67,7 @@ export const notebookRendererPlugin = {
         IJGISExternalCommandRegistryToken,
         IJupyterGISDocTracker,
         IJupyterYWidgetManager,
-        ICollaborativeDrive
+        ICollaborativeDrive,
     ],
     activate: (app, externalCommandRegistry, jgisTracker, yWidgetManager, drive) => {
         if (!yWidgetManager) {
@@ -99,7 +99,7 @@ export const notebookRendererPlugin = {
                     catch (e) {
                         await app.serviceManager.contents.save(localPath, {
                             content: btoa('{}'),
-                            format: 'base64'
+                            format: 'base64',
                         });
                     }
                 }
@@ -111,10 +111,10 @@ export const notebookRendererPlugin = {
                     path: localPath,
                     format: fileFormat,
                     contentType,
-                    collaborative: true
+                    collaborative: true,
                 });
                 this.jupyterGISModel = new JupyterGISModel({
-                    sharedModel: sharedModel
+                    sharedModel: sharedModel,
                 });
                 this.jupyterGISModel.contentsManager = app.serviceManager.contents;
                 this.jupyterGISModel.filePath = localPath;
@@ -130,7 +130,7 @@ export const notebookRendererPlugin = {
                     commands: app.commands,
                     model: yModel.jupyterGISModel,
                     externalCommands: externalCommandRegistry,
-                    tracker: jgisTracker
+                    tracker: jgisTracker,
                 });
                 this._jgisWidget = widget.jgisWidget;
                 MessageLoop.sendMessage(widget, Widget.Msg.BeforeAttach);
@@ -143,5 +143,5 @@ export const notebookRendererPlugin = {
             }
         }
         yWidgetManager.registerWidget('@jupytergis:widget', YJupyterGISModelFactory, YJupyterGISWidget);
-    }
+    },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-lab",
-  "version": "0.4.5",
+  "version": "0.6.0",
   "description": "JupyterGIS Lab extension.",
   "keywords": [
     "jupyter",
@@ -53,8 +53,8 @@
   },
   "dependencies": {
     "@jupyter/collaborative-drive": "^3.0.0",
-    "@jupytergis/base": "^0.4.5",
-    "@jupytergis/schema": "^0.4.5",
+    "@jupytergis/base": "^0.6.0",
+    "@jupytergis/schema": "^0.6.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",

package/style/base.css

@@ -223,6 +223,7 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   width: 100%;
   box-sizing: border-box;
   flex: 1;
+  position: relative;
 }
 
 .jGIS-Popup-Wrapper {
@@ -373,6 +374,11 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   z-index: 20;
 }
 
+.jGIS-Remote-Pointer-Icon {
+  filter: drop-shadow(-1px 0px white) drop-shadow(1px 0px white)
+    drop-shadow(0px -1px white) drop-shadow(0px 1px white)
+    drop-shadow(0px 0px 1px black);
+}
 .jGIS-Remote-Pointer-Icon:hover {
   scale: 1.3;
 }
@@ -581,10 +587,6 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   display: none;
 }
 
-.jGIS-property-panel .rjsf .errors {
-  color: var(--jp-warn-color0);
-}
-
 .jGIS-property-panel .rjsf .errors ul,
 .jGIS-property-panel .rjsf .validationErrors ul,
 .jGIS-property-panel .rjsf .validationErrors li,
@@ -785,3 +787,46 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   cursor: not-allowed;
   pointer-events: auto;
 }
+
+.jp-gis-stop-container-wrapper {
+  display: flex;
+  flex-direction: row;
+  gap: 2rem;
+}
+
+.jp-gis-stop-container-wrapper > * {
+  flex: 1;
+}
+
+.jp-gis-stop-container-wrapper > *:only-child {
+  flex: 1 1 100%;
+}
+
+.jp-gis-symbology-tabs {
+  display: flex;
+  border-bottom: 1px solid #ccc;
+  margin: 12px 0;
+}
+
+.jp-gis-tab {
+  flex: 1;
+  text-align: center;
+  padding: 10px 16px;
+  border: none;
+  border-bottom: 2px solid transparent;
+  cursor: pointer;
+  font-size: var(--jp-ui-font-size2);
+  color: var(--jp-ui-font-color1);
+  background-color: var(--jp-layout-color1);
+}
+
+.jp-gis-tab:not(.active):hover {
+  background-color: var(--jp-layout-color2);
+}
+
+.jp-gis-tab.active {
+  background-color: var(--jp-layout-color2);
+  color: var(--jp-brand-color1);
+  border-bottom: 2px solid var(--jp-brand-color1);
+  font-weight: 500;
+}