@jupytergis/base 0.3.0 → 0.4.1

package/lib/widget.d.ts

@@ -1,25 +1,48 @@
-import { JSONValue } from '@lumino/coreutils';
-import { ISignal } from '@lumino/signaling';
-import { SplitPanel } from '@lumino/widgets';
+import { IJupyterGISDocumentWidget, IJupyterGISModel, IJupyterGISOutputWidget } from '@jupytergis/schema';
+import { MainAreaWidget } from '@jupyterlab/apputils';
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
 import { DocumentWidget } from '@jupyterlab/docregistry';
 import { IObservableMap, ObservableMap } from '@jupyterlab/observables';
-import { IJupyterGISModel, IJupyterGISWidget } from '@jupytergis/schema';
+import { JSONValue } from '@lumino/coreutils';
+import { ISignal } from '@lumino/signaling';
+import { SplitPanel } from '@lumino/widgets';
+import { CommandRegistry } from '@lumino/commands';
+import { ConsoleView } from './console';
 import { JupyterGISMainViewPanel } from './mainview';
 import { MainViewModel } from './mainview/mainviewmodel';
-import { ConsoleView } from './console';
-export declare class JupyterGISWidget extends DocumentWidget<JupyterGISPanel, IJupyterGISModel> implements IJupyterGISWidget {
+export type JupyterGISWidget = JupyterGISDocumentWidget | JupyterGISOutputWidget;
+export declare class JupyterGISDocumentWidget extends DocumentWidget<JupyterGISPanel, IJupyterGISModel> implements IJupyterGISDocumentWidget {
     constructor(options: DocumentWidget.IOptions<JupyterGISPanel, IJupyterGISModel>);
+    get model(): IJupyterGISModel;
     /**
      * Dispose of the resources held by the widget.
      */
     dispose(): void;
     onResize: (msg: any) => void;
 }
+/**
+ * A main area widget designed to be used as Notebook cell output widget, to ease the
+ * integration of toolbar and tracking.
+ */
+export declare class JupyterGISOutputWidget extends MainAreaWidget<JupyterGISPanel> implements IJupyterGISOutputWidget {
+    constructor(options: JupyterGISOutputWidget.IOptions);
+    /**
+     * Dispose of the resources held by the widget.
+     */
+    dispose(): void;
+    readonly model: IJupyterGISModel;
+    readonly resizeObserver: ResizeObserver;
+}
+export declare namespace JupyterGISOutputWidget {
+    interface IOptions extends MainAreaWidget.IOptions<JupyterGISPanel> {
+        model: IJupyterGISModel;
+    }
+}
 export declare class JupyterGISPanel extends SplitPanel {
     constructor(options: JupyterGISPanel.IOptions);
     _initModel(options: {
         model: IJupyterGISModel;
+        commandRegistry: CommandRegistry;
     }): void;
     _initView(): void;
     get jupyterGISMainViewPanel(): JupyterGISMainViewPanel;
@@ -44,6 +67,7 @@ export declare class JupyterGISPanel extends SplitPanel {
 export declare namespace JupyterGISPanel {
     interface IOptions extends Partial<ConsoleView.IOptions> {
         model: IJupyterGISModel;
+        commandRegistry: CommandRegistry;
         consoleTracker?: IConsoleTracker;
     }
 }

package/lib/widget.js

@@ -9,20 +9,26 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { Signal } from '@lumino/signaling';
-import { SplitPanel } from '@lumino/widgets';
+import { MainAreaWidget } from '@jupyterlab/apputils';
 import { DocumentWidget } from '@jupyterlab/docregistry';
 import { ObservableMap } from '@jupyterlab/observables';
+import { Signal } from '@lumino/signaling';
+import { SplitPanel, Widget } from '@lumino/widgets';
+import { MessageLoop } from '@lumino/messaging';
+import { ConsoleView } from './console';
 import { JupyterGISMainViewPanel } from './mainview';
 import { MainViewModel } from './mainview/mainviewmodel';
-import { ConsoleView } from './console';
-export class JupyterGISWidget extends DocumentWidget {
+const CELL_OUTPUT_WIDGET_CLASS = 'jgis-cell-output-widget';
+export class JupyterGISDocumentWidget extends DocumentWidget {
     constructor(options) {
         super(options);
         this.onResize = (msg) => {
             window.dispatchEvent(new Event('resize'));
         };
     }
+    get model() {
+        return this.context.model;
+    }
     /**
      * Dispose of the resources held by the widget.
      */
@@ -31,21 +37,49 @@ export class JupyterGISWidget extends DocumentWidget {
         super.dispose();
     }
 }
+/**
+ * A main area widget designed to be used as Notebook cell output widget, to ease the
+ * integration of toolbar and tracking.
+ */
+export class JupyterGISOutputWidget extends MainAreaWidget {
+    constructor(options) {
+        super(options);
+        this.addClass(CELL_OUTPUT_WIDGET_CLASS);
+        this.model = options.model;
+        this.resizeObserver = new ResizeObserver(() => {
+            // Send a resize message to the widget, to update the child size.
+            MessageLoop.sendMessage(this, Widget.ResizeMessage.UnknownSize);
+        });
+        this.resizeObserver.observe(this.node);
+        this.model.disposed.connect(() => this.dispose());
+    }
+    /**
+     * Dispose of the resources held by the widget.
+     */
+    dispose() {
+        if (!this.isDisposed) {
+            this.resizeObserver.disconnect();
+            this.content.dispose();
+            super.dispose();
+        }
+    }
+}
 export class JupyterGISPanel extends SplitPanel {
     constructor(options) {
         super({ orientation: 'vertical', spacing: 0 });
         this._consoleOpened = false;
-        const { model, consoleTracker } = options, consoleOption = __rest(options, ["model", "consoleTracker"]);
-        this._initModel({ model });
+        const { model, consoleTracker, commandRegistry } = options, consoleOption = __rest(options, ["model", "consoleTracker", "commandRegistry"]);
+        this._initModel({ model, commandRegistry });
         this._initView();
-        this._consoleOption = consoleOption;
+        this._consoleOption = Object.assign({ commandRegistry }, consoleOption);
         this._consoleTracker = consoleTracker;
     }
     _initModel(options) {
         this._view = new ObservableMap();
         this._mainViewModel = new MainViewModel({
             jGISModel: options.model,
-            viewSetting: this._view
+            viewSetting: this._view,
+            commands: options.commandRegistry
         });
     }
     _initView() {
@@ -116,10 +150,10 @@ export class JupyterGISPanel extends SplitPanel {
                 const { consolePanel } = this._consoleView;
                 this._consoleTracker.widgetAdded.emit(consolePanel);
                 await consolePanel.sessionContext.ready;
-                await consolePanel.console.inject(`from jupytergis_lab import GISDocument\ndoc = GISDocument("${jgisPath}")`);
                 this.addWidget(this._consoleView);
                 this.setRelativeSizes([2, 1]);
                 this._consoleOpened = true;
+                await consolePanel.console.inject(`from jupytergis import GISDocument\ndoc = GISDocument("${jgisPath}")`);
                 consolePanel.console.sessionContext.kernelChanged.connect((_, arg) => {
                     if (!arg.newValue) {
                         this.removeConsole();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/base",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "A JupyterLab extension for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -43,7 +43,7 @@
     "@fortawesome/react-fontawesome": "latest",
     "@jupyter/react-components": "^0.16.6",
     "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
-    "@jupytergis/schema": "^0.3.0",
+    "@jupytergis/schema": "^0.4.1",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",
@@ -68,6 +68,7 @@
     "ajv": "^8.14.0",
     "colormap": "^2.3.2",
     "d3-color": "^3.1.0",
+    "date-fns": "^4.1.0",
     "gdal3.js": "^2.8.1",
     "geojson-vt": "^4.0.2",
     "geotiff": "^2.1.3",
@@ -76,7 +77,7 @@
     "pbf": "^4.0.1",
     "pmtiles": "^3.0.7",
     "proj4": "^2.14.0",
-    "proj4-list": "^1.0.2",
+    "proj4-list": "^1.0.4",
     "react": "^18.0.1",
     "shpjs": "^6.1.0",
     "styled-components": "^5.3.6",

package/style/base.css

@@ -9,6 +9,7 @@
 @import url('./filterPanel.css');
 @import url('./symbologyDialog.css');
 @import url('./statusBar.css');
+@import url('./temporalSlider.css');
 @import url('ol/ol.css');
 
 .jGIS-Toolbar-GroupName {
@@ -49,3 +50,12 @@
   display: block;
   position: relative;
 }
+
+/*This is being upstreamed. Will remove once upstream's been fixed.*/
+button.jp-mod-styled.jp-mod-accept {
+  background-color: var(--jp-brand-color1) !important;
+}
+
+button.jp-mod-styled.jp-mod-reject {
+  background-color: var(--jp-layout-color4) !important;
+}

package/style/symbologyDialog.css

@@ -159,7 +159,7 @@ select option {
   z-index: 40;
   flex: 1 1 auto;
   width: 97%;
-  max-height: 375px;
+  max-height: 20rem;
   background: var(--jp-input-background);
   padding-left: 8px;
   border: var(--jp-border-width) solid var(--jp-input-border-color);
@@ -207,6 +207,12 @@ select option {
   width: 100%;
   height: 30px;
   visibility: initial;
+  border-radius: var(--jp-border-radius);
+}
+
+.jp-Dialog-content:has(.jp-gis-heatmap),
+.jp-Dialog-body:has(.jp-gis-heatmap) {
+  overflow: visible;
 }
 
 .jp-gis-canvas-button-wrapper {

package/style/temporalSlider.css

@@ -0,0 +1,47 @@
+.jp-gis-temporal-slider-container {
+  display: flex;
+  flex-direction: column;
+  gap: 0.2rem;
+  padding: 0.5rem;
+  background-color: var(--jp-layout-color1);
+  border-bottom: 1px solid var(--jp-border-color1);
+}
+
+.jp-gis-temporal-slider-container span,
+.jp-gis-temporal-slider-container label {
+  font-weight: bold;
+}
+
+.jp-gis-temporal-slider-row {
+  display: flex;
+  gap: 0.25rem;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.jp-gis-temporal-slider-controls {
+  display: flex;
+  flex-grow: 1;
+  justify-content: space-around;
+}
+
+.jp-gis-temporal-slider-sub-controls {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 0.25rem;
+}
+
+.jp-gis-temporal-slider-sub-controls > input {
+  width: 35px;
+}
+
+select,
+select option {
+  text-transform: capitalize;
+}
+
+.jp-gis-temporal-slider {
+  flex: 1 0 40%;
+  min-width: 300px;
+}