@jupytergis/schema 0.8.0 → 0.9.0

package/lib/interfaces.d.ts

@@ -4,6 +4,7 @@ import { IChangedArgs } from '@jupyterlab/coreutils';
 import { IDocumentManager } from '@jupyterlab/docmanager';
 import { DocumentRegistry, IDocumentWidget } from '@jupyterlab/docregistry';
 import { Contents, User } from '@jupyterlab/services';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { JSONObject } from '@lumino/coreutils';
 import { ISignal, Signal } from '@lumino/signaling';
 import { SplitPanel } from '@lumino/widgets';
@@ -132,6 +133,7 @@ export interface IJupyterGISModel extends DocumentRegistry.IModel {
     geolocation: JgisCoordinates;
     localState: IJupyterGISClientState | null;
     annotationModel?: IAnnotationModel;
+    currentMode: 'panning' | 'identifying';
     themeChanged: Signal<IJupyterGISModel, IChangedArgs<string, string | null, string>>;
     clientStateChanged: ISignal<IJupyterGISModel, Map<number, IJupyterGISClientState>>;
     sharedOptionsChanged: ISignal<IJupyterGISDoc, MapChange>;
@@ -156,7 +158,9 @@ export interface IJupyterGISModel extends DocumentRegistry.IModel {
         sourceId: string;
         features: FeatureLike[];
     }) => void;
-    getSettings(): IJupyterGISSettings;
+    getSettings(): Promise<ISettingRegistry.ISettings>;
+    settingsChanged: ISignal<IJupyterGISModel, string>;
+    jgisSettings: IJupyterGISSettings;
     getContent(): IJGISContent;
     getLayers(): IJGISLayers;
     getLayer(id: string): IJGISLayer | undefined;
@@ -190,7 +194,6 @@ export interface IJupyterGISModel extends DocumentRegistry.IModel {
     removeMetadata(key: string): void;
     centerOnPosition(id: string): void;
     toggleIdentify(): void;
-    isIdentifying: boolean;
     isTemporalControllerActive: boolean;
     toggleTemporalController(): void;
     addFeatureAsMs(id: string, selectedFeature: string): void;
@@ -292,4 +295,12 @@ export interface IAnnotation {
 }
 export interface IJupyterGISSettings {
     proxyUrl: string;
+    leftPanelDisabled?: boolean;
+    rightPanelDisabled?: boolean;
+    layersDisabled?: boolean;
+    stacBrowserDisabled?: boolean;
+    filtersDisabled?: boolean;
+    objectPropertiesDisabled?: boolean;
+    annotationsDisabled?: boolean;
+    identifyDisabled?: boolean;
 }

package/lib/model.d.ts

@@ -14,7 +14,16 @@ export declare class JupyterGISModel implements IJupyterGISModel {
      * Initialize custom settings for JupyterLab.
      */
     initSettings(): Promise<void>;
-    getSettings(): IJupyterGISSettings;
+    private _updateLocalSettings;
+    get jgisSettings(): IJupyterGISSettings;
+    /**
+     * Expose the settingsChanged signal for external use.
+     */
+    get settingsChanged(): ISignal<JupyterGISModel, string>;
+    /**
+     * Return stored settings.
+     */
+    getSettings(): Promise<ISettingRegistry.ISettings>;
     getFeaturesForCurrentTile({ sourceId }: {
         sourceId: string;
     }): FeatureLike[];
@@ -46,8 +55,6 @@ export declare class JupyterGISModel implements IJupyterGISModel {
     get disposed(): ISignal<JupyterGISModel, void>;
     get sharedMetadataChanged(): ISignal<this, MapChange>;
     get zoomToPositionSignal(): ISignal<this, string>;
-    set isIdentifying(isIdentifying: boolean);
-    get isIdentifying(): boolean;
     set isTemporalControllerActive(isActive: boolean);
     get isTemporalControllerActive(): boolean;
     centerOnPosition(id: string): void;
@@ -154,6 +161,8 @@ export declare class JupyterGISModel implements IJupyterGISModel {
     renameLayerGroup(groupName: string, newName: string): void;
     removeLayerGroup(groupName: string): void;
     toggleIdentify(): void;
+    get currentMode(): 'panning' | 'identifying';
+    set currentMode(value: 'panning' | 'identifying');
     toggleTemporalController(): void;
     private _getLayerTreeInfo;
     private _onClientStateChanged;
@@ -169,6 +178,9 @@ export declare class JupyterGISModel implements IJupyterGISModel {
     readonly annotationModel?: IAnnotationModel;
     readonly settingRegistry?: ISettingRegistry;
     private _settings;
+    private _settingsChanged;
+    private _jgisSettings;
+    private _currentMode;
     private _sharedModel;
     private _filePath;
     private _contentsManager?;
@@ -187,7 +199,6 @@ export declare class JupyterGISModel implements IJupyterGISModel {
     private _zoomToPositionSignal;
     private _addFeatureAsMsSignal;
     private _updateLayerSignal;
-    private _isIdentifying;
     private _isTemporalControllerActive;
     static worker: Worker;
     private _geolocation;

package/lib/model.js

@@ -44,7 +44,6 @@ export class JupyterGISModel {
         this._zoomToPositionSignal = new Signal(this);
         this._addFeatureAsMsSignal = new Signal(this);
         this._updateLayerSignal = new Signal(this);
-        this._isIdentifying = false;
         this._isTemporalControllerActive = false;
         this._geolocationChanged = new Signal(this);
         this._tileFeatureCache = new Map();
@@ -61,21 +60,95 @@ export class JupyterGISModel {
         this.annotationModel = annotationModel;
         this.settingRegistry = settingRegistry;
         this._pathChanged = new Signal(this);
+        this._settingsChanged = new Signal(this);
+        this._jgisSettings = {
+            proxyUrl: 'https://corsproxy.io',
+            leftPanelDisabled: false,
+            rightPanelDisabled: false,
+            layersDisabled: false,
+            stacBrowserDisabled: false,
+            filtersDisabled: false,
+            objectPropertiesDisabled: false,
+            annotationsDisabled: false,
+            identifyDisabled: false,
+        };
+        this.initSettings();
     }
     /**
      * Initialize custom settings for JupyterLab.
      */
     async initSettings() {
         if (this.settingRegistry) {
-            const setting = await this.settingRegistry.load(SETTINGS_ID);
-            this._settings = setting.composite;
-            setting.changed.connect(() => {
-                this._settings = setting.composite;
-                console.log('JupyterGIS Settings updated:', this._settings);
-            });
+            try {
+                const setting = await this.settingRegistry.load(SETTINGS_ID);
+                this._settings = setting;
+                this._updateLocalSettings();
+                setting.changed.connect(() => {
+                    const oldSettings = Object.assign({}, this._jgisSettings);
+                    this._updateLocalSettings();
+                    const newSettings = this._jgisSettings;
+                    const keys = [
+                        'proxyUrl',
+                        'leftPanelDisabled',
+                        'rightPanelDisabled',
+                        'layersDisabled',
+                        'stacBrowserDisabled',
+                        'filtersDisabled',
+                        'objectPropertiesDisabled',
+                        'annotationsDisabled',
+                        'identifyDisabled',
+                    ];
+                    keys.forEach(key => {
+                        if (oldSettings[key] !== newSettings[key]) {
+                            this._settingsChanged.emit(key);
+                        }
+                    });
+                });
+            }
+            catch (error) {
+                console.error(`Failed to load settings for ${SETTINGS_ID}:`, error);
+                this._jgisSettings = {
+                    proxyUrl: 'https://corsproxy.io',
+                    leftPanelDisabled: false,
+                    rightPanelDisabled: false,
+                    layersDisabled: false,
+                    stacBrowserDisabled: false,
+                    filtersDisabled: false,
+                    objectPropertiesDisabled: false,
+                    annotationsDisabled: false,
+                    identifyDisabled: false,
+                };
+            }
         }
     }
-    getSettings() {
+    _updateLocalSettings() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        const composite = this._settings.composite;
+        this._jgisSettings = {
+            proxyUrl: (_a = composite.proxyUrl) !== null && _a !== void 0 ? _a : 'https://corsproxy.io',
+            leftPanelDisabled: (_b = composite.leftPanelDisabled) !== null && _b !== void 0 ? _b : false,
+            rightPanelDisabled: (_c = composite.rightPanelDisabled) !== null && _c !== void 0 ? _c : false,
+            layersDisabled: (_d = composite.layersDisabled) !== null && _d !== void 0 ? _d : false,
+            stacBrowserDisabled: (_e = composite.stacBrowserDisabled) !== null && _e !== void 0 ? _e : false,
+            filtersDisabled: (_f = composite.filtersDisabled) !== null && _f !== void 0 ? _f : false,
+            objectPropertiesDisabled: (_g = composite.objectPropertiesDisabled) !== null && _g !== void 0 ? _g : false,
+            annotationsDisabled: (_h = composite.annotationsDisabled) !== null && _h !== void 0 ? _h : false,
+            identifyDisabled: (_j = composite.identifyDisabled) !== null && _j !== void 0 ? _j : false,
+        };
+    }
+    get jgisSettings() {
+        return this._jgisSettings;
+    }
+    /**
+     * Expose the settingsChanged signal for external use.
+     */
+    get settingsChanged() {
+        return this._settingsChanged;
+    }
+    /**
+     * Return stored settings.
+     */
+    async getSettings() {
         return this._settings;
     }
     getFeaturesForCurrentTile({ sourceId }) {
@@ -165,12 +238,6 @@ export class JupyterGISModel {
     get zoomToPositionSignal() {
         return this._zoomToPositionSignal;
     }
-    set isIdentifying(isIdentifying) {
-        this._isIdentifying = isIdentifying;
-    }
-    get isIdentifying() {
-        return this._isIdentifying;
-    }
     set isTemporalControllerActive(isActive) {
         this._isTemporalControllerActive = isActive;
     }
@@ -546,7 +613,18 @@ export class JupyterGISModel {
         }
     }
     toggleIdentify() {
-        this._isIdentifying = !this._isIdentifying;
+        if (this._currentMode === 'identifying') {
+            this._currentMode = 'panning';
+        }
+        else {
+            this._currentMode = 'identifying';
+        }
+    }
+    get currentMode() {
+        return this._currentMode;
+    }
+    set currentMode(value) {
+        this._currentMode = value;
     }
     toggleTemporalController() {
         this._isTemporalControllerActive = !this._isTemporalControllerActive;

package/lib/processing/_generated/exportProcessingSchema.d.ts

@@ -1,6 +1,6 @@
+export * from '../../_interface/processing/centroids';
 export * from '../../_interface/processing/buffer';
 export * from '../../_interface/processing/concaveHull';
-export * from '../../_interface/processing/centroids';
+export * from '../../_interface/processing/boundingBoxes';
 export * from '../../_interface/processing/convexHull';
 export * from '../../_interface/processing/dissolve';
-export * from '../../_interface/processing/boundingBoxes';

package/lib/processing/_generated/exportProcessingSchema.js

@@ -1,7 +1,7 @@
 //Generated automatically please don't modify directly
+export * from '../../_interface/processing/centroids';
 export * from '../../_interface/processing/buffer';
 export * from '../../_interface/processing/concaveHull';
-export * from '../../_interface/processing/centroids';
+export * from '../../_interface/processing/boundingBoxes';
 export * from '../../_interface/processing/convexHull';
 export * from '../../_interface/processing/dissolve';
-export * from '../../_interface/processing/boundingBoxes';

package/lib/processing/_generated/processingType.d.ts

@@ -1,2 +1,2 @@
-export type ProcessingType = 'Buffer' | 'ConcaveHull' | 'Centroids' | 'ConvexHull' | 'Dissolve' | 'BoundingBoxes';
+export type ProcessingType = 'Centroids' | 'Buffer' | 'ConcaveHull' | 'BoundingBoxes' | 'ConvexHull' | 'Dissolve';
 export declare const processingList: string[];

package/lib/processing/_generated/processingType.js

@@ -1,8 +1,8 @@
 export const processingList = [
+    'Centroids',
     'Buffer',
     'ConcaveHull',
-    'Centroids',
+    'BoundingBoxes',
     'ConvexHull',
     'Dissolve',
-    'BoundingBoxes',
 ];

package/lib/processing/_generated/processing_merge.json

@@ -1,4 +1,15 @@
 [
+    {
+        "description": "Centroids",
+        "name": "centroids",
+        "operationParams": [],
+        "label": "Centroids",
+        "operations": {
+            "gdalFunction": "ogr2ogr",
+            "sql": "SELECT ST_Centroid(geometry) AS geometry, * FROM \"{layerName}\""
+        },
+        "type": "vector"
+    },
     {
         "description": "Buffer",
         "name": "buffer",
@@ -27,13 +38,13 @@
         "type": "vector"
     },
     {
-        "description": "Centroids",
-        "name": "centroids",
+        "description": "BoundingBoxes",
+        "name": "boundingBoxes",
         "operationParams": [],
-        "label": "Centroids",
+        "label": "Bounding Boxes",
         "operations": {
-            "gdalFunction": "ogr2ogr",
-            "sql": "SELECT ST_Centroid(geometry) AS geometry, * FROM \"{layerName}\""
+            "sql": "SELECT ST_Envelope(geometry) AS geometry, * FROM \"{layerName}\"",
+            "gdalFunction": "ogr2ogr"
         },
         "type": "vector"
     },
@@ -60,16 +71,5 @@
             "sql": "SELECT ST_Union(geometry) AS geometry, {dissolveField} FROM \"{layerName}\" GROUP BY {dissolveField}"
         },
         "type": "vector"
-    },
-    {
-        "description": "BoundingBoxes",
-        "name": "boundingBoxes",
-        "operationParams": [],
-        "label": "Bounding Boxes",
-        "operations": {
-            "sql": "SELECT ST_Envelope(geometry) AS geometry, * FROM \"{layerName}\"",
-            "gdalFunction": "ogr2ogr"
-        },
-        "type": "vector"
     }
 ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/schema",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "A JupyterGIS schema package.",
   "keywords": [
     "jupytergis"