@loaders.gl/shapefile 4.0.4 → 4.1.0-alpha.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  import { parseDBF, parseDBFInBatches } from "./lib/parsers/parse-dbf.js";
2
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
2
+ const VERSION = typeof "4.1.0-alpha.10" !== 'undefined' ? "4.1.0-alpha.10" : 'latest';
3
3
  export const DBFWorkerLoader = {
4
4
  name: 'DBF',
5
5
  id: 'dbf',
@@ -1 +1 @@
1
- {"version":3,"file":"dbf-loader.js","names":["parseDBF","parseDBFInBatches","VERSION","__VERSION__","DBFWorkerLoader","name","id","module","version","worker","category","extensions","mimeTypes","options","dbf","encoding","DBFLoader","parse","arrayBuffer","parseSync","parseInBatches","arrayBufferIterator"],"sources":["../src/dbf-loader.ts"],"sourcesContent":["import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parseDBF, parseDBFInBatches} from './lib/parsers/parse-dbf';\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\n/**\n * DBFLoader - DBF files are used to contain non-geometry columns in Shapefiles\n */\nexport const DBFWorkerLoader: Loader = {\n name: 'DBF',\n id: 'dbf',\n module: 'shapefile',\n version: VERSION,\n worker: true,\n category: 'table',\n extensions: ['dbf'],\n mimeTypes: ['application/x-dbf'],\n options: {\n dbf: {\n encoding: 'latin1'\n }\n }\n};\n\n/** DBF file loader */\nexport const DBFLoader: LoaderWithParser = {\n ...DBFWorkerLoader,\n parse: async (arrayBuffer, options) => parseDBF(arrayBuffer, options),\n parseSync: parseDBF,\n parseInBatches(arrayBufferIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>, options) {\n return parseDBFInBatches(arrayBufferIterator, options);\n }\n};\n"],"mappings":"SACQA,QAAQ,EAAEC,iBAAiB;AAInC,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAK3E,OAAO,MAAMC,eAAuB,GAAG;EACrCC,IAAI,EAAE,KAAK;EACXC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,WAAW;EACnBC,OAAO,EAAEN,OAAO;EAChBO,MAAM,EAAE,IAAI;EACZC,QAAQ,EAAE,OAAO;EACjBC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,mBAAmB,CAAC;EAChCC,OAAO,EAAE;IACPC,GAAG,EAAE;MACHC,QAAQ,EAAE;IACZ;EACF;AACF,CAAC;AAGD,OAAO,MAAMC,SAA2B,GAAG;EACzC,GAAGZ,eAAe;EAClBa,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEL,OAAO,KAAKb,QAAQ,CAACkB,WAAW,EAAEL,OAAO,CAAC;EACrEM,SAAS,EAAEnB,QAAQ;EACnBoB,cAAcA,CAACC,mBAAuE,EAAER,OAAO,EAAE;IAC/F,OAAOZ,iBAAiB,CAACoB,mBAAmB,EAAER,OAAO,CAAC;EACxD;AACF,CAAC"}
1
+ {"version":3,"file":"dbf-loader.js","names":["parseDBF","parseDBFInBatches","VERSION","DBFWorkerLoader","name","id","module","version","worker","category","extensions","mimeTypes","options","dbf","encoding","DBFLoader","parse","arrayBuffer","parseSync","parseInBatches","arrayBufferIterator"],"sources":["../src/dbf-loader.ts"],"sourcesContent":["import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parseDBF, parseDBFInBatches} from './lib/parsers/parse-dbf';\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\n/**\n * DBFLoader - DBF files are used to contain non-geometry columns in Shapefiles\n */\nexport const DBFWorkerLoader: Loader = {\n name: 'DBF',\n id: 'dbf',\n module: 'shapefile',\n version: VERSION,\n worker: true,\n category: 'table',\n extensions: ['dbf'],\n mimeTypes: ['application/x-dbf'],\n options: {\n dbf: {\n encoding: 'latin1'\n }\n }\n};\n\n/** DBF file loader */\nexport const DBFLoader: LoaderWithParser = {\n ...DBFWorkerLoader,\n parse: async (arrayBuffer, options) => parseDBF(arrayBuffer, options),\n parseSync: parseDBF,\n parseInBatches(arrayBufferIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>, options) {\n return parseDBFInBatches(arrayBufferIterator, options);\n }\n};\n"],"mappings":"SACQA,QAAQ,EAAEC,iBAAiB;AAInC,MAAMC,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAK3E,OAAO,MAAMC,eAAuB,GAAG;EACrCC,IAAI,EAAE,KAAK;EACXC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,WAAW;EACnBC,OAAO,EAAEL,OAAO;EAChBM,MAAM,EAAE,IAAI;EACZC,QAAQ,EAAE,OAAO;EACjBC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,mBAAmB,CAAC;EAChCC,OAAO,EAAE;IACPC,GAAG,EAAE;MACHC,QAAQ,EAAE;IACZ;EACF;AACF,CAAC;AAGD,OAAO,MAAMC,SAA2B,GAAG;EACzC,GAAGZ,eAAe;EAClBa,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEL,OAAO,KAAKZ,QAAQ,CAACiB,WAAW,EAAEL,OAAO,CAAC;EACrEM,SAAS,EAAElB,QAAQ;EACnBmB,cAAcA,CAACC,mBAAuE,EAAER,OAAO,EAAE;IAC/F,OAAOX,iBAAiB,CAACmB,mBAAmB,EAAER,OAAO,CAAC;EACxD;AACF,CAAC"}
@@ -372,7 +372,7 @@
372
372
  }
373
373
 
374
374
  // src/dbf-loader.ts
375
- var VERSION = true ? "4.0.4" : "latest";
375
+ var VERSION = true ? "4.1.0-alpha.10" : "latest";
376
376
  var DBFWorkerLoader = {
377
377
  name: "DBF",
378
378
  id: "dbf",
package/dist/dist.dev.js CHANGED
@@ -492,7 +492,7 @@ var __exports__ = (() => {
492
492
  }
493
493
 
494
494
  // src/shp-loader.ts
495
- var VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
495
+ var VERSION = true ? "4.1.0-alpha.10" : "latest";
496
496
  var SHP_MAGIC_NUMBER2 = [0, 0, 39, 10];
497
497
  var SHPWorkerLoader = {
498
498
  name: "SHP",
@@ -6399,7 +6399,7 @@ var __exports__ = (() => {
6399
6399
  }
6400
6400
 
6401
6401
  // src/dbf-loader.ts
6402
- var VERSION2 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
6402
+ var VERSION2 = true ? "4.1.0-alpha.10" : "latest";
6403
6403
  var DBFWorkerLoader = {
6404
6404
  name: "DBF",
6405
6405
  id: "dbf",
@@ -6502,26 +6502,44 @@ var __exports__ = (() => {
6502
6502
  geometries
6503
6503
  } = await parseFromContext(arrayBuffer, SHPLoader, options, context);
6504
6504
  const geojsonGeometries = parseGeometries(geometries);
6505
- let properties = [];
6505
+ let propertyTable;
6506
6506
  const dbfResponse = await context?.fetch(replaceExtension(context?.url, "dbf"));
6507
6507
  if (dbfResponse?.ok) {
6508
- properties = await parseFromContext(dbfResponse, DBFLoader, {
6508
+ propertyTable = await parseFromContext(dbfResponse, DBFLoader, {
6509
6509
  dbf: {
6510
+ shape: "object-row-table",
6510
6511
  encoding: cpg || "latin1"
6511
6512
  }
6512
6513
  }, context);
6513
6514
  }
6514
- let features = joinProperties(geojsonGeometries, properties);
6515
+ let features = joinProperties(geojsonGeometries, propertyTable?.data || []);
6515
6516
  if (reproject) {
6516
6517
  features = reprojectFeatures(features, prj, _targetCrs);
6517
6518
  }
6518
- return {
6519
- encoding: cpg,
6520
- prj,
6521
- shx,
6522
- header,
6523
- data: features
6524
- };
6519
+ switch (options?.shapefile?.shape) {
6520
+ case "geojson-table":
6521
+ return {
6522
+ shape: "geojson-table",
6523
+ type: "FeatureCollection",
6524
+ encoding: cpg,
6525
+ schema: propertyTable?.schema || {
6526
+ metadata: {},
6527
+ fields: []
6528
+ },
6529
+ prj,
6530
+ shx,
6531
+ header,
6532
+ features
6533
+ };
6534
+ default:
6535
+ return {
6536
+ encoding: cpg,
6537
+ prj,
6538
+ shx,
6539
+ header,
6540
+ data: features
6541
+ };
6542
+ }
6525
6543
  }
6526
6544
  function parseGeometries(geometries) {
6527
6545
  const geojsonGeometries = [];
@@ -6609,7 +6627,7 @@ var __exports__ = (() => {
6609
6627
  }
6610
6628
 
6611
6629
  // src/shapefile-loader.ts
6612
- var VERSION3 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
6630
+ var VERSION3 = true ? "4.1.0-alpha.10" : "latest";
6613
6631
  var ShapefileLoader = {
6614
6632
  name: "Shapefile",
6615
6633
  id: "shapefile",
@@ -6620,7 +6638,9 @@ var __exports__ = (() => {
6620
6638
  mimeTypes: ["application/octet-stream"],
6621
6639
  tests: [new Uint8Array(SHP_MAGIC_NUMBER2).buffer],
6622
6640
  options: {
6623
- shapefile: {},
6641
+ shapefile: {
6642
+ shape: "v3"
6643
+ },
6624
6644
  shp: {
6625
6645
  _maxDimensions: 4
6626
6646
  }
package/dist/index.cjs CHANGED
@@ -932,31 +932,47 @@ async function* parseShapefileInBatches(asyncIterator, options, context) {
932
932
  }
933
933
  }
934
934
  async function parseShapefile(arrayBuffer, options, context) {
935
+ var _a;
935
936
  const { reproject = false, _targetCrs = "WGS84" } = (options == null ? void 0 : options.gis) || {};
936
937
  const { shx, cpg, prj } = await loadShapefileSidecarFiles(options, context);
937
938
  const { header, geometries } = await (0, import_loader_utils.parseFromContext)(arrayBuffer, SHPLoader, options, context);
938
939
  const geojsonGeometries = parseGeometries(geometries);
939
- let properties = [];
940
+ let propertyTable;
940
941
  const dbfResponse = await (context == null ? void 0 : context.fetch(replaceExtension(context == null ? void 0 : context.url, "dbf")));
941
942
  if (dbfResponse == null ? void 0 : dbfResponse.ok) {
942
- properties = await (0, import_loader_utils.parseFromContext)(
943
+ propertyTable = await (0, import_loader_utils.parseFromContext)(
943
944
  dbfResponse,
944
945
  DBFLoader,
945
- { dbf: { encoding: cpg || "latin1" } },
946
+ { dbf: { shape: "object-row-table", encoding: cpg || "latin1" } },
946
947
  context
947
948
  );
948
949
  }
949
- let features = joinProperties(geojsonGeometries, properties);
950
+ let features = joinProperties(geojsonGeometries, (propertyTable == null ? void 0 : propertyTable.data) || []);
950
951
  if (reproject) {
951
952
  features = reprojectFeatures(features, prj, _targetCrs);
952
953
  }
953
- return {
954
- encoding: cpg,
955
- prj,
956
- shx,
957
- header,
958
- data: features
959
- };
954
+ switch ((_a = options == null ? void 0 : options.shapefile) == null ? void 0 : _a.shape) {
955
+ case "geojson-table":
956
+ return {
957
+ // @ts-expect-error
958
+ shape: "geojson-table",
959
+ type: "FeatureCollection",
960
+ encoding: cpg,
961
+ schema: (propertyTable == null ? void 0 : propertyTable.schema) || { metadata: {}, fields: [] },
962
+ prj,
963
+ shx,
964
+ header,
965
+ features
966
+ };
967
+ default:
968
+ return {
969
+ encoding: cpg,
970
+ prj,
971
+ shx,
972
+ header,
973
+ data: features
974
+ };
975
+ }
960
976
  }
961
977
  function parseGeometries(geometries) {
962
978
  const geojsonGeometries = [];
@@ -1050,12 +1066,16 @@ var ShapefileLoader = {
1050
1066
  mimeTypes: ["application/octet-stream"],
1051
1067
  tests: [new Uint8Array(SHP_MAGIC_NUMBER2).buffer],
1052
1068
  options: {
1053
- shapefile: {},
1069
+ shapefile: {
1070
+ shape: "v3"
1071
+ },
1054
1072
  shp: {
1055
1073
  _maxDimensions: 4
1056
1074
  }
1057
1075
  },
1076
+ // @ts-expect-error
1058
1077
  parse: parseShapefile,
1078
+ // @ts-expect-error
1059
1079
  parseInBatches: parseShapefileInBatches
1060
1080
  };
1061
1081
 
@@ -1 +1 @@
1
- {"version":3,"file":"parse-shapefile.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-shapefile.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAA8C,MAAM,0BAA0B,CAAC;AAKpG,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,SAAS,CAAC;AAOpD,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AACD;;GAEG;AAEH,wBAAuB,uBAAuB,CAC5C,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,aAAa,CAAC,eAAe,CAAC,CAkFhC;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,eAAe,CAAC,CAkC1B;AAwDD;;;;;GAKG;AAEH,wBAAsB,yBAAyB,CAC7C,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC;IACT,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC,CAkCD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ1E"}
1
+ {"version":3,"file":"parse-shapefile.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-shapefile.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAA8C,MAAM,0BAA0B,CAAC;AAUpG,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,SAAS,CAAC;AAOpD,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AACD;;GAEG;AAEH,wBAAuB,uBAAuB,CAC5C,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,aAAa,CAAC,eAAe,CAAC,CAkFhC;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,eAAe,CAAC,CAiD1B;AAwDD;;;;;GAKG;AAEH,wBAAsB,yBAAyB,CAC7C,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC;IACT,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC,CAkCD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ1E"}
@@ -70,6 +70,7 @@ export async function* parseShapefileInBatches(asyncIterator, options, context)
70
70
  }
71
71
  }
72
72
  export async function parseShapefile(arrayBuffer, options, context) {
73
+ var _propertyTable, _options$shapefile, _propertyTable2;
73
74
  const {
74
75
  reproject = false,
75
76
  _targetCrs = 'WGS84'
@@ -84,26 +85,44 @@ export async function parseShapefile(arrayBuffer, options, context) {
84
85
  geometries
85
86
  } = await parseFromContext(arrayBuffer, SHPLoader, options, context);
86
87
  const geojsonGeometries = parseGeometries(geometries);
87
- let properties = [];
88
+ let propertyTable;
88
89
  const dbfResponse = await (context === null || context === void 0 ? void 0 : context.fetch(replaceExtension(context === null || context === void 0 ? void 0 : context.url, 'dbf')));
89
90
  if (dbfResponse !== null && dbfResponse !== void 0 && dbfResponse.ok) {
90
- properties = await parseFromContext(dbfResponse, DBFLoader, {
91
+ propertyTable = await parseFromContext(dbfResponse, DBFLoader, {
91
92
  dbf: {
93
+ shape: 'object-row-table',
92
94
  encoding: cpg || 'latin1'
93
95
  }
94
96
  }, context);
95
97
  }
96
- let features = joinProperties(geojsonGeometries, properties);
98
+ let features = joinProperties(geojsonGeometries, ((_propertyTable = propertyTable) === null || _propertyTable === void 0 ? void 0 : _propertyTable.data) || []);
97
99
  if (reproject) {
98
100
  features = reprojectFeatures(features, prj, _targetCrs);
99
101
  }
100
- return {
101
- encoding: cpg,
102
- prj,
103
- shx,
104
- header,
105
- data: features
106
- };
102
+ switch (options === null || options === void 0 ? void 0 : (_options$shapefile = options.shapefile) === null || _options$shapefile === void 0 ? void 0 : _options$shapefile.shape) {
103
+ case 'geojson-table':
104
+ return {
105
+ shape: 'geojson-table',
106
+ type: 'FeatureCollection',
107
+ encoding: cpg,
108
+ schema: ((_propertyTable2 = propertyTable) === null || _propertyTable2 === void 0 ? void 0 : _propertyTable2.schema) || {
109
+ metadata: {},
110
+ fields: []
111
+ },
112
+ prj,
113
+ shx,
114
+ header,
115
+ features
116
+ };
117
+ default:
118
+ return {
119
+ encoding: cpg,
120
+ prj,
121
+ shx,
122
+ header,
123
+ data: features
124
+ };
125
+ }
107
126
  }
108
127
  function parseGeometries(geometries) {
109
128
  const geojsonGeometries = [];
@@ -1 +1 @@
1
- {"version":3,"file":"parse-shapefile.js","names":["parseInBatchesFromContext","parseFromContext","binaryToGeometry","transformGeoJsonCoords","Proj4Projection","parseShx","zipBatchIterators","SHPLoader","DBFLoader","parseShapefileInBatches","asyncIterator","options","context","_shapeIterable$Symbol","_shapeIterable$Symbol2","reproject","_targetCrs","gis","shx","cpg","prj","loadShapefileSidecarFiles","shapeIterable","shapeIterator","Symbol","call","iterator","propertyIterator","dbfResponse","fetch","replaceExtension","url","ok","_propertyIterable$Sym","propertyIterable","dbf","encoding","shapeHeader","next","value","batchType","dbfHeader","zippedIterator","zippedBatchIterable","batch","geometries","properties","data","geojsonGeometries","parseGeometries","features","joinProperties","reprojectFeatures","header","parseShapefile","arrayBuffer","geom","push","i","length","geometry","feature","type","sourceCrs","targetCrs","projection","from","to","coord","project","shxPromise","cpgPromise","prjPromise","Promise","all","shxResponse","cpgResponse","text","prjResponse","newExtension","baseName","basename","extension","extname","isUpperCase","toUpperCase","extIndex","lastIndexOf","substr"],"sources":["../../../src/lib/parsers/parse-shapefile.ts"],"sourcesContent":["// import type {Feature} from '@loaders.gl/gis';\nimport {LoaderContext, parseInBatchesFromContext, parseFromContext} from '@loaders.gl/loader-utils';\nimport {binaryToGeometry, transformGeoJsonCoords} from '@loaders.gl/gis';\nimport type {BinaryGeometry, Geometry, ObjectRowTableBatch} from '@loaders.gl/schema';\nimport {Proj4Projection} from '@math.gl/proj4';\n\nimport type {SHXOutput} from './parse-shx';\nimport type {SHPHeader} from './parse-shp-header';\nimport type {ShapefileLoaderOptions} from './types';\nimport {parseShx} from './parse-shx';\nimport {zipBatchIterators} from '../streaming/zip-batch-iterators';\nimport {SHPLoader} from '../../shp-loader';\nimport {DBFLoader} from '../../dbf-loader';\n\ntype Feature = any;\ninterface ShapefileOutput {\n encoding?: string;\n prj?: string;\n shx?: SHXOutput;\n header: SHPHeader;\n data: object[];\n}\n/**\n * Parsing of file in batches\n */\n// eslint-disable-next-line max-statements, complexity\nexport async function* parseShapefileInBatches(\n asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,\n options?: ShapefileLoaderOptions,\n context?: LoaderContext\n): AsyncIterable<ShapefileOutput> {\n const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};\n const {shx, cpg, prj} = await loadShapefileSidecarFiles(options, context);\n\n // parse geometries\n const shapeIterable = await parseInBatchesFromContext(\n asyncIterator,\n SHPLoader,\n options,\n context!\n );\n\n const shapeIterator: AsyncIterator<any> =\n shapeIterable[Symbol.asyncIterator]?.() || shapeIterable[Symbol.iterator]?.();\n\n // parse properties\n let propertyIterator: AsyncIterator<any> | null = null;\n const dbfResponse = await context?.fetch(replaceExtension(context?.url || '', 'dbf'));\n if (dbfResponse?.ok) {\n const propertyIterable = await parseInBatchesFromContext(\n dbfResponse,\n DBFLoader,\n {\n ...options,\n dbf: {encoding: cpg || 'latin1'}\n },\n context!\n );\n propertyIterator =\n propertyIterable[Symbol.asyncIterator]?.() || propertyIterable[Symbol.iterator]();\n }\n\n // When `options.metadata` is `true`, there's an extra initial `metadata`\n // object before the iterator starts. zipBatchIterators expects to receive\n // batches of Array objects, and will fail with non-iterable batches, so it's\n // important to skip over the first batch.\n let shapeHeader = (await shapeIterator.next()).value;\n if (shapeHeader && shapeHeader.batchType === 'metadata') {\n shapeHeader = (await shapeIterator.next()).value;\n }\n\n let dbfHeader: {batchType?: string} = {};\n if (propertyIterator) {\n dbfHeader = (await propertyIterator.next()).value;\n if (dbfHeader && dbfHeader.batchType === 'metadata') {\n dbfHeader = (await propertyIterator.next()).value;\n }\n }\n\n const zippedIterator: AsyncIterator<ObjectRowTableBatch> = propertyIterator\n ? zipBatchIterators(shapeIterator, propertyIterator, 'object-row-table')\n : shapeIterator;\n\n const zippedBatchIterable: AsyncIterable<ObjectRowTableBatch> = {\n [Symbol.asyncIterator]() {\n return zippedIterator;\n }\n };\n\n for await (const batch of zippedBatchIterable) {\n let geometries: any;\n let properties: any;\n if (!propertyIterator) {\n geometries = batch;\n } else {\n [geometries, properties] = batch.data;\n }\n\n const geojsonGeometries = parseGeometries(geometries);\n let features = joinProperties(geojsonGeometries, properties);\n if (reproject) {\n // @ts-ignore\n features = reprojectFeatures(features, prj, _targetCrs);\n }\n yield {\n encoding: cpg,\n prj,\n shx,\n header: shapeHeader,\n data: features\n };\n }\n}\n\n/**\n * Parse shapefile\n *\n * @param arrayBuffer\n * @param options\n * @param context\n * @returns output of shapefile\n */\nexport async function parseShapefile(\n arrayBuffer: ArrayBuffer,\n options?: ShapefileLoaderOptions,\n context?: LoaderContext\n): Promise<ShapefileOutput> {\n const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};\n const {shx, cpg, prj} = await loadShapefileSidecarFiles(options, context);\n\n // parse geometries\n const {header, geometries} = await parseFromContext(arrayBuffer, SHPLoader, options, context!); // {shp: shx}\n\n const geojsonGeometries = parseGeometries(geometries);\n\n // parse properties\n let properties = [];\n\n const dbfResponse = await context?.fetch(replaceExtension(context?.url!, 'dbf'));\n if (dbfResponse?.ok) {\n properties = await parseFromContext(\n dbfResponse as any,\n DBFLoader,\n {dbf: {encoding: cpg || 'latin1'}},\n context!\n );\n }\n\n let features = joinProperties(geojsonGeometries, properties);\n if (reproject) {\n features = reprojectFeatures(features, prj, _targetCrs);\n }\n\n return {\n encoding: cpg,\n prj,\n shx,\n header,\n data: features\n };\n}\n\n/**\n * Parse geometries\n *\n * @param geometries\n * @returns geometries as an array\n */\nfunction parseGeometries(geometries: BinaryGeometry[]): Geometry[] {\n const geojsonGeometries: any[] = [];\n for (const geom of geometries) {\n geojsonGeometries.push(binaryToGeometry(geom));\n }\n return geojsonGeometries;\n}\n\n/**\n * Join properties and geometries into features\n *\n * @param geometries [description]\n * @param properties [description]\n * @return [description]\n */\nfunction joinProperties(geometries: Geometry[], properties: object[]): Feature[] {\n const features: Feature[] = [];\n for (let i = 0; i < geometries.length; i++) {\n const geometry = geometries[i];\n const feature: Feature = {\n type: 'Feature',\n geometry,\n // properties can be undefined if dbfResponse above was empty\n properties: (properties && properties[i]) || {}\n };\n features.push(feature);\n }\n\n return features;\n}\n\n/**\n * Reproject GeoJSON features to output CRS\n *\n * @param features parsed GeoJSON features\n * @param sourceCrs source coordinate reference system\n * @param targetCrs †arget coordinate reference system\n * @return Reprojected Features\n */\nfunction reprojectFeatures(features: Feature[], sourceCrs?: string, targetCrs?: string): Feature[] {\n if (!sourceCrs && !targetCrs) {\n return features;\n }\n\n const projection = new Proj4Projection({from: sourceCrs || 'WGS84', to: targetCrs || 'WGS84'});\n return transformGeoJsonCoords(features, (coord) => projection.project(coord));\n}\n\n/**\n *\n * @param options\n * @param context\n * @returns Promise\n */\n// eslint-disable-next-line max-statements\nexport async function loadShapefileSidecarFiles(\n options?: ShapefileLoaderOptions,\n context?: LoaderContext\n): Promise<{\n shx?: SHXOutput;\n cpg?: string;\n prj?: string;\n}> {\n // Attempt a parallel load of the small sidecar files\n // @ts-ignore context must be defined\n const {url, fetch} = context;\n const shxPromise = fetch(replaceExtension(url, 'shx'));\n const cpgPromise = fetch(replaceExtension(url, 'cpg'));\n const prjPromise = fetch(replaceExtension(url, 'prj'));\n await Promise.all([shxPromise, cpgPromise, prjPromise]);\n\n let shx: SHXOutput | undefined;\n let cpg: string | undefined;\n let prj: string | undefined;\n\n const shxResponse = await shxPromise;\n if (shxResponse.ok) {\n const arrayBuffer = await shxResponse.arrayBuffer();\n shx = parseShx(arrayBuffer);\n }\n\n const cpgResponse = await cpgPromise;\n if (cpgResponse.ok) {\n cpg = await cpgResponse.text();\n }\n\n const prjResponse = await prjPromise;\n if (prjResponse.ok) {\n prj = await prjResponse.text();\n }\n\n return {\n shx,\n cpg,\n prj\n };\n}\n\n/**\n * Replace the extension at the end of a path.\n *\n * Matches the case of new extension with the case of the original file extension,\n * to increase the chance of finding files without firing off a request storm looking for various case combinations\n *\n * NOTE: Extensions can be both lower and uppercase\n * per spec, extensions should be lower case, but that doesn't mean they always are. See:\n * calvinmetcalf/shapefile-js#64, mapserver/mapserver#4712\n * https://trac.osgeo.org/mapserver/ticket/166\n */\nexport function replaceExtension(url: string, newExtension: string): string {\n const baseName = basename(url);\n const extension = extname(url);\n const isUpperCase = extension === extension.toUpperCase();\n if (isUpperCase) {\n newExtension = newExtension.toUpperCase();\n }\n return `${baseName}.${newExtension}`;\n}\n\n// NOTE - this gives the entire path minus extension (i.e. NOT same as path.basename)\n/**\n * @param url\n * @returns string\n */\nfunction basename(url: string): string {\n const extIndex = url && url.lastIndexOf('.');\n if (typeof extIndex === 'number') {\n return extIndex >= 0 ? url.substr(0, extIndex) : '';\n }\n return extIndex;\n}\n/**\n * @param url\n * @returns string\n */\nfunction extname(url: string): string {\n const extIndex = url && url.lastIndexOf('.');\n if (typeof extIndex === 'number') {\n return extIndex >= 0 ? url.substr(extIndex + 1) : '';\n }\n return extIndex;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"parse-shapefile.js","names":["parseInBatchesFromContext","parseFromContext","binaryToGeometry","transformGeoJsonCoords","Proj4Projection","parseShx","zipBatchIterators","SHPLoader","DBFLoader","parseShapefileInBatches","asyncIterator","options","context","_shapeIterable$Symbol","_shapeIterable$Symbol2","reproject","_targetCrs","gis","shx","cpg","prj","loadShapefileSidecarFiles","shapeIterable","shapeIterator","Symbol","call","iterator","propertyIterator","dbfResponse","fetch","replaceExtension","url","ok","_propertyIterable$Sym","propertyIterable","dbf","encoding","shapeHeader","next","value","batchType","dbfHeader","zippedIterator","zippedBatchIterable","batch","geometries","properties","data","geojsonGeometries","parseGeometries","features","joinProperties","reprojectFeatures","header","parseShapefile","arrayBuffer","_propertyTable","_options$shapefile","_propertyTable2","propertyTable","shape","shapefile","type","schema","metadata","fields","geom","push","i","length","geometry","feature","sourceCrs","targetCrs","projection","from","to","coord","project","shxPromise","cpgPromise","prjPromise","Promise","all","shxResponse","cpgResponse","text","prjResponse","newExtension","baseName","basename","extension","extname","isUpperCase","toUpperCase","extIndex","lastIndexOf","substr"],"sources":["../../../src/lib/parsers/parse-shapefile.ts"],"sourcesContent":["// import type {Feature} from '@loaders.gl/gis';\nimport {LoaderContext, parseInBatchesFromContext, parseFromContext} from '@loaders.gl/loader-utils';\nimport {binaryToGeometry, transformGeoJsonCoords} from '@loaders.gl/gis';\nimport type {\n BinaryGeometry,\n Geometry,\n ObjectRowTable,\n ObjectRowTableBatch\n} from '@loaders.gl/schema';\nimport {Proj4Projection} from '@math.gl/proj4';\n\nimport type {SHXOutput} from './parse-shx';\nimport type {SHPHeader} from './parse-shp-header';\nimport type {ShapefileLoaderOptions} from './types';\nimport {parseShx} from './parse-shx';\nimport {zipBatchIterators} from '../streaming/zip-batch-iterators';\nimport {SHPLoader} from '../../shp-loader';\nimport {DBFLoader} from '../../dbf-loader';\n\ntype Feature = any;\ninterface ShapefileOutput {\n encoding?: string;\n prj?: string;\n shx?: SHXOutput;\n header: SHPHeader;\n data: object[];\n}\n/**\n * Parsing of file in batches\n */\n// eslint-disable-next-line max-statements, complexity\nexport async function* parseShapefileInBatches(\n asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,\n options?: ShapefileLoaderOptions,\n context?: LoaderContext\n): AsyncIterable<ShapefileOutput> {\n const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};\n const {shx, cpg, prj} = await loadShapefileSidecarFiles(options, context);\n\n // parse geometries\n const shapeIterable = await parseInBatchesFromContext(\n asyncIterator,\n SHPLoader,\n options,\n context!\n );\n\n const shapeIterator: AsyncIterator<any> =\n shapeIterable[Symbol.asyncIterator]?.() || shapeIterable[Symbol.iterator]?.();\n\n // parse properties\n let propertyIterator: AsyncIterator<any> | null = null;\n const dbfResponse = await context?.fetch(replaceExtension(context?.url || '', 'dbf'));\n if (dbfResponse?.ok) {\n const propertyIterable = await parseInBatchesFromContext(\n dbfResponse,\n DBFLoader,\n {\n ...options,\n dbf: {encoding: cpg || 'latin1'}\n },\n context!\n );\n propertyIterator =\n propertyIterable[Symbol.asyncIterator]?.() || propertyIterable[Symbol.iterator]();\n }\n\n // When `options.metadata` is `true`, there's an extra initial `metadata`\n // object before the iterator starts. zipBatchIterators expects to receive\n // batches of Array objects, and will fail with non-iterable batches, so it's\n // important to skip over the first batch.\n let shapeHeader = (await shapeIterator.next()).value;\n if (shapeHeader && shapeHeader.batchType === 'metadata') {\n shapeHeader = (await shapeIterator.next()).value;\n }\n\n let dbfHeader: {batchType?: string} = {};\n if (propertyIterator) {\n dbfHeader = (await propertyIterator.next()).value;\n if (dbfHeader && dbfHeader.batchType === 'metadata') {\n dbfHeader = (await propertyIterator.next()).value;\n }\n }\n\n const zippedIterator: AsyncIterator<ObjectRowTableBatch> = propertyIterator\n ? zipBatchIterators(shapeIterator, propertyIterator, 'object-row-table')\n : shapeIterator;\n\n const zippedBatchIterable: AsyncIterable<ObjectRowTableBatch> = {\n [Symbol.asyncIterator]() {\n return zippedIterator;\n }\n };\n\n for await (const batch of zippedBatchIterable) {\n let geometries: any;\n let properties: any;\n if (!propertyIterator) {\n geometries = batch;\n } else {\n [geometries, properties] = batch.data;\n }\n\n const geojsonGeometries = parseGeometries(geometries);\n let features = joinProperties(geojsonGeometries, properties);\n if (reproject) {\n // @ts-ignore\n features = reprojectFeatures(features, prj, _targetCrs);\n }\n yield {\n encoding: cpg,\n prj,\n shx,\n header: shapeHeader,\n data: features\n };\n }\n}\n\n/**\n * Parse shapefile\n *\n * @param arrayBuffer\n * @param options\n * @param context\n * @returns output of shapefile\n */\nexport async function parseShapefile(\n arrayBuffer: ArrayBuffer,\n options?: ShapefileLoaderOptions,\n context?: LoaderContext\n): Promise<ShapefileOutput> {\n const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};\n const {shx, cpg, prj} = await loadShapefileSidecarFiles(options, context);\n\n // parse geometries\n const {header, geometries} = await parseFromContext(arrayBuffer, SHPLoader, options, context!); // {shp: shx}\n\n const geojsonGeometries = parseGeometries(geometries);\n\n // parse properties\n let propertyTable: ObjectRowTable | undefined;\n\n const dbfResponse = await context?.fetch(replaceExtension(context?.url!, 'dbf'));\n if (dbfResponse?.ok) {\n propertyTable = await parseFromContext(\n dbfResponse as any,\n DBFLoader,\n {dbf: {shape: 'object-row-table', encoding: cpg || 'latin1'}},\n context!\n );\n }\n\n let features = joinProperties(geojsonGeometries, propertyTable?.data || []);\n if (reproject) {\n features = reprojectFeatures(features, prj, _targetCrs);\n }\n\n switch (options?.shapefile?.shape) {\n case 'geojson-table':\n return {\n // @ts-expect-error\n shape: 'geojson-table',\n type: 'FeatureCollection',\n encoding: cpg,\n schema: propertyTable?.schema || {metadata: {}, fields: []},\n prj,\n shx,\n header,\n features\n };\n default:\n return {\n encoding: cpg,\n prj,\n shx,\n header,\n data: features\n };\n }\n}\n\n/**\n * Parse geometries\n *\n * @param geometries\n * @returns geometries as an array\n */\nfunction parseGeometries(geometries: BinaryGeometry[]): Geometry[] {\n const geojsonGeometries: any[] = [];\n for (const geom of geometries) {\n geojsonGeometries.push(binaryToGeometry(geom));\n }\n return geojsonGeometries;\n}\n\n/**\n * Join properties and geometries into features\n *\n * @param geometries [description]\n * @param properties [description]\n * @return [description]\n */\nfunction joinProperties(geometries: Geometry[], properties: object[]): Feature[] {\n const features: Feature[] = [];\n for (let i = 0; i < geometries.length; i++) {\n const geometry = geometries[i];\n const feature: Feature = {\n type: 'Feature',\n geometry,\n // properties can be undefined if dbfResponse above was empty\n properties: (properties && properties[i]) || {}\n };\n features.push(feature);\n }\n\n return features;\n}\n\n/**\n * Reproject GeoJSON features to output CRS\n *\n * @param features parsed GeoJSON features\n * @param sourceCrs source coordinate reference system\n * @param targetCrs †arget coordinate reference system\n * @return Reprojected Features\n */\nfunction reprojectFeatures(features: Feature[], sourceCrs?: string, targetCrs?: string): Feature[] {\n if (!sourceCrs && !targetCrs) {\n return features;\n }\n\n const projection = new Proj4Projection({from: sourceCrs || 'WGS84', to: targetCrs || 'WGS84'});\n return transformGeoJsonCoords(features, (coord) => projection.project(coord));\n}\n\n/**\n *\n * @param options\n * @param context\n * @returns Promise\n */\n// eslint-disable-next-line max-statements\nexport async function loadShapefileSidecarFiles(\n options?: ShapefileLoaderOptions,\n context?: LoaderContext\n): Promise<{\n shx?: SHXOutput;\n cpg?: string;\n prj?: string;\n}> {\n // Attempt a parallel load of the small sidecar files\n // @ts-ignore context must be defined\n const {url, fetch} = context;\n const shxPromise = fetch(replaceExtension(url, 'shx'));\n const cpgPromise = fetch(replaceExtension(url, 'cpg'));\n const prjPromise = fetch(replaceExtension(url, 'prj'));\n await Promise.all([shxPromise, cpgPromise, prjPromise]);\n\n let shx: SHXOutput | undefined;\n let cpg: string | undefined;\n let prj: string | undefined;\n\n const shxResponse = await shxPromise;\n if (shxResponse.ok) {\n const arrayBuffer = await shxResponse.arrayBuffer();\n shx = parseShx(arrayBuffer);\n }\n\n const cpgResponse = await cpgPromise;\n if (cpgResponse.ok) {\n cpg = await cpgResponse.text();\n }\n\n const prjResponse = await prjPromise;\n if (prjResponse.ok) {\n prj = await prjResponse.text();\n }\n\n return {\n shx,\n cpg,\n prj\n };\n}\n\n/**\n * Replace the extension at the end of a path.\n *\n * Matches the case of new extension with the case of the original file extension,\n * to increase the chance of finding files without firing off a request storm looking for various case combinations\n *\n * NOTE: Extensions can be both lower and uppercase\n * per spec, extensions should be lower case, but that doesn't mean they always are. See:\n * calvinmetcalf/shapefile-js#64, mapserver/mapserver#4712\n * https://trac.osgeo.org/mapserver/ticket/166\n */\nexport function replaceExtension(url: string, newExtension: string): string {\n const baseName = basename(url);\n const extension = extname(url);\n const isUpperCase = extension === extension.toUpperCase();\n if (isUpperCase) {\n newExtension = newExtension.toUpperCase();\n }\n return `${baseName}.${newExtension}`;\n}\n\n// NOTE - this gives the entire path minus extension (i.e. NOT same as path.basename)\n/**\n * @param url\n * @returns string\n */\nfunction basename(url: string): string {\n const extIndex = url && url.lastIndexOf('.');\n if (typeof extIndex === 'number') {\n return extIndex >= 0 ? url.substr(0, extIndex) : '';\n }\n return extIndex;\n}\n/**\n * @param url\n * @returns string\n */\nfunction extname(url: string): string {\n const extIndex = url && url.lastIndexOf('.');\n if (typeof extIndex === 'number') {\n return extIndex >= 0 ? url.substr(extIndex + 1) : '';\n }\n return extIndex;\n}\n"],"mappings":"AACA,SAAuBA,yBAAyB,EAAEC,gBAAgB,QAAO,0BAA0B;AACnG,SAAQC,gBAAgB,EAAEC,sBAAsB,QAAO,iBAAiB;AAOxE,SAAQC,eAAe,QAAO,gBAAgB;AAAC,SAKvCC,QAAQ;AAAA,SACRC,iBAAiB;AAAA,SACjBC,SAAS;AAAA,SACTC,SAAS;AAcjB,OAAO,gBAAgBC,uBAAuBA,CAC5CC,aAAiE,EACjEC,OAAgC,EAChCC,OAAuB,EACS;EAAA,IAAAC,qBAAA,EAAAC,sBAAA;EAChC,MAAM;IAACC,SAAS,GAAG,KAAK;IAAEC,UAAU,GAAG;EAAO,CAAC,GAAG,CAAAL,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEM,GAAG,KAAI,CAAC,CAAC;EACpE,MAAM;IAACC,GAAG;IAAEC,GAAG;IAAEC;EAAG,CAAC,GAAG,MAAMC,yBAAyB,CAACV,OAAO,EAAEC,OAAO,CAAC;EAGzE,MAAMU,aAAa,GAAG,MAAMtB,yBAAyB,CACnDU,aAAa,EACbH,SAAS,EACTI,OAAO,EACPC,OACF,CAAC;EAED,MAAMW,aAAiC,GACrC,EAAAV,qBAAA,GAAAS,aAAa,CAACE,MAAM,CAACd,aAAa,CAAC,cAAAG,qBAAA,uBAAnCA,qBAAA,CAAAY,IAAA,CAAAH,aAAsC,CAAC,OAAAR,sBAAA,GAAIQ,aAAa,CAACE,MAAM,CAACE,QAAQ,CAAC,cAAAZ,sBAAA,uBAA9BA,sBAAA,CAAAW,IAAA,CAAAH,aAAiC,CAAC;EAG/E,IAAIK,gBAA2C,GAAG,IAAI;EACtD,MAAMC,WAAW,GAAG,OAAMhB,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEiB,KAAK,CAACC,gBAAgB,CAAC,CAAAlB,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEmB,GAAG,KAAI,EAAE,EAAE,KAAK,CAAC,CAAC;EACrF,IAAIH,WAAW,aAAXA,WAAW,eAAXA,WAAW,CAAEI,EAAE,EAAE;IAAA,IAAAC,qBAAA;IACnB,MAAMC,gBAAgB,GAAG,MAAMlC,yBAAyB,CACtD4B,WAAW,EACXpB,SAAS,EACT;MACE,GAAGG,OAAO;MACVwB,GAAG,EAAE;QAACC,QAAQ,EAAEjB,GAAG,IAAI;MAAQ;IACjC,CAAC,EACDP,OACF,CAAC;IACDe,gBAAgB,GACd,EAAAM,qBAAA,GAAAC,gBAAgB,CAACV,MAAM,CAACd,aAAa,CAAC,cAAAuB,qBAAA,uBAAtCA,qBAAA,CAAAR,IAAA,CAAAS,gBAAyC,CAAC,KAAIA,gBAAgB,CAACV,MAAM,CAACE,QAAQ,CAAC,CAAC,CAAC;EACrF;EAMA,IAAIW,WAAW,GAAG,CAAC,MAAMd,aAAa,CAACe,IAAI,CAAC,CAAC,EAAEC,KAAK;EACpD,IAAIF,WAAW,IAAIA,WAAW,CAACG,SAAS,KAAK,UAAU,EAAE;IACvDH,WAAW,GAAG,CAAC,MAAMd,aAAa,CAACe,IAAI,CAAC,CAAC,EAAEC,KAAK;EAClD;EAEA,IAAIE,SAA+B,GAAG,CAAC,CAAC;EACxC,IAAId,gBAAgB,EAAE;IACpBc,SAAS,GAAG,CAAC,MAAMd,gBAAgB,CAACW,IAAI,CAAC,CAAC,EAAEC,KAAK;IACjD,IAAIE,SAAS,IAAIA,SAAS,CAACD,SAAS,KAAK,UAAU,EAAE;MACnDC,SAAS,GAAG,CAAC,MAAMd,gBAAgB,CAACW,IAAI,CAAC,CAAC,EAAEC,KAAK;IACnD;EACF;EAEA,MAAMG,cAAkD,GAAGf,gBAAgB,GACvErB,iBAAiB,CAACiB,aAAa,EAAEI,gBAAgB,EAAE,kBAAkB,CAAC,GACtEJ,aAAa;EAEjB,MAAMoB,mBAAuD,GAAG;IAC9D,CAACnB,MAAM,CAACd,aAAa,IAAI;MACvB,OAAOgC,cAAc;IACvB;EACF,CAAC;EAED,WAAW,MAAME,KAAK,IAAID,mBAAmB,EAAE;IAC7C,IAAIE,UAAe;IACnB,IAAIC,UAAe;IACnB,IAAI,CAACnB,gBAAgB,EAAE;MACrBkB,UAAU,GAAGD,KAAK;IACpB,CAAC,MAAM;MACL,CAACC,UAAU,EAAEC,UAAU,CAAC,GAAGF,KAAK,CAACG,IAAI;IACvC;IAEA,MAAMC,iBAAiB,GAAGC,eAAe,CAACJ,UAAU,CAAC;IACrD,IAAIK,QAAQ,GAAGC,cAAc,CAACH,iBAAiB,EAAEF,UAAU,CAAC;IAC5D,IAAI/B,SAAS,EAAE;MAEbmC,QAAQ,GAAGE,iBAAiB,CAACF,QAAQ,EAAE9B,GAAG,EAAEJ,UAAU,CAAC;IACzD;IACA,MAAM;MACJoB,QAAQ,EAAEjB,GAAG;MACbC,GAAG;MACHF,GAAG;MACHmC,MAAM,EAAEhB,WAAW;MACnBU,IAAI,EAAEG;IACR,CAAC;EACH;AACF;AAUA,OAAO,eAAeI,cAAcA,CAClCC,WAAwB,EACxB5C,OAAgC,EAChCC,OAAuB,EACG;EAAA,IAAA4C,cAAA,EAAAC,kBAAA,EAAAC,eAAA;EAC1B,MAAM;IAAC3C,SAAS,GAAG,KAAK;IAAEC,UAAU,GAAG;EAAO,CAAC,GAAG,CAAAL,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEM,GAAG,KAAI,CAAC,CAAC;EACpE,MAAM;IAACC,GAAG;IAAEC,GAAG;IAAEC;EAAG,CAAC,GAAG,MAAMC,yBAAyB,CAACV,OAAO,EAAEC,OAAO,CAAC;EAGzE,MAAM;IAACyC,MAAM;IAAER;EAAU,CAAC,GAAG,MAAM5C,gBAAgB,CAACsD,WAAW,EAAEhD,SAAS,EAAEI,OAAO,EAAEC,OAAQ,CAAC;EAE9F,MAAMoC,iBAAiB,GAAGC,eAAe,CAACJ,UAAU,CAAC;EAGrD,IAAIc,aAAyC;EAE7C,MAAM/B,WAAW,GAAG,OAAMhB,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEiB,KAAK,CAACC,gBAAgB,CAAClB,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEmB,GAAG,EAAG,KAAK,CAAC,CAAC;EAChF,IAAIH,WAAW,aAAXA,WAAW,eAAXA,WAAW,CAAEI,EAAE,EAAE;IACnB2B,aAAa,GAAG,MAAM1D,gBAAgB,CACpC2B,WAAW,EACXpB,SAAS,EACT;MAAC2B,GAAG,EAAE;QAACyB,KAAK,EAAE,kBAAkB;QAAExB,QAAQ,EAAEjB,GAAG,IAAI;MAAQ;IAAC,CAAC,EAC7DP,OACF,CAAC;EACH;EAEA,IAAIsC,QAAQ,GAAGC,cAAc,CAACH,iBAAiB,EAAE,EAAAQ,cAAA,GAAAG,aAAa,cAAAH,cAAA,uBAAbA,cAAA,CAAeT,IAAI,KAAI,EAAE,CAAC;EAC3E,IAAIhC,SAAS,EAAE;IACbmC,QAAQ,GAAGE,iBAAiB,CAACF,QAAQ,EAAE9B,GAAG,EAAEJ,UAAU,CAAC;EACzD;EAEA,QAAQL,OAAO,aAAPA,OAAO,wBAAA8C,kBAAA,GAAP9C,OAAO,CAAEkD,SAAS,cAAAJ,kBAAA,uBAAlBA,kBAAA,CAAoBG,KAAK;IAC/B,KAAK,eAAe;MAClB,OAAO;QAELA,KAAK,EAAE,eAAe;QACtBE,IAAI,EAAE,mBAAmB;QACzB1B,QAAQ,EAAEjB,GAAG;QACb4C,MAAM,EAAE,EAAAL,eAAA,GAAAC,aAAa,cAAAD,eAAA,uBAAbA,eAAA,CAAeK,MAAM,KAAI;UAACC,QAAQ,EAAE,CAAC,CAAC;UAAEC,MAAM,EAAE;QAAE,CAAC;QAC3D7C,GAAG;QACHF,GAAG;QACHmC,MAAM;QACNH;MACF,CAAC;IACH;MACE,OAAO;QACLd,QAAQ,EAAEjB,GAAG;QACbC,GAAG;QACHF,GAAG;QACHmC,MAAM;QACNN,IAAI,EAAEG;MACR,CAAC;EACL;AACF;AAQA,SAASD,eAAeA,CAACJ,UAA4B,EAAc;EACjE,MAAMG,iBAAwB,GAAG,EAAE;EACnC,KAAK,MAAMkB,IAAI,IAAIrB,UAAU,EAAE;IAC7BG,iBAAiB,CAACmB,IAAI,CAACjE,gBAAgB,CAACgE,IAAI,CAAC,CAAC;EAChD;EACA,OAAOlB,iBAAiB;AAC1B;AASA,SAASG,cAAcA,CAACN,UAAsB,EAAEC,UAAoB,EAAa;EAC/E,MAAMI,QAAmB,GAAG,EAAE;EAC9B,KAAK,IAAIkB,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGvB,UAAU,CAACwB,MAAM,EAAED,CAAC,EAAE,EAAE;IAC1C,MAAME,QAAQ,GAAGzB,UAAU,CAACuB,CAAC,CAAC;IAC9B,MAAMG,OAAgB,GAAG;MACvBT,IAAI,EAAE,SAAS;MACfQ,QAAQ;MAERxB,UAAU,EAAGA,UAAU,IAAIA,UAAU,CAACsB,CAAC,CAAC,IAAK,CAAC;IAChD,CAAC;IACDlB,QAAQ,CAACiB,IAAI,CAACI,OAAO,CAAC;EACxB;EAEA,OAAOrB,QAAQ;AACjB;AAUA,SAASE,iBAAiBA,CAACF,QAAmB,EAAEsB,SAAkB,EAAEC,SAAkB,EAAa;EACjG,IAAI,CAACD,SAAS,IAAI,CAACC,SAAS,EAAE;IAC5B,OAAOvB,QAAQ;EACjB;EAEA,MAAMwB,UAAU,GAAG,IAAItE,eAAe,CAAC;IAACuE,IAAI,EAAEH,SAAS,IAAI,OAAO;IAAEI,EAAE,EAAEH,SAAS,IAAI;EAAO,CAAC,CAAC;EAC9F,OAAOtE,sBAAsB,CAAC+C,QAAQ,EAAG2B,KAAK,IAAKH,UAAU,CAACI,OAAO,CAACD,KAAK,CAAC,CAAC;AAC/E;AASA,OAAO,eAAexD,yBAAyBA,CAC7CV,OAAgC,EAChCC,OAAuB,EAKtB;EAGD,MAAM;IAACmB,GAAG;IAAEF;EAAK,CAAC,GAAGjB,OAAO;EAC5B,MAAMmE,UAAU,GAAGlD,KAAK,CAACC,gBAAgB,CAACC,GAAG,EAAE,KAAK,CAAC,CAAC;EACtD,MAAMiD,UAAU,GAAGnD,KAAK,CAACC,gBAAgB,CAACC,GAAG,EAAE,KAAK,CAAC,CAAC;EACtD,MAAMkD,UAAU,GAAGpD,KAAK,CAACC,gBAAgB,CAACC,GAAG,EAAE,KAAK,CAAC,CAAC;EACtD,MAAMmD,OAAO,CAACC,GAAG,CAAC,CAACJ,UAAU,EAAEC,UAAU,EAAEC,UAAU,CAAC,CAAC;EAEvD,IAAI/D,GAA0B;EAC9B,IAAIC,GAAuB;EAC3B,IAAIC,GAAuB;EAE3B,MAAMgE,WAAW,GAAG,MAAML,UAAU;EACpC,IAAIK,WAAW,CAACpD,EAAE,EAAE;IAClB,MAAMuB,WAAW,GAAG,MAAM6B,WAAW,CAAC7B,WAAW,CAAC,CAAC;IACnDrC,GAAG,GAAGb,QAAQ,CAACkD,WAAW,CAAC;EAC7B;EAEA,MAAM8B,WAAW,GAAG,MAAML,UAAU;EACpC,IAAIK,WAAW,CAACrD,EAAE,EAAE;IAClBb,GAAG,GAAG,MAAMkE,WAAW,CAACC,IAAI,CAAC,CAAC;EAChC;EAEA,MAAMC,WAAW,GAAG,MAAMN,UAAU;EACpC,IAAIM,WAAW,CAACvD,EAAE,EAAE;IAClBZ,GAAG,GAAG,MAAMmE,WAAW,CAACD,IAAI,CAAC,CAAC;EAChC;EAEA,OAAO;IACLpE,GAAG;IACHC,GAAG;IACHC;EACF,CAAC;AACH;AAaA,OAAO,SAASU,gBAAgBA,CAACC,GAAW,EAAEyD,YAAoB,EAAU;EAC1E,MAAMC,QAAQ,GAAGC,QAAQ,CAAC3D,GAAG,CAAC;EAC9B,MAAM4D,SAAS,GAAGC,OAAO,CAAC7D,GAAG,CAAC;EAC9B,MAAM8D,WAAW,GAAGF,SAAS,KAAKA,SAAS,CAACG,WAAW,CAAC,CAAC;EACzD,IAAID,WAAW,EAAE;IACfL,YAAY,GAAGA,YAAY,CAACM,WAAW,CAAC,CAAC;EAC3C;EACA,OAAQ,GAAEL,QAAS,IAAGD,YAAa,EAAC;AACtC;AAOA,SAASE,QAAQA,CAAC3D,GAAW,EAAU;EACrC,MAAMgE,QAAQ,GAAGhE,GAAG,IAAIA,GAAG,CAACiE,WAAW,CAAC,GAAG,CAAC;EAC5C,IAAI,OAAOD,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAOA,QAAQ,IAAI,CAAC,GAAGhE,GAAG,CAACkE,MAAM,CAAC,CAAC,EAAEF,QAAQ,CAAC,GAAG,EAAE;EACrD;EACA,OAAOA,QAAQ;AACjB;AAKA,SAASH,OAAOA,CAAC7D,GAAW,EAAU;EACpC,MAAMgE,QAAQ,GAAGhE,GAAG,IAAIA,GAAG,CAACiE,WAAW,CAAC,GAAG,CAAC;EAC5C,IAAI,OAAOD,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAOA,QAAQ,IAAI,CAAC,GAAGhE,GAAG,CAACkE,MAAM,CAACF,QAAQ,GAAG,CAAC,CAAC,GAAG,EAAE;EACtD;EACA,OAAOA,QAAQ;AACjB"}
@@ -1 +1 @@
1
- {"version":3,"file":"binary-chunk-reader.d.ts","sourceRoot":"","sources":["../../../src/lib/streaming/binary-chunk-reader.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,wBAAwB,GAAG;IACrC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,qBAAa,iBAAiB;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;gBAEX,OAAO,CAAC,EAAE,wBAAwB;IAY9C;;OAEG;IACH,KAAK,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAIrC,GAAG,IAAI,IAAI;IAKX;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAWzC;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,IAAI;IAwC9C;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IA8B3C;;OAEG;IACH,cAAc,IAAI,IAAI;IAUtB;;;;;;;;;OASG;IACH,oBAAoB,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,eAAe;IAoB3D;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAGzB;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAI5B"}
1
+ {"version":3,"file":"binary-chunk-reader.d.ts","sourceRoot":"","sources":["../../../src/lib/streaming/binary-chunk-reader.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,wBAAwB,GAAG;IACrC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,qBAAa,iBAAiB;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;gBAEX,OAAO,CAAC,EAAE,wBAAwB;IAY9C;;OAEG;IACH,KAAK,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAIrC,GAAG,IAAI,IAAI;IAKX;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAWzC;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,IAAI;IAwC9C;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IA8B3C;;OAEG;IACH,cAAc,IAAI,IAAI;IAUtB;;;;;;;;;OASG;IACH,oBAAoB,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,eAAe;IAoB3D;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAGzB;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAI5B"}
@@ -1 +1 @@
1
- {"version":3,"file":"binary-chunk-reader.js","names":["BinaryChunkReader","constructor","options","offset","arrayBuffers","ended","maxRewindBytes","write","arrayBuffer","push","end","hasAvailableBytes","bytes","bytesAvailable","byteLength","findBufferOffsets","selectedBuffers","i","length","buf","start","Math","abs","getDataView","bufferOffsets","Error","bufferIndex","view","DataView","disposeBuffers","_combineArrayBuffers","shift","bufferOffset","result","Uint8Array","resultOffset","sourceArray","set","subarray","buffer","skip","rewind"],"sources":["../../../src/lib/streaming/binary-chunk-reader.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nexport type BinaryChunkReaderOptions = {\n maxRewindBytes: number;\n};\n\nexport class BinaryChunkReader {\n offset: number;\n arrayBuffers: ArrayBuffer[];\n ended: boolean;\n maxRewindBytes: number;\n\n constructor(options?: BinaryChunkReaderOptions) {\n const {maxRewindBytes = 0} = options || {};\n\n /** current global offset into current array buffer*/\n this.offset = 0;\n /** current buffer from iterator */\n this.arrayBuffers = [];\n this.ended = false;\n\n /** bytes behind offset to hold on to */\n this.maxRewindBytes = maxRewindBytes;\n }\n /**\n * @param arrayBuffer\n */\n write(arrayBuffer: ArrayBuffer): void {\n this.arrayBuffers.push(arrayBuffer);\n }\n\n end(): void {\n this.arrayBuffers = [];\n this.ended = true;\n }\n\n /**\n * Has enough bytes available in array buffers\n *\n * @param bytes Number of bytes\n * @return boolean\n */\n hasAvailableBytes(bytes: number): boolean {\n let bytesAvailable = -this.offset;\n for (const arrayBuffer of this.arrayBuffers) {\n bytesAvailable += arrayBuffer.byteLength;\n if (bytesAvailable >= bytes) {\n return true;\n }\n }\n return false;\n }\n\n /**\n * Find offsets of byte ranges within this.arrayBuffers\n *\n * @param bytes Byte length to read\n * @return Arrays with byte ranges pointing to this.arrayBuffers, Output type is nested array, e.g. [ [0, [1, 2]], ...]\n */\n findBufferOffsets(bytes: number): any[] | null {\n let offset = -this.offset;\n const selectedBuffers: any = [];\n\n for (let i = 0; i < this.arrayBuffers.length; i++) {\n const buf = this.arrayBuffers[i];\n\n // Current buffer isn't long enough to reach global offset\n if (offset + buf.byteLength <= 0) {\n offset += buf.byteLength;\n // eslint-disable-next-line no-continue\n continue;\n }\n\n // Find start/end offsets for this buffer\n // When offset < 0, need to skip over Math.abs(offset) bytes\n // When offset > 0, implies bytes in previous buffer, start at 0\n const start = offset <= 0 ? Math.abs(offset) : 0;\n let end: number;\n\n // Length of requested bytes is contained in current buffer\n if (start + bytes <= buf.byteLength) {\n end = start + bytes;\n selectedBuffers.push([i, [start, end]]);\n return selectedBuffers;\n }\n\n // Will need to look into next buffer\n end = buf.byteLength;\n selectedBuffers.push([i, [start, end]]);\n\n // Need to read fewer bytes in next iter\n bytes -= buf.byteLength - start;\n offset += buf.byteLength;\n }\n\n // Should only finish loop if exhausted all arrays\n return null;\n }\n\n /**\n * Get the required number of bytes from the iterator\n *\n * @param bytes Number of bytes\n * @return DataView with data\n */\n getDataView(bytes: number): DataView | null {\n const bufferOffsets = this.findBufferOffsets(bytes);\n // return `null` if not enough data, except if end() already called, in\n // which case throw an error.\n if (!bufferOffsets && this.ended) {\n throw new Error('binary data exhausted');\n }\n\n if (!bufferOffsets) {\n return null;\n }\n\n // If only one arrayBuffer needed, return DataView directly\n if (bufferOffsets.length === 1) {\n const [bufferIndex, [start, end]] = bufferOffsets[0];\n const arrayBuffer = this.arrayBuffers[bufferIndex];\n const view = new DataView(arrayBuffer, start, end - start);\n\n this.offset += bytes;\n this.disposeBuffers();\n return view;\n }\n\n // Concatenate portions of multiple ArrayBuffers\n const view = new DataView(this._combineArrayBuffers(bufferOffsets));\n this.offset += bytes;\n this.disposeBuffers();\n return view;\n }\n\n /**\n * Dispose of old array buffers\n */\n disposeBuffers(): void {\n while (\n this.arrayBuffers.length > 0 &&\n this.offset - this.maxRewindBytes >= this.arrayBuffers[0].byteLength\n ) {\n this.offset -= this.arrayBuffers[0].byteLength;\n this.arrayBuffers.shift();\n }\n }\n\n /**\n * Copy multiple ArrayBuffers into one contiguous ArrayBuffer\n *\n * In contrast to concatenateArrayBuffers, this only copies the necessary\n * portions of the source arrays, rather than first copying the entire arrays\n * then taking a part of them.\n *\n * @param bufferOffsets List of internal array offsets\n * @return New contiguous ArrayBuffer\n */\n _combineArrayBuffers(bufferOffsets: any[]): ArrayBufferLike {\n let byteLength: number = 0;\n for (const bufferOffset of bufferOffsets) {\n const [start, end] = bufferOffset[1];\n byteLength += end - start;\n }\n\n const result = new Uint8Array(byteLength);\n\n // Copy the subarrays\n let resultOffset: number = 0;\n for (const bufferOffset of bufferOffsets) {\n const [bufferIndex, [start, end]] = bufferOffset;\n const sourceArray = new Uint8Array(this.arrayBuffers[bufferIndex]);\n result.set(sourceArray.subarray(start, end), resultOffset);\n resultOffset += end - start;\n }\n\n return result.buffer;\n }\n /**\n * @param bytes\n */\n skip(bytes: number): void {\n this.offset += bytes;\n }\n /**\n * @param bytes\n */\n rewind(bytes: number): void {\n // TODO - only works if offset is already set\n this.offset -= bytes;\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"binary-chunk-reader.js","names":["BinaryChunkReader","constructor","options","offset","arrayBuffers","ended","maxRewindBytes","write","arrayBuffer","push","end","hasAvailableBytes","bytes","bytesAvailable","byteLength","findBufferOffsets","selectedBuffers","i","length","buf","start","Math","abs","getDataView","bufferOffsets","Error","bufferIndex","view","DataView","disposeBuffers","_combineArrayBuffers","shift","bufferOffset","result","Uint8Array","resultOffset","sourceArray","set","subarray","buffer","skip","rewind"],"sources":["../../../src/lib/streaming/binary-chunk-reader.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nexport type BinaryChunkReaderOptions = {\n maxRewindBytes: number;\n};\n\nexport class BinaryChunkReader {\n offset: number;\n arrayBuffers: ArrayBuffer[];\n ended: boolean;\n maxRewindBytes: number;\n\n constructor(options?: BinaryChunkReaderOptions) {\n const {maxRewindBytes = 0} = options || {};\n\n /** current global offset into current array buffer*/\n this.offset = 0;\n /** current buffer from iterator */\n this.arrayBuffers = [];\n this.ended = false;\n\n /** bytes behind offset to hold on to */\n this.maxRewindBytes = maxRewindBytes;\n }\n /**\n * @param arrayBuffer\n */\n write(arrayBuffer: ArrayBuffer): void {\n this.arrayBuffers.push(arrayBuffer);\n }\n\n end(): void {\n this.arrayBuffers = [];\n this.ended = true;\n }\n\n /**\n * Has enough bytes available in array buffers\n *\n * @param bytes Number of bytes\n * @return boolean\n */\n hasAvailableBytes(bytes: number): boolean {\n let bytesAvailable = -this.offset;\n for (const arrayBuffer of this.arrayBuffers) {\n bytesAvailable += arrayBuffer.byteLength;\n if (bytesAvailable >= bytes) {\n return true;\n }\n }\n return false;\n }\n\n /**\n * Find offsets of byte ranges within this.arrayBuffers\n *\n * @param bytes Byte length to read\n * @return Arrays with byte ranges pointing to this.arrayBuffers, Output type is nested array, e.g. [ [0, [1, 2]], ...]\n */\n findBufferOffsets(bytes: number): any[] | null {\n let offset = -this.offset;\n const selectedBuffers: any = [];\n\n for (let i = 0; i < this.arrayBuffers.length; i++) {\n const buf = this.arrayBuffers[i];\n\n // Current buffer isn't long enough to reach global offset\n if (offset + buf.byteLength <= 0) {\n offset += buf.byteLength;\n // eslint-disable-next-line no-continue\n continue;\n }\n\n // Find start/end offsets for this buffer\n // When offset < 0, need to skip over Math.abs(offset) bytes\n // When offset > 0, implies bytes in previous buffer, start at 0\n const start = offset <= 0 ? Math.abs(offset) : 0;\n let end: number;\n\n // Length of requested bytes is contained in current buffer\n if (start + bytes <= buf.byteLength) {\n end = start + bytes;\n selectedBuffers.push([i, [start, end]]);\n return selectedBuffers;\n }\n\n // Will need to look into next buffer\n end = buf.byteLength;\n selectedBuffers.push([i, [start, end]]);\n\n // Need to read fewer bytes in next iter\n bytes -= buf.byteLength - start;\n offset += buf.byteLength;\n }\n\n // Should only finish loop if exhausted all arrays\n return null;\n }\n\n /**\n * Get the required number of bytes from the iterator\n *\n * @param bytes Number of bytes\n * @return DataView with data\n */\n getDataView(bytes: number): DataView | null {\n const bufferOffsets = this.findBufferOffsets(bytes);\n // return `null` if not enough data, except if end() already called, in\n // which case throw an error.\n if (!bufferOffsets && this.ended) {\n throw new Error('binary data exhausted');\n }\n\n if (!bufferOffsets) {\n return null;\n }\n\n // If only one arrayBuffer needed, return DataView directly\n if (bufferOffsets.length === 1) {\n const [bufferIndex, [start, end]] = bufferOffsets[0];\n const arrayBuffer = this.arrayBuffers[bufferIndex];\n const view = new DataView(arrayBuffer, start, end - start);\n\n this.offset += bytes;\n this.disposeBuffers();\n return view;\n }\n\n // Concatenate portions of multiple ArrayBuffers\n const view = new DataView(this._combineArrayBuffers(bufferOffsets));\n this.offset += bytes;\n this.disposeBuffers();\n return view;\n }\n\n /**\n * Dispose of old array buffers\n */\n disposeBuffers(): void {\n while (\n this.arrayBuffers.length > 0 &&\n this.offset - this.maxRewindBytes >= this.arrayBuffers[0].byteLength\n ) {\n this.offset -= this.arrayBuffers[0].byteLength;\n this.arrayBuffers.shift();\n }\n }\n\n /**\n * Copy multiple ArrayBuffers into one contiguous ArrayBuffer\n *\n * In contrast to concatenateArrayBuffers, this only copies the necessary\n * portions of the source arrays, rather than first copying the entire arrays\n * then taking a part of them.\n *\n * @param bufferOffsets List of internal array offsets\n * @return New contiguous ArrayBuffer\n */\n _combineArrayBuffers(bufferOffsets: any[]): ArrayBufferLike {\n let byteLength: number = 0;\n for (const bufferOffset of bufferOffsets) {\n const [start, end] = bufferOffset[1];\n byteLength += end - start;\n }\n\n const result = new Uint8Array(byteLength);\n\n // Copy the subarrays\n let resultOffset: number = 0;\n for (const bufferOffset of bufferOffsets) {\n const [bufferIndex, [start, end]] = bufferOffset;\n const sourceArray = new Uint8Array(this.arrayBuffers[bufferIndex]);\n result.set(sourceArray.subarray(start, end), resultOffset);\n resultOffset += end - start;\n }\n\n return result.buffer;\n }\n /**\n * @param bytes\n */\n skip(bytes: number): void {\n this.offset += bytes;\n }\n /**\n * @param bytes\n */\n rewind(bytes: number): void {\n // TODO - only works if offset is already set\n this.offset -= bytes;\n }\n}\n"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"binary-reader.d.ts","sourceRoot":"","sources":["../../../src/lib/streaming/binary-reader.ts"],"names":[],"mappings":"AAGA,qBAAa,YAAY;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;gBAEb,WAAW,EAAE,WAAW;IAMpC;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIzC;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ;IAYpC;;;;OAIG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIzB;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAG5B"}
1
+ {"version":3,"file":"binary-reader.d.ts","sourceRoot":"","sources":["../../../src/lib/streaming/binary-reader.ts"],"names":[],"mappings":"AAIA,qBAAa,YAAY;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;gBAEb,WAAW,EAAE,WAAW;IAMpC;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIzC;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ;IAYpC;;;;OAIG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIzB;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAG5B"}
@@ -1 +1 @@
1
- {"version":3,"file":"binary-reader.js","names":["BinaryReader","constructor","arrayBuffer","offset","hasAvailableBytes","bytes","byteLength","getDataView","Error","dataView","DataView","skip","rewind"],"sources":["../../../src/lib/streaming/binary-reader.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nexport class BinaryReader {\n offset: number;\n arrayBuffer: ArrayBuffer;\n\n constructor(arrayBuffer: ArrayBuffer) {\n /** current global (stream) offset */\n this.offset = 0;\n /** current buffer from iterator */\n this.arrayBuffer = arrayBuffer;\n }\n /**\n * Checks if there are available bytes in data\n *\n * @param bytes\n * @returns boolean\n */\n hasAvailableBytes(bytes: number): boolean {\n return this.arrayBuffer.byteLength - this.offset >= bytes;\n }\n\n /**\n * Get the required number of bytes from the iterator\n *\n * @param bytes\n * @returns Dataview\n */\n getDataView(bytes: number): DataView {\n if (bytes && !this.hasAvailableBytes(bytes)) {\n throw new Error('binary data exhausted');\n }\n\n const dataView = bytes\n ? new DataView(this.arrayBuffer, this.offset, bytes)\n : new DataView(this.arrayBuffer, this.offset);\n this.offset += bytes;\n return dataView;\n }\n\n /**\n * Skipping\n *\n * @param bytes\n */\n skip(bytes: number): void {\n this.offset += bytes;\n }\n\n /**\n * Rewinding\n *\n * @param bytes\n */\n rewind(bytes: number): void {\n this.offset -= bytes;\n }\n}\n"],"mappings":"AAGA,OAAO,MAAMA,YAAY,CAAC;EAIxBC,WAAWA,CAACC,WAAwB,EAAE;IAAA,KAHtCC,MAAM;IAAA,KACND,WAAW;IAIT,IAAI,CAACC,MAAM,GAAG,CAAC;IAEf,IAAI,CAACD,WAAW,GAAGA,WAAW;EAChC;EAOAE,iBAAiBA,CAACC,KAAa,EAAW;IACxC,OAAO,IAAI,CAACH,WAAW,CAACI,UAAU,GAAG,IAAI,CAACH,MAAM,IAAIE,KAAK;EAC3D;EAQAE,WAAWA,CAACF,KAAa,EAAY;IACnC,IAAIA,KAAK,IAAI,CAAC,IAAI,CAACD,iBAAiB,CAACC,KAAK,CAAC,EAAE;MAC3C,MAAM,IAAIG,KAAK,CAAC,uBAAuB,CAAC;IAC1C;IAEA,MAAMC,QAAQ,GAAGJ,KAAK,GAClB,IAAIK,QAAQ,CAAC,IAAI,CAACR,WAAW,EAAE,IAAI,CAACC,MAAM,EAAEE,KAAK,CAAC,GAClD,IAAIK,QAAQ,CAAC,IAAI,CAACR,WAAW,EAAE,IAAI,CAACC,MAAM,CAAC;IAC/C,IAAI,CAACA,MAAM,IAAIE,KAAK;IACpB,OAAOI,QAAQ;EACjB;EAOAE,IAAIA,CAACN,KAAa,EAAQ;IACxB,IAAI,CAACF,MAAM,IAAIE,KAAK;EACtB;EAOAO,MAAMA,CAACP,KAAa,EAAQ;IAC1B,IAAI,CAACF,MAAM,IAAIE,KAAK;EACtB;AACF"}
1
+ {"version":3,"file":"binary-reader.js","names":["BinaryReader","constructor","arrayBuffer","offset","hasAvailableBytes","bytes","byteLength","getDataView","Error","dataView","DataView","skip","rewind"],"sources":["../../../src/lib/streaming/binary-reader.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nexport class BinaryReader {\n offset: number;\n arrayBuffer: ArrayBuffer;\n\n constructor(arrayBuffer: ArrayBuffer) {\n /** current global (stream) offset */\n this.offset = 0;\n /** current buffer from iterator */\n this.arrayBuffer = arrayBuffer;\n }\n /**\n * Checks if there are available bytes in data\n *\n * @param bytes\n * @returns boolean\n */\n hasAvailableBytes(bytes: number): boolean {\n return this.arrayBuffer.byteLength - this.offset >= bytes;\n }\n\n /**\n * Get the required number of bytes from the iterator\n *\n * @param bytes\n * @returns Dataview\n */\n getDataView(bytes: number): DataView {\n if (bytes && !this.hasAvailableBytes(bytes)) {\n throw new Error('binary data exhausted');\n }\n\n const dataView = bytes\n ? new DataView(this.arrayBuffer, this.offset, bytes)\n : new DataView(this.arrayBuffer, this.offset);\n this.offset += bytes;\n return dataView;\n }\n\n /**\n * Skipping\n *\n * @param bytes\n */\n skip(bytes: number): void {\n this.offset += bytes;\n }\n\n /**\n * Rewinding\n *\n * @param bytes\n */\n rewind(bytes: number): void {\n this.offset -= bytes;\n }\n}\n"],"mappings":"AAIA,OAAO,MAAMA,YAAY,CAAC;EAIxBC,WAAWA,CAACC,WAAwB,EAAE;IAAA,KAHtCC,MAAM;IAAA,KACND,WAAW;IAIT,IAAI,CAACC,MAAM,GAAG,CAAC;IAEf,IAAI,CAACD,WAAW,GAAGA,WAAW;EAChC;EAOAE,iBAAiBA,CAACC,KAAa,EAAW;IACxC,OAAO,IAAI,CAACH,WAAW,CAACI,UAAU,GAAG,IAAI,CAACH,MAAM,IAAIE,KAAK;EAC3D;EAQAE,WAAWA,CAACF,KAAa,EAAY;IACnC,IAAIA,KAAK,IAAI,CAAC,IAAI,CAACD,iBAAiB,CAACC,KAAK,CAAC,EAAE;MAC3C,MAAM,IAAIG,KAAK,CAAC,uBAAuB,CAAC;IAC1C;IAEA,MAAMC,QAAQ,GAAGJ,KAAK,GAClB,IAAIK,QAAQ,CAAC,IAAI,CAACR,WAAW,EAAE,IAAI,CAACC,MAAM,EAAEE,KAAK,CAAC,GAClD,IAAIK,QAAQ,CAAC,IAAI,CAACR,WAAW,EAAE,IAAI,CAACC,MAAM,CAAC;IAC/C,IAAI,CAACA,MAAM,IAAIE,KAAK;IACpB,OAAOI,QAAQ;EACjB;EAOAE,IAAIA,CAACN,KAAa,EAAQ;IACxB,IAAI,CAACF,MAAM,IAAIE,KAAK;EACtB;EAOAO,MAAMA,CAACP,KAAa,EAAQ;IAC1B,IAAI,CAACF,MAAM,IAAIE,KAAK;EACtB;AACF"}
@@ -1 +1 @@
1
- {"version":3,"file":"zip-batch-iterators.d.ts","sourceRoot":"","sources":["../../../src/lib/streaming/zip-batch-iterators.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAEhF,KAAK,aAAa,GAAG,mBAAmB,GAAG,kBAAkB,CAAC;AAE9D;;;;;GAKG;AACH,wBAAuB,iBAAiB,CACtC,SAAS,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,EACjE,SAAS,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,EACjE,KAAK,EAAE,kBAAkB,GAAG,iBAAiB,GAC5C,cAAc,CAAC,aAAa,EAAE,IAAI,EAAE,OAAO,CAAC,CAqC9C"}
1
+ {"version":3,"file":"zip-batch-iterators.d.ts","sourceRoot":"","sources":["../../../src/lib/streaming/zip-batch-iterators.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAEhF,KAAK,aAAa,GAAG,mBAAmB,GAAG,kBAAkB,CAAC;AAE9D;;;;;GAKG;AACH,wBAAuB,iBAAiB,CACtC,SAAS,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,EACjE,SAAS,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,EACjE,KAAK,EAAE,kBAAkB,GAAG,iBAAiB,GAC5C,cAAc,CAAC,aAAa,EAAE,IAAI,EAAE,OAAO,CAAC,CAqC9C"}
@@ -1 +1 @@
1
- {"version":3,"file":"zip-batch-iterators.js","names":["zipBatchIterators","iterator1","iterator2","shape","batch1Data","batch2Data","iterator1Done","iterator2Done","length","value","done","next","push","batchData","extractBatchData","batchType","data","batch1","batch2","batchLength","Math","min","batch","slice","splice"],"sources":["../../../src/lib/streaming/zip-batch-iterators.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport type {ObjectRowTableBatch, ArrayRowTableBatch} from '@loaders.gl/schema';\n\ntype RowTableBatch = ObjectRowTableBatch | ArrayRowTableBatch;\n\n/**\n * Zip two iterators together\n *\n * @param iterator1\n * @param iterator2\n */\nexport async function* zipBatchIterators(\n iterator1: AsyncIterator<RowTableBatch> | Iterator<RowTableBatch>,\n iterator2: AsyncIterator<RowTableBatch> | Iterator<RowTableBatch>,\n shape: 'object-row-table' | 'array-row-table'\n): AsyncGenerator<RowTableBatch, void, unknown> {\n const batch1Data: unknown[] = [];\n const batch2Data: unknown[] = [];\n let iterator1Done: boolean = false;\n let iterator2Done: boolean = false;\n\n // TODO - one could let all iterators flow at full speed using `Promise.race`\n // however we might end up with a big temporary buffer\n while (!iterator1Done && !iterator2Done) {\n if (batch1Data.length === 0 && !iterator1Done) {\n const {value, done} = await iterator1.next();\n if (done) {\n iterator1Done = true;\n } else {\n // @ts-expect-error\n batch1Data.push(...value);\n }\n }\n if (batch2Data.length === 0 && !iterator2Done) {\n const {value, done} = await iterator2.next();\n if (done) {\n iterator2Done = true;\n } else {\n batch2Data.push(...value);\n }\n }\n\n const batchData = extractBatchData(batch1Data, batch2Data);\n if (batchData) {\n yield {\n batchType: 'data',\n shape,\n length: batchData.length,\n data: batchData\n };\n }\n }\n}\n\n/**\n * Extract batch of same length from two batches\n *\n * @param batch1\n * @param batch2\n * @return array | null\n */\nfunction extractBatchData(batch1: any[], batch2: any[]): any[] | null {\n const batchLength: number = Math.min(batch1.length, batch2.length);\n if (batchLength === 0) {\n return null;\n }\n\n // Non interleaved arrays\n const batch: any[] = [batch1.slice(0, batchLength), batch2.slice(0, batchLength)];\n\n // Modify the 2 batches\n batch1.splice(0, batchLength);\n batch2.splice(0, batchLength);\n return batch;\n}\n"],"mappings":"AAaA,OAAO,gBAAgBA,iBAAiBA,CACtCC,SAAiE,EACjEC,SAAiE,EACjEC,KAA6C,EACC;EAC9C,MAAMC,UAAqB,GAAG,EAAE;EAChC,MAAMC,UAAqB,GAAG,EAAE;EAChC,IAAIC,aAAsB,GAAG,KAAK;EAClC,IAAIC,aAAsB,GAAG,KAAK;EAIlC,OAAO,CAACD,aAAa,IAAI,CAACC,aAAa,EAAE;IACvC,IAAIH,UAAU,CAACI,MAAM,KAAK,CAAC,IAAI,CAACF,aAAa,EAAE;MAC7C,MAAM;QAACG,KAAK;QAAEC;MAAI,CAAC,GAAG,MAAMT,SAAS,CAACU,IAAI,CAAC,CAAC;MAC5C,IAAID,IAAI,EAAE;QACRJ,aAAa,GAAG,IAAI;MACtB,CAAC,MAAM;QAELF,UAAU,CAACQ,IAAI,CAAC,GAAGH,KAAK,CAAC;MAC3B;IACF;IACA,IAAIJ,UAAU,CAACG,MAAM,KAAK,CAAC,IAAI,CAACD,aAAa,EAAE;MAC7C,MAAM;QAACE,KAAK;QAAEC;MAAI,CAAC,GAAG,MAAMR,SAAS,CAACS,IAAI,CAAC,CAAC;MAC5C,IAAID,IAAI,EAAE;QACRH,aAAa,GAAG,IAAI;MACtB,CAAC,MAAM;QACLF,UAAU,CAACO,IAAI,CAAC,GAAGH,KAAK,CAAC;MAC3B;IACF;IAEA,MAAMI,SAAS,GAAGC,gBAAgB,CAACV,UAAU,EAAEC,UAAU,CAAC;IAC1D,IAAIQ,SAAS,EAAE;MACb,MAAM;QACJE,SAAS,EAAE,MAAM;QACjBZ,KAAK;QACLK,MAAM,EAAEK,SAAS,CAACL,MAAM;QACxBQ,IAAI,EAAEH;MACR,CAAC;IACH;EACF;AACF;AASA,SAASC,gBAAgBA,CAACG,MAAa,EAAEC,MAAa,EAAgB;EACpE,MAAMC,WAAmB,GAAGC,IAAI,CAACC,GAAG,CAACJ,MAAM,CAACT,MAAM,EAAEU,MAAM,CAACV,MAAM,CAAC;EAClE,IAAIW,WAAW,KAAK,CAAC,EAAE;IACrB,OAAO,IAAI;EACb;EAGA,MAAMG,KAAY,GAAG,CAACL,MAAM,CAACM,KAAK,CAAC,CAAC,EAAEJ,WAAW,CAAC,EAAED,MAAM,CAACK,KAAK,CAAC,CAAC,EAAEJ,WAAW,CAAC,CAAC;EAGjFF,MAAM,CAACO,MAAM,CAAC,CAAC,EAAEL,WAAW,CAAC;EAC7BD,MAAM,CAACM,MAAM,CAAC,CAAC,EAAEL,WAAW,CAAC;EAC7B,OAAOG,KAAK;AACd"}
1
+ {"version":3,"file":"zip-batch-iterators.js","names":["zipBatchIterators","iterator1","iterator2","shape","batch1Data","batch2Data","iterator1Done","iterator2Done","length","value","done","next","push","batchData","extractBatchData","batchType","data","batch1","batch2","batchLength","Math","min","batch","slice","splice"],"sources":["../../../src/lib/streaming/zip-batch-iterators.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport type {ObjectRowTableBatch, ArrayRowTableBatch} from '@loaders.gl/schema';\n\ntype RowTableBatch = ObjectRowTableBatch | ArrayRowTableBatch;\n\n/**\n * Zip two iterators together\n *\n * @param iterator1\n * @param iterator2\n */\nexport async function* zipBatchIterators(\n iterator1: AsyncIterator<RowTableBatch> | Iterator<RowTableBatch>,\n iterator2: AsyncIterator<RowTableBatch> | Iterator<RowTableBatch>,\n shape: 'object-row-table' | 'array-row-table'\n): AsyncGenerator<RowTableBatch, void, unknown> {\n const batch1Data: unknown[] = [];\n const batch2Data: unknown[] = [];\n let iterator1Done: boolean = false;\n let iterator2Done: boolean = false;\n\n // TODO - one could let all iterators flow at full speed using `Promise.race`\n // however we might end up with a big temporary buffer\n while (!iterator1Done && !iterator2Done) {\n if (batch1Data.length === 0 && !iterator1Done) {\n const {value, done} = await iterator1.next();\n if (done) {\n iterator1Done = true;\n } else {\n // @ts-expect-error\n batch1Data.push(...value);\n }\n }\n if (batch2Data.length === 0 && !iterator2Done) {\n const {value, done} = await iterator2.next();\n if (done) {\n iterator2Done = true;\n } else {\n batch2Data.push(...value);\n }\n }\n\n const batchData = extractBatchData(batch1Data, batch2Data);\n if (batchData) {\n yield {\n batchType: 'data',\n shape,\n length: batchData.length,\n data: batchData\n };\n }\n }\n}\n\n/**\n * Extract batch of same length from two batches\n *\n * @param batch1\n * @param batch2\n * @return array | null\n */\nfunction extractBatchData(batch1: any[], batch2: any[]): any[] | null {\n const batchLength: number = Math.min(batch1.length, batch2.length);\n if (batchLength === 0) {\n return null;\n }\n\n // Non interleaved arrays\n const batch: any[] = [batch1.slice(0, batchLength), batch2.slice(0, batchLength)];\n\n // Modify the 2 batches\n batch1.splice(0, batchLength);\n batch2.splice(0, batchLength);\n return batch;\n}\n"],"mappings":"AAcA,OAAO,gBAAgBA,iBAAiBA,CACtCC,SAAiE,EACjEC,SAAiE,EACjEC,KAA6C,EACC;EAC9C,MAAMC,UAAqB,GAAG,EAAE;EAChC,MAAMC,UAAqB,GAAG,EAAE;EAChC,IAAIC,aAAsB,GAAG,KAAK;EAClC,IAAIC,aAAsB,GAAG,KAAK;EAIlC,OAAO,CAACD,aAAa,IAAI,CAACC,aAAa,EAAE;IACvC,IAAIH,UAAU,CAACI,MAAM,KAAK,CAAC,IAAI,CAACF,aAAa,EAAE;MAC7C,MAAM;QAACG,KAAK;QAAEC;MAAI,CAAC,GAAG,MAAMT,SAAS,CAACU,IAAI,CAAC,CAAC;MAC5C,IAAID,IAAI,EAAE;QACRJ,aAAa,GAAG,IAAI;MACtB,CAAC,MAAM;QAELF,UAAU,CAACQ,IAAI,CAAC,GAAGH,KAAK,CAAC;MAC3B;IACF;IACA,IAAIJ,UAAU,CAACG,MAAM,KAAK,CAAC,IAAI,CAACD,aAAa,EAAE;MAC7C,MAAM;QAACE,KAAK;QAAEC;MAAI,CAAC,GAAG,MAAMR,SAAS,CAACS,IAAI,CAAC,CAAC;MAC5C,IAAID,IAAI,EAAE;QACRH,aAAa,GAAG,IAAI;MACtB,CAAC,MAAM;QACLF,UAAU,CAACO,IAAI,CAAC,GAAGH,KAAK,CAAC;MAC3B;IACF;IAEA,MAAMI,SAAS,GAAGC,gBAAgB,CAACV,UAAU,EAAEC,UAAU,CAAC;IAC1D,IAAIQ,SAAS,EAAE;MACb,MAAM;QACJE,SAAS,EAAE,MAAM;QACjBZ,KAAK;QACLK,MAAM,EAAEK,SAAS,CAACL,MAAM;QACxBQ,IAAI,EAAEH;MACR,CAAC;IACH;EACF;AACF;AASA,SAASC,gBAAgBA,CAACG,MAAa,EAAEC,MAAa,EAAgB;EACpE,MAAMC,WAAmB,GAAGC,IAAI,CAACC,GAAG,CAACJ,MAAM,CAACT,MAAM,EAAEU,MAAM,CAACV,MAAM,CAAC;EAClE,IAAIW,WAAW,KAAK,CAAC,EAAE;IACrB,OAAO,IAAI;EACb;EAGA,MAAMG,KAAY,GAAG,CAACL,MAAM,CAACM,KAAK,CAAC,CAAC,EAAEJ,WAAW,CAAC,EAAED,MAAM,CAACK,KAAK,CAAC,CAAC,EAAEJ,WAAW,CAAC,CAAC;EAGjFF,MAAM,CAACO,MAAM,CAAC,CAAC,EAAEL,WAAW,CAAC;EAC7BD,MAAM,CAACM,MAAM,CAAC,CAAC,EAAEL,WAAW,CAAC;EAC7B,OAAOG,KAAK;AACd"}
@@ -1,7 +1,13 @@
1
1
  import type { LoaderOptions, LoaderWithParser } from '@loaders.gl/loader-utils';
2
+ import { Batch, GeoJSONTable } from '@loaders.gl/schema';
3
+ export type ShapefileLoaderOptions = LoaderOptions & {
4
+ shapefile?: {
5
+ shape?: 'geojson-table' | 'v3';
6
+ };
7
+ };
2
8
  /**
3
9
  * Shapefile loader
4
10
  * @note Shapefile is multifile format and requires providing additional files
5
11
  */
6
- export declare const ShapefileLoader: LoaderWithParser<any, any, LoaderOptions>;
12
+ export declare const ShapefileLoader: LoaderWithParser<GeoJSONTable, Batch, ShapefileLoaderOptions>;
7
13
  //# sourceMappingURL=shapefile-loader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"shapefile-loader.d.ts","sourceRoot":"","sources":["../src/shapefile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAQ9E;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,CAiBrE,CAAC"}
1
+ {"version":3,"file":"shapefile-loader.d.ts","sourceRoot":"","sources":["../src/shapefile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAG9E,OAAO,EAAC,KAAK,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAMvD,MAAM,MAAM,sBAAsB,GAAG,aAAa,GAAG;IACnD,SAAS,CAAC,EAAE;QACV,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;KAChC,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,YAAY,EAAE,KAAK,EAAE,sBAAsB,CAqBzF,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import { SHP_MAGIC_NUMBER } from "./shp-loader.js";
2
2
  import { parseShapefile, parseShapefileInBatches } from "./lib/parsers/parse-shapefile.js";
3
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
3
+ const VERSION = typeof "4.1.0-alpha.10" !== 'undefined' ? "4.1.0-alpha.10" : 'latest';
4
4
  export const ShapefileLoader = {
5
5
  name: 'Shapefile',
6
6
  id: 'shapefile',
@@ -11,7 +11,9 @@ export const ShapefileLoader = {
11
11
  mimeTypes: ['application/octet-stream'],
12
12
  tests: [new Uint8Array(SHP_MAGIC_NUMBER).buffer],
13
13
  options: {
14
- shapefile: {},
14
+ shapefile: {
15
+ shape: 'v3'
16
+ },
15
17
  shp: {
16
18
  _maxDimensions: 4
17
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"shapefile-loader.js","names":["SHP_MAGIC_NUMBER","parseShapefile","parseShapefileInBatches","VERSION","__VERSION__","ShapefileLoader","name","id","module","version","category","extensions","mimeTypes","tests","Uint8Array","buffer","options","shapefile","shp","_maxDimensions","parse","parseInBatches"],"sources":["../src/shapefile-loader.ts"],"sourcesContent":["import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {SHP_MAGIC_NUMBER} from './shp-loader';\nimport {parseShapefile, parseShapefileInBatches} from './lib/parsers/parse-shapefile';\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\n/**\n * Shapefile loader\n * @note Shapefile is multifile format and requires providing additional files\n */\nexport const ShapefileLoader: LoaderWithParser<any, any, LoaderOptions> = {\n name: 'Shapefile',\n id: 'shapefile',\n module: 'shapefile',\n version: VERSION,\n category: 'geometry',\n extensions: ['shp'],\n mimeTypes: ['application/octet-stream'],\n tests: [new Uint8Array(SHP_MAGIC_NUMBER).buffer],\n options: {\n shapefile: {},\n shp: {\n _maxDimensions: 4\n }\n },\n parse: parseShapefile,\n parseInBatches: parseShapefileInBatches\n};\n"],"mappings":"SACQA,gBAAgB;AAAA,SAChBC,cAAc,EAAEC,uBAAuB;AAI/C,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAM3E,OAAO,MAAMC,eAA0D,GAAG;EACxEC,IAAI,EAAE,WAAW;EACjBC,EAAE,EAAE,WAAW;EACfC,MAAM,EAAE,WAAW;EACnBC,OAAO,EAAEN,OAAO;EAChBO,QAAQ,EAAE,UAAU;EACpBC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,KAAK,EAAE,CAAC,IAAIC,UAAU,CAACd,gBAAgB,CAAC,CAACe,MAAM,CAAC;EAChDC,OAAO,EAAE;IACPC,SAAS,EAAE,CAAC,CAAC;IACbC,GAAG,EAAE;MACHC,cAAc,EAAE;IAClB;EACF,CAAC;EACDC,KAAK,EAAEnB,cAAc;EACrBoB,cAAc,EAAEnB;AAClB,CAAC"}
1
+ {"version":3,"file":"shapefile-loader.js","names":["SHP_MAGIC_NUMBER","parseShapefile","parseShapefileInBatches","VERSION","ShapefileLoader","name","id","module","version","category","extensions","mimeTypes","tests","Uint8Array","buffer","options","shapefile","shape","shp","_maxDimensions","parse","parseInBatches"],"sources":["../src/shapefile-loader.ts"],"sourcesContent":["import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {SHP_MAGIC_NUMBER} from './shp-loader';\nimport {parseShapefile, parseShapefileInBatches} from './lib/parsers/parse-shapefile';\nimport {Batch, GeoJSONTable} from '@loaders.gl/schema';\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 type ShapefileLoaderOptions = LoaderOptions & {\n shapefile?: {\n shape?: 'geojson-table' | 'v3';\n };\n};\n\n/**\n * Shapefile loader\n * @note Shapefile is multifile format and requires providing additional files\n */\nexport const ShapefileLoader: LoaderWithParser<GeoJSONTable, Batch, ShapefileLoaderOptions> = {\n name: 'Shapefile',\n id: 'shapefile',\n module: 'shapefile',\n version: VERSION,\n category: 'geometry',\n extensions: ['shp'],\n mimeTypes: ['application/octet-stream'],\n tests: [new Uint8Array(SHP_MAGIC_NUMBER).buffer],\n options: {\n shapefile: {\n shape: 'v3'\n },\n shp: {\n _maxDimensions: 4\n }\n },\n // @ts-expect-error\n parse: parseShapefile,\n // @ts-expect-error\n parseInBatches: parseShapefileInBatches\n};\n"],"mappings":"SACQA,gBAAgB;AAAA,SAChBC,cAAc,EAAEC,uBAAuB;AAK/C,MAAMC,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAY3E,OAAO,MAAMC,eAA8E,GAAG;EAC5FC,IAAI,EAAE,WAAW;EACjBC,EAAE,EAAE,WAAW;EACfC,MAAM,EAAE,WAAW;EACnBC,OAAO,EAAEL,OAAO;EAChBM,QAAQ,EAAE,UAAU;EACpBC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,KAAK,EAAE,CAAC,IAAIC,UAAU,CAACb,gBAAgB,CAAC,CAACc,MAAM,CAAC;EAChDC,OAAO,EAAE;IACPC,SAAS,EAAE;MACTC,KAAK,EAAE;IACT,CAAC;IACDC,GAAG,EAAE;MACHC,cAAc,EAAE;IAClB;EACF,CAAC;EAEDC,KAAK,EAAEnB,cAAc;EAErBoB,cAAc,EAAEnB;AAClB,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { parseSHP, parseSHPInBatches } from "./lib/parsers/parse-shp.js";
2
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
2
+ const VERSION = typeof "4.1.0-alpha.10" !== 'undefined' ? "4.1.0-alpha.10" : 'latest';
3
3
  export const SHP_MAGIC_NUMBER = [0x00, 0x00, 0x27, 0x0a];
4
4
  export const SHPWorkerLoader = {
5
5
  name: 'SHP',
@@ -1 +1 @@
1
- {"version":3,"file":"shp-loader.js","names":["parseSHP","parseSHPInBatches","VERSION","__VERSION__","SHP_MAGIC_NUMBER","SHPWorkerLoader","name","id","module","version","worker","category","extensions","mimeTypes","tests","Uint8Array","buffer","options","shp","_maxDimensions","SHPLoader","parse","arrayBuffer","parseSync","parseInBatches","arrayBufferIterator"],"sources":["../src/shp-loader.ts"],"sourcesContent":["import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parseSHP, parseSHPInBatches} from './lib/parsers/parse-shp';\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 SHP_MAGIC_NUMBER = [0x00, 0x00, 0x27, 0x0a];\n\n/**\n * SHP file loader\n */\nexport const SHPWorkerLoader: Loader = {\n name: 'SHP',\n id: 'shp',\n module: 'shapefile',\n version: VERSION,\n worker: true,\n category: 'geometry',\n extensions: ['shp'],\n mimeTypes: ['application/octet-stream'],\n // ISSUE: This also identifies SHX files, which are identical to SHP for the first 100 bytes...\n tests: [new Uint8Array(SHP_MAGIC_NUMBER).buffer],\n options: {\n shp: {\n _maxDimensions: 4\n }\n }\n};\n\n/** SHP file loader */\nexport const SHPLoader: LoaderWithParser = {\n ...SHPWorkerLoader,\n parse: async (arrayBuffer, options?) => parseSHP(arrayBuffer, options),\n parseSync: parseSHP,\n parseInBatches: (\n arrayBufferIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,\n options\n ) => parseSHPInBatches(arrayBufferIterator, options)\n};\n"],"mappings":"SACQA,QAAQ,EAAEC,iBAAiB;AAInC,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAE3E,OAAO,MAAMC,gBAAgB,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;AAKxD,OAAO,MAAMC,eAAuB,GAAG;EACrCC,IAAI,EAAE,KAAK;EACXC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,WAAW;EACnBC,OAAO,EAAEP,OAAO;EAChBQ,MAAM,EAAE,IAAI;EACZC,QAAQ,EAAE,UAAU;EACpBC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,0BAA0B,CAAC;EAEvCC,KAAK,EAAE,CAAC,IAAIC,UAAU,CAACX,gBAAgB,CAAC,CAACY,MAAM,CAAC;EAChDC,OAAO,EAAE;IACPC,GAAG,EAAE;MACHC,cAAc,EAAE;IAClB;EACF;AACF,CAAC;AAGD,OAAO,MAAMC,SAA2B,GAAG;EACzC,GAAGf,eAAe;EAClBgB,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEL,OAAQ,KAAKjB,QAAQ,CAACsB,WAAW,EAAEL,OAAO,CAAC;EACtEM,SAAS,EAAEvB,QAAQ;EACnBwB,cAAc,EAAEA,CACdC,mBAAuE,EACvER,OAAO,KACJhB,iBAAiB,CAACwB,mBAAmB,EAAER,OAAO;AACrD,CAAC"}
1
+ {"version":3,"file":"shp-loader.js","names":["parseSHP","parseSHPInBatches","VERSION","SHP_MAGIC_NUMBER","SHPWorkerLoader","name","id","module","version","worker","category","extensions","mimeTypes","tests","Uint8Array","buffer","options","shp","_maxDimensions","SHPLoader","parse","arrayBuffer","parseSync","parseInBatches","arrayBufferIterator"],"sources":["../src/shp-loader.ts"],"sourcesContent":["import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parseSHP, parseSHPInBatches} from './lib/parsers/parse-shp';\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 SHP_MAGIC_NUMBER = [0x00, 0x00, 0x27, 0x0a];\n\n/**\n * SHP file loader\n */\nexport const SHPWorkerLoader: Loader = {\n name: 'SHP',\n id: 'shp',\n module: 'shapefile',\n version: VERSION,\n worker: true,\n category: 'geometry',\n extensions: ['shp'],\n mimeTypes: ['application/octet-stream'],\n // ISSUE: This also identifies SHX files, which are identical to SHP for the first 100 bytes...\n tests: [new Uint8Array(SHP_MAGIC_NUMBER).buffer],\n options: {\n shp: {\n _maxDimensions: 4\n }\n }\n};\n\n/** SHP file loader */\nexport const SHPLoader: LoaderWithParser = {\n ...SHPWorkerLoader,\n parse: async (arrayBuffer, options?) => parseSHP(arrayBuffer, options),\n parseSync: parseSHP,\n parseInBatches: (\n arrayBufferIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,\n options\n ) => parseSHPInBatches(arrayBufferIterator, options)\n};\n"],"mappings":"SACQA,QAAQ,EAAEC,iBAAiB;AAInC,MAAMC,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAE3E,OAAO,MAAMC,gBAAgB,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;AAKxD,OAAO,MAAMC,eAAuB,GAAG;EACrCC,IAAI,EAAE,KAAK;EACXC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,WAAW;EACnBC,OAAO,EAAEN,OAAO;EAChBO,MAAM,EAAE,IAAI;EACZC,QAAQ,EAAE,UAAU;EACpBC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,0BAA0B,CAAC;EAEvCC,KAAK,EAAE,CAAC,IAAIC,UAAU,CAACX,gBAAgB,CAAC,CAACY,MAAM,CAAC;EAChDC,OAAO,EAAE;IACPC,GAAG,EAAE;MACHC,cAAc,EAAE;IAClB;EACF;AACF,CAAC;AAGD,OAAO,MAAMC,SAA2B,GAAG;EACzC,GAAGf,eAAe;EAClBgB,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEL,OAAQ,KAAKhB,QAAQ,CAACqB,WAAW,EAAEL,OAAO,CAAC;EACtEM,SAAS,EAAEtB,QAAQ;EACnBuB,cAAc,EAAEA,CACdC,mBAAuE,EACvER,OAAO,KACJf,iBAAiB,CAACuB,mBAAmB,EAAER,OAAO;AACrD,CAAC"}
@@ -480,7 +480,7 @@
480
480
  }
481
481
 
482
482
  // src/shp-loader.ts
483
- var VERSION = true ? "4.0.4" : "latest";
483
+ var VERSION = true ? "4.1.0-alpha.10" : "latest";
484
484
  var SHP_MAGIC_NUMBER2 = [0, 0, 39, 10];
485
485
  var SHPWorkerLoader = {
486
486
  name: "SHP",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@loaders.gl/shapefile",
3
3
  "description": "Loader for the Shapefile Format",
4
- "version": "4.0.4",
4
+ "version": "4.1.0-alpha.10",
5
5
  "license": "MIT",
6
6
  "type": "module",
7
7
  "publishConfig": {
@@ -23,9 +23,9 @@
23
23
  "module": "dist/index.js",
24
24
  "exports": {
25
25
  ".": {
26
+ "types": "./dist/index.d.ts",
26
27
  "import": "./dist/index.js",
27
- "require": "./dist/index.cjs",
28
- "types": "./dist/index.d.ts"
28
+ "require": "./dist/index.cjs"
29
29
  }
30
30
  },
31
31
  "sideEffects": false,
@@ -44,10 +44,10 @@
44
44
  "build-worker-dbf": "esbuild src/workers/dbf-worker.ts --bundle --outfile=dist/dbf-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
45
45
  },
46
46
  "dependencies": {
47
- "@loaders.gl/gis": "4.0.4",
48
- "@loaders.gl/loader-utils": "4.0.4",
49
- "@loaders.gl/schema": "4.0.4",
47
+ "@loaders.gl/gis": "4.1.0-alpha.10",
48
+ "@loaders.gl/loader-utils": "4.1.0-alpha.10",
49
+ "@loaders.gl/schema": "4.1.0-alpha.10",
50
50
  "@math.gl/proj4": "^4.0.0"
51
51
  },
52
- "gitHead": "4dc810fa04bb400f4aedfef98a83c7ef882ed3d7"
52
+ "gitHead": "19f43c2d90d8b50860c3f8e487429779a386287d"
53
53
  }
@@ -1,7 +1,12 @@
1
1
  // import type {Feature} from '@loaders.gl/gis';
2
2
  import {LoaderContext, parseInBatchesFromContext, parseFromContext} from '@loaders.gl/loader-utils';
3
3
  import {binaryToGeometry, transformGeoJsonCoords} from '@loaders.gl/gis';
4
- import type {BinaryGeometry, Geometry, ObjectRowTableBatch} from '@loaders.gl/schema';
4
+ import type {
5
+ BinaryGeometry,
6
+ Geometry,
7
+ ObjectRowTable,
8
+ ObjectRowTableBatch
9
+ } from '@loaders.gl/schema';
5
10
  import {Proj4Projection} from '@math.gl/proj4';
6
11
 
7
12
  import type {SHXOutput} from './parse-shx';
@@ -134,30 +139,45 @@ export async function parseShapefile(
134
139
  const geojsonGeometries = parseGeometries(geometries);
135
140
 
136
141
  // parse properties
137
- let properties = [];
142
+ let propertyTable: ObjectRowTable | undefined;
138
143
 
139
144
  const dbfResponse = await context?.fetch(replaceExtension(context?.url!, 'dbf'));
140
145
  if (dbfResponse?.ok) {
141
- properties = await parseFromContext(
146
+ propertyTable = await parseFromContext(
142
147
  dbfResponse as any,
143
148
  DBFLoader,
144
- {dbf: {encoding: cpg || 'latin1'}},
149
+ {dbf: {shape: 'object-row-table', encoding: cpg || 'latin1'}},
145
150
  context!
146
151
  );
147
152
  }
148
153
 
149
- let features = joinProperties(geojsonGeometries, properties);
154
+ let features = joinProperties(geojsonGeometries, propertyTable?.data || []);
150
155
  if (reproject) {
151
156
  features = reprojectFeatures(features, prj, _targetCrs);
152
157
  }
153
158
 
154
- return {
155
- encoding: cpg,
156
- prj,
157
- shx,
158
- header,
159
- data: features
160
- };
159
+ switch (options?.shapefile?.shape) {
160
+ case 'geojson-table':
161
+ return {
162
+ // @ts-expect-error
163
+ shape: 'geojson-table',
164
+ type: 'FeatureCollection',
165
+ encoding: cpg,
166
+ schema: propertyTable?.schema || {metadata: {}, fields: []},
167
+ prj,
168
+ shx,
169
+ header,
170
+ features
171
+ };
172
+ default:
173
+ return {
174
+ encoding: cpg,
175
+ prj,
176
+ shx,
177
+ header,
178
+ data: features
179
+ };
180
+ }
161
181
  }
162
182
 
163
183
  /**
@@ -1,4 +1,5 @@
1
- // loaders.gl, MIT license
1
+ // loaders.gl
2
+ // SPDX-License-Identifier: MIT
2
3
  // Copyright (c) vis.gl contributors
3
4
 
4
5
  export type BinaryChunkReaderOptions = {
@@ -1,4 +1,5 @@
1
- // loaders.gl, MIT license
1
+ // loaders.gl
2
+ // SPDX-License-Identifier: MIT
2
3
  // Copyright (c) vis.gl contributors
3
4
 
4
5
  export class BinaryReader {
@@ -1,4 +1,5 @@
1
- // loaders.gl, MIT license
1
+ // loaders.gl
2
+ // SPDX-License-Identifier: MIT
2
3
  // Copyright (c) vis.gl contributors
3
4
 
4
5
  import type {ObjectRowTableBatch, ArrayRowTableBatch} from '@loaders.gl/schema';
@@ -1,16 +1,23 @@
1
1
  import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
2
2
  import {SHP_MAGIC_NUMBER} from './shp-loader';
3
3
  import {parseShapefile, parseShapefileInBatches} from './lib/parsers/parse-shapefile';
4
+ import {Batch, GeoJSONTable} from '@loaders.gl/schema';
4
5
 
5
6
  // __VERSION__ is injected by babel-plugin-version-inline
6
7
  // @ts-ignore TS2304: Cannot find name '__VERSION__'.
7
8
  const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
8
9
 
10
+ export type ShapefileLoaderOptions = LoaderOptions & {
11
+ shapefile?: {
12
+ shape?: 'geojson-table' | 'v3';
13
+ };
14
+ };
15
+
9
16
  /**
10
17
  * Shapefile loader
11
18
  * @note Shapefile is multifile format and requires providing additional files
12
19
  */
13
- export const ShapefileLoader: LoaderWithParser<any, any, LoaderOptions> = {
20
+ export const ShapefileLoader: LoaderWithParser<GeoJSONTable, Batch, ShapefileLoaderOptions> = {
14
21
  name: 'Shapefile',
15
22
  id: 'shapefile',
16
23
  module: 'shapefile',
@@ -20,11 +27,15 @@ export const ShapefileLoader: LoaderWithParser<any, any, LoaderOptions> = {
20
27
  mimeTypes: ['application/octet-stream'],
21
28
  tests: [new Uint8Array(SHP_MAGIC_NUMBER).buffer],
22
29
  options: {
23
- shapefile: {},
30
+ shapefile: {
31
+ shape: 'v3'
32
+ },
24
33
  shp: {
25
34
  _maxDimensions: 4
26
35
  }
27
36
  },
37
+ // @ts-expect-error
28
38
  parse: parseShapefile,
39
+ // @ts-expect-error
29
40
  parseInBatches: parseShapefileInBatches
30
41
  };