@jupytergis/base 0.6.2 → 0.8.0

package/lib/widget.js

@@ -65,12 +65,13 @@ export class JupyterGISOutputWidget extends MainAreaWidget {
     }
 }
 export class JupyterGISPanel extends SplitPanel {
-    constructor(options) {
+    constructor(_a) {
+        var { model, consoleTracker, state, commandRegistry, formSchemaRegistry, annotationModel } = _a, consoleOption = __rest(_a, ["model", "consoleTracker", "state", "commandRegistry", "formSchemaRegistry", "annotationModel"]);
         super({ orientation: 'vertical', spacing: 0 });
         this._consoleOpened = false;
-        const { model, consoleTracker, commandRegistry } = options, consoleOption = __rest(options, ["model", "consoleTracker", "commandRegistry"]);
+        this._state = state;
         this._initModel({ model, commandRegistry });
-        this._initView();
+        this._initView(formSchemaRegistry, annotationModel);
         this._consoleOption = Object.assign({ commandRegistry }, consoleOption);
         this._consoleTracker = consoleTracker;
     }
@@ -82,9 +83,12 @@ export class JupyterGISPanel extends SplitPanel {
             commands: options.commandRegistry,
         });
     }
-    _initView() {
+    _initView(formSchemaRegistry, annotationModel) {
         this._jupyterGISMainViewPanel = new JupyterGISMainViewPanel({
             mainViewModel: this._mainViewModel,
+            state: this._state,
+            formSchemaRegistry: formSchemaRegistry,
+            annotationModel: annotationModel,
         });
         this.addWidget(this._jupyterGISMainViewPanel);
         SplitPanel.setStretch(this._jupyterGISMainViewPanel, 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/base",
-  "version": "0.6.2",
+  "version": "0.8.0",
   "description": "A JupyterLab extension for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -44,7 +44,7 @@
     "@jupyter/collaboration": "^3.1.0",
     "@jupyter/react-components": "^0.16.6",
     "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
-    "@jupytergis/schema": "^0.6.2",
+    "@jupytergis/schema": "^0.8.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",
@@ -80,7 +80,9 @@
     "date-fns": "^4.1.0",
     "gdal3.js": "^2.8.1",
     "geojson-vt": "^4.0.2",
+    "geoparquet": "^0.3.0",
     "geotiff": "^2.1.3",
+    "hyparquet-compressors": "^1.1.1",
     "lucide-react": "^0.513.0",
     "ol": "^10.1.0",
     "ol-pmtiles": "^0.5.0",

package/style/base.css

@@ -10,7 +10,7 @@
 @import url('./symbologyDialog.css');
 @import url('./statusBar.css');
 @import url('./temporalSlider.css');
-@import url('./stacBrowser.css');
+@import url('./tabPanel.css');
 @import url('ol/ol.css');
 @import url('./shared/button.css');
 @import url('./shared/toggle.css');
@@ -34,7 +34,7 @@
 /* Overwrite forms CSS */
 .jGIS-property-panel .array-item-list {
   display: flex;
-  gap: 1rem;
+  background-color: var(--jp-layout-color0);
 }
 
 .jGIS-property-panel .rjsf .array-item:not(:last-child) {
@@ -85,3 +85,19 @@ button.jp-mod-styled.jp-mod-reject {
   white-space: nowrap;
   border-width: 0;
 }
+
+.jgis-right-panel-container {
+  width: 330px;
+  top: 30px;
+  right: 0px;
+  position: absolute;
+  margin: 5px;
+}
+
+.jgis-left-panel-container {
+  position: absolute;
+  width: 250px;
+  top: 30px;
+  left: 0px;
+  margin: 5px;
+}

package/style/shared/tabs.css

@@ -1,14 +1,26 @@
+.jgis-panel-tabs {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  justify-content: center;
+  align-items: center;
+  background-color: var(--jp-layout-color0);
+  box-shadow:
+    0 4px 8px 0 rgba(0, 0, 0, 0.2),
+    0 6px 20px 0 rgba(0, 0, 0, 0.19);
+  border-radius: 5px;
+}
 .jgis-tabs-list {
   display: inline-flex;
   height: 2.5rem;
   align-items: center;
   justify-content: space-evenly;
-  border-radius: 0.375rem;
   background-color: var(--jp-layout-color2);
-  padding: 0.25rem;
   color: var(--jp-ui-font-color0);
   gap: 1rem;
   width: 100%;
+  font-size: 9px;
+  border-radius: 5px;
 }
 
 .jgis-tabs-trigger {
@@ -47,6 +59,8 @@
 .jgis-tabs-content {
   outline: none;
   width: 100%;
+  overflow-y: scroll;
+  max-height: 480px;
 }
 
 .jgis-tabs-content:focus-visible {

package/style/stacBrowser.css

@@ -1,9 +1,3 @@
-.jgis-stac-browser-main {
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-}
-
 .jgis-stac-browser-collection {
   flex-wrap: wrap;
   margin-top: 0.5rem;

package/style/tabPanel.css

@@ -0,0 +1,91 @@
+.jgis-panel-tab-content {
+  border-radius: 5px;
+  font-size: 10px;
+  padding-bottom: 50px;
+}
+
+.jgis-stac-browser-collection {
+  flex-wrap: wrap;
+  margin-top: 0.5rem;
+}
+
+.jgis-stac-browser-section-item {
+  border-radius: 1rem !important;
+  cursor: pointer;
+}
+
+.jgis-stac-browser-results-item {
+  border-radius: 1rem !important;
+  cursor: pointer;
+  white-space: normal !important;
+  height: auto !important;
+}
+
+.jgis-stac-browser-results-list {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  word-break: break-word;
+  padding: 0.25rem;
+  margin-right: 0.5rem;
+}
+
+.jgis-stac-browser-date-picker {
+  display: flex;
+  justify-content: space-around;
+  flex-wrap: wrap;
+  gap: 0.5rem;
+}
+
+.jgis-stac-browser-filters-panel {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  align-items: flex-start;
+  padding: 0 0.5rem;
+}
+
+.jgis-stac-filter-trigger {
+  max-width: fit-content;
+  border: 1px solid var(--jp-border-color0);
+  padding: 0.5rem;
+  cursor: pointer;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  gap: 0.15rem;
+}
+
+.jgis-stac-filter-trigger:disabled {
+  cursor: not-allowed;
+}
+
+.jgis-stac-filter-section-container {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25rem;
+}
+
+.jgis-stac-filter-section-badges {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.25rem;
+}
+
+.jgis-stac-datepicker-icon {
+  width: 1rem;
+  height: 1rem;
+}
+
+.jgis-stac-badge {
+  gap: 0.25rem;
+  padding-right: 0.3rem !important;
+}
+
+.jgis-stac-badge-icon:hover {
+  background-color: color-mix(
+    in srgb,
+    var(--jp-error-color0),
+    transparent 20%
+  ) !important;
+}

package/style/temporalSlider.css

@@ -5,6 +5,7 @@
   padding: 0.5rem;
   background-color: var(--jp-layout-color1);
   border-bottom: 1px solid var(--jp-border-color1);
+  z-index: 99;
 }
 
 .jp-gis-temporal-slider-container span,

package/lib/panelview/model.d.ts

@@ -1,19 +0,0 @@
-import { IJupyterGISDoc, IJupyterGISModel, IJupyterGISTracker, IJupyterGISWidget } from '@jupytergis/schema';
-import { ISignal } from '@lumino/signaling';
-import { IControlPanelModel } from "../types";
-export declare class ControlPanelModel implements IControlPanelModel {
-    constructor(options: ControlPanelModel.IOptions);
-    get documentChanged(): ISignal<IJupyterGISTracker, IJupyterGISWidget | null>;
-    get filePath(): string | undefined;
-    get jGISModel(): IJupyterGISModel | undefined;
-    get sharedModel(): IJupyterGISDoc | undefined;
-    disconnect(f: any): void;
-    private readonly _tracker;
-    private _documentChanged;
-}
-declare namespace ControlPanelModel {
-    interface IOptions {
-        tracker: IJupyterGISTracker;
-    }
-}
-export {};

package/lib/panelview/model.js

@@ -1,30 +0,0 @@
-export class ControlPanelModel {
-    constructor(options) {
-        this._tracker = options.tracker;
-        this._documentChanged = this._tracker.currentChanged;
-    }
-    get documentChanged() {
-        return this._documentChanged;
-    }
-    get filePath() {
-        var _a;
-        return (_a = this._tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model.filePath;
-    }
-    get jGISModel() {
-        var _a;
-        return (_a = this._tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
-    }
-    get sharedModel() {
-        var _a;
-        return (_a = this._tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model.sharedModel;
-    }
-    disconnect(f) {
-        this._tracker.forEach(w => {
-            w.model.sharedLayersChanged.disconnect(f);
-            w.model.sharedSourcesChanged.disconnect(f);
-            w.model.sharedOptionsChanged.disconnect(f);
-        });
-        this._tracker.forEach(w => w.model.themeChanged.disconnect(f));
-        this._tracker.forEach(w => w.model.clientStateChanged.disconnect(f));
-    }
-}

package/lib/stacBrowser/StacBrowser.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-import { IControlPanelModel } from "../types";
-interface IStacBrowserDialogProps {
-    controlPanelModel: IControlPanelModel;
-}
-declare const StacBrowser: ({ controlPanelModel }: IStacBrowserDialogProps) => React.JSX.Element;
-export default StacBrowser;

package/lib/stacBrowser/StacBrowser.js

@@ -1,16 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import StacPanelView from "./components/StacPanelView";
-const StacBrowser = ({ controlPanelModel }) => {
-    const [jgisModel, setJgisModel] = useState(controlPanelModel === null || controlPanelModel === void 0 ? void 0 : controlPanelModel.jGISModel);
-    useEffect(() => {
-        const handleCurrentChanged = (_, widget) => {
-            setJgisModel(widget === null || widget === void 0 ? void 0 : widget.model);
-        };
-        controlPanelModel.documentChanged.connect(handleCurrentChanged);
-        return () => {
-            controlPanelModel.documentChanged.disconnect(handleCurrentChanged);
-        };
-    }, [controlPanelModel]);
-    return React.createElement(StacPanelView, { model: jgisModel });
-};
-export default StacBrowser;

package/lib/stacBrowser/StacPanel.d.ts

@@ -1,14 +0,0 @@
-import { IJupyterGISTracker } from '@jupytergis/schema';
-import { Panel } from '@lumino/widgets';
-import { IControlPanelModel } from "../types";
-export declare class StacPanel extends Panel {
-    constructor(options: StacPanel.IOptions);
-    private _model;
-}
-export declare namespace StacPanel {
-    interface IOptions {
-        model: IControlPanelModel;
-        tracker: IJupyterGISTracker;
-    }
-}
-export default StacPanel;

package/lib/stacBrowser/StacPanel.js

@@ -1,16 +0,0 @@
-import { ReactWidget } from '@jupyterlab/ui-components';
-import { Panel } from '@lumino/widgets';
-import React from 'react';
-import StacBrowser from "./StacBrowser";
-export class StacPanel extends Panel {
-    constructor(options) {
-        super();
-        this._model = options.model;
-        this.id = 'jupytergis::stacPanel';
-        this.title.caption = 'STAC';
-        this.title.label = 'STAC';
-        this.addClass('jgis-scrollable');
-        this.addWidget(ReactWidget.create(React.createElement(StacBrowser, { controlPanelModel: this._model })));
-    }
-}
-export default StacPanel;