@jupytergis/base 0.2.1 → 0.4.0

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 { JupyterGISMainViewPanel } from './mainview';
 import { MainViewModel } from './mainview/mainviewmodel';
 import { ConsoleView } from './console';
-export class JupyterGISWidget extends DocumentWidget {
+import { MessageLoop } from '@lumino/messaging';
+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,12 +37,39 @@ 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._consoleTracker = consoleTracker;
@@ -45,7 +78,8 @@ export class JupyterGISPanel extends SplitPanel {
         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.2.1",
+  "version": "0.4.0",
   "description": "A JupyterLab extension for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -38,8 +38,12 @@
     "watch": "tsc -w"
   },
   "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "^6.5.2",
+    "@fortawesome/free-solid-svg-icons": "^6.5.2",
+    "@fortawesome/react-fontawesome": "latest",
+    "@jupyter/react-components": "^0.16.6",
     "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
-    "@jupytergis/schema": "^0.2.1",
+    "@jupytergis/schema": "^0.4.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",
@@ -61,13 +65,19 @@
     "@naisutech/react-tree": "^3.0.1",
     "@rjsf/core": "^4.2.0",
     "@rjsf/validator-ajv8": "^5.23.1",
-    "@types/d3-color": "^3.1.0",
-    "@types/three": "^0.134.0",
     "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",
+    "ol": "^10.1.0",
     "ol-pmtiles": "^0.5.0",
     "pbf": "^4.0.1",
+    "pmtiles": "^3.0.7",
+    "proj4": "^2.14.0",
+    "proj4-list": "^1.0.4",
     "react": "^18.0.1",
     "shpjs": "^6.1.0",
     "styled-components": "^5.3.6",
@@ -77,9 +87,11 @@
   },
   "devDependencies": {
     "@apidevtools/json-schema-ref-parser": "^9.0.9",
+    "@types/colormap": "^2.3.4",
+    "@types/d3-color": "^3.1.0",
     "@types/node": "^18.15.11",
+    "@types/proj4": "^2.5.5",
     "@types/shpjs": "^3.4.7",
-    "@types/three": "^0.135.0",
     "@types/uuid": "^10.0.0",
     "rimraf": "^3.0.2",
     "typescript": "^5"

package/style/base.css

@@ -8,6 +8,8 @@
 @import url('./leftPanel.css');
 @import url('./filterPanel.css');
 @import url('./symbologyDialog.css');
+@import url('./statusBar.css');
+@import url('./temporalSlider.css');
 @import url('ol/ol.css');
 
 .jGIS-Toolbar-GroupName {
@@ -48,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/icons/logo_mini_qgz.svg

@@ -0,0 +1,31 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  version="1.1"
+  width="256"
+  height="256"
+  viewBox="0 0 256 256"
+  class="jp-icon-selectable">
+  <g class="jp-icon-selectable">
+    <path
+      class="jp-icon-selectable"
+      d="M137.607,136.899 L172.044,136.899 L142.898,108.083 L107.19,108.083 L107.19,142.392 L137.607,172.708 z"
+      fill="#EE7913" />
+    <path
+      class="jp-icon-selectable"
+      d="M248.061,212.048 L186.618,151.306 L152.01,151.306 L152.01,187.067 L210.891,245.749 L248.061,245.749 z"
+      fill="#589632" />
+    <path
+      class="jp-icon-selectable"
+      d="M152.01,151.306 L186.618,151.306 L172.044,136.899 L137.607,136.899 L137.607,172.708 L152.01,187.067 z"
+      fill="#F0E64A" />
+    <path
+      class="jp-icon-selectable"
+      d="M144.826,199.3 C139.606,200.502 134.183,201.154 128.588,201.154 C88.561,201.154 54.516,168.24 54.516,125.564 C54.516,82.887 88.182,50.695 128.588,50.695 C168.989,50.695 201.158,82.882 201.158,125.564 C201.158,132.501 200.295,139.183 198.697,145.509 L235.744,182.551 C245.296,165.815 250.64,146.354 250.64,125.277 C250.64,59.499 198.147,10.251 127.839,10.251 C57.849,10.251 5.36,59.178 5.36,125.277 C5.36,191.698 57.849,241.598 127.839,241.598 C145.905,241.598 162.791,238.275 177.916,232.227 L144.826,199.3 z"
+      fill="#93B023" />
+    <path
+      class="jp-icon-selectable"
+      d="M107.19,108.083 L248.061,245.749 L248.061,212.048 L186.618,151.306 L172.044,136.898 L142.898,108.083 z"
+      fill="#FFFFFF"
+      fill-opacity="0.172" />
+  </g>
+</svg>

package/style/leftPanel.css

@@ -64,6 +64,14 @@
 .jp-gis-layerGroupHeader.jp-mod-selected .jp-icon-selectable {
   fill: var(--jp-ui-inverse-font-color1);
 }
+.jp-gis-layer.jp-mod-selected path,
+.jp-gis-source.jp-mod-selected path {
+  fill: var(--jp-ui-inverse-font-color1);
+}
+.jp-gis-layer.jp-mod-selected button:hover,
+.jp-gis-source.jp-mod-selected button:hover {
+  background: none;
+}
 
 .jp-gis-layer button,
 .jp-gis-source button {

package/style/statusBar.css

@@ -0,0 +1,16 @@
+.jgis-status-bar {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  height: 16px;
+  background-color: var(--jp-layout-color1);
+  font-size: var(--jp-ui-font-size0);
+}
+
+.jgis-status-bar-item {
+  flex: 0 0 content;
+}
+
+.jgis-status-bar-coords {
+  min-width: 160px;
+}

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;
+}