@jupytergis/base 0.4.5 → 0.5.0

package/lib/commands.js

@@ -164,21 +164,21 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     /**
      * Source and layers
      */
-    commands.addCommand(CommandIDs.newRasterEntry, Object.assign({ label: trans.__('New Raster Layer'), isEnabled: () => {
+    commands.addCommand(CommandIDs.newRasterEntry, Object.assign({ label: trans.__('New Raster Tile Layer'), isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
         }, execute: Private.createEntry({
             tracker,
             formSchemaRegistry,
-            title: 'Create Raster Layer',
+            title: 'Create Raster Tile Layer',
             createLayer: true,
             createSource: true,
             sourceData: {
                 minZoom: 0,
                 maxZoom: 24
             },
-            layerData: { name: 'Custom Raster Layer' },
+            layerData: { name: 'Custom Raster Tile Layer' },
             sourceType: 'RasterSource',
             layerType: 'RasterLayer'
         }) }, icons.get(CommandIDs.newRasterEntry)));
@@ -321,21 +321,6 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             sourceType: 'VideoSource',
             layerType: 'RasterLayer'
         }) }, icons.get(CommandIDs.newVideoEntry)));
-    commands.addCommand(CommandIDs.newShapefileSource, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Shapefile')
-            : trans.__('Add Shapefile Source'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Shapefile Source',
-            createLayer: false,
-            createSource: true,
-            sourceData: { name: 'Custom Shapefile Source' },
-            sourceType: 'ShapefileSource'
-        }) }, icons.get(CommandIDs.newShapefileSource)));
     commands.addCommand(CommandIDs.newGeoTiffEntry, Object.assign({ label: trans.__('New GeoTiff layer'), isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
@@ -354,191 +339,7 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             sourceType: 'GeoTiffSource',
             layerType: 'WebGlLayer'
         }) }, icons.get(CommandIDs.newGeoTiffEntry)));
-    /**
-     * SOURCES only commands.
-     */
-    commands.addCommand(CommandIDs.newRasterSource, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Raster')
-            : trans.__('New Raster Source'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Raster Source',
-            createLayer: false,
-            createSource: true,
-            sourceData: { name: 'Custom Raster Source', minZoom: 0, maxZoom: 24 },
-            sourceType: 'RasterSource'
-        }) }, icons.get(CommandIDs.newRasterSource)));
-    commands.addCommand(CommandIDs.newRasterDemSource, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Raster DEM')
-            : trans.__('New Raster DEM Source'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Raster Dem Source',
-            createLayer: false,
-            createSource: true,
-            sourceData: { name: 'Custom Raster DEM Source' },
-            sourceType: 'RasterDemSource'
-        }) }, icons.get(CommandIDs.newRasterDemSource)));
-    commands.addCommand(CommandIDs.newVectorSource, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Vector')
-            : trans.__('New Vector Source'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Vector Source',
-            createLayer: false,
-            createSource: true,
-            sourceData: { name: 'Custom Vector Source', minZoom: 0, maxZoom: 24 },
-            sourceType: 'VectorTileSource'
-        }) }, icons.get(CommandIDs.newVectorSource)));
-    commands.addCommand(CommandIDs.newGeoJSONSource, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('GeoJSON')
-            : trans.__('Add GeoJSON data from file'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create GeoJson Source',
-            createLayer: false,
-            createSource: true,
-            sourceData: { name: 'Custom GeoJSON Source' },
-            sourceType: 'GeoJSONSource'
-        }) }, icons.get(CommandIDs.newGeoJSONSource)));
-    commands.addCommand(CommandIDs.newImageSource, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Image')
-            : trans.__('Add Image Source'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Image Source',
-            createLayer: false,
-            createSource: true,
-            sourceData: { name: 'Custom Image Source' },
-            sourceType: 'ImageSource'
-        }) }, icons.get(CommandIDs.newImageSource)));
-    commands.addCommand(CommandIDs.newVideoSource, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Video')
-            : trans.__('Add Video Source'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Video Source',
-            createLayer: false,
-            createSource: true,
-            sourceData: { name: 'Custom Video Source' },
-            sourceType: 'VideoSource'
-        }) }, icons.get(CommandIDs.newVideoSource)));
-    // Layers only
-    commands.addCommand(CommandIDs.newRasterLayer, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Raster')
-            : trans.__('Add Raster layer'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Raster Layer',
-            createLayer: true,
-            createSource: false,
-            layerData: {
-                name: 'Custom Raster Layer'
-            },
-            sourceType: 'RasterSource',
-            layerType: 'RasterLayer'
-        }) }, icons.get(CommandIDs.newVectorLayer)));
-    commands.addCommand(CommandIDs.newVectorLayer, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Vector')
-            : trans.__('Add New Vector layer'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Vector Layer',
-            createLayer: true,
-            createSource: false,
-            layerData: {
-                name: 'Custom Vector Layer'
-            },
-            sourceType: 'VectorTileSource',
-            layerType: 'VectorTileLayer'
-        }) }, icons.get(CommandIDs.newVectorLayer)));
-    commands.addCommand(CommandIDs.newHillshadeLayer, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Hillshade')
-            : trans.__('Add Hillshade layer'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Hillshade Layer',
-            createLayer: true,
-            createSource: false,
-            layerData: {
-                name: 'Custom Hillshade Layer'
-            },
-            sourceType: 'RasterDemSource',
-            layerType: 'HillshadeLayer'
-        }) }, icons.get(CommandIDs.newHillshadeLayer)));
-    commands.addCommand(CommandIDs.newImageLayer, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Image')
-            : trans.__('Add Image layer'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Image Layer',
-            createLayer: true,
-            createSource: false,
-            layerData: {
-                name: 'Custom Image Layer'
-            },
-            sourceType: 'ImageSource',
-            layerType: 'RasterLayer'
-        }) }, icons.get(CommandIDs.newImageLayer)));
-    commands.addCommand(CommandIDs.newVideoLayer, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Video')
-            : trans.__('Add Video layer'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Video Layer',
-            createLayer: true,
-            createSource: false,
-            layerData: {
-                name: 'Custom Video Layer'
-            },
-            sourceType: 'VideoSource',
-            layerType: 'RasterLayer'
-        }) }, icons.get(CommandIDs.newVideoLayer)));
-    commands.addCommand(CommandIDs.newShapefileLayer, Object.assign({ label: trans.__('New Shapefile Layer'), isEnabled: () => {
+    commands.addCommand(CommandIDs.newShapefileEntry, Object.assign({ label: trans.__('New Shapefile Layer'), isEnabled: () => {
             return tracker.currentWidget
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
@@ -552,23 +353,7 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             layerData: { name: 'Custom Shapefile Layer' },
             sourceType: 'ShapefileSource',
             layerType: 'VectorLayer'
-        }) }, icons.get(CommandIDs.newShapefileLayer)));
-    commands.addCommand(CommandIDs.newHeatmapLayer, Object.assign({ label: args => args.from === 'contextMenu'
-            ? trans.__('Heatmap')
-            : trans.__('Add HeatmapLayer'), isEnabled: () => {
-            return tracker.currentWidget
-                ? tracker.currentWidget.model.sharedModel.editable
-                : false;
-        }, execute: Private.createEntry({
-            tracker,
-            formSchemaRegistry,
-            title: 'Create Heatmap Layer',
-            createLayer: true,
-            createSource: false,
-            layerData: { name: 'Custom Heatmap Layer' },
-            sourceType: 'GeoJSONSource',
-            layerType: 'HeatmapLayer'
-        }) }, icons.get(CommandIDs.newHeatmapLayer)));
+        }) }, icons.get(CommandIDs.newShapefileEntry)));
     /**
      * LAYERS and LAYER GROUP actions.
      */
@@ -725,7 +510,19 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
                 ? tracker.currentWidget.model.sharedModel.editable
                 : false;
         },
-        execute: async () => await Private.toggleConsole(tracker)
+        isToggled: () => {
+            var _a;
+            if (tracker.currentWidget instanceof JupyterGISDocumentWidget) {
+                return ((_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.content.consoleOpened) === true;
+            }
+            else {
+                return false;
+            }
+        },
+        execute: async () => {
+            await Private.toggleConsole(tracker);
+            commands.notifyCommandChanged(CommandIDs.toggleConsole);
+        }
     });
     commands.addCommand(CommandIDs.executeConsole, {
         label: trans.__('Execute console'),

package/lib/constants.d.ts

@@ -13,6 +13,7 @@ export declare namespace CommandIDs {
     const openLayerBrowser = "jupytergis:openLayerBrowser";
     const newRasterEntry = "jupytergis:newRasterEntry";
     const newVectorTileEntry = "jupytergis:newVectorTileEntry";
+    const newShapefileEntry = "jupytergis:newShapefileEntry";
     const newGeoJSONEntry = "jupytergis:newGeoJSONEntry";
     const newHillshadeEntry = "jupytergis:newHillshadeEntry";
     const newImageEntry = "jupytergis:newImageEntry";
@@ -20,22 +21,6 @@ export declare namespace CommandIDs {
     const newGeoTiffEntry = "jupytergis:newGeoTiffEntry";
     const buffer = "jupytergis:buffer";
     const dissolve = "jupytergis:dissolve";
-    const newRasterSource = "jupytergis:newRasterSource";
-    const newRasterDemSource = "jupytergis:newRasterDemSource";
-    const newVectorSource = "jupytergis:newVectorSource";
-    const newGeoJSONSource = "jupytergis:newGeoJSONSource";
-    const newImageSource = "jupytergis:imageSource";
-    const newVideoSource = "jupytergis:videoSource";
-    const newShapefileSource = "jupytergis:shapefileSource";
-    const newGeoTiffSource = "jupytergis:newGeoTiffSource";
-    const newRasterLayer = "jupytergis:newRasterLayer";
-    const newVectorLayer = "jupytergis:newVectorLayer";
-    const newHillshadeLayer = "jupytergis:newHillshadeLayer";
-    const newImageLayer = "jupytergis:newImageLayer";
-    const newVideoLayer = "jupytergis:newVideoLayer";
-    const newShapefileLayer = "jupytergis:newShapefileLayer";
-    const newWebGlTileLayer = "jupytergis:newWebGlTileLayer";
-    const newHeatmapLayer = "jupytergis:newHeatmapLayer";
     const renameLayer = "jupytergis:renameLayer";
     const removeLayer = "jupytergis:removeLayer";
     const renameGroup = "jupytergis:renameGroup";

package/lib/constants.js

@@ -18,6 +18,7 @@ export var CommandIDs;
     // Layer and source
     CommandIDs.newRasterEntry = 'jupytergis:newRasterEntry';
     CommandIDs.newVectorTileEntry = 'jupytergis:newVectorTileEntry';
+    CommandIDs.newShapefileEntry = 'jupytergis:newShapefileEntry';
     CommandIDs.newGeoJSONEntry = 'jupytergis:newGeoJSONEntry';
     CommandIDs.newHillshadeEntry = 'jupytergis:newHillshadeEntry';
     CommandIDs.newImageEntry = 'jupytergis:newImageEntry';
@@ -26,24 +27,6 @@ export var CommandIDs;
     // Processing commands
     CommandIDs.buffer = 'jupytergis:buffer';
     CommandIDs.dissolve = 'jupytergis:dissolve';
-    // Sources only commands
-    CommandIDs.newRasterSource = 'jupytergis:newRasterSource';
-    CommandIDs.newRasterDemSource = 'jupytergis:newRasterDemSource';
-    CommandIDs.newVectorSource = 'jupytergis:newVectorSource';
-    CommandIDs.newGeoJSONSource = 'jupytergis:newGeoJSONSource';
-    CommandIDs.newImageSource = 'jupytergis:imageSource';
-    CommandIDs.newVideoSource = 'jupytergis:videoSource';
-    CommandIDs.newShapefileSource = 'jupytergis:shapefileSource';
-    CommandIDs.newGeoTiffSource = 'jupytergis:newGeoTiffSource';
-    // Layers only commands
-    CommandIDs.newRasterLayer = 'jupytergis:newRasterLayer';
-    CommandIDs.newVectorLayer = 'jupytergis:newVectorLayer';
-    CommandIDs.newHillshadeLayer = 'jupytergis:newHillshadeLayer';
-    CommandIDs.newImageLayer = 'jupytergis:newImageLayer';
-    CommandIDs.newVideoLayer = 'jupytergis:newVideoLayer';
-    CommandIDs.newShapefileLayer = 'jupytergis:newShapefileLayer';
-    CommandIDs.newWebGlTileLayer = 'jupytergis:newWebGlTileLayer';
-    CommandIDs.newHeatmapLayer = 'jupytergis:newHeatmapLayer';
     // Layer and group actions
     CommandIDs.renameLayer = 'jupytergis:renameLayer';
     CommandIDs.removeLayer = 'jupytergis:removeLayer';
@@ -87,7 +70,7 @@ const iconObject = {
     [CommandIDs.newHillshadeEntry]: { icon: moundIcon },
     [CommandIDs.newImageEntry]: { iconClass: 'fa fa-image' },
     [CommandIDs.newVideoEntry]: { iconClass: 'fa fa-video' },
-    [CommandIDs.newShapefileLayer]: { iconClass: 'fa fa-file' },
+    [CommandIDs.newShapefileEntry]: { iconClass: 'fa fa-file' },
     [CommandIDs.newGeoTiffEntry]: { iconClass: 'fa fa-image' },
     [CommandIDs.symbology]: { iconClass: 'fa fa-brush' },
     [CommandIDs.identify]: { icon: infoIcon },

package/lib/index.d.ts

@@ -12,3 +12,4 @@ export * from './tools';
 export * from './types';
 export * from './widget';
 export * from './annotations';
+export * from './menus';

package/lib/index.js

@@ -12,3 +12,4 @@ export * from './tools';
 export * from './types';
 export * from './widget';
 export * from './annotations';
+export * from './menus';

package/lib/menus.d.ts

@@ -0,0 +1,4 @@
+import { Menu } from '@lumino/widgets';
+import { CommandRegistry } from '@lumino/commands';
+export declare const vectorSubMenu: (commands: CommandRegistry) => Menu;
+export declare const rasterSubMenu: (commands: CommandRegistry) => Menu;

package/lib/menus.js

@@ -0,0 +1,45 @@
+import { Menu } from '@lumino/widgets';
+import { CommandIDs } from './constants';
+import { rasterIcon } from './icons';
+export const vectorSubMenu = (commands) => {
+    const subMenu = new Menu({ commands });
+    subMenu.title.label = 'Add Vector Layer';
+    subMenu.title.iconClass = 'fa fa-vector-square';
+    subMenu.id = 'jp-gis-toolbar-vector-menu';
+    subMenu.addItem({
+        type: 'command',
+        command: CommandIDs.newVectorTileEntry
+    });
+    subMenu.addItem({
+        type: 'command',
+        command: CommandIDs.newGeoJSONEntry
+    });
+    subMenu.addItem({
+        type: 'command',
+        command: CommandIDs.newShapefileEntry
+    });
+    return subMenu;
+};
+export const rasterSubMenu = (commands) => {
+    const subMenu = new Menu({ commands });
+    subMenu.title.label = 'Add Raster Layer';
+    subMenu.title.icon = rasterIcon;
+    subMenu.id = 'jp-gis-toolbar-raster-menu';
+    subMenu.addItem({
+        type: 'command',
+        command: CommandIDs.newRasterEntry
+    });
+    subMenu.addItem({
+        type: 'command',
+        command: CommandIDs.newHillshadeEntry
+    });
+    subMenu.addItem({
+        type: 'command',
+        command: CommandIDs.newImageEntry
+    });
+    subMenu.addItem({
+        type: 'command',
+        command: CommandIDs.newGeoTiffEntry
+    });
+    return subMenu;
+};

package/lib/panelview/leftpanel.js

@@ -1,6 +1,5 @@
 import { SidePanel } from '@jupyterlab/ui-components';
 import { LayersPanel } from './components/layers';
-import { SourcesPanel } from './components/sources';
 import { ControlPanelHeader } from './header';
 import { FilterPanel } from './components/filter-panel/Filter';
 import { CommandIDs } from '../constants';
@@ -62,13 +61,6 @@ export class LeftPanelWidget extends SidePanel {
         this._commands = options.commands;
         const header = new ControlPanelHeader();
         this.header.addWidget(header);
-        const sourcesPanel = new SourcesPanel({
-            model: this._model,
-            onSelect: this._onSelect
-        });
-        sourcesPanel.title.caption = 'Sources';
-        sourcesPanel.title.label = 'Sources';
-        this.addWidget(sourcesPanel);
         const layerTree = new LayersPanel({
             model: this._model,
             state: this._state,

package/lib/toolbar/widget.js

@@ -1,9 +1,10 @@
 import { CommandToolbarButton } from '@jupyterlab/apputils';
 import { MenuSvg, ReactWidget, ReactiveToolbar, ToolbarButton, addIcon, redoIcon, undoIcon } from '@jupyterlab/ui-components';
-import { Menu, Widget } from '@lumino/widgets';
+import { Widget } from '@lumino/widgets';
 import * as React from 'react';
 import { CommandIDs } from '../constants';
-import { rasterIcon, terminalToolbarIcon } from '../icons';
+import { terminalToolbarIcon } from '../icons';
+import { rasterSubMenu, vectorSubMenu } from '../menus';
 import { UsersItem } from './usertoolbaritem';
 export const TOOLBAR_SEPARATOR_CLASS = 'jGIS-Toolbar-Separator';
 export const TOOLBAR_GROUPNAME_CLASS = 'jGIS-Toolbar-GroupName';
@@ -53,60 +54,16 @@ export class ToolbarWidget extends ReactiveToolbar {
             });
             this.addItem('openLayerBrowser', openLayersBrowserButton);
             openLayersBrowserButton.node.dataset.testid = 'open-layers-browser';
-            const newRasterEntryButton = new CommandToolbarButton({
-                id: CommandIDs.newRasterEntry,
-                label: '',
-                commands: options.commands
-            });
-            this.addItem('newRasterEntry', newRasterEntryButton);
-            const newVectorTileEntryButton = new CommandToolbarButton({
-                id: CommandIDs.newVectorTileEntry,
-                label: '',
-                commands: options.commands
-            });
-            this.addItem('newVectorTileEntry', newVectorTileEntryButton);
-            newRasterEntryButton.node.dataset.testid = 'new-raster-entry-button';
-            const geolocationButton = new CommandToolbarButton({
-                id: CommandIDs.getGeolocation,
-                commands: options.commands,
-                label: ''
-            });
-            this.addItem('Geolocation', geolocationButton);
-            geolocationButton.node.dataset.testid = 'geolocation-button';
-            // vector sub menu
-            const vectorSubMenu = new Menu({ commands: options.commands });
-            vectorSubMenu.title.label = 'Add Vector Layer';
-            vectorSubMenu.title.iconClass = 'fa fa-vector-square';
-            vectorSubMenu.id = 'jp-gis-toolbar-vector-menu';
-            vectorSubMenu.addItem({
-                type: 'command',
-                command: CommandIDs.newGeoJSONEntry
-            });
-            vectorSubMenu.addItem({
-                type: 'command',
-                command: CommandIDs.newShapefileLayer
-            });
-            //raster submenu
-            const rasterSubMenu = new Menu({ commands: options.commands });
-            rasterSubMenu.title.label = 'Add Raster Layer';
-            rasterSubMenu.title.icon = rasterIcon;
-            rasterSubMenu.id = 'jp-gis-toolbar-raster-menu';
-            rasterSubMenu.addItem({
-                type: 'command',
-                command: CommandIDs.newHillshadeEntry
-            });
-            rasterSubMenu.addItem({
-                type: 'command',
-                command: CommandIDs.newImageEntry
-            });
-            rasterSubMenu.addItem({
-                type: 'command',
-                command: CommandIDs.newGeoTiffEntry
-            });
             const NewSubMenu = new MenuSvg({ commands: options.commands });
             NewSubMenu.title.label = 'Add Layer';
-            NewSubMenu.addItem({ type: 'submenu', submenu: rasterSubMenu });
-            NewSubMenu.addItem({ type: 'submenu', submenu: vectorSubMenu });
+            NewSubMenu.addItem({
+                type: 'submenu',
+                submenu: rasterSubMenu(options.commands)
+            });
+            NewSubMenu.addItem({
+                type: 'submenu',
+                submenu: vectorSubMenu(options.commands)
+            });
             const NewEntryButton = new ToolbarButton({
                 icon: addIcon,
                 noFocusOnClick: false,
@@ -121,6 +78,13 @@ export class ToolbarWidget extends ReactiveToolbar {
             NewEntryButton.node.dataset.testid = 'new-entry-button';
             this.addItem('New', NewEntryButton);
             this.addItem('separator2', new Separator());
+            const geolocationButton = new CommandToolbarButton({
+                id: CommandIDs.getGeolocation,
+                commands: options.commands,
+                label: ''
+            });
+            this.addItem('Geolocation', geolocationButton);
+            geolocationButton.node.dataset.testid = 'geolocation-button';
             const identifyButton = new CommandToolbarButton({
                 id: CommandIDs.identify,
                 label: '',

package/lib/tools.d.ts

@@ -65,7 +65,7 @@ export declare const getFromIndexedDB: (key: string) => Promise<{
  */
 export declare const loadGeoTiff: (sourceInfo: {
     url?: string | undefined;
-}, file?: Contents.IModel | null) => Promise<{
+}, model: IJupyterGISModel, file?: Contents.IModel | null) => Promise<{
     file: any;
     metadata: any;
     sourceUrl: string;

package/lib/tools.js

@@ -301,11 +301,19 @@ export const getFromIndexedDB = async (key) => {
         request.onerror = () => reject(request.error);
     });
 };
-const fetchWithProxies = async (url, parseResponse) => {
+const fetchWithProxies = async (url, model, parseResponse) => {
+    let settings = null;
+    try {
+        settings = await model.getSettings();
+    }
+    catch (e) {
+        console.warn('Failed to get settings from model. Falling back.', e);
+    }
+    const proxyUrl = settings && settings.proxyUrl ? settings.proxyUrl : 'https://corsproxy.io';
     const proxyUrls = [
         url, // Direct fetch
         `/jupytergis_core/proxy?url=${encodeURIComponent(url)}`, // Internal proxy
-        `https://corsproxy.io/?url=${encodeURIComponent(url)}` // External proxy
+        `${proxyUrl}/?url=${encodeURIComponent(url)}` // External proxy
     ];
     for (const proxyUrl of proxyUrls) {
         try {
@@ -328,7 +336,7 @@ const fetchWithProxies = async (url, parseResponse) => {
  * @param sourceInfo object containing the URL of the GeoTIFF file.
  * @returns A promise that resolves to the file as a Blob, or undefined .
  */
-export const loadGeoTiff = async (sourceInfo, file) => {
+export const loadGeoTiff = async (sourceInfo, model, file) => {
     if (!(sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url)) {
         return null;
     }
@@ -347,7 +355,7 @@ export const loadGeoTiff = async (sourceInfo, file) => {
     }
     let fileBlob = null;
     if (!file) {
-        fileBlob = await fetchWithProxies(url, async (response) => response.blob());
+        fileBlob = await fetchWithProxies(url, model, async (response) => response.blob());
         if (!fileBlob) {
             showErrorMessage('Network error', `Failed to fetch ${url}`);
             throw new Error(`Failed to fetch ${url}`);
@@ -403,7 +411,7 @@ export const loadFile = async (fileInfo) => {
                 if (cached) {
                     return cached.file;
                 }
-                const geojson = await fetchWithProxies(filepath, async (response) => {
+                const geojson = await fetchWithProxies(filepath, model, async (response) => {
                     const arrayBuffer = await response.arrayBuffer();
                     return shp(arrayBuffer);
                 });
@@ -419,7 +427,7 @@ export const loadFile = async (fileInfo) => {
                 if (cached) {
                     return cached.file;
                 }
-                const geojson = await fetchWithProxies(filepath, async (response) => response.json());
+                const geojson = await fetchWithProxies(filepath, model, async (response) => response.json());
                 if (geojson) {
                     await saveToIndexedDB(filepath, geojson);
                     return geojson;
@@ -476,7 +484,7 @@ export const loadFile = async (fileInfo) => {
             }
             case 'GeoTiffSource': {
                 if (typeof file.content === 'string') {
-                    const tiff = loadGeoTiff({ url: filepath }, file);
+                    const tiff = loadGeoTiff({ url: filepath }, model, file);
                     return tiff;
                 }
                 else {

package/lib/widget.d.ts

@@ -53,6 +53,7 @@ export declare class JupyterGISPanel extends SplitPanel {
     dispose(): void;
     get currentViewModel(): MainViewModel;
     get consolePanel(): ConsolePanel | undefined;
+    get consoleOpened(): boolean;
     executeConsole(): void;
     removeConsole(): void;
     toggleConsole(jgisPath: string): Promise<void>;

package/lib/widget.js

@@ -116,6 +116,9 @@ export class JupyterGISPanel extends SplitPanel {
         var _a;
         return (_a = this._consoleView) === null || _a === void 0 ? void 0 : _a.consolePanel;
     }
+    get consoleOpened() {
+        return this._consoleOpened;
+    }
     executeConsole() {
         if (this._consoleView) {
             this._consoleView.execute();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/base",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "A JupyterLab extension for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -43,7 +43,7 @@
     "@fortawesome/react-fontawesome": "latest",
     "@jupyter/react-components": "^0.16.6",
     "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
-    "@jupytergis/schema": "^0.4.5",
+    "@jupytergis/schema": "^0.5.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",

package/style/leftPanel.css

@@ -3,7 +3,6 @@
 | Distributed under the terms of the Modified BSD License.
 |---------------------------------------------------------------------------- */
 
-.jp-gis-sourcePanel,
 .jp-gis-layerPanel {
   min-height: 3em;
 }

package/lib/panelview/components/sources.d.ts

@@ -1,10 +0,0 @@
-import { Panel } from '@lumino/widgets';
-import { ILeftPanelOptions } from '../leftpanel';
-/**
- * The sources panel widget.
- */
-export declare class SourcesPanel extends Panel {
-    constructor(options: ILeftPanelOptions);
-    private _model;
-    private _onSelect;
-}

package/lib/panelview/components/sources.js

@@ -1,147 +0,0 @@
-import { DOMUtils } from '@jupyterlab/apputils';
-import { LabIcon, ReactWidget } from '@jupyterlab/ui-components';
-import { Panel } from '@lumino/widgets';
-import React, { useEffect, useState } from 'react';
-import { icons } from '../../constants';
-const SOURCES_PANEL_CLASS = 'jp-gis-sourcePanel';
-const SOURCE_CLASS = 'jp-gis-source';
-const SOURCE_TITLE_CLASS = 'jp-gis-sourceTitle';
-const SOURCE_ICON_CLASS = 'jp-gis-sourceIcon';
-const SOURCE_TEXT_CLASS = 'jp-gis-sourceText';
-const SOURCE_UNUSED = 'jp-gis-sourceUnused';
-const SOURCE_INFO = 'jp-gis-sourceInfo';
-/**
- * The sources panel widget.
- */
-export class SourcesPanel extends Panel {
-    constructor(options) {
-        super();
-        this._model = options.model;
-        this._onSelect = options.onSelect;
-        this.id = 'jupytergis::sourcesPanel';
-        this.addClass(SOURCES_PANEL_CLASS);
-        this.addWidget(ReactWidget.create(React.createElement(SourcesBodyComponent, { model: this._model, onSelect: this._onSelect })));
-    }
-}
-/**
- * The body component of the panel.
- */
-function SourcesBodyComponent(props) {
-    var _a, _b;
-    const [model, setModel] = useState((_a = props.model) === null || _a === void 0 ? void 0 : _a.jGISModel);
-    const [sourceIds, setSourceIds] = useState(Private.sortedSourceIds(model));
-    /**
-     * Propagate the source selection.
-     */
-    const onItemClick = ({ type, item, nodeId, event }) => {
-        props.onSelect({ type, item, nodeId, event });
-    };
-    /**
-     * Listen to the sources and changes.
-     */
-    useEffect(() => {
-        const updateSources = () => {
-            setSourceIds([...Private.sortedSourceIds(model)]);
-        };
-        model === null || model === void 0 ? void 0 : model.sharedModel.sourcesChanged.connect(updateSources);
-        model === null || model === void 0 ? void 0 : model.clientStateChanged.connect(updateSources);
-        updateSources();
-        return () => {
-            model === null || model === void 0 ? void 0 : model.sharedModel.sourcesChanged.disconnect(updateSources);
-            model === null || model === void 0 ? void 0 : model.clientStateChanged.disconnect(updateSources);
-        };
-    }, [model]);
-    /**
-     * Update the model when it changes.
-     */
-    (_b = props.model) === null || _b === void 0 ? void 0 : _b.documentChanged.connect((_, widget) => {
-        setModel(widget === null || widget === void 0 ? void 0 : widget.model);
-    });
-    return (React.createElement("div", { id: "jp-gis-sources" }, sourceIds.map(sourceId => {
-        return (React.createElement(SourceComponent, { key: `source-${sourceId}`, gisModel: model, sourceId: sourceId, onClick: onItemClick }));
-    })));
-}
-function isSelected(sourceId, model) {
-    var _a, _b, _c, _d;
-    return ((((_b = (_a = model === null || model === void 0 ? void 0 : model.localState) === null || _a === void 0 ? void 0 : _a.selected) === null || _b === void 0 ? void 0 : _b.value) &&
-        Object.keys((_d = (_c = model === null || model === void 0 ? void 0 : model.localState) === null || _c === void 0 ? void 0 : _c.selected) === null || _d === void 0 ? void 0 : _d.value).includes(sourceId)) ||
-        false);
-}
-/**
- * The component to display a single source.
- */
-function SourceComponent(props) {
-    const { sourceId, gisModel, onClick } = props;
-    const source = gisModel === null || gisModel === void 0 ? void 0 : gisModel.getSource(sourceId);
-    if (source === undefined) {
-        return React.createElement(React.Fragment, null);
-    }
-    const [id, setId] = useState('');
-    const [selected, setSelected] = useState(
-    // TODO Support multi-selection as `model?.jGISModel?.localState?.selected.value` does
-    isSelected(sourceId, gisModel));
-    const [unused, setUnused] = useState(false);
-    const name = source.name;
-    useEffect(() => {
-        setId(DOMUtils.createDomID());
-    }, []);
-    /**
-     * Check if the source is used by a layer.
-     */
-    useEffect(() => {
-        const checkUsage = () => {
-            const sources = gisModel === null || gisModel === void 0 ? void 0 : gisModel.getLayersBySource(sourceId);
-            setUnused(sources ? sources.length === 0 : true);
-        };
-        gisModel === null || gisModel === void 0 ? void 0 : gisModel.sharedLayersChanged.connect(checkUsage);
-        checkUsage();
-        return () => {
-            gisModel === null || gisModel === void 0 ? void 0 : gisModel.sharedLayersChanged.disconnect(checkUsage);
-        };
-    }, [gisModel]);
-    /**
-     * Listen to the changes on the current source.
-     */
-    useEffect(() => {
-        const onClientSharedStateChanged = (sender, clients) => {
-            // TODO Support follow mode and remoteUser state
-            setSelected(isSelected(sourceId, gisModel));
-        };
-        gisModel === null || gisModel === void 0 ? void 0 : gisModel.clientStateChanged.connect(onClientSharedStateChanged);
-        return () => {
-            gisModel === null || gisModel === void 0 ? void 0 : gisModel.clientStateChanged.disconnect(onClientSharedStateChanged);
-        };
-    }, [gisModel]);
-    const setSelection = (event) => {
-        var _a;
-        const childId = (_a = event.currentTarget.children.namedItem(id)) === null || _a === void 0 ? void 0 : _a.id;
-        onClick({ type: 'source', item: sourceId, nodeId: childId, event });
-    };
-    let mainClasses = SOURCE_CLASS;
-    if (selected) {
-        mainClasses = mainClasses.concat(' jp-mod-selected');
-    }
-    if (unused) {
-        mainClasses = mainClasses.concat(` ${SOURCE_UNUSED}`);
-    }
-    return (React.createElement("div", { className: mainClasses },
-        React.createElement("div", { className: SOURCE_TITLE_CLASS, onClick: setSelection, onContextMenu: setSelection },
-            icons.has(source.type) && (React.createElement(LabIcon.resolveReact, Object.assign({}, icons.get(source.type), { className: SOURCE_ICON_CLASS }))),
-            React.createElement("span", { id: id, className: SOURCE_TEXT_CLASS }, name),
-            unused && React.createElement("span", { className: SOURCE_INFO }, "(unused)"))));
-}
-var Private;
-(function (Private) {
-    function sortedSourceIds(model) {
-        const sources = model === null || model === void 0 ? void 0 : model.getSources();
-        if (sources === undefined) {
-            return [];
-        }
-        return Object.keys(sources).sort((id1, id2) => {
-            const name1 = sources[id1].name.toLowerCase();
-            const name2 = sources[id2].name.toLowerCase();
-            return name1 < name2 ? -1 : name1 > name2 ? 1 : 0;
-        });
-    }
-    Private.sortedSourceIds = sortedSourceIds;
-})(Private || (Private = {}));