@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
@@ -32,7 +32,6 @@ __export(index_exports, {
32
32
  QuantizedMeshFormat: () => QuantizedMeshFormat,
33
33
  QuantizedMeshLoader: () => QuantizedMeshLoader,
34
34
  QuantizedMeshLoaderWithParser: () => QuantizedMeshLoaderWithParser,
35
- QuantizedMeshWorkerLoader: () => QuantizedMeshLoader,
36
35
  QuantizedMeshWriter: () => QuantizedMeshWriter,
37
36
  TerrainFormat: () => TerrainFormat,
38
37
  TerrainLoader: () => TerrainLoader,
@@ -64,21 +63,23 @@ var QuantizedMeshFormat = {
64
63
  };
65
64
 
66
65
  // dist/terrain/lib/utils/version.js
67
- var VERSION = true ? "5.0.0-beta.1" : "latest";
66
+ var VERSION = true ? "5.0.0-beta.11" : "latest";
68
67
 
69
68
  // dist/terrain/terrain-loader-types.js
70
69
  var TerrainLoader = {
70
+ defaultShape: "arrow",
71
+ supportsNativeArrow: true,
71
72
  dataType: null,
72
73
  batchType: null,
73
74
  ...TerrainFormat,
74
75
  version: VERSION,
75
76
  worker: true,
76
77
  /** Loads the parser-bearing terrain loader implementation. */
77
- preload: async () => (await import("@loaders.gl/raster/terrain/terrain-loader")).TerrainLoaderWithParser,
78
+ preload: async () => (await import("@loaders.gl/raster/terrain-loader")).TerrainLoaderWithParser,
78
79
  options: {
79
80
  terrain: {
80
81
  tesselator: "auto",
81
- shape: "arrow-table",
82
+ shape: "arrow",
82
83
  bounds: void 0,
83
84
  meshMaxError: 10,
84
85
  elevationDecoder: {
@@ -93,592 +94,52 @@ var TerrainLoader = {
93
94
  };
94
95
 
95
96
  // dist/terrain/terrain-loader.js
96
- var import_arrow_transport = require("@loaders.gl/core/schema-utils/arrow-transport");
97
- var import_loader_utils2 = require("@loaders.gl/core/loader-utils");
97
+ var import_arrow_worker_transport = require("@loaders.gl/core/arrow-worker-transport");
98
+ var import_loader_utils = require("@loaders.gl/core/loader-utils");
98
99
  var import_schema_utils2 = require("@loaders.gl/core/schema-utils");
99
100
  var import_images = require("@loaders.gl/images");
100
101
 
101
102
  // dist/terrain/lib/parse-terrain.js
102
103
  var import_schema_utils = require("@loaders.gl/core/schema-utils");
103
-
104
- // dist/terrain/libs/martini.mjs
105
- var Martini = class {
106
- constructor(gridSize = 257) {
107
- this.gridSize = gridSize;
108
- const tileSize = gridSize - 1;
109
- if (tileSize & tileSize - 1) throw new Error(
110
- `Expected grid size to be 2^n+1, got ${gridSize}.`
111
- );
112
- this.numTriangles = tileSize * tileSize * 2 - 2;
113
- this.numParentTriangles = this.numTriangles - tileSize * tileSize;
114
- this.indices = new Uint32Array(this.gridSize * this.gridSize);
115
- this.coords = new Uint16Array(this.numTriangles * 4);
116
- for (let i = 0; i < this.numTriangles; i++) {
117
- let id = i + 2;
118
- let ax = 0, ay = 0, bx = 0, by = 0, cx = 0, cy = 0;
119
- if (id & 1) {
120
- bx = by = cx = tileSize;
121
- } else {
122
- ax = ay = cy = tileSize;
123
- }
124
- while ((id >>= 1) > 1) {
125
- const mx = ax + bx >> 1;
126
- const my = ay + by >> 1;
127
- if (id & 1) {
128
- bx = ax;
129
- by = ay;
130
- ax = cx;
131
- ay = cy;
132
- } else {
133
- ax = bx;
134
- ay = by;
135
- bx = cx;
136
- by = cy;
137
- }
138
- cx = mx;
139
- cy = my;
140
- }
141
- const k = i * 4;
142
- this.coords[k + 0] = ax;
143
- this.coords[k + 1] = ay;
144
- this.coords[k + 2] = bx;
145
- this.coords[k + 3] = by;
146
- }
147
- }
148
- createTile(terrain) {
149
- return new Tile(terrain, this);
150
- }
151
- };
152
- var Tile = class {
153
- constructor(terrain, martini) {
154
- const size = martini.gridSize;
155
- if (terrain.length !== size * size) throw new Error(
156
- `Expected terrain data of length ${size * size} (${size} x ${size}), got ${terrain.length}.`
157
- );
158
- this.terrain = terrain;
159
- this.martini = martini;
160
- this.errors = new Float32Array(terrain.length);
161
- this.update();
162
- }
163
- update() {
164
- const { numTriangles, numParentTriangles, coords, gridSize: size } = this.martini;
165
- const { terrain, errors } = this;
166
- for (let i = numTriangles - 1; i >= 0; i--) {
167
- const k = i * 4;
168
- const ax = coords[k + 0];
169
- const ay = coords[k + 1];
170
- const bx = coords[k + 2];
171
- const by = coords[k + 3];
172
- const mx = ax + bx >> 1;
173
- const my = ay + by >> 1;
174
- const cx = mx + my - ay;
175
- const cy = my + ax - mx;
176
- const interpolatedHeight = (terrain[ay * size + ax] + terrain[by * size + bx]) / 2;
177
- const middleIndex = my * size + mx;
178
- const middleError = Math.abs(interpolatedHeight - terrain[middleIndex]);
179
- errors[middleIndex] = Math.max(errors[middleIndex], middleError);
180
- if (i < numParentTriangles) {
181
- const leftChildIndex = (ay + cy >> 1) * size + (ax + cx >> 1);
182
- const rightChildIndex = (by + cy >> 1) * size + (bx + cx >> 1);
183
- errors[middleIndex] = Math.max(errors[middleIndex], errors[leftChildIndex], errors[rightChildIndex]);
184
- }
185
- }
186
- }
187
- getMesh(maxError = 0) {
188
- const { gridSize: size, indices } = this.martini;
189
- const { errors } = this;
190
- let numVertices = 0;
191
- let numTriangles = 0;
192
- const max = size - 1;
193
- indices.fill(0);
194
- function countElements(ax, ay, bx, by, cx, cy) {
195
- const mx = ax + bx >> 1;
196
- const my = ay + by >> 1;
197
- if (Math.abs(ax - cx) + Math.abs(ay - cy) > 1 && errors[my * size + mx] > maxError) {
198
- countElements(cx, cy, ax, ay, mx, my);
199
- countElements(bx, by, cx, cy, mx, my);
200
- } else {
201
- indices[ay * size + ax] = indices[ay * size + ax] || ++numVertices;
202
- indices[by * size + bx] = indices[by * size + bx] || ++numVertices;
203
- indices[cy * size + cx] = indices[cy * size + cx] || ++numVertices;
204
- numTriangles++;
205
- }
206
- }
207
- countElements(0, 0, max, max, max, 0);
208
- countElements(max, max, 0, 0, 0, max);
209
- const vertices = new Uint16Array(numVertices * 2);
210
- const triangles = new Uint32Array(numTriangles * 3);
211
- let triIndex = 0;
212
- function processTriangle(ax, ay, bx, by, cx, cy) {
213
- const mx = ax + bx >> 1;
214
- const my = ay + by >> 1;
215
- if (Math.abs(ax - cx) + Math.abs(ay - cy) > 1 && errors[my * size + mx] > maxError) {
216
- processTriangle(cx, cy, ax, ay, mx, my);
217
- processTriangle(bx, by, cx, cy, mx, my);
218
- } else {
219
- const a = indices[ay * size + ax] - 1;
220
- const b = indices[by * size + bx] - 1;
221
- const c = indices[cy * size + cx] - 1;
222
- vertices[2 * a] = ax;
223
- vertices[2 * a + 1] = ay;
224
- vertices[2 * b] = bx;
225
- vertices[2 * b + 1] = by;
226
- vertices[2 * c] = cx;
227
- vertices[2 * c + 1] = cy;
228
- triangles[triIndex++] = a;
229
- triangles[triIndex++] = b;
230
- triangles[triIndex++] = c;
231
- }
232
- }
233
- processTriangle(0, 0, max, max, max, 0);
234
- processTriangle(max, max, 0, 0, 0, max);
235
- return { vertices, triangles };
236
- }
237
- };
238
-
239
- // dist/terrain/lib/delatin/index.js
240
- var Delatin = class {
241
- constructor(data, width, height = width) {
242
- this.data = data;
243
- this.width = width;
244
- this.height = height;
245
- this.coords = [];
246
- this.triangles = [];
247
- this._halfedges = [];
248
- this._candidates = [];
249
- this._queueIndices = [];
250
- this._queue = [];
251
- this._errors = [];
252
- this._rms = [];
253
- this._pending = [];
254
- this._pendingLen = 0;
255
- this._rmsSum = 0;
256
- const x1 = width - 1;
257
- const y1 = height - 1;
258
- const p0 = this._addPoint(0, 0);
259
- const p1 = this._addPoint(x1, 0);
260
- const p2 = this._addPoint(0, y1);
261
- const p3 = this._addPoint(x1, y1);
262
- const t0 = this._addTriangle(p3, p0, p2, -1, -1, -1);
263
- this._addTriangle(p0, p3, p1, t0, -1, -1);
264
- this._flush();
265
- }
266
- // refine the mesh until its maximum error gets below the given one
267
- run(maxError = 1) {
268
- while (this.getMaxError() > maxError) {
269
- this.refine();
270
- }
271
- }
272
- // refine the mesh with a single point
273
- refine() {
274
- this._step();
275
- this._flush();
276
- }
277
- // max error of the current mesh
278
- getMaxError() {
279
- return this._errors[0];
280
- }
281
- // root-mean-square deviation of the current mesh
282
- getRMSD() {
283
- return this._rmsSum > 0 ? Math.sqrt(this._rmsSum / (this.width * this.height)) : 0;
284
- }
285
- // height value at a given position
286
- heightAt(x, y) {
287
- return this.data[this.width * y + x];
288
- }
289
- // rasterize and queue all triangles that got added or updated in _step
290
- _flush() {
291
- const coords = this.coords;
292
- for (let i = 0; i < this._pendingLen; i++) {
293
- const t = this._pending[i];
294
- const a = 2 * this.triangles[t * 3 + 0];
295
- const b = 2 * this.triangles[t * 3 + 1];
296
- const c = 2 * this.triangles[t * 3 + 2];
297
- this._findCandidate(coords[a], coords[a + 1], coords[b], coords[b + 1], coords[c], coords[c + 1], t);
298
- }
299
- this._pendingLen = 0;
300
- }
301
- // rasterize a triangle, find its max error, and queue it for processing
302
- _findCandidate(p0x, p0y, p1x, p1y, p2x, p2y, t) {
303
- const minX = Math.min(p0x, p1x, p2x);
304
- const minY = Math.min(p0y, p1y, p2y);
305
- const maxX = Math.max(p0x, p1x, p2x);
306
- const maxY = Math.max(p0y, p1y, p2y);
307
- let w00 = orient(p1x, p1y, p2x, p2y, minX, minY);
308
- let w01 = orient(p2x, p2y, p0x, p0y, minX, minY);
309
- let w02 = orient(p0x, p0y, p1x, p1y, minX, minY);
310
- const a01 = p1y - p0y;
311
- const b01 = p0x - p1x;
312
- const a12 = p2y - p1y;
313
- const b12 = p1x - p2x;
314
- const a20 = p0y - p2y;
315
- const b20 = p2x - p0x;
316
- const a = orient(p0x, p0y, p1x, p1y, p2x, p2y);
317
- const z0 = this.heightAt(p0x, p0y) / a;
318
- const z1 = this.heightAt(p1x, p1y) / a;
319
- const z2 = this.heightAt(p2x, p2y) / a;
320
- let maxError = 0;
321
- let mx = 0;
322
- let my = 0;
323
- let rms = 0;
324
- for (let y = minY; y <= maxY; y++) {
325
- let dx = 0;
326
- if (w00 < 0 && a12 !== 0) {
327
- dx = Math.max(dx, Math.floor(-w00 / a12));
328
- }
329
- if (w01 < 0 && a20 !== 0) {
330
- dx = Math.max(dx, Math.floor(-w01 / a20));
331
- }
332
- if (w02 < 0 && a01 !== 0) {
333
- dx = Math.max(dx, Math.floor(-w02 / a01));
334
- }
335
- let w0 = w00 + a12 * dx;
336
- let w1 = w01 + a20 * dx;
337
- let w2 = w02 + a01 * dx;
338
- let wasInside = false;
339
- for (let x = minX + dx; x <= maxX; x++) {
340
- if (w0 >= 0 && w1 >= 0 && w2 >= 0) {
341
- wasInside = true;
342
- const z = z0 * w0 + z1 * w1 + z2 * w2;
343
- const dz = Math.abs(z - this.heightAt(x, y));
344
- rms += dz * dz;
345
- if (dz > maxError) {
346
- maxError = dz;
347
- mx = x;
348
- my = y;
349
- }
350
- } else if (wasInside) {
351
- break;
352
- }
353
- w0 += a12;
354
- w1 += a20;
355
- w2 += a01;
356
- }
357
- w00 += b12;
358
- w01 += b20;
359
- w02 += b01;
360
- }
361
- if (mx === p0x && my === p0y || mx === p1x && my === p1y || mx === p2x && my === p2y) {
362
- maxError = 0;
363
- }
364
- this._candidates[2 * t] = mx;
365
- this._candidates[2 * t + 1] = my;
366
- this._rms[t] = rms;
367
- this._queuePush(t, maxError, rms);
368
- }
369
- // process the next triangle in the queue, splitting it with a new point
370
- _step() {
371
- const t = this._queuePop();
372
- const e0 = t * 3 + 0;
373
- const e1 = t * 3 + 1;
374
- const e2 = t * 3 + 2;
375
- const p0 = this.triangles[e0];
376
- const p1 = this.triangles[e1];
377
- const p2 = this.triangles[e2];
378
- const ax = this.coords[2 * p0];
379
- const ay = this.coords[2 * p0 + 1];
380
- const bx = this.coords[2 * p1];
381
- const by = this.coords[2 * p1 + 1];
382
- const cx = this.coords[2 * p2];
383
- const cy = this.coords[2 * p2 + 1];
384
- const px = this._candidates[2 * t];
385
- const py = this._candidates[2 * t + 1];
386
- const pn = this._addPoint(px, py);
387
- if (orient(ax, ay, bx, by, px, py) === 0) {
388
- this._handleCollinear(pn, e0);
389
- } else if (orient(bx, by, cx, cy, px, py) === 0) {
390
- this._handleCollinear(pn, e1);
391
- } else if (orient(cx, cy, ax, ay, px, py) === 0) {
392
- this._handleCollinear(pn, e2);
393
- } else {
394
- const h0 = this._halfedges[e0];
395
- const h1 = this._halfedges[e1];
396
- const h2 = this._halfedges[e2];
397
- const t0 = this._addTriangle(p0, p1, pn, h0, -1, -1, e0);
398
- const t1 = this._addTriangle(p1, p2, pn, h1, -1, t0 + 1);
399
- const t2 = this._addTriangle(p2, p0, pn, h2, t0 + 2, t1 + 1);
400
- this._legalize(t0);
401
- this._legalize(t1);
402
- this._legalize(t2);
403
- }
404
- }
405
- // add coordinates for a new vertex
406
- _addPoint(x, y) {
407
- const i = this.coords.length >> 1;
408
- this.coords.push(x, y);
409
- return i;
410
- }
411
- // add or update a triangle in the mesh
412
- _addTriangle(a, b, c, ab, bc, ca, e = this.triangles.length) {
413
- const t = e / 3;
414
- this.triangles[e + 0] = a;
415
- this.triangles[e + 1] = b;
416
- this.triangles[e + 2] = c;
417
- this._halfedges[e + 0] = ab;
418
- this._halfedges[e + 1] = bc;
419
- this._halfedges[e + 2] = ca;
420
- if (ab >= 0) {
421
- this._halfedges[ab] = e + 0;
422
- }
423
- if (bc >= 0) {
424
- this._halfedges[bc] = e + 1;
425
- }
426
- if (ca >= 0) {
427
- this._halfedges[ca] = e + 2;
428
- }
429
- this._candidates[2 * t + 0] = 0;
430
- this._candidates[2 * t + 1] = 0;
431
- this._queueIndices[t] = -1;
432
- this._rms[t] = 0;
433
- this._pending[this._pendingLen++] = t;
434
- return e;
435
- }
436
- _legalize(a) {
437
- const b = this._halfedges[a];
438
- if (b < 0) {
439
- return;
440
- }
441
- const a0 = a - a % 3;
442
- const b0 = b - b % 3;
443
- const al = a0 + (a + 1) % 3;
444
- const ar = a0 + (a + 2) % 3;
445
- const bl = b0 + (b + 2) % 3;
446
- const br = b0 + (b + 1) % 3;
447
- const p0 = this.triangles[ar];
448
- const pr = this.triangles[a];
449
- const pl = this.triangles[al];
450
- const p1 = this.triangles[bl];
451
- const coords = this.coords;
452
- if (!inCircle(coords[2 * p0], coords[2 * p0 + 1], coords[2 * pr], coords[2 * pr + 1], coords[2 * pl], coords[2 * pl + 1], coords[2 * p1], coords[2 * p1 + 1])) {
453
- return;
454
- }
455
- const hal = this._halfedges[al];
456
- const har = this._halfedges[ar];
457
- const hbl = this._halfedges[bl];
458
- const hbr = this._halfedges[br];
459
- this._queueRemove(a0 / 3);
460
- this._queueRemove(b0 / 3);
461
- const t0 = this._addTriangle(p0, p1, pl, -1, hbl, hal, a0);
462
- const t1 = this._addTriangle(p1, p0, pr, t0, har, hbr, b0);
463
- this._legalize(t0 + 1);
464
- this._legalize(t1 + 2);
465
- }
466
- // handle a case where new vertex is on the edge of a triangle
467
- _handleCollinear(pn, a) {
468
- const a0 = a - a % 3;
469
- const al = a0 + (a + 1) % 3;
470
- const ar = a0 + (a + 2) % 3;
471
- const p0 = this.triangles[ar];
472
- const pr = this.triangles[a];
473
- const pl = this.triangles[al];
474
- const hal = this._halfedges[al];
475
- const har = this._halfedges[ar];
476
- const b = this._halfedges[a];
477
- if (b < 0) {
478
- const t02 = this._addTriangle(pn, p0, pr, -1, har, -1, a0);
479
- const t12 = this._addTriangle(p0, pn, pl, t02, -1, hal);
480
- this._legalize(t02 + 1);
481
- this._legalize(t12 + 2);
482
- return;
483
- }
484
- const b0 = b - b % 3;
485
- const bl = b0 + (b + 2) % 3;
486
- const br = b0 + (b + 1) % 3;
487
- const p1 = this.triangles[bl];
488
- const hbl = this._halfedges[bl];
489
- const hbr = this._halfedges[br];
490
- this._queueRemove(b0 / 3);
491
- const t0 = this._addTriangle(p0, pr, pn, har, -1, -1, a0);
492
- const t1 = this._addTriangle(pr, p1, pn, hbr, -1, t0 + 1, b0);
493
- const t2 = this._addTriangle(p1, pl, pn, hbl, -1, t1 + 1);
494
- const t3 = this._addTriangle(pl, p0, pn, hal, t0 + 2, t2 + 1);
495
- this._legalize(t0);
496
- this._legalize(t1);
497
- this._legalize(t2);
498
- this._legalize(t3);
499
- }
500
- // priority queue methods
501
- _queuePush(t, error, rms) {
502
- const i = this._queue.length;
503
- this._queueIndices[t] = i;
504
- this._queue.push(t);
505
- this._errors.push(error);
506
- this._rmsSum += rms;
507
- this._queueUp(i);
508
- }
509
- _queuePop() {
510
- const n = this._queue.length - 1;
511
- this._queueSwap(0, n);
512
- this._queueDown(0, n);
513
- return this._queuePopBack();
514
- }
515
- _queuePopBack() {
516
- const t = this._queue.pop();
517
- this._errors.pop();
518
- this._rmsSum -= this._rms[t];
519
- this._queueIndices[t] = -1;
520
- return t;
521
- }
522
- _queueRemove(t) {
523
- const i = this._queueIndices[t];
524
- if (i < 0) {
525
- const it = this._pending.indexOf(t);
526
- if (it !== -1) {
527
- this._pending[it] = this._pending[--this._pendingLen];
528
- } else {
529
- throw new Error("Broken triangulation (something went wrong).");
530
- }
531
- return;
532
- }
533
- const n = this._queue.length - 1;
534
- if (n !== i) {
535
- this._queueSwap(i, n);
536
- if (!this._queueDown(i, n)) {
537
- this._queueUp(i);
538
- }
539
- }
540
- this._queuePopBack();
541
- }
542
- _queueLess(i, j) {
543
- return this._errors[i] > this._errors[j];
544
- }
545
- _queueSwap(i, j) {
546
- const pi = this._queue[i];
547
- const pj = this._queue[j];
548
- this._queue[i] = pj;
549
- this._queue[j] = pi;
550
- this._queueIndices[pi] = j;
551
- this._queueIndices[pj] = i;
552
- const e = this._errors[i];
553
- this._errors[i] = this._errors[j];
554
- this._errors[j] = e;
555
- }
556
- _queueUp(j0) {
557
- let j = j0;
558
- while (true) {
559
- const i = j - 1 >> 1;
560
- if (i === j || !this._queueLess(j, i)) {
561
- break;
562
- }
563
- this._queueSwap(i, j);
564
- j = i;
565
- }
566
- }
567
- _queueDown(i0, n) {
568
- let i = i0;
569
- while (true) {
570
- const j1 = 2 * i + 1;
571
- if (j1 >= n || j1 < 0) {
572
- break;
573
- }
574
- const j2 = j1 + 1;
575
- let j = j1;
576
- if (j2 < n && this._queueLess(j2, j1)) {
577
- j = j2;
578
- }
579
- if (!this._queueLess(j, i)) {
580
- break;
581
- }
582
- this._queueSwap(i, j);
583
- i = j;
584
- }
585
- return i > i0;
586
- }
587
- };
588
- function orient(ax, ay, bx, by, cx, cy) {
589
- return (bx - cx) * (ay - cy) - (by - cy) * (ax - cx);
590
- }
591
- function inCircle(ax, ay, bx, by, cx, cy, px, py) {
592
- const dx = ax - px;
593
- const dy = ay - py;
594
- const ex = bx - px;
595
- const ey = by - py;
596
- const fx = cx - px;
597
- const fy = cy - py;
598
- const ap = dx * dx + dy * dy;
599
- const bp = ex * ex + ey * ey;
600
- const cp = fx * fx + fy * fy;
601
- return dx * (ey * cp - bp * fy) - dy * (ex * cp - bp * fx) + ap * (ex * fy - ey * fx) < 0;
602
- }
104
+ var import_terrain2 = require("@math.gl/geospatial/terrain");
603
105
 
604
106
  // dist/terrain/lib/helpers/skirt.js
605
- var import_loader_utils = require("@loaders.gl/core/loader-utils");
107
+ var import_terrain = require("@math.gl/geospatial/terrain");
606
108
  function addSkirt(attributes, triangles, skirtHeight, outsideIndices) {
607
- const outsideEdges = outsideIndices ? getOutsideEdgesFromIndices(outsideIndices, attributes.POSITION.value) : getOutsideEdgesFromTriangles(triangles);
608
- const newPosition = new attributes.POSITION.value.constructor(outsideEdges.length * 6);
609
- const newTexcoord0 = new attributes.TEXCOORD_0.value.constructor(outsideEdges.length * 4);
610
- const newTriangles = new triangles.constructor(outsideEdges.length * 6);
611
- for (let i = 0; i < outsideEdges.length; i++) {
612
- const edge = outsideEdges[i];
613
- updateAttributesForNewEdge({
614
- edge,
615
- edgeIndex: i,
616
- attributes,
617
- skirtHeight,
618
- newPosition,
619
- newTexcoord0,
620
- newTriangles
621
- });
622
- }
623
- attributes.POSITION.value = (0, import_loader_utils.concatenateTypedArrays)(attributes.POSITION.value, newPosition);
624
- attributes.TEXCOORD_0.value = (0, import_loader_utils.concatenateTypedArrays)(attributes.TEXCOORD_0.value, newTexcoord0);
625
- const resultTriangles = triangles instanceof Array ? triangles.concat(newTriangles) : (0, import_loader_utils.concatenateTypedArrays)(triangles, newTriangles);
109
+ const positions = attributes.POSITION.value;
110
+ const sourceIndices = Array.isArray(triangles) ? Uint32Array.from(triangles) : triangles;
111
+ const edges = outsideIndices ? getBoundaryEdges(outsideIndices, positions) : void 0;
112
+ const skirt = (0, import_terrain.createTerrainSkirt)({ positions, indices: sourceIndices }, { height: skirtHeight, edges });
113
+ const textureCoordinates = attributes.TEXCOORD_0.value;
114
+ const outputTextureCoordinates = new textureCoordinates.constructor(skirt.positions.length / 3 * 2);
115
+ outputTextureCoordinates.set(textureCoordinates);
116
+ for (let i = 0; i < skirt.sourceVertexIndices.length; i++) {
117
+ const source = skirt.sourceVertexIndices[i];
118
+ outputTextureCoordinates.set(textureCoordinates.subarray(source * 2, source * 2 + 2), (skirt.skirtVertexOffset + i) * 2);
119
+ }
120
+ attributes.POSITION.value = skirt.positions;
121
+ attributes.TEXCOORD_0.value = outputTextureCoordinates;
626
122
  return {
627
123
  attributes,
628
- triangles: resultTriangles
124
+ triangles: Array.isArray(triangles) ? Array.from(skirt.indices) : skirt.indices
629
125
  };
630
126
  }
631
- function getOutsideEdgesFromTriangles(triangles) {
632
- const edges = [];
633
- for (let i = 0; i < triangles.length; i += 3) {
634
- edges.push([triangles[i], triangles[i + 1]]);
635
- edges.push([triangles[i + 1], triangles[i + 2]]);
636
- edges.push([triangles[i + 2], triangles[i]]);
637
- }
638
- edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));
639
- const outsideEdges = [];
640
- let index = 0;
641
- while (index < edges.length) {
642
- if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {
643
- index += 2;
644
- } else {
645
- outsideEdges.push(edges[index]);
646
- index++;
647
- }
648
- }
649
- return outsideEdges;
650
- }
651
- function getOutsideEdgesFromIndices(indices, position) {
652
- indices.westIndices.sort((a, b) => position[3 * a + 1] - position[3 * b + 1]);
653
- indices.eastIndices.sort((a, b) => position[3 * b + 1] - position[3 * a + 1]);
654
- indices.southIndices.sort((a, b) => position[3 * b] - position[3 * a]);
655
- indices.northIndices.sort((a, b) => position[3 * a] - position[3 * b]);
127
+ function getBoundaryEdges(indices, positions) {
128
+ indices.westIndices.sort((a, b) => positions[3 * a + 1] - positions[3 * b + 1]);
129
+ indices.eastIndices.sort((a, b) => positions[3 * b + 1] - positions[3 * a + 1]);
130
+ indices.southIndices.sort((a, b) => positions[3 * b] - positions[3 * a]);
131
+ indices.northIndices.sort((a, b) => positions[3 * a] - positions[3 * b]);
656
132
  const edges = [];
657
- for (const index in indices) {
658
- const indexGroup = indices[index];
659
- for (let i = 0; i < indexGroup.length - 1; i++) {
660
- edges.push([indexGroup[i], indexGroup[i + 1]]);
661
- }
133
+ for (const side of [
134
+ indices.westIndices,
135
+ indices.northIndices,
136
+ indices.eastIndices,
137
+ indices.southIndices
138
+ ]) {
139
+ for (let i = 1; i < side.length; i++)
140
+ edges.push(side[i - 1], side[i]);
662
141
  }
663
- return edges;
664
- }
665
- function updateAttributesForNewEdge({ edge, edgeIndex, attributes, skirtHeight, newPosition, newTexcoord0, newTriangles }) {
666
- const positionsLength = attributes.POSITION.value.length;
667
- const vertex1Offset = edgeIndex * 2;
668
- const vertex2Offset = edgeIndex * 2 + 1;
669
- newPosition.set(attributes.POSITION.value.subarray(edge[0] * 3, edge[0] * 3 + 3), vertex1Offset * 3);
670
- newPosition[vertex1Offset * 3 + 2] = newPosition[vertex1Offset * 3 + 2] - skirtHeight;
671
- newPosition.set(attributes.POSITION.value.subarray(edge[1] * 3, edge[1] * 3 + 3), vertex2Offset * 3);
672
- newPosition[vertex2Offset * 3 + 2] = newPosition[vertex2Offset * 3 + 2] - skirtHeight;
673
- newTexcoord0.set(attributes.TEXCOORD_0.value.subarray(edge[0] * 2, edge[0] * 2 + 2), vertex1Offset * 2);
674
- newTexcoord0.set(attributes.TEXCOORD_0.value.subarray(edge[1] * 2, edge[1] * 2 + 2), vertex2Offset * 2);
675
- const triangle1Offset = edgeIndex * 2 * 3;
676
- newTriangles[triangle1Offset] = edge[0];
677
- newTriangles[triangle1Offset + 1] = positionsLength / 3 + vertex2Offset;
678
- newTriangles[triangle1Offset + 2] = edge[1];
679
- newTriangles[triangle1Offset + 3] = positionsLength / 3 + vertex2Offset;
680
- newTriangles[triangle1Offset + 4] = edge[0];
681
- newTriangles[triangle1Offset + 5] = positionsLength / 3 + vertex1Offset;
142
+ return Uint32Array.from(edges);
682
143
  }
683
144
 
684
145
  // dist/terrain/lib/decode-terrain-heightmap.js
@@ -701,27 +162,27 @@ function decodeTerrainHeightmapInto(image, elevationDecoder, heights, rowStride)
701
162
 
702
163
  // dist/terrain/lib/parse-terrain.js
703
164
  function makeTerrainMeshFromImage(terrainImage, terrainOptions) {
704
- const { meshMaxError, bounds, elevationDecoder } = terrainOptions;
165
+ const { bounds, elevationDecoder } = terrainOptions;
705
166
  const { data, width, height } = terrainImage;
706
167
  let terrain;
707
168
  let mesh;
708
169
  switch (terrainOptions.tesselator) {
709
170
  case "martini":
710
171
  terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);
711
- mesh = getMartiniTileMesh(meshMaxError, width, terrain);
172
+ mesh = getTerrainTileMesh(terrainOptions, width, height, terrain, "martini");
712
173
  break;
713
174
  case "delatin":
714
175
  terrain = getTerrain(data, width, height, elevationDecoder, terrainOptions.tesselator);
715
- mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);
176
+ mesh = getTerrainTileMesh(terrainOptions, width, height, terrain, "delatin");
716
177
  break;
717
178
  // auto
718
179
  default:
719
180
  if (width === height && !(height & width - 1)) {
720
181
  terrain = getTerrain(data, width, height, elevationDecoder, "martini");
721
- mesh = getMartiniTileMesh(meshMaxError, width, terrain);
182
+ mesh = getTerrainTileMesh(terrainOptions, width, height, terrain, "martini");
722
183
  } else {
723
184
  terrain = getTerrain(data, width, height, elevationDecoder, "delatin");
724
- mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);
185
+ mesh = getTerrainTileMesh(terrainOptions, width, height, terrain, "delatin");
725
186
  }
726
187
  break;
727
188
  }
@@ -757,19 +218,19 @@ function makeTerrainMeshFromImage(terrainImage, terrainOptions) {
757
218
  attributes
758
219
  };
759
220
  }
760
- function getMartiniTileMesh(meshMaxError, width, terrain) {
761
- const gridSize = width + 1;
762
- const martini = new Martini(gridSize);
763
- const tile = martini.createTile(terrain);
764
- const { vertices, triangles } = tile.getMesh(meshMaxError);
765
- return { vertices, triangles };
766
- }
767
- function getDelatinTileMesh(meshMaxError, width, height, terrain) {
768
- const tin = new Delatin(terrain, width + 1, height + 1);
769
- tin.run(meshMaxError);
770
- const { coords, triangles } = tin;
771
- const vertices = coords;
772
- return { vertices, triangles };
221
+ function getTerrainTileMesh(terrainOptions, width, height, terrain, tesselator) {
222
+ const field = new import_terrain2.HeightField({
223
+ width: width + 1,
224
+ height: height + 1,
225
+ heights: terrain,
226
+ rowStep: [0, -1]
227
+ });
228
+ const options = {
229
+ maxError: terrainOptions.meshMaxError,
230
+ maxSampleTests: terrainOptions.meshMaxSampleTests ?? Math.max(1e7, 32 * terrain.length)
231
+ };
232
+ const mesh = tesselator === "martini" ? (0, import_terrain2.createMartiniTerrainMesh)(field, options) : (0, import_terrain2.createDelatinTerrainMesh)(field, options);
233
+ return { vertices: mesh.gridCoordinates, triangles: mesh.indices };
773
234
  }
774
235
  function getTerrain(imageData, width, height, elevationDecoder, tesselator) {
775
236
  const terrain = new Float32Array((width + 1) * (height + 1));
@@ -813,10 +274,10 @@ function getMeshAttributes(vertices, terrain, width, height, bounds) {
813
274
  var { preload: _TerrainLoaderPreload, ...TerrainLoaderMetadataWithoutPreload } = TerrainLoader;
814
275
  var TerrainLoaderWithParser = {
815
276
  ...TerrainLoaderMetadataWithoutPreload,
816
- serializeWorkerResult: import_arrow_transport.serializeArrowWorkerResult,
817
- deserializeWorkerResult: import_arrow_transport.deserializeArrowWorkerResult,
277
+ serializeWorkerResult: import_arrow_worker_transport.serializeArrowWorkerResult,
278
+ deserializeWorkerResult: import_arrow_worker_transport.deserializeArrowWorkerResult,
818
279
  /** Image decoder requested by terrain workers through the nested parse bridge. */
819
- subloaders: { ImageBitmapLoader: import_images.ImageBitmapLoader },
280
+ subloaders: { ImageLoader: import_images.ImageLoader },
820
281
  parse: parseTerrain
821
282
  };
822
283
  async function parseTerrain(arrayBuffer, options, context) {
@@ -824,7 +285,7 @@ async function parseTerrain(arrayBuffer, options, context) {
824
285
  ...options,
825
286
  core: { ...options?.core, mimeType: "application/x.image" }
826
287
  };
827
- const image = await (0, import_loader_utils2.parseFromContext)(arrayBuffer, import_images.ImageBitmapLoader, loadImageOptions, context);
288
+ const image = await (0, import_loader_utils.parseFromContext)(arrayBuffer, import_images.ImageLoader, loadImageOptions, context);
828
289
  const imageData = (0, import_images.getImageData)(image);
829
290
  const terrainImage = {
830
291
  width: imageData.width,
@@ -836,8 +297,8 @@ async function parseTerrain(arrayBuffer, options, context) {
836
297
  ...options?.terrain
837
298
  };
838
299
  const mesh = makeTerrainMeshFromImage(terrainImage, terrainOptions);
839
- const table = (0, import_schema_utils2.convertMeshToTable)(mesh, "arrow-table");
840
- if (options?.terrain?.shape === "arrow-table") {
300
+ const table = (0, import_schema_utils2.convertMeshToArrowTable)(mesh);
301
+ if (options?.terrain?.shape === "arrow") {
841
302
  return table;
842
303
  }
843
304
  return {
@@ -849,16 +310,18 @@ async function parseTerrain(arrayBuffer, options, context) {
849
310
 
850
311
  // dist/terrain/quantized-mesh-loader-types.js
851
312
  var QuantizedMeshLoader = {
313
+ defaultShape: "arrow",
314
+ supportsNativeArrow: true,
852
315
  dataType: null,
853
316
  batchType: null,
854
317
  ...QuantizedMeshFormat,
855
318
  version: VERSION,
856
319
  worker: true,
857
320
  /** Loads the parser-bearing quantized mesh loader implementation. */
858
- preload: async () => (await import("@loaders.gl/raster/terrain/quantized-mesh-loader")).QuantizedMeshLoaderWithParser,
321
+ preload: async () => (await import("@loaders.gl/raster/quantized-mesh-loader")).QuantizedMeshLoaderWithParser,
859
322
  options: {
860
323
  "quantized-mesh": {
861
- shape: "arrow-table",
324
+ shape: "arrow",
862
325
  bounds: [0, 0, 1, 1],
863
326
  skirtHeight: null
864
327
  }
@@ -866,7 +329,7 @@ var QuantizedMeshLoader = {
866
329
  };
867
330
 
868
331
  // dist/terrain/quantized-mesh-loader.js
869
- var import_arrow_transport2 = require("@loaders.gl/core/schema-utils/arrow-transport");
332
+ var import_arrow_worker_transport2 = require("@loaders.gl/core/arrow-worker-transport");
870
333
  var import_schema_utils4 = require("@loaders.gl/core/schema-utils");
871
334
 
872
335
  // dist/terrain/lib/parse-quantized-mesh.js
@@ -1148,15 +611,15 @@ function getMeshAttributes2(vertexData, header, bounds) {
1148
611
  var { preload: _QuantizedMeshLoaderPreload, ...QuantizedMeshLoaderMetadataWithoutPreload } = QuantizedMeshLoader;
1149
612
  var QuantizedMeshLoaderWithParser = {
1150
613
  ...QuantizedMeshLoaderMetadataWithoutPreload,
1151
- serializeWorkerResult: import_arrow_transport2.serializeArrowWorkerResult,
1152
- deserializeWorkerResult: import_arrow_transport2.deserializeArrowWorkerResult,
614
+ serializeWorkerResult: import_arrow_worker_transport2.serializeArrowWorkerResult,
615
+ deserializeWorkerResult: import_arrow_worker_transport2.deserializeArrowWorkerResult,
1153
616
  parseSync: parseQuantizedMeshInRequestedShape,
1154
617
  parse: async (arrayBuffer, options) => parseQuantizedMeshInRequestedShape(arrayBuffer, options)
1155
618
  };
1156
619
  function parseQuantizedMeshInRequestedShape(arrayBuffer, options) {
1157
620
  const mesh = parseQuantizedMesh(arrayBuffer, options?.["quantized-mesh"]);
1158
- const table = (0, import_schema_utils4.convertMeshToTable)(mesh, "arrow-table");
1159
- if (options?.["quantized-mesh"]?.shape === "arrow-table") {
621
+ const table = (0, import_schema_utils4.convertMeshToArrowTable)(mesh);
622
+ if (options?.["quantized-mesh"]?.shape === "arrow") {
1160
623
  return table;
1161
624
  }
1162
625
  return {
@@ -1215,10 +678,10 @@ function encodeQuantizedMeshSync(data, options = {}) {
1215
678
  return arrayBuffer;
1216
679
  }
1217
680
  function normalizeMeshArrowTable(data) {
1218
- if ("shape" in data && data.shape === "arrow-table") {
681
+ if (!("attributes" in data)) {
1219
682
  return data;
1220
683
  }
1221
- return (0, import_schema_utils5.convertMeshToTable)(data, "arrow-table");
684
+ return (0, import_schema_utils5.convertMeshToArrowTable)(data);
1222
685
  }
1223
686
  function getRequiredAttribute(mesh, attributeName) {
1224
687
  const attribute = mesh.attributes[attributeName];
@@ -1395,7 +858,6 @@ function encodeZigZag(value) {
1395
858
  QuantizedMeshFormat,
1396
859
  QuantizedMeshLoader,
1397
860
  QuantizedMeshLoaderWithParser,
1398
- QuantizedMeshWorkerLoader,
1399
861
  QuantizedMeshWriter,
1400
862
  TerrainFormat,
1401
863
  TerrainLoader,