@loaders.gl/shapefile 3.1.0-alpha.4 → 3.1.0-beta.3
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/dist/bundle.d.ts +2 -0
- package/dist/bundle.d.ts.map +1 -0
- package/dist/bundle.js +7554 -0
- package/dist/dbf-loader.d.ts +8 -0
- package/dist/dbf-loader.d.ts.map +1 -0
- package/dist/dbf-loader.js +32 -0
- package/dist/dbf-worker.js +912 -2
- package/dist/es5/bundle.js +1 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/dbf-loader.js +5 -40
- package/dist/es5/dbf-loader.js.map +1 -1
- package/dist/es5/index.js +5 -5
- package/dist/es5/lib/parsers/parse-dbf.js +86 -232
- package/dist/es5/lib/parsers/parse-dbf.js.map +1 -1
- package/dist/es5/lib/parsers/parse-shapefile.js +151 -404
- package/dist/es5/lib/parsers/parse-shapefile.js.map +1 -1
- package/dist/es5/lib/parsers/parse-shp-geometry.js +49 -96
- package/dist/es5/lib/parsers/parse-shp-geometry.js.map +1 -1
- package/dist/es5/lib/parsers/parse-shp-header.js +4 -4
- package/dist/es5/lib/parsers/parse-shp-header.js.map +1 -1
- package/dist/es5/lib/parsers/parse-shp.js +47 -165
- package/dist/es5/lib/parsers/parse-shp.js.map +1 -1
- package/dist/es5/lib/parsers/parse-shx.js +11 -11
- package/dist/es5/lib/parsers/parse-shx.js.map +1 -1
- package/dist/es5/lib/streaming/binary-chunk-reader.js +99 -172
- package/dist/es5/lib/streaming/binary-chunk-reader.js.map +1 -1
- package/dist/es5/lib/streaming/binary-reader.js +24 -35
- package/dist/es5/lib/streaming/binary-reader.js.map +1 -1
- package/dist/es5/lib/streaming/zip-batch-iterators.js +37 -96
- package/dist/es5/lib/streaming/zip-batch-iterators.js.map +1 -1
- package/dist/es5/shapefile-loader.js +3 -3
- package/dist/es5/shapefile-loader.js.map +1 -1
- package/dist/es5/shp-loader.js +6 -41
- package/dist/es5/shp-loader.js.map +1 -1
- package/dist/es5/workers/dbf-worker.js +7 -3
- package/dist/es5/workers/dbf-worker.js.map +1 -0
- package/dist/es5/workers/shp-worker.js +7 -3
- package/dist/es5/workers/shp-worker.js.map +1 -0
- package/dist/esm/dbf-loader.js +1 -1
- package/dist/esm/dbf-loader.js.map +1 -1
- package/dist/esm/lib/parsers/parse-dbf.js +4 -6
- package/dist/esm/lib/parsers/parse-dbf.js.map +1 -1
- package/dist/esm/lib/parsers/parse-shapefile.js +1 -1
- package/dist/esm/lib/parsers/parse-shapefile.js.map +1 -1
- package/dist/esm/lib/parsers/parse-shp-geometry.js +1 -1
- package/dist/esm/lib/parsers/parse-shp-geometry.js.map +1 -1
- package/dist/esm/lib/parsers/parse-shp-header.js +2 -2
- package/dist/esm/lib/parsers/parse-shp-header.js.map +1 -1
- package/dist/esm/lib/parsers/parse-shp.js +2 -2
- package/dist/esm/lib/parsers/parse-shp.js.map +1 -1
- package/dist/esm/shapefile-loader.js +1 -1
- package/dist/esm/shapefile-loader.js.map +1 -1
- package/dist/esm/shp-loader.js +1 -1
- package/dist/esm/shp-loader.js.map +1 -1
- package/dist/esm/workers/dbf-worker.js +3 -3
- package/dist/esm/workers/dbf-worker.js.map +1 -0
- package/dist/esm/workers/shp-worker.js +3 -3
- package/dist/esm/workers/shp-worker.js.map +1 -0
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +11 -0
- package/dist/lib/parsers/parse-dbf.d.ts +28 -0
- package/dist/lib/parsers/parse-dbf.d.ts.map +1 -0
- package/dist/lib/parsers/parse-dbf.js +335 -0
- package/dist/lib/parsers/parse-shapefile.d.ts +54 -0
- package/dist/lib/parsers/parse-shapefile.d.ts.map +1 -0
- package/dist/lib/parsers/parse-shapefile.js +245 -0
- package/dist/lib/parsers/parse-shp-geometry.d.ts +11 -0
- package/dist/lib/parsers/parse-shp-geometry.d.ts.map +1 -0
- package/dist/lib/parsers/parse-shp-geometry.js +287 -0
- package/dist/lib/parsers/parse-shp-header.d.ts +26 -0
- package/dist/lib/parsers/parse-shp-header.d.ts.map +1 -0
- package/dist/lib/parsers/parse-shp-header.js +43 -0
- package/dist/lib/parsers/parse-shp.d.ts +9 -0
- package/dist/lib/parsers/parse-shp.d.ts.map +1 -0
- package/dist/lib/parsers/parse-shp.js +170 -0
- package/dist/lib/parsers/parse-shx.d.ts +10 -0
- package/dist/lib/parsers/parse-shx.d.ts.map +1 -0
- package/dist/lib/parsers/parse-shx.js +28 -0
- package/dist/lib/streaming/binary-chunk-reader.d.ts +59 -0
- package/dist/lib/streaming/binary-chunk-reader.d.ts.map +1 -0
- package/dist/lib/streaming/binary-chunk-reader.js +161 -0
- package/dist/lib/streaming/binary-reader.d.ts +32 -0
- package/dist/lib/streaming/binary-reader.d.ts.map +1 -0
- package/dist/lib/streaming/binary-reader.js +52 -0
- package/dist/lib/streaming/zip-batch-iterators.d.ts +8 -0
- package/dist/lib/streaming/zip-batch-iterators.d.ts.map +1 -0
- package/dist/lib/streaming/zip-batch-iterators.js +61 -0
- package/dist/shapefile-loader.d.ts +26 -0
- package/dist/shapefile-loader.d.ts.map +1 -0
- package/dist/shapefile-loader.js +31 -0
- package/dist/shp-loader.d.ts +9 -0
- package/dist/shp-loader.d.ts.map +1 -0
- package/dist/shp-loader.js +35 -0
- package/dist/shp-worker.js +606 -2
- package/dist/workers/dbf-worker.d.ts +2 -0
- package/dist/workers/dbf-worker.d.ts.map +1 -0
- package/dist/workers/dbf-worker.js +5 -0
- package/dist/workers/shp-worker.d.ts +2 -0
- package/dist/workers/shp-worker.d.ts.map +1 -0
- package/dist/workers/shp-worker.js +5 -0
- package/package.json +10 -10
- package/src/lib/parsers/parse-dbf.ts +5 -3
- package/src/lib/parsers/parse-shp-geometry.ts +1 -1
- package/src/workers/{dbf-worker.js → dbf-worker.ts} +0 -0
- package/src/workers/{shp-worker.js → shp-worker.ts} +0 -0
- package/dist/dbf-worker.js.map +0 -1
- package/dist/dist.min.js +0 -2
- package/dist/dist.min.js.map +0 -1
- package/dist/shp-worker.js.map +0 -1
|
@@ -7,212 +7,139 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
|
|
10
|
-
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
|
-
|
|
12
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
13
|
-
|
|
14
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
15
|
-
|
|
16
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
17
11
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
21
|
-
|
|
22
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
23
|
-
|
|
24
|
-
var BinaryChunkReader = function () {
|
|
25
|
-
function BinaryChunkReader(options) {
|
|
26
|
-
(0, _classCallCheck2.default)(this, BinaryChunkReader);
|
|
12
|
+
class BinaryChunkReader {
|
|
13
|
+
constructor(options) {
|
|
27
14
|
(0, _defineProperty2.default)(this, "offset", void 0);
|
|
28
15
|
(0, _defineProperty2.default)(this, "arrayBuffers", void 0);
|
|
29
16
|
(0, _defineProperty2.default)(this, "ended", void 0);
|
|
30
17
|
(0, _defineProperty2.default)(this, "maxRewindBytes", void 0);
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
maxRewindBytes = _ref$maxRewindBytes === void 0 ? 0 : _ref$maxRewindBytes;
|
|
35
|
-
|
|
18
|
+
const {
|
|
19
|
+
maxRewindBytes = 0
|
|
20
|
+
} = options || {};
|
|
36
21
|
this.offset = 0;
|
|
37
22
|
this.arrayBuffers = [];
|
|
38
23
|
this.ended = false;
|
|
39
24
|
this.maxRewindBytes = maxRewindBytes;
|
|
40
25
|
}
|
|
41
26
|
|
|
42
|
-
(
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
var bytesAvailable = -this.offset;
|
|
57
|
-
|
|
58
|
-
var _iterator = _createForOfIteratorHelper(this.arrayBuffers),
|
|
59
|
-
_step;
|
|
60
|
-
|
|
61
|
-
try {
|
|
62
|
-
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
63
|
-
var arrayBuffer = _step.value;
|
|
64
|
-
bytesAvailable += arrayBuffer.byteLength;
|
|
65
|
-
|
|
66
|
-
if (bytesAvailable >= bytes) {
|
|
67
|
-
return true;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
} catch (err) {
|
|
71
|
-
_iterator.e(err);
|
|
72
|
-
} finally {
|
|
73
|
-
_iterator.f();
|
|
74
|
-
}
|
|
27
|
+
write(arrayBuffer) {
|
|
28
|
+
this.arrayBuffers.push(arrayBuffer);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
end() {
|
|
32
|
+
this.arrayBuffers = [];
|
|
33
|
+
this.ended = true;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
hasAvailableBytes(bytes) {
|
|
37
|
+
let bytesAvailable = -this.offset;
|
|
38
|
+
|
|
39
|
+
for (const arrayBuffer of this.arrayBuffers) {
|
|
40
|
+
bytesAvailable += arrayBuffer.byteLength;
|
|
75
41
|
|
|
76
|
-
|
|
42
|
+
if (bytesAvailable >= bytes) {
|
|
43
|
+
return true;
|
|
44
|
+
}
|
|
77
45
|
}
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
var start = offset <= 0 ? Math.abs(offset) : 0;
|
|
93
|
-
var end = void 0;
|
|
94
|
-
|
|
95
|
-
if (start + bytes <= buf.byteLength) {
|
|
96
|
-
end = start + bytes;
|
|
97
|
-
selectedBuffers.push([i, [start, end]]);
|
|
98
|
-
return selectedBuffers;
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
end = buf.byteLength;
|
|
102
|
-
selectedBuffers.push([i, [start, end]]);
|
|
103
|
-
bytes -= buf.byteLength - start;
|
|
46
|
+
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
findBufferOffsets(bytes) {
|
|
51
|
+
let offset = -this.offset;
|
|
52
|
+
const selectedBuffers = [];
|
|
53
|
+
|
|
54
|
+
for (let i = 0; i < this.arrayBuffers.length; i++) {
|
|
55
|
+
const buf = this.arrayBuffers[i];
|
|
56
|
+
|
|
57
|
+
if (offset + buf.byteLength <= 0) {
|
|
104
58
|
offset += buf.byteLength;
|
|
59
|
+
continue;
|
|
105
60
|
}
|
|
106
61
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
}, {
|
|
110
|
-
key: "getDataView",
|
|
111
|
-
value: function getDataView(bytes) {
|
|
112
|
-
var bufferOffsets = this.findBufferOffsets(bytes);
|
|
62
|
+
const start = offset <= 0 ? Math.abs(offset) : 0;
|
|
63
|
+
let end;
|
|
113
64
|
|
|
114
|
-
if (
|
|
115
|
-
|
|
65
|
+
if (start + bytes <= buf.byteLength) {
|
|
66
|
+
end = start + bytes;
|
|
67
|
+
selectedBuffers.push([i, [start, end]]);
|
|
68
|
+
return selectedBuffers;
|
|
116
69
|
}
|
|
117
70
|
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
71
|
+
end = buf.byteLength;
|
|
72
|
+
selectedBuffers.push([i, [start, end]]);
|
|
73
|
+
bytes -= buf.byteLength - start;
|
|
74
|
+
offset += buf.byteLength;
|
|
75
|
+
}
|
|
121
76
|
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
bufferIndex = _bufferOffsets$[0],
|
|
125
|
-
_bufferOffsets$$ = (0, _slicedToArray2.default)(_bufferOffsets$[1], 2),
|
|
126
|
-
start = _bufferOffsets$$[0],
|
|
127
|
-
end = _bufferOffsets$$[1];
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
128
79
|
|
|
129
|
-
|
|
80
|
+
getDataView(bytes) {
|
|
81
|
+
const bufferOffsets = this.findBufferOffsets(bytes);
|
|
130
82
|
|
|
131
|
-
|
|
83
|
+
if (!bufferOffsets && this.ended) {
|
|
84
|
+
throw new Error('binary data exhausted');
|
|
85
|
+
}
|
|
132
86
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
}
|
|
87
|
+
if (!bufferOffsets) {
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
137
90
|
|
|
138
|
-
|
|
91
|
+
if (bufferOffsets.length === 1) {
|
|
92
|
+
const [bufferIndex, [start, end]] = bufferOffsets[0];
|
|
93
|
+
const arrayBuffer = this.arrayBuffers[bufferIndex];
|
|
94
|
+
const view = new DataView(arrayBuffer, start, end - start);
|
|
139
95
|
this.offset += bytes;
|
|
140
96
|
this.disposeBuffers();
|
|
141
97
|
return view;
|
|
142
98
|
}
|
|
143
|
-
}, {
|
|
144
|
-
key: "disposeBuffers",
|
|
145
|
-
value: function disposeBuffers() {
|
|
146
|
-
while (this.arrayBuffers.length > 0 && this.offset - this.maxRewindBytes >= this.arrayBuffers[0].byteLength) {
|
|
147
|
-
this.offset -= this.arrayBuffers[0].byteLength;
|
|
148
|
-
this.arrayBuffers.shift();
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
}, {
|
|
152
|
-
key: "_combineArrayBuffers",
|
|
153
|
-
value: function _combineArrayBuffers(bufferOffsets) {
|
|
154
|
-
var byteLength = 0;
|
|
155
|
-
|
|
156
|
-
var _iterator2 = _createForOfIteratorHelper(bufferOffsets),
|
|
157
|
-
_step2;
|
|
158
|
-
|
|
159
|
-
try {
|
|
160
|
-
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
|
161
|
-
var bufferOffset = _step2.value;
|
|
162
|
-
|
|
163
|
-
var _bufferOffset$ = (0, _slicedToArray2.default)(bufferOffset[1], 2),
|
|
164
|
-
start = _bufferOffset$[0],
|
|
165
|
-
end = _bufferOffset$[1];
|
|
166
|
-
|
|
167
|
-
byteLength += end - start;
|
|
168
|
-
}
|
|
169
|
-
} catch (err) {
|
|
170
|
-
_iterator2.e(err);
|
|
171
|
-
} finally {
|
|
172
|
-
_iterator2.f();
|
|
173
|
-
}
|
|
174
99
|
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
try {
|
|
182
|
-
for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
|
|
183
|
-
var _bufferOffset = _step3.value;
|
|
184
|
-
|
|
185
|
-
var _bufferOffset2 = (0, _slicedToArray2.default)(_bufferOffset, 2),
|
|
186
|
-
bufferIndex = _bufferOffset2[0],
|
|
187
|
-
_bufferOffset2$ = (0, _slicedToArray2.default)(_bufferOffset2[1], 2),
|
|
188
|
-
_start = _bufferOffset2$[0],
|
|
189
|
-
_end = _bufferOffset2$[1];
|
|
190
|
-
|
|
191
|
-
var sourceArray = new Uint8Array(this.arrayBuffers[bufferIndex]);
|
|
192
|
-
result.set(sourceArray.subarray(_start, _end), resultOffset);
|
|
193
|
-
resultOffset += _end - _start;
|
|
194
|
-
}
|
|
195
|
-
} catch (err) {
|
|
196
|
-
_iterator3.e(err);
|
|
197
|
-
} finally {
|
|
198
|
-
_iterator3.f();
|
|
199
|
-
}
|
|
100
|
+
const view = new DataView(this._combineArrayBuffers(bufferOffsets));
|
|
101
|
+
this.offset += bytes;
|
|
102
|
+
this.disposeBuffers();
|
|
103
|
+
return view;
|
|
104
|
+
}
|
|
200
105
|
|
|
201
|
-
|
|
106
|
+
disposeBuffers() {
|
|
107
|
+
while (this.arrayBuffers.length > 0 && this.offset - this.maxRewindBytes >= this.arrayBuffers[0].byteLength) {
|
|
108
|
+
this.offset -= this.arrayBuffers[0].byteLength;
|
|
109
|
+
this.arrayBuffers.shift();
|
|
202
110
|
}
|
|
203
|
-
}
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
_combineArrayBuffers(bufferOffsets) {
|
|
114
|
+
let byteLength = 0;
|
|
115
|
+
|
|
116
|
+
for (const bufferOffset of bufferOffsets) {
|
|
117
|
+
const [start, end] = bufferOffset[1];
|
|
118
|
+
byteLength += end - start;
|
|
207
119
|
}
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
120
|
+
|
|
121
|
+
const result = new Uint8Array(byteLength);
|
|
122
|
+
let resultOffset = 0;
|
|
123
|
+
|
|
124
|
+
for (const bufferOffset of bufferOffsets) {
|
|
125
|
+
const [bufferIndex, [start, end]] = bufferOffset;
|
|
126
|
+
const sourceArray = new Uint8Array(this.arrayBuffers[bufferIndex]);
|
|
127
|
+
result.set(sourceArray.subarray(start, end), resultOffset);
|
|
128
|
+
resultOffset += end - start;
|
|
212
129
|
}
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
}
|
|
130
|
+
|
|
131
|
+
return result.buffer;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
skip(bytes) {
|
|
135
|
+
this.offset += bytes;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
rewind(bytes) {
|
|
139
|
+
this.offset -= bytes;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
}
|
|
216
143
|
|
|
217
144
|
exports.default = BinaryChunkReader;
|
|
218
145
|
//# sourceMappingURL=binary-chunk-reader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/streaming/binary-chunk-reader.ts"],"names":["BinaryChunkReader","options","maxRewindBytes","offset","arrayBuffers","ended","arrayBuffer","push","bytes","bytesAvailable","byteLength","selectedBuffers","i","length","buf","start","Math","abs","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/streaming/binary-chunk-reader.ts"],"names":["BinaryChunkReader","constructor","options","maxRewindBytes","offset","arrayBuffers","ended","write","arrayBuffer","push","end","hasAvailableBytes","bytes","bytesAvailable","byteLength","findBufferOffsets","selectedBuffers","i","length","buf","start","Math","abs","getDataView","bufferOffsets","Error","bufferIndex","view","DataView","disposeBuffers","_combineArrayBuffers","shift","bufferOffset","result","Uint8Array","resultOffset","sourceArray","set","subarray","buffer","skip","rewind"],"mappings":"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","sourcesContent":["export default class BinaryChunkReader {\n offset: number;\n arrayBuffers: ArrayBuffer[];\n ended: boolean;\n maxRewindBytes: number;\n\n constructor(options?: {[key: string]: any}) {\n const {maxRewindBytes = 0} = options || {};\n\n /** current global offset into current array buffer*/\n this.offset = 0;\n /** current buffer from iterator */\n this.arrayBuffers = [];\n this.ended = false;\n\n /** bytes behind offset to hold on to */\n this.maxRewindBytes = maxRewindBytes;\n }\n /**\n * @param arrayBuffer\n */\n write(arrayBuffer: ArrayBuffer): void {\n this.arrayBuffers.push(arrayBuffer);\n }\n\n end(): void {\n this.arrayBuffers = [];\n this.ended = true;\n }\n\n /**\n * Has enough bytes available in array buffers\n *\n * @param bytes Number of bytes\n * @return boolean\n */\n hasAvailableBytes(bytes: number): boolean {\n let bytesAvailable = -this.offset;\n for (const arrayBuffer of this.arrayBuffers) {\n bytesAvailable += arrayBuffer.byteLength;\n if (bytesAvailable >= bytes) {\n return true;\n }\n }\n return false;\n }\n\n /**\n * Find offsets of byte ranges within this.arrayBuffers\n *\n * @param bytes Byte length to read\n * @return Arrays with byte ranges pointing to this.arrayBuffers, Output type is nested array, e.g. [ [0, [1, 2]], ...]\n */\n findBufferOffsets(bytes: number): any[] | null {\n let offset = -this.offset;\n const selectedBuffers: any = [];\n\n for (let i = 0; i < this.arrayBuffers.length; i++) {\n const buf = this.arrayBuffers[i];\n\n // Current buffer isn't long enough to reach global offset\n if (offset + buf.byteLength <= 0) {\n offset += buf.byteLength;\n // eslint-disable-next-line no-continue\n continue;\n }\n\n // Find start/end offsets for this buffer\n // When offset < 0, need to skip over Math.abs(offset) bytes\n // When offset > 0, implies bytes in previous buffer, start at 0\n const start = offset <= 0 ? Math.abs(offset) : 0;\n let end: number;\n\n // Length of requested bytes is contained in current buffer\n if (start + bytes <= buf.byteLength) {\n end = start + bytes;\n selectedBuffers.push([i, [start, end]]);\n return selectedBuffers;\n }\n\n // Will need to look into next buffer\n end = buf.byteLength;\n selectedBuffers.push([i, [start, end]]);\n\n // Need to read fewer bytes in next iter\n bytes -= buf.byteLength - start;\n offset += buf.byteLength;\n }\n\n // Should only finish loop if exhausted all arrays\n return null;\n }\n\n /**\n * Get the required number of bytes from the iterator\n *\n * @param bytes Number of bytes\n * @return DataView with data\n */\n getDataView(bytes: number): DataView | null {\n const bufferOffsets = this.findBufferOffsets(bytes);\n // return `null` if not enough data, except if end() already called, in\n // which case throw an error.\n if (!bufferOffsets && this.ended) {\n throw new Error('binary data exhausted');\n }\n\n if (!bufferOffsets) {\n // @ts-ignore\n return null;\n }\n\n // If only one arrayBuffer needed, return DataView directly\n if (bufferOffsets.length === 1) {\n const [bufferIndex, [start, end]] = bufferOffsets[0];\n const arrayBuffer = this.arrayBuffers[bufferIndex];\n const view = new DataView(arrayBuffer, start, end - start);\n\n this.offset += bytes;\n this.disposeBuffers();\n return view;\n }\n\n // Concatenate portions of multiple ArrayBuffers\n const view = new DataView(this._combineArrayBuffers(bufferOffsets));\n this.offset += bytes;\n this.disposeBuffers();\n return view;\n }\n\n /**\n * Dispose of old array buffers\n */\n disposeBuffers(): void {\n while (\n this.arrayBuffers.length > 0 &&\n this.offset - this.maxRewindBytes >= this.arrayBuffers[0].byteLength\n ) {\n this.offset -= this.arrayBuffers[0].byteLength;\n this.arrayBuffers.shift();\n }\n }\n\n /**\n * Copy multiple ArrayBuffers into one contiguous ArrayBuffer\n *\n * In contrast to concatenateArrayBuffers, this only copies the necessary\n * portions of the source arrays, rather than first copying the entire arrays\n * then taking a part of them.\n *\n * @param bufferOffsets List of internal array offsets\n * @return New contiguous ArrayBuffer\n */\n _combineArrayBuffers(bufferOffsets: any[]): ArrayBufferLike {\n let byteLength: number = 0;\n for (const bufferOffset of bufferOffsets) {\n const [start, end] = bufferOffset[1];\n byteLength += end - start;\n }\n\n const result = new Uint8Array(byteLength);\n\n // Copy the subarrays\n let resultOffset: number = 0;\n for (const bufferOffset of bufferOffsets) {\n const [bufferIndex, [start, end]] = bufferOffset;\n const sourceArray = new Uint8Array(this.arrayBuffers[bufferIndex]);\n result.set(sourceArray.subarray(start, end), resultOffset);\n resultOffset += end - start;\n }\n\n return result.buffer;\n }\n /**\n * @param bytes\n */\n skip(bytes: number): void {\n this.offset += bytes;\n }\n /**\n * @param bytes\n */\n rewind(bytes: number): void {\n // TODO - only works if offset is already set\n this.offset -= bytes;\n }\n}\n"],"file":"binary-chunk-reader.js"}
|
|
@@ -7,50 +7,39 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
|
|
10
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
|
-
|
|
12
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
-
|
|
14
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
15
11
|
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
(0, _classCallCheck2.default)(this, BinaryReader);
|
|
12
|
+
class BinaryReader {
|
|
13
|
+
constructor(arrayBuffer) {
|
|
19
14
|
(0, _defineProperty2.default)(this, "offset", void 0);
|
|
20
15
|
(0, _defineProperty2.default)(this, "arrayBuffer", void 0);
|
|
21
16
|
this.offset = 0;
|
|
22
17
|
this.arrayBuffer = arrayBuffer;
|
|
23
18
|
}
|
|
24
19
|
|
|
25
|
-
(
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
value: function getDataView(bytes) {
|
|
33
|
-
if (bytes && !this.hasAvailableBytes(bytes)) {
|
|
34
|
-
throw new Error('binary data exhausted');
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
var dataView = bytes ? new DataView(this.arrayBuffer, this.offset, bytes) : new DataView(this.arrayBuffer, this.offset);
|
|
38
|
-
this.offset += bytes;
|
|
39
|
-
return dataView;
|
|
40
|
-
}
|
|
41
|
-
}, {
|
|
42
|
-
key: "skip",
|
|
43
|
-
value: function skip(bytes) {
|
|
44
|
-
this.offset += bytes;
|
|
45
|
-
}
|
|
46
|
-
}, {
|
|
47
|
-
key: "rewind",
|
|
48
|
-
value: function rewind(bytes) {
|
|
49
|
-
this.offset -= bytes;
|
|
20
|
+
hasAvailableBytes(bytes) {
|
|
21
|
+
return this.arrayBuffer.byteLength - this.offset >= bytes;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
getDataView(bytes) {
|
|
25
|
+
if (bytes && !this.hasAvailableBytes(bytes)) {
|
|
26
|
+
throw new Error('binary data exhausted');
|
|
50
27
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
28
|
+
|
|
29
|
+
const dataView = bytes ? new DataView(this.arrayBuffer, this.offset, bytes) : new DataView(this.arrayBuffer, this.offset);
|
|
30
|
+
this.offset += bytes;
|
|
31
|
+
return dataView;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
skip(bytes) {
|
|
35
|
+
this.offset += bytes;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
rewind(bytes) {
|
|
39
|
+
this.offset -= bytes;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
}
|
|
54
43
|
|
|
55
44
|
exports.default = BinaryReader;
|
|
56
45
|
//# sourceMappingURL=binary-reader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/streaming/binary-reader.ts"],"names":["BinaryReader","arrayBuffer","offset","bytes","byteLength","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/streaming/binary-reader.ts"],"names":["BinaryReader","constructor","arrayBuffer","offset","hasAvailableBytes","bytes","byteLength","getDataView","Error","dataView","DataView","skip","rewind"],"mappings":";;;;;;;;;;;AAAe,MAAMA,YAAN,CAAmB;AAIhCC,EAAAA,WAAW,CAACC,WAAD,EAA2B;AAAA;AAAA;AAEpC,SAAKC,MAAL,GAAc,CAAd;AAEA,SAAKD,WAAL,GAAmBA,WAAnB;AACD;;AAODE,EAAAA,iBAAiB,CAACC,KAAD,EAAyB;AACxC,WAAO,KAAKH,WAAL,CAAiBI,UAAjB,GAA8B,KAAKH,MAAnC,IAA6CE,KAApD;AACD;;AAQDE,EAAAA,WAAW,CAACF,KAAD,EAA0B;AACnC,QAAIA,KAAK,IAAI,CAAC,KAAKD,iBAAL,CAAuBC,KAAvB,CAAd,EAA6C;AAC3C,YAAM,IAAIG,KAAJ,CAAU,uBAAV,CAAN;AACD;;AAED,UAAMC,QAAQ,GAAGJ,KAAK,GAClB,IAAIK,QAAJ,CAAa,KAAKR,WAAlB,EAA+B,KAAKC,MAApC,EAA4CE,KAA5C,CADkB,GAElB,IAAIK,QAAJ,CAAa,KAAKR,WAAlB,EAA+B,KAAKC,MAApC,CAFJ;AAGA,SAAKA,MAAL,IAAeE,KAAf;AACA,WAAOI,QAAP;AACD;;AAODE,EAAAA,IAAI,CAACN,KAAD,EAAsB;AACxB,SAAKF,MAAL,IAAeE,KAAf;AACD;;AAODO,EAAAA,MAAM,CAACP,KAAD,EAAsB;AAC1B,SAAKF,MAAL,IAAeE,KAAf;AACD;;AAtD+B","sourcesContent":["export default class BinaryReader {\n offset: number;\n arrayBuffer: ArrayBuffer;\n\n constructor(arrayBuffer: ArrayBuffer) {\n /** current global (stream) offset */\n this.offset = 0;\n /** current buffer from iterator */\n this.arrayBuffer = arrayBuffer;\n }\n /**\n * Checks if there are available bytes in data\n *\n * @param bytes\n * @returns boolean\n */\n hasAvailableBytes(bytes: number): boolean {\n return this.arrayBuffer.byteLength - this.offset >= bytes;\n }\n\n /**\n * Get the required number of bytes from the iterator\n *\n * @param bytes\n * @returns Dataview\n */\n getDataView(bytes: number): DataView {\n if (bytes && !this.hasAvailableBytes(bytes)) {\n throw new Error('binary data exhausted');\n }\n\n const dataView = bytes\n ? new DataView(this.arrayBuffer, this.offset, bytes)\n : new DataView(this.arrayBuffer, this.offset);\n this.offset += bytes;\n return dataView;\n }\n\n /**\n * Skipping\n *\n * @param bytes\n */\n skip(bytes: number): void {\n this.offset += bytes;\n }\n\n /**\n * Rewinding\n *\n * @param bytes\n */\n rewind(bytes: number): void {\n this.offset -= bytes;\n }\n}\n"],"file":"binary-reader.js"}
|
|
@@ -1,116 +1,57 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
3
|
Object.defineProperty(exports, "__esModule", {
|
|
6
4
|
value: true
|
|
7
5
|
});
|
|
8
6
|
exports.zipBatchIterators = zipBatchIterators;
|
|
9
7
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
_context.next = 14;
|
|
41
|
-
break;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
_context.next = 8;
|
|
45
|
-
return (0, _awaitAsyncGenerator2.default)(iterator1.next());
|
|
46
|
-
|
|
47
|
-
case 8:
|
|
48
|
-
_yield$_awaitAsyncGen = _context.sent;
|
|
49
|
-
value = _yield$_awaitAsyncGen.value;
|
|
50
|
-
done = _yield$_awaitAsyncGen.done;
|
|
51
|
-
|
|
52
|
-
if (done) {
|
|
53
|
-
iterator1Done = true;
|
|
54
|
-
} else {
|
|
55
|
-
batch1 = value;
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
_context.next = 21;
|
|
59
|
-
break;
|
|
60
|
-
|
|
61
|
-
case 14:
|
|
62
|
-
if (!(batch2.length === 0 && !iterator2Done)) {
|
|
63
|
-
_context.next = 21;
|
|
64
|
-
break;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
_context.next = 17;
|
|
68
|
-
return (0, _awaitAsyncGenerator2.default)(iterator2.next());
|
|
69
|
-
|
|
70
|
-
case 17:
|
|
71
|
-
_yield$_awaitAsyncGen2 = _context.sent;
|
|
72
|
-
_value = _yield$_awaitAsyncGen2.value;
|
|
73
|
-
_done = _yield$_awaitAsyncGen2.done;
|
|
74
|
-
|
|
75
|
-
if (_done) {
|
|
76
|
-
iterator2Done = true;
|
|
77
|
-
} else {
|
|
78
|
-
batch2 = _value;
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
case 21:
|
|
82
|
-
batch = extractBatch(batch1, batch2);
|
|
83
|
-
|
|
84
|
-
if (!batch) {
|
|
85
|
-
_context.next = 25;
|
|
86
|
-
break;
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
_context.next = 25;
|
|
90
|
-
return batch;
|
|
8
|
+
async function* zipBatchIterators(iterator1, iterator2) {
|
|
9
|
+
let batch1 = [];
|
|
10
|
+
let batch2 = [];
|
|
11
|
+
let iterator1Done = false;
|
|
12
|
+
let iterator2Done = false;
|
|
13
|
+
|
|
14
|
+
while (!iterator1Done && !iterator2Done) {
|
|
15
|
+
if (batch1.length === 0 && !iterator1Done) {
|
|
16
|
+
const {
|
|
17
|
+
value,
|
|
18
|
+
done
|
|
19
|
+
} = await iterator1.next();
|
|
20
|
+
|
|
21
|
+
if (done) {
|
|
22
|
+
iterator1Done = true;
|
|
23
|
+
} else {
|
|
24
|
+
batch1 = value;
|
|
25
|
+
}
|
|
26
|
+
} else if (batch2.length === 0 && !iterator2Done) {
|
|
27
|
+
const {
|
|
28
|
+
value,
|
|
29
|
+
done
|
|
30
|
+
} = await iterator2.next();
|
|
31
|
+
|
|
32
|
+
if (done) {
|
|
33
|
+
iterator2Done = true;
|
|
34
|
+
} else {
|
|
35
|
+
batch2 = value;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
91
38
|
|
|
92
|
-
|
|
93
|
-
_context.next = 4;
|
|
94
|
-
break;
|
|
39
|
+
const batch = extractBatch(batch1, batch2);
|
|
95
40
|
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
}
|
|
101
|
-
}, _callee);
|
|
102
|
-
}));
|
|
103
|
-
return _zipBatchIterators.apply(this, arguments);
|
|
41
|
+
if (batch) {
|
|
42
|
+
yield batch;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
104
45
|
}
|
|
105
46
|
|
|
106
47
|
function extractBatch(batch1, batch2) {
|
|
107
|
-
|
|
48
|
+
const batchLength = Math.min(batch1.length, batch2.length);
|
|
108
49
|
|
|
109
50
|
if (batchLength === 0) {
|
|
110
51
|
return null;
|
|
111
52
|
}
|
|
112
53
|
|
|
113
|
-
|
|
54
|
+
const batch = [batch1.slice(0, batchLength), batch2.slice(0, batchLength)];
|
|
114
55
|
batch1.splice(0, batchLength);
|
|
115
56
|
batch2.splice(0, batchLength);
|
|
116
57
|
return batch;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/streaming/zip-batch-iterators.ts"],"names":["zipBatchIterators","iterator1","iterator2","batch1","batch2","iterator1Done","iterator2Done","length","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/streaming/zip-batch-iterators.ts"],"names":["zipBatchIterators","iterator1","iterator2","batch1","batch2","iterator1Done","iterator2Done","length","value","done","next","batch","extractBatch","batchLength","Math","min","slice","splice"],"mappings":";;;;;;;AAMO,gBAAgBA,iBAAhB,CACLC,SADK,EAELC,SAFK,EAGsC;AAC3C,MAAIC,MAAM,GAAG,EAAb;AACA,MAAIC,MAAM,GAAG,EAAb;AACA,MAAIC,aAAsB,GAAG,KAA7B;AACA,MAAIC,aAAsB,GAAG,KAA7B;;AAIA,SAAO,CAACD,aAAD,IAAkB,CAACC,aAA1B,EAAyC;AACvC,QAAIH,MAAM,CAACI,MAAP,KAAkB,CAAlB,IAAuB,CAACF,aAA5B,EAA2C;AACzC,YAAM;AAACG,QAAAA,KAAD;AAAQC,QAAAA;AAAR,UAAgB,MAAMR,SAAS,CAACS,IAAV,EAA5B;;AACA,UAAID,IAAJ,EAAU;AACRJ,QAAAA,aAAa,GAAG,IAAhB;AACD,OAFD,MAEO;AACLF,QAAAA,MAAM,GAAGK,KAAT;AACD;AACF,KAPD,MAOO,IAAIJ,MAAM,CAACG,MAAP,KAAkB,CAAlB,IAAuB,CAACD,aAA5B,EAA2C;AAChD,YAAM;AAACE,QAAAA,KAAD;AAAQC,QAAAA;AAAR,UAAgB,MAAMP,SAAS,CAACQ,IAAV,EAA5B;;AACA,UAAID,IAAJ,EAAU;AACRH,QAAAA,aAAa,GAAG,IAAhB;AACD,OAFD,MAEO;AACLF,QAAAA,MAAM,GAAGI,KAAT;AACD;AACF;;AAED,UAAMG,KAAK,GAAGC,YAAY,CAACT,MAAD,EAASC,MAAT,CAA1B;;AACA,QAAIO,KAAJ,EAAW;AACT,YAAMA,KAAN;AACD;AACF;AACF;;AASD,SAASC,YAAT,CAAsBT,MAAtB,EAAwCC,MAAxC,EAA6E;AAC3E,QAAMS,WAAmB,GAAGC,IAAI,CAACC,GAAL,CAASZ,MAAM,CAACI,MAAhB,EAAwBH,MAAM,CAACG,MAA/B,CAA5B;;AACA,MAAIM,WAAW,KAAK,CAApB,EAAuB;AACrB,WAAO,IAAP;AACD;;AAGD,QAAMF,KAAiB,GAAG,CAACR,MAAM,CAACa,KAAP,CAAa,CAAb,EAAgBH,WAAhB,CAAD,EAA+BT,MAAM,CAACY,KAAP,CAAa,CAAb,EAAgBH,WAAhB,CAA/B,CAA1B;AAGAV,EAAAA,MAAM,CAACc,MAAP,CAAc,CAAd,EAAiBJ,WAAjB;AACAT,EAAAA,MAAM,CAACa,MAAP,CAAc,CAAd,EAAiBJ,WAAjB;AACA,SAAOF,KAAP;AACD","sourcesContent":["/**\n * Zip two iterators together\n *\n * @param iterator1\n * @param iterator2\n */\nexport async function* zipBatchIterators(\n iterator1: AsyncIterator<any[]>,\n iterator2: AsyncIterator<any[]>\n): AsyncGenerator<number[][], void, unknown> {\n let batch1 = [];\n let batch2 = [];\n let iterator1Done: boolean = false;\n let iterator2Done: boolean = false;\n\n // TODO - one could let all iterators flow at full speed using `Promise.race`\n // however we might end up with a big temporary buffer\n while (!iterator1Done && !iterator2Done) {\n if (batch1.length === 0 && !iterator1Done) {\n const {value, done} = await iterator1.next();\n if (done) {\n iterator1Done = true;\n } else {\n batch1 = value;\n }\n } else if (batch2.length === 0 && !iterator2Done) {\n const {value, done} = await iterator2.next();\n if (done) {\n iterator2Done = true;\n } else {\n batch2 = value;\n }\n }\n\n const batch = extractBatch(batch1, batch2);\n if (batch) {\n yield batch;\n }\n }\n}\n\n/**\n * Extract batch of same length from two batches\n *\n * @param batch1\n * @param batch2\n * @return array | null\n */\nfunction extractBatch(batch1: number[], batch2: number[]): number[][] | null {\n const batchLength: number = Math.min(batch1.length, batch2.length);\n if (batchLength === 0) {\n return null;\n }\n\n // Non interleaved arrays\n const batch: number[][] = [batch1.slice(0, batchLength), batch2.slice(0, batchLength)];\n\n // Modify the 2 batches\n batch1.splice(0, batchLength);\n batch2.splice(0, batchLength);\n return batch;\n}\n"],"file":"zip-batch-iterators.js"}
|
|
@@ -9,8 +9,8 @@ var _shpLoader = require("./shp-loader");
|
|
|
9
9
|
|
|
10
10
|
var _parseShapefile = require("./lib/parsers/parse-shapefile");
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
const VERSION = typeof "3.1.0-beta.3" !== 'undefined' ? "3.1.0-beta.3" : 'latest';
|
|
13
|
+
const ShapefileLoader = {
|
|
14
14
|
name: 'Shapefile',
|
|
15
15
|
id: 'shapefile',
|
|
16
16
|
module: 'shapefile',
|
|
@@ -29,6 +29,6 @@ var ShapefileLoader = {
|
|
|
29
29
|
parseInBatches: _parseShapefile.parseShapefileInBatches
|
|
30
30
|
};
|
|
31
31
|
exports.ShapefileLoader = ShapefileLoader;
|
|
32
|
-
|
|
32
|
+
const _typecheckShapefileLoader = ShapefileLoader;
|
|
33
33
|
exports._typecheckShapefileLoader = _typecheckShapefileLoader;
|
|
34
34
|
//# sourceMappingURL=shapefile-loader.js.map
|