ol-load-geopackage 2.2.0 → 2.3.1

package/API.md

@@ -2,8 +2,8 @@
 
 This page describes the 3 exported functions/constants of the [ol-load-geopackage](README.md) module:
 
-- [initSqlJsWasm()](#initsqljswasmsqljswasmdir) - initialisation: start loading of required sql.js WASM file
-- [loadGpkg()](#loadgpkggpkgfile-displayprojection) - start loading and data extraction of GeoPackage
+- [initSqlJsWasm()](#initsqljswasmsqljswasmdir) - initialisation: start asynchronous loading of required sql.js WASM file
+- [loadGpkg()](#loadgpkggpkgfile-displayprojection) - start asynchronous loading and data extraction of GeoPackage
 - [sql_js_version](#sql_js_version) - NPM version number of  underlying sql.js module
 
 ## initSqlJsWasm(sqlJsWasmDir)
@@ -31,43 +31,86 @@ initSqlJsWasm(sqlJsWasmDir);
 
 Begin asynchronous loading of a single OGC GeoPackage, then extract vector data tables into OpenLayers Vector Sources, transforming the data (if necessary) to match the specified display projection. If a "layer_styles" table is found (as generated by QGIS [Package Layers](https://docs.qgis.org/3.16/en/docs/user_manual/processing_algs/qgis/database.html#package-layers) Processing Toolbox command), it will extract the constituent SLD XML styling data associated with each vector data table.
 
-Parameters:
+### Parameters
+
 - string|File|Blob|URL `gpkgFile`: OGC GeoPackage URL string or File/URL object (URL can be path relative to document's base URI)
 - string `displayProjection`: Map display projection for output sources (e.g. 'EPSG:3857'). Note that projections not built in to OpenLayers must be defined before calling the function. This is most easily done using the Proj4JS library  - see Proj4 [Example](README.md#examples-in-github-repository).
+- object `options`: Configuration options
+
+### Options
+
+`MissingDataSrsAction`: Action if missing source data SRS, one of:
+
+- `stop` (default): Throw error, stop processing, discard all tables
+- `discard`: Skip processing of data; put error and missing data SRS ID in table status
+- `noProject`: Keep data but do not reproject; put error and missing data SRC in table status
 
-Returns a Promise which delivers an array of 2 objects:
+`FailedTableLoadAction`: Action if gpkg table load fails, one of:
+
+ - `stop` (default): Throw error, stop processing, discard all tables
+- `discard`: Skip processing of data; put error and data SRS ID in table status
+
+### Return Values
+
+Returns a Promise which delivers an array of 3 objects:
 
 ```javascript
-[dataFromGpkg, sldsFromGpkg]
+[dataFromGpkg, sldsFromGpkg, gpkgTableStatus]
 ```
 
 - object `dataFromGpkg`: data tables (OpenLayers vector sources, indexed by table name),
 - object `sldsFromGpkg`: styles (SLD layer_styles XML strings, indexed by layer name)
+- object `gpkgTableStatus`: table status (indexed by table name) which is an object with 3 properties:
+    - integer `statusCode`: error code
+    - string `statusMsg`: error message
+    - integer `origSrsId`: original geopackage table SRS ID
+
+`dataFromGpkg`:
 
-For information only, the original data projection (SRS ID) will be returned as the string Property "origProjection" of each data source, so can be accessed with:
+If any `option` is set to `discard`, no Vector Source will be returned in `dataFromGpkg` for failing tables, but there will be a table entry in `gpkgTableStatus`.
+
+**DEPRECATED (will be removed in later versions)**: Vector Source extension: for information only, the original data projection (SRS ID) with an "EPSG:" prefix is currently also returned as the string Property "origProjection" of each data source, so can be accessed with:
 
 ```javascript
-dataFromGpkg[table].getProperties()["origProjection"]
+tableSrsId = gpkgTableStatus[table].origSrsId
+
+// DEPRECATED
+tableEpsgSrsId = dataFromGpkg[table].getProperties()["origProjection"]
 ```
 
-Notes:
+`gpkgTableStatus` table status values:
+| statusCode | statusMsg |
+| ------------- | ------------- |
+| 0 | OK |
+| 1 | Not reprojected as ol/proj missing table SRS |
+| 2 | Discarded as ol/proj missing table SRS |
+| 3 | Discarded as no (or only null geom) features |
+| 4 | Failed GeoPackage table load: _(specific error)_ |
 
-1. After loading the GeoPackage file, extraction of GeoPackage data will wait (if necessary) for the loading of the sql.js WASM file to complete (as initiated by [initSqlJsWasm()](#initsqljswasmsqljswasmdir)).
-2. `sldsFromGpkg` will be an empty object if no table named "layer_styles" is found in the GeoPackage.
-3. In the output GeoPackage from QGIS [Package Layers](https://docs.qgis.org/3.16/en/docs/user_manual/processing_algs/qgis/database.html#package-layers) the "table name" used for each vector data table will be exactly the same as the "layer name" used to index the SLD style strings in the "layer_styles" table.
-
-Errors thrown on these events:
-- SQL WASM loading not previously started, i.e. mmissing a preceding call to initSqlJsWasm()
-- ol/proj is missing the requested display projection (can be added beforehand using ol/proj/proj4.js)
- 
-Promise rejected on these events:
+### Promise rejections
+
+Promise is rejected (i.e. asynchronously) on these events (usually indicating unexpected data or network errors):
 - Unable to load SQLite JS WebAssembly binary (sql-wasm.wasm)
-- `gpkgFile` parameter not of type URL string or URL/File/Blob object
 - Unable to load requested GeoPackage
-- Missing a data projection (from any of Geopackage tables)
-- Failure trying to extract feature tables from GeoPackage
-- Invalid geometry envelope size flag in a GeoPackage table feature
+- Unable to extract feature table names and types from OGC GeoPackage file
+- (Geopackage table specific) Missing a table data projection
+- (Geopackage table specific) Failure trying to extract feature table
+
+The last 2 (table-specific) promise rejections can be avoided by setting the appropriate `option` to handle the errors. The errors can then be determined in the calling routine by examining the returned table-specific `gpkgTableStatus` status codes and status messages.
 
+### Errors Thrown
+
+Errors are thrown immediately on these events (usually indicating programming errors):
+- (Error) SQL WASM loading not previously started, i.e. missing a preceding call to initSqlJsWasm()
+- (Error) ol/proj is missing the requested display projection (can be added beforehand using ol/proj/proj4.js)
+- (TypeError) gpkgFile is not a supported type
+
+### General Notes
+
+1. After loading the GeoPackage file, extraction of GeoPackage data will wait (if necessary) for the loading of the sql.js WASM file to complete (as initiated by [initSqlJsWasm()](#initsqljswasmsqljswasmdir)).
+2. Any features with null geom attributes will be silently discarded.
+3. `sldsFromGpkg` will be an empty object if no table named "layer_styles" is found in the GeoPackage.
+4. In the output GeoPackage from QGIS [Package Layers](https://docs.qgis.org/3.16/en/docs/user_manual/processing_algs/qgis/database.html#package-layers) the "table name" used for each vector data table will be exactly the same as the "layer name" used to index the SLD style strings in the "layer_styles" table.
 
 ## sql_js_version
 

package/README.md

@@ -2,7 +2,7 @@
 
 [![npm](https://img.shields.io/npm/v/ol-load-geopackage)](https://www.npmjs.com/package/ol-load-geopackage)
 
-A JavaScript module to load OGC GeoPackage vector data tables into OpenLayers Vector Sources, transforming the data (if necessary) to match the specified display projection. This was primarily designed to directly load data exported by the QGIS [Package Layers](https://docs.qgis.org/3.16/en/docs/user_manual/processing_algs/qgis/database.html#package-layers) Processing Toolbox operation. As such, it will also (if it exists) load the associated "layer_styles" table of SLD XML styling data exported by QGIS in the same GeoPackage. It is implemented as an NPM module and is a lightweight wrapper around the [sql.js](https://github.com/sql-js/sql.js) SQLite JavaScript library.
+A JavaScript module to load OGC GeoPackage vector data tables into [OpenLayers Vector Sources](https://openlayers.org/en/latest/apidoc/module-ol_source_Vector-VectorSource.html), transforming the data (if necessary) to match the specified display projection. Additionally, to help directly load data exported by the QGIS [Package Layers](https://docs.qgis.org/3.16/en/docs/user_manual/processing_algs/qgis/database.html#package-layers) Processing Toolbox operation it will also (if it exists) load the associated "layer_styles" table of SLD XML styling data exported by QGIS in the same GeoPackage. It is implemented as an NPM module and is a lightweight wrapper around the [sql.js](https://github.com/sql-js/sql.js) SQLite JavaScript library.
 
 The current version was tested with OpenLayers 10.7, but should work with OpenLayers 6+.
 
@@ -69,6 +69,8 @@ gpkgPromise
 
 Note that the _initSqlJsWasm()_ statement will start the asynchronous loading of the required sql.js WebAssembly binary file sql-wasm.wasm (from the current folder in this case), so is best placed early in the code.
 
+For more advanced usage, an additional `options` parameter can be passed to loadGpkg() to control handling of problems encountered with GeoPackages, with information on the issues available as a 3rd return value (`gpkgTableStatus`). See the separate [API Specification](API.md) for details.
+
 ### Building with Webpack
 
 The (shared) support files used to build the examples using [Webpack 5](https://webpack.js.org/) ([package.json](https://github.com/richard-thomas/ol-load-geopackage/tree/master/examples/package.json), [webpack.config.js](https://github.com/richard-thomas/ol-load-geopackage/tree/master/examples/webpack.config.js)) are in the _examples_ folder. If you clone the repository then you can (re-)build the code bundles (for both examples) with the commands:
@@ -120,7 +122,7 @@ npm run-script dev
 
 The JavaScript module has 3 exported functions/constants which are described in the separate [API Specification](API.md):
 
-- [initSqlJsWasm()](API.md#initsqljswasmsqljswasmdir) - Initialisation: start loading of required sql.js WASM file
+- [initSqlJsWasm()](API.md#initsqljswasmsqljswasmdir) - Initialisation: start asynchronous loading of required sql.js WASM file
 - [loadGpkg()](API.md#loadgpkggpkgfile-displayprojection) - start asynchronous loading and data extraction of GeoPackage
 - [sql_js_version](API.md#sql_js_version) - NPM version number of  underlying sql.js module
 

package/dist/ol-load-geopackage.js

@@ -19,7 +19,7 @@ const sql_js_version = sqlJsPkg.version;
 /**
  * Whether sql.js WASM file has been (successfully) loaded yet
  */
-var promiseSqlWasmLoaded;
+let promiseSqlWasmLoaded;
 
 // -------- Public Functions --------
 export { initSqlJsWasm, loadGpkg, sql_js_version };
@@ -57,17 +57,56 @@ function initSqlJsWasm(sqlJsWasmDir) {
     return promiseSqlWasmLoaded;
 }
 
+/**
+ * @typedef {'stop' | 'discard' | 'noProject'} MissingDataSrsAction
+ * Action if missing source data CRS, one of:
+ * * `stop` (default): Throw error, stop processing, discard all tables
+ * * `discard`: Skip processing of data; put error and missing data SRS ID in table status
+ * * `noProject`: Keep data but do not reproject; put error and missing data SRC in table status
+ */
+
+/**
+ * @typedef {'stop' | 'discard'} FailedTableLoadAction
+ * Action if gpkg table load fails, one of:
+ * * `stop` (default): Throw error, stop processing, discard all tables
+ * * `discard`: Skip processing of data; put error and data SRS ID in table status
+ */
+
+/**
+ * Configuration options for loadGpkg() function
+ * @typedef {Object} loadGpkgOptions
+ * @property {MissingDataSrsAction} [missingDataSrsAction='stop'] Missing source data CRS action
+ * @property {FailedTableLoadAction} [failedTableLoadAction='stop'] Failed gpkg table action
+ */
+
+/**
+ * gpkgTableStatus return value object
+ * @typedef {Object} gpkgTableStatusObj
+ * @property {integer} statusCode - error code
+ * @property {string} statusMsg - error message
+ * @property {integer} origSrsId - original geopackage table SRS ID
+ */
+
 /**
  * Wrapper to load a single OGC GeoPackage
  * @param {(string|File|Blob|URL)} gpkgFile - OGC GeoPackage URL string or File/URL object
  * @param {string} displayProjection - map display projection (e.g. EPSG:3857)
- * @returns {Promise<[Object, Object]>} Promise delivering array of 2 objects:
- *   data tables (OpenLayers vector sources, indexed by table name),
- *   styles (SLD layer_styles XML strings, indexed by layer name)
+ * @param {loadGpkgOptions} options - configuration options
+ * @returns {Promise<[Object, Object, gpkgTableStatusObj]>} Promise delivering array of 3 objects:
+ * * data tables (OpenLayers vector sources, indexed by table name),
+ * * styles (SLD layer_styles XML strings, indexed by layer name),
+ * * table status (indexed by table name) which is an object with 3 properties:
+ * * (integer) `statusCode`: error code
+ * * (string) `statusMsg`: error message
+ * * (integer) `origSrsId`: original geopackage table SRS
  * @throws {Error} If SQL WASM loading not previously started
  * @throws {Error} If ol/proj is missing the requested display projection
+ * @throws {TypeError} If gpkgFile is not a supported type
  */
-function loadGpkg(gpkgFile, displayProjection) {
+function loadGpkg(gpkgFile, displayProjection, options) {
+    options = options || {};
+    options.missingDataSrsAction ??= 'stop';
+    options.failedTableLoadAction ??= 'stop';
 
     // Check SQL WASM loading was initiated
     if (promiseSqlWasmLoaded === undefined) {
@@ -82,8 +121,15 @@ function loadGpkg(gpkgFile, displayProjection) {
             '] - can be added beforehand with ol/proj/proj4');
     }
 
+    // Check if gpkgFile is valid type (string, URL, File or Blob)
+    if (!(typeof gpkgFile === 'string' || gpkgFile instanceof URL ||
+          gpkgFile instanceof Blob)) {        
+        throw new TypeError('GeoPackage file specifier must be URL string ' +
+            'or URL/File/Blob object');
+    }
+
     // Start OGC GeoPackage load and processing to extract data/SLDs
-    var gpkgReadPromise = readRawGpkg(gpkgFile);
+    const gpkgReadPromise = readRawGpkg(gpkgFile);
 
     return Promise.allSettled([promiseSqlWasmLoaded, gpkgReadPromise])
         .then((results) => {
@@ -100,8 +146,10 @@ function loadGpkg(gpkgFile, displayProjection) {
             }
             const sqlWasm = results[0].value;
             const gpkgByteArray = results[1].value;
-            const gpkgFileName = (gpkgFile instanceof File) ? gpkgFile.name : gpkgFile.toString();
-            return processGpkgData(gpkgFileName, gpkgByteArray, sqlWasm, displayProjection);
+            const gpkgFileName = (gpkgFile instanceof File) ? gpkgFile.name :
+                gpkgFile.toString();
+            return processGpkgData(gpkgFileName, gpkgByteArray, sqlWasm,
+                displayProjection, options);           
         }
     );
 }
@@ -118,10 +166,11 @@ async function readRawGpkg(input) {
     // Fetch() or File/Blob object (both have the equivalent methods we need)
     let gpkgSource;
 
-    // File object is a specific type of Blob
     if (input instanceof Blob) {
+        // File or Blob (File object is a specific type of Blob)
         gpkgSource = input;
-    } else if (typeof input === 'string' || input instanceof URL) {
+    } else {
+        // URL string or URL object
         const response = await fetch(input);
         if (!response.ok) {
             // Throw will convert to rejected promise (as an async function)
@@ -130,9 +179,6 @@ async function readRawGpkg(input) {
                 `Response: (${response.status}) ${response.statusText}`);
         }
         gpkgSource = response;
-    } else {
-        // Throw will convert to rejected promise (as an async function)
-        throw new TypeError('Input must be URL string or URL/File/Blob object');
     }
 
     try {
@@ -147,7 +193,7 @@ async function readRawGpkg(input) {
         return new Uint8Array(buffer);
     } catch (error) {
         // Throw will convert to rejected promise (as an async function)
-        throw new Error('Requested GPKG file could not be loaded.\n' + error);
+        throw new Error('Unable to extract Byte Array from GPKG file.\n' + error);
     }
 }
 
@@ -157,33 +203,46 @@ async function readRawGpkg(input) {
  * @param {Uint8Array} gpkgByteArray - Byte Array containing Gpkg data read
  * @param {WebAssembly} sqlWasm - sql.js SQLITE database access library
  * @param {string} displayProjection - map display projection (e.g. EPSG:3857)
- * @returns {[Object, Object]} Array of 2 objects:
- *   data tables (OpenLayers vector sources, indexed by table name),
- *   styles (SLD layer_styles XML strings, indexed by layer name) 
+ * @param {loadGpkgOptions} options - configuration options
+ * @returns {[Object, Object, gpkgTableStatusObj]} Array of 3 objects:
+ * * data tables (OpenLayers vector sources, indexed by table name),
+ * * styles (SLD layer_styles XML strings, indexed by layer name),
+ * * table status (indexed by table name) which is an object with 3 properties:
+ * * (integer) `statusCode`: error code
+ * * (string) `statusMsg`: error message
+ * * (integer) `origSrsId`: original geopackage table SRS
  * @throws {Error} If unable to extract feature tables from OGC GeoPackage file
  * @throws {Error} If ol/proj is missing required projection for a data table
+ * @throws {Error} Failed GeoPackage table load
  */
-function processGpkgData(loadedGpkgFile, gpkgByteArray, sqlWasm, displayProjection) {
-    var db;
+function processGpkgData(loadedGpkgFile, gpkgByteArray, sqlWasm,
+    displayProjection, options) {
+    let db = null;
+    let stmt;
+    const featureTableNames = [];
 
     // Data and associated SLD styles loaded both from GPKG
-    var dataFromGpkg = {};
-    var sldsFromGpkg = {};
+    const dataFromGpkg = {};
+    const sldsFromGpkg = {};
+
+    /**
+     * @type {gpkgTableStatusObj}
+     * Table data extraction status
+     */
+    const gpkgTableStatus = {};
 
     // DEBUG: measure GPKG processing time
-    //var startProcessing = Date.now();
+    //let startProcessing = Date.now();
 
     try {
         db = new sqlWasm.Database(gpkgByteArray);
 
-        // Extract all feature tables, SRS IDs and their geometry types
+        // Extract all feature table names, SRS IDs and their geometry types
         // Note the following fields are not extracted:
         //   gpkg_contents.identifier - title (QGIS: same as table_name)
         //   gpkg_contents.description - human readable (QGIS: blank)
         //   gpkg_geometry_columns.geometry_type_name
         //     - e.g. LINESTRING (but info also embedded in each feature)
-        var featureTableNames = [];
-        var stmt;
         stmt = db.prepare(`
             SELECT gpkg_contents.table_name, gpkg_contents.srs_id,
                 gpkg_geometry_columns.column_name
@@ -192,18 +251,21 @@ function processGpkgData(loadedGpkgFile, gpkgByteArray, sqlWasm, displayProjecti
                 gpkg_contents.table_name=gpkg_geometry_columns.table_name;
         `);
         while (stmt.step()) {
-            let row = stmt.get();
+            const row = stmt.get();
             featureTableNames.push({
                 'table_name': row[0],
                 'srs_id': row[1].toString(),
                 'geometry_column_name': row[2]
             });
         }
+        stmt.free();
     }
     catch (err) {
-        throw new Error(
-            'Unable to extract feature tables from OGC GeoPackage file.\n' +
-            err);
+        if (db) {
+            db.close();
+        }
+        throw new Error('Unable to extract feature table names and types ' +
+            'from OGC GeoPackage file.\n' + err);
     }
 
     // Extract SLD styles for each layer (if styles included in the gpkg)
@@ -215,64 +277,143 @@ function processGpkgData(loadedGpkgFile, gpkgByteArray, sqlWasm, displayProjecti
     if (stmt.step()) {
         stmt = db.prepare('SELECT f_table_name,styleSLD FROM layer_styles');
         while (stmt.step()) {
-            let row = stmt.get();
+            const row = stmt.get();
             sldsFromGpkg[row[0]] = row[1];
         }
     }
+    stmt.free();
 
     // For each table, extract geometry and other properties
     // (Note: becomes OpenLayers-specific from here)
-    var formatWKB = new ol_format_WKB();
-    for (let table of featureTableNames) {
-        let features;
-        let table_name = table.table_name;
-        let tableDataProjection = 'EPSG:' + table.srs_id;
+    const formatWKB = new ol_format_WKB();
+    for (const table of featureTableNames) {
+        const table_name = table.table_name;
+        const tableDataProjection = 'EPSG:' + table.srs_id;
+        let noReProject = false;
+        let featureCount = 0;
 
         // Check if we have a definition for the data projection (SRS)
         if (!ol_proj_get(tableDataProjection)) {
-            throw new Error('Missing data projection [' +
-                tableDataProjection + '] for table "' + table_name +
-                '" - can be added beforehand with ol/proj/proj4');
+            if (options.missingDataSrsAction === 'discard') {
+                // discard: Skip processing of data; put error and
+                // missing data SRS ID in table status
+                console.warn(`Discarding table "${table_name}" from gpkg ` +
+                    `"${loadedGpkgFile}" as ol/proj missing table SRS ` +
+                    `${tableDataProjection}`);
+                gpkgTableStatus[table_name] = {
+                    statusCode: 2,
+                    statusMsg: 'Discarded as ol/proj missing table SRS',
+                    origSrsId: table.srs_id
+                };
+                continue;
+
+            } else if (options.missingDataSrsAction === 'noProject') {
+                // noProject: Keep data but do not reproject;
+                // put error and missing data SRC in table status
+                console.warn(`Not reprojecting table "${table_name}" from ` +
+                    `gpkg "${loadedGpkgFile}" as ol/proj missing table SRS ` +
+                    `${tableDataProjection}`);
+                gpkgTableStatus[table_name] = {
+                    statusCode: 1,
+                    statusMsg: 'Not reprojected as ol/proj missing table SRS',
+                    origSrsId: table.srs_id
+                };                                        
+                noReProject = true;
+
+            } else {
+                // stop (default): Throw error, stop processing, discard all tables
+                throw new Error('Missing data projection [' +
+                    tableDataProjection + '] for table "' + table_name +
+                    '" - can be added beforehand with ol/proj/proj4');
+            }
         }
 
+        // For each feature in the table, extract geometry + other properties
+        // and add these to a new OpenLayers Vector Source for the table.
         //console.log(`Extracting table "${table_name}" (SRS: ${tableDataProjection})`);
-        stmt = db.prepare("SELECT * FROM '" + table_name + "'");
-        let vectorSource = new ol_source_Vector();
-        let geometry_column_name = table.geometry_column_name;
-        let properties = {};
-        while (stmt.step()) {
-            // Extract properties & geometry for a single feature
-            properties = stmt.getAsObject();
-            let geomProp = properties[geometry_column_name];
-            delete properties[geometry_column_name];
-            let featureWkb = parseGpkgGeom(geomProp);
-/*
-            // DEBUG: show endianness of WKB data (can differ from header)
-            if (!vectorSource.getFeatures().length) {
-                console.log('WKB Geometry: ' +
-                    (featureWkb[0] ? 'NDR (Little' : 'XDR (Big') + ' Endian)');
+        const vectorSource = new ol_source_Vector();
+        const geometry_column_name = table.geometry_column_name;
+        try {
+            stmt = db.prepare("SELECT * FROM `" + table_name + "`");
+            while (stmt.step()) {
+                // Extract properties & geometry for a single feature
+                const properties = stmt.getAsObject();
+                const geomProp = properties[geometry_column_name];
+                if (geomProp == null) {
+                    //console.log(`Discarding feature ${featureCount + 1} with null geom in table: '${table_name}'`);
+                    continue;
+                }
+                delete properties[geometry_column_name];
+                const featureWkb = parseGpkgGeom(geomProp);
+    /*
+                // DEBUG: show endianness of WKB data (can differ from header)
+                if (!vectorSource.getFeatures().length) {
+                    console.log('WKB Geometry: ' +
+                        (featureWkb[0] ? 'NDR (Little' : 'XDR (Big') + ' Endian)');
+                }
+    */
+                // Put the feature into the vector source for the current table
+                // Reproject unless ol/proj is missing SRS of source data table
+                const features = formatWKB.readFeatures(featureWkb, {
+                    dataProjection: tableDataProjection,
+                    featureProjection: noReProject ? undefined : displayProjection
+                });
+                features[0].setProperties(properties);
+                vectorSource.addFeatures(features);
+                featureCount++;
+            }
+            stmt.free();
+        } catch (error) {
+            if (options.failedTableLoadAction === 'discard') {
+                 // discard: Skip processing of data; put error and data SRS ID in table status
+                console.warn(`Discarding table "${table_name}" from gpkg ` +
+                    `"${loadedGpkgFile}" as table load failed:\n${error}`);
+                gpkgTableStatus[table_name] = {
+                    statusCode: 4,
+                    statusMsg: 'Failed GeoPackage table load: ' + error,
+                    origSrsId: table.srs_id
+                };                                        
+                stmt.free();
+                continue;
+            } else {
+                // stop (default): Throw error, stop processing, discard all tables
+                db.close();
+                throw error;
             }
-*/
-            // Put the feature into the vector source for the current table
-            features = formatWKB.readFeatures(featureWkb, {
-                dataProjection: tableDataProjection,
-                featureProjection: displayProjection
-            });
-            features[0].setProperties(properties);
-            vectorSource.addFeatures(features);
         }
 
+        if (featureCount === 0) {
+            console.warn('Discarding table with no (or only null geom) features: ' + table_name);
+            gpkgTableStatus[table_name] = {
+                statusCode: 3,
+                statusMsg: 'Discarded as no (or only null geom) features',
+                origSrsId: table.srs_id
+            };                                        
+            continue;
+        }
         // For information only, save details of original projection (SRS)
+        // DEPRECATED (as now included in gpkgTableStatus). TBD: remove this soon!
         vectorSource.setProperties({'origProjection': tableDataProjection});
+
         dataFromGpkg[table_name] = vectorSource;
+        if (!noReProject) {
+            gpkgTableStatus[table_name] = {
+                statusCode: 0,
+                statusMsg: 'OK',
+                origSrsId: table.srs_id
+            };                                        
+        }
     }
+
+    // Close database (gpkg) to trigger garbage collection
+    db.close();
 /*
     // DEBUG: measure OGC GeoPackage processing time
-    var processingSecs = (Date.now() - startProcessing) / 1000;
+    let processingSecs = (Date.now() - startProcessing) / 1000;
     console.log('INFO: OGC GeoPackage file ("' + loadedGpkgFile +
         '") processing time = ' + processingSecs + ' s');
 */
-    return [dataFromGpkg, sldsFromGpkg];
+    return [dataFromGpkg, sldsFromGpkg, gpkgTableStatus];
 }
 
 /**
@@ -283,9 +424,9 @@ function processGpkgData(loadedGpkgFile, gpkgByteArray, sqlWasm, displayProjecti
  * @throws {Error} If invalid geometry envelope size flag in GeoPackage
  */
 function parseGpkgGeom(gpkgBinGeom) {
-    var flags = gpkgBinGeom[3];
-    var eFlags = (flags >> 1) & 7;
-    var envelopeSize;
+    const flags = gpkgBinGeom[3];
+    const eFlags = (flags >> 1) & 7;
+    let envelopeSize;
     switch (eFlags) {
         case 0:
             envelopeSize = 0;
@@ -306,9 +447,9 @@ function parseGpkgGeom(gpkgBinGeom) {
 /*
     // Extract SRS (EPSG code)
     // (not required as given for whole table in gpkg_contents table)
-    var littleEndian = flags & 1;
-    var srs = gpkgBinGeom.subarray(4,8);
-    var srsId;
+    const littleEndian = flags & 1;
+    const srs = gpkgBinGeom.subarray(4,8);
+    let srsId;
     if (littleEndian) {
         srsId = srs[0] + (srs[1]<<8) + (srs[2]<<16) + (srs[3]<<24);
     } else {
@@ -326,6 +467,6 @@ function parseGpkgGeom(gpkgBinGeom) {
     console.log('gpkgBinGeom envelope size (bytes):', envelopeSize);
 */
     // Extract WKB which starts after variable-size "envelope" field
-    var wkbOffset = envelopeSize + 8;
+    const wkbOffset = envelopeSize + 8;
     return gpkgBinGeom.subarray(wkbOffset);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-load-geopackage",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "Loads OGC GeoPackage vector data tables into OpenLayers Vector Sources",
   "files": [
     "dist/",
@@ -24,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "ol": ">=6.7.0",
-    "sql.js": "^1.6.1"
+    "sql.js": "1.13.0"
   },
   "repository": {
     "type": "git",