@jupytergis/jupytergis-qgis 0.4.1 → 0.4.3

package/lib/modelfactory.d.ts

@@ -1,10 +1,11 @@
-import { IJupyterGISDoc, JupyterGISModel } from '@jupytergis/schema';
+import { IJupyterGISDoc, JupyterGISModel, IAnnotationModel } 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 JupyterGISModelFactoryBase implements DocumentRegistry.IModelFactory<JupyterGISModel> {
+    constructor(options: JupyterGISModelFactoryBase.IOptions);
     /**
      * Whether the model is collaborative or not.
      */
@@ -50,8 +51,14 @@ export declare class JupyterGISModelFactoryBase implements DocumentRegistry.IMod
      * @returns The model
      */
     createNew(options: DocumentRegistry.IModelOptions<IJupyterGISDoc>): JupyterGISModel;
+    private _annotationModel;
     private _disposed;
 }
+export declare namespace JupyterGISModelFactoryBase {
+    interface IOptions {
+        annotationModel: IAnnotationModel;
+    }
+}
 export declare class QGZModelFactory extends JupyterGISModelFactoryBase {
     /**
      * The name of the model.

package/lib/modelfactory.js

@@ -3,12 +3,13 @@ import { JupyterGISModel } from '@jupytergis/schema';
  * A Model factory to create new instances of JupyterGISModel.
  */
 export class JupyterGISModelFactoryBase {
-    constructor() {
+    constructor(options) {
         /**
          * Whether the model is collaborative or not.
          */
         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 JupyterGISModelFactoryBase {
     createNew(options) {
         const model = new JupyterGISModel({
             sharedModel: options.sharedModel,
-            languagePreference: options.languagePreference
+            languagePreference: options.languagePreference,
+            annotationModel: this._annotationModel
         });
         return model;
     }

package/lib/plugins.js

@@ -1,5 +1,5 @@
 import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
-import { IJGISExternalCommandRegistryToken, JupyterGISDoc } from '@jupytergis/schema';
+import { IJGISExternalCommandRegistryToken, JupyterGISDoc, IJupyterGISDocTracker, IAnnotationToken } from '@jupytergis/schema';
 import { Dialog, ICommandPalette, IThemeManager, InputDialog, showDialog, showErrorMessage } from '@jupyterlab/apputils';
 import { IEditorServices } from '@jupyterlab/codeeditor';
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
@@ -8,7 +8,6 @@ import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { Widget } from '@lumino/widgets';
 import { logoMiniIcon, logoMiniIconQGZ, requestAPI } from '@jupytergis/base';
 import { JupyterGISDocumentWidgetFactory } from '@jupytergis/jupytergis-core';
-import { IJupyterGISDocTracker } from '@jupytergis/schema';
 import { QGSModelFactory, QGZModelFactory } from './modelfactory';
 /**
  * The command IDs used by the qgis plugin.
@@ -17,7 +16,7 @@ var CommandIDs;
 (function (CommandIDs) {
     CommandIDs.exportQgis = 'jupytergis:export';
 })(CommandIDs || (CommandIDs = {}));
-const activate = async (app, tracker, themeManager, drive, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, commandPalette) => {
+const activate = async (app, tracker, themeManager, drive, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, annotationModel, commandPalette) => {
     const fcCheck = await requestAPI('jupytergis_qgis/backend-check', {
         method: 'POST',
         body: JSON.stringify({})
@@ -63,8 +62,8 @@ const activate = async (app, tracker, themeManager, drive, externalCommandRegist
     app.docRegistry.addWidgetFactory(QGSWidgetFactory);
     app.docRegistry.addWidgetFactory(QGZWidgetFactory);
     // Creating and registering the model factory for our custom DocumentModel
-    app.docRegistry.addModelFactory(new QGSModelFactory());
-    app.docRegistry.addModelFactory(new QGZModelFactory());
+    app.docRegistry.addModelFactory(new QGSModelFactory({ annotationModel }));
+    app.docRegistry.addModelFactory(new QGZModelFactory({ annotationModel }));
     // register the filetype
     app.docRegistry.addFileType({
         name: 'QGS',
@@ -211,7 +210,8 @@ export const qgisplugin = {
         ConsolePanel.IContentFactory,
         IEditorServices,
         IRenderMimeRegistry,
-        IConsoleTracker
+        IConsoleTracker,
+        IAnnotationToken
     ],
     optional: [ICommandPalette],
     autoStart: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-qgis",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "JupyterGIS QGIS extension.",
   "keywords": [
     "jupyter",
@@ -54,9 +54,9 @@
   },
   "dependencies": {
     "@jupyter/collaborative-drive": "^3.0.0",
-    "@jupytergis/base": "^0.4.1",
-    "@jupytergis/jupytergis-core": "^0.4.1",
-    "@jupytergis/schema": "^0.4.1",
+    "@jupytergis/base": "^0.4.3",
+    "@jupytergis/jupytergis-core": "^0.4.3",
+    "@jupytergis/schema": "^0.4.3",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/coreutils": "^6.3.0",