@jupytergis/base 0.4.1 → 0.4.3

package/lib/tools.d.ts

@@ -1,4 +1,5 @@
 import { VectorTile } from '@mapbox/vector-tile';
+import { Contents } from '@jupyterlab/services';
 import { IDict, IJGISLayerBrowserRegistry, IJGISOptions, IJGISSource, IJupyterGISModel } from '@jupytergis/schema';
 export declare const debounce: (func: CallableFunction, timeout?: number) => CallableFunction;
 export declare function throttle<T extends (...args: any[]) => void>(callback: T, delay?: number): T;
@@ -56,6 +57,19 @@ export declare const getFromIndexedDB: (key: string) => Promise<{
     file: any;
     metadata?: any | undefined;
 } | undefined>;
+/**
+ * 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 loadGeoTiff: (sourceInfo: {
+    url?: string | undefined;
+}, file?: Contents.IModel | null) => Promise<{
+    file: any;
+    metadata: any;
+    sourceUrl: string;
+} | null>;
 /**
  * Generalized file reader for different source types.
  *
@@ -96,3 +110,5 @@ export declare const getMimeType: (filename: string) => string;
  */
 export declare const stringToArrayBuffer: (content: string) => Promise<ArrayBuffer>;
 export declare const getNumericFeatureAttributes: (featureProperties: Record<string, Set<any>>) => Record<string, Set<number>>;
+export declare function downloadFile(content: BlobPart, fileName: string, mimeType: string): void;
+export declare function getGeoJSONDataFromLayerSource(source: IJGISSource, model: IJupyterGISModel): Promise<string | null>;

package/lib/tools.js

@@ -5,6 +5,7 @@ import { ServerConnection } from '@jupyterlab/services';
 import { showErrorMessage } from '@jupyterlab/apputils';
 import * as d3Color from 'd3-color';
 import shp from 'shpjs';
+import { getGdal } from './gdal';
 import RASTER_LAYER_GALLERY from '../rasterlayer_gallery/raster_layer_gallery.json';
 export const debounce = (func, timeout = 100) => {
     let timeoutId;
@@ -321,6 +322,53 @@ const fetchWithProxies = async (url, parseResponse) => {
     }
     return null;
 };
+/**
+ * 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 loadGeoTiff = async (sourceInfo, file) => {
+    if (!(sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url)) {
+        return null;
+    }
+    const url = sourceInfo.url;
+    const mimeType = getMimeType(url);
+    if (!mimeType || !mimeType.startsWith('image/tiff')) {
+        throw new Error('Invalid file type. Expected GeoTIFF (image/tiff).');
+    }
+    const cachedData = await getFromIndexedDB(url);
+    if (cachedData) {
+        return {
+            file: cachedData.file,
+            metadata: cachedData.metadata,
+            sourceUrl: url
+        };
+    }
+    let fileBlob = null;
+    if (!file) {
+        fileBlob = await fetchWithProxies(url, async (response) => response.blob());
+        if (!fileBlob) {
+            showErrorMessage('Network error', `Failed to fetch ${url}`);
+            throw new Error(`Failed to fetch ${url}`);
+        }
+    }
+    else {
+        fileBlob = await base64ToBlob(file.content, mimeType);
+    }
+    const geotiff = new File([fileBlob], 'loaded.tif');
+    const Gdal = await getGdal();
+    const result = await Gdal.open(geotiff);
+    const tifDataset = result.datasets[0];
+    const metadata = await Gdal.gdalinfo(tifDataset, ['-stats']);
+    Gdal.close(tifDataset);
+    await saveToIndexedDB(url, fileBlob, metadata);
+    return {
+        file: fileBlob,
+        metadata,
+        sourceUrl: url
+    };
+};
 /**
  * Generalized file reader for different source types.
  *
@@ -426,6 +474,15 @@ export const loadFile = async (fileInfo) => {
                     throw new Error('Invalid file format for image content.');
                 }
             }
+            case 'GeoTiffSource': {
+                if (typeof file.content === 'string') {
+                    const tiff = loadGeoTiff({ url: filepath }, file);
+                    return tiff;
+                }
+                else {
+                    throw new Error('Invalid file format for tiff content.');
+                }
+            }
             default: {
                 throw new Error(`Unsupported source type: ${type}`);
             }
@@ -643,3 +700,39 @@ export const getNumericFeatureAttributes = (featureProperties) => {
     }
     return filteredRecord;
 };
+export function downloadFile(content, fileName, mimeType) {
+    const blob = new Blob([content], { type: mimeType });
+    const url = URL.createObjectURL(blob);
+    const downloadLink = document.createElement('a');
+    downloadLink.href = url;
+    downloadLink.download = fileName;
+    document.body.appendChild(downloadLink);
+    downloadLink.click();
+    document.body.removeChild(downloadLink);
+}
+export async function getGeoJSONDataFromLayerSource(source, model) {
+    const vectorSourceTypes = ['GeoJSONSource', 'ShapefileSource'];
+    if (!vectorSourceTypes.includes(source.type)) {
+        console.error(`Invalid source type '${source.type}'. Expected one of: ${vectorSourceTypes.join(', ')}`);
+        return null;
+    }
+    if (!source.parameters) {
+        console.error('Source parameters are missing.');
+        return null;
+    }
+    if (source.parameters.path) {
+        const fileContent = await loadFile({
+            filepath: source.parameters.path,
+            type: source.type,
+            model
+        });
+        return typeof fileContent === 'object'
+            ? JSON.stringify(fileContent)
+            : fileContent;
+    }
+    else if (source.parameters.data) {
+        return JSON.stringify(source.parameters.data);
+    }
+    console.error("Source is missing both 'path' and 'data' parameters.");
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/base",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "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.1",
+    "@jupytergis/schema": "^0.4.3",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",

package/style/leftPanel.css

@@ -75,7 +75,6 @@
 
 .jp-gis-layer button,
 .jp-gis-source button {
-  margin-left: auto;
   min-height: unset;
   min-width: unset;
   padding: unset;