@jupytergis/schema 0.4.4 → 0.5.0

package/lib/_interface/project/jgis.d.ts

@@ -42,6 +42,7 @@ export type IJGISLayerItem = string | IJGISLayerGroup;
 export type IJGISLayerTree = IJGISLayerItem[];
 
 export interface IJGISContent {
+  schemaVersion?: string;
   layers: IJGISLayers;
   sources: IJGISSources;
   layerTree?: IJGISLayerTree;

package/lib/_interface/version.d.ts

@@ -0,0 +1 @@
+export declare const SCHEMA_VERSION = '0.5.0';

package/lib/_interface/version.js

@@ -0,0 +1 @@
+export const SCHEMA_VERSION = '0.5.0';

package/lib/doc.js

@@ -1,6 +1,7 @@
 import { YDocument } from '@jupyter/ydoc';
 import { JSONExt } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
+import { SCHEMA_VERSION } from './_interface/version';
 export class JupyterGISDoc extends YDocument {
     constructor() {
         super();
@@ -66,7 +67,7 @@ export class JupyterGISDoc extends YDocument {
         super.dispose();
     }
     get version() {
-        return '0.1.0';
+        return SCHEMA_VERSION;
     }
     get layers() {
         return JSONExt.deepCopy(this._layers.toJSON());

package/lib/index.d.ts

@@ -2,3 +2,4 @@ export * from './interfaces';
 export * from './model';
 export * from './token';
 export * from './doc';
+export { SCHEMA_VERSION } from './_interface/version';

package/lib/index.js

@@ -2,3 +2,4 @@ export * from './interfaces';
 export * from './model';
 export * from './token';
 export * from './doc';
+export { SCHEMA_VERSION } from './_interface/version';

package/lib/interfaces.d.ts

@@ -128,6 +128,7 @@ export interface IJupyterGISDocChange extends DocumentChange {
 export interface IJupyterGISModel extends DocumentRegistry.IModel {
     isDisposed: boolean;
     sharedModel: IJupyterGISDoc;
+    geolocation: JgisCoordinates;
     localState: IJupyterGISClientState | null;
     annotationModel?: IAnnotationModel;
     themeChanged: Signal<IJupyterGISModel, IChangedArgs<string, string | null, string>>;
@@ -140,8 +141,12 @@ export interface IJupyterGISModel extends DocumentRegistry.IModel {
     zoomToPositionSignal: ISignal<IJupyterGISModel, string>;
     addFeatureAsMsSignal: ISignal<IJupyterGISModel, string>;
     updateLayerSignal: ISignal<IJupyterGISModel, string>;
+    geolocationChanged: Signal<IJupyterGISModel, JgisCoordinates>;
+    flyToGeometrySignal: Signal<IJupyterGISModel, any>;
+    highlightFeatureSignal: Signal<IJupyterGISModel, any>;
     contentsManager: Contents.IManager | undefined;
     filePath: string;
+    getSettings(): IJupyterGISSettings;
     getContent(): IJGISContent;
     getLayers(): IJGISLayers;
     getLayer(id: string): IJGISLayer | undefined;
@@ -256,6 +261,7 @@ export interface IAnnotationModel {
     getAnnotation(id: string): IAnnotation | undefined;
     getAnnotationIds(): string[];
     addAnnotation(key: string, value: IAnnotation): void;
+    updateAnnotation(id: string, updates: Partial<IAnnotation>): void;
     removeAnnotation(key: string): void;
     addContent(id: string, value: string): void;
 }
@@ -272,4 +278,8 @@ export interface IAnnotation {
     zoom: number;
     contents: IAnnotationContent[];
     parent: string;
+    open: boolean;
+}
+export interface IJupyterGISSettings {
+    proxyUrl: string;
 }

package/lib/model.d.ts

@@ -5,9 +5,15 @@ import { Contents } from '@jupyterlab/services';
 import { PartialJSONObject } from '@lumino/coreutils';
 import { ISignal, Signal } from '@lumino/signaling';
 import { IJGISContent, IJGISLayer, IJGISLayerGroup, IJGISLayerTree, IJGISLayers, IJGISOptions, IJGISSource, IJGISSources } from './_interface/project/jgis';
-import { IAnnotationModel, IDict, IJGISLayerDocChange, IJGISLayerTreeDocChange, IJGISSourceDocChange, IJupyterGISClientState, IJupyterGISDoc, IJupyterGISModel, ISelection, IUserData, IViewPortState, Pointer } from './interfaces';
+import { IAnnotationModel, IDict, IJGISLayerDocChange, IJGISLayerTreeDocChange, IJGISSourceDocChange, IJupyterGISClientState, IJupyterGISDoc, IJupyterGISModel, ISelection, IUserData, IViewPortState, JgisCoordinates, Pointer, IJupyterGISSettings } from './interfaces';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
 export declare class JupyterGISModel implements IJupyterGISModel {
     constructor(options: JupyterGISModel.IOptions);
+    /**
+     * Initialize custom settings for JupyterLab.
+     */
+    initSettings(): Promise<void>;
+    getSettings(): IJupyterGISSettings;
     private _onSharedModelChanged;
     readonly collaborative: boolean;
     get sharedModel(): IJupyterGISDoc;
@@ -46,6 +52,8 @@ export declare class JupyterGISModel implements IJupyterGISModel {
     fromJSON(data: PartialJSONObject): void;
     initialize(): void;
     getWorker(): Worker;
+    readonly flyToGeometrySignal: Signal<this, any>;
+    readonly highlightFeatureSignal: Signal<this, any>;
     getContent(): IJGISContent;
     /**
      * Getter for the contents manager.
@@ -143,9 +151,14 @@ export declare class JupyterGISModel implements IJupyterGISModel {
     get addFeatureAsMsSignal(): Signal<this, string>;
     get updateLayerSignal(): Signal<this, string>;
     triggerLayerUpdate: (layerId: string, layer: IJGISLayer) => void;
+    get geolocation(): JgisCoordinates;
+    set geolocation(geolocation: JgisCoordinates);
+    get geolocationChanged(): Signal<this, JgisCoordinates>;
     readonly defaultKernelName: string;
     readonly defaultKernelLanguage: string;
     readonly annotationModel?: IAnnotationModel;
+    readonly settingRegistry?: ISettingRegistry;
+    private _settings;
     private _sharedModel;
     private _filePath;
     private _contentsManager?;
@@ -166,6 +179,8 @@ export declare class JupyterGISModel implements IJupyterGISModel {
     private _isIdentifying;
     private _isTemporalControllerActive;
     static worker: Worker;
+    private _geolocation;
+    private _geolocationChanged;
 }
 export declare namespace JupyterGISModel {
     /**
@@ -174,5 +189,6 @@ export declare namespace JupyterGISModel {
     function getOrderedLayerIds(model: IJupyterGISModel): string[];
     interface IOptions extends DocumentRegistry.IModelOptions<IJupyterGISDoc> {
         annotationModel?: IAnnotationModel;
+        settingRegistry?: ISettingRegistry;
     }
 }

package/lib/model.js

@@ -2,6 +2,7 @@ import { Signal } from '@lumino/signaling';
 import Ajv from 'ajv';
 import { JupyterGISDoc } from './doc';
 import jgisSchema from './schema/project/jgis.json';
+const SETTINGS_ID = '@jupytergis/jupytergis-core:jupytergis-settings';
 export class JupyterGISModel {
     constructor(options) {
         this._onSharedModelChanged = (sender, changes) => {
@@ -12,6 +13,8 @@ export class JupyterGISModel {
             }
         };
         this.collaborative = document.querySelectorAll('[data-jupyter-lite-root]')[0] === undefined;
+        this.flyToGeometrySignal = new Signal(this);
+        this.highlightFeatureSignal = new Signal(this);
         this._onClientStateChanged = (changed) => {
             const clients = this.sharedModel.awareness.getStates();
             this._clientStateChanged.emit(clients);
@@ -42,7 +45,8 @@ export class JupyterGISModel {
         this._updateLayerSignal = new Signal(this);
         this._isIdentifying = false;
         this._isTemporalControllerActive = false;
-        const { annotationModel, sharedModel } = options;
+        this._geolocationChanged = new Signal(this);
+        const { annotationModel, sharedModel, settingRegistry } = options;
         if (sharedModel) {
             this._sharedModel = sharedModel;
         }
@@ -53,6 +57,23 @@ export class JupyterGISModel {
         this.sharedModel.awareness.on('change', this._onClientStateChanged);
         this._sharedModel.metadataChanged.connect(this._metadataChangedHandler, this);
         this.annotationModel = annotationModel;
+        this.settingRegistry = settingRegistry;
+    }
+    /**
+     * 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);
+            });
+        }
+    }
+    getSettings() {
+        return this._settings;
     }
     get sharedModel() {
         return this._sharedModel;
@@ -320,8 +341,12 @@ export class JupyterGISModel {
         this._addLayerTreeItem(id, groupName, position);
     }
     removeLayer(layer_id) {
+        var _a;
+        const layer = this._sharedModel.getLayer(layer_id);
+        const source_id = (_a = layer === null || layer === void 0 ? void 0 : layer.parameters) === null || _a === void 0 ? void 0 : _a.source;
         this._removeLayerTreeLayer(this.getLayerTree(), layer_id);
         this.sharedModel.removeLayer(layer_id);
+        this.sharedModel.removeSource(source_id);
     }
     setOptions(value) {
         this._sharedModel.options = value;
@@ -540,6 +565,16 @@ export class JupyterGISModel {
     get updateLayerSignal() {
         return this._updateLayerSignal;
     }
+    get geolocation() {
+        return this._geolocation;
+    }
+    set geolocation(geolocation) {
+        this._geolocation = geolocation;
+        this.geolocationChanged.emit(this.geolocation);
+    }
+    get geolocationChanged() {
+        return this._geolocationChanged;
+    }
 }
 (function (JupyterGISModel) {
     /**

package/lib/schema/project/jgis.json

@@ -4,6 +4,10 @@
     "required": ["layers", "sources"],
     "additionalProperties": false,
     "properties": {
+        "schemaVersion": {
+            "type": "string",
+            "default": "0.5.0"
+        },
         "layers": {
             "$ref": "#/definitions/jGISLayers"
         },

package/lib/types.d.ts

@@ -22,3 +22,4 @@ export * from './doc';
 export * from './interfaces';
 export * from './model';
 export * from './token';
+export * from './index';

package/lib/types.js

@@ -27,3 +27,4 @@ export * from './doc';
 export * from './interfaces';
 export * from './model';
 export * from './token';
+export * from './index';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/schema",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "description": "A JupyterGIS schema package.",
   "keywords": [
     "jupytergis"
@@ -28,7 +28,7 @@
     "build": "jlpm build:schema && jlpm build:lib",
     "build:schema": "node ./cacheGeoJSONSchema.js && jlpm build:schema:js && jlpm build:schema:py",
     "build:schema:js": "json2ts -i src/schema -o src/_interface --no-unknownAny --unreachableDefinitions --cwd ./src/schema && cd src/schema && node ../../schema.js",
-    "build:schema:py": "datamodel-codegen --input ./src/schema --output ../../python/jupytergis_lab/jupytergis_lab/notebook/objects/_schema --output-model-type pydantic_v2.BaseModel --input-file-type jsonschema",
+    "build:schema:py": "datamodel-codegen --input ./src/schema --output ../../python/jupytergis_core/jupytergis_core/schema/interfaces --output-model-type pydantic_v2.BaseModel --input-file-type jsonschema",
     "build:prod": "jlpm run clean && jlpm build:schema && jlpm run build:lib",
     "build:lib": "tsc -b",
     "build:dev": "jlpm run build",