@loaders.gl/geopackage 4.0.0-alpha.5 → 4.0.0-alpha.7

package/dist/lib/types.d.ts

@@ -4,13 +4,20 @@ export interface GeometryBitFlags {
     emptyGeometry: boolean;
     extendedGeometryType: boolean;
 }
-export declare type ProjectionMapping = {
+export type ProjectionMapping = {
     [srsId: number]: string;
 };
-export declare type DataColumnsMapping = {
+export type DataColumnsMapping = {
     [columnName: string]: string | null;
 };
-export declare type SQLiteTypes = 'BOOLEAN' | 'TINYINT' | 'SMALLINT' | 'MEDIUMINT' | 'INT' | 'INTEGER' | 'FLOAT' | 'DOUBLE' | 'REAL' | 'TEXT' | 'BLOB' | 'DATE' | 'DATETIME' | 'GEOMETRY';
+export type SQLiteTypes = 'BOOLEAN' | 'TINYINT' | 'SMALLINT' | 'MEDIUMINT' | 'INT' | 'INTEGER' | 'FLOAT' | 'DOUBLE' | 'REAL' | 'TEXT' | 'BLOB' | 'DATE' | 'DATETIME';
+/** Type names for geopackage geometries
+ *
+ * As defined in https://www.geopackage.org/spec130/index.html#table_column_data_types, geometries
+ * can be stored with any geometry name listed here:
+ * https://www.geopackage.org/spec130/index.html#geometry_types
+ */
+export type GeoPackageGeometryTypes = 'GEOMETRY' | 'POINT' | 'LINESTRING' | 'POLYGON' | 'MULTIPOINT' | 'MULTILINESTRING' | 'MULTIPOLYGON' | 'GEOMETRYCOLLECTION';
 /**
  * https://www.geopackage.org/spec121/#spatial_ref_sys
  */
@@ -85,7 +92,7 @@ export interface ContentsRow {
      */
     srs_id?: number;
 }
-declare type GeometryType = 'GEOMETRY' | 'POINT' | 'LINESTRING' | 'POLYGON' | 'MULTIPOINT' | 'MULTILINESTRING' | 'MULTIPOLYGON' | 'GEOMETRYCOLLECTION' | 'CIRCULARSTRING' | 'COMPOUNDCURVE' | 'CURVEPOLYGON' | 'MULTICURVE' | 'MULTISURFACE' | 'CURVE' | 'SURFACE';
+type GeometryType = 'GEOMETRY' | 'POINT' | 'LINESTRING' | 'POLYGON' | 'MULTIPOINT' | 'MULTILINESTRING' | 'MULTIPOLYGON' | 'GEOMETRYCOLLECTION' | 'CIRCULARSTRING' | 'COMPOUNDCURVE' | 'CURVEPOLYGON' | 'MULTICURVE' | 'MULTISURFACE' | 'CURVE' | 'SURFACE';
 /**
  * https://www.geopackage.org/spec121/#_geometry_columns
  */

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"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"}

package/dist/lib/types.js

@@ -1,2 +1,2 @@
-export {};
-//# sourceMappingURL=types.js.map
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/geopackage",
   "description": "GeoPackage data loaders",
-  "version": "4.0.0-alpha.5",
+  "version": "4.0.0-alpha.7",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,8 +15,8 @@
     "GeoPackage"
   ],
   "types": "dist/index.d.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
+  "main": "dist/es5/index.js",
+  "module": "dist/esm/index.js",
   "sideEffects": false,
   "files": [
     "src",
@@ -25,12 +25,12 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/gis": "4.0.0-alpha.5",
-    "@loaders.gl/schema": "4.0.0-alpha.5",
-    "@loaders.gl/wkt": "4.0.0-alpha.5",
+    "@loaders.gl/gis": "4.0.0-alpha.7",
+    "@loaders.gl/schema": "4.0.0-alpha.7",
+    "@loaders.gl/wkt": "4.0.0-alpha.7",
     "@math.gl/proj4": "^3.5.1",
     "@types/sql.js": "^1.4.2",
-    "sql.js": "^1.5.0"
+    "sql.js": "1.5.0"
   },
-  "gitHead": "7a71a54bdf1ddf985cc3af3db90b82e7fa97d025"
+  "gitHead": "afb59c4d8e5d8ebb9c28f111cb0c96c5527d0ffd"
 }

package/src/geopackage-loader.ts

@@ -1,5 +1,5 @@
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
-import parseGeoPackage from './lib/parse-geopackage';
+import parseGeoPackage, {DEFAULT_SQLJS_CDN} from './lib/parse-geopackage';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
@@ -14,6 +14,7 @@ export type GeoPackageLoaderOptions = LoaderOptions & {
   gis?: {
     reproject?: boolean;
     _targetCrs?: string;
+    format?: 'geojson' | 'tables';
   };
 };
 
@@ -29,7 +30,10 @@ export const GeoPackageLoader: LoaderWithParser = {
   parse: parseGeoPackage,
   options: {
     geopackage: {
-      sqlJsCDN: 'https://sql.js.org/dist/'
+      sqlJsCDN: DEFAULT_SQLJS_CDN
+    },
+    gis: {
+      format: 'tables'
     }
   }
 };

package/src/lib/parse-geopackage.ts

@@ -7,14 +7,9 @@ import {
   Field,
   Geometry,
   DataType,
-  Bool,
-  Utf8,
-  Float64,
-  Int32,
-  Int8,
-  Int16,
-  Float32,
-  Binary
+  Tables,
+  ObjectRowTable,
+  Feature
 } from '@loaders.gl/schema';
 import {binaryToGeometry, transformGeoJsonCoords} from '@loaders.gl/gis';
 import {Proj4Projection} from '@math.gl/proj4';
@@ -27,9 +22,14 @@ import {
   DataColumnsRow,
   DataColumnsMapping,
   PragmaTableInfoRow,
-  SQLiteTypes
+  SQLiteTypes,
+  GeoPackageGeometryTypes
 } from './types';
 
+// 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.
+export const 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,
@@ -44,45 +44,63 @@ const ENVELOPE_BYTE_LENGTHS = {
 };
 
 // Documentation: https://www.geopackage.org/spec130/index.html#table_column_data_types
-const SQL_TYPE_MAPPING: {[type in SQLiteTypes]: typeof DataType} = {
-  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
+const SQL_TYPE_MAPPING: {[type in SQLiteTypes | GeoPackageGeometryTypes]: DataType} = {
+  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'
 };
 
 export default async function parseGeoPackage(
   arrayBuffer: ArrayBuffer,
   options?: GeoPackageLoaderOptions
-) {
-  const {sqlJsCDN = 'https://sql.js.org/dist/'} = options?.geopackage || {};
-  const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};
+): Promise<Tables<ObjectRowTable> | Record<string, Feature[]>> {
+  const {sqlJsCDN = DEFAULT_SQLJS_CDN} = options?.geopackage || {};
+  const {reproject = false, _targetCrs = 'WGS84', format = 'tables'} = options?.gis || {};
 
   const db = await loadDatabase(arrayBuffer, sqlJsCDN);
   const tables = listVectorTables(db);
   const projections = getProjections(db);
 
   // Mapping from tableName to geojson feature collection
-  const result = {};
+  const outputTables: Tables<ObjectRowTable> = {
+    shape: 'tables',
+    tables: []
+  };
+
   for (const table of tables) {
     const {table_name: tableName} = table;
-    result[tableName] = getVectorTable(db, tableName, projections, {
-      reproject,
-      _targetCrs
+    outputTables.tables.push({
+      name: tableName,
+      table: getVectorTable(db, tableName, projections, {
+        reproject,
+        _targetCrs
+      })
     });
   }
 
-  return result;
+  if (format === 'geojson') {
+    return formatTablesAsGeojson(outputTables);
+  }
+
+  return outputTables;
 }
 
 /**
@@ -147,7 +165,7 @@ function getVectorTable(
   tableName: string,
   projections: ProjectionMapping,
   {reproject, _targetCrs}: {reproject: boolean; _targetCrs: string}
-): object {
+): ObjectRowTable {
   const dataColumns = getDataColumns(db, tableName);
   const geomColumn = getGeometryColumn(db, tableName);
   const featureIdColumn = getFeatureIdName(db, tableName);
@@ -178,12 +196,16 @@ function getVectorTable(
     geojsonFeatures.push(geojsonFeature);
   }
 
-  const schema = getArrowSchema(db, tableName);
+  const schema = getSchema(db, tableName);
   if (projection) {
-    return {geojsonFeatures: transformGeoJsonCoords(geojsonFeatures, projection.project), schema};
+    return {
+      shape: 'object-row-table',
+      data: transformGeoJsonCoords(geojsonFeatures, projection.project),
+      schema
+    };
   }
 
-  return {geojsonFeatures, schema};
+  return {data: geojsonFeatures, schema, shape: 'object-row-table'};
 }
 
 /**
@@ -220,7 +242,7 @@ function constructGeoJsonFeature(
   geomColumn: GeometryColumnsRow,
   dataColumns: DataColumnsMapping,
   featureIdColumn: string
-) {
+): Feature<Geometry | null> {
   // Find feature id
   const idIdx = columns.indexOf(featureIdColumn);
   const id = row[idIdx];
@@ -290,7 +312,7 @@ function getGeopackageVersion(db: Database): string | null {
   const userVersionQuery = db.exec('PRAGMA user_version;')[0];
   const userVersionInt = userVersionQuery.values[0][0];
 
-  if (userVersionInt && userVersionInt < 10300) {
+  if (userVersionInt && typeof userVersionInt === 'number' && userVersionInt < 10300) {
     return '1.2';
   }
 
@@ -328,7 +350,7 @@ function getFeatureIdName(db: Database, tableName: string): string | null {
  * See: https://www.geopackage.org/spec121/#gpb_format
  *
  * @param arrayBuffer geometry buffer
- * @return {object} GeoJSON geometry (in original CRS)
+ * @return GeoJSON geometry (in original CRS)
  */
 function parseGeometry(arrayBuffer: ArrayBuffer): Geometry | null {
   const view = new DataView(arrayBuffer);
@@ -438,16 +460,25 @@ function getDataColumns(db: Database, tableName: string): DataColumnsMapping | n
  * @param tableName  table name
  * @returns Arrow-like Schema
  */
-function getArrowSchema(db: Database, tableName: string): Schema {
+function getSchema(db: Database, tableName: string): Schema {
   const stmt = db.prepare(`PRAGMA table_info(\`${tableName}\`)`);
 
   const fields: Field[] = [];
   while (stmt.step()) {
     const pragmaTableInfo = stmt.getAsObject() as unknown as PragmaTableInfoRow;
-    const {name, type, notnull} = pragmaTableInfo;
-    const field = new Field(name, new SQL_TYPE_MAPPING[type](), !notnull);
+    const {name, type: sqlType, notnull} = pragmaTableInfo;
+    const type = SQL_TYPE_MAPPING[sqlType];
+    const field = {name, type, nullable: !notnull};
     fields.push(field);
   }
 
-  return new Schema(fields);
+  return {fields, metadata: {}};
+}
+
+function formatTablesAsGeojson(tables: Tables<ObjectRowTable>): Record<string, Feature[]> {
+  const geojsonMap = {};
+  for (const table of tables.tables) {
+    geojsonMap[table.name] = table.table.data;
+  }
+  return geojsonMap;
 }

package/src/lib/types.ts

@@ -21,8 +21,23 @@ export type SQLiteTypes =
   | 'TEXT'
   | 'BLOB'
   | 'DATE'
-  | 'DATETIME'
-  | 'GEOMETRY';
+  | 'DATETIME';
+
+/** Type names for geopackage geometries
+ *
+ * As defined in https://www.geopackage.org/spec130/index.html#table_column_data_types, geometries
+ * can be stored with any geometry name listed here:
+ * https://www.geopackage.org/spec130/index.html#geometry_types
+ */
+export type GeoPackageGeometryTypes =
+  | 'GEOMETRY'
+  | 'POINT'
+  | 'LINESTRING'
+  | 'POLYGON'
+  | 'MULTIPOINT'
+  | 'MULTILINESTRING'
+  | 'MULTIPOLYGON'
+  | 'GEOMETRYCOLLECTION';
 
 /**
  * https://www.geopackage.org/spec121/#spatial_ref_sys

package/dist/bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/bundle.ts"],"names":["moduleExports","require","globalThis","loaders","module","exports","Object","assign"],"mappings":"AACA,MAAMA,aAAa,GAAGC,OAAO,CAAC,SAAD,CAA7B;;AACAC,UAAU,CAACC,OAAX,GAAqBD,UAAU,CAACC,OAAX,IAAsB,EAA3C;AACAC,MAAM,CAACC,OAAP,GAAiBC,MAAM,CAACC,MAAP,CAAcL,UAAU,CAACC,OAAzB,EAAkCH,aAAlC,CAAjB","sourcesContent":["// @ts-nocheck\nconst moduleExports = require('./index');\nglobalThis.loaders = globalThis.loaders || {};\nmodule.exports = Object.assign(globalThis.loaders, moduleExports);\n"],"file":"bundle.js"}

package/dist/geopackage-loader.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/geopackage-loader.ts"],"names":["parseGeoPackage","VERSION","GeoPackageLoader","id","name","module","version","extensions","mimeTypes","category","parse","options","geopackage","sqlJsCDN"],"mappings":"AACA,OAAOA,eAAP,MAA4B,wBAA5B;AAKA,MAAMC,OAAO,GAAG,QAAhB;AAcA,OAAO,MAAMC,gBAAkC,GAAG;AAChDC,EAAAA,EAAE,EAAE,YAD4C;AAEhDC,EAAAA,IAAI,EAAE,YAF0C;AAGhDC,EAAAA,MAAM,EAAE,YAHwC;AAIhDC,EAAAA,OAAO,EAAEL,OAJuC;AAKhDM,EAAAA,UAAU,EAAE,CAAC,MAAD,CALoC;AAMhDC,EAAAA,SAAS,EAAE,CAAC,gCAAD,CANqC;AAOhDC,EAAAA,QAAQ,EAAE,UAPsC;AAQhDC,EAAAA,KAAK,EAAEV,eARyC;AAShDW,EAAAA,OAAO,EAAE;AACPC,IAAAA,UAAU,EAAE;AACVC,MAAAA,QAAQ,EAAE;AADA;AADL;AATuC,CAA3C","sourcesContent":["import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\nimport parseGeoPackage from './lib/parse-geopackage';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\n// const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\nconst VERSION = 'latest';\n\nexport type GeoPackageLoaderOptions = LoaderOptions & {\n  geopackage?: {\n    // Use null in Node\n    sqlJsCDN: string | null;\n  };\n  gis?: {\n    reproject?: boolean;\n    _targetCrs?: string;\n  };\n};\n\n/** Geopackage loader */\nexport const GeoPackageLoader: LoaderWithParser = {\n  id: 'geopackage',\n  name: 'GeoPackage',\n  module: 'geopackage',\n  version: VERSION,\n  extensions: ['gpkg'],\n  mimeTypes: ['application/geopackage+sqlite3'],\n  category: 'geometry',\n  parse: parseGeoPackage,\n  options: {\n    geopackage: {\n      sqlJsCDN: 'https://sql.js.org/dist/'\n    }\n  }\n};\n"],"file":"geopackage-loader.js"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/index.ts"],"names":["GeoPackageLoader"],"mappings":"AAAA,SAAQA,gBAAR,QAA+B,qBAA/B","sourcesContent":["export {GeoPackageLoader} from './geopackage-loader';\n"],"file":"index.js"}

package/dist/lib/parse-geopackage.js.map

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

package/dist/lib/types.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[],"file":"types.js"}