@loaders.gl/flatgeobuf 3.2.0-alpha.1 → 3.2.0-alpha.2

package/dist/dist.min.js

@@ -44,7 +44,9 @@
         mimeTypes: ["application/octet-stream"],
         category: "geometry",
         options: {
-          flatgeobuf: {}
+          flatgeobuf: {
+            shape: "geojson"
+          }
         }
       };
     }
@@ -9340,19 +9342,33 @@
     return parsedGeometry;
   }
   function parseFlatGeobuf(arrayBuffer, options) {
-    if (arrayBuffer.byteLength === 0) {
-      return [];
-    }
-    if (options && options.gis && options.gis.format === "binary") {
-      return parseFlatGeobufToBinary(arrayBuffer, options);
+    const shape = options?.gis?.format || options?.flatgeobuf?.shape;
+    switch (shape) {
+      case "geojson-row-table": {
+        const table = {
+          shape: "geojson-row-table",
+          data: parseFlatGeobufToGeoJSON(arrayBuffer, options)
+        };
+        return table;
+      }
+      case "columnar-table":
+        return { shape: "columnar-table", data: parseFlatGeobufToBinary(arrayBuffer, options) };
+      case "geojson":
+        return parseFlatGeobufToGeoJSON(arrayBuffer, options);
+      case "binary":
+        return parseFlatGeobufToBinary(arrayBuffer, options);
+      default:
+        throw new Error(shape);
     }
-    return parseFlatGeobufToGeoJSON(arrayBuffer, options);
   }
   function parseFlatGeobufToBinary(arrayBuffer, options) {
-    const arr = new Uint8Array(arrayBuffer);
-    return (0, import_generic.deserialize)(arr, binaryFromFeature);
+    const array = new Uint8Array(arrayBuffer);
+    return (0, import_generic.deserialize)(array, binaryFromFeature);
   }
   function parseFlatGeobufToGeoJSON(arrayBuffer, options) {
+    if (arrayBuffer.byteLength === 0) {
+      return [];
+    }
     const { reproject = false, _targetCrs = "WGS84" } = options && options.gis || {};
     const arr = new Uint8Array(arrayBuffer);
     let headerMeta;

package/dist/es5/flatgeobuf-loader.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports._typecheckFlatGeobufLoader = exports.FlatGeobufLoader = void 0;
-var VERSION = typeof "3.2.0-alpha.1" !== 'undefined' ? "3.2.0-alpha.1" : 'latest';
+var VERSION = typeof "3.2.0-alpha.2" !== 'undefined' ? "3.2.0-alpha.2" : 'latest';
 var FlatGeobufLoader = {
   id: 'flatgeobuf',
   name: 'FlatGeobuf',
@@ -15,7 +15,9 @@ var FlatGeobufLoader = {
   mimeTypes: ['application/octet-stream'],
   category: 'geometry',
   options: {
-    flatgeobuf: {}
+    flatgeobuf: {
+      shape: 'geojson'
+    }
   }
 };
 exports.FlatGeobufLoader = FlatGeobufLoader;

package/dist/es5/flatgeobuf-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/flatgeobuf-loader.ts"],"names":["VERSION","FlatGeobufLoader","id","name","module","version","worker","extensions","mimeTypes","category","options","flatgeobuf","_typecheckFlatGeobufLoader"],"mappings":";;;;;;AAIA,IAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAEO,IAAMC,gBAAgB,GAAG;AAC9BC,EAAAA,EAAE,EAAE,YAD0B;AAE9BC,EAAAA,IAAI,EAAE,YAFwB;AAG9BC,EAAAA,MAAM,EAAE,YAHsB;AAI9BC,EAAAA,OAAO,EAAEL,OAJqB;AAK9BM,EAAAA,MAAM,EAAE,IALsB;AAM9BC,EAAAA,UAAU,EAAE,CAAC,KAAD,CANkB;AAO9BC,EAAAA,SAAS,EAAE,CAAC,0BAAD,CAPmB;AAQ9BC,EAAAA,QAAQ,EAAE,UARoB;AAS9BC,EAAAA,OAAO,EAAE;AACPC,IAAAA,UAAU,EAAE;AADL;AATqB,CAAzB;;AAcA,IAAMC,0BAAkC,GAAGX,gBAA3C","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport const FlatGeobufLoader = {\n  id: 'flatgeobuf',\n  name: 'FlatGeobuf',\n  module: 'flatgeobuf',\n  version: VERSION,\n  worker: true,\n  extensions: ['fgb'],\n  mimeTypes: ['application/octet-stream'],\n  category: 'geometry',\n  options: {\n    flatgeobuf: {}\n  }\n};\n\nexport const _typecheckFlatGeobufLoader: Loader = FlatGeobufLoader;\n"],"file":"flatgeobuf-loader.js"}
+{"version":3,"sources":["../../src/flatgeobuf-loader.ts"],"names":["VERSION","FlatGeobufLoader","id","name","module","version","worker","extensions","mimeTypes","category","options","flatgeobuf","shape","_typecheckFlatGeobufLoader"],"mappings":";;;;;;AAIA,IAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAEO,IAAMC,gBAAgB,GAAG;AAC9BC,EAAAA,EAAE,EAAE,YAD0B;AAE9BC,EAAAA,IAAI,EAAE,YAFwB;AAG9BC,EAAAA,MAAM,EAAE,YAHsB;AAI9BC,EAAAA,OAAO,EAAEL,OAJqB;AAK9BM,EAAAA,MAAM,EAAE,IALsB;AAM9BC,EAAAA,UAAU,EAAE,CAAC,KAAD,CANkB;AAO9BC,EAAAA,SAAS,EAAE,CAAC,0BAAD,CAPmB;AAQ9BC,EAAAA,QAAQ,EAAE,UARoB;AAS9BC,EAAAA,OAAO,EAAE;AACPC,IAAAA,UAAU,EAAE;AAEVC,MAAAA,KAAK,EAAE;AAFG;AADL;AATqB,CAAzB;;AAiBA,IAAMC,0BAAkC,GAAGZ,gBAA3C","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport const FlatGeobufLoader = {\n  id: 'flatgeobuf',\n  name: 'FlatGeobuf',\n  module: 'flatgeobuf',\n  version: VERSION,\n  worker: true,\n  extensions: ['fgb'],\n  mimeTypes: ['application/octet-stream'],\n  category: 'geometry',\n  options: {\n    flatgeobuf: {\n      // Set to GeoJSON for backwards compatibility\n      shape: 'geojson'\n    }\n  }\n};\n\nexport const _typecheckFlatGeobufLoader: Loader = FlatGeobufLoader;\n"],"file":"flatgeobuf-loader.js"}

package/dist/es5/lib/parse-flatgeobuf.js

@@ -37,23 +37,47 @@ function binaryFromFeature(feature, header) {
 }
 
 function parseFlatGeobuf(arrayBuffer, options) {
-  if (arrayBuffer.byteLength === 0) {
-    return [];
-  }
+  var _options$gis, _options$flatgeobuf;
+
+  var shape = (options === null || options === void 0 ? void 0 : (_options$gis = options.gis) === null || _options$gis === void 0 ? void 0 : _options$gis.format) || (options === null || options === void 0 ? void 0 : (_options$flatgeobuf = options.flatgeobuf) === null || _options$flatgeobuf === void 0 ? void 0 : _options$flatgeobuf.shape);
+
+  switch (shape) {
+    case 'geojson-row-table':
+      {
+        var table = {
+          shape: 'geojson-row-table',
+          data: parseFlatGeobufToGeoJSON(arrayBuffer, options)
+        };
+        return table;
+      }
 
-  if (options && options.gis && options.gis.format === 'binary') {
-    return parseFlatGeobufToBinary(arrayBuffer, options);
-  }
+    case 'columnar-table':
+      return {
+        shape: 'columnar-table',
+        data: parseFlatGeobufToBinary(arrayBuffer, options)
+      };
+
+    case 'geojson':
+      return parseFlatGeobufToGeoJSON(arrayBuffer, options);
 
-  return parseFlatGeobufToGeoJSON(arrayBuffer, options);
+    case 'binary':
+      return parseFlatGeobufToBinary(arrayBuffer, options);
+
+    default:
+      throw new Error(shape);
+  }
 }
 
 function parseFlatGeobufToBinary(arrayBuffer, options) {
-  var arr = new Uint8Array(arrayBuffer);
-  return (0, _generic.deserialize)(arr, binaryFromFeature);
+  var array = new Uint8Array(arrayBuffer);
+  return (0, _generic.deserialize)(array, binaryFromFeature);
 }
 
 function parseFlatGeobufToGeoJSON(arrayBuffer, options) {
+  if (arrayBuffer.byteLength === 0) {
+    return [];
+  }
+
   var _ref = options && options.gis || {},
       _ref$reproject = _ref.reproject,
       reproject = _ref$reproject === void 0 ? false : _ref$reproject,

package/dist/es5/lib/parse-flatgeobuf.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/parse-flatgeobuf.ts"],"names":["binaryFromFeature","feature","header","geometry","geometryType","type","parsedGeometry","properties","columns","parseFlatGeobuf","arrayBuffer","options","byteLength","gis","format","parseFlatGeobufToBinary","parseFlatGeobufToGeoJSON","arr","Uint8Array","reproject","_targetCrs","headerMeta","features","crs","projection","Proj4Projection","from","wkt","to","e","coords","project","parseFlatGeobufInBatches","stream","parseFlatGeobufInBatchesToBinary","parseFlatGeobufInBatchesToGeoJSON","iterator","firstRecord"],"mappings":"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","sourcesContent":["// @ts-nocheck\nimport {Proj4Projection} from '@math.gl/proj4';\nimport {transformGeoJsonCoords} from '@loaders.gl/gis';\n\nimport {deserialize as deserializeGeoJson} from 'flatgeobuf/lib/cjs/geojson';\nimport {deserialize as deserializeGeneric} from 'flatgeobuf/lib/cjs/generic';\nimport {parseProperties as parsePropertiesBinary} from 'flatgeobuf/lib/cjs/generic/feature';\n\nimport {fromGeometry as binaryFromGeometry} from './binary-geometries';\n\n// TODO: reproject binary features\nfunction binaryFromFeature(feature, header) {\n  const geometry = feature.geometry();\n\n  // FlatGeobuf files can only hold a single geometry type per file, otherwise\n  // GeometryType is GeometryCollection\n  // I believe geometry.type() is null (0) except when the geometry type isn't\n  // known in the header?\n  const geometryType = header.geometryType || geometry.type();\n  const parsedGeometry = binaryFromGeometry(geometry, geometryType);\n  parsedGeometry.properties = parsePropertiesBinary(feature, header.columns);\n\n  // TODO: wrap binary data either in points, lines, or polygons key\n  return parsedGeometry;\n}\n\n/*\n * Parse FlatGeobuf arrayBuffer and return GeoJSON.\n *\n * @param arrayBuffer  A FlatGeobuf arrayBuffer\n * @return A GeoJSON geometry object\n */\nexport function parseFlatGeobuf(arrayBuffer, options) {\n  if (arrayBuffer.byteLength === 0) {\n    return [];\n  }\n\n  if (options && options.gis && options.gis.format === 'binary') {\n    return parseFlatGeobufToBinary(arrayBuffer, options);\n  }\n\n  return parseFlatGeobufToGeoJSON(arrayBuffer, options);\n}\n\nfunction parseFlatGeobufToBinary(arrayBuffer, options) {\n  // TODO: reproject binary features\n  // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const arr = new Uint8Array(arrayBuffer);\n  return deserializeGeneric(arr, binaryFromFeature);\n}\n\nfunction parseFlatGeobufToGeoJSON(arrayBuffer, options) {\n  const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const arr = new Uint8Array(arrayBuffer);\n\n  let headerMeta;\n  const {features} = deserializeGeoJson(arr, false, (header) => {\n    headerMeta = header;\n  });\n\n  const crs = headerMeta && headerMeta.crs;\n  let projection;\n  if (reproject && crs) {\n    // Constructing the projection may fail for some invalid WKT strings\n    try {\n      projection = new Proj4Projection({from: crs.wkt, to: _targetCrs});\n    } catch (e) {\n      // no op\n    }\n  }\n\n  if (projection) {\n    return transformGeoJsonCoords(features, (coords) => projection.project(coords));\n  }\n\n  return features;\n}\n\n/*\n * Parse FlatGeobuf arrayBuffer and return GeoJSON.\n *\n * @param {ReadableStream} _ A FlatGeobuf arrayBuffer\n * @return  A GeoJSON geometry object iterator\n */\n// eslint-disable-next-line complexity\nexport function parseFlatGeobufInBatches(stream, options) {\n  if (options && options.gis && options.gis.format === 'binary') {\n    return parseFlatGeobufInBatchesToBinary(stream, options);\n  }\n\n  return parseFlatGeobufInBatchesToGeoJSON(stream, options);\n}\n\nfunction parseFlatGeobufInBatchesToBinary(stream, options) {\n  // TODO: reproject binary streaming features\n  // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const iterator = deserializeGeneric(stream, binaryFromFeature);\n  return iterator;\n}\n\n// eslint-disable-next-line complexity\nasync function* parseFlatGeobufInBatchesToGeoJSON(stream, options) {\n  const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  let headerMeta;\n  const iterator = deserializeGeoJson(stream, false, (header) => {\n    headerMeta = header;\n  });\n\n  let projection;\n  let firstRecord = true;\n  for await (const feature of iterator) {\n    if (firstRecord) {\n      const crs = headerMeta && headerMeta.crs;\n      if (reproject && crs) {\n        projection = new Proj4Projection({from: crs.wkt, to: _targetCrs});\n      }\n\n      firstRecord = false;\n    }\n\n    if (reproject && projection) {\n      // eslint-disable-next-line\n      yield transformGeoJsonCoords([feature], (coords) => projection.project(coords));\n    } else {\n      yield feature;\n    }\n  }\n}\n"],"file":"parse-flatgeobuf.js"}
+{"version":3,"sources":["../../../src/lib/parse-flatgeobuf.ts"],"names":["binaryFromFeature","feature","header","geometry","geometryType","type","parsedGeometry","properties","columns","parseFlatGeobuf","arrayBuffer","options","shape","gis","format","flatgeobuf","table","data","parseFlatGeobufToGeoJSON","parseFlatGeobufToBinary","Error","array","Uint8Array","byteLength","reproject","_targetCrs","arr","headerMeta","features","crs","projection","Proj4Projection","from","wkt","to","e","coords","project","parseFlatGeobufInBatches","stream","parseFlatGeobufInBatchesToBinary","parseFlatGeobufInBatchesToGeoJSON","iterator","firstRecord"],"mappings":";;;;;;;;;;;;;;;;;;AACA;;AACA;;AAEA;;AACA;;AACA;;AAEA;;AAKA,SAASA,iBAAT,CAA2BC,OAA3B,EAAoCC,MAApC,EAA4C;AAC1C,MAAMC,QAAQ,GAAGF,OAAO,CAACE,QAAR,EAAjB;AAMA,MAAMC,YAAY,GAAGF,MAAM,CAACE,YAAP,IAAuBD,QAAQ,CAACE,IAAT,EAA5C;AACA,MAAMC,cAAc,GAAG,oCAAmBH,QAAnB,EAA6BC,YAA7B,CAAvB;AACAE,EAAAA,cAAc,CAACC,UAAf,GAA4B,8BAAsBN,OAAtB,EAA+BC,MAAM,CAACM,OAAtC,CAA5B;AAGA,SAAOF,cAAP;AACD;;AAQM,SAASG,eAAT,CAAyBC,WAAzB,EAAmDC,OAAnD,EAAsF;AAAA;;AAC3F,MAAMC,KAAK,GAAG,CAAAD,OAAO,SAAP,IAAAA,OAAO,WAAP,4BAAAA,OAAO,CAAEE,GAAT,8DAAcC,MAAd,MAAwBH,OAAxB,aAAwBA,OAAxB,8CAAwBA,OAAO,CAAEI,UAAjC,wDAAwB,oBAAqBH,KAA7C,CAAd;;AAEA,UAAQA,KAAR;AACE,SAAK,mBAAL;AAA0B;AACxB,YAAMI,KAAsB,GAAG;AAC7BJ,UAAAA,KAAK,EAAE,mBADsB;AAE7BK,UAAAA,IAAI,EAAEC,wBAAwB,CAACR,WAAD,EAAcC,OAAd;AAFD,SAA/B;AAIA,eAAOK,KAAP;AACD;;AACD,SAAK,gBAAL;AACE,aAAO;AAACJ,QAAAA,KAAK,EAAE,gBAAR;AAA0BK,QAAAA,IAAI,EAAEE,uBAAuB,CAACT,WAAD,EAAcC,OAAd;AAAvD,OAAP;;AACF,SAAK,SAAL;AACE,aAAOO,wBAAwB,CAACR,WAAD,EAAcC,OAAd,CAA/B;;AACF,SAAK,QAAL;AACE,aAAOQ,uBAAuB,CAACT,WAAD,EAAcC,OAAd,CAA9B;;AACF;AACE,YAAM,IAAIS,KAAJ,CAAUR,KAAV,CAAN;AAfJ;AAiBD;;AAED,SAASO,uBAAT,CAAiCT,WAAjC,EAA2DC,OAA3D,EAA6F;AAI3F,MAAMU,KAAK,GAAG,IAAIC,UAAJ,CAAeZ,WAAf,CAAd;AACA,SAAO,0BAAmBW,KAAnB,EAA0BrB,iBAA1B,CAAP;AACD;;AAED,SAASkB,wBAAT,CACER,WADF,EAEEC,OAFF,EAGa;AACX,MAAID,WAAW,CAACa,UAAZ,KAA2B,CAA/B,EAAkC;AAChC,WAAO,EAAP;AACD;;AAED,aAAmDZ,OAAO,IAAIA,OAAO,CAACE,GAApB,IAA4B,EAA9E;AAAA,4BAAOW,SAAP;AAAA,MAAOA,SAAP,+BAAmB,KAAnB;AAAA,6BAA0BC,UAA1B;AAAA,MAA0BA,UAA1B,gCAAuC,OAAvC;;AAEA,MAAMC,GAAG,GAAG,IAAIJ,UAAJ,CAAeZ,WAAf,CAAZ;AAEA,MAAIiB,UAAJ;;AACA,4BAAmB,0BAAmBD,GAAnB,EAAwB,KAAxB,EAA+B,UAACxB,MAAD,EAAY;AAC5DyB,IAAAA,UAAU,GAAGzB,MAAb;AACD,GAFkB,CAAnB;AAAA,MAAO0B,QAAP,uBAAOA,QAAP;;AAIA,MAAMC,GAAG,GAAGF,UAAU,IAAIA,UAAU,CAACE,GAArC;AACA,MAAIC,UAAJ;;AACA,MAAIN,SAAS,IAAIK,GAAjB,EAAsB;AAEpB,QAAI;AACFC,MAAAA,UAAU,GAAG,IAAIC,qBAAJ,CAAoB;AAACC,QAAAA,IAAI,EAAEH,GAAG,CAACI,GAAX;AAAgBC,QAAAA,EAAE,EAAET;AAApB,OAApB,CAAb;AACD,KAFD,CAEE,OAAOU,CAAP,EAAU,CAEX;AACF;;AAED,MAAIL,UAAJ,EAAgB;AACd,WAAO,iCAAuBF,QAAvB,EAAiC,UAACQ,MAAD;AAAA,aAAYN,UAAU,CAACO,OAAX,CAAmBD,MAAnB,CAAZ;AAAA,KAAjC,CAAP;AACD;;AAED,SAAOR,QAAP;AACD;;AASM,SAASU,wBAAT,CAAkCC,MAAlC,EAA0C5B,OAA1C,EAA4E;AACjF,MAAIA,OAAO,IAAIA,OAAO,CAACE,GAAnB,IAA0BF,OAAO,CAACE,GAAR,CAAYC,MAAZ,KAAuB,QAArD,EAA+D;AAC7D,WAAO0B,gCAAgC,CAACD,MAAD,EAAS5B,OAAT,CAAvC;AACD;;AAED,SAAO8B,iCAAiC,CAACF,MAAD,EAAS5B,OAAT,CAAxC;AACD;;AAED,SAAS6B,gCAAT,CAA0CD,MAA1C,EAAkD5B,OAAlD,EAAoF;AAIlF,MAAM+B,QAAQ,GAAG,0BAAmBH,MAAnB,EAA2BvC,iBAA3B,CAAjB;AACA,SAAO0C,QAAP;AACD;;SAGeD,iC;;;;;mGAAhB,iBAAkDF,MAAlD,EAA0D5B,OAA1D;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA,oBACqDA,OAAO,IAAIA,OAAO,CAACE,GAApB,IAA4B,EADhF,0BACSW,SADT,EACSA,SADT,gCACqB,KADrB,6CAC4BC,UAD5B,EAC4BA,UAD5B,iCACyC,OADzC;AAIQiB,YAAAA,QAJR,GAImB,0BAAmBH,MAAnB,EAA2B,KAA3B,EAAkC,UAACrC,MAAD,EAAY;AAC7DyB,cAAAA,UAAU,GAAGzB,MAAb;AACD,aAFgB,CAJnB;AASMyC,YAAAA,WATN,GASoB,IATpB;AAAA;AAAA;AAAA;AAAA,qDAU8BD,QAV9B;;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;;AAUmBzC,YAAAA,OAVnB;;AAWI,gBAAI0C,WAAJ,EAAiB;AACTd,cAAAA,GADS,GACHF,UAAU,IAAIA,UAAU,CAACE,GADtB;;AAEf,kBAAIL,SAAS,IAAIK,GAAjB,EAAsB;AACpBC,gBAAAA,UAAU,GAAG,IAAIC,qBAAJ,CAAoB;AAACC,kBAAAA,IAAI,EAAEH,GAAG,CAACI,GAAX;AAAgBC,kBAAAA,EAAE,EAAET;AAApB,iBAApB,CAAb;AACD;;AAEDkB,cAAAA,WAAW,GAAG,KAAd;AACD;;AAlBL,kBAoBQnB,SAAS,IAAIM,UApBrB;AAAA;AAAA;AAAA;;AAAA;AAsBM,mBAAM,iCAAuB,CAAC7B,OAAD,CAAvB,EAAkC,UAACmC,MAAD;AAAA,qBAAYN,UAAU,CAACO,OAAX,CAAmBD,MAAnB,CAAZ;AAAA,aAAlC,CAAN;;AAtBN;AAAA;AAAA;;AAAA;AAAA;AAwBM,mBAAMnC,OAAN;;AAxBN;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;;AAAA;;AAAA;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["// @ts-nocheck\nimport {Proj4Projection} from '@math.gl/proj4';\nimport {transformGeoJsonCoords} from '@loaders.gl/gis';\n\nimport {deserialize as deserializeGeoJson} from 'flatgeobuf/lib/cjs/geojson';\nimport {deserialize as deserializeGeneric} from 'flatgeobuf/lib/cjs/generic';\nimport {parseProperties as parsePropertiesBinary} from 'flatgeobuf/lib/cjs/generic/feature';\n\nimport {fromGeometry as binaryFromGeometry} from './binary-geometries';\nimport {FlatGeobufLoaderOptions} from './types';\nimport {GeoJSONRowTable, Feature} from '@loaders.gl/schema';\n\n// TODO: reproject binary features\nfunction binaryFromFeature(feature, header) {\n  const geometry = feature.geometry();\n\n  // FlatGeobuf files can only hold a single geometry type per file, otherwise\n  // GeometryType is GeometryCollection\n  // I believe geometry.type() is null (0) except when the geometry type isn't\n  // known in the header?\n  const geometryType = header.geometryType || geometry.type();\n  const parsedGeometry = binaryFromGeometry(geometry, geometryType);\n  parsedGeometry.properties = parsePropertiesBinary(feature, header.columns);\n\n  // TODO: wrap binary data either in points, lines, or polygons key\n  return parsedGeometry;\n}\n\n/*\n * Parse FlatGeobuf arrayBuffer and return GeoJSON.\n *\n * @param arrayBuffer  A FlatGeobuf arrayBuffer\n * @return A GeoJSON geometry object\n */\nexport function parseFlatGeobuf(arrayBuffer: ArrayBuffer, options?: FlatGeobufLoaderOptions) {\n  const shape = options?.gis?.format || options?.flatgeobuf?.shape;\n\n  switch (shape) {\n    case 'geojson-row-table': {\n      const table: GeoJSONRowTable = {\n        shape: 'geojson-row-table',\n        data: parseFlatGeobufToGeoJSON(arrayBuffer, options)\n      };\n      return table;\n    }\n    case 'columnar-table': // binary + some JS arrays\n      return {shape: 'columnar-table', data: parseFlatGeobufToBinary(arrayBuffer, options)};\n    case 'geojson':\n      return parseFlatGeobufToGeoJSON(arrayBuffer, options);\n    case 'binary':\n      return parseFlatGeobufToBinary(arrayBuffer, options);\n    default:\n      throw new Error(shape);\n  }\n}\n\nfunction parseFlatGeobufToBinary(arrayBuffer: ArrayBuffer, options: FlatGeobufLoaderOptions) {\n  // TODO: reproject binary features\n  // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const array = new Uint8Array(arrayBuffer);\n  return deserializeGeneric(array, binaryFromFeature);\n}\n\nfunction parseFlatGeobufToGeoJSON(\n  arrayBuffer: ArrayBuffer,\n  options: FlatGeobufLoaderOptions\n): Feature[] {\n  if (arrayBuffer.byteLength === 0) {\n    return [];\n  }\n\n  const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const arr = new Uint8Array(arrayBuffer);\n\n  let headerMeta;\n  const {features} = deserializeGeoJson(arr, false, (header) => {\n    headerMeta = header;\n  });\n\n  const crs = headerMeta && headerMeta.crs;\n  let projection;\n  if (reproject && crs) {\n    // Constructing the projection may fail for some invalid WKT strings\n    try {\n      projection = new Proj4Projection({from: crs.wkt, to: _targetCrs});\n    } catch (e) {\n      // no op\n    }\n  }\n\n  if (projection) {\n    return transformGeoJsonCoords(features, (coords) => projection.project(coords));\n  }\n\n  return features;\n}\n\n/*\n * Parse FlatGeobuf arrayBuffer and return GeoJSON.\n *\n * @param {ReadableStream} _ A FlatGeobuf arrayBuffer\n * @return  A GeoJSON geometry object iterator\n */\n// eslint-disable-next-line complexity\nexport function parseFlatGeobufInBatches(stream, options: FlatGeobufLoaderOptions) {\n  if (options && options.gis && options.gis.format === 'binary') {\n    return parseFlatGeobufInBatchesToBinary(stream, options);\n  }\n\n  return parseFlatGeobufInBatchesToGeoJSON(stream, options);\n}\n\nfunction parseFlatGeobufInBatchesToBinary(stream, options: FlatGeobufLoaderOptions) {\n  // TODO: reproject binary streaming features\n  // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const iterator = deserializeGeneric(stream, binaryFromFeature);\n  return iterator;\n}\n\n// eslint-disable-next-line complexity\nasync function* parseFlatGeobufInBatchesToGeoJSON(stream, options: FlatGeobufLoaderOptions) {\n  const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  let headerMeta;\n  const iterator = deserializeGeoJson(stream, false, (header) => {\n    headerMeta = header;\n  });\n\n  let projection;\n  let firstRecord = true;\n  for await (const feature of iterator) {\n    if (firstRecord) {\n      const crs = headerMeta && headerMeta.crs;\n      if (reproject && crs) {\n        projection = new Proj4Projection({from: crs.wkt, to: _targetCrs});\n      }\n\n      firstRecord = false;\n    }\n\n    if (reproject && projection) {\n      // eslint-disable-next-line\n      yield transformGeoJsonCoords([feature], (coords) => projection.project(coords));\n    } else {\n      yield feature;\n    }\n  }\n}\n"],"file":"parse-flatgeobuf.js"}

package/dist/es5/lib/types.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=types.js.map

package/dist/es5/lib/types.js.map

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

package/dist/esm/flatgeobuf-loader.js

@@ -1,4 +1,4 @@
-const VERSION = typeof "3.2.0-alpha.1" !== 'undefined' ? "3.2.0-alpha.1" : 'latest';
+const VERSION = typeof "3.2.0-alpha.2" !== 'undefined' ? "3.2.0-alpha.2" : 'latest';
 export const FlatGeobufLoader = {
   id: 'flatgeobuf',
   name: 'FlatGeobuf',
@@ -9,7 +9,9 @@ export const FlatGeobufLoader = {
   mimeTypes: ['application/octet-stream'],
   category: 'geometry',
   options: {
-    flatgeobuf: {}
+    flatgeobuf: {
+      shape: 'geojson'
+    }
   }
 };
 export const _typecheckFlatGeobufLoader = FlatGeobufLoader;

package/dist/esm/flatgeobuf-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/flatgeobuf-loader.ts"],"names":["VERSION","FlatGeobufLoader","id","name","module","version","worker","extensions","mimeTypes","category","options","flatgeobuf","_typecheckFlatGeobufLoader"],"mappings":"AAIA,MAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAEA,OAAO,MAAMC,gBAAgB,GAAG;AAC9BC,EAAAA,EAAE,EAAE,YAD0B;AAE9BC,EAAAA,IAAI,EAAE,YAFwB;AAG9BC,EAAAA,MAAM,EAAE,YAHsB;AAI9BC,EAAAA,OAAO,EAAEL,OAJqB;AAK9BM,EAAAA,MAAM,EAAE,IALsB;AAM9BC,EAAAA,UAAU,EAAE,CAAC,KAAD,CANkB;AAO9BC,EAAAA,SAAS,EAAE,CAAC,0BAAD,CAPmB;AAQ9BC,EAAAA,QAAQ,EAAE,UARoB;AAS9BC,EAAAA,OAAO,EAAE;AACPC,IAAAA,UAAU,EAAE;AADL;AATqB,CAAzB;AAcP,OAAO,MAAMC,0BAAkC,GAAGX,gBAA3C","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport const FlatGeobufLoader = {\n  id: 'flatgeobuf',\n  name: 'FlatGeobuf',\n  module: 'flatgeobuf',\n  version: VERSION,\n  worker: true,\n  extensions: ['fgb'],\n  mimeTypes: ['application/octet-stream'],\n  category: 'geometry',\n  options: {\n    flatgeobuf: {}\n  }\n};\n\nexport const _typecheckFlatGeobufLoader: Loader = FlatGeobufLoader;\n"],"file":"flatgeobuf-loader.js"}
+{"version":3,"sources":["../../src/flatgeobuf-loader.ts"],"names":["VERSION","FlatGeobufLoader","id","name","module","version","worker","extensions","mimeTypes","category","options","flatgeobuf","shape","_typecheckFlatGeobufLoader"],"mappings":"AAIA,MAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAEA,OAAO,MAAMC,gBAAgB,GAAG;AAC9BC,EAAAA,EAAE,EAAE,YAD0B;AAE9BC,EAAAA,IAAI,EAAE,YAFwB;AAG9BC,EAAAA,MAAM,EAAE,YAHsB;AAI9BC,EAAAA,OAAO,EAAEL,OAJqB;AAK9BM,EAAAA,MAAM,EAAE,IALsB;AAM9BC,EAAAA,UAAU,EAAE,CAAC,KAAD,CANkB;AAO9BC,EAAAA,SAAS,EAAE,CAAC,0BAAD,CAPmB;AAQ9BC,EAAAA,QAAQ,EAAE,UARoB;AAS9BC,EAAAA,OAAO,EAAE;AACPC,IAAAA,UAAU,EAAE;AAEVC,MAAAA,KAAK,EAAE;AAFG;AADL;AATqB,CAAzB;AAiBP,OAAO,MAAMC,0BAAkC,GAAGZ,gBAA3C","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport const FlatGeobufLoader = {\n  id: 'flatgeobuf',\n  name: 'FlatGeobuf',\n  module: 'flatgeobuf',\n  version: VERSION,\n  worker: true,\n  extensions: ['fgb'],\n  mimeTypes: ['application/octet-stream'],\n  category: 'geometry',\n  options: {\n    flatgeobuf: {\n      // Set to GeoJSON for backwards compatibility\n      shape: 'geojson'\n    }\n  }\n};\n\nexport const _typecheckFlatGeobufLoader: Loader = FlatGeobufLoader;\n"],"file":"flatgeobuf-loader.js"}

package/dist/esm/lib/parse-flatgeobuf.js

@@ -14,23 +14,47 @@ function binaryFromFeature(feature, header) {
 }
 
 export function parseFlatGeobuf(arrayBuffer, options) {
-  if (arrayBuffer.byteLength === 0) {
-    return [];
-  }
+  var _options$gis, _options$flatgeobuf;
+
+  const shape = (options === null || options === void 0 ? void 0 : (_options$gis = options.gis) === null || _options$gis === void 0 ? void 0 : _options$gis.format) || (options === null || options === void 0 ? void 0 : (_options$flatgeobuf = options.flatgeobuf) === null || _options$flatgeobuf === void 0 ? void 0 : _options$flatgeobuf.shape);
+
+  switch (shape) {
+    case 'geojson-row-table':
+      {
+        const table = {
+          shape: 'geojson-row-table',
+          data: parseFlatGeobufToGeoJSON(arrayBuffer, options)
+        };
+        return table;
+      }
 
-  if (options && options.gis && options.gis.format === 'binary') {
-    return parseFlatGeobufToBinary(arrayBuffer, options);
-  }
+    case 'columnar-table':
+      return {
+        shape: 'columnar-table',
+        data: parseFlatGeobufToBinary(arrayBuffer, options)
+      };
+
+    case 'geojson':
+      return parseFlatGeobufToGeoJSON(arrayBuffer, options);
 
-  return parseFlatGeobufToGeoJSON(arrayBuffer, options);
+    case 'binary':
+      return parseFlatGeobufToBinary(arrayBuffer, options);
+
+    default:
+      throw new Error(shape);
+  }
 }
 
 function parseFlatGeobufToBinary(arrayBuffer, options) {
-  const arr = new Uint8Array(arrayBuffer);
-  return deserializeGeneric(arr, binaryFromFeature);
+  const array = new Uint8Array(arrayBuffer);
+  return deserializeGeneric(array, binaryFromFeature);
 }
 
 function parseFlatGeobufToGeoJSON(arrayBuffer, options) {
+  if (arrayBuffer.byteLength === 0) {
+    return [];
+  }
+
   const {
     reproject = false,
     _targetCrs = 'WGS84'

package/dist/esm/lib/parse-flatgeobuf.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/parse-flatgeobuf.ts"],"names":["Proj4Projection","transformGeoJsonCoords","deserialize","deserializeGeoJson","deserializeGeneric","parseProperties","parsePropertiesBinary","fromGeometry","binaryFromGeometry","binaryFromFeature","feature","header","geometry","geometryType","type","parsedGeometry","properties","columns","parseFlatGeobuf","arrayBuffer","options","byteLength","gis","format","parseFlatGeobufToBinary","parseFlatGeobufToGeoJSON","arr","Uint8Array","reproject","_targetCrs","headerMeta","features","crs","projection","from","wkt","to","e","coords","project","parseFlatGeobufInBatches","stream","parseFlatGeobufInBatchesToBinary","parseFlatGeobufInBatchesToGeoJSON","iterator","firstRecord"],"mappings":"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","sourcesContent":["// @ts-nocheck\nimport {Proj4Projection} from '@math.gl/proj4';\nimport {transformGeoJsonCoords} from '@loaders.gl/gis';\n\nimport {deserialize as deserializeGeoJson} from 'flatgeobuf/lib/cjs/geojson';\nimport {deserialize as deserializeGeneric} from 'flatgeobuf/lib/cjs/generic';\nimport {parseProperties as parsePropertiesBinary} from 'flatgeobuf/lib/cjs/generic/feature';\n\nimport {fromGeometry as binaryFromGeometry} from './binary-geometries';\n\n// TODO: reproject binary features\nfunction binaryFromFeature(feature, header) {\n  const geometry = feature.geometry();\n\n  // FlatGeobuf files can only hold a single geometry type per file, otherwise\n  // GeometryType is GeometryCollection\n  // I believe geometry.type() is null (0) except when the geometry type isn't\n  // known in the header?\n  const geometryType = header.geometryType || geometry.type();\n  const parsedGeometry = binaryFromGeometry(geometry, geometryType);\n  parsedGeometry.properties = parsePropertiesBinary(feature, header.columns);\n\n  // TODO: wrap binary data either in points, lines, or polygons key\n  return parsedGeometry;\n}\n\n/*\n * Parse FlatGeobuf arrayBuffer and return GeoJSON.\n *\n * @param arrayBuffer  A FlatGeobuf arrayBuffer\n * @return A GeoJSON geometry object\n */\nexport function parseFlatGeobuf(arrayBuffer, options) {\n  if (arrayBuffer.byteLength === 0) {\n    return [];\n  }\n\n  if (options && options.gis && options.gis.format === 'binary') {\n    return parseFlatGeobufToBinary(arrayBuffer, options);\n  }\n\n  return parseFlatGeobufToGeoJSON(arrayBuffer, options);\n}\n\nfunction parseFlatGeobufToBinary(arrayBuffer, options) {\n  // TODO: reproject binary features\n  // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const arr = new Uint8Array(arrayBuffer);\n  return deserializeGeneric(arr, binaryFromFeature);\n}\n\nfunction parseFlatGeobufToGeoJSON(arrayBuffer, options) {\n  const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const arr = new Uint8Array(arrayBuffer);\n\n  let headerMeta;\n  const {features} = deserializeGeoJson(arr, false, (header) => {\n    headerMeta = header;\n  });\n\n  const crs = headerMeta && headerMeta.crs;\n  let projection;\n  if (reproject && crs) {\n    // Constructing the projection may fail for some invalid WKT strings\n    try {\n      projection = new Proj4Projection({from: crs.wkt, to: _targetCrs});\n    } catch (e) {\n      // no op\n    }\n  }\n\n  if (projection) {\n    return transformGeoJsonCoords(features, (coords) => projection.project(coords));\n  }\n\n  return features;\n}\n\n/*\n * Parse FlatGeobuf arrayBuffer and return GeoJSON.\n *\n * @param {ReadableStream} _ A FlatGeobuf arrayBuffer\n * @return  A GeoJSON geometry object iterator\n */\n// eslint-disable-next-line complexity\nexport function parseFlatGeobufInBatches(stream, options) {\n  if (options && options.gis && options.gis.format === 'binary') {\n    return parseFlatGeobufInBatchesToBinary(stream, options);\n  }\n\n  return parseFlatGeobufInBatchesToGeoJSON(stream, options);\n}\n\nfunction parseFlatGeobufInBatchesToBinary(stream, options) {\n  // TODO: reproject binary streaming features\n  // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const iterator = deserializeGeneric(stream, binaryFromFeature);\n  return iterator;\n}\n\n// eslint-disable-next-line complexity\nasync function* parseFlatGeobufInBatchesToGeoJSON(stream, options) {\n  const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  let headerMeta;\n  const iterator = deserializeGeoJson(stream, false, (header) => {\n    headerMeta = header;\n  });\n\n  let projection;\n  let firstRecord = true;\n  for await (const feature of iterator) {\n    if (firstRecord) {\n      const crs = headerMeta && headerMeta.crs;\n      if (reproject && crs) {\n        projection = new Proj4Projection({from: crs.wkt, to: _targetCrs});\n      }\n\n      firstRecord = false;\n    }\n\n    if (reproject && projection) {\n      // eslint-disable-next-line\n      yield transformGeoJsonCoords([feature], (coords) => projection.project(coords));\n    } else {\n      yield feature;\n    }\n  }\n}\n"],"file":"parse-flatgeobuf.js"}
+{"version":3,"sources":["../../../src/lib/parse-flatgeobuf.ts"],"names":["Proj4Projection","transformGeoJsonCoords","deserialize","deserializeGeoJson","deserializeGeneric","parseProperties","parsePropertiesBinary","fromGeometry","binaryFromGeometry","binaryFromFeature","feature","header","geometry","geometryType","type","parsedGeometry","properties","columns","parseFlatGeobuf","arrayBuffer","options","shape","gis","format","flatgeobuf","table","data","parseFlatGeobufToGeoJSON","parseFlatGeobufToBinary","Error","array","Uint8Array","byteLength","reproject","_targetCrs","arr","headerMeta","features","crs","projection","from","wkt","to","e","coords","project","parseFlatGeobufInBatches","stream","parseFlatGeobufInBatchesToBinary","parseFlatGeobufInBatchesToGeoJSON","iterator","firstRecord"],"mappings":"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","sourcesContent":["// @ts-nocheck\nimport {Proj4Projection} from '@math.gl/proj4';\nimport {transformGeoJsonCoords} from '@loaders.gl/gis';\n\nimport {deserialize as deserializeGeoJson} from 'flatgeobuf/lib/cjs/geojson';\nimport {deserialize as deserializeGeneric} from 'flatgeobuf/lib/cjs/generic';\nimport {parseProperties as parsePropertiesBinary} from 'flatgeobuf/lib/cjs/generic/feature';\n\nimport {fromGeometry as binaryFromGeometry} from './binary-geometries';\nimport {FlatGeobufLoaderOptions} from './types';\nimport {GeoJSONRowTable, Feature} from '@loaders.gl/schema';\n\n// TODO: reproject binary features\nfunction binaryFromFeature(feature, header) {\n  const geometry = feature.geometry();\n\n  // FlatGeobuf files can only hold a single geometry type per file, otherwise\n  // GeometryType is GeometryCollection\n  // I believe geometry.type() is null (0) except when the geometry type isn't\n  // known in the header?\n  const geometryType = header.geometryType || geometry.type();\n  const parsedGeometry = binaryFromGeometry(geometry, geometryType);\n  parsedGeometry.properties = parsePropertiesBinary(feature, header.columns);\n\n  // TODO: wrap binary data either in points, lines, or polygons key\n  return parsedGeometry;\n}\n\n/*\n * Parse FlatGeobuf arrayBuffer and return GeoJSON.\n *\n * @param arrayBuffer  A FlatGeobuf arrayBuffer\n * @return A GeoJSON geometry object\n */\nexport function parseFlatGeobuf(arrayBuffer: ArrayBuffer, options?: FlatGeobufLoaderOptions) {\n  const shape = options?.gis?.format || options?.flatgeobuf?.shape;\n\n  switch (shape) {\n    case 'geojson-row-table': {\n      const table: GeoJSONRowTable = {\n        shape: 'geojson-row-table',\n        data: parseFlatGeobufToGeoJSON(arrayBuffer, options)\n      };\n      return table;\n    }\n    case 'columnar-table': // binary + some JS arrays\n      return {shape: 'columnar-table', data: parseFlatGeobufToBinary(arrayBuffer, options)};\n    case 'geojson':\n      return parseFlatGeobufToGeoJSON(arrayBuffer, options);\n    case 'binary':\n      return parseFlatGeobufToBinary(arrayBuffer, options);\n    default:\n      throw new Error(shape);\n  }\n}\n\nfunction parseFlatGeobufToBinary(arrayBuffer: ArrayBuffer, options: FlatGeobufLoaderOptions) {\n  // TODO: reproject binary features\n  // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const array = new Uint8Array(arrayBuffer);\n  return deserializeGeneric(array, binaryFromFeature);\n}\n\nfunction parseFlatGeobufToGeoJSON(\n  arrayBuffer: ArrayBuffer,\n  options: FlatGeobufLoaderOptions\n): Feature[] {\n  if (arrayBuffer.byteLength === 0) {\n    return [];\n  }\n\n  const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const arr = new Uint8Array(arrayBuffer);\n\n  let headerMeta;\n  const {features} = deserializeGeoJson(arr, false, (header) => {\n    headerMeta = header;\n  });\n\n  const crs = headerMeta && headerMeta.crs;\n  let projection;\n  if (reproject && crs) {\n    // Constructing the projection may fail for some invalid WKT strings\n    try {\n      projection = new Proj4Projection({from: crs.wkt, to: _targetCrs});\n    } catch (e) {\n      // no op\n    }\n  }\n\n  if (projection) {\n    return transformGeoJsonCoords(features, (coords) => projection.project(coords));\n  }\n\n  return features;\n}\n\n/*\n * Parse FlatGeobuf arrayBuffer and return GeoJSON.\n *\n * @param {ReadableStream} _ A FlatGeobuf arrayBuffer\n * @return  A GeoJSON geometry object iterator\n */\n// eslint-disable-next-line complexity\nexport function parseFlatGeobufInBatches(stream, options: FlatGeobufLoaderOptions) {\n  if (options && options.gis && options.gis.format === 'binary') {\n    return parseFlatGeobufInBatchesToBinary(stream, options);\n  }\n\n  return parseFlatGeobufInBatchesToGeoJSON(stream, options);\n}\n\nfunction parseFlatGeobufInBatchesToBinary(stream, options: FlatGeobufLoaderOptions) {\n  // TODO: reproject binary streaming features\n  // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  const iterator = deserializeGeneric(stream, binaryFromFeature);\n  return iterator;\n}\n\n// eslint-disable-next-line complexity\nasync function* parseFlatGeobufInBatchesToGeoJSON(stream, options: FlatGeobufLoaderOptions) {\n  const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};\n\n  let headerMeta;\n  const iterator = deserializeGeoJson(stream, false, (header) => {\n    headerMeta = header;\n  });\n\n  let projection;\n  let firstRecord = true;\n  for await (const feature of iterator) {\n    if (firstRecord) {\n      const crs = headerMeta && headerMeta.crs;\n      if (reproject && crs) {\n        projection = new Proj4Projection({from: crs.wkt, to: _targetCrs});\n      }\n\n      firstRecord = false;\n    }\n\n    if (reproject && projection) {\n      // eslint-disable-next-line\n      yield transformGeoJsonCoords([feature], (coords) => projection.project(coords));\n    } else {\n      yield feature;\n    }\n  }\n}\n"],"file":"parse-flatgeobuf.js"}

package/dist/esm/lib/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/esm/lib/types.js.map

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

package/dist/flatgeobuf-loader.d.ts

@@ -9,7 +9,9 @@ export declare const FlatGeobufLoader: {
     mimeTypes: string[];
     category: string;
     options: {
-        flatgeobuf: {};
+        flatgeobuf: {
+            shape: string;
+        };
     };
 };
 export declare const _typecheckFlatGeobufLoader: Loader;

package/dist/flatgeobuf-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flatgeobuf-loader.d.ts","sourceRoot":"","sources":["../src/flatgeobuf-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAMrD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;CAY5B,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,MAAyB,CAAC"}
+{"version":3,"file":"flatgeobuf-loader.d.ts","sourceRoot":"","sources":["../src/flatgeobuf-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAMrD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;CAe5B,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,MAAyB,CAAC"}

package/dist/flatgeobuf-loader.js

@@ -14,7 +14,10 @@ exports.FlatGeobufLoader = {
     mimeTypes: ['application/octet-stream'],
     category: 'geometry',
     options: {
-        flatgeobuf: {}
+        flatgeobuf: {
+            // Set to GeoJSON for backwards compatibility
+            shape: 'geojson'
+        }
     }
 };
 exports._typecheckFlatGeobufLoader = exports.FlatGeobufLoader;

package/dist/flatgeobuf-worker.js

@@ -3394,7 +3394,7 @@
   }
 
   // src/flatgeobuf-loader.ts
-  var VERSION = true ? "3.2.0-alpha.1" : "latest";
+  var VERSION = true ? "3.2.0-alpha.2" : "latest";
   var FlatGeobufLoader = {
     id: "flatgeobuf",
     name: "FlatGeobuf",
@@ -3405,7 +3405,9 @@
     mimeTypes: ["application/octet-stream"],
     category: "geometry",
     options: {
-      flatgeobuf: {}
+      flatgeobuf: {
+        shape: "geojson"
+      }
     }
   };
 
@@ -8879,19 +8881,33 @@
     return parsedGeometry;
   }
   function parseFlatGeobuf(arrayBuffer, options) {
-    if (arrayBuffer.byteLength === 0) {
-      return [];
-    }
-    if (options && options.gis && options.gis.format === "binary") {
-      return parseFlatGeobufToBinary(arrayBuffer, options);
+    const shape = options?.gis?.format || options?.flatgeobuf?.shape;
+    switch (shape) {
+      case "geojson-row-table": {
+        const table = {
+          shape: "geojson-row-table",
+          data: parseFlatGeobufToGeoJSON(arrayBuffer, options)
+        };
+        return table;
+      }
+      case "columnar-table":
+        return { shape: "columnar-table", data: parseFlatGeobufToBinary(arrayBuffer, options) };
+      case "geojson":
+        return parseFlatGeobufToGeoJSON(arrayBuffer, options);
+      case "binary":
+        return parseFlatGeobufToBinary(arrayBuffer, options);
+      default:
+        throw new Error(shape);
     }
-    return parseFlatGeobufToGeoJSON(arrayBuffer, options);
   }
   function parseFlatGeobufToBinary(arrayBuffer, options) {
-    const arr = new Uint8Array(arrayBuffer);
-    return (0, import_generic.deserialize)(arr, binaryFromFeature);
+    const array = new Uint8Array(arrayBuffer);
+    return (0, import_generic.deserialize)(array, binaryFromFeature);
   }
   function parseFlatGeobufToGeoJSON(arrayBuffer, options) {
+    if (arrayBuffer.byteLength === 0) {
+      return [];
+    }
     const { reproject = false, _targetCrs = "WGS84" } = options && options.gis || {};
     const arr = new Uint8Array(arrayBuffer);
     let headerMeta;

package/dist/index.d.ts

@@ -3,7 +3,10 @@ import { FlatGeobufLoader as FlatGeobufWorkerLoader } from './flatgeobuf-loader'
 import { parseFlatGeobuf, parseFlatGeobufInBatches } from './lib/parse-flatgeobuf';
 export { FlatGeobufWorkerLoader };
 export declare const FlatGeobufLoader: {
-    parse: (arrayBuffer: any, options: any) => Promise<any>;
+    parse: (arrayBuffer: any, options: any) => Promise<any[] | import("@loaders.gl/schema").GeoJSONRowTable | AsyncGenerator<import("flatgeobuf/lib/cjs/generic/feature").IFeature, any, unknown> | {
+        shape: string;
+        data: any[] | AsyncGenerator<import("flatgeobuf/lib/cjs/generic/feature").IFeature, any, unknown>;
+    }>;
     parseSync: typeof parseFlatGeobuf;
     parseInBatchesFromStream: typeof parseFlatGeobufInBatches;
     binary: boolean;
@@ -16,7 +19,9 @@ export declare const FlatGeobufLoader: {
     mimeTypes: string[];
     category: string;
     options: {
-        flatgeobuf: {};
+        flatgeobuf: {
+            shape: string;
+        };
     };
 };
 export declare const _typecheckFlatGeobufLoader: LoaderWithParser;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAC,gBAAgB,IAAI,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAC,eAAe,EAAE,wBAAwB,EAAC,MAAM,wBAAwB,CAAC;AAEjF,OAAO,EAAC,sBAAsB,EAAC,CAAC;AAEhC,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;CAM5B,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,gBAAmC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAC,gBAAgB,IAAI,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAC,eAAe,EAAE,wBAAwB,EAAC,MAAM,wBAAwB,CAAC;AAEjF,OAAO,EAAC,sBAAsB,EAAC,CAAC;AAEhC,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;CAM5B,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,gBAAmC,CAAC"}

package/dist/lib/parse-flatgeobuf.d.ts

@@ -1,3 +1,8 @@
-export declare function parseFlatGeobuf(arrayBuffer: any, options: any): any;
-export declare function parseFlatGeobufInBatches(stream: any, options: any): any[] | AsyncGenerator<import("flatgeobuf/lib/cjs/generic/feature").IFeature, any, unknown> | AsyncGenerator<any, void, unknown>;
+import { FlatGeobufLoaderOptions } from './types';
+import { GeoJSONRowTable } from '@loaders.gl/schema';
+export declare function parseFlatGeobuf(arrayBuffer: ArrayBuffer, options?: FlatGeobufLoaderOptions): any[] | GeoJSONRowTable | AsyncGenerator<import("flatgeobuf/lib/cjs/generic/feature").IFeature, any, unknown> | {
+    shape: string;
+    data: any[] | AsyncGenerator<import("flatgeobuf/lib/cjs/generic/feature").IFeature, any, unknown>;
+};
+export declare function parseFlatGeobufInBatches(stream: any, options: FlatGeobufLoaderOptions): any[] | AsyncGenerator<import("flatgeobuf/lib/cjs/generic/feature").IFeature, any, unknown> | AsyncGenerator<any, void, unknown>;
 //# sourceMappingURL=parse-flatgeobuf.d.ts.map

package/dist/lib/parse-flatgeobuf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-flatgeobuf.d.ts","sourceRoot":"","sources":["../../src/lib/parse-flatgeobuf.ts"],"names":[],"mappings":"AAgCA,wBAAgB,eAAe,CAAC,WAAW,KAAA,EAAE,OAAO,KAAA,OAUnD;AA6CD,wBAAgB,wBAAwB,CAAC,MAAM,KAAA,EAAE,OAAO,KAAA,oIAMvD"}
+{"version":3,"file":"parse-flatgeobuf.d.ts","sourceRoot":"","sources":["../../src/lib/parse-flatgeobuf.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,uBAAuB,EAAC,MAAM,SAAS,CAAC;AAChD,OAAO,EAAC,eAAe,EAAU,MAAM,oBAAoB,CAAC;AAwB5D,wBAAgB,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,uBAAuB;;;EAoB1F;AAoDD,wBAAgB,wBAAwB,CAAC,MAAM,KAAA,EAAE,OAAO,EAAE,uBAAuB,oIAMhF"}

package/dist/lib/parse-flatgeobuf.js

@@ -28,22 +28,36 @@ function binaryFromFeature(feature, header) {
  * @return A GeoJSON geometry object
  */
 function parseFlatGeobuf(arrayBuffer, options) {
-    if (arrayBuffer.byteLength === 0) {
-        return [];
-    }
-    if (options && options.gis && options.gis.format === 'binary') {
-        return parseFlatGeobufToBinary(arrayBuffer, options);
+    const shape = options?.gis?.format || options?.flatgeobuf?.shape;
+    switch (shape) {
+        case 'geojson-row-table': {
+            const table = {
+                shape: 'geojson-row-table',
+                data: parseFlatGeobufToGeoJSON(arrayBuffer, options)
+            };
+            return table;
+        }
+        case 'columnar-table': // binary + some JS arrays
+            return { shape: 'columnar-table', data: parseFlatGeobufToBinary(arrayBuffer, options) };
+        case 'geojson':
+            return parseFlatGeobufToGeoJSON(arrayBuffer, options);
+        case 'binary':
+            return parseFlatGeobufToBinary(arrayBuffer, options);
+        default:
+            throw new Error(shape);
     }
-    return parseFlatGeobufToGeoJSON(arrayBuffer, options);
 }
 exports.parseFlatGeobuf = parseFlatGeobuf;
 function parseFlatGeobufToBinary(arrayBuffer, options) {
     // TODO: reproject binary features
     // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};
-    const arr = new Uint8Array(arrayBuffer);
-    return (0, generic_1.deserialize)(arr, binaryFromFeature);
+    const array = new Uint8Array(arrayBuffer);
+    return (0, generic_1.deserialize)(array, binaryFromFeature);
 }
 function parseFlatGeobufToGeoJSON(arrayBuffer, options) {
+    if (arrayBuffer.byteLength === 0) {
+        return [];
+    }
     const { reproject = false, _targetCrs = 'WGS84' } = (options && options.gis) || {};
     const arr = new Uint8Array(arrayBuffer);
     let headerMeta;

package/dist/lib/types.d.ts

@@ -0,0 +1,13 @@
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
+export declare type FlatGeobufLoaderOptions = LoaderOptions & {
+    flatgeobuf?: {
+        shape?: 'geojson-row-table' | 'columnar-table' | 'geojson' | 'binary';
+    };
+    gis?: {
+        reproject?: boolean;
+        _targetCrs?: string;
+        /** @deprecated Use options.flatgeobuf.shape */
+        format?: 'geojson-row-table' | 'columnar-table' | 'geojson' | 'binary';
+    };
+};
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE5D,oBAAY,uBAAuB,GAAG,aAAa,GAAG;IACpD,UAAU,CAAC,EAAE;QACX,KAAK,CAAC,EAAE,mBAAmB,GAAG,gBAAgB,GAAG,SAAS,GAAG,QAAQ,CAAC;KACvE,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,+CAA+C;QAC/C,MAAM,CAAC,EAAE,mBAAmB,GAAG,gBAAgB,GAAG,SAAS,GAAG,QAAQ,CAAC;KACxE,CAAC;CACH,CAAC"}

package/dist/lib/types.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/flatgeobuf",
   "description": "Loader for FlatGeobuf",
-  "version": "3.2.0-alpha.1",
+  "version": "3.2.0-alpha.2",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -32,10 +32,10 @@
     "build-worker": "esbuild src/workers/flatgeobuf-worker.ts --bundle --outfile=dist/flatgeobuf-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.0.0-alpha.1",
-    "@loaders.gl/loader-utils": "3.2.0-alpha.1",
+    "@loaders.gl/gis": "3.2.0-alpha.2",
+    "@loaders.gl/loader-utils": "3.2.0-alpha.2",
     "@math.gl/proj4": "^3.3.1",
     "flatgeobuf": "3.6.5"
   },
-  "gitHead": "423a2815092b08dcf93ad5b7dc2940b167305afe"
+  "gitHead": "52a602739cbfce60fc314f474efc984d199dff78"
 }

package/src/flatgeobuf-loader.ts

@@ -14,7 +14,10 @@ export const FlatGeobufLoader = {
   mimeTypes: ['application/octet-stream'],
   category: 'geometry',
   options: {
-    flatgeobuf: {}
+    flatgeobuf: {
+      // Set to GeoJSON for backwards compatibility
+      shape: 'geojson'
+    }
   }
 };
 

package/src/lib/parse-flatgeobuf.ts

@@ -7,6 +7,8 @@ import {deserialize as deserializeGeneric} from 'flatgeobuf/lib/cjs/generic';
 import {parseProperties as parsePropertiesBinary} from 'flatgeobuf/lib/cjs/generic/feature';
 
 import {fromGeometry as binaryFromGeometry} from './binary-geometries';
+import {FlatGeobufLoaderOptions} from './types';
+import {GeoJSONRowTable, Feature} from '@loaders.gl/schema';
 
 // TODO: reproject binary features
 function binaryFromFeature(feature, header) {
@@ -30,27 +32,44 @@ function binaryFromFeature(feature, header) {
  * @param arrayBuffer  A FlatGeobuf arrayBuffer
  * @return A GeoJSON geometry object
  */
-export function parseFlatGeobuf(arrayBuffer, options) {
-  if (arrayBuffer.byteLength === 0) {
-    return [];
-  }
-
-  if (options && options.gis && options.gis.format === 'binary') {
-    return parseFlatGeobufToBinary(arrayBuffer, options);
+export function parseFlatGeobuf(arrayBuffer: ArrayBuffer, options?: FlatGeobufLoaderOptions) {
+  const shape = options?.gis?.format || options?.flatgeobuf?.shape;
+
+  switch (shape) {
+    case 'geojson-row-table': {
+      const table: GeoJSONRowTable = {
+        shape: 'geojson-row-table',
+        data: parseFlatGeobufToGeoJSON(arrayBuffer, options)
+      };
+      return table;
+    }
+    case 'columnar-table': // binary + some JS arrays
+      return {shape: 'columnar-table', data: parseFlatGeobufToBinary(arrayBuffer, options)};
+    case 'geojson':
+      return parseFlatGeobufToGeoJSON(arrayBuffer, options);
+    case 'binary':
+      return parseFlatGeobufToBinary(arrayBuffer, options);
+    default:
+      throw new Error(shape);
   }
-
-  return parseFlatGeobufToGeoJSON(arrayBuffer, options);
 }
 
-function parseFlatGeobufToBinary(arrayBuffer, options) {
+function parseFlatGeobufToBinary(arrayBuffer: ArrayBuffer, options: FlatGeobufLoaderOptions) {
   // TODO: reproject binary features
   // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};
 
-  const arr = new Uint8Array(arrayBuffer);
-  return deserializeGeneric(arr, binaryFromFeature);
+  const array = new Uint8Array(arrayBuffer);
+  return deserializeGeneric(array, binaryFromFeature);
 }
 
-function parseFlatGeobufToGeoJSON(arrayBuffer, options) {
+function parseFlatGeobufToGeoJSON(
+  arrayBuffer: ArrayBuffer,
+  options: FlatGeobufLoaderOptions
+): Feature[] {
+  if (arrayBuffer.byteLength === 0) {
+    return [];
+  }
+
   const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};
 
   const arr = new Uint8Array(arrayBuffer);
@@ -85,7 +104,7 @@ function parseFlatGeobufToGeoJSON(arrayBuffer, options) {
  * @return  A GeoJSON geometry object iterator
  */
 // eslint-disable-next-line complexity
-export function parseFlatGeobufInBatches(stream, options) {
+export function parseFlatGeobufInBatches(stream, options: FlatGeobufLoaderOptions) {
   if (options && options.gis && options.gis.format === 'binary') {
     return parseFlatGeobufInBatchesToBinary(stream, options);
   }
@@ -93,7 +112,7 @@ export function parseFlatGeobufInBatches(stream, options) {
   return parseFlatGeobufInBatchesToGeoJSON(stream, options);
 }
 
-function parseFlatGeobufInBatchesToBinary(stream, options) {
+function parseFlatGeobufInBatchesToBinary(stream, options: FlatGeobufLoaderOptions) {
   // TODO: reproject binary streaming features
   // const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};
 
@@ -102,7 +121,7 @@ function parseFlatGeobufInBatchesToBinary(stream, options) {
 }
 
 // eslint-disable-next-line complexity
-async function* parseFlatGeobufInBatchesToGeoJSON(stream, options) {
+async function* parseFlatGeobufInBatchesToGeoJSON(stream, options: FlatGeobufLoaderOptions) {
   const {reproject = false, _targetCrs = 'WGS84'} = (options && options.gis) || {};
 
   let headerMeta;

package/src/lib/types.ts

@@ -0,0 +1,13 @@
+import type {LoaderOptions} from '@loaders.gl/loader-utils';
+
+export type FlatGeobufLoaderOptions = LoaderOptions & {
+  flatgeobuf?: {
+    shape?: 'geojson-row-table' | 'columnar-table' | 'geojson' | 'binary';
+  };
+  gis?: {
+    reproject?: boolean;
+    _targetCrs?: string;
+    /** @deprecated Use options.flatgeobuf.shape */
+    format?: 'geojson-row-table' | 'columnar-table' | 'geojson' | 'binary';
+  };
+};