Add GeoPackage data format

packages/base/package.json

@@ -63,6 +63,7 @@
     "@lumino/widgets": "^2.0.0",
     "@mapbox/vector-tile": "^2.0.3",
     "@naisutech/react-tree": "^3.0.1",
+    "@ngageoint/geopackage": "^4.2.6",
     "@rjsf/core": "^4.2.0",
     "@rjsf/validator-ajv8": "^5.23.1",
     "ajv": "^8.14.0",

packages/base/src/commands.ts

@@ -528,6 +528,26 @@ export function addCommands(
     }),
     ...icons.get(CommandIDs.newShapefileEntry)
   });
+  commands.addCommand(CommandIDs.newGeoPackageEntry, {
+    label: trans.__('New GeoPackage Layer'),
+    isEnabled: () => {
+      return tracker.currentWidget
+        ? tracker.currentWidget.model.sharedModel.editable
+        : false;
+    },
+    execute: Private.createEntry({
+      tracker,
+      formSchemaRegistry,
+      title: 'Create GeoPackage Layer',
+      createLayer: true,
+      createSource: true,
+      sourceData: { name: 'Custom GeoPackage Source' },
+      layerData: { name: 'Custom GeoPackage Layer' },
+      sourceType: 'GeoPackageSource',
+      layerType: 'VectorLayer'
+    }),
+    ...icons.get(CommandIDs.newGeoPackageEntry)
+  });
 
   /**
    * LAYERS and LAYER GROUP actions.

packages/base/src/constants.ts

@@ -3,6 +3,7 @@ import {
   bookOpenIcon,
   clockIcon,
   geoJSONIcon,
+  geoPackageIcon,
   infoIcon,
   moundIcon,
   rasterIcon,
@@ -35,6 +36,7 @@ export namespace CommandIDs {
   export const newImageEntry = 'jupytergis:newImageEntry';
   export const newVideoEntry = 'jupytergis:newVideoEntry';
   export const newGeoTiffEntry = 'jupytergis:newGeoTiffEntry';
+  export const newGeoPackageEntry = 'jupytergis:newGeoPackageEntry';
 
   // Processing commands
   export const buffer = 'jupytergis:buffer';
@@ -94,6 +96,7 @@ const iconObject = {
   [CommandIDs.newHillshadeEntry]: { icon: moundIcon },
   [CommandIDs.newImageEntry]: { iconClass: 'fa fa-image' },
   [CommandIDs.newVideoEntry]: { iconClass: 'fa fa-video' },
+  [CommandIDs.newGeoPackageEntry]: { icon: geoPackageIcon },
   [CommandIDs.newShapefileEntry]: { iconClass: 'fa fa-file' },
   [CommandIDs.newGeoTiffEntry]: { iconClass: 'fa fa-image' },
   [CommandIDs.symbology]: { iconClass: 'fa fa-brush' },

packages/base/src/formbuilder/formselectors.ts

@@ -59,6 +59,9 @@ export function getSourceTypeForm(
     case 'VectorTileSource':
       SourceForm = TileSourcePropertiesForm;
       break;
+    case 'GeoPackageSource':
+      SourceForm = PathBasedSourcePropertiesForm;
+      break;
     // ADD MORE FORM TYPES HERE
   }
   return SourceForm;

packages/base/src/icons.ts

@@ -23,6 +23,7 @@ import terminalToolbarSvgStr from '../style/icons/terminal_toolbar.svg';
 import geolocationSvgStr from '../style/icons/geolocation.svg';
 import targetWithoutCenterSvgStr from '../style/icons/target_without_center.svg';
 import targetWithCenterSvgStr from '../style/icons/target_with_center.svg';
+import geoPackageSvgStr from '../style/icons/geopackage.svg';
 
 export const logoIcon = new LabIcon({
   name: 'jupytergis::logo',
@@ -108,3 +109,8 @@ export const targetWithCenterIcon = new LabIcon({
   name: 'jupytergis::targetWithoutCenter',
   svgstr: targetWithoutCenterSvgStr
 });
+
+export const geoPackageIcon = new LabIcon({
+  name: 'jupytergis::geoPackage',
+  svgstr: geoPackageSvgStr
+});

packages/base/src/mainview/mainView.tsx

@@ -2,6 +2,7 @@ import { MapChange } from '@jupyter/ydoc';
 import {
   IAnnotation,
   IDict,
+  IGeoPackageSource,
   IGeoTiffSource,
   IHeatmapLayer,
   IHillshadeLayer,
@@ -695,6 +696,27 @@ export class MainView extends React.Component<IProps, IStates> {
 
         break;
       }
+      case 'GeoPackageSource': {
+        const parameters = source.parameters as IGeoPackageSource;
+
+        const geojson = await loadFile({
+          filepath: parameters.path,
+          type: 'GeoPackageSource',
+          model: this._model
+        });
+
+        const geojsonData = Array.isArray(geojson) ? geojson[0] : geojson;
+
+        const format = new GeoJSON();
+
+        newSource = new VectorSource({
+          features: format.readFeatures(geojsonData, {
+            dataProjection: parameters.projection,
+            featureProjection: this._Map.getView().getProjection()
+          })
+        });
+        break;
+      }
     }
 
     newSource.set('id', id);

packages/base/src/menus.ts

@@ -26,6 +26,11 @@ export const vectorSubMenu = (commands: CommandRegistry) => {
     command: CommandIDs.newShapefileEntry
   });
 
+  subMenu.addItem({
+    type: 'command',
+    command: CommandIDs.newGeoPackageEntry
+  });
+
   return subMenu;
 };
 

packages/base/src/tools.ts

@@ -19,6 +19,7 @@ import {
   SourceType
 } from '@jupytergis/schema';
 import RASTER_LAYER_GALLERY from '../rasterlayer_gallery/raster_layer_gallery.json';
+import { GeoPackageAPI } from '@ngageoint/geopackage';
 
 export const debounce = (
   func: CallableFunction,
@@ -489,6 +490,31 @@ export const loadGeoTiff = async (
   };
 };
 
+/**
+ * Read a GeoPackage file
+ *
+ * @param file The GeoPackage file content as an ArrayBuffer
+ *
+ * @returns A promise that resolves to a GeoJSON FeatureCollection
+ *
+ */
+const loadGeoPackageFile = async (file: ArrayBuffer) => {
+  const bytes = new Uint8Array(file);
+  const gpkg = await GeoPackageAPI.open(bytes);
+
+  const tables = gpkg.getFeatureTables();
+  const features: GeoJSON.Feature[] = [];
+  for (const tableName of tables) {
+    const dao = gpkg.getFeatureDao(tableName);
+    const bbox = dao.getBoundingBox();
+    const iter = gpkg.queryForGeoJSONFeaturesInTable(tableName, bbox);
+    for (const feat of iter) {
+      features.push(feat);
+    }
+  }
+  return { type: 'FeatureCollection', features };
+};
+
 /**
  * Generalized file reader for different source types.
  *
@@ -570,6 +596,30 @@ export const loadFile = async (fileInfo: {
         throw new Error(`Failed to fetch ${filepath}`);
       }
 
+      case 'GeoPackageSource': {
+        const cached = await getFromIndexedDB(filepath);
+        if (cached) {
+          return cached.file;
+        }
+
+        const geojson = await fetchWithProxies(
+          filepath,
+          model,
+          async response => {
+            const arrayBuffer = await response.arrayBuffer();
+            return await loadGeoPackageFile(arrayBuffer);
+          }
+        );
+
+        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}`);
       }
@@ -636,6 +686,15 @@ export const loadFile = async (fileInfo: {
         }
       }
 
+      case 'GeoPackageSource': {
+        if (typeof file.content === 'string') {
+          const arrayBuffer = await stringToArrayBuffer(file.content);
+          return await loadGeoPackageFile(arrayBuffer);
+        } else {
+          throw new Error('Invalid file format for GeoPackage content.');
+        }
+      }
+
       default: {
         throw new Error(`Unsupported source type: ${type}`);
       }

packages/schema/src/schema/project/jgis.json

@@ -53,7 +53,8 @@
         "VideoSource",
         "ImageSource",
         "ShapefileSource",
-        "GeoTiffSource"
+        "GeoTiffSource",
+        "GeoPackageSource"
       ]
     },
     "jGISLayer": {

packages/schema/src/schema/project/sources/geoPackageSource.json

@@ -0,0 +1,24 @@
+{
+  "type": "object",
+  "description": "GeoPackageSource",
+  "title": "IGeoPackageSource",
+  "required": ["path"],
+  "additionalProperties": false,
+  "properties": {
+    "path": {
+      "type": "string",
+      "description": "The path to the GeoPackage source"
+    },
+    "attribution": {
+      "type": "string",
+      "readOnly": true,
+      "description": "The attribution for the GeoPackage source.",
+      "default": ""
+    },
+    "projection": {
+      "type": "string",
+      "description": "The projection information for the GeoPackage data (optional).",
+      "default": "EPSG:4326"
+    }
+  }
+}

packages/schema/src/types.ts

@@ -1,6 +1,7 @@
 export * from './_interface/project/jgis';
 
 // Sources
+export * from './_interface/project/sources/geoPackageSource';
 export * from './_interface/project/sources/geoTiffSource';
 export * from './_interface/geojsonsource';
 export * from './_interface/project/sources/imageSource';

python/jupytergis_core/jupytergis_core/schema/__init__.py

@@ -15,6 +15,7 @@
 from .interfaces.project.sources.imageSource import IImageSource  # noqa
 from .interfaces.project.sources.geoTiffSource import IGeoTiffSource  # noqa
 from .interfaces.project.sources.rasterDemSource import IRasterDemSource  # noqa
+from .interfaces.project.sources.geoPackageSource import IGeoPackageSource  # noqa
 
 from .interfaces.processing.buffer import IBuffer  # noqa
 

python/jupytergis_core/package.json

@@ -73,11 +73,14 @@
     "@types/json-schema": "^7.0.11",
     "@types/react": "^18.0.26",
     "@types/react-addons-linked-state-mixin": "^0.14.22",
+    "buffer": "^6.0.3",
     "copy-webpack-plugin": "^10.0.0",
     "css-loader": "^6.7.1",
     "mkdirp": "^1.0.3",
     "npm-run-all": "^4.1.5",
+    "process": "^0.11.10",
     "rimraf": "^3.0.2",
+    "stream-browserify": "^3.0.0",
     "style-loader": "^3.3.1",
     "typescript": "^5",
     "webpack": "^5.76.3",
@@ -105,6 +108,7 @@
     },
     "extension": true,
     "outputDir": "jupytergis_core/labextension",
+    "webpackConfig": "webpack.config.js",
     "sharedPackages": {
       "@jupytergis/base": {
         "singleton": true,

python/jupytergis_core/src/@types/wasm.ts

@@ -0,0 +1,4 @@
+declare module '*.wasm' {
+  const url: string;
+  export default url;
+}