@loaders.gl/raster 5.0.0-alpha.14 → 5.0.0-beta.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +2 -30
- package/README.md +13 -4
- package/THIRD-PARTY-NOTICES.md +21 -0
- package/dist/geotiff/advanced.cjs +153 -105
- package/dist/geotiff/advanced.cjs.map +4 -4
- package/dist/geotiff/advanced.d.ts +4 -3
- package/dist/geotiff/advanced.d.ts.map +1 -1
- package/dist/geotiff/advanced.js +3 -2
- package/dist/geotiff/advanced.js.map +1 -1
- package/dist/geotiff/geotiff-loader-types.d.ts +14 -3
- package/dist/geotiff/geotiff-loader-types.d.ts.map +1 -1
- package/dist/geotiff/geotiff-loader-types.js +12 -2
- package/dist/geotiff/geotiff-loader-types.js.map +1 -1
- package/dist/geotiff/geotiff-loader.d.ts +9 -8
- package/dist/geotiff/geotiff-loader.d.ts.map +1 -1
- package/dist/geotiff/geotiff-loader.js +2 -0
- package/dist/geotiff/geotiff-loader.js.map +1 -1
- package/dist/geotiff/geotiff-raster-loader-types.d.ts.map +1 -1
- package/dist/geotiff/geotiff-raster-loader-types.js +2 -2
- package/dist/geotiff/geotiff-raster-loader-types.js.map +1 -1
- package/dist/geotiff/geotiff-source-loader.d.ts +2 -34
- package/dist/geotiff/geotiff-source-loader.d.ts.map +1 -1
- package/dist/geotiff/geotiff-source-loader.js +14 -36
- package/dist/geotiff/geotiff-source-loader.js.map +1 -1
- package/dist/geotiff/lib/ome/load-ome-tiff.d.ts +1 -0
- package/dist/geotiff/lib/ome/load-ome-tiff.d.ts.map +1 -1
- package/dist/geotiff/lib/ome/load-ome-tiff.js +7 -1
- package/dist/geotiff/lib/ome/load-ome-tiff.js.map +1 -1
- package/dist/geotiff/lib/ome/omexml.d.ts.map +1 -1
- package/dist/geotiff/lib/ome/omexml.js +5 -4
- package/dist/geotiff/lib/ome/omexml.js.map +1 -1
- package/dist/geotiff/lib/tiff/tiff-gdal-metadata.d.ts.map +1 -1
- package/dist/geotiff/lib/tiff/tiff-gdal-metadata.js +6 -5
- package/dist/geotiff/lib/tiff/tiff-gdal-metadata.js.map +1 -1
- package/dist/geotiff/lib/tiff-pixel-source.d.ts.map +1 -1
- package/dist/geotiff/lib/tiff-pixel-source.js +2 -1
- package/dist/geotiff/lib/tiff-pixel-source.js.map +1 -1
- package/dist/geotiff/loaders.js +1 -1
- package/dist/geotiff/loaders.js.map +1 -1
- package/dist/geotiff/{ometiff-source-loader-types.d.ts → ometiff-loader-types.d.ts} +7 -7
- package/dist/geotiff/ometiff-loader-types.d.ts.map +1 -0
- package/dist/geotiff/{ometiff-source-loader-types.js → ometiff-loader-types.js} +6 -6
- package/dist/geotiff/ometiff-loader-types.js.map +1 -0
- package/dist/geotiff/{ometiff-source-loader.d.ts → ometiff-loader.d.ts} +6 -6
- package/dist/geotiff/ometiff-loader.d.ts.map +1 -0
- package/dist/geotiff/{ometiff-source-loader.js → ometiff-loader.js} +5 -5
- package/dist/geotiff/ometiff-loader.js.map +1 -0
- package/dist/geotiff-loader-types.d.ts +2 -0
- package/dist/geotiff-loader-types.d.ts.map +1 -0
- package/dist/geotiff-loader-types.js +2 -0
- package/dist/geotiff-loader-types.js.map +1 -0
- package/dist/geotiff-loader.d.ts +2 -0
- package/dist/geotiff-loader.d.ts.map +1 -0
- package/dist/geotiff-loader.js +2 -0
- package/dist/geotiff-loader.js.map +1 -0
- package/dist/geotiff-raster-loader-types.d.ts +2 -0
- package/dist/geotiff-raster-loader-types.d.ts.map +1 -0
- package/dist/geotiff-raster-loader-types.js +2 -0
- package/dist/geotiff-raster-loader-types.js.map +1 -0
- package/dist/geotiff-raster-loader.d.ts +2 -0
- package/dist/geotiff-raster-loader.d.ts.map +1 -0
- package/dist/geotiff-raster-loader.js +2 -0
- package/dist/geotiff-raster-loader.js.map +1 -0
- package/dist/geotiff-source-loader.d.ts +2 -0
- package/dist/geotiff-source-loader.d.ts.map +1 -0
- package/dist/geotiff-source-loader.js +2 -0
- package/dist/geotiff-source-loader.js.map +1 -0
- package/dist/index.cjs +37 -67
- package/dist/index.cjs.map +3 -3
- package/dist/index.d.ts +4 -10
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -6
- package/dist/index.js.map +1 -1
- package/dist/lerc/lerc-loader-types.d.ts +1 -1
- package/dist/lerc/lerc-loader-types.js +2 -2
- package/dist/lerc/lerc-loader-types.js.map +1 -1
- package/dist/lerc-loader-types.d.ts +2 -0
- package/dist/lerc-loader-types.d.ts.map +1 -0
- package/dist/lerc-loader-types.js +2 -0
- package/dist/lerc-loader-types.js.map +1 -0
- package/dist/lerc-loader.d.ts +2 -0
- package/dist/lerc-loader.d.ts.map +1 -0
- package/dist/lerc-loader.js +2 -0
- package/dist/lerc-loader.js.map +1 -0
- package/dist/ometiff-loader-types.d.ts +2 -0
- package/dist/ometiff-loader-types.d.ts.map +1 -0
- package/dist/ometiff-loader-types.js +2 -0
- package/dist/ometiff-loader-types.js.map +1 -0
- package/dist/ometiff-loader.d.ts +2 -0
- package/dist/ometiff-loader.d.ts.map +1 -0
- package/dist/ometiff-loader.js +2 -0
- package/dist/ometiff-loader.js.map +1 -0
- package/dist/quantized-mesh-loader-types.d.ts +2 -0
- package/dist/quantized-mesh-loader-types.d.ts.map +1 -0
- package/dist/quantized-mesh-loader-types.js +2 -0
- package/dist/quantized-mesh-loader-types.js.map +1 -0
- package/dist/quantized-mesh-loader.d.ts +2 -0
- package/dist/quantized-mesh-loader.d.ts.map +1 -0
- package/dist/quantized-mesh-loader.js +2 -0
- package/dist/quantized-mesh-loader.js.map +1 -0
- package/dist/quantized-mesh-worker.js +1955 -1010
- package/dist/quantized-mesh-writer.d.ts +2 -0
- package/dist/quantized-mesh-writer.d.ts.map +1 -0
- package/dist/quantized-mesh-writer.js +2 -0
- package/dist/quantized-mesh-writer.js.map +1 -0
- package/dist/terrain/heightmap.cjs +2 -333
- package/dist/terrain/heightmap.cjs.map +4 -4
- package/dist/terrain/heightmap.d.ts +1 -5
- package/dist/terrain/heightmap.d.ts.map +1 -1
- package/dist/terrain/heightmap.js +0 -3
- package/dist/terrain/heightmap.js.map +1 -1
- package/dist/terrain/index.cjs +74 -612
- package/dist/terrain/index.cjs.map +4 -4
- package/dist/terrain/index.d.ts +3 -6
- package/dist/terrain/index.d.ts.map +1 -1
- package/dist/terrain/index.js +2 -5
- package/dist/terrain/index.js.map +1 -1
- package/dist/terrain/lib/helpers/skirt.d.ts +2 -9
- package/dist/terrain/lib/helpers/skirt.d.ts.map +1 -1
- package/dist/terrain/lib/helpers/skirt.js +30 -114
- package/dist/terrain/lib/helpers/skirt.js.map +1 -1
- package/dist/terrain/lib/parse-terrain.d.ts +2 -0
- package/dist/terrain/lib/parse-terrain.d.ts.map +1 -1
- package/dist/terrain/lib/parse-terrain.js +23 -38
- package/dist/terrain/lib/parse-terrain.js.map +1 -1
- package/dist/terrain/lib/terrain-contracts.d.ts +0 -15
- package/dist/terrain/lib/terrain-contracts.d.ts.map +1 -1
- package/dist/terrain/lib/utils/version.js +1 -1
- package/dist/terrain/lib/utils/version.js.map +1 -1
- package/dist/terrain/quantized-mesh-loader-types.d.ts +1 -1
- package/dist/terrain/quantized-mesh-loader-types.d.ts.map +1 -1
- package/dist/terrain/quantized-mesh-loader-types.js +4 -3
- package/dist/terrain/quantized-mesh-loader-types.js.map +1 -1
- package/dist/terrain/quantized-mesh-loader.d.ts.map +1 -1
- package/dist/terrain/quantized-mesh-loader.js +5 -5
- package/dist/terrain/quantized-mesh-loader.js.map +1 -1
- package/dist/terrain/quantized-mesh-writer.d.ts +4 -3
- package/dist/terrain/quantized-mesh-writer.d.ts.map +1 -1
- package/dist/terrain/quantized-mesh-writer.js +3 -3
- package/dist/terrain/quantized-mesh-writer.js.map +1 -1
- package/dist/terrain/terrain-loader-types.d.ts +3 -3
- package/dist/terrain/terrain-loader-types.d.ts.map +1 -1
- package/dist/terrain/terrain-loader-types.js +4 -2
- package/dist/terrain/terrain-loader-types.js.map +1 -1
- package/dist/terrain/terrain-loader.d.ts +3 -2
- package/dist/terrain/terrain-loader.d.ts.map +1 -1
- package/dist/terrain/terrain-loader.js +8 -8
- package/dist/terrain/terrain-loader.js.map +1 -1
- package/dist/terrain-loader-types.d.ts +2 -0
- package/dist/terrain-loader-types.d.ts.map +1 -0
- package/dist/terrain-loader-types.js +2 -0
- package/dist/terrain-loader-types.js.map +1 -0
- package/dist/terrain-loader.d.ts +2 -0
- package/dist/terrain-loader.d.ts.map +1 -0
- package/dist/terrain-loader.js +2 -0
- package/dist/terrain-loader.js.map +1 -0
- package/dist/terrain-worker.js +5724 -3314
- package/package.json +82 -68
- package/src/geotiff/advanced.ts +9 -4
- package/src/geotiff/geotiff-loader-types.ts +13 -4
- package/src/geotiff/geotiff-loader.ts +5 -8
- package/src/geotiff/geotiff-raster-loader-types.ts +1 -3
- package/src/geotiff/geotiff-source-loader.ts +19 -45
- package/src/geotiff/lib/ome/load-ome-tiff.ts +7 -1
- package/src/geotiff/lib/ome/omexml.ts +5 -4
- package/src/geotiff/lib/tiff/tiff-gdal-metadata.ts +6 -5
- package/src/geotiff/lib/tiff-pixel-source.ts +2 -1
- package/src/geotiff/{ometiff-source-loader-types.ts → ometiff-loader-types.ts} +6 -7
- package/src/geotiff/{ometiff-source-loader.ts → ometiff-loader.ts} +6 -8
- package/src/geotiff-loader-types.ts +1 -0
- package/src/geotiff-loader.ts +1 -0
- package/src/geotiff-raster-loader-types.ts +1 -0
- package/src/geotiff-raster-loader.ts +1 -0
- package/src/geotiff-source-loader.ts +1 -0
- package/src/index.ts +4 -15
- package/src/lerc/lerc-loader-types.ts +1 -1
- package/src/lerc-loader-types.ts +1 -0
- package/src/lerc-loader.ts +1 -0
- package/src/ometiff-loader-types.ts +1 -0
- package/src/ometiff-loader.ts +1 -0
- package/src/quantized-mesh-loader-types.ts +1 -0
- package/src/quantized-mesh-loader.ts +1 -0
- package/src/quantized-mesh-writer.ts +1 -0
- package/src/terrain/heightmap.ts +0 -10
- package/src/terrain/index.ts +2 -13
- package/src/terrain/lib/helpers/skirt.ts +41 -151
- package/src/terrain/lib/parse-terrain.ts +36 -40
- package/src/terrain/lib/terrain-contracts.ts +0 -19
- package/src/terrain/quantized-mesh-loader-types.ts +9 -7
- package/src/terrain/quantized-mesh-loader.ts +9 -8
- package/src/terrain/quantized-mesh-writer.ts +12 -7
- package/src/terrain/terrain-loader-types.ts +11 -9
- package/src/terrain/terrain-loader.ts +12 -11
- package/src/terrain-loader-types.ts +1 -0
- package/src/terrain-loader.ts +1 -0
- package/{dist/terrain/libs/martini-LICENSE → third-party-licenses/delatin-LICENSE} +1 -1
- package/dist/geotiff/geotiff-source-loader-types.d.ts +0 -67
- package/dist/geotiff/geotiff-source-loader-types.d.ts.map +0 -1
- package/dist/geotiff/geotiff-source-loader-types.js +0 -43
- package/dist/geotiff/geotiff-source-loader-types.js.map +0 -1
- package/dist/geotiff/ometiff-source-loader-types.d.ts.map +0 -1
- package/dist/geotiff/ometiff-source-loader-types.js.map +0 -1
- package/dist/geotiff/ometiff-source-loader.d.ts.map +0 -1
- package/dist/geotiff/ometiff-source-loader.js.map +0 -1
- package/dist/terrain/lib/terrain-height-field.d.ts +0 -51
- package/dist/terrain/lib/terrain-height-field.d.ts.map +0 -1
- package/dist/terrain/lib/terrain-height-field.js +0 -260
- package/dist/terrain/lib/terrain-height-field.js.map +0 -1
- package/dist/terrain/lib/terrain-height-grid.d.ts +0 -14
- package/dist/terrain/lib/terrain-height-grid.d.ts.map +0 -1
- package/dist/terrain/lib/terrain-height-grid.js +0 -104
- package/dist/terrain/lib/terrain-height-grid.js.map +0 -1
- package/dist/terrain/lib/terrain-neighborhood.d.ts +0 -15
- package/dist/terrain/lib/terrain-neighborhood.d.ts.map +0 -1
- package/dist/terrain/lib/terrain-neighborhood.js +0 -58
- package/dist/terrain/lib/terrain-neighborhood.js.map +0 -1
- package/dist/terrain/libs/README.md +0 -10
- package/dist/terrain/libs/martini.d.mts +0 -19
- package/dist/terrain/libs/martini.mjs +0 -164
- package/src/geotiff/geotiff-source-loader-types.ts +0 -55
- package/src/terrain/lib/terrain-height-field.ts +0 -355
- package/src/terrain/lib/terrain-height-grid.ts +0 -157
- package/src/terrain/lib/terrain-neighborhood.ts +0 -69
- package/src/terrain/libs/README.md +0 -10
- package/src/terrain/libs/martini-LICENSE +0 -15
- package/src/terrain/libs/martini.d.mts +0 -19
- package/src/terrain/libs/martini.mjs +0 -164
|
@@ -1,164 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
export default class Martini {
|
|
3
|
-
constructor(gridSize = 257) {
|
|
4
|
-
this.gridSize = gridSize;
|
|
5
|
-
const tileSize = gridSize - 1;
|
|
6
|
-
if (tileSize & (tileSize - 1)) throw new Error(
|
|
7
|
-
`Expected grid size to be 2^n+1, got ${gridSize}.`);
|
|
8
|
-
|
|
9
|
-
this.numTriangles = tileSize * tileSize * 2 - 2;
|
|
10
|
-
this.numParentTriangles = this.numTriangles - tileSize * tileSize;
|
|
11
|
-
|
|
12
|
-
this.indices = new Uint32Array(this.gridSize * this.gridSize);
|
|
13
|
-
|
|
14
|
-
// coordinates for all possible triangles in an RTIN tile
|
|
15
|
-
this.coords = new Uint16Array(this.numTriangles * 4);
|
|
16
|
-
|
|
17
|
-
// get triangle coordinates from its index in an implicit binary tree
|
|
18
|
-
for (let i = 0; i < this.numTriangles; i++) {
|
|
19
|
-
let id = i + 2;
|
|
20
|
-
let ax = 0, ay = 0, bx = 0, by = 0, cx = 0, cy = 0;
|
|
21
|
-
if (id & 1) {
|
|
22
|
-
bx = by = cx = tileSize; // bottom-left triangle
|
|
23
|
-
} else {
|
|
24
|
-
ax = ay = cy = tileSize; // top-right triangle
|
|
25
|
-
}
|
|
26
|
-
while ((id >>= 1) > 1) {
|
|
27
|
-
const mx = (ax + bx) >> 1;
|
|
28
|
-
const my = (ay + by) >> 1;
|
|
29
|
-
|
|
30
|
-
if (id & 1) { // left half
|
|
31
|
-
bx = ax; by = ay;
|
|
32
|
-
ax = cx; ay = cy;
|
|
33
|
-
} else { // right half
|
|
34
|
-
ax = bx; ay = by;
|
|
35
|
-
bx = cx; by = cy;
|
|
36
|
-
}
|
|
37
|
-
cx = mx; cy = my;
|
|
38
|
-
}
|
|
39
|
-
const k = i * 4;
|
|
40
|
-
this.coords[k + 0] = ax;
|
|
41
|
-
this.coords[k + 1] = ay;
|
|
42
|
-
this.coords[k + 2] = bx;
|
|
43
|
-
this.coords[k + 3] = by;
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
createTile(terrain) {
|
|
48
|
-
return new Tile(terrain, this);
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
class Tile {
|
|
53
|
-
constructor(terrain, martini) {
|
|
54
|
-
const size = martini.gridSize;
|
|
55
|
-
if (terrain.length !== size * size) throw new Error(
|
|
56
|
-
`Expected terrain data of length ${size * size} (${size} x ${size}), got ${terrain.length}.`);
|
|
57
|
-
|
|
58
|
-
this.terrain = terrain;
|
|
59
|
-
this.martini = martini;
|
|
60
|
-
this.errors = new Float32Array(terrain.length);
|
|
61
|
-
this.update();
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
update() {
|
|
65
|
-
const {numTriangles, numParentTriangles, coords, gridSize: size} = this.martini;
|
|
66
|
-
const {terrain, errors} = this;
|
|
67
|
-
|
|
68
|
-
// iterate over all possible triangles, starting from the smallest level
|
|
69
|
-
for (let i = numTriangles - 1; i >= 0; i--) {
|
|
70
|
-
const k = i * 4;
|
|
71
|
-
const ax = coords[k + 0];
|
|
72
|
-
const ay = coords[k + 1];
|
|
73
|
-
const bx = coords[k + 2];
|
|
74
|
-
const by = coords[k + 3];
|
|
75
|
-
const mx = (ax + bx) >> 1;
|
|
76
|
-
const my = (ay + by) >> 1;
|
|
77
|
-
const cx = mx + my - ay;
|
|
78
|
-
const cy = my + ax - mx;
|
|
79
|
-
|
|
80
|
-
// calculate error in the middle of the long edge of the triangle
|
|
81
|
-
const interpolatedHeight = (terrain[ay * size + ax] + terrain[by * size + bx]) / 2;
|
|
82
|
-
const middleIndex = my * size + mx;
|
|
83
|
-
const middleError = Math.abs(interpolatedHeight - terrain[middleIndex]);
|
|
84
|
-
|
|
85
|
-
errors[middleIndex] = Math.max(errors[middleIndex], middleError);
|
|
86
|
-
|
|
87
|
-
if (i < numParentTriangles) { // bigger triangles; accumulate error with children
|
|
88
|
-
const leftChildIndex = ((ay + cy) >> 1) * size + ((ax + cx) >> 1);
|
|
89
|
-
const rightChildIndex = ((by + cy) >> 1) * size + ((bx + cx) >> 1);
|
|
90
|
-
errors[middleIndex] = Math.max(errors[middleIndex], errors[leftChildIndex], errors[rightChildIndex]);
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
getMesh(maxError = 0) {
|
|
96
|
-
const {gridSize: size, indices} = this.martini;
|
|
97
|
-
const {errors} = this;
|
|
98
|
-
let numVertices = 0;
|
|
99
|
-
let numTriangles = 0;
|
|
100
|
-
const max = size - 1;
|
|
101
|
-
|
|
102
|
-
// use an index grid to keep track of vertices that were already used to avoid duplication
|
|
103
|
-
indices.fill(0);
|
|
104
|
-
|
|
105
|
-
// retrieve mesh in two stages that both traverse the error map:
|
|
106
|
-
// - countElements: find used vertices (and assign each an index), and count triangles (for minimum allocation)
|
|
107
|
-
// - processTriangle: fill the allocated vertices & triangles typed arrays
|
|
108
|
-
|
|
109
|
-
function countElements(ax, ay, bx, by, cx, cy) {
|
|
110
|
-
const mx = (ax + bx) >> 1;
|
|
111
|
-
const my = (ay + by) >> 1;
|
|
112
|
-
|
|
113
|
-
if (Math.abs(ax - cx) + Math.abs(ay - cy) > 1 && errors[my * size + mx] > maxError) {
|
|
114
|
-
countElements(cx, cy, ax, ay, mx, my);
|
|
115
|
-
countElements(bx, by, cx, cy, mx, my);
|
|
116
|
-
} else {
|
|
117
|
-
indices[ay * size + ax] = indices[ay * size + ax] || ++numVertices;
|
|
118
|
-
indices[by * size + bx] = indices[by * size + bx] || ++numVertices;
|
|
119
|
-
indices[cy * size + cx] = indices[cy * size + cx] || ++numVertices;
|
|
120
|
-
numTriangles++;
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
countElements(0, 0, max, max, max, 0);
|
|
124
|
-
countElements(max, max, 0, 0, 0, max);
|
|
125
|
-
|
|
126
|
-
const vertices = new Uint16Array(numVertices * 2);
|
|
127
|
-
const triangles = new Uint32Array(numTriangles * 3);
|
|
128
|
-
let triIndex = 0;
|
|
129
|
-
|
|
130
|
-
function processTriangle(ax, ay, bx, by, cx, cy) {
|
|
131
|
-
const mx = (ax + bx) >> 1;
|
|
132
|
-
const my = (ay + by) >> 1;
|
|
133
|
-
|
|
134
|
-
if (Math.abs(ax - cx) + Math.abs(ay - cy) > 1 && errors[my * size + mx] > maxError) {
|
|
135
|
-
// triangle doesn't approximate the surface well enough; drill down further
|
|
136
|
-
processTriangle(cx, cy, ax, ay, mx, my);
|
|
137
|
-
processTriangle(bx, by, cx, cy, mx, my);
|
|
138
|
-
|
|
139
|
-
} else {
|
|
140
|
-
// add a triangle
|
|
141
|
-
const a = indices[ay * size + ax] - 1;
|
|
142
|
-
const b = indices[by * size + bx] - 1;
|
|
143
|
-
const c = indices[cy * size + cx] - 1;
|
|
144
|
-
|
|
145
|
-
vertices[2 * a] = ax;
|
|
146
|
-
vertices[2 * a + 1] = ay;
|
|
147
|
-
|
|
148
|
-
vertices[2 * b] = bx;
|
|
149
|
-
vertices[2 * b + 1] = by;
|
|
150
|
-
|
|
151
|
-
vertices[2 * c] = cx;
|
|
152
|
-
vertices[2 * c + 1] = cy;
|
|
153
|
-
|
|
154
|
-
triangles[triIndex++] = a;
|
|
155
|
-
triangles[triIndex++] = b;
|
|
156
|
-
triangles[triIndex++] = c;
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
processTriangle(0, 0, max, max, max, 0);
|
|
160
|
-
processTriangle(max, max, 0, 0, 0, max);
|
|
161
|
-
|
|
162
|
-
return {vertices, triangles};
|
|
163
|
-
}
|
|
164
|
-
}
|