@loaders.gl/geopackage 4.0.0-alpha.23 → 4.0.0-alpha.24

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/geopackage",
   "description": "GeoPackage data loaders",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -25,12 +25,12 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/gis": "4.0.0-alpha.23",
-    "@loaders.gl/schema": "4.0.0-alpha.23",
-    "@loaders.gl/wkt": "4.0.0-alpha.23",
+    "@loaders.gl/gis": "4.0.0-alpha.24",
+    "@loaders.gl/schema": "4.0.0-alpha.24",
+    "@loaders.gl/wkt": "4.0.0-alpha.24",
     "@math.gl/proj4": "^3.5.1",
     "@types/sql.js": "^1.4.2",
     "sql.js": "1.5.0"
   },
-  "gitHead": "e212f2a0c0e342f7cb65ce84fa2ff39f64b7d94b"
+  "gitHead": "97a8990595c132fb14e3445a8768d9f4cb98ff05"
 }

package/dist/bundle.js

@@ -1,5 +0,0 @@
-"use strict";
-// @ts-nocheck
-const moduleExports = require('./index');
-globalThis.loaders = globalThis.loaders || {};
-module.exports = Object.assign(globalThis.loaders, moduleExports);

package/dist/geopackage-loader.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeoPackageLoader = void 0;
-const parse_geopackage_1 = require("./lib/parse-geopackage");
-// __VERSION__ is injected by babel-plugin-version-inline
-// @ts-ignore TS2304: Cannot find name '__VERSION__'.
-// const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
-const VERSION = 'latest';
-exports.GeoPackageLoader = {
-    id: 'geopackage',
-    name: 'GeoPackage',
-    module: 'geopackage',
-    version: VERSION,
-    extensions: ['gpkg'],
-    mimeTypes: ['application/geopackage+sqlite3'],
-    category: 'geometry',
-    parse: parse_geopackage_1.parseGeoPackage,
-    options: {
-        geopackage: {
-            sqlJsCDN: parse_geopackage_1.DEFAULT_SQLJS_CDN
-        },
-        gis: {}
-    }
-};
-/** Geopackage loader *
-export const GeoPackageTableLoader: LoaderWithParser<Record<string, Feature[]>, never, GeoPackageLoaderOptions> = {
-  id: 'geopackage',
-  name: 'GeoPackage',
-  module: 'geopackage',
-  version: VERSION,
-  extensions: ['gpkg'],
-  mimeTypes: ['application/geopackage+sqlite3'],
-  category: 'geometry',
-  parse: parseGeoPackage,
-  options: {
-    geopackage: {
-      sqlJsCDN: DEFAULT_SQLJS_CDN,
-    },
-    gis: {
-    }
-  }
-};
-*/

package/dist/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeoPackageLoader = void 0;
-var geopackage_loader_1 = require("./geopackage-loader");
-Object.defineProperty(exports, "GeoPackageLoader", { enumerable: true, get: function () { return geopackage_loader_1.GeoPackageLoader; } });

package/dist/lib/parse-geopackage.js

@@ -1,384 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseGeoPackage = exports.DEFAULT_SQLJS_CDN = void 0;
-const sql_js_1 = __importDefault(require("sql.js"));
-const wkt_1 = require("@loaders.gl/wkt");
-const gis_1 = require("@loaders.gl/gis");
-const proj4_1 = require("@math.gl/proj4");
-// We pin to the same version as sql.js that we use.
-// As of March 2022, versions 1.6.0, 1.6.1, and 1.6.2 of sql.js appeared not to work.
-exports.DEFAULT_SQLJS_CDN = 'https://cdnjs.cloudflare.com/ajax/libs/sql.js/1.5.0/';
-// https://www.geopackage.org/spec121/#flags_layout
-const ENVELOPE_BYTE_LENGTHS = {
-    0: 0,
-    1: 32,
-    2: 48,
-    3: 48,
-    4: 64,
-    // values 5-7 are invalid and _should_ never show up
-    5: 0,
-    6: 0,
-    7: 0
-};
-// Documentation: https://www.geopackage.org/spec130/index.html#table_column_data_types
-const SQL_TYPE_MAPPING = {
-    BOOLEAN: 'bool',
-    TINYINT: 'int8',
-    SMALLINT: 'int16',
-    MEDIUMINT: 'int32',
-    INT: 'int32',
-    INTEGER: 'int32',
-    FLOAT: 'float32',
-    DOUBLE: 'float64',
-    REAL: 'float64',
-    TEXT: 'utf8',
-    BLOB: 'binary',
-    DATE: 'utf8',
-    DATETIME: 'utf8',
-    GEOMETRY: 'binary',
-    POINT: 'binary',
-    LINESTRING: 'binary',
-    POLYGON: 'binary',
-    MULTIPOINT: 'binary',
-    MULTILINESTRING: 'binary',
-    MULTIPOLYGON: 'binary',
-    GEOMETRYCOLLECTION: 'binary'
-};
-async function parseGeoPackage(arrayBuffer, options) {
-    const { sqlJsCDN = exports.DEFAULT_SQLJS_CDN } = options?.geopackage || {};
-    const { reproject = false, _targetCrs = 'WGS84' } = options?.gis || {};
-    const db = await loadDatabase(arrayBuffer, sqlJsCDN);
-    const tables = listVectorTables(db);
-    const projections = getProjections(db);
-    // Mapping from tableName to geojson feature collection
-    const outputTables = {
-        shape: 'tables',
-        tables: []
-    };
-    for (const table of tables) {
-        const { table_name: tableName } = table;
-        outputTables.tables.push({
-            name: tableName,
-            table: getVectorTable(db, tableName, projections, {
-                reproject,
-                _targetCrs
-            })
-        });
-    }
-    return outputTables;
-}
-exports.parseGeoPackage = parseGeoPackage;
-/**
- * Initialize SQL.js and create database
- *
- * @param arrayBuffer input bytes
- * @return SQL.js database object
- */
-async function loadDatabase(arrayBuffer, sqlJsCDN) {
-    // In Node, `locateFile` must not be passed
-    let SQL;
-    if (sqlJsCDN) {
-        SQL = await (0, sql_js_1.default)({
-            locateFile: (file) => `${sqlJsCDN}${file}`
-        });
-    }
-    else {
-        SQL = await (0, sql_js_1.default)();
-    }
-    return new SQL.Database(new Uint8Array(arrayBuffer));
-}
-/**
- * Find all vector tables in GeoPackage
- * This queries the `gpkg_contents` table to find a list of vector tables
- *
- * @param db GeoPackage to query
- * @return list of table references
- */
-function listVectorTables(db) {
-    // The gpkg_contents table can have at least three categorical values for
-    // data_type.
-    // - 'features' refers to a vector geometry table
-    // (https://www.geopackage.org/spec121/#_contents_2)
-    // - 'tiles' refers to a raster table
-    // (https://www.geopackage.org/spec121/#_contents_3)
-    // - 'attributes' refers to a data table with no geometry
-    // (https://www.geopackage.org/spec121/#_contents_4).
-    // We hard code 'features' because for now we don't support raster data or pure attribute data
-    // eslint-disable-next-line quotes
-    const stmt = db.prepare("SELECT * FROM gpkg_contents WHERE data_type='features';");
-    const vectorTablesInfo = [];
-    while (stmt.step()) {
-        const vectorTableInfo = stmt.getAsObject();
-        vectorTablesInfo.push(vectorTableInfo);
-    }
-    return vectorTablesInfo;
-}
-/**
- * Load geometries from vector table
- *
- * @param db GeoPackage object
- * @param tableName name of vector table to query
- * @param projections keys are srs_id values, values are WKT strings
- * @returns Array of GeoJSON Feature objects
- */
-function getVectorTable(db, tableName, projections, { reproject, _targetCrs }) {
-    const dataColumns = getDataColumns(db, tableName);
-    const geomColumn = getGeometryColumn(db, tableName);
-    const featureIdColumn = getFeatureIdName(db, tableName);
-    // Get vector features from table
-    // Don't think it's possible to parameterize the table name in SQLite?
-    const { columns, values } = db.exec(`SELECT * FROM \`${tableName}\`;`)[0];
-    let projection;
-    if (reproject) {
-        const geomColumnProjStr = projections[geomColumn.srs_id];
-        projection = new proj4_1.Proj4Projection({
-            from: geomColumnProjStr,
-            to: _targetCrs
-        });
-    }
-    const geojsonFeatures = [];
-    for (const row of values) {
-        const geojsonFeature = constructGeoJsonFeature(columns, row, geomColumn, 
-        // @ts-ignore
-        dataColumns, featureIdColumn);
-        geojsonFeatures.push(geojsonFeature);
-    }
-    const schema = getSchema(db, tableName);
-    if (projection) {
-        return {
-            shape: 'object-row-table',
-            // @ts-expect-error TODO - null geometries causing problems...
-            data: (0, gis_1.transformGeoJsonCoords)(geojsonFeatures, projection.project),
-            schema
-        };
-    }
-    return { data: geojsonFeatures, schema, shape: 'object-row-table' };
-}
-/**
- * Find all projections defined in GeoPackage
- * This queries the gpkg_spatial_ref_sys table
- * @param db GeoPackage object
- * @returns mapping from srid to WKT projection string
- */
-function getProjections(db) {
-    // Query gpkg_spatial_ref_sys to get srid: srtext mappings
-    const stmt = db.prepare('SELECT * FROM gpkg_spatial_ref_sys;');
-    const projectionMapping = {};
-    while (stmt.step()) {
-        const srsInfo = stmt.getAsObject();
-        const { srs_id, definition } = srsInfo;
-        projectionMapping[srs_id] = definition;
-    }
-    return projectionMapping;
-}
-/**
- * Construct single GeoJSON feature given row's data
- * @param columns array of ordered column identifiers
- * @param row array of ordered values representing row's data
- * @param geomColumn geometry column metadata
- * @param dataColumns mapping from table column names to property name
- * @returns GeoJSON Feature object
- */
-function constructGeoJsonFeature(columns, row, geomColumn, dataColumns, featureIdColumn) {
-    // Find feature id
-    const idIdx = columns.indexOf(featureIdColumn);
-    const id = row[idIdx];
-    // Parse geometry columns to geojson
-    const geomColumnIdx = columns.indexOf(geomColumn.column_name);
-    const geometry = parseGeometry(row[geomColumnIdx].buffer);
-    const properties = {};
-    if (dataColumns) {
-        for (const [key, value] of Object.entries(dataColumns)) {
-            const idx = columns.indexOf(key);
-            // @ts-ignore TODO - Check what happens if null?
-            properties[value] = row[idx];
-        }
-    }
-    else {
-        // Put all columns except for the feature id and geometry in properties
-        for (let i = 0; i < columns.length; i++) {
-            if (i === idIdx || i === geomColumnIdx) {
-                // eslint-disable-next-line no-continue
-                continue;
-            }
-            const columnName = columns[i];
-            properties[columnName] = row[i];
-        }
-    }
-    return {
-        id,
-        type: 'Feature',
-        geometry,
-        properties
-    };
-}
-/**
- * Get GeoPackage version from database
- * @param db database
- * @returns version string. One of '1.0', '1.1', '1.2'
- */
-// @ts-ignore
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function getGeopackageVersion(db) {
-    const textDecoder = new TextDecoder();
-    // Read application id from SQLite metadata
-    const applicationIdQuery = db.exec('PRAGMA application_id;')[0];
-    const applicationId = applicationIdQuery.values[0][0];
-    // Convert 4-byte signed int32 application id to text
-    const buffer = new ArrayBuffer(4);
-    const view = new DataView(buffer);
-    view.setInt32(0, Number(applicationId));
-    const versionString = textDecoder.decode(buffer);
-    if (versionString === 'GP10') {
-        return '1.0';
-    }
-    if (versionString === 'GP11') {
-        return '1.1';
-    }
-    // If versionString is GPKG, then read user_version
-    const userVersionQuery = db.exec('PRAGMA user_version;')[0];
-    const userVersionInt = userVersionQuery.values[0][0];
-    if (userVersionInt && typeof userVersionInt === 'number' && userVersionInt < 10300) {
-        return '1.2';
-    }
-    return null;
-}
-/**
- * Find name of feature id column in table
- * The feature ID is the primary key of the table.
- * http://www.geopackage.org/spec121/#feature_user_tables
- *
- * @param db database
- * @param tableName name of table
- * @return name of feature id column
- */
-function getFeatureIdName(db, tableName) {
-    // Again, not possible to parameterize table name?
-    const stmt = db.prepare(`PRAGMA table_info(\`${tableName}\`)`);
-    while (stmt.step()) {
-        const pragmaTableInfo = stmt.getAsObject();
-        const { name, pk } = pragmaTableInfo;
-        if (pk) {
-            return name;
-        }
-    }
-    // Is it guaranteed for there always to be at least one primary key column in the table?
-    return null;
-}
-/**
- * Parse geometry buffer
- * GeoPackage vector geometries are slightly extended past the WKB standard
- * See: https://www.geopackage.org/spec121/#gpb_format
- *
- * @param arrayBuffer geometry buffer
- * @return GeoJSON geometry (in original CRS)
- */
-function parseGeometry(arrayBuffer) {
-    const view = new DataView(arrayBuffer);
-    const { envelopeLength, emptyGeometry } = parseGeometryBitFlags(view.getUint8(3));
-    // A Feature object has a member with the name "geometry".  The value of the
-    // geometry member SHALL be either a Geometry object as defined above or, in
-    // the case that the Feature is unlocated, a JSON null value.
-    /** @see https://tools.ietf.org/html/rfc7946#section-3.2 */
-    if (emptyGeometry) {
-        return null;
-    }
-    // Do I need to find the srid here? Is it necessarily the same for every
-    // geometry in a table?
-    // const srid = view.getInt32(4, littleEndian);
-    // 2 byte magic, 1 byte version, 1 byte flags, 4 byte int32 srid
-    const wkbOffset = 8 + envelopeLength;
-    // Loaders should not depend on `core` and the context passed to the main loader doesn't include a
-    // `parseSync` option, so instead we call parseSync directly on WKBLoader
-    const binaryGeometry = wkt_1.WKBLoader.parseSync?.(arrayBuffer.slice(wkbOffset));
-    // @ts-expect-error
-    return (0, gis_1.binaryToGeometry)(binaryGeometry);
-}
-/**
- * Parse geometry header flags
- * https://www.geopackage.org/spec121/#flags_layout
- *
- * @param byte uint8 number representing flags
- * @return object representing information from bit flags
- */
-function parseGeometryBitFlags(byte) {
-    // Are header values little endian?
-    const envelopeValue = (byte & 0b00001110) / 2;
-    // TODO: Not sure the best way to handle this. Throw an error if envelopeValue outside 0-7?
-    const envelopeLength = ENVELOPE_BYTE_LENGTHS[envelopeValue];
-    return {
-        littleEndian: Boolean(byte & 0b00000001),
-        envelopeLength,
-        emptyGeometry: Boolean(byte & 0b00010000),
-        extendedGeometryType: Boolean(byte & 0b00100000)
-    };
-}
-/**
- * Find geometry column in given vector table
- *
- * @param db GeoPackage object
- * @param tableName Name of vector table
- * @returns Array of geometry column definitions
- */
-function getGeometryColumn(db, tableName) {
-    const stmt = db.prepare('SELECT * FROM gpkg_geometry_columns WHERE table_name=:tableName;');
-    stmt.bind({ ':tableName': tableName });
-    // > Requirement 30
-    // > A feature table SHALL have only one geometry column.
-    // https://www.geopackage.org/spec121/#feature_user_tables
-    // So we should need one and only one step, given that we use the WHERE clause in the SQL query
-    // above
-    stmt.step();
-    const geometryColumn = stmt.getAsObject();
-    return geometryColumn;
-}
-/**
- * Find property columns in given vector table
- * @param db GeoPackage object
- * @param tableName Name of vector table
- * @returns Mapping from table column names to property name
- */
-function getDataColumns(db, tableName) {
-    // gpkg_data_columns is not required to exist
-    // https://www.geopackage.org/spec121/#extension_schema
-    let stmt;
-    try {
-        stmt = db.prepare('SELECT * FROM gpkg_data_columns WHERE table_name=:tableName;');
-    }
-    catch (error) {
-        if (error.message.includes('no such table')) {
-            return null;
-        }
-        throw error;
-    }
-    stmt.bind({ ':tableName': tableName });
-    // Convert DataColumnsRow object this to a key-value {column_name: name}
-    const result = {};
-    while (stmt.step()) {
-        const column = stmt.getAsObject();
-        const { column_name, name } = column;
-        result[column_name] = name || null;
-    }
-    return result;
-}
-/**
- * Get arrow schema
- * @param db GeoPackage object
- * @param tableName  table name
- * @returns Arrow-like Schema
- */
-function getSchema(db, tableName) {
-    const stmt = db.prepare(`PRAGMA table_info(\`${tableName}\`)`);
-    const fields = [];
-    while (stmt.step()) {
-        const pragmaTableInfo = stmt.getAsObject();
-        const { name, type: sqlType, notnull } = pragmaTableInfo;
-        const type = SQL_TYPE_MAPPING[sqlType];
-        const field = { name, type, nullable: !notnull };
-        fields.push(field);
-    }
-    return { fields, metadata: {} };
-}

package/dist/lib/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });