@loaders.gl/arrow 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.
Files changed (109) hide show
  1. package/dist/arrow-loader.d.ts +1 -0
  2. package/dist/arrow-loader.d.ts.map +1 -1
  3. package/dist/arrow-loader.js +1 -1
  4. package/dist/arrow-loader.js.map +1 -1
  5. package/dist/arrow-worker.js +241 -3
  6. package/dist/arrow-writer.js +1 -1
  7. package/dist/arrow-writer.js.map +1 -1
  8. package/dist/dist.dev.js +1496 -641
  9. package/dist/geoarrow/convert-geoarrow-to-binary-geometry.d.ts +8 -4
  10. package/dist/geoarrow/convert-geoarrow-to-binary-geometry.d.ts.map +1 -1
  11. package/dist/geoarrow/convert-geoarrow-to-binary-geometry.js +75 -54
  12. package/dist/geoarrow/convert-geoarrow-to-binary-geometry.js.map +1 -1
  13. package/dist/geoarrow/convert-geoarrow-to-geojson-geometry.d.ts +13 -0
  14. package/dist/geoarrow/convert-geoarrow-to-geojson-geometry.d.ts.map +1 -0
  15. package/dist/geoarrow/{convert-geoarrow-to-geojson.js → convert-geoarrow-to-geojson-geometry.js} +34 -27
  16. package/dist/geoarrow/convert-geoarrow-to-geojson-geometry.js.map +1 -0
  17. package/dist/geoarrow/get-arrow-bounds.d.ts.map +1 -1
  18. package/dist/geoarrow/get-arrow-bounds.js.map +1 -1
  19. package/dist/geoarrow-loader.d.ts.map +1 -1
  20. package/dist/geoarrow-loader.js +0 -1
  21. package/dist/geoarrow-loader.js.map +1 -1
  22. package/dist/geoarrow-writer.js +1 -1
  23. package/dist/geoarrow-writer.js.map +1 -1
  24. package/dist/index.cjs +436 -347
  25. package/dist/index.d.ts +5 -3
  26. package/dist/index.d.ts.map +1 -1
  27. package/dist/index.js +4 -3
  28. package/dist/index.js.map +1 -1
  29. package/dist/lib/arrow-table-batch.d.ts.map +1 -1
  30. package/dist/lib/arrow-table-batch.js.map +1 -1
  31. package/dist/lib/arrow-table.d.ts.map +1 -1
  32. package/dist/lib/arrow-table.js.map +1 -1
  33. package/dist/lib/encode-arrow.d.ts.map +1 -1
  34. package/dist/lib/encode-arrow.js.map +1 -1
  35. package/dist/lib/encode-geoarrow.d.ts.map +1 -1
  36. package/dist/lib/encode-geoarrow.js.map +1 -1
  37. package/dist/parsers/parse-arrow-in-batches.d.ts +2 -1
  38. package/dist/parsers/parse-arrow-in-batches.d.ts.map +1 -1
  39. package/dist/parsers/parse-arrow-in-batches.js +8 -1
  40. package/dist/parsers/parse-arrow-in-batches.js.map +1 -1
  41. package/dist/parsers/parse-arrow-sync.d.ts.map +1 -1
  42. package/dist/parsers/parse-arrow-sync.js +2 -0
  43. package/dist/parsers/parse-arrow-sync.js.map +1 -1
  44. package/dist/parsers/parse-geoarrow-in-batches.d.ts.map +1 -1
  45. package/dist/parsers/parse-geoarrow-in-batches.js.map +1 -1
  46. package/dist/parsers/parse-geoarrow-sync.d.ts.map +1 -1
  47. package/dist/parsers/parse-geoarrow-sync.js.map +1 -1
  48. package/dist/schema/arrow-type-utils.d.ts.map +1 -1
  49. package/dist/schema/arrow-type-utils.js.map +1 -1
  50. package/dist/schema/convert-arrow-schema.d.ts.map +1 -1
  51. package/dist/schema/convert-arrow-schema.js.map +1 -1
  52. package/dist/tables/convert-arrow-to-columnar-table.d.ts.map +1 -1
  53. package/dist/tables/convert-arrow-to-columnar-table.js +1 -0
  54. package/dist/tables/convert-arrow-to-columnar-table.js.map +1 -1
  55. package/dist/tables/convert-arrow-to-geojson-table.d.ts +1 -1
  56. package/dist/tables/convert-arrow-to-geojson-table.d.ts.map +1 -1
  57. package/dist/tables/convert-arrow-to-geojson-table.js +14 -8
  58. package/dist/tables/convert-arrow-to-geojson-table.js.map +1 -1
  59. package/dist/tables/convert-columnar-to-row-table.d.ts.map +1 -1
  60. package/dist/tables/convert-columnar-to-row-table.js +1 -0
  61. package/dist/tables/convert-columnar-to-row-table.js.map +1 -1
  62. package/dist/tables/convert-table-to-arrow.d.ts.map +1 -1
  63. package/dist/tables/convert-table-to-arrow.js.map +1 -1
  64. package/dist/triangulate-on-worker.d.ts +40 -6
  65. package/dist/triangulate-on-worker.d.ts.map +1 -1
  66. package/dist/triangulate-on-worker.js +12 -2
  67. package/dist/triangulate-on-worker.js.map +1 -1
  68. package/dist/triangulation-worker.js +11703 -34
  69. package/dist/types.d.ts.map +1 -1
  70. package/dist/types.js.map +1 -1
  71. package/dist/workers/arrow-worker.js.map +1 -1
  72. package/dist/workers/hard-clone.d.ts +23 -0
  73. package/dist/workers/hard-clone.d.ts.map +1 -0
  74. package/dist/workers/hard-clone.js +57 -0
  75. package/dist/workers/hard-clone.js.map +1 -0
  76. package/dist/workers/triangulation-worker-node.d.ts.map +1 -1
  77. package/dist/workers/triangulation-worker-node.js.map +1 -1
  78. package/dist/workers/triangulation-worker.js +37 -2
  79. package/dist/workers/triangulation-worker.js.map +1 -1
  80. package/package.json +18 -12
  81. package/src/arrow-loader.ts +3 -1
  82. package/src/geoarrow/convert-geoarrow-to-binary-geometry.ts +105 -62
  83. package/src/geoarrow/{convert-geoarrow-to-geojson.ts → convert-geoarrow-to-geojson-geometry.ts} +58 -47
  84. package/src/geoarrow/get-arrow-bounds.ts +2 -1
  85. package/src/geoarrow-loader.ts +2 -5
  86. package/src/index.ts +11 -4
  87. package/src/lib/arrow-table-batch.ts +2 -1
  88. package/src/lib/arrow-table.ts +2 -1
  89. package/src/lib/encode-arrow.ts +2 -1
  90. package/src/lib/encode-geoarrow.ts +2 -1
  91. package/src/parsers/parse-arrow-in-batches.ts +9 -2
  92. package/src/parsers/parse-arrow-sync.ts +8 -2
  93. package/src/parsers/parse-geoarrow-in-batches.ts +2 -1
  94. package/src/parsers/parse-geoarrow-sync.ts +2 -1
  95. package/src/schema/arrow-type-utils.ts +2 -1
  96. package/src/schema/convert-arrow-schema.ts +2 -1
  97. package/src/tables/convert-arrow-to-columnar-table.ts +3 -1
  98. package/src/tables/convert-arrow-to-geojson-table.ts +20 -8
  99. package/src/tables/convert-columnar-to-row-table.ts +3 -1
  100. package/src/tables/convert-table-to-arrow.ts +2 -1
  101. package/src/triangulate-on-worker.ts +53 -9
  102. package/src/types.ts +2 -1
  103. package/src/workers/arrow-worker.ts +2 -1
  104. package/src/workers/hard-clone.ts +162 -0
  105. package/src/workers/triangulation-worker-node.ts +2 -1
  106. package/src/workers/triangulation-worker.ts +59 -4
  107. package/dist/geoarrow/convert-geoarrow-to-geojson.d.ts +0 -20
  108. package/dist/geoarrow/convert-geoarrow-to-geojson.d.ts.map +0 -1
  109. package/dist/geoarrow/convert-geoarrow-to-geojson.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,KAAK,aAAa,GAAG,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,WAAW,CAAC;AAElG,KAAK,eAAe,GAAG,YAAY,GAAG,YAAY,CAAC;AAEnD,KAAK,UAAU,GAAG,aAAa,GAAG,eAAe,CAAC;AAElD,MAAM,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;AAEnD,oBAAY,YAAY;IACtB,KAAK,IAAA;IACL,IAAI,IAAA;CACL"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAIA,KAAK,aAAa,GAAG,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,WAAW,CAAC;AAElG,KAAK,eAAe,GAAG,YAAY,GAAG,YAAY,CAAC;AAEnD,KAAK,UAAU,GAAG,aAAa,GAAG,eAAe,CAAC;AAElD,MAAM,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;AAEnD,oBAAY,YAAY;IACtB,KAAK,IAAA;IACL,IAAI,IAAA;CACL"}
package/dist/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","names":["VECTOR_TYPES"],"sources":["../src/types.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\ntype TypedIntArray = Int8Array | Uint8Array | Int16Array | Uint16Array | Int32Array | Uint32Array;\n\ntype TypedFloatArray = Float32Array | Float64Array;\n\ntype TypedArray = TypedIntArray | TypedFloatArray;\n\nexport type AnyArrayType = Array<any> | TypedArray;\n\nexport enum VECTOR_TYPES {\n FLOAT,\n DATE\n}\n"],"mappings":"AAWA,WAAYA,YAAY,aAAZA,YAAY;EAAZA,YAAY,CAAZA,YAAY;EAAZA,YAAY,CAAZA,YAAY;EAAA,OAAZA,YAAY;AAAA"}
1
+ {"version":3,"file":"types.js","names":["VECTOR_TYPES"],"sources":["../src/types.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\ntype TypedIntArray = Int8Array | Uint8Array | Int16Array | Uint16Array | Int32Array | Uint32Array;\n\ntype TypedFloatArray = Float32Array | Float64Array;\n\ntype TypedArray = TypedIntArray | TypedFloatArray;\n\nexport type AnyArrayType = Array<any> | TypedArray;\n\nexport enum VECTOR_TYPES {\n FLOAT,\n DATE\n}\n"],"mappings":"AAYA,WAAYA,YAAY,aAAZA,YAAY;EAAZA,YAAY,CAAZA,YAAY;EAAZA,YAAY,CAAZA,YAAY;EAAA,OAAZA,YAAY;AAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"arrow-worker.js","names":["createLoaderWorker","ArrowLoader"],"sources":["../../src/workers/arrow-worker.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {ArrowLoader} from '../arrow-loader';\n\ncreateLoaderWorker(ArrowLoader);\n"],"mappings":"AAGA,SAAQA,kBAAkB,QAAO,0BAA0B;AAAC,SACpDC,WAAW;AAEnBD,kBAAkB,CAACC,WAAW,CAAC"}
1
+ {"version":3,"file":"arrow-worker.js","names":["createLoaderWorker","ArrowLoader"],"sources":["../../src/workers/arrow-worker.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {ArrowLoader} from '../arrow-loader';\n\ncreateLoaderWorker(ArrowLoader);\n"],"mappings":"AAIA,SAAQA,kBAAkB,QAAO,0BAA0B;AAAC,SACpDC,WAAW;AAEnBD,kBAAkB,CAACC,WAAW,CAAC"}
@@ -0,0 +1,23 @@
1
+ import * as arrow from 'apache-arrow';
2
+ /**
3
+ * Clone an Arrow JS Data or Vector, detaching from an existing ArrayBuffer if
4
+ * it is shared with other.
5
+ *
6
+ * The purpose of this function is to enable transferring a `Data` instance,
7
+ * e.g. to a web worker, without neutering any other data.
8
+ *
9
+ * Any internal buffers that are a slice of a larger `ArrayBuffer` (i.e. where
10
+ * the typed array's `byteOffset` is not `0` and where its `byteLength` does not
11
+ * match its `array.buffer.byteLength`) are copied into new `ArrayBuffers`.
12
+ *
13
+ * If `force` is `true`, always clone internal buffers, even if not shared. If
14
+ * the default, `false`, any internal buffers that are **not** a slice of a
15
+ * larger `ArrayBuffer` will not be copied.
16
+ */
17
+ export declare function hardClone<T extends arrow.DataType>(input: arrow.Data<T>, force?: boolean): arrow.Data<T>;
18
+ export declare function hardClone<T extends arrow.DataType>(input: arrow.Vector<T>, force?: boolean): arrow.Vector<T>;
19
+ /**
20
+ * Test whether an arrow.Data instance is a slice of a larger `ArrayBuffer`.
21
+ */
22
+ export declare function isShared<T extends arrow.DataType>(data: arrow.Data<T> | arrow.Vector<T>): boolean;
23
+ //# sourceMappingURL=hard-clone.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hard-clone.d.ts","sourceRoot":"","sources":["../../src/workers/hard-clone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AActC;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,KAAK,CAAC,QAAQ,EAChD,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EACpB,KAAK,CAAC,EAAE,OAAO,GACd,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,wBAAgB,SAAS,CAAC,CAAC,SAAS,KAAK,CAAC,QAAQ,EAChD,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EACtB,KAAK,CAAC,EAAE,OAAO,GACd,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAuDnB;;GAEG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAiCjG"}
@@ -0,0 +1,57 @@
1
+ import * as arrow from 'apache-arrow';
2
+ export function hardClone(data) {
3
+ let force = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
4
+ if ('data' in data) {
5
+ return new arrow.Vector(data.data.map(data => hardClone(data, force)));
6
+ }
7
+ const clonedChildren = [];
8
+ for (const childData of data.children) {
9
+ clonedChildren.push(hardClone(childData, force));
10
+ }
11
+ let clonedDictionary;
12
+ if (data.dictionary !== undefined) {
13
+ clonedDictionary = hardClone(data.dictionary, force);
14
+ }
15
+ const clonedBuffers = {
16
+ [arrow.BufferType.OFFSET]: cloneBuffer(data.buffers[arrow.BufferType.OFFSET], force),
17
+ [arrow.BufferType.DATA]: cloneBuffer(data.buffers[arrow.BufferType.DATA], force),
18
+ [arrow.BufferType.VALIDITY]: cloneBuffer(data.buffers[arrow.BufferType.VALIDITY], force),
19
+ [arrow.BufferType.TYPE]: cloneBuffer(data.buffers[arrow.BufferType.TYPE], force)
20
+ };
21
+ return new arrow.Data(data.type, data.offset, data.length, data._nullCount, clonedBuffers, clonedChildren, clonedDictionary);
22
+ }
23
+ export function isShared(data) {
24
+ if ('data' in data) {
25
+ return data.data.some(data => isShared(data));
26
+ }
27
+ for (const childData of data.children) {
28
+ if (isShared(childData)) {
29
+ return true;
30
+ }
31
+ }
32
+ if (data.dictionary !== undefined) {
33
+ if (isShared(data.dictionary)) {
34
+ return true;
35
+ }
36
+ }
37
+ const bufferTypes = [arrow.BufferType.OFFSET, arrow.BufferType.DATA, arrow.BufferType.VALIDITY, arrow.BufferType.TYPE];
38
+ for (const bufferType of bufferTypes) {
39
+ if (data.buffers[bufferType] !== undefined && isTypedArraySliced(data.buffers[bufferType])) {
40
+ return true;
41
+ }
42
+ }
43
+ return false;
44
+ }
45
+ function isTypedArraySliced(arr) {
46
+ return !(arr.byteOffset === 0 && arr.byteLength === arr.buffer.byteLength);
47
+ }
48
+ function cloneBuffer(arr, force) {
49
+ if (arr === undefined) {
50
+ return arr;
51
+ }
52
+ if (!force && !isTypedArraySliced(arr)) {
53
+ return arr;
54
+ }
55
+ return arr.slice();
56
+ }
57
+ //# sourceMappingURL=hard-clone.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hard-clone.js","names":["arrow","hardClone","data","force","arguments","length","undefined","Vector","map","clonedChildren","childData","children","push","clonedDictionary","dictionary","clonedBuffers","BufferType","OFFSET","cloneBuffer","buffers","DATA","VALIDITY","TYPE","Data","type","offset","_nullCount","isShared","some","bufferTypes","bufferType","isTypedArraySliced","arr","byteOffset","byteLength","buffer","slice"],"sources":["../../src/workers/hard-clone.ts"],"sourcesContent":["import * as arrow from 'apache-arrow';\nimport type {Buffers} from 'apache-arrow/data';\n\ntype TypedArray =\n | Uint8Array\n | Uint8ClampedArray\n | Uint16Array\n | Uint32Array\n | Int8Array\n | Int16Array\n | Int32Array\n | Float32Array\n | Float64Array;\n\n/**\n * Clone an Arrow JS Data or Vector, detaching from an existing ArrayBuffer if\n * it is shared with other.\n *\n * The purpose of this function is to enable transferring a `Data` instance,\n * e.g. to a web worker, without neutering any other data.\n *\n * Any internal buffers that are a slice of a larger `ArrayBuffer` (i.e. where\n * the typed array's `byteOffset` is not `0` and where its `byteLength` does not\n * match its `array.buffer.byteLength`) are copied into new `ArrayBuffers`.\n *\n * If `force` is `true`, always clone internal buffers, even if not shared. If\n * the default, `false`, any internal buffers that are **not** a slice of a\n * larger `ArrayBuffer` will not be copied.\n */\nexport function hardClone<T extends arrow.DataType>(\n input: arrow.Data<T>,\n force?: boolean\n): arrow.Data<T>;\nexport function hardClone<T extends arrow.DataType>(\n input: arrow.Vector<T>,\n force?: boolean\n): arrow.Vector<T>;\n\nexport function hardClone<T extends arrow.DataType>(\n data: arrow.Data<T> | arrow.Vector<T>,\n force: boolean = false\n): arrow.Data<T> | arrow.Vector<T> {\n // Check if `data` is an arrow.Vector\n if ('data' in data) {\n return new arrow.Vector(data.data.map((data) => hardClone(data, force)));\n }\n\n // Clone each of the children, recursively\n const clonedChildren: arrow.Data[] = [];\n for (const childData of data.children) {\n clonedChildren.push(hardClone(childData, force));\n }\n\n // Clone the dictionary if there is one\n let clonedDictionary: arrow.Vector | undefined;\n if (data.dictionary !== undefined) {\n clonedDictionary = hardClone(data.dictionary, force);\n }\n\n // Buffers can have up to four entries. Each of these can be `undefined` for\n // one or more array types.\n //\n // - OFFSET: value offsets for variable size list types\n // - DATA: the underlying data\n // - VALIDITY: the null buffer. This may be empty or undefined if all elements\n // are non-null/valid.\n // - TYPE: type ids for a union type.\n const clonedBuffers: Buffers<T> = {\n [arrow.BufferType.OFFSET]: cloneBuffer(data.buffers[arrow.BufferType.OFFSET], force),\n [arrow.BufferType.DATA]: cloneBuffer(data.buffers[arrow.BufferType.DATA], force),\n [arrow.BufferType.VALIDITY]: cloneBuffer(data.buffers[arrow.BufferType.VALIDITY], force),\n [arrow.BufferType.TYPE]: cloneBuffer(data.buffers[arrow.BufferType.TYPE], force)\n };\n\n // Note: the data.offset is passed on so that a sliced Data instance will not\n // be \"un-sliced\". However keep in mind that this means we're cloning the\n // _original backing buffer_, not only the portion of the Data that was\n // sliced.\n return new arrow.Data(\n data.type,\n data.offset,\n data.length,\n // @ts-expect-error _nullCount is protected. We're using it here to mimic\n // `Data.clone`\n data._nullCount,\n clonedBuffers,\n clonedChildren,\n clonedDictionary\n );\n}\n\n/**\n * Test whether an arrow.Data instance is a slice of a larger `ArrayBuffer`.\n */\nexport function isShared<T extends arrow.DataType>(data: arrow.Data<T> | arrow.Vector<T>): boolean {\n // Loop over arrow.Vector\n if ('data' in data) {\n return data.data.some((data) => isShared(data));\n }\n\n // Check child data\n for (const childData of data.children) {\n if (isShared(childData)) {\n return true;\n }\n }\n\n // Check dictionary\n if (data.dictionary !== undefined) {\n if (isShared(data.dictionary)) {\n return true;\n }\n }\n\n const bufferTypes = [\n arrow.BufferType.OFFSET,\n arrow.BufferType.DATA,\n arrow.BufferType.VALIDITY,\n arrow.BufferType.TYPE\n ];\n for (const bufferType of bufferTypes) {\n if (data.buffers[bufferType] !== undefined && isTypedArraySliced(data.buffers[bufferType])) {\n return true;\n }\n }\n\n return false;\n}\n\n/**\n * Returns true if the current typed array is a partial slice on a larger\n * ArrayBuffer\n */\nfunction isTypedArraySliced(arr: TypedArray): boolean {\n return !(arr.byteOffset === 0 && arr.byteLength === arr.buffer.byteLength);\n}\n\n/**\n * If a slice of a larger ArrayBuffer, clone to a fresh `ArrayBuffer`.\n *\n * If `force` is `true`, always clone the array, even if not shared.\n */\nfunction cloneBuffer<A extends TypedArray | undefined>(arr: A, force: boolean): A {\n // Not all buffer types are defined for every type of Arrow array. E.g.\n // `arrow.BufferType.TYPE` is only defined for the Union type.\n if (arr === undefined) {\n return arr;\n }\n\n // The current array is not a part of a larger ArrayBuffer, don't clone it\n if (!force && !isTypedArraySliced(arr)) {\n return arr;\n }\n\n // Note: TypedArray.slice() **copies** into a new ArrayBuffer\n\n // @ts-expect-error 'Uint8Array' is assignable to the constraint of type 'A',\n // but 'A' could be instantiated with a different subtype of constraint\n // 'TypedArray'\n // We know from arr.slice that it will always return the same\n return arr.slice();\n}\n"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"triangulation-worker-node.d.ts","sourceRoot":"","sources":["../../src/workers/triangulation-worker-node.ts"],"names":[],"mappings":"AAGA,OAAO,wBAAwB,CAAC"}
1
+ {"version":3,"file":"triangulation-worker-node.d.ts","sourceRoot":"","sources":["../../src/workers/triangulation-worker-node.ts"],"names":[],"mappings":"AAIA,OAAO,wBAAwB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"triangulation-worker-node.js","names":[],"sources":["../../src/workers/triangulation-worker-node.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport './triangulation-worker';\n"],"mappings":""}
1
+ {"version":3,"file":"triangulation-worker-node.js","names":[],"sources":["../../src/workers/triangulation-worker-node.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport './triangulation-worker';\n"],"mappings":""}
@@ -1,5 +1,6 @@
1
+ import * as arrow from 'apache-arrow';
1
2
  import { createWorker } from '@loaders.gl/worker-utils';
2
- import { getTriangleIndices } from "../geoarrow/convert-geoarrow-to-binary-geometry.js";
3
+ import { getTriangleIndices, getBinaryGeometriesFromArrow } from "../geoarrow/convert-geoarrow-to-binary-geometry.js";
3
4
  createWorker(async function (data) {
4
5
  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
5
6
  const input = data;
@@ -9,6 +10,8 @@ createWorker(async function (data) {
9
10
  return input;
10
11
  case 'triangulate':
11
12
  return triangulateBatch(data);
13
+ case 'parse-geoarrow':
14
+ return parseGeoArrowBatch(data);
12
15
  default:
13
16
  throw new Error(`TriangulationWorker: Unsupported operation ${operation}. Expected 'triangulate'`);
14
17
  }
@@ -18,7 +21,39 @@ function triangulateBatch(data) {
18
21
  const triangleIndices = getTriangleIndices(data.polygonIndices, data.primitivePolygonIndices, data.flatCoordinateArray, data.nDim);
19
22
  return {
20
23
  ...data,
21
- triangleIndices
24
+ ...(triangleIndices ? {
25
+ triangleIndices
26
+ } : {})
27
+ };
28
+ }
29
+ function parseGeoArrowBatch(data) {
30
+ let binaryDataFromGeoArrow = null;
31
+ const {
32
+ chunkData,
33
+ chunkIndex,
34
+ chunkOffset,
35
+ geometryEncoding,
36
+ calculateMeanCenters,
37
+ triangle
38
+ } = data;
39
+ const arrowData = new arrow.Data(chunkData.type, chunkData.offset, chunkData.length, chunkData.nullCount, chunkData.buffers, chunkData.children, chunkData.dictionary);
40
+ const geometryColumn = arrow.makeVector(arrowData);
41
+ if (geometryColumn) {
42
+ const options = {
43
+ calculateMeanCenters,
44
+ triangle,
45
+ chunkIndex: 0,
46
+ chunkOffset
47
+ };
48
+ binaryDataFromGeoArrow = getBinaryGeometriesFromArrow(geometryColumn, geometryEncoding, options);
49
+ return {
50
+ binaryDataFromGeoArrow,
51
+ chunkIndex
52
+ };
53
+ }
54
+ return {
55
+ binaryDataFromGeoArrow,
56
+ chunkIndex
22
57
  };
23
58
  }
24
59
  //# sourceMappingURL=triangulation-worker.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"triangulation-worker.js","names":["createWorker","getTriangleIndices","data","options","arguments","length","undefined","input","operation","triangulateBatch","Error","console","error","triangleIndices","polygonIndices","primitivePolygonIndices","flatCoordinateArray","nDim"],"sources":["../../src/workers/triangulation-worker.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {createWorker} from '@loaders.gl/worker-utils';\nimport {getTriangleIndices} from '../geoarrow/convert-geoarrow-to-binary-geometry';\nimport type {\n TriangulationWorkerInput,\n TriangulateInput,\n TriangulateResult\n} from '../triangulate-on-worker';\n\ncreateWorker(async (data, options = {}) => {\n const input = data as TriangulationWorkerInput;\n const operation = input?.operation;\n switch (operation) {\n case 'test':\n return input;\n case 'triangulate':\n return triangulateBatch(data);\n default:\n throw new Error(\n `TriangulationWorker: Unsupported operation ${operation}. Expected 'triangulate'`\n );\n }\n});\n\nfunction triangulateBatch(data: TriangulateInput): TriangulateResult {\n // Parse any WKT/WKB geometries\n // Build binary geometries\n // Call earcut and triangulate\n console.error('TriangulationWorker: tessellating batch', data);\n const triangleIndices = getTriangleIndices(\n data.polygonIndices,\n data.primitivePolygonIndices,\n data.flatCoordinateArray,\n data.nDim\n );\n return {...data, triangleIndices};\n}\n"],"mappings":"AAGA,SAAQA,YAAY,QAAO,0BAA0B;AAAC,SAC9CC,kBAAkB;AAO1BD,YAAY,CAAC,gBAAOE,IAAI,EAAmB;EAAA,IAAjBC,OAAO,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EACpC,MAAMG,KAAK,GAAGL,IAAgC;EAC9C,MAAMM,SAAS,GAAGD,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEC,SAAS;EAClC,QAAQA,SAAS;IACf,KAAK,MAAM;MACT,OAAOD,KAAK;IACd,KAAK,aAAa;MAChB,OAAOE,gBAAgB,CAACP,IAAI,CAAC;IAC/B;MACE,MAAM,IAAIQ,KAAK,CACZ,8CAA6CF,SAAU,0BAC1D,CAAC;EACL;AACF,CAAC,CAAC;AAEF,SAASC,gBAAgBA,CAACP,IAAsB,EAAqB;EAInES,OAAO,CAACC,KAAK,CAAC,yCAAyC,EAAEV,IAAI,CAAC;EAC9D,MAAMW,eAAe,GAAGZ,kBAAkB,CACxCC,IAAI,CAACY,cAAc,EACnBZ,IAAI,CAACa,uBAAuB,EAC5Bb,IAAI,CAACc,mBAAmB,EACxBd,IAAI,CAACe,IACP,CAAC;EACD,OAAO;IAAC,GAAGf,IAAI;IAAEW;EAAe,CAAC;AACnC"}
1
+ {"version":3,"file":"triangulation-worker.js","names":["arrow","createWorker","getTriangleIndices","getBinaryGeometriesFromArrow","data","options","arguments","length","undefined","input","operation","triangulateBatch","parseGeoArrowBatch","Error","console","error","triangleIndices","polygonIndices","primitivePolygonIndices","flatCoordinateArray","nDim","binaryDataFromGeoArrow","chunkData","chunkIndex","chunkOffset","geometryEncoding","calculateMeanCenters","triangle","arrowData","Data","type","offset","nullCount","buffers","children","dictionary","geometryColumn","makeVector"],"sources":["../../src/workers/triangulation-worker.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport * as arrow from 'apache-arrow';\nimport {createWorker} from '@loaders.gl/worker-utils';\nimport {\n getTriangleIndices,\n getBinaryGeometriesFromArrow,\n BinaryDataFromGeoArrow\n} from '../geoarrow/convert-geoarrow-to-binary-geometry';\nimport type {\n TriangulationWorkerInput,\n TriangulateInput,\n TriangulateResult,\n ParseGeoArrowInput,\n ParseGeoArrowResult\n} from '../triangulate-on-worker';\n\ncreateWorker(async (data, options = {}) => {\n const input = data as TriangulationWorkerInput;\n const operation = input?.operation;\n switch (operation) {\n case 'test':\n return input;\n case 'triangulate':\n return triangulateBatch(data);\n case 'parse-geoarrow':\n return parseGeoArrowBatch(data);\n default:\n throw new Error(\n `TriangulationWorker: Unsupported operation ${operation}. Expected 'triangulate'`\n );\n }\n});\n\nfunction triangulateBatch(data: TriangulateInput): TriangulateResult {\n // Parse any WKT/WKB geometries\n // Build binary geometries\n // Call earcut and triangulate\n console.error('TriangulationWorker: tessellating batch', data);\n const triangleIndices = getTriangleIndices(\n data.polygonIndices,\n data.primitivePolygonIndices,\n data.flatCoordinateArray,\n data.nDim\n );\n return {...data, ...(triangleIndices ? {triangleIndices} : {})};\n}\n\n/**\n * Reading the arrow file into memory is very fast. Parsing the geoarrow column is slow, and blocking the main thread.\n * To address this issue, we can move the parsing job from main thread to parallel web workers.\n * Each web worker will parse one chunk/batch of geoarrow column, and return binary geometries to main thread.\n * The app on the main thread will render the binary geometries and the parsing will not block the main thread.\n *\n * @param data\n * @returns\n */\nfunction parseGeoArrowBatch(data: ParseGeoArrowInput): ParseGeoArrowResult {\n let binaryDataFromGeoArrow: BinaryDataFromGeoArrow | null = null;\n const {chunkData, chunkIndex, chunkOffset, geometryEncoding, calculateMeanCenters, triangle} =\n data;\n // rebuild chunkData that is only for geoarrow column\n const arrowData = new arrow.Data(\n chunkData.type,\n chunkData.offset,\n chunkData.length,\n chunkData.nullCount,\n chunkData.buffers,\n chunkData.children,\n chunkData.dictionary\n );\n // rebuild geometry column with chunkData\n const geometryColumn = arrow.makeVector(arrowData);\n if (geometryColumn) {\n // NOTE: for a rebuild arrow.Vector, there is only one chunk, so chunkIndex is always 0\n const options = {calculateMeanCenters, triangle, chunkIndex: 0, chunkOffset};\n binaryDataFromGeoArrow = getBinaryGeometriesFromArrow(\n geometryColumn,\n geometryEncoding,\n options\n );\n // NOTE: here binaryGeometry will be copied to main thread\n return {\n binaryDataFromGeoArrow,\n chunkIndex\n };\n }\n return {\n binaryDataFromGeoArrow,\n chunkIndex\n };\n}\n"],"mappings":"AAIA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,SAAQC,YAAY,QAAO,0BAA0B;AAAC,SAEpDC,kBAAkB,EAClBC,4BAA4B;AAW9BF,YAAY,CAAC,gBAAOG,IAAI,EAAmB;EAAA,IAAjBC,OAAO,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EACpC,MAAMG,KAAK,GAAGL,IAAgC;EAC9C,MAAMM,SAAS,GAAGD,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEC,SAAS;EAClC,QAAQA,SAAS;IACf,KAAK,MAAM;MACT,OAAOD,KAAK;IACd,KAAK,aAAa;MAChB,OAAOE,gBAAgB,CAACP,IAAI,CAAC;IAC/B,KAAK,gBAAgB;MACnB,OAAOQ,kBAAkB,CAACR,IAAI,CAAC;IACjC;MACE,MAAM,IAAIS,KAAK,CACZ,8CAA6CH,SAAU,0BAC1D,CAAC;EACL;AACF,CAAC,CAAC;AAEF,SAASC,gBAAgBA,CAACP,IAAsB,EAAqB;EAInEU,OAAO,CAACC,KAAK,CAAC,yCAAyC,EAAEX,IAAI,CAAC;EAC9D,MAAMY,eAAe,GAAGd,kBAAkB,CACxCE,IAAI,CAACa,cAAc,EACnBb,IAAI,CAACc,uBAAuB,EAC5Bd,IAAI,CAACe,mBAAmB,EACxBf,IAAI,CAACgB,IACP,CAAC;EACD,OAAO;IAAC,GAAGhB,IAAI;IAAE,IAAIY,eAAe,GAAG;MAACA;IAAe,CAAC,GAAG,CAAC,CAAC;EAAC,CAAC;AACjE;AAWA,SAASJ,kBAAkBA,CAACR,IAAwB,EAAuB;EACzE,IAAIiB,sBAAqD,GAAG,IAAI;EAChE,MAAM;IAACC,SAAS;IAAEC,UAAU;IAAEC,WAAW;IAAEC,gBAAgB;IAAEC,oBAAoB;IAAEC;EAAQ,CAAC,GAC1FvB,IAAI;EAEN,MAAMwB,SAAS,GAAG,IAAI5B,KAAK,CAAC6B,IAAI,CAC9BP,SAAS,CAACQ,IAAI,EACdR,SAAS,CAACS,MAAM,EAChBT,SAAS,CAACf,MAAM,EAChBe,SAAS,CAACU,SAAS,EACnBV,SAAS,CAACW,OAAO,EACjBX,SAAS,CAACY,QAAQ,EAClBZ,SAAS,CAACa,UACZ,CAAC;EAED,MAAMC,cAAc,GAAGpC,KAAK,CAACqC,UAAU,CAACT,SAAS,CAAC;EAClD,IAAIQ,cAAc,EAAE;IAElB,MAAM/B,OAAO,GAAG;MAACqB,oBAAoB;MAAEC,QAAQ;MAAEJ,UAAU,EAAE,CAAC;MAAEC;IAAW,CAAC;IAC5EH,sBAAsB,GAAGlB,4BAA4B,CACnDiC,cAAc,EACdX,gBAAgB,EAChBpB,OACF,CAAC;IAED,OAAO;MACLgB,sBAAsB;MACtBE;IACF,CAAC;EACH;EACA,OAAO;IACLF,sBAAsB;IACtBE;EACF,CAAC;AACH"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loaders.gl/arrow",
3
- "version": "4.0.4",
3
+ "version": "4.1.0-alpha.10",
4
4
  "description": "Simple columnar table loader for the Apache Arrow format",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -12,21 +12,26 @@
12
12
  "url": "https://github.com/visgl/loaders.gl"
13
13
  },
14
14
  "keywords": [
15
- "webgl",
16
15
  "loader",
17
- "3d",
18
- "mesh",
19
- "point cloud",
20
- "PLY"
16
+ "parser",
17
+ "writer",
18
+ "encoder",
19
+ "geoarrow",
20
+ "apache-arrow",
21
+ "arrow",
22
+ "binary columnar",
23
+ "cloud native",
24
+ "webgl",
25
+ "webgpu"
21
26
  ],
22
27
  "types": "dist/index.d.ts",
23
28
  "main": "dist/index.cjs",
24
29
  "module": "dist/index.js",
25
30
  "exports": {
26
31
  ".": {
32
+ "types": "./dist/index.d.ts",
27
33
  "import": "./dist/index.js",
28
- "require": "./dist/index.cjs",
29
- "types": "./dist/index.d.ts"
34
+ "require": "./dist/index.cjs"
30
35
  }
31
36
  },
32
37
  "sideEffects": false,
@@ -47,11 +52,12 @@
47
52
  "build-worker2": "esbuild src/workers/arrow-worker.ts --bundle --outfile=dist/arrow-worker.js --platform=browser --external:{stream}"
48
53
  },
49
54
  "dependencies": {
50
- "@loaders.gl/gis": "4.0.4",
51
- "@loaders.gl/loader-utils": "4.0.4",
52
- "@loaders.gl/schema": "4.0.4",
55
+ "@loaders.gl/gis": "4.1.0-alpha.10",
56
+ "@loaders.gl/loader-utils": "4.1.0-alpha.10",
57
+ "@loaders.gl/schema": "4.1.0-alpha.10",
58
+ "@loaders.gl/wkt": "4.1.0-alpha.10",
53
59
  "@math.gl/polygon": "4.0.0",
54
60
  "apache-arrow": "^13.0.0"
55
61
  },
56
- "gitHead": "4dc810fa04bb400f4aedfef98a83c7ef882ed3d7"
62
+ "gitHead": "19f43c2d90d8b50860c3f8e487429779a386287d"
57
63
  }
@@ -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 {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
@@ -19,6 +20,7 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
19
20
  export type ArrowLoaderOptions = LoaderOptions & {
20
21
  arrow?: {
21
22
  shape: 'arrow-table' | 'columnar-table' | 'array-row-table' | 'object-row-table';
23
+ batchDebounceMs?: number;
22
24
  };
23
25
  };
24
26
 
@@ -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 * as arrow from 'apache-arrow';
@@ -8,6 +9,15 @@ import {GeoArrowEncoding} from '@loaders.gl/gis';
8
9
  import {updateBoundsFromGeoArrowSamples} from './get-arrow-bounds';
9
10
  import {TypedArray} from '@loaders.gl/loader-utils';
10
11
 
12
+ /**
13
+ * Binary geometry type
14
+ */
15
+ enum BinaryGeometryType {
16
+ points = 'points',
17
+ lines = 'lines',
18
+ polygons = 'polygons'
19
+ }
20
+
11
21
  /**
12
22
  * Binary data from geoarrow column and can be used by e.g. deck.gl GeojsonLayer
13
23
  */
@@ -36,7 +46,7 @@ type BinaryGeometryContent = {
36
46
  geomOffset: Int32Array;
37
47
  /** Array of geometry indicies: the start index of each geometry */
38
48
  geometryIndicies: Uint16Array;
39
- /** (Optional) indices of triangels returned from polygon tessellation (Polygon only) */
49
+ /** (Optional) indices of triangels returned from polygon triangulation (Polygon only) */
40
50
  triangles?: Uint32Array;
41
51
  /** (Optional) array of mean center of each geometry */
42
52
  meanCenters?: Float64Array;
@@ -45,19 +55,25 @@ type BinaryGeometryContent = {
45
55
  /**
46
56
  * binary geometry template, see deck.gl BinaryGeometry
47
57
  */
48
- export const BINARY_GEOMETRY_TEMPLATE = {
49
- globalFeatureIds: {value: new Uint32Array(0), size: 1},
50
- positions: {value: new Float32Array(0), size: 2},
51
- properties: [],
52
- numericProps: {},
53
- featureIds: {value: new Uint32Array(0), size: 1}
54
- };
58
+ export function getBinaryGeometryTemplate() {
59
+ return {
60
+ globalFeatureIds: {value: new Uint32Array(0), size: 1},
61
+ positions: {value: new Float32Array(0), size: 2},
62
+ properties: [],
63
+ numericProps: {},
64
+ featureIds: {value: new Uint32Array(0), size: 1}
65
+ };
66
+ }
55
67
 
56
68
  export type BinaryGeometriesFromArrowOptions = {
57
69
  /** option to specify which chunk to get binary geometries from, for progressive rendering */
58
70
  chunkIndex?: number;
71
+ /** The offset (beginning index of rows) of input chunk. Used for reconstructing globalFeatureIds in web workers */
72
+ chunkOffset?: number;
59
73
  /** option to get mean centers from geometries, for polygon filtering */
60
- meanCenter?: boolean;
74
+ calculateMeanCenters?: boolean;
75
+ /** option to compute the triangle indices by tesselating polygons */
76
+ triangulate?: boolean;
61
77
  };
62
78
 
63
79
  /**
@@ -79,14 +95,17 @@ export function getBinaryGeometriesFromArrow(
79
95
  line: geoEncoding === 'geoarrow.multilinestring' || geoEncoding === 'geoarrow.linestring'
80
96
  };
81
97
 
82
- const chunks = options?.chunkIndex ? [geoColumn.data[options?.chunkIndex]] : geoColumn.data;
98
+ const chunks =
99
+ options?.chunkIndex !== undefined && options?.chunkIndex >= 0
100
+ ? [geoColumn.data[options?.chunkIndex]]
101
+ : geoColumn.data;
83
102
  let bounds: [number, number, number, number] = [Infinity, Infinity, -Infinity, -Infinity];
84
- let globalFeatureIdOffset = 0;
103
+ let globalFeatureIdOffset = options?.chunkOffset || 0;
85
104
  const binaryGeometries: BinaryFeatures[] = [];
86
105
 
87
106
  chunks.forEach((chunk) => {
88
107
  const {featureIds, flatCoordinateArray, nDim, geomOffset, triangles} =
89
- getBinaryGeometriesFromChunk(chunk, geoEncoding);
108
+ getBinaryGeometriesFromChunk(chunk, geoEncoding, options);
90
109
 
91
110
  const globalFeatureIds = new Uint32Array(featureIds.length);
92
111
  for (let i = 0; i < featureIds.length; i++) {
@@ -100,6 +119,7 @@ export function getBinaryGeometriesFromArrow(
100
119
  size: nDim
101
120
  },
102
121
  featureIds: {value: featureIds, size: 1},
122
+ // eslint-disable-next-line no-loop-func
103
123
  properties: [...Array(chunk.length).keys()].map((i) => ({
104
124
  index: i + globalFeatureIdOffset
105
125
  }))
@@ -112,18 +132,18 @@ export function getBinaryGeometriesFromArrow(
112
132
  shape: 'binary-feature-collection',
113
133
  points: {
114
134
  type: 'Point',
115
- ...BINARY_GEOMETRY_TEMPLATE,
135
+ ...getBinaryGeometryTemplate(),
116
136
  ...(featureTypes.point ? binaryContent : {})
117
137
  },
118
138
  lines: {
119
139
  type: 'LineString',
120
- ...BINARY_GEOMETRY_TEMPLATE,
140
+ ...getBinaryGeometryTemplate(),
121
141
  ...(featureTypes.line ? binaryContent : {}),
122
142
  pathIndices: {value: featureTypes.line ? geomOffset : new Uint16Array(0), size: 1}
123
143
  },
124
144
  polygons: {
125
145
  type: 'Polygon',
126
- ...BINARY_GEOMETRY_TEMPLATE,
146
+ ...getBinaryGeometryTemplate(),
127
147
  ...(featureTypes.polygon ? binaryContent : {}),
128
148
  polygonIndices: {
129
149
  // use geomOffset as polygonIndices same as primitivePolygonIndices since we are using earcut to get triangule indices
@@ -145,7 +165,7 @@ export function getBinaryGeometriesFromArrow(
145
165
  binaryGeometries,
146
166
  bounds,
147
167
  featureTypes,
148
- ...(options?.meanCenter
168
+ ...(options?.calculateMeanCenters
149
169
  ? {meanCenters: getMeanCentersFromBinaryGeometries(binaryGeometries)}
150
170
  : {})
151
171
  };
@@ -159,13 +179,13 @@ export function getBinaryGeometriesFromArrow(
159
179
  export function getMeanCentersFromBinaryGeometries(binaryGeometries: BinaryFeatures[]): number[][] {
160
180
  const globalMeanCenters: number[][] = [];
161
181
  binaryGeometries.forEach((binaryGeometry: BinaryFeatures) => {
162
- let binaryGeometryType: string | null = null;
182
+ let binaryGeometryType: keyof typeof BinaryGeometryType | null = null;
163
183
  if (binaryGeometry.points && binaryGeometry.points.positions.value.length > 0) {
164
- binaryGeometryType = 'points';
184
+ binaryGeometryType = BinaryGeometryType.points;
165
185
  } else if (binaryGeometry.lines && binaryGeometry.lines.positions.value.length > 0) {
166
- binaryGeometryType = 'lines';
186
+ binaryGeometryType = BinaryGeometryType.lines;
167
187
  } else if (binaryGeometry.polygons && binaryGeometry.polygons.positions.value.length > 0) {
168
- binaryGeometryType = 'polygons';
188
+ binaryGeometryType = BinaryGeometryType.polygons;
169
189
  }
170
190
 
171
191
  const binaryContent = binaryGeometryType ? binaryGeometry[binaryGeometryType] : null;
@@ -173,7 +193,8 @@ export function getMeanCentersFromBinaryGeometries(binaryGeometries: BinaryFeatu
173
193
  const featureIds = binaryContent.featureIds.value;
174
194
  const flatCoordinateArray = binaryContent.positions.value;
175
195
  const nDim = binaryContent.positions.size;
176
- const primitivePolygonIndices = binaryContent.primitivePolygonIndices?.value;
196
+ const primitivePolygonIndices =
197
+ binaryContent.type === 'Polygon' ? binaryContent.primitivePolygonIndices?.value : undefined;
177
198
 
178
199
  const meanCenters = getMeanCentersFromGeometry(
179
200
  featureIds,
@@ -201,30 +222,33 @@ function getMeanCentersFromGeometry(
201
222
  featureIds: TypedArray,
202
223
  flatCoordinateArray: TypedArray,
203
224
  nDim: number,
204
- geometryType: string,
225
+ geometryType: keyof typeof BinaryGeometryType,
205
226
  primitivePolygonIndices?: TypedArray
206
227
  ) {
207
228
  const meanCenters: number[][] = [];
208
229
  const vertexCount = flatCoordinateArray.length;
209
230
  let vertexIndex = 0;
231
+ let coordIdx = 0;
232
+ let primitiveIdx = 0;
210
233
  while (vertexIndex < vertexCount) {
211
234
  const featureId = featureIds[vertexIndex / nDim];
212
235
  const center = [0, 0];
213
236
  let vertexCountInFeature = 0;
214
- while (vertexIndex < vertexCount && featureIds[vertexIndex / nDim] === featureId) {
237
+ while (vertexIndex < vertexCount && featureIds[coordIdx] === featureId) {
215
238
  if (
216
- geometryType === 'polygons' &&
217
- primitivePolygonIndices &&
218
- primitivePolygonIndices.indexOf(vertexIndex / nDim) >= 0
239
+ geometryType === BinaryGeometryType.polygons &&
240
+ primitivePolygonIndices?.[primitiveIdx] === coordIdx
219
241
  ) {
220
242
  // skip the first point since it is the same as the last point in each ring for polygons
221
243
  vertexIndex += nDim;
244
+ primitiveIdx++;
222
245
  } else {
223
246
  center[0] += flatCoordinateArray[vertexIndex];
224
247
  center[1] += flatCoordinateArray[vertexIndex + 1];
225
248
  vertexIndex += nDim;
226
249
  vertexCountInFeature++;
227
250
  }
251
+ coordIdx += 1;
228
252
  }
229
253
  center[0] /= vertexCountInFeature;
230
254
  center[1] /= vertexCountInFeature;
@@ -237,11 +261,13 @@ function getMeanCentersFromGeometry(
237
261
  * get binary geometries from geoarrow column
238
262
  * @param chunk one chunk/batch of geoarrow column
239
263
  * @param geoEncoding geo encoding of the geoarrow column
264
+ * @param options options for getting binary geometries
240
265
  * @returns BinaryGeometryContent
241
266
  */
242
267
  function getBinaryGeometriesFromChunk(
243
268
  chunk: arrow.Data,
244
- geoEncoding: GeoArrowEncoding
269
+ geoEncoding: GeoArrowEncoding,
270
+ options?: BinaryGeometriesFromArrowOptions
245
271
  ): BinaryGeometryContent {
246
272
  switch (geoEncoding) {
247
273
  case 'geoarrow.point':
@@ -252,7 +278,7 @@ function getBinaryGeometriesFromChunk(
252
278
  return getBinaryLinesFromChunk(chunk, geoEncoding);
253
279
  case 'geoarrow.polygon':
254
280
  case 'geoarrow.multipolygon':
255
- return getBinaryPolygonsFromChunk(chunk, geoEncoding);
281
+ return getBinaryPolygonsFromChunk(chunk, geoEncoding, options);
256
282
  default:
257
283
  throw Error('invalid geoarrow encoding');
258
284
  }
@@ -264,54 +290,68 @@ function getBinaryGeometriesFromChunk(
264
290
  * @param primitivePolygonIndices Indices within positions of the start of each primitive Polygon/ring
265
291
  * @param flatCoordinateArray Array of x, y or x, y, z positions
266
292
  * @param nDim - number of dimensions per position
267
- * @returns
293
+ * @returns triangle indices or null if invalid polygon and earcut fails
268
294
  */
269
295
  export function getTriangleIndices(
270
296
  polygonIndices: Uint16Array,
271
297
  primitivePolygonIndices: Int32Array,
272
298
  flatCoordinateArray: Float64Array,
273
299
  nDim: number
274
- ): Uint32Array {
275
- let primitiveIndex = 0;
276
- const triangles: number[] = [];
277
- // loop polygonIndices to get triangles
278
- for (let i = 0; i < polygonIndices.length - 1; i++) {
279
- const startIdx = polygonIndices[i];
280
- const endIdx = polygonIndices[i + 1];
281
- // get subarray of flatCoordinateArray
282
- const slicedFlatCoords = flatCoordinateArray.subarray(startIdx * nDim, endIdx * nDim);
283
- // get holeIndices for earcut
284
- const holeIndices: number[] = [];
285
- while (primitivePolygonIndices[primitiveIndex] < endIdx) {
286
- if (primitivePolygonIndices[primitiveIndex] > startIdx) {
287
- holeIndices.push(primitivePolygonIndices[primitiveIndex] - startIdx);
300
+ ): Uint32Array | null {
301
+ try {
302
+ let primitiveIndex = 0;
303
+ const triangles: number[] = [];
304
+ // loop polygonIndices to get triangles
305
+ for (let i = 0; i < polygonIndices.length - 1; i++) {
306
+ const startIdx = polygonIndices[i];
307
+ const endIdx = polygonIndices[i + 1];
308
+ // get subarray of flatCoordinateArray
309
+ const slicedFlatCoords = flatCoordinateArray.subarray(startIdx * nDim, endIdx * nDim);
310
+ // get holeIndices for earcut
311
+ const holeIndices: number[] = [];
312
+ while (primitivePolygonIndices[primitiveIndex] < endIdx) {
313
+ if (primitivePolygonIndices[primitiveIndex] > startIdx) {
314
+ holeIndices.push(primitivePolygonIndices[primitiveIndex] - startIdx);
315
+ }
316
+ primitiveIndex++;
317
+ }
318
+ // TODO check if each ring is closed
319
+ const triangleIndices = earcut(
320
+ slicedFlatCoords,
321
+ holeIndices.length > 0 ? holeIndices : undefined,
322
+ nDim
323
+ );
324
+ if (triangleIndices.length === 0) {
325
+ throw Error('earcut failed e.g. invalid polygon');
326
+ }
327
+ for (let j = 0; j < triangleIndices.length; j++) {
328
+ triangles.push(triangleIndices[j] + startIdx);
288
329
  }
289
- primitiveIndex++;
290
330
  }
291
- const triangleIndices = earcut(
292
- slicedFlatCoords,
293
- holeIndices.length > 0 ? holeIndices : undefined,
294
- nDim
295
- );
296
- for (let j = 0; j < triangleIndices.length; j++) {
297
- triangles.push(triangleIndices[j] + startIdx);
331
+ // convert traingles to Uint32Array
332
+ const trianglesUint32 = new Uint32Array(triangles.length);
333
+ for (let i = 0; i < triangles.length; i++) {
334
+ trianglesUint32[i] = triangles[i];
298
335
  }
336
+ return trianglesUint32;
337
+ } catch (error) {
338
+ // if earcut fails, return null
339
+ return null;
299
340
  }
300
- // convert traingles to Uint32Array
301
- const trianglesUint32 = new Uint32Array(triangles.length);
302
- for (let i = 0; i < triangles.length; i++) {
303
- trianglesUint32[i] = triangles[i];
304
- }
305
- return trianglesUint32;
306
341
  }
307
342
 
308
343
  /**
309
344
  * get binary polygons from geoarrow polygon column
310
345
  * @param chunk one chunk of geoarrow polygon column
311
346
  * @param geoEncoding the geo encoding of the geoarrow polygon column
347
+ * @param options options for getting binary geometries
312
348
  * @returns BinaryGeometryContent
313
349
  */
314
- function getBinaryPolygonsFromChunk(chunk: arrow.Data, geoEncoding: string): BinaryGeometryContent {
350
+ function getBinaryPolygonsFromChunk(
351
+ chunk: arrow.Data,
352
+ geoEncoding: string,
353
+ options?: BinaryGeometriesFromArrowOptions
354
+ ): BinaryGeometryContent {
315
355
  const isMultiPolygon = geoEncoding === 'geoarrow.multipolygon';
316
356
 
317
357
  const polygonData = isMultiPolygon ? chunk.children[0] : chunk;
@@ -341,14 +381,17 @@ function getBinaryPolygonsFromChunk(chunk: arrow.Data, geoEncoding: string): Bin
341
381
  }
342
382
  }
343
383
 
344
- const triangles = getTriangleIndices(geometryIndicies, geomOffset, flatCoordinateArray, nDim);
384
+ const triangles = options?.triangulate
385
+ ? getTriangleIndices(geometryIndicies, geomOffset, flatCoordinateArray, nDim)
386
+ : null;
387
+
345
388
  return {
346
389
  featureIds,
347
- flatCoordinateArray,
348
390
  nDim,
391
+ flatCoordinateArray,
349
392
  geomOffset,
350
393
  geometryIndicies,
351
- triangles
394
+ ...(options?.triangulate && triangles ? {triangles} : {})
352
395
  };
353
396
  }
354
397