@jupytergis/base 0.4.4 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/base",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "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.4.4",
+    "@jupytergis/schema": "^0.5.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",

package/style/icons/book_open.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 576 512"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+   <defs
+      id="defs1" />
+   <!--!Font
+   Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License -
+   https://fontawesome.com/license/free -->
+   <path
+      id="path1"
+      d="M542.2 32.1c-54.8 3.1-163.7 14.4-231 55.6-4.6 2.8-7.3 7.9-7.3 13.2v363.9c0 11.6 12.6 18.9 23.3 13.5 69.2-34.8 169.2-44.3 218.7-46.9 16.9-.9 30-14.4 30-30.7V62.8c0-17.7-15.4-31.7-33.8-30.7zM264.7 87.6C197.5 46.5 88.6 35.2 33.8 32.1 15.4 31 0 45 0 62.8V400.6c0 16.2 13.1 29.8 30 30.7 49.5 2.6 149.6 12.1 218.8 47 10.6 5.4 23.2-1.9 23.2-13.5V100.6c0-5.3-2.6-10.1-7.3-13z"
+      fill="#616161"
+      class="jp-icon3"
+   />
+</svg>

package/style/icons/clock-solid.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <!--!FontAwesome Free 6.7.2 by @fontawesome - https://fontawesome.com License -https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
+  <path
+     d="M 256,47.68 C 140.92,47.68 47.68,140.92 47.68,256 47.68,371.08 140.92,464.32 256,464.32 371.08,464.32 464.32,371.08 464.32,256 464.32,140.92 371.08,47.68 256,47.68 Z m 77.7,262.92 v 0 l -16.8,21 a 13.44,13.44 0 0 1 -18.9,2.1 v 0 l -56.28,-41.748 a 33.6,33.6 0 0 1 -12.6,-26.208 V 135.04 a 13.44,13.44 0 0 1 13.44,-13.44 h 26.88 a 13.44,13.44 0 0 1 13.44,13.44 V 256 l 48.72,35.7 a 13.44,13.44 0 0 1 2.1,18.9 z"
+     id="path1"
+     style="stroke-width:0.84"
+     fill="#616161"
+     class="jp-icon3" />
+</svg>

package/style/icons/geolocation.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 384 512"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
+  <path
+     d="M172.3 501.7C27 291 0 269.4 0 192 0 86 86 0 192 0s192 86 192 192c0 77.4-27 99-172.3 309.7-9.5 13.8-29.9 13.8-39.5 0zM192 272c44.2 0 80-35.8 80-80s-35.8-80-80-80-80 35.8-80 80 35.8 80 80 80z"
+     id="path1"
+     style="fill:#616161;fill-opacity:1" />
+</svg>

package/style/icons/info-solid.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    viewBox="0 0 192 512"
+    version="1.1"
+    id="svg1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:svg="http://www.w3.org/2000/svg">
+    <defs
+        id="defs1" />
+    <!--!Font
+    Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License -
+    https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
+    <path
+        d="m 35.2,390.56 h 16 V 275.04 h -16 c -8.8,0 -16,-7.2 -16,-16 V 220.8 c 0,-8.8 7.2,-16 16,-16 h 89.6 c 8.8,0 16,7.2 16,16 v 169.76 h 16 c 8.8,0 16,7.2 16,16 v 38.24 c 0,8.8 -7.2,16 -16,16 H 35.2 c -8.8,0 -16,-7.2 -16,-16 v -38.24 c 0,-8.8 7.2,-16 16,-16 z M 96,51.2 c -31.84,0 -57.6,25.76 -57.6,57.6 0,31.84 25.76,57.6 57.6,57.6 31.84,0 57.6,-25.76 57.6,-57.6 0,-31.84 -25.76,-57.6 -57.6,-57.6 z"
+        id="path1"
+        style="stroke-width:0.8"
+        fill="#616161"
+        class="jp-icon3"
+    />
+</svg>

package/style/icons/raster.svg

@@ -1,5 +1,6 @@
 <svg height="16" viewBox="0 0 24 24" width="16" xmlns="http://www.w3.org/2000/svg">
-  <g class="jp-icon2 jp-icon-selectable" fill="#e2e2e2">
-    <path d="M 22,8 H 2 v 1 h 20 z m 0,10.5 H 2 v 1 H 22 Z M 22,15 H 2 v 1 h 20 z m 0,-3.5 H 2 v 1 h 20 z m 0,-7 H 2 v 1 H 22 Z M 5.5,2 h -1 v 20 h 1 z M 9,2 H 8 v 20 h 1 z m 3.5,0 h -1 v 20 h 1 z M 16,2 h -1 v 20 h 1 z m 3.5,0 h -1 v 20 h 1 z"/>
+  <g class="jp-icon3 jp-icon-selectable" fill="#616161">
+    <path
+      d="M 22,8 H 2 v 1 h 20 z m 0,10.5 H 2 v 1 H 22 Z M 22,15 H 2 v 1 h 20 z m 0,-3.5 H 2 v 1 h 20 z m 0,-7 H 2 v 1 H 22 Z M 5.5,2 h -1 v 20 h 1 z M 9,2 H 8 v 20 h 1 z m 3.5,0 h -1 v 20 h 1 z M 16,2 h -1 v 20 h 1 z m 3.5,0 h -1 v 20 h 1 z" />
   </g>
 </svg>

package/style/icons/target_with_center.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font
+    Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License -
+    https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
+    <path
+        d="M256 0c17.7 0 32 14.3 32 32l0 34.7C368.4 80.1 431.9 143.6 445.3 224l34.7 0c17.7 0 32 14.3 32 32s-14.3 32-32 32l-34.7 0C431.9 368.4 368.4 431.9 288 445.3l0 34.7c0 17.7-14.3 32-32 32s-32-14.3-32-32l0-34.7C143.6 431.9 80.1 368.4 66.7 288L32 288c-17.7 0-32-14.3-32-32s14.3-32 32-32l34.7 0C80.1 143.6 143.6 80.1 224 66.7L224 32c0-17.7 14.3-32 32-32zM128 256a128 128 0 1 0 256 0 128 128 0 1 0 -256 0zm128-80a80 80 0 1 1 0 160 80 80 0 1 1 0-160z"
+        fill="#616161"
+        class="jp-icon3"
+    />
+</svg>

package/style/icons/target_without_center.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
+  <path
+     d="m 256,0 c 17.7,0 32,14.3 32,32 V 66.7 C 368.4,80.1 431.9,143.6 445.3,224 H 480 c 17.7,0 32,14.3 32,32 0,17.7 -14.3,32 -32,32 H 445.3 C 431.9,368.4 368.4,431.9 288,445.3 V 480 c 0,17.7 -14.3,32 -32,32 -17.7,0 -32,-14.3 -32,-32 V 445.3 C 143.6,431.9 80.1,368.4 66.7,288 H 32 C 14.3,288 0,273.7 0,256 0,238.3 14.3,224 32,224 H 66.7 C 80.1,143.6 143.6,80.1 224,66.7 V 32 C 224,14.3 238.3,0 256,0 Z M 128,256 c 0,70.6925 57.30755,127.99994 128,127.99994 70.69245,0 128,-57.30744 128,-127.99994 0,-70.6925 -57.30755,-127.99994 -128,-127.99994 -70.69245,0 -128,57.30744 -128,127.99994 z"
+     id="path1"
+     fill="#616161"
+     class="jp-icon3"
+     />
+</svg>

package/style/icons/terminal_toolbar.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" viewBox="0 0 24 24">
+  <path
+    d="M2 2h20v20H2z"
+    fill="#616161"
+    class="jp-icon3"
+  />
+  <path
+    d="M9.01 14.762q0-.246-.077-.434a.9.9 0 0 0-.234-.351 1.6 1.6 0 0 0-.422-.288 5 5 0 0 0-.627-.263q-.592-.211-1.078-.446a3.5 3.5 0 0 1-.832-.544 2.2 2.2 0 0 1-.528-.721 2.4 2.4 0 0 1-.187-.985q0-.498.17-.908a2.1 2.1 0 0 1 .48-.72q.31-.306.75-.493.44-.188.979-.24V7.11h.937v1.272q.527.07.95.287.421.217.714.568.3.345.457.82.165.47.164 1.055H8.998q0-.709-.323-1.072-.322-.37-.873-.37-.299 0-.521.083a.9.9 0 0 0-.358.223.9.9 0 0 0-.21.334q-.066.194-.065.421 0 .23.064.41a.9.9 0 0 0 .229.329q.165.152.428.293.263.134.656.275.591.223 1.072.463.48.235.82.55.346.312.528.727.187.41.187.973 0 .515-.17.932-.17.41-.486.709t-.762.48a3.7 3.7 0 0 1-.996.229v1.148h-.931V17.1a4 4 0 0 1-.967-.217 2.6 2.6 0 0 1-.832-.504 2.4 2.4 0 0 1-.574-.826q-.217-.505-.217-1.207h1.635q0 .421.123.709.123.281.316.45.2.165.451.235.252.07.516.07.627 0 .949-.292a.98.98 0 0 0 .322-.756m8.36 3.51h-5.343V17h5.344z"
+    fill="#bdbdbd"
+    class="jp-icon-accent1"
+  />
+</svg>

package/style/icons/vector_square.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   class="jp-icon3"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+   <defs
+      id="defs1" />
+   <!--!Font
+   Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License -
+   https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
+   <path
+      d="M 486.4,140.8 V 54.4 c 0,-15.93 -12.87,-28.8 -28.8,-28.8 h -86.4 c -15.93,0 -28.8,12.87 -28.8,28.8 H 169.6 c 0,-15.93 -12.87,-28.8 -28.8,-28.8 H 54.4 c -15.93,0 -28.8,12.87 -28.8,28.8 v 86.4 c 0,15.93 12.87,28.8 28.8,28.8 v 172.8 c -15.93,0 -28.8,12.87 -28.8,28.8 v 86.4 c 0,15.93 12.87,28.8 28.8,28.8 h 86.4 c 15.93,0 28.8,-12.87 28.8,-28.8 h 172.8 c 0,15.93 12.87,28.8 28.8,28.8 h 86.4 c 15.93,0 28.8,-12.87 28.8,-28.8 v -86.4 c 0,-15.93 -12.87,-28.8 -28.8,-28.8 V 169.6 c 15.93,0 28.8,-12.87 28.8,-28.8 z M 400,83.2 h 28.8 V 112 H 400 Z m -316.8,0 H 112 V 112 H 83.2 Z M 112,428.8 H 83.2 V 400 H 112 Z m 316.8,0 H 400 V 400 h 28.8 z M 400,342.4 h -28.8 c -15.93,0 -28.8,12.87 -28.8,28.8 V 400 H 169.6 v -28.8 c 0,-15.93 -12.87,-28.8 -28.8,-28.8 H 112 V 169.6 h 28.8 c 15.93,0 28.8,-12.87 28.8,-28.8 V 112 h 172.8 v 28.8 c 0,15.93 12.87,28.8 28.8,28.8 H 400 Z"
+      id="path1"
+      style="stroke-width:0.9"
+      fill="#616161"
+      class="jp-icon3"
+   />
+</svg>

package/style/leftPanel.css

@@ -3,7 +3,6 @@
 | Distributed under the terms of the Modified BSD License.
 |---------------------------------------------------------------------------- */
 
-.jp-gis-sourcePanel,
 .jp-gis-layerPanel {
   min-height: 3em;
 }

package/lib/panelview/components/sources.d.ts

@@ -1,10 +0,0 @@
-import { Panel } from '@lumino/widgets';
-import { ILeftPanelOptions } from '../leftpanel';
-/**
- * The sources panel widget.
- */
-export declare class SourcesPanel extends Panel {
-    constructor(options: ILeftPanelOptions);
-    private _model;
-    private _onSelect;
-}

package/lib/panelview/components/sources.js

@@ -1,147 +0,0 @@
-import { DOMUtils } from '@jupyterlab/apputils';
-import { LabIcon, ReactWidget } from '@jupyterlab/ui-components';
-import { Panel } from '@lumino/widgets';
-import React, { useEffect, useState } from 'react';
-import { icons } from '../../constants';
-const SOURCES_PANEL_CLASS = 'jp-gis-sourcePanel';
-const SOURCE_CLASS = 'jp-gis-source';
-const SOURCE_TITLE_CLASS = 'jp-gis-sourceTitle';
-const SOURCE_ICON_CLASS = 'jp-gis-sourceIcon';
-const SOURCE_TEXT_CLASS = 'jp-gis-sourceText';
-const SOURCE_UNUSED = 'jp-gis-sourceUnused';
-const SOURCE_INFO = 'jp-gis-sourceInfo';
-/**
- * The sources panel widget.
- */
-export class SourcesPanel extends Panel {
-    constructor(options) {
-        super();
-        this._model = options.model;
-        this._onSelect = options.onSelect;
-        this.id = 'jupytergis::sourcesPanel';
-        this.addClass(SOURCES_PANEL_CLASS);
-        this.addWidget(ReactWidget.create(React.createElement(SourcesBodyComponent, { model: this._model, onSelect: this._onSelect })));
-    }
-}
-/**
- * The body component of the panel.
- */
-function SourcesBodyComponent(props) {
-    var _a, _b;
-    const [model, setModel] = useState((_a = props.model) === null || _a === void 0 ? void 0 : _a.jGISModel);
-    const [sourceIds, setSourceIds] = useState(Private.sortedSourceIds(model));
-    /**
-     * Propagate the source selection.
-     */
-    const onItemClick = ({ type, item, nodeId, event }) => {
-        props.onSelect({ type, item, nodeId, event });
-    };
-    /**
-     * Listen to the sources and changes.
-     */
-    useEffect(() => {
-        const updateSources = () => {
-            setSourceIds([...Private.sortedSourceIds(model)]);
-        };
-        model === null || model === void 0 ? void 0 : model.sharedModel.sourcesChanged.connect(updateSources);
-        model === null || model === void 0 ? void 0 : model.clientStateChanged.connect(updateSources);
-        updateSources();
-        return () => {
-            model === null || model === void 0 ? void 0 : model.sharedModel.sourcesChanged.disconnect(updateSources);
-            model === null || model === void 0 ? void 0 : model.clientStateChanged.disconnect(updateSources);
-        };
-    }, [model]);
-    /**
-     * Update the model when it changes.
-     */
-    (_b = props.model) === null || _b === void 0 ? void 0 : _b.documentChanged.connect((_, widget) => {
-        setModel(widget === null || widget === void 0 ? void 0 : widget.model);
-    });
-    return (React.createElement("div", { id: "jp-gis-sources" }, sourceIds.map(sourceId => {
-        return (React.createElement(SourceComponent, { key: `source-${sourceId}`, gisModel: model, sourceId: sourceId, onClick: onItemClick }));
-    })));
-}
-function isSelected(sourceId, model) {
-    var _a, _b, _c, _d;
-    return ((((_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) &&
-        Object.keys((_d = (_c = model === null || model === void 0 ? void 0 : model.localState) === null || _c === void 0 ? void 0 : _c.selected) === null || _d === void 0 ? void 0 : _d.value).includes(sourceId)) ||
-        false);
-}
-/**
- * The component to display a single source.
- */
-function SourceComponent(props) {
-    const { sourceId, gisModel, onClick } = props;
-    const source = gisModel === null || gisModel === void 0 ? void 0 : gisModel.getSource(sourceId);
-    if (source === undefined) {
-        return React.createElement(React.Fragment, null);
-    }
-    const [id, setId] = useState('');
-    const [selected, setSelected] = useState(
-    // TODO Support multi-selection as `model?.jGISModel?.localState?.selected.value` does
-    isSelected(sourceId, gisModel));
-    const [unused, setUnused] = useState(false);
-    const name = source.name;
-    useEffect(() => {
-        setId(DOMUtils.createDomID());
-    }, []);
-    /**
-     * Check if the source is used by a layer.
-     */
-    useEffect(() => {
-        const checkUsage = () => {
-            const sources = gisModel === null || gisModel === void 0 ? void 0 : gisModel.getLayersBySource(sourceId);
-            setUnused(sources ? sources.length === 0 : true);
-        };
-        gisModel === null || gisModel === void 0 ? void 0 : gisModel.sharedLayersChanged.connect(checkUsage);
-        checkUsage();
-        return () => {
-            gisModel === null || gisModel === void 0 ? void 0 : gisModel.sharedLayersChanged.disconnect(checkUsage);
-        };
-    }, [gisModel]);
-    /**
-     * Listen to the changes on the current source.
-     */
-    useEffect(() => {
-        const onClientSharedStateChanged = (sender, clients) => {
-            // TODO Support follow mode and remoteUser state
-            setSelected(isSelected(sourceId, gisModel));
-        };
-        gisModel === null || gisModel === void 0 ? void 0 : gisModel.clientStateChanged.connect(onClientSharedStateChanged);
-        return () => {
-            gisModel === null || gisModel === void 0 ? void 0 : gisModel.clientStateChanged.disconnect(onClientSharedStateChanged);
-        };
-    }, [gisModel]);
-    const setSelection = (event) => {
-        var _a;
-        const childId = (_a = event.currentTarget.children.namedItem(id)) === null || _a === void 0 ? void 0 : _a.id;
-        onClick({ type: 'source', item: sourceId, nodeId: childId, event });
-    };
-    let mainClasses = SOURCE_CLASS;
-    if (selected) {
-        mainClasses = mainClasses.concat(' jp-mod-selected');
-    }
-    if (unused) {
-        mainClasses = mainClasses.concat(` ${SOURCE_UNUSED}`);
-    }
-    return (React.createElement("div", { className: mainClasses },
-        React.createElement("div", { className: SOURCE_TITLE_CLASS, onClick: setSelection, onContextMenu: setSelection },
-            icons.has(source.type) && (React.createElement(LabIcon.resolveReact, Object.assign({}, icons.get(source.type), { className: SOURCE_ICON_CLASS }))),
-            React.createElement("span", { id: id, className: SOURCE_TEXT_CLASS }, name),
-            unused && React.createElement("span", { className: SOURCE_INFO }, "(unused)"))));
-}
-var Private;
-(function (Private) {
-    function sortedSourceIds(model) {
-        const sources = model === null || model === void 0 ? void 0 : model.getSources();
-        if (sources === undefined) {
-            return [];
-        }
-        return Object.keys(sources).sort((id1, id2) => {
-            const name1 = sources[id1].name.toLowerCase();
-            const name2 = sources[id2].name.toLowerCase();
-            return name1 < name2 ? -1 : name1 > name2 ? 1 : 0;
-        });
-    }
-    Private.sortedSourceIds = sortedSourceIds;
-})(Private || (Private = {}));