@jupytergis/jupytergis-core 0.4.5 → 0.5.0

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

@@ -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,5 +1,5 @@
 import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
-import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISDoc } from '@jupytergis/schema';
+import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISDoc, SCHEMA_VERSION } from '@jupytergis/schema';
 import { ICommandPalette, IThemeManager } from '@jupyterlab/apputils';
 import { IEditorServices } from '@jupyterlab/codeeditor';
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
@@ -7,6 +7,7 @@ import { PageConfig } from '@jupyterlab/coreutils';
 import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
 import { ILauncher } from '@jupyterlab/launcher';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { CommandIDs, logoIcon, logoMiniIcon } from '@jupytergis/base';
 import { JupyterGISDocumentWidgetFactory } from '../factory';
 import { JupyterGISModelFactory } from './modelfactory';
@@ -15,10 +16,19 @@ 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,
@@ -45,7 +55,10 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
     });
     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({
@@ -100,7 +113,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\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,
@@ -144,36 +157,6 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
             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'
-        });
         // Layer and group actions
         palette.addItem({
             command: CommandIDs.moveLayerToNewGroup,
@@ -196,7 +179,8 @@ const jGISPlugin = {
         IEditorServices,
         IRenderMimeRegistry,
         IConsoleTracker,
-        IAnnotationToken
+        IAnnotationToken,
+        ISettingRegistry
     ],
     optional: [ILauncher, ICommandPalette, ICollaborativeDrive],
     autoStart: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-core",
-  "version": "0.4.5",
+  "version": "0.5.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.5.0",
+    "@jupytergis/schema": "^0.5.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"
+    }
+  }
+}