@loaders.gl/raster 5.0.0-beta.1 → 5.0.0-beta.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 (226) hide show
  1. package/README.md +9 -5
  2. package/THIRD-PARTY-NOTICES.md +1 -1
  3. package/dist/geotiff/advanced.cjs +153 -105
  4. package/dist/geotiff/advanced.cjs.map +4 -4
  5. package/dist/geotiff/advanced.d.ts +4 -3
  6. package/dist/geotiff/advanced.d.ts.map +1 -1
  7. package/dist/geotiff/advanced.js +3 -2
  8. package/dist/geotiff/advanced.js.map +1 -1
  9. package/dist/geotiff/geotiff-loader-types.d.ts +14 -3
  10. package/dist/geotiff/geotiff-loader-types.d.ts.map +1 -1
  11. package/dist/geotiff/geotiff-loader-types.js +12 -2
  12. package/dist/geotiff/geotiff-loader-types.js.map +1 -1
  13. package/dist/geotiff/geotiff-loader.d.ts +9 -8
  14. package/dist/geotiff/geotiff-loader.d.ts.map +1 -1
  15. package/dist/geotiff/geotiff-loader.js +2 -0
  16. package/dist/geotiff/geotiff-loader.js.map +1 -1
  17. package/dist/geotiff/geotiff-raster-loader-types.d.ts.map +1 -1
  18. package/dist/geotiff/geotiff-raster-loader-types.js +2 -2
  19. package/dist/geotiff/geotiff-raster-loader-types.js.map +1 -1
  20. package/dist/geotiff/geotiff-source-loader.d.ts +2 -34
  21. package/dist/geotiff/geotiff-source-loader.d.ts.map +1 -1
  22. package/dist/geotiff/geotiff-source-loader.js +14 -36
  23. package/dist/geotiff/geotiff-source-loader.js.map +1 -1
  24. package/dist/geotiff/lib/ome/load-ome-tiff.d.ts +1 -0
  25. package/dist/geotiff/lib/ome/load-ome-tiff.d.ts.map +1 -1
  26. package/dist/geotiff/lib/ome/load-ome-tiff.js +7 -1
  27. package/dist/geotiff/lib/ome/load-ome-tiff.js.map +1 -1
  28. package/dist/geotiff/lib/ome/omexml.d.ts.map +1 -1
  29. package/dist/geotiff/lib/ome/omexml.js +5 -4
  30. package/dist/geotiff/lib/ome/omexml.js.map +1 -1
  31. package/dist/geotiff/lib/tiff/tiff-gdal-metadata.d.ts.map +1 -1
  32. package/dist/geotiff/lib/tiff/tiff-gdal-metadata.js +6 -5
  33. package/dist/geotiff/lib/tiff/tiff-gdal-metadata.js.map +1 -1
  34. package/dist/geotiff/lib/tiff-pixel-source.d.ts.map +1 -1
  35. package/dist/geotiff/lib/tiff-pixel-source.js +2 -1
  36. package/dist/geotiff/lib/tiff-pixel-source.js.map +1 -1
  37. package/dist/geotiff/loaders.js +1 -1
  38. package/dist/geotiff/loaders.js.map +1 -1
  39. package/dist/geotiff/{ometiff-source-loader-types.d.ts → ometiff-loader-types.d.ts} +7 -7
  40. package/dist/geotiff/ometiff-loader-types.d.ts.map +1 -0
  41. package/dist/geotiff/{ometiff-source-loader-types.js → ometiff-loader-types.js} +6 -6
  42. package/dist/geotiff/ometiff-loader-types.js.map +1 -0
  43. package/dist/geotiff/{ometiff-source-loader.d.ts → ometiff-loader.d.ts} +6 -6
  44. package/dist/geotiff/ometiff-loader.d.ts.map +1 -0
  45. package/dist/geotiff/{ometiff-source-loader.js → ometiff-loader.js} +5 -5
  46. package/dist/geotiff/ometiff-loader.js.map +1 -0
  47. package/dist/geotiff-loader-types.d.ts +2 -0
  48. package/dist/geotiff-loader-types.d.ts.map +1 -0
  49. package/dist/geotiff-loader-types.js +2 -0
  50. package/dist/geotiff-loader-types.js.map +1 -0
  51. package/dist/geotiff-loader.d.ts +2 -0
  52. package/dist/geotiff-loader.d.ts.map +1 -0
  53. package/dist/geotiff-loader.js +2 -0
  54. package/dist/geotiff-loader.js.map +1 -0
  55. package/dist/geotiff-raster-loader-types.d.ts +2 -0
  56. package/dist/geotiff-raster-loader-types.d.ts.map +1 -0
  57. package/dist/geotiff-raster-loader-types.js +2 -0
  58. package/dist/geotiff-raster-loader-types.js.map +1 -0
  59. package/dist/geotiff-raster-loader.d.ts +2 -0
  60. package/dist/geotiff-raster-loader.d.ts.map +1 -0
  61. package/dist/geotiff-raster-loader.js +2 -0
  62. package/dist/geotiff-raster-loader.js.map +1 -0
  63. package/dist/geotiff-source-loader.d.ts +2 -0
  64. package/dist/geotiff-source-loader.d.ts.map +1 -0
  65. package/dist/geotiff-source-loader.js +2 -0
  66. package/dist/geotiff-source-loader.js.map +1 -0
  67. package/dist/index.cjs +37 -67
  68. package/dist/index.cjs.map +3 -3
  69. package/dist/index.d.ts +4 -10
  70. package/dist/index.d.ts.map +1 -1
  71. package/dist/index.js +1 -6
  72. package/dist/index.js.map +1 -1
  73. package/dist/lerc/lerc-loader-types.d.ts +1 -1
  74. package/dist/lerc/lerc-loader-types.js +2 -2
  75. package/dist/lerc/lerc-loader-types.js.map +1 -1
  76. package/dist/lerc-loader-types.d.ts +2 -0
  77. package/dist/lerc-loader-types.d.ts.map +1 -0
  78. package/dist/lerc-loader-types.js +2 -0
  79. package/dist/lerc-loader-types.js.map +1 -0
  80. package/dist/lerc-loader.d.ts +2 -0
  81. package/dist/lerc-loader.d.ts.map +1 -0
  82. package/dist/lerc-loader.js +2 -0
  83. package/dist/lerc-loader.js.map +1 -0
  84. package/dist/ometiff-loader-types.d.ts +2 -0
  85. package/dist/ometiff-loader-types.d.ts.map +1 -0
  86. package/dist/ometiff-loader-types.js +2 -0
  87. package/dist/ometiff-loader-types.js.map +1 -0
  88. package/dist/ometiff-loader.d.ts +2 -0
  89. package/dist/ometiff-loader.d.ts.map +1 -0
  90. package/dist/ometiff-loader.js +2 -0
  91. package/dist/ometiff-loader.js.map +1 -0
  92. package/dist/quantized-mesh-loader-types.d.ts +2 -0
  93. package/dist/quantized-mesh-loader-types.d.ts.map +1 -0
  94. package/dist/quantized-mesh-loader-types.js +2 -0
  95. package/dist/quantized-mesh-loader-types.js.map +1 -0
  96. package/dist/quantized-mesh-loader.d.ts +2 -0
  97. package/dist/quantized-mesh-loader.d.ts.map +1 -0
  98. package/dist/quantized-mesh-loader.js +2 -0
  99. package/dist/quantized-mesh-loader.js.map +1 -0
  100. package/dist/quantized-mesh-worker.js +1847 -1011
  101. package/dist/quantized-mesh-writer.d.ts +2 -0
  102. package/dist/quantized-mesh-writer.d.ts.map +1 -0
  103. package/dist/quantized-mesh-writer.js +2 -0
  104. package/dist/quantized-mesh-writer.js.map +1 -0
  105. package/dist/terrain/heightmap.cjs +2 -333
  106. package/dist/terrain/heightmap.cjs.map +4 -4
  107. package/dist/terrain/heightmap.d.ts +1 -5
  108. package/dist/terrain/heightmap.d.ts.map +1 -1
  109. package/dist/terrain/heightmap.js +0 -3
  110. package/dist/terrain/heightmap.js.map +1 -1
  111. package/dist/terrain/index.cjs +74 -612
  112. package/dist/terrain/index.cjs.map +4 -4
  113. package/dist/terrain/index.d.ts +3 -6
  114. package/dist/terrain/index.d.ts.map +1 -1
  115. package/dist/terrain/index.js +2 -5
  116. package/dist/terrain/index.js.map +1 -1
  117. package/dist/terrain/lib/helpers/skirt.d.ts +2 -9
  118. package/dist/terrain/lib/helpers/skirt.d.ts.map +1 -1
  119. package/dist/terrain/lib/helpers/skirt.js +30 -114
  120. package/dist/terrain/lib/helpers/skirt.js.map +1 -1
  121. package/dist/terrain/lib/parse-terrain.d.ts +2 -0
  122. package/dist/terrain/lib/parse-terrain.d.ts.map +1 -1
  123. package/dist/terrain/lib/parse-terrain.js +23 -38
  124. package/dist/terrain/lib/parse-terrain.js.map +1 -1
  125. package/dist/terrain/lib/terrain-contracts.d.ts +0 -15
  126. package/dist/terrain/lib/terrain-contracts.d.ts.map +1 -1
  127. package/dist/terrain/lib/utils/version.js +1 -1
  128. package/dist/terrain/lib/utils/version.js.map +1 -1
  129. package/dist/terrain/quantized-mesh-loader-types.d.ts +1 -1
  130. package/dist/terrain/quantized-mesh-loader-types.d.ts.map +1 -1
  131. package/dist/terrain/quantized-mesh-loader-types.js +4 -3
  132. package/dist/terrain/quantized-mesh-loader-types.js.map +1 -1
  133. package/dist/terrain/quantized-mesh-loader.d.ts.map +1 -1
  134. package/dist/terrain/quantized-mesh-loader.js +5 -5
  135. package/dist/terrain/quantized-mesh-loader.js.map +1 -1
  136. package/dist/terrain/quantized-mesh-writer.d.ts +4 -3
  137. package/dist/terrain/quantized-mesh-writer.d.ts.map +1 -1
  138. package/dist/terrain/quantized-mesh-writer.js +3 -3
  139. package/dist/terrain/quantized-mesh-writer.js.map +1 -1
  140. package/dist/terrain/terrain-loader-types.d.ts +3 -3
  141. package/dist/terrain/terrain-loader-types.d.ts.map +1 -1
  142. package/dist/terrain/terrain-loader-types.js +4 -2
  143. package/dist/terrain/terrain-loader-types.js.map +1 -1
  144. package/dist/terrain/terrain-loader.d.ts +3 -2
  145. package/dist/terrain/terrain-loader.d.ts.map +1 -1
  146. package/dist/terrain/terrain-loader.js +8 -8
  147. package/dist/terrain/terrain-loader.js.map +1 -1
  148. package/dist/terrain-loader-types.d.ts +2 -0
  149. package/dist/terrain-loader-types.d.ts.map +1 -0
  150. package/dist/terrain-loader-types.js +2 -0
  151. package/dist/terrain-loader-types.js.map +1 -0
  152. package/dist/terrain-loader.d.ts +2 -0
  153. package/dist/terrain-loader.d.ts.map +1 -0
  154. package/dist/terrain-loader.js +2 -0
  155. package/dist/terrain-loader.js.map +1 -0
  156. package/dist/terrain-worker.js +6558 -4257
  157. package/package.json +78 -67
  158. package/src/geotiff/advanced.ts +9 -4
  159. package/src/geotiff/geotiff-loader-types.ts +13 -4
  160. package/src/geotiff/geotiff-loader.ts +5 -8
  161. package/src/geotiff/geotiff-raster-loader-types.ts +1 -3
  162. package/src/geotiff/geotiff-source-loader.ts +19 -45
  163. package/src/geotiff/lib/ome/load-ome-tiff.ts +7 -1
  164. package/src/geotiff/lib/ome/omexml.ts +5 -4
  165. package/src/geotiff/lib/tiff/tiff-gdal-metadata.ts +6 -5
  166. package/src/geotiff/lib/tiff-pixel-source.ts +2 -1
  167. package/src/geotiff/{ometiff-source-loader-types.ts → ometiff-loader-types.ts} +6 -7
  168. package/src/geotiff/{ometiff-source-loader.ts → ometiff-loader.ts} +6 -8
  169. package/src/geotiff-loader-types.ts +1 -0
  170. package/src/geotiff-loader.ts +1 -0
  171. package/src/geotiff-raster-loader-types.ts +1 -0
  172. package/src/geotiff-raster-loader.ts +1 -0
  173. package/src/geotiff-source-loader.ts +1 -0
  174. package/src/index.ts +4 -15
  175. package/src/lerc/lerc-loader-types.ts +1 -1
  176. package/src/lerc-loader-types.ts +1 -0
  177. package/src/lerc-loader.ts +1 -0
  178. package/src/ometiff-loader-types.ts +1 -0
  179. package/src/ometiff-loader.ts +1 -0
  180. package/src/quantized-mesh-loader-types.ts +1 -0
  181. package/src/quantized-mesh-loader.ts +1 -0
  182. package/src/quantized-mesh-writer.ts +1 -0
  183. package/src/terrain/heightmap.ts +0 -10
  184. package/src/terrain/index.ts +2 -13
  185. package/src/terrain/lib/helpers/skirt.ts +41 -151
  186. package/src/terrain/lib/parse-terrain.ts +36 -40
  187. package/src/terrain/lib/terrain-contracts.ts +0 -19
  188. package/src/terrain/quantized-mesh-loader-types.ts +9 -7
  189. package/src/terrain/quantized-mesh-loader.ts +9 -8
  190. package/src/terrain/quantized-mesh-writer.ts +12 -7
  191. package/src/terrain/terrain-loader-types.ts +11 -9
  192. package/src/terrain/terrain-loader.ts +12 -11
  193. package/src/terrain-loader-types.ts +1 -0
  194. package/src/terrain-loader.ts +1 -0
  195. package/dist/geotiff/geotiff-source-loader-types.d.ts +0 -67
  196. package/dist/geotiff/geotiff-source-loader-types.d.ts.map +0 -1
  197. package/dist/geotiff/geotiff-source-loader-types.js +0 -43
  198. package/dist/geotiff/geotiff-source-loader-types.js.map +0 -1
  199. package/dist/geotiff/ometiff-source-loader-types.d.ts.map +0 -1
  200. package/dist/geotiff/ometiff-source-loader-types.js.map +0 -1
  201. package/dist/geotiff/ometiff-source-loader.d.ts.map +0 -1
  202. package/dist/geotiff/ometiff-source-loader.js.map +0 -1
  203. package/dist/terrain/lib/terrain-height-field.d.ts +0 -51
  204. package/dist/terrain/lib/terrain-height-field.d.ts.map +0 -1
  205. package/dist/terrain/lib/terrain-height-field.js +0 -260
  206. package/dist/terrain/lib/terrain-height-field.js.map +0 -1
  207. package/dist/terrain/lib/terrain-height-grid.d.ts +0 -14
  208. package/dist/terrain/lib/terrain-height-grid.d.ts.map +0 -1
  209. package/dist/terrain/lib/terrain-height-grid.js +0 -104
  210. package/dist/terrain/lib/terrain-height-grid.js.map +0 -1
  211. package/dist/terrain/lib/terrain-neighborhood.d.ts +0 -15
  212. package/dist/terrain/lib/terrain-neighborhood.d.ts.map +0 -1
  213. package/dist/terrain/lib/terrain-neighborhood.js +0 -58
  214. package/dist/terrain/lib/terrain-neighborhood.js.map +0 -1
  215. package/dist/terrain/libs/README.md +0 -10
  216. package/dist/terrain/libs/martini-LICENSE +0 -15
  217. package/dist/terrain/libs/martini.d.mts +0 -19
  218. package/dist/terrain/libs/martini.mjs +0 -164
  219. package/src/geotiff/geotiff-source-loader-types.ts +0 -55
  220. package/src/terrain/lib/terrain-height-field.ts +0 -355
  221. package/src/terrain/lib/terrain-height-grid.ts +0 -157
  222. package/src/terrain/lib/terrain-neighborhood.ts +0 -69
  223. package/src/terrain/libs/README.md +0 -10
  224. package/src/terrain/libs/martini-LICENSE +0 -15
  225. package/src/terrain/libs/martini.d.mts +0 -19
  226. package/src/terrain/libs/martini.mjs +0 -164
@@ -7,17 +7,19 @@ import { TerrainFormat } from "./terrain-format.js";
7
7
  * Worker loader for image encoded terrain
8
8
  */
9
9
  export const TerrainLoader = {
10
+ defaultShape: 'arrow',
11
+ supportsNativeArrow: true,
10
12
  dataType: null,
11
13
  batchType: null,
12
14
  ...TerrainFormat,
13
15
  version: VERSION,
14
16
  worker: true,
15
17
  /** Loads the parser-bearing terrain loader implementation. */
16
- preload: async () => (await import('@loaders.gl/raster/terrain/terrain-loader')).TerrainLoaderWithParser,
18
+ preload: async () => (await import('@loaders.gl/raster/terrain-loader')).TerrainLoaderWithParser,
17
19
  options: {
18
20
  terrain: {
19
21
  tesselator: 'auto',
20
- shape: 'arrow-table',
22
+ shape: 'arrow',
21
23
  bounds: undefined,
22
24
  meshMaxError: 10,
23
25
  elevationDecoder: {
@@ -1 +1 @@
1
- {"version":3,"file":"terrain-loader-types.js","sourceRoot":"","sources":["../../src/terrain/terrain-loader-types.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,OAAO,EAAC,+BAA4B;AAG5C,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAa/C;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,QAAQ,EAAE,IAAwC;IAClD,SAAS,EAAE,IAAa;IAExB,GAAG,aAAa;IAChB,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,IAAI;IACZ,8DAA8D;IAC9D,OAAO,EAAE,KAAK,IAAI,EAAE,CAClB,CAAC,MAAM,MAAM,CAAC,2CAA2C,CAAC,CAAC,CAAC,uBAAuB;IACrF,OAAO,EAAE;QACP,OAAO,EAAE;YACP,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,SAAU;YAClB,YAAY,EAAE,EAAE;YAChB,gBAAgB,EAAE;gBAChB,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,CAAC;aACV;YACD,WAAW,EAAE,SAAS;SACvB;KACF;CAC4E,CAAC"}
1
+ {"version":3,"file":"terrain-loader-types.js","sourceRoot":"","sources":["../../src/terrain/terrain-loader-types.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAMpC,OAAO,EAAC,OAAO,EAAC,+BAA4B;AAG5C,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAa/C;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,YAAY,EAAE,OAAO;IACrB,mBAAmB,EAAE,IAAI;IACzB,QAAQ,EAAE,IAA+B;IACzC,SAAS,EAAE,IAAa;IAExB,GAAG,aAAa;IAChB,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,IAAI;IACZ,8DAA8D;IAC9D,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC,CAAC,uBAAuB;IAChG,OAAO,EAAE;QACP,OAAO,EAAE;YACP,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,SAAU;YAClB,YAAY,EAAE,EAAE;YAChB,gBAAgB,EAAE;gBAChB,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,CAAC;aACV;YACD,WAAW,EAAE,SAAS;SACvB;KACF;CACmE,CAAC"}
@@ -1,5 +1,6 @@
1
1
  import type { LoaderContext } from '@loaders.gl/core/loader-utils';
2
- import type { Mesh, MeshArrowTable } from '@loaders.gl/core/schema';
2
+ import type { Table } from 'apache-arrow';
3
+ import type { Mesh } from '@loaders.gl/core/schema';
3
4
  import { type TerrainLoaderOptions } from "./terrain-loader-types.js";
4
5
  /**
5
6
  * Loader for height-map terrain meshes.
@@ -12,5 +13,5 @@ export declare const TerrainLoaderWithParser: any;
12
13
  * @param context Loader context used to parse the image payload.
13
14
  * @returns Terrain mesh reconstructed from the image.
14
15
  */
15
- export declare function parseTerrain(arrayBuffer: ArrayBuffer, options?: TerrainLoaderOptions, context?: LoaderContext): Promise<Mesh | MeshArrowTable>;
16
+ export declare function parseTerrain(arrayBuffer: ArrayBuffer, options?: TerrainLoaderOptions, context?: LoaderContext): Promise<Mesh | Table>;
16
17
  //# sourceMappingURL=terrain-loader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"terrain-loader.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,aAAa,EAAmB,MAAM,+BAA+B,CAAC;AAEnF,OAAO,KAAK,EAAC,IAAI,EAAE,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAIlE,OAAO,EAEL,KAAK,oBAAoB,EAC1B,kCAA+B;AAKhC;;GAEG;AACH,eAAO,MAAM,uBAAuB,KAOqD,CAAC;AAE1F;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,oBAAoB,EAC9B,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC,CAiChC"}
1
+ {"version":3,"file":"terrain-loader.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,aAAa,EAAmB,MAAM,+BAA+B,CAAC;AAEnF,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,yBAAyB,CAAC;AAIlD,OAAO,EAEL,KAAK,oBAAoB,EAC1B,kCAA+B;AAKhC;;GAEG;AACH,eAAO,MAAM,uBAAuB,KAO4C,CAAC;AAEjF;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,oBAAoB,EAC9B,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,CAiCvB"}
@@ -1,10 +1,10 @@
1
1
  // loaders.gl
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
- import { serializeArrowWorkerResult, deserializeArrowWorkerResult } from '@loaders.gl/core/schema-utils/arrow-transport';
4
+ import { serializeArrowWorkerResult, deserializeArrowWorkerResult } from '@loaders.gl/core/arrow-worker-transport';
5
5
  import { parseFromContext } from '@loaders.gl/core/loader-utils';
6
- import { convertMeshToTable, convertTableToMesh } from '@loaders.gl/core/schema-utils';
7
- import { ImageBitmapLoader, getImageData } from '@loaders.gl/images';
6
+ import { convertMeshToArrowTableWrapper, convertTableToMesh } from '@loaders.gl/core/schema-utils';
7
+ import { ImageLoader, getImageData } from '@loaders.gl/images';
8
8
  import { makeTerrainMeshFromImage } from "./lib/parse-terrain.js";
9
9
  import { TerrainLoader as TerrainLoaderMetadata } from "./terrain-loader-types.js";
10
10
  const { preload: _TerrainLoaderPreload, ...TerrainLoaderMetadataWithoutPreload } = TerrainLoaderMetadata;
@@ -16,7 +16,7 @@ export const TerrainLoaderWithParser = {
16
16
  serializeWorkerResult: serializeArrowWorkerResult,
17
17
  deserializeWorkerResult: deserializeArrowWorkerResult,
18
18
  /** Image decoder requested by terrain workers through the nested parse bridge. */
19
- subloaders: { ImageBitmapLoader },
19
+ subloaders: { ImageLoader },
20
20
  parse: parseTerrain
21
21
  };
22
22
  /**
@@ -31,7 +31,7 @@ export async function parseTerrain(arrayBuffer, options, context) {
31
31
  ...options,
32
32
  core: { ...options?.core, mimeType: 'application/x.image' }
33
33
  };
34
- const image = await parseFromContext(arrayBuffer, ImageBitmapLoader, loadImageOptions, context);
34
+ const image = await parseFromContext(arrayBuffer, ImageLoader, loadImageOptions, context);
35
35
  const imageData = getImageData(image);
36
36
  const terrainImage = {
37
37
  width: imageData.width,
@@ -45,9 +45,9 @@ export async function parseTerrain(arrayBuffer, options, context) {
45
45
  ...options?.terrain
46
46
  };
47
47
  const mesh = makeTerrainMeshFromImage(terrainImage, terrainOptions);
48
- const table = convertMeshToTable(mesh, 'arrow-table');
49
- if (options?.terrain?.shape === 'arrow-table') {
50
- return table;
48
+ const table = convertMeshToArrowTableWrapper(mesh);
49
+ if (options?.terrain?.shape === 'arrow') {
50
+ return table.data;
51
51
  }
52
52
  return {
53
53
  ...convertTableToMesh(table),
@@ -1 +1 @@
1
- {"version":3,"file":"terrain-loader.js","sourceRoot":"","sources":["../../src/terrain/terrain-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAC,iBAAiB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAiB,wBAAwB,EAAC,+BAA4B;AAC7E,OAAO,EACL,aAAa,IAAI,qBAAqB,EAEvC,kCAA+B;AAEhC,MAAM,EAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,mCAAmC,EAAC,GAC5E,qBAAqB,CAAC;AAExB;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,GAAG,mCAAmC;IACtC,qBAAqB,EAAE,0BAA0B;IACjD,uBAAuB,EAAE,4BAA4B;IACrD,kFAAkF;IAClF,UAAU,EAAE,EAAC,iBAAiB,EAAC;IAC/B,KAAK,EAAE,YAAY;CACoE,CAAC;AAE1F;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,WAAwB,EACxB,OAA8B,EAC9B,OAAuB;IAEvB,MAAM,gBAAgB,GAAG;QACvB,GAAG,OAAO;QACV,IAAI,EAAE,EAAC,GAAG,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,qBAAqB,EAAC;KAC1D,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,OAAQ,CAAC,CAAC;IACjG,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,SAAS,CAAC,KAAK;QACtB,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,IAAI,EACF,SAAS,CAAC,IAAI,YAAY,iBAAiB;YACzC,CAAC,CAAC,IAAI,UAAU,CACZ,SAAS,CAAC,IAAI,CAAC,MAAM,EACrB,SAAS,CAAC,IAAI,CAAC,UAAU,EACzB,SAAS,CAAC,IAAI,CAAC,UAAU,CAC1B;YACH,CAAC,CAAC,SAAS,CAAC,IAAI;KACrB,CAAC;IACF,MAAM,cAAc,GAAG;QACrB,GAAG,uBAAuB,CAAC,OAAO,CAAC,OAAO;QAC1C,GAAG,OAAO,EAAE,OAAO;KACF,CAAC;IACpB,MAAM,IAAI,GAAG,wBAAwB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACtD,IAAI,OAAO,EAAE,OAAO,EAAE,KAAK,KAAK,aAAa,EAAE,CAAC;QAC9C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO;QACL,GAAG,kBAAkB,CAAC,KAAK,CAAC;QAC5B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"terrain-loader.js","sourceRoot":"","sources":["../../src/terrain/terrain-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAG/D,OAAO,EAAC,8BAA8B,EAAE,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AACjG,OAAO,EAAC,WAAW,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAiB,wBAAwB,EAAC,+BAA4B;AAC7E,OAAO,EACL,aAAa,IAAI,qBAAqB,EAEvC,kCAA+B;AAEhC,MAAM,EAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,mCAAmC,EAAC,GAC5E,qBAAqB,CAAC;AAExB;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,GAAG,mCAAmC;IACtC,qBAAqB,EAAE,0BAA0B;IACjD,uBAAuB,EAAE,4BAA4B;IACrD,kFAAkF;IAClF,UAAU,EAAE,EAAC,WAAW,EAAC;IACzB,KAAK,EAAE,YAAY;CAC2D,CAAC;AAEjF;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,WAAwB,EACxB,OAA8B,EAC9B,OAAuB;IAEvB,MAAM,gBAAgB,GAAG;QACvB,GAAG,OAAO;QACV,IAAI,EAAE,EAAC,GAAG,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,qBAAqB,EAAC;KAC1D,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,OAAQ,CAAC,CAAC;IAC3F,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,SAAS,CAAC,KAAK;QACtB,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,IAAI,EACF,SAAS,CAAC,IAAI,YAAY,iBAAiB;YACzC,CAAC,CAAC,IAAI,UAAU,CACZ,SAAS,CAAC,IAAI,CAAC,MAAM,EACrB,SAAS,CAAC,IAAI,CAAC,UAAU,EACzB,SAAS,CAAC,IAAI,CAAC,UAAU,CAC1B;YACH,CAAC,CAAC,SAAS,CAAC,IAAI;KACrB,CAAC;IACF,MAAM,cAAc,GAAG;QACrB,GAAG,uBAAuB,CAAC,OAAO,CAAC,OAAO;QAC1C,GAAG,OAAO,EAAE,OAAO;KACF,CAAC;IACpB,MAAM,IAAI,GAAG,wBAAwB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,OAAO,EAAE,OAAO,EAAE,KAAK,KAAK,OAAO,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC,IAAI,CAAC;IACpB,CAAC;IACD,OAAO;QACL,GAAG,kBAAkB,CAAC,KAAK,CAAC;QAC5B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC;AACJ,CAAC"}
@@ -0,0 +1,2 @@
1
+ export * from './terrain/terrain-loader-types.js';
2
+ //# sourceMappingURL=terrain-loader-types.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"terrain-loader-types.d.ts","sourceRoot":"","sources":["../src/terrain-loader-types.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export * from './terrain/terrain-loader-types.js';
2
+ //# sourceMappingURL=terrain-loader-types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"terrain-loader-types.js","sourceRoot":"","sources":["../src/terrain-loader-types.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export * from './terrain/terrain-loader.js';
2
+ //# sourceMappingURL=terrain-loader.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"terrain-loader.d.ts","sourceRoot":"","sources":["../src/terrain-loader.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC"}
@@ -0,0 +1,2 @@
1
+ export * from './terrain/terrain-loader.js';
2
+ //# sourceMappingURL=terrain-loader.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"terrain-loader.js","sourceRoot":"","sources":["../src/terrain-loader.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC"}