@jupytergis/base 0.3.0 → 0.4.1

package/lib/panelview/annotationPanel.js

@@ -9,12 +9,12 @@ export class AnnotationsPanel extends Component {
         };
         this._annotationModel = props.annotationModel;
         this._rightPanelModel = props.rightPanelModel;
-        this._annotationModel.contextChanged.connect(async () => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            await ((_b = (_a = this._annotationModel) === null || _a === void 0 ? void 0 : _a.context) === null || _b === void 0 ? void 0 : _b.ready);
-            (_e = (_d = (_c = this._annotationModel) === null || _c === void 0 ? void 0 : _c.context) === null || _d === void 0 ? void 0 : _d.model) === null || _e === void 0 ? void 0 : _e.sharedMetadataChanged.disconnect(updateCallback);
+        this._annotationModel.modelChanged.connect(async () => {
+            // await this._annotationModel?.context?.ready;
+            var _a, _b, _c, _d;
+            (_b = (_a = this._annotationModel) === null || _a === void 0 ? void 0 : _a.model) === null || _b === void 0 ? void 0 : _b.sharedMetadataChanged.disconnect(updateCallback);
             this._annotationModel = props.annotationModel;
-            (_h = (_g = (_f = this._annotationModel) === null || _f === void 0 ? void 0 : _f.context) === null || _g === void 0 ? void 0 : _g.model) === null || _h === void 0 ? void 0 : _h.sharedMetadataChanged.connect(updateCallback);
+            (_d = (_c = this._annotationModel) === null || _c === void 0 ? void 0 : _c.model) === null || _d === void 0 ? void 0 : _d.sharedMetadataChanged.connect(updateCallback);
             this.forceUpdate();
         });
     }

package/lib/panelview/components/filter-panel/Filter.js

@@ -2,9 +2,8 @@ import { Button, ReactWidget } from '@jupyterlab/ui-components';
 import { Panel } from '@lumino/widgets';
 import { cloneDeep } from 'lodash';
 import React, { useEffect, useRef, useState } from 'react';
-import { debounce, getLayerTileInfo } from '../../../tools';
+import { debounce, loadFile } from '../../../tools';
 import FilterRow from './FilterRow';
-import { loadFile } from '../../../tools';
 /**
  * The filters panel widget.
  */
@@ -29,7 +28,7 @@ const FilterComponent = (props) => {
     const [featuresInLayer, setFeaturesInLayer] = useState({});
     const [model, setModel] = useState(props.model.jGISModel);
     (_a = props.model) === null || _a === void 0 ? void 0 : _a.documentChanged.connect((_, widget) => {
-        setModel(widget === null || widget === void 0 ? void 0 : widget.context.model);
+        setModel(widget === null || widget === void 0 ? void 0 : widget.model);
     });
     // Reset state values when current widget changes
     useEffect(() => {
@@ -108,13 +107,12 @@ const FilterComponent = (props) => {
         featuresInLayerRef.current = featuresInLayer;
     }, [featuresInLayer]);
     const buildFilterObject = async (currentLayer) => {
-        var _a, _b, _c, _d;
+        var _a, _b;
         if (!model) {
             return;
         }
         const layer = model.getLayer(currentLayer !== null && currentLayer !== void 0 ? currentLayer : selectedLayer);
         const source = model.getSource((_a = layer === null || layer === void 0 ? void 0 : layer.parameters) === null || _a === void 0 ? void 0 : _a.source);
-        const { latitude, longitude, extent, zoom } = model.getOptions();
         if (!source || !layer) {
             return;
         }
@@ -131,28 +129,9 @@ const FilterComponent = (props) => {
             });
         }
         switch (source.type) {
-            case 'VectorTileSource': {
-                try {
-                    const tile = await getLayerTileInfo((_b = source === null || source === void 0 ? void 0 : source.parameters) === null || _b === void 0 ? void 0 : _b.url, {
-                        latitude,
-                        longitude,
-                        extent,
-                        zoom
-                    });
-                    const layerValue = tile.layers[(_c = layer.parameters) === null || _c === void 0 ? void 0 : _c.sourceLayer];
-                    for (let i = 0; i < layerValue.length; i++) {
-                        const feature = layerValue.feature(i);
-                        addFeatureValue(feature.properties, aggregatedProperties);
-                    }
-                }
-                catch (error) {
-                    console.warn(`Error fetching tile info: ${error}`);
-                }
-                break;
-            }
             case 'GeoJSONSource': {
                 const data = await loadFile({
-                    filepath: (_d = source.parameters) === null || _d === void 0 ? void 0 : _d.path,
+                    filepath: (_b = source.parameters) === null || _b === void 0 ? void 0 : _b.path,
                     type: 'GeoJSONSource',
                     model: model
                 });

package/lib/panelview/components/identify-panel/IdentifyPanel.js

@@ -26,7 +26,7 @@ const IdentifyPanelComponent = ({ controlPanelModel, tracker }) => {
      * Update the model when it changes.
      */
     controlPanelModel === null || controlPanelModel === void 0 ? void 0 : controlPanelModel.documentChanged.connect((_, widget) => {
-        setJgisModel(widget === null || widget === void 0 ? void 0 : widget.context.model);
+        setJgisModel(widget === null || widget === void 0 ? void 0 : widget.model);
     });
     // Reset state values when current widget changes
     useEffect(() => {

package/lib/panelview/components/layers.js

@@ -104,8 +104,8 @@ function LayersBodyComponent(props) {
      */
     (_b = props.model) === null || _b === void 0 ? void 0 : _b.documentChanged.connect((_, widget) => {
         var _a;
-        setModel(widget === null || widget === void 0 ? void 0 : widget.context.model);
-        setLayerTree(((_a = widget === null || widget === void 0 ? void 0 : widget.context.model) === null || _a === void 0 ? void 0 : _a.getLayerTree()) || []);
+        setModel(widget === null || widget === void 0 ? void 0 : widget.model);
+        setLayerTree(((_a = widget === null || widget === void 0 ? void 0 : widget.model) === null || _a === void 0 ? void 0 : _a.getLayerTree()) || []);
     });
     return (React.createElement("div", { id: "jp-gis-layer-tree" }, layerTree
         .slice()

package/lib/panelview/components/sources.js

@@ -55,7 +55,7 @@ function SourcesBodyComponent(props) {
      * 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.context.model);
+        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 }));

package/lib/panelview/leftpanel.d.ts

@@ -4,6 +4,7 @@ import { SidePanel } from '@jupyterlab/ui-components';
 import { Message } from '@lumino/messaging';
 import { MouseEvent as ReactMouseEvent } from 'react';
 import { IControlPanelModel } from '../types';
+import { CommandRegistry } from '@lumino/commands';
 /**
  * Options of the left panel widget.
  */
@@ -37,12 +38,14 @@ export declare class LeftPanelWidget extends SidePanel {
     private _lastSelectedNodeId;
     private _model;
     private _state;
+    private _commands;
 }
 export declare namespace LeftPanelWidget {
     interface IOptions {
         model: IControlPanelModel;
         tracker: IJupyterGISTracker;
         state: IStateDB;
+        commands: CommandRegistry;
     }
     interface IProps {
         filePath?: string;

package/lib/panelview/leftpanel.js

@@ -3,6 +3,7 @@ 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';
 export class LeftPanelWidget extends SidePanel {
     constructor(options) {
         super();
@@ -50,11 +51,13 @@ export class LeftPanelWidget extends SidePanel {
                 const updatedSelectedValue = Object.assign(Object.assign({}, selectedValue), { [item]: { type, selectedNodeId: nodeId } });
                 this._lastSelectedNodeId = nodeId;
                 jGISModel.syncSelected(updatedSelectedValue, this.id);
+                this._commands.notifyCommandChanged(CommandIDs.temporalController);
             }
         };
         this.addClass('jGIS-sidepanel-widget');
         this._model = options.model;
         this._state = options.state;
+        this._commands = options.commands;
         const header = new ControlPanelHeader();
         this.header.addWidget(header);
         const sourcesPanel = new SourcesPanel({
@@ -81,7 +84,7 @@ export class LeftPanelWidget extends SidePanel {
         this.addWidget(filterPanel);
         options.tracker.currentChanged.connect((_, changed) => {
             if (changed) {
-                header.title.label = changed.context.localPath;
+                header.title.label = changed.model.filePath;
             }
             else {
                 header.title.label = '-';
@@ -129,5 +132,6 @@ export class LeftPanelWidget extends SidePanel {
             this._lastSelectedNodeId = nodeId;
         }
         (_b = (_a = this._model) === null || _a === void 0 ? void 0 : _a.jGISModel) === null || _b === void 0 ? void 0 : _b.syncSelected(selection, this.id);
+        this._commands.notifyCommandChanged(CommandIDs.temporalController);
     }
 }

package/lib/panelview/model.js

@@ -8,23 +8,23 @@ export class ControlPanelModel {
     }
     get filePath() {
         var _a;
-        return (_a = this._tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.context.localPath;
+        return (_a = this._tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model.filePath;
     }
     get jGISModel() {
         var _a;
-        return (_a = this._tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.context.model;
+        return (_a = this._tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
     }
     get sharedModel() {
         var _a;
-        return (_a = this._tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.context.model.sharedModel;
+        return (_a = this._tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model.sharedModel;
     }
     disconnect(f) {
         this._tracker.forEach(w => {
-            w.context.model.sharedLayersChanged.disconnect(f);
-            w.context.model.sharedSourcesChanged.disconnect(f);
-            w.context.model.sharedOptionsChanged.disconnect(f);
+            w.model.sharedLayersChanged.disconnect(f);
+            w.model.sharedSourcesChanged.disconnect(f);
+            w.model.sharedOptionsChanged.disconnect(f);
         });
-        this._tracker.forEach(w => w.context.model.themeChanged.disconnect(f));
-        this._tracker.forEach(w => w.context.model.clientStateChanged.disconnect(f));
+        this._tracker.forEach(w => w.model.themeChanged.disconnect(f));
+        this._tracker.forEach(w => w.model.clientStateChanged.disconnect(f));
     }
 }

package/lib/panelview/objectproperties.js

@@ -45,7 +45,7 @@ class ObjectPropertiesReact extends React.Component {
             }
         };
         this.state = {
-            context: (_a = props.tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.context,
+            model: (_a = props.tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model,
             clientId: null,
             id: uuid()
         };
@@ -55,14 +55,14 @@ class ObjectPropertiesReact extends React.Component {
             if (changed) {
                 this.props.cpModel.disconnect(this._sharedJGISModelChanged);
                 this.props.cpModel.disconnect(this._onClientSharedStateChanged);
-                changed.context.model.sharedLayersChanged.connect(this._sharedJGISModelChanged);
-                changed.context.model.sharedSourcesChanged.connect(this._sharedJGISModelChanged);
-                changed.context.model.clientStateChanged.connect(this._onClientSharedStateChanged);
-                this.setState(old => (Object.assign(Object.assign({}, old), { context: changed.context, filePath: changed.context.localPath, clientId: changed.context.model.getClientId() })));
+                changed.model.sharedLayersChanged.connect(this._sharedJGISModelChanged);
+                changed.model.sharedSourcesChanged.connect(this._sharedJGISModelChanged);
+                changed.model.clientStateChanged.connect(this._onClientSharedStateChanged);
+                this.setState(old => (Object.assign(Object.assign({}, old), { model: changed.model, filePath: changed.model.filePath, clientId: changed.model.getClientId() })));
             }
             else {
                 this.setState({
-                    context: undefined,
+                    model: undefined,
                     selectedObject: undefined
                 });
             }
@@ -71,22 +71,22 @@ class ObjectPropertiesReact extends React.Component {
     render() {
         var _a;
         const selectedObject = this.state.selectedObject;
-        if (!selectedObject || !this.state.context) {
+        if (!selectedObject || !this.state.model) {
             return React.createElement("div", null);
         }
         let layerId = undefined;
         let sourceId = undefined;
-        const layer = this.state.context.model.getLayer(selectedObject);
+        const layer = this.state.model.getLayer(selectedObject);
         if (layer) {
             layerId = selectedObject;
             sourceId = (_a = layer.parameters) === null || _a === void 0 ? void 0 : _a.source;
         }
         else {
-            const source = this.state.context.model.getSource(selectedObject);
+            const source = this.state.model.getSource(selectedObject);
             if (source) {
                 sourceId = selectedObject;
             }
         }
-        return (React.createElement(EditForm, { layer: layerId, source: sourceId, formSchemaRegistry: this.props.formSchemaRegistry, context: this.state.context }));
+        return (React.createElement(EditForm, { layer: layerId, source: sourceId, formSchemaRegistry: this.props.formSchemaRegistry, model: this.state.model }));
     }
 }

package/lib/panelview/rightpanel.d.ts

@@ -4,7 +4,7 @@ import { IControlPanelModel } from '../types';
 export declare class RightPanelWidget extends SidePanel {
     constructor(options: RightPanelWidget.IOptions);
     dispose(): void;
-    private _currentContext;
+    private _currentModel;
     private _model;
     private _annotationModel;
 }

package/lib/panelview/rightpanel.js

@@ -31,12 +31,12 @@ export class RightPanelWidget extends SidePanel {
         this.addWidget(identifyPanel);
         this._model.documentChanged.connect((_, changed) => {
             if (changed) {
-                if (changed.context.model.sharedModel.editable) {
-                    header.title.label = changed.context.localPath;
+                if (changed.model.sharedModel.editable) {
+                    header.title.label = changed.model.filePath;
                     properties.show();
                 }
                 else {
-                    header.title.label = `${changed.context.localPath} - Read Only`;
+                    header.title.label = `${changed.model.filePath} - Read Only`;
                     properties.hide();
                 }
             }
@@ -47,16 +47,16 @@ export class RightPanelWidget extends SidePanel {
         options.tracker.currentChanged.connect(async (_, changed) => {
             var _a;
             if (changed) {
-                this._currentContext = changed.context;
-                header.title.label = this._currentContext.localPath;
-                this._annotationModel.context =
-                    ((_a = options.tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.context) || undefined;
-                await changed.context.ready;
+                this._currentModel = changed.model;
+                header.title.label = this._currentModel.filePath;
+                this._annotationModel.model =
+                    ((_a = options.tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model) || undefined;
+                // await changed.context.ready;
             }
             else {
                 header.title.label = '-';
-                this._currentContext = null;
-                this._annotationModel.context = undefined;
+                this._currentModel = null;
+                this._annotationModel.model = undefined;
             }
         });
     }

package/lib/toolbar/widget.d.ts

@@ -1,5 +1,5 @@
 import { IJGISExternalCommand, JupyterGISModel } from '@jupytergis/schema';
-import { Toolbar, ReactiveToolbar } from '@jupyterlab/ui-components';
+import { ReactiveToolbar, Toolbar } from '@jupyterlab/ui-components';
 import { CommandRegistry } from '@lumino/commands';
 import { Widget } from '@lumino/widgets';
 export declare const TOOLBAR_SEPARATOR_CLASS = "jGIS-Toolbar-Separator";

package/lib/toolbar/widget.js

@@ -1,8 +1,9 @@
 import { CommandToolbarButton } from '@jupyterlab/apputils';
-import { ReactWidget, ReactiveToolbar, ToolbarButton, addIcon, redoIcon, undoIcon, terminalIcon } from '@jupyterlab/ui-components';
+import { MenuSvg, ReactWidget, ReactiveToolbar, ToolbarButton, addIcon, redoIcon, terminalIcon, undoIcon } from '@jupyterlab/ui-components';
 import { Menu, Widget } from '@lumino/widgets';
 import * as React from 'react';
 import { CommandIDs } from '../constants';
+import { rasterIcon } from '../icons';
 import { UsersItem } from './usertoolbaritem';
 export const TOOLBAR_SEPARATOR_CLASS = 'jGIS-Toolbar-Separator';
 export const TOOLBAR_GROUPNAME_CLASS = 'jGIS-Toolbar-GroupName';
@@ -55,52 +56,63 @@ export class ToolbarWidget extends ReactiveToolbar {
                 label: '',
                 commands: options.commands
             }));
-            const NewButton = new ToolbarButton({
+            // 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 });
+            const NewEntryButton = new ToolbarButton({
                 icon: addIcon,
                 noFocusOnClick: false,
                 onClick: () => {
                     if (!options.commands) {
                         return;
                     }
-                    const bbox = NewButton.node.getBoundingClientRect();
-                    const NewSubMenu = new Menu({ commands: options.commands });
-                    NewSubMenu.title.label = 'New Layer';
-                    NewSubMenu.addItem({
-                        type: 'command',
-                        command: CommandIDs.newHillshadeEntry
-                    });
-                    NewSubMenu.addItem({
-                        type: 'separator'
-                    });
-                    NewSubMenu.addItem({
-                        type: 'command',
-                        command: CommandIDs.newImageEntry
-                    });
-                    NewSubMenu.addItem({
-                        type: 'separator'
-                    });
-                    NewSubMenu.addItem({
-                        type: 'command',
-                        command: CommandIDs.newShapefileLayer
-                    });
-                    NewSubMenu.addItem({
-                        type: 'command',
-                        command: CommandIDs.newGeoTiffEntry
-                    });
-                    NewSubMenu.addItem({
-                        type: 'command',
-                        command: CommandIDs.newGeoJSONEntry
-                    });
+                    const bbox = NewEntryButton.node.getBoundingClientRect();
                     NewSubMenu.open(bbox.x, bbox.bottom);
                 }
             });
-            this.addItem('New', NewButton);
+            this.addItem('New', NewEntryButton);
             this.addItem('separator2', new Separator());
             this.addItem('identify', new CommandToolbarButton({
                 id: CommandIDs.identify,
                 label: '',
                 commands: options.commands
             }));
+            this.addItem('temporalController', new CommandToolbarButton({
+                id: CommandIDs.temporalController,
+                label: '',
+                commands: options.commands
+            }));
             this.addItem('spacer', ReactiveToolbar.createSpacerItem());
             // Users
             this.addItem('users', ReactWidget.create(React.createElement(UsersItem, { model: options.model })));

package/lib/tools.d.ts

@@ -22,7 +22,6 @@ export declare function deepCopy<T = IDict<any>>(value: T): T;
  */
 export declare function createDefaultLayerRegistry(layerBrowserRegistry: IJGISLayerBrowserRegistry): void;
 export declare function getLayerTileInfo(tileUrl: string, mapOptions: Pick<IJGISOptions, 'latitude' | 'longitude' | 'extent' | 'zoom'>, urlParameters?: IDict<string>): Promise<VectorTile>;
-export declare function getSourceLayerNames(tileUrl: string, urlParameters?: IDict<string>): Promise<string[]>;
 export interface IParsedStyle {
     fillColor: string;
     strokeColor: string;
@@ -46,27 +45,17 @@ export declare const openDatabase: () => Promise<IDBDatabase>;
  * @param metadata metadata of file.
  * @returns A promise that resolves once the data is successfully saved.
  */
-export declare const saveToIndexedDB: (key: string, file: Blob, metadata: any) => Promise<void>;
+export declare const saveToIndexedDB: (key: string, file: any, metadata?: any | undefined) => Promise<void>;
 /**
  * Retrieve a file and its metadata from the IndexedDB database.
  *
  * @param key fileID (sourceUrl).
  * @returns A promise that resolves to the stored data object or undefined.
  */
-export declare const getFromIndexedDB: (key: string) => Promise<any>;
-/**
- * Load a GeoTIFF file from IndexedDB database cache or fetch it .
- *
- * @param sourceInfo object containing the URL of the GeoTIFF file.
- * @returns A promise that resolves to the file as a Blob, or undefined .
- */
-export declare const loadGeoTIFFWithCache: (sourceInfo: {
-    url?: string | undefined;
-}) => Promise<{
-    file: Blob;
-    metadata: any;
-    sourceUrl: string;
-} | null>;
+export declare const getFromIndexedDB: (key: string) => Promise<{
+    file: any;
+    metadata?: any | undefined;
+} | undefined>;
 /**
  * Generalized file reader for different source types.
  *
@@ -106,3 +95,4 @@ export declare const getMimeType: (filename: string) => string;
  * @returns An ArrayBuffer.
  */
 export declare const stringToArrayBuffer: (content: string) => Promise<ArrayBuffer>;
+export declare const getNumericFeatureAttributes: (featureProperties: Record<string, Set<any>>) => Record<string, Set<number>>;

package/lib/tools.js

@@ -1,12 +1,11 @@
 import Protobuf from 'pbf';
 import { VectorTile } from '@mapbox/vector-tile';
-import { URLExt } from '@jupyterlab/coreutils';
+import { PathExt, URLExt } from '@jupyterlab/coreutils';
 import { ServerConnection } from '@jupyterlab/services';
+import { showErrorMessage } from '@jupyterlab/apputils';
 import * as d3Color from 'd3-color';
-import { PathExt } from '@jupyterlab/coreutils';
 import shp from 'shpjs';
 import RASTER_LAYER_GALLERY from '../rasterlayer_gallery/raster_layer_gallery.json';
-import { getGdal } from './gdal';
 export const debounce = (func, timeout = 100) => {
     let timeoutId;
     return (...args) => {
@@ -215,11 +214,6 @@ export async function getLayerTileInfo(tileUrl, mapOptions, urlParameters) {
     const tile = new VectorTile(new Protobuf(arrayBuffer));
     return tile;
 }
-export async function getSourceLayerNames(tileUrl, urlParameters) {
-    const tile = await getLayerTileInfo(tileUrl, { latitude: 0, longitude: 0, zoom: 0, extent: [] }, urlParameters);
-    const layerNames = Object.keys(tile.layers);
-    return layerNames;
-}
 export function parseColor(type, style) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     if (!type || !style) {
@@ -306,38 +300,26 @@ export const getFromIndexedDB = async (key) => {
         request.onerror = () => reject(request.error);
     });
 };
-/**
- * Load a GeoTIFF file from IndexedDB database cache or fetch it .
- *
- * @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 loadGeoTIFFWithCache = async (sourceInfo) => {
-    if (!(sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url)) {
-        return null;
-    }
-    const cachedData = await getFromIndexedDB(sourceInfo.url);
-    if (cachedData) {
-        return {
-            file: new Blob([cachedData.file]),
-            metadata: cachedData.metadata,
-            sourceUrl: sourceInfo.url
-        };
+const fetchWithProxies = async (url, parseResponse) => {
+    const proxyUrls = [
+        url, // Direct fetch
+        `/jupytergis_core/proxy?url=${encodeURIComponent(url)}`, // Internal proxy
+        `https://corsproxy.io/?url=${encodeURIComponent(url)}` // External proxy
+    ];
+    for (const proxyUrl of proxyUrls) {
+        try {
+            const response = await fetch(proxyUrl);
+            if (!response.ok) {
+                console.warn(`Failed to fetch from ${proxyUrl}: ${response.statusText}`);
+                continue;
+            }
+            return await parseResponse(response);
+        }
+        catch (error) {
+            console.warn(`Error fetching from ${proxyUrl}:`, error);
+        }
     }
-    const response = await fetch(sourceInfo.url);
-    const fileBlob = await response.blob();
-    const file = new File([fileBlob], 'loaded.tif');
-    const Gdal = await getGdal();
-    const result = await Gdal.open(file);
-    const tifDataset = result.datasets[0];
-    const metadata = await Gdal.gdalinfo(tifDataset, ['-stats']);
-    Gdal.close(tifDataset);
-    await saveToIndexedDB(sourceInfo.url, fileBlob, metadata);
-    return {
-        file: fileBlob,
-        metadata,
-        sourceUrl: sourceInfo.url
-    };
+    return null;
 };
 /**
  * Generalized file reader for different source types.
@@ -369,30 +351,33 @@ export const loadFile = async (fileInfo) => {
                 }
             }
             case 'ShapefileSource': {
-                try {
-                    const response = await fetch(`/jupytergis_core/proxy?url=${filepath}`);
+                const cached = await getFromIndexedDB(filepath);
+                if (cached) {
+                    return cached.file;
+                }
+                const geojson = await fetchWithProxies(filepath, async (response) => {
                     const arrayBuffer = await response.arrayBuffer();
-                    const geojson = await shp(arrayBuffer);
+                    return shp(arrayBuffer);
+                });
+                if (geojson) {
+                    await saveToIndexedDB(filepath, geojson);
                     return geojson;
                 }
-                catch (error) {
-                    console.error('Error loading remote shapefile:', error);
-                    throw error;
-                }
+                showErrorMessage('Network error', `Failed to fetch ${filepath}`);
+                throw new Error(`Failed to fetch ${filepath}`);
             }
             case 'GeoJSONSource': {
-                try {
-                    const response = await fetch(`/jupytergis_core/proxy?url=${filepath}`);
-                    if (!response.ok) {
-                        throw new Error(`Failed to fetch GeoJSON from URL: ${filepath}`);
-                    }
-                    const geojson = await response.json();
-                    return geojson;
+                const cached = await getFromIndexedDB(filepath);
+                if (cached) {
+                    return cached.file;
                 }
-                catch (error) {
-                    console.error('Error loading remote GeoJSON:', error);
-                    throw error;
+                const geojson = await fetchWithProxies(filepath, async (response) => response.json());
+                if (geojson) {
+                    await saveToIndexedDB(filepath, geojson);
+                    return geojson;
                 }
+                showErrorMessage('Network error', `Failed to fetch ${filepath}`);
+                throw new Error(`Failed to fetch ${filepath}`);
             }
             default: {
                 throw new Error(`Unsupported URL handling for source type: ${type}`);
@@ -645,3 +630,16 @@ export const stringToArrayBuffer = async (content) => {
     const base64Response = await fetch(`data:application/octet-stream;base64,${content}`);
     return await base64Response.arrayBuffer();
 };
+export const getNumericFeatureAttributes = (featureProperties) => {
+    // We only want number values here
+    const filteredRecord = {};
+    for (const [key, set] of Object.entries(featureProperties)) {
+        const firstValue = set.values().next().value;
+        // Check if the first value is a string that cannot be parsed as a number
+        const isInvalidString = typeof firstValue === 'string' && isNaN(Number(firstValue));
+        if (!isInvalidString) {
+            filteredRecord[key] = set;
+        }
+    }
+    return filteredRecord;
+};

package/lib/types.d.ts

@@ -1,8 +1,10 @@
 import { IDict, IJupyterGISDoc, IJupyterGISModel, IJupyterGISTracker, IJupyterGISWidget } from '@jupytergis/schema';
+import { WidgetTracker } from '@jupyterlab/apputils';
 import { ISignal } from '@lumino/signaling';
 import { Map } from 'ol';
 export { IDict };
 export type ValueOf<T> = T[keyof T];
+export type JupyterGISTracker = WidgetTracker<IJupyterGISWidget>;
 export interface IControlPanelModel {
     disconnect(f: any): void;
     documentChanged: ISignal<IJupyterGISTracker, IJupyterGISWidget | null>;