@jupytergis/jupytergis-core 0.4.5 → 0.6.0

package/lib/factory.d.ts

@@ -1,12 +1,12 @@
-import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
 import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
+import { JupyterGISDocumentWidget } from '@jupytergis/base';
 import { JupyterGISModel, IJupyterGISTracker, IJGISExternalCommandRegistry } from '@jupytergis/schema';
-import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { IEditorMimeTypeService } from '@jupyterlab/codeeditor';
+import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
 import { ABCWidgetFactory, DocumentRegistry } from '@jupyterlab/docregistry';
-import { CommandRegistry } from '@lumino/commands';
-import { JupyterGISDocumentWidget } from '@jupytergis/base';
+import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { ServiceManager } from '@jupyterlab/services';
+import { CommandRegistry } from '@lumino/commands';
 interface IOptions extends DocumentRegistry.IWidgetFactoryOptions {
     tracker: IJupyterGISTracker;
     commands: CommandRegistry;

package/lib/factory.js

@@ -9,8 +9,8 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+import { JupyterGISPanel, JupyterGISDocumentWidget, ToolbarWidget, } from '@jupytergis/base';
 import { ABCWidgetFactory } from '@jupyterlab/docregistry';
-import { JupyterGISPanel, JupyterGISDocumentWidget, ToolbarWidget } from '@jupytergis/base';
 export class JupyterGISDocumentWidgetFactory extends ABCWidgetFactory {
     constructor(options) {
         var _a;
@@ -37,6 +37,9 @@ export class JupyterGISDocumentWidgetFactory extends ABCWidgetFactory {
         }
         const { model } = context;
         model.filePath = context.localPath;
+        context.pathChanged.connect(() => {
+            model.filePath = context.localPath;
+        });
         if (this._contentsManager) {
             model.contentsManager = this._contentsManager;
         }
@@ -47,12 +50,12 @@ export class JupyterGISDocumentWidgetFactory extends ABCWidgetFactory {
             mimeTypeService: this.options.mimeTypeService,
             rendermime: this.options.rendermime,
             consoleTracker: this.options.consoleTracker,
-            commandRegistry: this.options.commands
+            commandRegistry: this.options.commands,
         });
         const toolbar = new ToolbarWidget({
             commands: this._commands,
             model,
-            externalCommands: this._externalCommandRegistry.getCommands()
+            externalCommands: this._externalCommandRegistry.getCommands(),
         });
         return new JupyterGISDocumentWidget({ context, content, toolbar });
     }

package/lib/index.js

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

package/lib/jgisplugin/modelfactory.d.ts

@@ -1,6 +1,7 @@
 import { IAnnotationModel, IJupyterGISDoc, JupyterGISModel } from '@jupytergis/schema';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { Contents } from '@jupyterlab/services';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
 /**
  * A Model factory to create new instances of JupyterGISModel.
  */
@@ -52,10 +53,12 @@ export declare class JupyterGISModelFactory implements DocumentRegistry.IModelFa
      */
     createNew(options: DocumentRegistry.IModelOptions<IJupyterGISDoc>): JupyterGISModel;
     private _annotationModel;
+    private _settingRegistry;
     private _disposed;
 }
 export declare namespace JupyterGISModelFactory {
     interface IOptions {
         annotationModel: IAnnotationModel;
+        settingRegistry: ISettingRegistry;
     }
 }

package/lib/jgisplugin/modelfactory.js

@@ -1,4 +1,4 @@
-import { JupyterGISModel } from '@jupytergis/schema';
+import { JupyterGISModel, } from '@jupytergis/schema';
 /**
  * A Model factory to create new instances of JupyterGISModel.
  */
@@ -10,6 +10,7 @@ export class JupyterGISModelFactory {
         this.collaborative = true;
         this._disposed = false;
         this._annotationModel = options.annotationModel;
+        this._settingRegistry = options.settingRegistry;
     }
     /**
      * The name of the model.
@@ -67,8 +68,10 @@ export class JupyterGISModelFactory {
         const model = new JupyterGISModel({
             sharedModel: options.sharedModel,
             languagePreference: options.languagePreference,
-            annotationModel: this._annotationModel
+            annotationModel: this._annotationModel,
+            settingRegistry: this._settingRegistry,
         });
+        model.initSettings();
         return model;
     }
 }

package/lib/jgisplugin/plugins.js

@@ -1,24 +1,34 @@
-import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
-import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISDoc } from '@jupytergis/schema';
-import { ICommandPalette, IThemeManager } from '@jupyterlab/apputils';
+import { ICollaborativeDrive, } from '@jupyter/collaborative-drive';
+import { CommandIDs, logoIcon, logoMiniIcon } from '@jupytergis/base';
+import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISDoc, SCHEMA_VERSION, ProcessingMerge, } 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 { MimeDocumentFactory } from '@jupyterlab/docregistry';
 import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
 import { ILauncher } from '@jupyterlab/launcher';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
-import { CommandIDs, logoIcon, logoMiniIcon } from '@jupytergis/base';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { JupyterGISDocumentWidgetFactory } 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 MODEL_NAME = 'jupytergis-jgismodel';
-const activate = (app, tracker, themeManager, browserFactory, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, annotationModel, launcher, palette, drive) => {
+const SETTINGS_ID = '@jupytergis/jupytergis-core:jupytergis-settings';
+const activate = async (app, tracker, themeManager, browserFactory, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, annotationModel, settingRegistry, launcher, palette, drive) => {
     if (PageConfig.getOption('jgis_expose_maps')) {
         window.jupytergisMaps = {};
     }
+    let settings = null;
+    try {
+        settings = await settingRegistry.load(SETTINGS_ID);
+        console.log(`Loaded settings for ${SETTINGS_ID}`, settings);
+    }
+    catch (error) {
+        console.warn(`Failed to load settings for ${SETTINGS_ID}`, error);
+    }
     const widgetFactory = new JupyterGISDocumentWidgetFactory({
         name: FACTORY,
         modelName: MODEL_NAME,
@@ -31,7 +41,7 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
         contentFactory,
         rendermime,
         mimeTypeService: editorServices.mimeTypeService,
-        consoleTracker
+        consoleTracker,
     });
     // Registering the widget factory
     app.docRegistry.addWidgetFactory(widgetFactory);
@@ -41,11 +51,14 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
         modelName: MODEL_NAME,
         name: 'JSON Editor',
         primaryFileType: app.docRegistry.getFileType('json'),
-        fileTypes: [CONTENT_TYPE]
+        fileTypes: [CONTENT_TYPE],
     });
     app.docRegistry.addWidgetFactory(mimeDocumentFactory);
     // Creating and registering the model factory for our custom DocumentModel
-    const modelFactory = new JupyterGISModelFactory({ annotationModel });
+    const modelFactory = new JupyterGISModelFactory({
+        annotationModel,
+        settingRegistry,
+    });
     app.docRegistry.addModelFactory(modelFactory);
     // register the filetype
     app.docRegistry.addFileType({
@@ -55,7 +68,7 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
         extensions: ['.jgis', '.JGIS'],
         fileFormat: 'text',
         contentType: CONTENT_TYPE,
-        icon: logoMiniIcon
+        icon: logoMiniIcon,
     });
     const jGISSharedModelFactory = () => {
         return new JupyterGISDoc();
@@ -98,22 +111,22 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
             let model = await app.serviceManager.contents.newUntitled({
                 path: cwd,
                 type: 'file',
-                ext: '.jGIS'
+                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\t"metadata": {}\n}' }));
+            model = await app.serviceManager.contents.save(model.path, Object.assign(Object.assign({}, model), { format: 'text', size: undefined, content: `{\n\t"schemaVersion": "${SCHEMA_VERSION}",\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,
-                factory: FACTORY
+                factory: FACTORY,
             });
-        }
+        },
     });
     // Add the command to the launcher
     if (launcher) {
         launcher.add({
             command: CommandIDs.createNew,
             category: 'Other',
-            rank: 1
+            rank: 1,
         });
     }
     // Add the command to the palette
@@ -121,68 +134,40 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
         palette.addItem({
             command: CommandIDs.createNew,
             args: { isPalette: true },
-            category: PALETTE_CATEGORY
+            category: PALETTE_CATEGORY,
         });
         palette.addItem({
             command: CommandIDs.openLayerBrowser,
-            category: 'JupyterGIS'
+            category: 'JupyterGIS',
         });
         // Layers and Sources
         palette.addItem({
             command: CommandIDs.newRasterEntry,
-            category: 'JupyterGIS'
+            category: 'JupyterGIS',
         });
         palette.addItem({
             command: CommandIDs.newVectorTileEntry,
-            category: 'JupyterGIS'
+            category: 'JupyterGIS',
         });
         palette.addItem({
             command: CommandIDs.newGeoJSONEntry,
-            category: 'JupyterGIS'
+            category: 'JupyterGIS',
         });
         palette.addItem({
             command: CommandIDs.newHillshadeEntry,
-            category: 'JupyterGIS'
-        });
-        // Source only
-        palette.addItem({
-            command: CommandIDs.newRasterSource,
-            category: 'JupyterGIS'
-        });
-        palette.addItem({
-            command: CommandIDs.newRasterDemSource,
-            category: 'JupyterGIS'
-        });
-        palette.addItem({
-            command: CommandIDs.newVectorSource,
-            category: 'JupyterGIS'
-        });
-        palette.addItem({
-            command: CommandIDs.newGeoJSONSource,
-            category: 'JupyterGIS'
-        });
-        // Layers only
-        palette.addItem({
-            command: CommandIDs.newRasterLayer,
-            category: 'JupyterGIS'
-        });
-        palette.addItem({
-            command: CommandIDs.newVectorLayer,
-            category: 'JupyterGIS'
-        });
-        palette.addItem({
-            command: CommandIDs.newHillshadeLayer,
-            category: 'JupyterGIS'
+            category: 'JupyterGIS',
         });
         // Layer and group actions
         palette.addItem({
             command: CommandIDs.moveLayerToNewGroup,
-            category: 'JupyterGIS'
-        });
-        palette.addItem({
-            command: CommandIDs.buffer,
-            category: 'JupyterGIS'
+            category: 'JupyterGIS',
         });
+        for (const processingElement of ProcessingMerge) {
+            palette.addItem({
+                command: processingElement.name,
+                category: 'JupyterGIS',
+            });
+        }
     }
 };
 const jGISPlugin = {
@@ -196,10 +181,11 @@ const jGISPlugin = {
         IEditorServices,
         IRenderMimeRegistry,
         IConsoleTracker,
-        IAnnotationToken
+        IAnnotationToken,
+        ISettingRegistry,
     ],
     optional: [ILauncher, ICommandPalette, ICollaborativeDrive],
     autoStart: true,
-    activate
+    activate,
 };
 export default jGISPlugin;

package/lib/plugin.js

@@ -1,9 +1,9 @@
 import { AnnotationModel } from '@jupytergis/base';
-import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJGISFormSchemaRegistryToken, IJGISLayerBrowserRegistryToken, IJupyterGISDocTracker } from '@jupytergis/schema';
+import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJGISFormSchemaRegistryToken, IJGISLayerBrowserRegistryToken, IJupyterGISDocTracker, } from '@jupytergis/schema';
 import { WidgetTracker } from '@jupyterlab/apputils';
+import { IDocumentManager } from '@jupyterlab/docmanager';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { ITranslator } from '@jupyterlab/translation';
-import { IDocumentManager } from '@jupyterlab/docmanager';
 import { JupyterGISExternalCommandRegistry } from './externalcommand';
 import { JupyterGISLayerBrowserRegistry } from './layerBrowserRegistry';
 import { JupyterGISFormSchemaRegistry } from './schemaregistry';
@@ -16,11 +16,11 @@ export const trackerPlugin = {
     provides: IJupyterGISDocTracker,
     activate: (app, translator, mainMenu) => {
         const tracker = new WidgetTracker({
-            namespace: NAME_SPACE
+            namespace: NAME_SPACE,
         });
         console.log('jupytergis:core:tracker is activated!');
         return tracker;
-    }
+    },
 };
 export const formSchemaRegistryPlugin = {
     id: 'jupytergis:core:form-schema-registry',
@@ -30,7 +30,7 @@ export const formSchemaRegistryPlugin = {
     activate: (app, docmanager) => {
         const registry = new JupyterGISFormSchemaRegistry(docmanager);
         return registry;
-    }
+    },
 };
 export const externalCommandRegistryPlugin = {
     id: 'jupytergis:core:external-command-registry',
@@ -40,7 +40,7 @@ export const externalCommandRegistryPlugin = {
     activate: (app) => {
         const registry = new JupyterGISExternalCommandRegistry();
         return registry;
-    }
+    },
 };
 export const layerBrowserRegistryPlugin = {
     id: 'jupytergis:core:layer-browser-registry',
@@ -51,7 +51,7 @@ export const layerBrowserRegistryPlugin = {
         console.log('jupytergis:core:layer-browser-registry is activated');
         const registry = new JupyterGISLayerBrowserRegistry();
         return registry;
-    }
+    },
 };
 export const annotationPlugin = {
     id: 'jupytergis:core:annotation',
@@ -61,11 +61,11 @@ export const annotationPlugin = {
     activate: (app, tracker) => {
         var _a;
         const annotationModel = new AnnotationModel({
-            model: (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model
+            model: (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model,
         });
         tracker.currentChanged.connect((_, changed) => {
             annotationModel.model = (changed === null || changed === void 0 ? void 0 : changed.model) || undefined;
         });
         return annotationModel;
-    }
+    },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-core",
-  "version": "0.4.5",
+  "version": "0.6.0",
   "description": "JupyterGIS core extension",
   "keywords": [
     "jupyter",
@@ -15,7 +15,8 @@
   "author": "JupyterGIS contributors",
   "files": [
     "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
-    "style/**/*.{css,js,eot,gif,html,jpg,json,png,svg,woff2,ttf}"
+    "style/**/*.{css,js,eot,gif,html,jpg,json,png,svg,woff2,ttf}",
+    "schema/**/*.{json,js,ts}"
   ],
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -53,8 +54,8 @@
   },
   "dependencies": {
     "@jupyter/collaborative-drive": "^3.0.0",
-    "@jupytergis/base": "^0.4.5",
-    "@jupytergis/schema": "^0.4.5",
+    "@jupytergis/base": "^0.6.0",
+    "@jupytergis/schema": "^0.6.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/docregistry": "^4.3.0",
@@ -91,6 +92,7 @@
     "access": "public"
   },
   "jupyterlab": {
+    "schemaDir": "schema",
     "discovery": {
       "server": {
         "managers": [

package/schema/jupytergis-settings.json

@@ -0,0 +1,13 @@
+{
+  "title": "JupyterGIS Settings",
+  "description": "Settings for the JupyterGIS extension.",
+  "type": "object",
+  "properties": {
+    "proxyUrl": {
+      "type": "string",
+      "title": "Proxy URL",
+      "description": "The proxy URL to use for external requests.",
+      "default": "https://corsproxy.io"
+    }
+  }
+}