@jupytergis/jupytergis-core 0.1.6 → 0.2.0

package/lib/factory.d.ts

@@ -1,5 +1,5 @@
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
-import { ICollaborativeDrive } from '@jupyter/docprovider';
+import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
 import { JupyterGISModel, IJupyterGISTracker, IJGISExternalCommandRegistry } from '@jupytergis/schema';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { IEditorMimeTypeService } from '@jupyterlab/codeeditor';
@@ -32,6 +32,6 @@ export declare class JupyterGISWidgetFactory extends ABCWidgetFactory<JupyterGIS
     private _commands;
     private _externalCommandRegistry;
     private _backendCheck?;
-    private _drive?;
+    private _contentsManager?;
 }
 export {};

package/lib/factory.js

@@ -13,13 +13,14 @@ import { ABCWidgetFactory } from '@jupyterlab/docregistry';
 import { JupyterGISPanel, JupyterGISWidget, ToolbarWidget } from '@jupytergis/base';
 export class JupyterGISWidgetFactory extends ABCWidgetFactory {
     constructor(options) {
+        var _a;
         const { backendCheck, externalCommandRegistry } = options, rest = __rest(options, ["backendCheck", "externalCommandRegistry"]);
         super(rest);
         this.options = options;
         this._backendCheck = backendCheck;
         this._commands = options.commands;
         this._externalCommandRegistry = externalCommandRegistry;
-        this._drive = options.drive;
+        this._contentsManager = (_a = options.manager) === null || _a === void 0 ? void 0 : _a.contents;
     }
     /**
      * Create a new widget given a context.
@@ -35,8 +36,8 @@ export class JupyterGISWidgetFactory extends ABCWidgetFactory {
             }
         }
         const { model } = context;
-        if (this._drive) {
-            model.setDrive(this._drive, context.path);
+        if (this._contentsManager) {
+            model.setContentsManager(this._contentsManager, context.path);
         }
         const content = new JupyterGISPanel({
             model,

package/lib/index.d.ts

@@ -1,3 +1,3 @@
 export * from './factory';
-declare const _default: (import("@jupyterlab/application").JupyterFrontEndPlugin<void> | import("@jupyterlab/application").JupyterFrontEndPlugin<import("@jupytergis/schema").IJupyterGISTracker> | import("@jupyterlab/application").JupyterFrontEndPlugin<import("@jupytergis/schema").IJGISFormSchemaRegistry> | import("@jupyterlab/application").JupyterFrontEndPlugin<import("@jupytergis/schema").IJGISExternalCommandRegistry> | import("@jupyterlab/application").JupyterFrontEndPlugin<import("@jupytergis/schema").IJGISLayerBrowserRegistry>)[];
+declare const _default: (import("@jupyterlab/application").JupyterFrontEndPlugin<void> | import("@jupyterlab/application").JupyterFrontEndPlugin<import("@jupytergis/schema").IJupyterGISTracker> | import("@jupyterlab/application").JupyterFrontEndPlugin<import("@jupytergis/schema").IJGISFormSchemaRegistry> | import("@jupyterlab/application").JupyterFrontEndPlugin<import("@jupytergis/schema").IJGISExternalCommandRegistry> | import("@jupyterlab/application").JupyterFrontEndPlugin<import("@jupytergis/schema").IJGISLayerBrowserRegistry> | import("@jupyterlab/application").JupyterFrontEndPlugin<import("@jupytergis/schema").IAnnotationModel>)[];
 export default _default;

package/lib/index.js

@@ -1,10 +1,11 @@
 import jgisPlugin from './jgisplugin/plugins';
-import { externalCommandRegistryPlugin, formSchemaRegistryPlugin, layerBrowserRegistryPlugin, trackerPlugin } from './plugin';
+import { externalCommandRegistryPlugin, formSchemaRegistryPlugin, layerBrowserRegistryPlugin, trackerPlugin, annotationPlugin } from './plugin';
 export * from './factory';
 export default [
     trackerPlugin,
     jgisPlugin,
     formSchemaRegistryPlugin,
     externalCommandRegistryPlugin,
-    layerBrowserRegistryPlugin
+    layerBrowserRegistryPlugin,
+    annotationPlugin
 ];

package/lib/jgisplugin/modelfactory.d.ts

@@ -1,14 +1,15 @@
-import { IJupyterGISDoc, JupyterGISModel } from '@jupytergis/schema';
+import { IAnnotationModel, IJupyterGISDoc, JupyterGISModel } from '@jupytergis/schema';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { Contents } from '@jupyterlab/services';
 /**
  * A Model factory to create new instances of JupyterGISModel.
  */
 export declare class JupyterGISModelFactory implements DocumentRegistry.IModelFactory<JupyterGISModel> {
+    constructor(options: JupyterGISModelFactory.IOptions);
     /**
      * Whether the model is collaborative or not.
      */
-    readonly collaborative = true;
+    readonly collaborative: boolean;
     /**
      * The name of the model.
      *
@@ -50,5 +51,11 @@ export declare class JupyterGISModelFactory implements DocumentRegistry.IModelFa
      * @returns The model
      */
     createNew(options: DocumentRegistry.IModelOptions<IJupyterGISDoc>): JupyterGISModel;
+    private _annotationModel;
     private _disposed;
 }
+export declare namespace JupyterGISModelFactory {
+    interface IOptions {
+        annotationModel: IAnnotationModel;
+    }
+}

package/lib/jgisplugin/modelfactory.js

@@ -3,12 +3,13 @@ import { JupyterGISModel } from '@jupytergis/schema';
  * A Model factory to create new instances of JupyterGISModel.
  */
 export class JupyterGISModelFactory {
-    constructor() {
+    constructor(options) {
         /**
          * Whether the model is collaborative or not.
          */
-        this.collaborative = true;
+        this.collaborative = document.querySelectorAll('[data-jupyter-lite-root]')[0] === undefined;
         this._disposed = false;
+        this._annotationModel = options.annotationModel;
     }
     /**
      * The name of the model.
@@ -65,7 +66,8 @@ export class JupyterGISModelFactory {
     createNew(options) {
         const model = new JupyterGISModel({
             sharedModel: options.sharedModel,
-            languagePreference: options.languagePreference
+            languagePreference: options.languagePreference,
+            annotationModel: this._annotationModel
         });
         return model;
     }

package/lib/jgisplugin/plugins.js

@@ -1,26 +1,32 @@
-import { ICollaborativeDrive } from '@jupyter/docprovider';
-import { IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISDoc } from '@jupytergis/schema';
+import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
+import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISDoc } from '@jupytergis/schema';
 import { ICommandPalette, IThemeManager } from '@jupyterlab/apputils';
 import { IEditorServices } from '@jupyterlab/codeeditor';
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
+import { PageConfig } from '@jupyterlab/coreutils';
 import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
 import { ILauncher } from '@jupyterlab/launcher';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { CommandIDs, logoIcon, logoMiniIcon } from '@jupytergis/base';
 import { JupyterGISWidgetFactory } from '../factory';
 import { JupyterGISModelFactory } from './modelfactory';
+import { MimeDocumentFactory } from '@jupyterlab/docregistry';
 const FACTORY = 'JupyterGIS .jgis Viewer';
+const CONTENT_TYPE = 'jgis';
 const PALETTE_CATEGORY = 'JupyterGIS';
-const activate = (app, tracker, themeManager, browserFactory, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, launcher, palette, drive) => {
+const MODEL_NAME = 'jupytergis-jgismodel';
+const activate = (app, tracker, themeManager, browserFactory, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, annotationModel, launcher, palette, drive) => {
+    if (PageConfig.getOption('jgis_expose_maps')) {
+        window.jupytergisMaps = {};
+    }
     const widgetFactory = new JupyterGISWidgetFactory({
         name: FACTORY,
-        modelName: 'jupytergis-jgismodel',
-        fileTypes: ['jgis'],
-        defaultFor: ['jgis'],
+        modelName: MODEL_NAME,
+        fileTypes: [CONTENT_TYPE],
+        defaultFor: [CONTENT_TYPE],
         tracker,
         commands: app.commands,
         externalCommandRegistry,
-        drive,
         manager: app.serviceManager,
         contentFactory,
         rendermime,
@@ -29,24 +35,33 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
     });
     // Registering the widget factory
     app.docRegistry.addWidgetFactory(widgetFactory);
+    const mimeDocumentFactory = new MimeDocumentFactory({
+        dataType: 'json',
+        rendermime,
+        modelName: MODEL_NAME,
+        name: 'JSON Editor',
+        primaryFileType: app.docRegistry.getFileType('json'),
+        fileTypes: [CONTENT_TYPE]
+    });
+    app.docRegistry.addWidgetFactory(mimeDocumentFactory);
     // Creating and registering the model factory for our custom DocumentModel
-    const modelFactory = new JupyterGISModelFactory();
+    const modelFactory = new JupyterGISModelFactory({ annotationModel });
     app.docRegistry.addModelFactory(modelFactory);
     // register the filetype
     app.docRegistry.addFileType({
-        name: 'jgis',
+        name: CONTENT_TYPE,
         displayName: 'JGIS',
         mimeTypes: ['text/json'],
         extensions: ['.jgis', '.JGIS'],
         fileFormat: 'text',
-        contentType: 'jgis',
+        contentType: CONTENT_TYPE,
         icon: logoMiniIcon
     });
     const jGISSharedModelFactory = () => {
         return new JupyterGISDoc();
     };
     if (drive) {
-        drive.sharedModelFactory.registerDocumentFactory('jgis', jGISSharedModelFactory);
+        drive.sharedModelFactory.registerDocumentFactory(CONTENT_TYPE, jGISSharedModelFactory);
     }
     widgetFactory.widgetCreated.connect((sender, widget) => {
         widget.title.icon = logoIcon;
@@ -54,9 +69,20 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
             tracker.save(widget);
         });
         themeManager.themeChanged.connect((_, changes) => widget.context.model.themeChanged.emit(changes));
-        tracker.add(widget);
         app.shell.activateById('jupytergis::leftControlPanel');
         app.shell.activateById('jupytergis::rightControlPanel');
+        tracker
+            .add(widget)
+            .then(() => {
+            Object.values(CommandIDs).forEach(id => {
+                if (app.commands.hasCommand(id)) {
+                    app.commands.notifyCommandChanged(id);
+                }
+            });
+        })
+            .catch(e => {
+            console.error('Cannot update JupyterGIS commands', e);
+        });
     });
     app.commands.addCommand(CommandIDs.createNew, {
         label: args => 'GIS File',
@@ -74,7 +100,7 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
                 type: 'file',
                 ext: '.jGIS'
             });
-            model = await app.serviceManager.contents.save(model.path, Object.assign(Object.assign({}, model), { format: 'text', size: undefined, content: '{\n\t"layers": {},\n\t"sources": {},\n\t"options": {"latitude": 0, "longitude": 0, "zoom": 0, "bearing": 0, "pitch": 0, "projection": "EPSG:3857"},\n\t"layerTree": []\n}' }));
+            model = await app.serviceManager.contents.save(model.path, Object.assign(Object.assign({}, model), { format: 'text', size: undefined, content: '{\n\t"layers": {},\n\t"sources": {},\n\t"options": {"latitude": 0, "longitude": 0, "zoom": 0, "bearing": 0, "pitch": 0, "projection": "EPSG:3857"},\n\t"layerTree": [],\n\t"metadata": {}\n}' }));
             // Open the newly created file with the 'Editor'
             return app.commands.execute('docmanager:open', {
                 path: model.path,
@@ -165,7 +191,8 @@ const jGISPlugin = {
         ConsolePanel.IContentFactory,
         IEditorServices,
         IRenderMimeRegistry,
-        IConsoleTracker
+        IConsoleTracker,
+        IAnnotationToken
     ],
     optional: [ILauncher, ICommandPalette, ICollaborativeDrive],
     autoStart: true,

package/lib/plugin.d.ts

@@ -1,6 +1,7 @@
-import { IJGISExternalCommandRegistry, IJGISFormSchemaRegistry, IJGISLayerBrowserRegistry, IJupyterGISTracker } from '@jupytergis/schema';
+import { IAnnotationModel, IJGISExternalCommandRegistry, IJGISFormSchemaRegistry, IJGISLayerBrowserRegistry, IJupyterGISTracker } from '@jupytergis/schema';
 import { JupyterFrontEndPlugin } from '@jupyterlab/application';
 export declare const trackerPlugin: JupyterFrontEndPlugin<IJupyterGISTracker>;
 export declare const formSchemaRegistryPlugin: JupyterFrontEndPlugin<IJGISFormSchemaRegistry>;
 export declare const externalCommandRegistryPlugin: JupyterFrontEndPlugin<IJGISExternalCommandRegistry>;
 export declare const layerBrowserRegistryPlugin: JupyterFrontEndPlugin<IJGISLayerBrowserRegistry>;
+export declare const annotationPlugin: JupyterFrontEndPlugin<IAnnotationModel>;

package/lib/plugin.js

@@ -1,4 +1,5 @@
-import { IJGISExternalCommandRegistryToken, IJGISFormSchemaRegistryToken, IJGISLayerBrowserRegistryToken, IJupyterGISDocTracker } from '@jupytergis/schema';
+import { AnnotationModel } from '@jupytergis/base';
+import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJGISFormSchemaRegistryToken, IJGISLayerBrowserRegistryToken, IJupyterGISDocTracker } from '@jupytergis/schema';
 import { WidgetTracker } from '@jupyterlab/apputils';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { ITranslator } from '@jupyterlab/translation';
@@ -51,3 +52,19 @@ export const layerBrowserRegistryPlugin = {
         return registry;
     }
 };
+export const annotationPlugin = {
+    id: 'jupytergis:core:annotation',
+    autoStart: true,
+    requires: [IJupyterGISDocTracker],
+    provides: IAnnotationToken,
+    activate: (app, tracker) => {
+        var _a;
+        const annotationModel = new AnnotationModel({
+            context: (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.context
+        });
+        tracker.currentChanged.connect((_, changed) => {
+            annotationModel.context = (changed === null || changed === void 0 ? void 0 : changed.context) || undefined;
+        });
+        return annotationModel;
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-core",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "JupyterGIS core extension",
   "keywords": [
     "jupyter",
@@ -52,23 +52,23 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/docprovider": "^2.0.0",
-    "@jupytergis/base": "^0.1.6",
-    "@jupytergis/schema": "^0.1.6",
-    "@jupyterlab/application": "^4.0.0",
-    "@jupyterlab/apputils": "^4.0.0",
-    "@jupyterlab/docregistry": "^4.0.0",
-    "@jupyterlab/filebrowser": "^4.0.0",
-    "@jupyterlab/launcher": "^4.0.0",
-    "@jupyterlab/mainmenu": "^4.0.0",
-    "@jupyterlab/services": "^7.0.0",
-    "@jupyterlab/translation": "^4.0.0",
-    "@jupyterlab/ui-components": "^4.0.0",
+    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupytergis/base": "^0.2.0",
+    "@jupytergis/schema": "^0.2.0",
+    "@jupyterlab/application": "^4.3.0",
+    "@jupyterlab/apputils": "^4.3.0",
+    "@jupyterlab/docregistry": "^4.3.0",
+    "@jupyterlab/filebrowser": "^4.3.0",
+    "@jupyterlab/launcher": "^4.3.0",
+    "@jupyterlab/mainmenu": "^4.3.0",
+    "@jupyterlab/services": "^7.3.0",
+    "@jupyterlab/translation": "^4.3.0",
+    "@jupyterlab/ui-components": "^4.3.0",
     "@lumino/commands": "^2.0.0",
     "util": "^0.12.5"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.0.0",
+    "@jupyterlab/builder": "^4.3.0",
     "@types/json-schema": "^7.0.11",
     "@types/react": "^18.0.26",
     "@types/react-addons-linked-state-mixin": "^0.14.22",