@loaders.gl/raster 5.0.0-beta.5 → 5.0.0-beta.7

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 (53) hide show
  1. package/dist/geotiff/advanced.cjs +4 -4
  2. package/dist/geotiff/geotiff-loader-types.js +1 -1
  3. package/dist/geotiff/geotiff-raster-loader-types.js +1 -1
  4. package/dist/geotiff/geotiff-source-loader.js +1 -1
  5. package/dist/geotiff/loaders.js +1 -1
  6. package/dist/geotiff/ometiff-source-loader.js +1 -1
  7. package/dist/index.cjs +4 -4
  8. package/dist/index.cjs.map +1 -1
  9. package/dist/index.d.ts +1 -2
  10. package/dist/index.d.ts.map +1 -1
  11. package/dist/index.js.map +1 -1
  12. package/dist/lerc/lerc-loader-types.js +1 -1
  13. package/dist/quantized-mesh-worker.js +4379 -4481
  14. package/dist/terrain/heightmap.cjs +2 -333
  15. package/dist/terrain/heightmap.cjs.map +4 -4
  16. package/dist/terrain/heightmap.d.ts +1 -5
  17. package/dist/terrain/heightmap.d.ts.map +1 -1
  18. package/dist/terrain/heightmap.js +0 -3
  19. package/dist/terrain/heightmap.js.map +1 -1
  20. package/dist/terrain/index.cjs +35 -76
  21. package/dist/terrain/index.cjs.map +3 -3
  22. package/dist/terrain/index.d.ts +1 -2
  23. package/dist/terrain/index.d.ts.map +1 -1
  24. package/dist/terrain/index.js.map +1 -1
  25. package/dist/terrain/lib/helpers/skirt.d.ts +2 -9
  26. package/dist/terrain/lib/helpers/skirt.d.ts.map +1 -1
  27. package/dist/terrain/lib/helpers/skirt.js +30 -114
  28. package/dist/terrain/lib/helpers/skirt.js.map +1 -1
  29. package/dist/terrain/lib/terrain-contracts.d.ts +0 -15
  30. package/dist/terrain/lib/terrain-contracts.d.ts.map +1 -1
  31. package/dist/terrain/lib/utils/version.js +1 -1
  32. package/dist/terrain-worker.js +131 -117
  33. package/package.json +5 -17
  34. package/src/index.ts +0 -7
  35. package/src/terrain/heightmap.ts +0 -10
  36. package/src/terrain/index.ts +0 -7
  37. package/src/terrain/lib/helpers/skirt.ts +41 -151
  38. package/src/terrain/lib/terrain-contracts.ts +0 -19
  39. package/dist/terrain/lib/terrain-height-field.d.ts +0 -51
  40. package/dist/terrain/lib/terrain-height-field.d.ts.map +0 -1
  41. package/dist/terrain/lib/terrain-height-field.js +0 -260
  42. package/dist/terrain/lib/terrain-height-field.js.map +0 -1
  43. package/dist/terrain/lib/terrain-height-grid.d.ts +0 -14
  44. package/dist/terrain/lib/terrain-height-grid.d.ts.map +0 -1
  45. package/dist/terrain/lib/terrain-height-grid.js +0 -104
  46. package/dist/terrain/lib/terrain-height-grid.js.map +0 -1
  47. package/dist/terrain/lib/terrain-neighborhood.d.ts +0 -15
  48. package/dist/terrain/lib/terrain-neighborhood.d.ts.map +0 -1
  49. package/dist/terrain/lib/terrain-neighborhood.js +0 -58
  50. package/dist/terrain/lib/terrain-neighborhood.js.map +0 -1
  51. package/src/terrain/lib/terrain-height-field.ts +0 -355
  52. package/src/terrain/lib/terrain-height-grid.ts +0 -157
  53. package/src/terrain/lib/terrain-neighborhood.ts +0 -69
@@ -1,127 +1,43 @@
1
1
  // loaders.gl
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
- import { concatenateTypedArrays } from '@loaders.gl/core/loader-utils';
5
- /**
6
- * Add skirt to existing mesh
7
- * @param {object} attributes - POSITION and TEXCOOD_0 attributes data
8
- * @param {any} triangles - indices array of the mesh geometry
9
- * @param skirtHeight - height of the skirt geometry
10
- * @param outsideIndices - edge indices from quantized mesh data
11
- * @returns - geometry data with added skirt
12
- */
4
+ import { createTerrainSkirt } from '@math.gl/geospatial/terrain';
5
+ /** Add a visual skirt while retaining the loader's texture coordinates and index representation. */
13
6
  export function addSkirt(attributes, triangles, skirtHeight, outsideIndices) {
14
- const outsideEdges = outsideIndices
15
- ? getOutsideEdgesFromIndices(outsideIndices, attributes.POSITION.value)
16
- : getOutsideEdgesFromTriangles(triangles);
17
- // 2 new vertices for each outside edge
18
- const newPosition = new attributes.POSITION.value.constructor(outsideEdges.length * 6);
19
- const newTexcoord0 = new attributes.TEXCOORD_0.value.constructor(outsideEdges.length * 4);
20
- // 2 new triangles for each outside edge
21
- const newTriangles = new triangles.constructor(outsideEdges.length * 6);
22
- for (let i = 0; i < outsideEdges.length; i++) {
23
- const edge = outsideEdges[i];
24
- updateAttributesForNewEdge({
25
- edge,
26
- edgeIndex: i,
27
- attributes,
28
- skirtHeight,
29
- newPosition,
30
- newTexcoord0,
31
- newTriangles
32
- });
7
+ const positions = attributes.POSITION.value;
8
+ const sourceIndices = Array.isArray(triangles) ? Uint32Array.from(triangles) : triangles;
9
+ const edges = outsideIndices ? getBoundaryEdges(outsideIndices, positions) : undefined;
10
+ const skirt = createTerrainSkirt({ positions, indices: sourceIndices }, { height: skirtHeight, edges });
11
+ const textureCoordinates = attributes.TEXCOORD_0.value;
12
+ const outputTextureCoordinates = new textureCoordinates.constructor((skirt.positions.length / 3) * 2);
13
+ outputTextureCoordinates.set(textureCoordinates);
14
+ for (let i = 0; i < skirt.sourceVertexIndices.length; i++) {
15
+ const source = skirt.sourceVertexIndices[i];
16
+ outputTextureCoordinates.set(textureCoordinates.subarray(source * 2, source * 2 + 2), (skirt.skirtVertexOffset + i) * 2);
33
17
  }
34
- attributes.POSITION.value = concatenateTypedArrays(attributes.POSITION.value, newPosition);
35
- attributes.TEXCOORD_0.value = concatenateTypedArrays(attributes.TEXCOORD_0.value, newTexcoord0);
36
- const resultTriangles = triangles instanceof Array
37
- ? triangles.concat(newTriangles)
38
- : concatenateTypedArrays(triangles, newTriangles);
18
+ attributes.POSITION.value = skirt.positions;
19
+ attributes.TEXCOORD_0.value = outputTextureCoordinates;
39
20
  return {
40
21
  attributes,
41
- triangles: resultTriangles
22
+ triangles: Array.isArray(triangles) ? Array.from(skirt.indices) : skirt.indices
42
23
  };
43
24
  }
44
- /**
45
- * Get geometry edges that located on a border of the mesh
46
- * @param {any} triangles - indices array of the mesh geometry
47
- * @returns {number[][]} - outside edges data
48
- */
49
- function getOutsideEdgesFromTriangles(triangles) {
25
+ /** Translate quantized mesh side lists into selected boundary edge pairs. */
26
+ function getBoundaryEdges(indices, positions) {
27
+ indices.westIndices.sort((a, b) => positions[3 * a + 1] - positions[3 * b + 1]);
28
+ indices.eastIndices.sort((a, b) => positions[3 * b + 1] - positions[3 * a + 1]);
29
+ indices.southIndices.sort((a, b) => positions[3 * b] - positions[3 * a]);
30
+ indices.northIndices.sort((a, b) => positions[3 * a] - positions[3 * b]);
50
31
  const edges = [];
51
- for (let i = 0; i < triangles.length; i += 3) {
52
- edges.push([triangles[i], triangles[i + 1]]);
53
- edges.push([triangles[i + 1], triangles[i + 2]]);
54
- edges.push([triangles[i + 2], triangles[i]]);
32
+ for (const side of [
33
+ indices.westIndices,
34
+ indices.northIndices,
35
+ indices.eastIndices,
36
+ indices.southIndices
37
+ ]) {
38
+ for (let i = 1; i < side.length; i++)
39
+ edges.push(side[i - 1], side[i]);
55
40
  }
56
- edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));
57
- const outsideEdges = [];
58
- let index = 0;
59
- while (index < edges.length) {
60
- if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {
61
- index += 2;
62
- }
63
- else {
64
- outsideEdges.push(edges[index]);
65
- index++;
66
- }
67
- }
68
- return outsideEdges;
69
- }
70
- /**
71
- * Get geometry edges that located on a border of the mesh
72
- * @param {object} indices - edge indices from quantized mesh data
73
- * @param {TypedArray} position - position attribute geometry data
74
- * @returns {number[][]} - outside edges data
75
- */
76
- function getOutsideEdgesFromIndices(indices, position) {
77
- // Sort skirt indices to create adjacent triangles
78
- indices.westIndices.sort((a, b) => position[3 * a + 1] - position[3 * b + 1]);
79
- // Reverse (b - a) to match triangle winding
80
- indices.eastIndices.sort((a, b) => position[3 * b + 1] - position[3 * a + 1]);
81
- indices.southIndices.sort((a, b) => position[3 * b] - position[3 * a]);
82
- // Reverse (b - a) to match triangle winding
83
- indices.northIndices.sort((a, b) => position[3 * a] - position[3 * b]);
84
- const edges = [];
85
- for (const index in indices) {
86
- const indexGroup = indices[index];
87
- for (let i = 0; i < indexGroup.length - 1; i++) {
88
- edges.push([indexGroup[i], indexGroup[i + 1]]);
89
- }
90
- }
91
- return edges;
92
- }
93
- /**
94
- * Get geometry edges that located on a border of the mesh
95
- * @param {object} args
96
- * @param {number[]} args.edge - edge indices in geometry
97
- * @param {number} args.edgeIndex - edge index in outsideEdges array
98
- * @param {object} args.attributes - POSITION and TEXCOORD_0 attributes
99
- * @param {number} args.skirtHeight - height of the skirt geometry
100
- * @param {TypedArray} args.newPosition - POSITION array for skirt data
101
- * @param {TypedArray} args.newTexcoord0 - TEXCOORD_0 array for skirt data
102
- * @param {TypedArray | Array} args.newTriangles - trinagle indices array for skirt data
103
- * @returns {void}
104
- */
105
- function updateAttributesForNewEdge({ edge, edgeIndex, attributes, skirtHeight, newPosition, newTexcoord0, newTriangles }) {
106
- const positionsLength = attributes.POSITION.value.length;
107
- const vertex1Offset = edgeIndex * 2;
108
- const vertex2Offset = edgeIndex * 2 + 1;
109
- // Define POSITION for new 1st vertex
110
- newPosition.set(attributes.POSITION.value.subarray(edge[0] * 3, edge[0] * 3 + 3), vertex1Offset * 3);
111
- newPosition[vertex1Offset * 3 + 2] = newPosition[vertex1Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height
112
- // Define POSITION for new 2nd vertex
113
- newPosition.set(attributes.POSITION.value.subarray(edge[1] * 3, edge[1] * 3 + 3), vertex2Offset * 3);
114
- newPosition[vertex2Offset * 3 + 2] = newPosition[vertex2Offset * 3 + 2] - skirtHeight; // put down elevation on the skirt height
115
- // Use same TEXCOORDS for skirt vertices
116
- newTexcoord0.set(attributes.TEXCOORD_0.value.subarray(edge[0] * 2, edge[0] * 2 + 2), vertex1Offset * 2);
117
- newTexcoord0.set(attributes.TEXCOORD_0.value.subarray(edge[1] * 2, edge[1] * 2 + 2), vertex2Offset * 2);
118
- // Define new triangles
119
- const triangle1Offset = edgeIndex * 2 * 3;
120
- newTriangles[triangle1Offset] = edge[0];
121
- newTriangles[triangle1Offset + 1] = positionsLength / 3 + vertex2Offset;
122
- newTriangles[triangle1Offset + 2] = edge[1];
123
- newTriangles[triangle1Offset + 3] = positionsLength / 3 + vertex2Offset;
124
- newTriangles[triangle1Offset + 4] = edge[0];
125
- newTriangles[triangle1Offset + 5] = positionsLength / 3 + vertex1Offset;
41
+ return Uint32Array.from(edges);
126
42
  }
127
43
  //# sourceMappingURL=skirt.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"skirt.js","sourceRoot":"","sources":["../../../../src/terrain/lib/helpers/skirt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"skirt.js","sourceRoot":"","sources":["../../../../src/terrain/lib/helpers/skirt.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAS/D,oGAAoG;AACpG,MAAM,UAAU,QAAQ,CAAC,UAAU,EAAE,SAAS,EAAE,WAAmB,EAAE,cAA4B;IAC/F,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC5C,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACzF,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACvF,MAAM,KAAK,GAAG,kBAAkB,CAC9B,EAAC,SAAS,EAAE,OAAO,EAAE,aAAa,EAAC,EACnC,EAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAC,CAC7B,CAAC;IACF,MAAM,kBAAkB,GAAG,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC;IACvD,MAAM,wBAAwB,GAAG,IAAI,kBAAkB,CAAC,WAAW,CACjE,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CACjC,CAAC;IACF,wBAAwB,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1D,MAAM,MAAM,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;QAC5C,wBAAwB,CAAC,GAAG,CAC1B,kBAAkB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,EACvD,CAAC,KAAK,CAAC,iBAAiB,GAAG,CAAC,CAAC,GAAG,CAAC,CAClC,CAAC;IACJ,CAAC;IACD,UAAU,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC;IAC5C,UAAU,CAAC,UAAU,CAAC,KAAK,GAAG,wBAAwB,CAAC;IACvD,OAAO;QACL,UAAU;QACV,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO;KAChF,CAAC;AACJ,CAAC;AAED,6EAA6E;AAC7E,SAAS,gBAAgB,CACvB,OAAoB,EACpB,SAAsC;IAEtC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAChF,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAChF,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACzE,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACzE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI;QACjB,OAAO,CAAC,WAAW;QACnB,OAAO,CAAC,YAAY;QACpB,OAAO,CAAC,WAAW;QACnB,OAAO,CAAC,YAAY;KACrB,EAAE,CAAC;QACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC"}
@@ -1,18 +1,3 @@
1
- import type { TerrainHeightmap } from "./terrain-heightmap-types.js";
2
- /** Georeferencing supplied by a source, never inferred from a provider name. */
3
- export type TerrainGridMetadata = {
4
- /** West, south, east, north in unwrapped EPSG:3857 meters; row zero is north. */
5
- readonly bounds: readonly [number, number, number, number];
6
- /** Pixel centers or samples including both footprint edges. */
7
- readonly registration: 'pixel-center' | 'grid-node';
8
- /** Physical height reference; this API does not convert vertical datums. */
9
- readonly verticalDatum: 'ellipsoidal' | 'orthometric' | 'unknown';
10
- };
11
- /** Physical source meters, independent of projection, display relief and mesh resolution. */
12
- export type TerrainHeightGrid = TerrainHeightmap & TerrainGridMetadata & {
13
- /** One byte per sample: zero is missing; invalid heights are NaN. Alpha is not inferred. */
14
- readonly valid: Uint8Array;
15
- };
16
1
  /** Ray coordinates must match the queried surface; direction need not be normalized. */
17
2
  export type TerrainRay = {
18
3
  /** Absolute content-space origin, before camera or room-placement transforms. */
@@ -1 +1 @@
1
- {"version":3,"file":"terrain-contracts.d.ts","sourceRoot":"","sources":["../../../src/terrain/lib/terrain-contracts.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAC,qCAAkC;AAEhE,gFAAgF;AAChF,MAAM,MAAM,mBAAmB,GAAG;IAChC,iFAAiF;IACjF,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3D,+DAA+D;IAC/D,QAAQ,CAAC,YAAY,EAAE,cAAc,GAAG,WAAW,CAAC;IACpD,4EAA4E;IAC5E,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS,CAAC;CACnE,CAAC;AAEF,6FAA6F;AAC7F,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,GAC9C,mBAAmB,GAAG;IACpB,4FAA4F;IAC5F,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;CAC5B,CAAC;AAEJ,wFAAwF;AACxF,MAAM,MAAM,UAAU,GAAG;IACvB,iFAAiF;IACjF,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,gCAAgC;IAChC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACvD,CAAC;AAEF,gFAAgF;AAChF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,2DAA2D;IAC3D,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD,+FAA+F;IAC/F,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvD,oFAAoF;IACpF,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,kDAAkD;IAClD,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,uDAAuD;IACvD,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACzD,CAAC;AAEF,uEAAuE;AACvE,MAAM,MAAM,oBAAoB,GAAG;IACjC,2BAA2B;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,2BAA2B;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACrD,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,iFAAiF;IACjF,QAAQ,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC;IAC9C,kGAAkG;IAClG,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAC9E,qEAAqE;IACrE,SAAS,CAAC,IAAI,oBAAoB,GAAG,IAAI,CAAC;CAC3C,CAAC"}
1
+ {"version":3,"file":"terrain-contracts.d.ts","sourceRoot":"","sources":["../../../src/terrain/lib/terrain-contracts.ts"],"names":[],"mappings":"AAIA,wFAAwF;AACxF,MAAM,MAAM,UAAU,GAAG;IACvB,iFAAiF;IACjF,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,gCAAgC;IAChC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACvD,CAAC;AAEF,gFAAgF;AAChF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,2DAA2D;IAC3D,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD,+FAA+F;IAC/F,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvD,oFAAoF;IACpF,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,kDAAkD;IAClD,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,uDAAuD;IACvD,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACzD,CAAC;AAEF,uEAAuE;AACvE,MAAM,MAAM,oBAAoB,GAAG;IACjC,2BAA2B;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,2BAA2B;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACrD,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,iFAAiF;IACjF,QAAQ,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC;IAC9C,kGAAkG;IAClG,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAC9E,qEAAqE;IACrE,SAAS,CAAC,IAAI,oBAAoB,GAAG,IAAI,CAAC;CAC3C,CAAC"}
@@ -4,5 +4,5 @@
4
4
  // Version constant cannot be imported, it needs to correspond to the build version of **this** module.
5
5
  // __VERSION__ is injected by babel-plugin-version-inline
6
6
  // @ts-ignore TS2304: Cannot find name '__VERSION__'.
7
- export const VERSION = typeof "5.0.0-beta.5" !== 'undefined' ? "5.0.0-beta.5" : 'latest';
7
+ export const VERSION = typeof "5.0.0-beta.7" !== 'undefined' ? "5.0.0-beta.7" : 'latest';
8
8
  //# sourceMappingURL=version.js.map
@@ -1298,30 +1298,6 @@
1298
1298
  }
1299
1299
  });
1300
1300
 
1301
- // ../core/src/loader-utils/lib/binary-utils/array-buffer-utils.ts
1302
- function concatenateTypedArrays(...typedArrays) {
1303
- const arrays = typedArrays;
1304
- const TypedArrayConstructor = arrays && arrays.length > 1 && arrays[0].constructor || null;
1305
- if (!TypedArrayConstructor) {
1306
- throw new Error(
1307
- '"concatenateTypedArrays" - incorrect quantity of arguments or arguments have incompatible data types'
1308
- );
1309
- }
1310
- const sumLength = arrays.reduce((acc, value) => acc + value.length, 0);
1311
- const result = new TypedArrayConstructor(sumLength);
1312
- let offset = 0;
1313
- for (const array of arrays) {
1314
- result.set(array, offset);
1315
- offset += array.length;
1316
- }
1317
- return result;
1318
- }
1319
- var init_array_buffer_utils = __esm({
1320
- "../core/src/loader-utils/lib/binary-utils/array-buffer-utils.ts"() {
1321
- "use strict";
1322
- }
1323
- });
1324
-
1325
1301
  // ../../node_modules/@math.gl/core/dist/lib/math-utils.js
1326
1302
  var PI_OVER_TWO, PI_OVER_FOUR, PI_OVER_SIX, TWO_PI;
1327
1303
  var init_math_utils = __esm({
@@ -1771,6 +1747,97 @@
1771
1747
  }
1772
1748
  });
1773
1749
 
1750
+ // ../../node_modules/@math.gl/geospatial/dist/terrain/mesh-skirts.js
1751
+ function createTerrainSkirt(mesh, options) {
1752
+ const { positions, indices } = mesh, { height, edges } = options;
1753
+ const maxVertices = options.maxVertices ?? 2e6, maxTriangles = options.maxTriangles ?? 4e6;
1754
+ if (!Number.isFinite(height) || height <= 0 || !Number.isSafeInteger(maxVertices) || maxVertices < 0 || maxVertices > 4294967295 || !Number.isSafeInteger(maxTriangles) || maxTriangles < 0 || maxTriangles > 4294967295)
1755
+ throw new Error("Invalid terrain skirt height or capacity");
1756
+ if (!(positions instanceof Float32Array || positions instanceof Float64Array) || positions.length < 3 || positions.length % 3 || !positions.every(Number.isFinite) || !(indices instanceof Uint16Array || indices instanceof Uint32Array) || indices.length % 3 || positions.length / 3 > maxVertices || indices.length / 3 > maxTriangles)
1757
+ throw new Error("Invalid terrain skirt mesh or capacity");
1758
+ if (edges !== void 0 && (!(edges instanceof Uint16Array || edges instanceof Uint32Array) || edges.length % 2))
1759
+ throw new Error("Invalid terrain skirt edge pairs");
1760
+ const vertexCount = positions.length / 3, triangleCount = indices.length / 3;
1761
+ const boundary = /* @__PURE__ */ new Map();
1762
+ for (let i = 0; i < indices.length; i += 3) {
1763
+ const ids = [indices[i], indices[i + 1], indices[i + 2]];
1764
+ if (ids.some((id) => id >= vertexCount))
1765
+ throw new Error("Terrain skirt index out of range");
1766
+ const [a, b, c] = ids.map((id) => id * 3);
1767
+ const area = (positions[b] - positions[a]) * (positions[c + 1] - positions[a + 1]) - (positions[b + 1] - positions[a + 1]) * (positions[c] - positions[a]);
1768
+ if (!Number.isFinite(area) || area <= 0)
1769
+ throw new Error("Terrain skirt requires upward nondegenerate XY triangles");
1770
+ for (let j = 0; j < 3; j++) {
1771
+ const u = ids[j], v = ids[(j + 1) % 3], key = edgeKey(u, v), prior = boundary.get(key);
1772
+ if (!prior)
1773
+ boundary.set(key, { a: u, b: v, count: 1 });
1774
+ else {
1775
+ if (prior.count !== 1 || prior.a !== v || prior.b !== u)
1776
+ throw new Error("Terrain skirt mesh has nonmanifold or inconsistent edges");
1777
+ prior.count++;
1778
+ }
1779
+ }
1780
+ }
1781
+ let selected;
1782
+ if (edges) {
1783
+ selected = [];
1784
+ const used = /* @__PURE__ */ new Set();
1785
+ for (let i = 0; i < edges.length; i += 2) {
1786
+ const key = edgeKey(edges[i], edges[i + 1]), edge = boundary.get(key);
1787
+ if (!edge || edge.count !== 1 || used.has(key))
1788
+ throw new Error("Terrain skirt selection must contain unique boundary edges");
1789
+ used.add(key);
1790
+ selected.push(edge);
1791
+ }
1792
+ } else
1793
+ selected = [...boundary.values()].filter((edge) => edge.count === 1);
1794
+ const outputVertices = vertexCount + selected.length * 2, outputTriangles = triangleCount + selected.length * 2;
1795
+ if (!Number.isSafeInteger(outputVertices) || outputVertices > maxVertices || outputVertices > 4294967295 || !Number.isSafeInteger(outputTriangles) || outputTriangles > maxTriangles)
1796
+ throw new Error("Terrain skirt output capacity exceeded");
1797
+ const resultPositions = positions instanceof Float32Array ? new Float32Array(outputVertices * 3) : new Float64Array(outputVertices * 3);
1798
+ resultPositions.set(positions);
1799
+ const resultIndices = indices instanceof Uint16Array && outputVertices <= 65536 ? new Uint16Array(outputTriangles * 3) : new Uint32Array(outputTriangles * 3);
1800
+ resultIndices.set(indices);
1801
+ const sourceVertexIndices = new Uint32Array(selected.length * 2), triangleValidity = new Uint8Array(outputTriangles);
1802
+ triangleValidity.fill(1, 0, triangleCount);
1803
+ for (let i = 0; i < selected.length; i++) {
1804
+ const { a, b } = selected[i], lowerA = vertexCount + 2 * i, lowerB = lowerA + 1;
1805
+ for (const [source, target] of [
1806
+ [a, lowerA],
1807
+ [b, lowerB]
1808
+ ]) {
1809
+ resultPositions.set(positions.subarray(3 * source, 3 * source + 3), 3 * target);
1810
+ resultPositions[3 * target + 2] = positions[3 * source + 2] - height;
1811
+ if (!Number.isFinite(resultPositions[3 * target + 2]) || resultPositions[3 * target + 2] >= positions[3 * source + 2])
1812
+ throw new Error("Terrain skirt height cannot be represented in position precision");
1813
+ sourceVertexIndices[target - vertexCount] = source;
1814
+ }
1815
+ resultIndices.set([a, lowerB, b, lowerB, a, lowerA], indices.length + i * 6);
1816
+ }
1817
+ const min = [Infinity, Infinity, Infinity], max = [-Infinity, -Infinity, -Infinity];
1818
+ for (let i = 0; i < resultPositions.length; i++) {
1819
+ const axis = i % 3;
1820
+ min[axis] = Math.min(min[axis], resultPositions[i]);
1821
+ max[axis] = Math.max(max[axis], resultPositions[i]);
1822
+ }
1823
+ return {
1824
+ positions: resultPositions,
1825
+ indices: resultIndices,
1826
+ sourceVertexIndices,
1827
+ skirtVertexOffset: vertexCount,
1828
+ skirtTriangleOffset: triangleCount,
1829
+ triangleValidity,
1830
+ bounds: [min, max]
1831
+ };
1832
+ }
1833
+ function edgeKey(a, b) {
1834
+ return a < b ? `${a},${b}` : `${b},${a}`;
1835
+ }
1836
+ var init_mesh_skirts = __esm({
1837
+ "../../node_modules/@math.gl/geospatial/dist/terrain/mesh-skirts.js"() {
1838
+ }
1839
+ });
1840
+
1774
1841
  // ../../node_modules/@math.gl/geospatial/dist/terrain/mesh-data.js
1775
1842
  function assembleTerrainMesh(field, gridCoordinates, indices, options) {
1776
1843
  const origin = options.origin ?? [field.origin[0], field.origin[1], 0];
@@ -1876,7 +1943,8 @@
1876
1943
  const x = mesh.gridCoordinates[i * 2] + shift, y = mesh.gridCoordinates[i * 2 + 1] + shift;
1877
1944
  for (let axis = 0; axis < 2; axis++) {
1878
1945
  const expected = field.origin[axis] - mesh.origin[axis] + x * field.columnStep[axis] + y * field.rowStep[axis];
1879
- if (!Number.isFinite(expected) || mesh.positions[i * 3 + axis] !== expected)
1946
+ const tolerance = Math.min(16 * Number.EPSILON * (Math.abs(field.origin[axis] - mesh.origin[axis]) + Math.abs(x * field.columnStep[axis]) + Math.abs(y * field.rowStep[axis])), 1e-9 * Math.max(Math.abs(field.columnStep[axis]), Math.abs(field.rowStep[axis])));
1947
+ if (!Number.isFinite(expected) || Math.abs(mesh.positions[i * 3 + axis] - expected) > tolerance)
1880
1948
  throw new Error("Terrain mesh XY does not match the source grid frame");
1881
1949
  }
1882
1950
  }
@@ -2594,6 +2662,7 @@
2594
2662
  var init_terrain = __esm({
2595
2663
  "../../node_modules/@math.gl/geospatial/dist/terrain/index.js"() {
2596
2664
  init_height_field();
2665
+ init_mesh_skirts();
2597
2666
  init_martini2();
2598
2667
  init_delatin2();
2599
2668
  }
@@ -2607,7 +2676,6 @@
2607
2676
  init_assert();
2608
2677
  init_globals();
2609
2678
  init_create_loader_worker();
2610
- init_array_buffer_utils();
2611
2679
  }
2612
2680
  });
2613
2681
 
@@ -19048,7 +19116,7 @@ return true;`);
19048
19116
  var init_version = __esm({
19049
19117
  "../images/src/lib/utils/version.ts"() {
19050
19118
  "use strict";
19051
- VERSION = true ? "5.0.0-beta.5" : "latest";
19119
+ VERSION = true ? "5.0.0-beta.7" : "latest";
19052
19120
  }
19053
19121
  });
19054
19122
 
@@ -19379,106 +19447,52 @@ return true;`);
19379
19447
 
19380
19448
  // src/terrain/lib/helpers/skirt.ts
19381
19449
  function addSkirt(attributes, triangles, skirtHeight, outsideIndices) {
19382
- const outsideEdges = outsideIndices ? getOutsideEdgesFromIndices(outsideIndices, attributes.POSITION.value) : getOutsideEdgesFromTriangles(triangles);
19383
- const newPosition = new attributes.POSITION.value.constructor(outsideEdges.length * 6);
19384
- const newTexcoord0 = new attributes.TEXCOORD_0.value.constructor(outsideEdges.length * 4);
19385
- const newTriangles = new triangles.constructor(outsideEdges.length * 6);
19386
- for (let i = 0; i < outsideEdges.length; i++) {
19387
- const edge = outsideEdges[i];
19388
- updateAttributesForNewEdge({
19389
- edge,
19390
- edgeIndex: i,
19391
- attributes,
19392
- skirtHeight,
19393
- newPosition,
19394
- newTexcoord0,
19395
- newTriangles
19396
- });
19450
+ const positions = attributes.POSITION.value;
19451
+ const sourceIndices = Array.isArray(triangles) ? Uint32Array.from(triangles) : triangles;
19452
+ const edges = outsideIndices ? getBoundaryEdges(outsideIndices, positions) : void 0;
19453
+ const skirt = createTerrainSkirt(
19454
+ { positions, indices: sourceIndices },
19455
+ { height: skirtHeight, edges }
19456
+ );
19457
+ const textureCoordinates = attributes.TEXCOORD_0.value;
19458
+ const outputTextureCoordinates = new textureCoordinates.constructor(
19459
+ skirt.positions.length / 3 * 2
19460
+ );
19461
+ outputTextureCoordinates.set(textureCoordinates);
19462
+ for (let i = 0; i < skirt.sourceVertexIndices.length; i++) {
19463
+ const source = skirt.sourceVertexIndices[i];
19464
+ outputTextureCoordinates.set(
19465
+ textureCoordinates.subarray(source * 2, source * 2 + 2),
19466
+ (skirt.skirtVertexOffset + i) * 2
19467
+ );
19397
19468
  }
19398
- attributes.POSITION.value = concatenateTypedArrays(attributes.POSITION.value, newPosition);
19399
- attributes.TEXCOORD_0.value = concatenateTypedArrays(attributes.TEXCOORD_0.value, newTexcoord0);
19400
- const resultTriangles = triangles instanceof Array ? triangles.concat(newTriangles) : concatenateTypedArrays(triangles, newTriangles);
19469
+ attributes.POSITION.value = skirt.positions;
19470
+ attributes.TEXCOORD_0.value = outputTextureCoordinates;
19401
19471
  return {
19402
19472
  attributes,
19403
- triangles: resultTriangles
19473
+ triangles: Array.isArray(triangles) ? Array.from(skirt.indices) : skirt.indices
19404
19474
  };
19405
19475
  }
19406
- function getOutsideEdgesFromTriangles(triangles) {
19407
- const edges = [];
19408
- for (let i = 0; i < triangles.length; i += 3) {
19409
- edges.push([triangles[i], triangles[i + 1]]);
19410
- edges.push([triangles[i + 1], triangles[i + 2]]);
19411
- edges.push([triangles[i + 2], triangles[i]]);
19412
- }
19413
- edges.sort((a, b) => Math.min(...a) - Math.min(...b) || Math.max(...a) - Math.max(...b));
19414
- const outsideEdges = [];
19415
- let index = 0;
19416
- while (index < edges.length) {
19417
- if (edges[index][0] === edges[index + 1]?.[1] && edges[index][1] === edges[index + 1]?.[0]) {
19418
- index += 2;
19419
- } else {
19420
- outsideEdges.push(edges[index]);
19421
- index++;
19422
- }
19423
- }
19424
- return outsideEdges;
19425
- }
19426
- function getOutsideEdgesFromIndices(indices, position) {
19427
- indices.westIndices.sort((a, b) => position[3 * a + 1] - position[3 * b + 1]);
19428
- indices.eastIndices.sort((a, b) => position[3 * b + 1] - position[3 * a + 1]);
19429
- indices.southIndices.sort((a, b) => position[3 * b] - position[3 * a]);
19430
- indices.northIndices.sort((a, b) => position[3 * a] - position[3 * b]);
19476
+ function getBoundaryEdges(indices, positions) {
19477
+ indices.westIndices.sort((a, b) => positions[3 * a + 1] - positions[3 * b + 1]);
19478
+ indices.eastIndices.sort((a, b) => positions[3 * b + 1] - positions[3 * a + 1]);
19479
+ indices.southIndices.sort((a, b) => positions[3 * b] - positions[3 * a]);
19480
+ indices.northIndices.sort((a, b) => positions[3 * a] - positions[3 * b]);
19431
19481
  const edges = [];
19432
- for (const index in indices) {
19433
- const indexGroup = indices[index];
19434
- for (let i = 0; i < indexGroup.length - 1; i++) {
19435
- edges.push([indexGroup[i], indexGroup[i + 1]]);
19436
- }
19482
+ for (const side of [
19483
+ indices.westIndices,
19484
+ indices.northIndices,
19485
+ indices.eastIndices,
19486
+ indices.southIndices
19487
+ ]) {
19488
+ for (let i = 1; i < side.length; i++) edges.push(side[i - 1], side[i]);
19437
19489
  }
19438
- return edges;
19439
- }
19440
- function updateAttributesForNewEdge({
19441
- edge,
19442
- edgeIndex,
19443
- attributes,
19444
- skirtHeight,
19445
- newPosition,
19446
- newTexcoord0,
19447
- newTriangles
19448
- }) {
19449
- const positionsLength = attributes.POSITION.value.length;
19450
- const vertex1Offset = edgeIndex * 2;
19451
- const vertex2Offset = edgeIndex * 2 + 1;
19452
- newPosition.set(
19453
- attributes.POSITION.value.subarray(edge[0] * 3, edge[0] * 3 + 3),
19454
- vertex1Offset * 3
19455
- );
19456
- newPosition[vertex1Offset * 3 + 2] = newPosition[vertex1Offset * 3 + 2] - skirtHeight;
19457
- newPosition.set(
19458
- attributes.POSITION.value.subarray(edge[1] * 3, edge[1] * 3 + 3),
19459
- vertex2Offset * 3
19460
- );
19461
- newPosition[vertex2Offset * 3 + 2] = newPosition[vertex2Offset * 3 + 2] - skirtHeight;
19462
- newTexcoord0.set(
19463
- attributes.TEXCOORD_0.value.subarray(edge[0] * 2, edge[0] * 2 + 2),
19464
- vertex1Offset * 2
19465
- );
19466
- newTexcoord0.set(
19467
- attributes.TEXCOORD_0.value.subarray(edge[1] * 2, edge[1] * 2 + 2),
19468
- vertex2Offset * 2
19469
- );
19470
- const triangle1Offset = edgeIndex * 2 * 3;
19471
- newTriangles[triangle1Offset] = edge[0];
19472
- newTriangles[triangle1Offset + 1] = positionsLength / 3 + vertex2Offset;
19473
- newTriangles[triangle1Offset + 2] = edge[1];
19474
- newTriangles[triangle1Offset + 3] = positionsLength / 3 + vertex2Offset;
19475
- newTriangles[triangle1Offset + 4] = edge[0];
19476
- newTriangles[triangle1Offset + 5] = positionsLength / 3 + vertex1Offset;
19490
+ return Uint32Array.from(edges);
19477
19491
  }
19478
19492
  var init_skirt = __esm({
19479
19493
  "src/terrain/lib/helpers/skirt.ts"() {
19480
19494
  "use strict";
19481
- init_loader_utils();
19495
+ init_terrain();
19482
19496
  }
19483
19497
  });
19484
19498
 
@@ -19639,7 +19653,7 @@ return true;`);
19639
19653
  var init_version2 = __esm({
19640
19654
  "src/terrain/lib/utils/version.ts"() {
19641
19655
  "use strict";
19642
- VERSION2 = true ? "5.0.0-beta.5" : "latest";
19656
+ VERSION2 = true ? "5.0.0-beta.7" : "latest";
19643
19657
  }
19644
19658
  });
19645
19659
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loaders.gl/raster",
3
- "version": "5.0.0-beta.5",
3
+ "version": "5.0.0-beta.7",
4
4
  "description": "GeoTIFF, OME-TIFF, LERC, and terrain raster loaders",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -239,22 +239,10 @@
239
239
  "types": "./dist/terrain/lib/terrain-contracts.d.ts",
240
240
  "import": "./dist/terrain/lib/terrain-contracts.js"
241
241
  },
242
- "./terrain/lib/terrain-height-field": {
243
- "types": "./dist/terrain/lib/terrain-height-field.d.ts",
244
- "import": "./dist/terrain/lib/terrain-height-field.js"
245
- },
246
- "./terrain/lib/terrain-height-grid": {
247
- "types": "./dist/terrain/lib/terrain-height-grid.d.ts",
248
- "import": "./dist/terrain/lib/terrain-height-grid.js"
249
- },
250
242
  "./terrain/lib/terrain-heightmap-types": {
251
243
  "types": "./dist/terrain/lib/terrain-heightmap-types.d.ts",
252
244
  "import": "./dist/terrain/lib/terrain-heightmap-types.js"
253
245
  },
254
- "./terrain/lib/terrain-neighborhood": {
255
- "types": "./dist/terrain/lib/terrain-neighborhood.d.ts",
256
- "import": "./dist/terrain/lib/terrain-neighborhood.js"
257
- },
258
246
  "./terrain/lib/utils/version": {
259
247
  "types": "./dist/terrain/lib/utils/version.d.ts",
260
248
  "import": "./dist/terrain/lib/utils/version.js"
@@ -325,9 +313,9 @@
325
313
  "pre-build": "npm run copy-libs && node ./build-cjs.mjs && npm run build-worker-terrain && npm run build-worker-quantized-mesh"
326
314
  },
327
315
  "dependencies": {
328
- "@loaders.gl/documents": "5.0.0-beta.5",
329
- "@loaders.gl/images": "5.0.0-beta.5",
330
- "@math.gl/geospatial": "5.0.0-beta.5"
316
+ "@loaders.gl/documents": "5.0.0-beta.7",
317
+ "@loaders.gl/images": "5.0.0-beta.7",
318
+ "@math.gl/geospatial": "5.0.0-beta.7"
331
319
  },
332
320
  "peerDependencies": {
333
321
  "@loaders.gl/core": "~5.0.0-alpha.0",
@@ -372,5 +360,5 @@
372
360
  "terrain",
373
361
  "tif"
374
362
  ],
375
- "gitHead": "673b72c560b284f158ff145ba74707f9a3994935"
363
+ "gitHead": "66290be3efdcaed637e7f1b18f30a69b2bd935c6"
376
364
  }
package/src/index.ts CHANGED
@@ -33,8 +33,6 @@ export type {
33
33
  TerrainHeightmapImage
34
34
  } from './terrain/lib/terrain-heightmap-types';
35
35
  export type {
36
- TerrainGridMetadata,
37
- TerrainHeightGrid,
38
36
  TerrainRay,
39
37
  TerrainSurfaceHit,
40
38
  TerrainSurfaceBounds,
@@ -44,11 +42,6 @@ export {GeoTIFFSourceLoader} from './geotiff/geotiff-source-loader-types';
44
42
  export {OMETiffSourceLoader} from './geotiff/ometiff-source-loader-types';
45
43
  export type {GeoTIFFSourceLoaderOptions} from './geotiff/geotiff-source-loader';
46
44
  export type {OMETiffSourceLoaderOptions} from './geotiff/ometiff-source-loader';
47
- export type {
48
- TerrainFieldBounds,
49
- TerrainHeightFieldOptions,
50
- TerrainHeightFieldStatistics
51
- } from './terrain/lib/terrain-height-field';
52
45
  export type {
53
46
  GetOMETiffParameters,
54
47
  OMETiffChannelMetadata,
@@ -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,