Enable adding annotations on QGZ files

python/jupytergis_qgis/src/modelfactory.ts

@@ -1,4 +1,8 @@
-import { IJupyterGISDoc, JupyterGISModel } from '@jupytergis/schema';
+import {
+  IJupyterGISDoc,
+  JupyterGISModel,
+  IAnnotationModel
+} from '@jupytergis/schema';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { Contents } from '@jupyterlab/services';
 
@@ -8,6 +12,10 @@ import { Contents } from '@jupyterlab/services';
 export class JupyterGISModelFactoryBase
   implements DocumentRegistry.IModelFactory<JupyterGISModel>
 {
+  constructor(options: JupyterGISModelFactoryBase.IOptions) {
+    this._annotationModel = options.annotationModel;
+  }
+
   /**
    * Whether the model is collaborative or not.
    */
@@ -77,14 +85,22 @@ export class JupyterGISModelFactoryBase
   ): JupyterGISModel {
     const model = new JupyterGISModel({
       sharedModel: options.sharedModel,
-      languagePreference: options.languagePreference
+      languagePreference: options.languagePreference,
+      annotationModel: this._annotationModel
     });
     return model;
   }
 
+  private _annotationModel: IAnnotationModel;
   private _disposed = false;
 }
 
+export namespace JupyterGISModelFactoryBase {
+  export interface IOptions {
+    annotationModel: IAnnotationModel;
+  }
+}
+
 export class QGZModelFactory extends JupyterGISModelFactoryBase {
   /**
    * The name of the model.

python/jupytergis_qgis/src/plugins.ts

@@ -7,7 +7,9 @@ import {
   IJGISExternalCommandRegistryToken,
   JupyterGISDoc,
   IJupyterGISDocTracker,
-  IJupyterGISWidget
+  IJupyterGISWidget,
+  IAnnotationModel,
+  IAnnotationToken
 } from '@jupytergis/schema';
 import {
   JupyterFrontEnd,
@@ -75,6 +77,7 @@ const activate = async (
   editorServices: IEditorServices,
   rendermime: IRenderMimeRegistry,
   consoleTracker: IConsoleTracker,
+  annotationModel: IAnnotationModel,
   commandPalette: ICommandPalette | null
 ): Promise<void> => {
   const fcCheck = await requestAPI<{ installed: boolean }>(
@@ -130,8 +133,8 @@ const activate = async (
   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',
@@ -307,7 +310,8 @@ export const qgisplugin: JupyterFrontEndPlugin<void> = {
     ConsolePanel.IContentFactory,
     IEditorServices,
     IRenderMimeRegistry,
-    IConsoleTracker
+    IConsoleTracker,
+    IAnnotationToken
   ],
   optional: [ICommandPalette],
   autoStart: true,