@loaders.gl/raster 5.0.0-beta.1 → 5.0.0-beta.11

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 +1807 -1032
  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 +72 -610
  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 +4 -4
  135. package/dist/terrain/quantized-mesh-loader.js.map +1 -1
  136. package/dist/terrain/quantized-mesh-writer.d.ts +5 -4
  137. package/dist/terrain/quantized-mesh-writer.d.ts.map +1 -1
  138. package/dist/terrain/quantized-mesh-writer.js +4 -4
  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 +7 -7
  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 +5511 -3271
  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 +8 -7
  190. package/src/terrain/quantized-mesh-writer.ts +10 -9
  191. package/src/terrain/terrain-loader-types.ts +11 -9
  192. package/src/terrain/terrain-loader.ts +11 -10
  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
@@ -0,0 +1 @@
1
+ export * from './geotiff/geotiff-source-loader.js';
package/src/index.ts CHANGED
@@ -17,12 +17,8 @@ export type {LERCLoaderOptions} from './lerc/lerc-loader-types';
17
17
  export {LERCFormat} from './lerc/lerc-format';
18
18
  export type {LERCData} from './lerc/lib/parsers/lerc/lerc-types';
19
19
  export {TerrainLoader} from './terrain/terrain-loader-types';
20
- /** @deprecated Use TerrainLoader. */
21
- export {TerrainLoader as TerrainWorkerLoader} from './terrain/terrain-loader-types';
22
20
  export type {TerrainLoaderOptions} from './terrain/terrain-loader-types';
23
21
  export {QuantizedMeshLoader} from './terrain/quantized-mesh-loader-types';
24
- /** @deprecated Use QuantizedMeshLoader. */
25
- export {QuantizedMeshLoader as QuantizedMeshWorkerLoader} from './terrain/quantized-mesh-loader-types';
26
22
  export type {QuantizedMeshLoaderOptions} from './terrain/quantized-mesh-loader-types';
27
23
  export {TerrainFormat, QuantizedMeshFormat} from './terrain/terrain-format';
28
24
  export {QuantizedMeshWriter} from './terrain/quantized-mesh-writer';
@@ -33,25 +29,18 @@ export type {
33
29
  TerrainHeightmapImage
34
30
  } from './terrain/lib/terrain-heightmap-types';
35
31
  export type {
36
- TerrainGridMetadata,
37
- TerrainHeightGrid,
38
32
  TerrainRay,
39
33
  TerrainSurfaceHit,
40
34
  TerrainSurfaceBounds,
41
35
  TerrainSurface
42
36
  } from './terrain/lib/terrain-contracts';
43
- export {GeoTIFFSourceLoader} from './geotiff/geotiff-source-loader-types';
44
- export {OMETiffSourceLoader} from './geotiff/ometiff-source-loader-types';
37
+
38
+ export {OMETiffLoader} from './geotiff/ometiff-loader-types';
45
39
  export type {GeoTIFFSourceLoaderOptions} from './geotiff/geotiff-source-loader';
46
- export type {OMETiffSourceLoaderOptions} from './geotiff/ometiff-source-loader';
47
- export type {
48
- TerrainFieldBounds,
49
- TerrainHeightFieldOptions,
50
- TerrainHeightFieldStatistics
51
- } from './terrain/lib/terrain-height-field';
40
+ export type {OMETiffLoaderOptions} from './geotiff/ometiff-loader';
52
41
  export type {
53
42
  GetOMETiffParameters,
54
43
  OMETiffChannelMetadata,
55
44
  OMETiffLevelMetadata,
56
45
  OMETiffSourceLoaderMetadata
57
- } from './geotiff/ometiff-source-loader';
46
+ } from './geotiff/ometiff-loader';
@@ -25,7 +25,7 @@ export type LERCLoaderOptions = LoaderOptions & {
25
25
 
26
26
  /** Preloads the parser-bearing LERC loader implementation. */
27
27
  async function preload() {
28
- const {LERCLoaderWithParser} = await import('@loaders.gl/raster/lerc/lerc-loader');
28
+ const {LERCLoaderWithParser} = await import('@loaders.gl/raster/lerc-loader');
29
29
  return LERCLoaderWithParser;
30
30
  }
31
31
 
@@ -0,0 +1 @@
1
+ export * from './lerc/lerc-loader-types.js';
@@ -0,0 +1 @@
1
+ export * from './lerc/lerc-loader.js';
@@ -0,0 +1 @@
1
+ export * from './geotiff/ometiff-loader-types.js';
@@ -0,0 +1 @@
1
+ export * from './geotiff/ometiff-loader.js';
@@ -0,0 +1 @@
1
+ export * from './terrain/quantized-mesh-loader-types.js';
@@ -0,0 +1 @@
1
+ export * from './terrain/quantized-mesh-loader.js';
@@ -0,0 +1 @@
1
+ export * from './terrain/quantized-mesh-writer.js';
@@ -13,18 +13,8 @@ export {
13
13
  } from './lib/decode-terrain-heightmap';
14
14
 
15
15
  export type {
16
- TerrainGridMetadata,
17
- TerrainHeightGrid,
18
16
  TerrainRay,
19
17
  TerrainSurfaceHit,
20
18
  TerrainSurfaceBounds,
21
19
  TerrainSurface
22
20
  } from './lib/terrain-contracts';
23
- export {createTerrainHeightGrid, sampleTerrainHeightGrid} from './lib/terrain-height-grid';
24
- export {TerrainHeightField} from './lib/terrain-height-field';
25
- export type {
26
- TerrainFieldBounds,
27
- TerrainHeightFieldOptions,
28
- TerrainHeightFieldStatistics
29
- } from './lib/terrain-height-field';
30
- export {sampleTerrainNeighborhood, resampleTerrainNodes} from './lib/terrain-neighborhood';
@@ -4,13 +4,6 @@
4
4
 
5
5
  export type {TerrainLoaderOptions} from './terrain-loader-types';
6
6
  export type {
7
- TerrainFieldBounds,
8
- TerrainHeightFieldOptions,
9
- TerrainHeightFieldStatistics
10
- } from './lib/terrain-height-field';
11
- export type {
12
- TerrainGridMetadata,
13
- TerrainHeightGrid,
14
7
  TerrainRay,
15
8
  TerrainSurfaceHit,
16
9
  TerrainSurfaceBounds,
@@ -25,6 +18,8 @@ export type {QuantizedMeshLoaderOptions} from './quantized-mesh-loader-types';
25
18
 
26
19
  export {TerrainFormat, QuantizedMeshFormat} from './terrain-format';
27
20
  export {TerrainLoader} from './terrain-loader-types';
21
+ /** @deprecated Compatibility alias for deck.gl 10.0.0-alpha.1. Use TerrainLoader. */
22
+ export {TerrainLoader as TerrainWorkerLoader} from './terrain-loader-types';
28
23
 
29
24
  export {parseTerrain} from './terrain-loader';
30
25
  export {TerrainLoaderWithParser} from './terrain-loader';
@@ -33,9 +28,3 @@ export {QuantizedMeshLoaderWithParser} from './quantized-mesh-loader';
33
28
 
34
29
  export type {QuantizedMeshWriterOptions} from './quantized-mesh-writer';
35
30
  export {QuantizedMeshWriter} from './quantized-mesh-writer';
36
-
37
- // DEPRECATED EXPORTS
38
- /** @deprecated Use TerrainLoader. */
39
- export {TerrainLoader as TerrainWorkerLoader} from './terrain-loader-types';
40
- /** @deprecated Use QuantizedMeshLoader. */
41
- export {QuantizedMeshLoader as QuantizedMeshWorkerLoader} from './quantized-mesh-loader-types';
@@ -2,7 +2,7 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
- import {concatenateTypedArrays} from '@loaders.gl/core/loader-utils';
5
+ import {createTerrainSkirt} from '@math.gl/geospatial/terrain';
6
6
 
7
7
  export type EdgeIndices = {
8
8
  westIndices: number[];
@@ -11,162 +11,52 @@ export type EdgeIndices = {
11
11
  southIndices: number[];
12
12
  };
13
13
 
14
- /**
15
- * Add skirt to existing mesh
16
- * @param {object} attributes - POSITION and TEXCOOD_0 attributes data
17
- * @param {any} triangles - indices array of the mesh geometry
18
- * @param skirtHeight - height of the skirt geometry
19
- * @param outsideIndices - edge indices from quantized mesh data
20
- * @returns - geometry data with added skirt
21
- */
14
+ /** Add a visual skirt while retaining the loader's texture coordinates and index representation. */
22
15
  export function addSkirt(attributes, triangles, skirtHeight: number, outsideIndices?: EdgeIndices) {
23
- const outsideEdges = outsideIndices
24
- ? getOutsideEdgesFromIndices(outsideIndices, attributes.POSITION.value)
25
- : getOutsideEdgesFromTriangles(triangles);
26
-
27
- // 2 new vertices for each outside edge
28
- const newPosition = new attributes.POSITION.value.constructor(outsideEdges.length * 6);
29
- const newTexcoord0 = new attributes.TEXCOORD_0.value.constructor(outsideEdges.length * 4);
30
-
31
- // 2 new triangles for each outside edge
32
- const newTriangles = new triangles.constructor(outsideEdges.length * 6);
33
-
34
- for (let i = 0; i < outsideEdges.length; i++) {
35
- const edge = outsideEdges[i];
36
-
37
- updateAttributesForNewEdge({
38
- edge,
39
- edgeIndex: i,
40
- attributes,
41
- skirtHeight,
42
- newPosition,
43
- newTexcoord0,
44
- newTriangles
45
- });
16
+ const positions = attributes.POSITION.value;
17
+ const sourceIndices = Array.isArray(triangles) ? Uint32Array.from(triangles) : triangles;
18
+ const edges = outsideIndices ? getBoundaryEdges(outsideIndices, positions) : undefined;
19
+ const skirt = createTerrainSkirt(
20
+ {positions, indices: sourceIndices},
21
+ {height: skirtHeight, edges}
22
+ );
23
+ const textureCoordinates = attributes.TEXCOORD_0.value;
24
+ const outputTextureCoordinates = new textureCoordinates.constructor(
25
+ (skirt.positions.length / 3) * 2
26
+ );
27
+ outputTextureCoordinates.set(textureCoordinates);
28
+ for (let i = 0; i < skirt.sourceVertexIndices.length; i++) {
29
+ const source = skirt.sourceVertexIndices[i];
30
+ outputTextureCoordinates.set(
31
+ textureCoordinates.subarray(source * 2, source * 2 + 2),
32
+ (skirt.skirtVertexOffset + i) * 2
33
+ );
46
34
  }
47
-
48
- attributes.POSITION.value = concatenateTypedArrays(attributes.POSITION.value, newPosition);
49
- attributes.TEXCOORD_0.value = concatenateTypedArrays(attributes.TEXCOORD_0.value, newTexcoord0);
50
- const resultTriangles =
51
- triangles instanceof Array
52
- ? triangles.concat(newTriangles)
53
- : concatenateTypedArrays(triangles, newTriangles);
54
-
35
+ attributes.POSITION.value = skirt.positions;
36
+ attributes.TEXCOORD_0.value = outputTextureCoordinates;
55
37
  return {
56
38
  attributes,
57
- triangles: resultTriangles
39
+ triangles: Array.isArray(triangles) ? Array.from(skirt.indices) : skirt.indices
58
40
  };
59
41
  }
60
42
 
61
- /**
62
- * Get geometry edges that located on a border of the mesh
63
- * @param {any} triangles - indices array of the mesh geometry
64
- * @returns {number[][]} - outside edges data
65
- */
66
- function getOutsideEdgesFromTriangles(triangles) {
67
- const edges: number[][] = [];
68
- for (let i = 0; i < triangles.length; i += 3) {
69
- edges.push([triangles[i], triangles[i + 1]]);
70
- edges.push([triangles[i + 1], triangles[i + 2]]);
71
- edges.push([triangles[i + 2], triangles[i]]);
72
- }
73
-
74
- edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));
75
-
76
- const outsideEdges: number[][] = [];
77
- let index = 0;
78
- while (index < edges.length) {
79
- if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {
80
- index += 2;
81
- } else {
82
- outsideEdges.push(edges[index]);
83
- index++;
84
- }
85
- }
86
- return outsideEdges;
87
- }
88
-
89
- /**
90
- * Get geometry edges that located on a border of the mesh
91
- * @param {object} indices - edge indices from quantized mesh data
92
- * @param {TypedArray} position - position attribute geometry data
93
- * @returns {number[][]} - outside edges data
94
- */
95
- function getOutsideEdgesFromIndices(indices: EdgeIndices, position) {
96
- // Sort skirt indices to create adjacent triangles
97
- indices.westIndices.sort((a, b) => position[3 * a + 1] - position[3 * b + 1]);
98
- // Reverse (b - a) to match triangle winding
99
- indices.eastIndices.sort((a, b) => position[3 * b + 1] - position[3 * a + 1]);
100
- indices.southIndices.sort((a, b) => position[3 * b] - position[3 * a]);
101
- // Reverse (b - a) to match triangle winding
102
- indices.northIndices.sort((a, b) => position[3 * a] - position[3 * b]);
103
-
104
- const edges: number[][] = [];
105
- for (const index in indices) {
106
- const indexGroup = indices[index];
107
- for (let i = 0; i < indexGroup.length - 1; i++) {
108
- edges.push([indexGroup[i], indexGroup[i + 1]]);
109
- }
43
+ /** Translate quantized mesh side lists into selected boundary edge pairs. */
44
+ function getBoundaryEdges(
45
+ indices: EdgeIndices,
46
+ positions: Float32Array | Float64Array
47
+ ): Uint32Array {
48
+ indices.westIndices.sort((a, b) => positions[3 * a + 1] - positions[3 * b + 1]);
49
+ indices.eastIndices.sort((a, b) => positions[3 * b + 1] - positions[3 * a + 1]);
50
+ indices.southIndices.sort((a, b) => positions[3 * b] - positions[3 * a]);
51
+ indices.northIndices.sort((a, b) => positions[3 * a] - positions[3 * b]);
52
+ const edges: number[] = [];
53
+ for (const side of [
54
+ indices.westIndices,
55
+ indices.northIndices,
56
+ indices.eastIndices,
57
+ indices.southIndices
58
+ ]) {
59
+ for (let i = 1; i < side.length; i++) edges.push(side[i - 1], side[i]);
110
60
  }
111
- return edges;
112
- }
113
-
114
- /**
115
- * Get geometry edges that located on a border of the mesh
116
- * @param {object} args
117
- * @param {number[]} args.edge - edge indices in geometry
118
- * @param {number} args.edgeIndex - edge index in outsideEdges array
119
- * @param {object} args.attributes - POSITION and TEXCOORD_0 attributes
120
- * @param {number} args.skirtHeight - height of the skirt geometry
121
- * @param {TypedArray} args.newPosition - POSITION array for skirt data
122
- * @param {TypedArray} args.newTexcoord0 - TEXCOORD_0 array for skirt data
123
- * @param {TypedArray | Array} args.newTriangles - trinagle indices array for skirt data
124
- * @returns {void}
125
- */
126
- function updateAttributesForNewEdge({
127
- edge,
128
- edgeIndex,
129
- attributes,
130
- skirtHeight,
131
- newPosition,
132
- newTexcoord0,
133
- newTriangles
134
- }) {
135
- const positionsLength = attributes.POSITION.value.length;
136
- const vertex1Offset = edgeIndex * 2;
137
- const vertex2Offset = edgeIndex * 2 + 1;
138
-
139
- // Define POSITION for new 1st vertex
140
- newPosition.set(
141
- attributes.POSITION.value.subarray(edge[0] * 3, edge[0] * 3 + 3),
142
- vertex1Offset * 3
143
- );
144
- newPosition[vertex1Offset * 3 + 2] = newPosition[vertex1Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height
145
-
146
- // Define POSITION for new 2nd vertex
147
- newPosition.set(
148
- attributes.POSITION.value.subarray(edge[1] * 3, edge[1] * 3 + 3),
149
- vertex2Offset * 3
150
- );
151
- newPosition[vertex2Offset * 3 + 2] = newPosition[vertex2Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height
152
-
153
- // Use same TEXCOORDS for skirt vertices
154
- newTexcoord0.set(
155
- attributes.TEXCOORD_0.value.subarray(edge[0] * 2, edge[0] * 2 + 2),
156
- vertex1Offset * 2
157
- );
158
- newTexcoord0.set(
159
- attributes.TEXCOORD_0.value.subarray(edge[1] * 2, edge[1] * 2 + 2),
160
- vertex2Offset * 2
161
- );
162
-
163
- // Define new triangles
164
- const triangle1Offset = edgeIndex * 2 * 3;
165
- newTriangles[triangle1Offset] = edge[0];
166
- newTriangles[triangle1Offset + 1] = positionsLength / 3 + vertex2Offset;
167
- newTriangles[triangle1Offset + 2] = edge[1];
168
-
169
- newTriangles[triangle1Offset + 3] = positionsLength / 3 + vertex2Offset;
170
- newTriangles[triangle1Offset + 4] = edge[0];
171
- newTriangles[triangle1Offset + 5] = positionsLength / 3 + vertex1Offset;
61
+ return Uint32Array.from(edges);
172
62
  }
@@ -4,8 +4,11 @@
4
4
 
5
5
  import type {Mesh} from '@loaders.gl/core/schema';
6
6
  import {deduceMeshSchema, getMeshBoundingBox} from '@loaders.gl/core/schema-utils';
7
- import Martini from '../libs/martini.mjs';
8
- import Delatin from './delatin/index';
7
+ import {
8
+ HeightField,
9
+ createMartiniTerrainMesh,
10
+ createDelatinTerrainMesh
11
+ } from '@math.gl/geospatial/terrain';
9
12
  import {addSkirt} from './helpers/skirt';
10
13
  import {decodeTerrainHeightmapInto} from './decode-terrain-heightmap';
11
14
  import type {ElevationDecoder} from './terrain-heightmap-types';
@@ -13,6 +16,8 @@ import type {ElevationDecoder} from './terrain-heightmap-types';
13
16
  export type TerrainOptions = {
14
17
  /** Maximum terrain mesh error in meters. */
15
18
  meshMaxError: number;
19
+ /** Maximum source-node validation tests per refinement pass; defaults scale with the padded grid. */
20
+ meshMaxSampleTests?: number;
16
21
  /** Bounds used to map terrain image coordinates to x/y positions. */
17
22
  bounds: number[];
18
23
  /** Decoder used to convert terrain image channels to elevation values. */
@@ -43,7 +48,7 @@ export function makeTerrainMeshFromImage(
43
48
  terrainImage: TerrainImage,
44
49
  terrainOptions: TerrainOptions
45
50
  ): Mesh {
46
- const {meshMaxError, bounds, elevationDecoder} = terrainOptions;
51
+ const {bounds, elevationDecoder} = terrainOptions;
47
52
 
48
53
  const {data, width, height} = terrainImage;
49
54
 
@@ -52,20 +57,20 @@ export function makeTerrainMeshFromImage(
52
57
  switch (terrainOptions.tesselator) {
53
58
  case 'martini':
54
59
  terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);
55
- mesh = getMartiniTileMesh(meshMaxError, width, terrain);
60
+ mesh = getTerrainTileMesh(terrainOptions, width, height, terrain, 'martini');
56
61
  break;
57
62
  case 'delatin':
58
63
  terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);
59
- mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);
64
+ mesh = getTerrainTileMesh(terrainOptions, width, height, terrain, 'delatin');
60
65
  break;
61
66
  // auto
62
67
  default:
63
68
  if (width === height && !(height & (width - 1))) {
64
69
  terrain = getTerrain(data, width, height, elevationDecoder, 'martini');
65
- mesh = getMartiniTileMesh(meshMaxError, width, terrain);
70
+ mesh = getTerrainTileMesh(terrainOptions, width, height, terrain, 'martini');
66
71
  } else {
67
72
  terrain = getTerrain(data, width, height, elevationDecoder, 'delatin');
68
- mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);
73
+ mesh = getTerrainTileMesh(terrainOptions, width, height, terrain, 'delatin');
69
74
  }
70
75
  break;
71
76
  }
@@ -112,39 +117,30 @@ export function makeTerrainMeshFromImage(
112
117
  };
113
118
  }
114
119
 
115
- /**
116
- * Get Martini generated vertices and triangles
117
- *
118
- * @param {number} meshMaxError threshold for simplifying mesh
119
- * @param {number} width width of the input data
120
- * @param {number[] | Float32Array} terrain elevation data
121
- * @returns {{vertices: Uint16Array, triangles: Uint32Array}} vertices and triangles data
122
- */
123
- function getMartiniTileMesh(meshMaxError, width, terrain) {
124
- const gridSize = width + 1;
125
- const martini = new Martini(gridSize);
126
- const tile = martini.createTile(terrain);
127
- const {vertices, triangles} = tile.getMesh(meshMaxError);
128
-
129
- return {vertices, triangles};
130
- }
131
-
132
- /**
133
- * Get Delatin generated vertices and triangles
134
- *
135
- * @param {number} meshMaxError threshold for simplifying mesh
136
- * @param {number} width width of the input data array
137
- * @param {number} height height of the input data array
138
- * @param {number[] | Float32Array} terrain elevation data
139
- * @returns {{vertices: number[], triangles: number[]}} vertices and triangles data
140
- */
141
- function getDelatinTileMesh(meshMaxError, width, height, terrain) {
142
- const tin = new Delatin(terrain, width + 1, height + 1);
143
- tin.run(meshMaxError);
144
- // @ts-expect-error
145
- const {coords, triangles} = tin;
146
- const vertices = coords;
147
- return {vertices, triangles};
120
+ /** Adapts the padded, north-first image grid to upstream adaptive terrain meshing. */
121
+ function getTerrainTileMesh(
122
+ terrainOptions: TerrainOptions,
123
+ width: number,
124
+ height: number,
125
+ terrain: Float32Array,
126
+ tesselator: 'martini' | 'delatin'
127
+ ) {
128
+ const field = new HeightField({
129
+ width: width + 1,
130
+ height: height + 1,
131
+ heights: terrain,
132
+ rowStep: [0, -1]
133
+ });
134
+ // Fully refined RTIN triangles can inspect 32 neighboring grid nodes per source cell.
135
+ const options = {
136
+ maxError: terrainOptions.meshMaxError,
137
+ maxSampleTests: terrainOptions.meshMaxSampleTests ?? Math.max(10_000_000, 32 * terrain.length)
138
+ };
139
+ const mesh =
140
+ tesselator === 'martini'
141
+ ? createMartiniTerrainMesh(field, options)
142
+ : createDelatinTerrainMesh(field, options);
143
+ return {vertices: mesh.gridCoordinates, triangles: mesh.indices};
148
144
  }
149
145
 
150
146
  function getTerrain(
@@ -2,25 +2,6 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
- import type {TerrainHeightmap} from './terrain-heightmap-types';
6
-
7
- /** Georeferencing supplied by a source, never inferred from a provider name. */
8
- export type TerrainGridMetadata = {
9
- /** West, south, east, north in unwrapped EPSG:3857 meters; row zero is north. */
10
- readonly bounds: readonly [number, number, number, number];
11
- /** Pixel centers or samples including both footprint edges. */
12
- readonly registration: 'pixel-center' | 'grid-node';
13
- /** Physical height reference; this API does not convert vertical datums. */
14
- readonly verticalDatum: 'ellipsoidal' | 'orthometric' | 'unknown';
15
- };
16
-
17
- /** Physical source meters, independent of projection, display relief and mesh resolution. */
18
- export type TerrainHeightGrid = TerrainHeightmap &
19
- TerrainGridMetadata & {
20
- /** One byte per sample: zero is missing; invalid heights are NaN. Alpha is not inferred. */
21
- readonly valid: Uint8Array;
22
- };
23
-
24
5
  /** Ray coordinates must match the queried surface; direction need not be normalized. */
25
6
  export type TerrainRay = {
26
7
  /** Absolute content-space origin, before camera or room-placement transforms. */
@@ -3,7 +3,8 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {Loader, LoaderOptions} from '@loaders.gl/core/loader-utils';
6
- import type {Mesh, MeshArrowTable} from '@loaders.gl/core/schema';
6
+ import type {Table} from 'apache-arrow';
7
+ import type {Mesh} from '@loaders.gl/core/schema';
7
8
  import {VERSION} from './lib/utils/version';
8
9
  import {QuantizedMeshFormat} from './terrain-format';
9
10
 
@@ -12,7 +13,7 @@ export type QuantizedMeshLoaderOptions = LoaderOptions & {
12
13
  /** QuantizedMeshLoader options */
13
14
  'quantized-mesh'?: {
14
15
  /** Selects mesh output or Apache Arrow output. */
15
- shape?: 'mesh' | 'arrow-table';
16
+ shape?: 'mesh' | 'arrow';
16
17
  bounds?: [number, number, number, number];
17
18
  skirtHeight?: number | null;
18
19
  /** Override the URL to the worker bundle (by default loads from unpkg.com) */
@@ -24,7 +25,9 @@ export type QuantizedMeshLoaderOptions = LoaderOptions & {
24
25
  * Worker loader for quantized meshes
25
26
  */
26
27
  export const QuantizedMeshLoader = {
27
- dataType: null as unknown as Mesh | MeshArrowTable,
28
+ defaultShape: 'arrow',
29
+ supportsNativeArrow: true,
30
+ dataType: null as unknown as Mesh | Table,
28
31
  batchType: null as never,
29
32
 
30
33
  ...QuantizedMeshFormat,
@@ -32,13 +35,12 @@ export const QuantizedMeshLoader = {
32
35
  worker: true,
33
36
  /** Loads the parser-bearing quantized mesh loader implementation. */
34
37
  preload: async () =>
35
- (await import('@loaders.gl/raster/terrain/quantized-mesh-loader'))
36
- .QuantizedMeshLoaderWithParser,
38
+ (await import('@loaders.gl/raster/quantized-mesh-loader')).QuantizedMeshLoaderWithParser,
37
39
  options: {
38
40
  'quantized-mesh': {
39
- shape: 'arrow-table',
41
+ shape: 'arrow',
40
42
  bounds: [0, 0, 1, 1],
41
43
  skirtHeight: null
42
44
  }
43
45
  }
44
- } as const satisfies Loader<Mesh | MeshArrowTable, never, QuantizedMeshLoaderOptions>;
46
+ } as const satisfies Loader<Mesh | Table, never, QuantizedMeshLoaderOptions>;
@@ -5,10 +5,11 @@
5
5
  import {
6
6
  serializeArrowWorkerResult,
7
7
  deserializeArrowWorkerResult
8
- } from '@loaders.gl/core/schema-utils/arrow-transport';
8
+ } from '@loaders.gl/core/arrow-worker-transport';
9
9
  import type {LoaderWithParser} from '@loaders.gl/core/loader-utils';
10
- import type {Mesh, MeshArrowTable} from '@loaders.gl/core/schema';
11
- import {convertMeshToTable, convertTableToMesh} from '@loaders.gl/core/schema-utils';
10
+ import type {Table} from 'apache-arrow';
11
+ import type {Mesh} from '@loaders.gl/core/schema';
12
+ import {convertMeshToArrowTable, convertTableToMesh} from '@loaders.gl/core/schema-utils';
12
13
  import {parseQuantizedMesh} from './lib/parse-quantized-mesh';
13
14
  import {
14
15
  QuantizedMeshLoader as QuantizedMeshLoaderMetadata,
@@ -27,15 +28,15 @@ export const QuantizedMeshLoaderWithParser = {
27
28
  deserializeWorkerResult: deserializeArrowWorkerResult,
28
29
  parseSync: parseQuantizedMeshInRequestedShape,
29
30
  parse: async (arrayBuffer, options) => parseQuantizedMeshInRequestedShape(arrayBuffer, options)
30
- } as const satisfies LoaderWithParser<Mesh | MeshArrowTable, never, QuantizedMeshLoaderOptions>;
31
+ } as const satisfies LoaderWithParser<Mesh | Table, never, QuantizedMeshLoaderOptions>;
31
32
 
32
33
  function parseQuantizedMeshInRequestedShape(
33
34
  arrayBuffer: ArrayBuffer,
34
35
  options?: QuantizedMeshLoaderOptions
35
- ): Mesh | MeshArrowTable {
36
+ ): Mesh | Table {
36
37
  const mesh = parseQuantizedMesh(arrayBuffer, options?.['quantized-mesh']);
37
- const table = convertMeshToTable(mesh, 'arrow-table');
38
- if (options?.['quantized-mesh']?.shape === 'arrow-table') {
38
+ const table = convertMeshToArrowTable(mesh);
39
+ if (options?.['quantized-mesh']?.shape === 'arrow') {
39
40
  return table;
40
41
  }
41
42
  return {
@@ -2,9 +2,10 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
+ import type {Table} from 'apache-arrow';
5
6
  import type {WriterOptions, WriterWithEncoder} from '@loaders.gl/core/loader-utils';
6
- import type {Mesh, MeshArrowTable, MeshAttribute} from '@loaders.gl/core/schema';
7
- import {convertMeshToTable, convertTableToMesh} from '@loaders.gl/core/schema-utils';
7
+ import type {Mesh, MeshAttribute} from '@loaders.gl/core/schema';
8
+ import {convertMeshToArrowTable, convertTableToMesh} from '@loaders.gl/core/schema-utils';
8
9
  import {VERSION} from './lib/utils/version';
9
10
  import {QuantizedMeshFormat} from './terrain-format';
10
11
 
@@ -27,18 +28,18 @@ export type QuantizedMeshWriterOptions = WriterOptions & {
27
28
  export const QuantizedMeshWriter = {
28
29
  ...QuantizedMeshFormat,
29
30
  version: VERSION,
30
- dataType: null as unknown as Mesh | MeshArrowTable,
31
+ dataType: null as unknown as Mesh | Table,
31
32
  batchType: null as never,
32
33
  options: {
33
34
  'quantized-mesh': {}
34
35
  },
35
36
  encode: async (data, options) => encodeQuantizedMeshSync(data, options),
36
37
  encodeSync: encodeQuantizedMeshSync
37
- } as const satisfies WriterWithEncoder<Mesh | MeshArrowTable, never, QuantizedMeshWriterOptions>;
38
+ } as const satisfies WriterWithEncoder<Mesh | Table, never, QuantizedMeshWriterOptions>;
38
39
 
39
40
  /** Encode mesh category data as quantized mesh terrain bytes. */
40
41
  function encodeQuantizedMeshSync(
41
- data: Mesh | MeshArrowTable,
42
+ data: Mesh | Table,
42
43
  options: QuantizedMeshWriterOptions = {}
43
44
  ): ArrayBuffer {
44
45
  const mesh = convertTableToMesh(normalizeMeshArrowTable(data));
@@ -87,12 +88,12 @@ function encodeQuantizedMeshSync(
87
88
  return arrayBuffer;
88
89
  }
89
90
 
90
- /** Return mesh data as a MeshArrowTable, converting plain Mesh data first. */
91
- function normalizeMeshArrowTable(data: Mesh | MeshArrowTable): MeshArrowTable {
92
- if ('shape' in data && data.shape === 'arrow-table') {
91
+ /** Return mesh data as a native Arrow table, converting plain Mesh data first. */
92
+ function normalizeMeshArrowTable(data: Mesh | Table): Table {
93
+ if (!('attributes' in data)) {
93
94
  return data;
94
95
  }
95
- return convertMeshToTable(data as Mesh, 'arrow-table');
96
+ return convertMeshToArrowTable(data as Mesh);
96
97
  }
97
98
 
98
99
  /** Return a required mesh attribute or throw a format-specific error. */