@map-colonies/mc-utils 2.0.1 → 2.0.2
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/geo/geoHash.d.ts +1 -1
- package/dist/geo/geoHash.d.ts.map +1 -1
- package/dist/geo/geoHash.js +65 -93
- package/dist/geo/geoHash.js.map +1 -1
- package/dist/geo/tileBatcher.d.ts +1 -1
- package/dist/geo/tileBatcher.d.ts.map +1 -1
- package/dist/geo/tileBatcher.js +116 -137
- package/dist/geo/tileBatcher.js.map +1 -1
- package/package.json +1 -1
package/dist/geo/geoHash.d.ts
CHANGED
|
@@ -21,5 +21,5 @@ export declare const createGeoHashGenerator: (polygon: Polygon | Feature<Polygon
|
|
|
21
21
|
* @param tileZoom target tiles zoom level
|
|
22
22
|
* @param origin target tiles grid origin location (default ll)
|
|
23
23
|
*/
|
|
24
|
-
export declare function tileGenerator(polygon: Polygon | Feature<Polygon | MultiPolygon>, tileZoom: number, origin?: TileOrigin):
|
|
24
|
+
export declare function tileGenerator(polygon: Polygon | Feature<Polygon | MultiPolygon>, tileZoom: number, origin?: TileOrigin): Generator<ITile>;
|
|
25
25
|
//# sourceMappingURL=geoHash.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geoHash.d.ts","sourceRoot":"","sources":["../../src/geo/geoHash.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,OAAO,EAAa,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACjH,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAE3D,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AA+C5D;;;;GAIG;AACH,eAAO,MAAM,aAAa,YAAa,MAAM,WAK5C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,YAAa,OAAO,GAAG,QAAQ,OAAO,GAAG,YAAY,CAAC,2BAAoC,UAAU,MAAM,CAc5I,CAAC;AAEF;;;;;GAKG;AACH,
|
|
1
|
+
{"version":3,"file":"geoHash.d.ts","sourceRoot":"","sources":["../../src/geo/geoHash.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,OAAO,EAAa,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACjH,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAE3D,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AA+C5D;;;;GAIG;AACH,eAAO,MAAM,aAAa,YAAa,MAAM,WAK5C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,YAAa,OAAO,GAAG,QAAQ,OAAO,GAAG,YAAY,CAAC,2BAAoC,UAAU,MAAM,CAc5I,CAAC;AAEF;;;;;GAKG;AACH,wBAAiB,aAAa,CAC5B,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,YAAY,CAAC,EAClD,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,UAAkC,GACzC,SAAS,CAAC,KAAK,CAAC,CAmClB"}
|
package/dist/geo/geoHash.js
CHANGED
|
@@ -49,25 +49,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
49
49
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
|
-
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
53
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
54
|
-
var m = o[Symbol.asyncIterator], i;
|
|
55
|
-
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
56
|
-
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
57
|
-
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
58
|
-
};
|
|
59
|
-
var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
|
|
60
|
-
var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
|
|
61
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
62
|
-
var g = generator.apply(thisArg, _arguments || []), i, q = [];
|
|
63
|
-
return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
|
|
64
|
-
function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
|
|
65
|
-
function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
|
|
66
|
-
function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
|
|
67
|
-
function fulfill(value) { resume("next", value); }
|
|
68
|
-
function reject(value) { resume("throw", value); }
|
|
69
|
-
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
70
|
-
};
|
|
71
52
|
var __values = (this && this.__values) || function(o) {
|
|
72
53
|
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
73
54
|
if (m) return m.call(o);
|
|
@@ -194,81 +175,72 @@ exports.createGeoHashGenerator = createGeoHashGenerator;
|
|
|
194
175
|
* @param origin target tiles grid origin location (default ll)
|
|
195
176
|
*/
|
|
196
177
|
function tileGenerator(polygon, tileZoom, origin) {
|
|
178
|
+
var hashGen, hashGen_1, hashGen_1_1, hash, bbox, minTile, maxTile, minX, maxX, minY, maxY, x, y, e_2_1;
|
|
179
|
+
var e_2, _a;
|
|
197
180
|
if (origin === void 0) { origin = tileOrigin_1.TileOrigin.LOWER_LEFT; }
|
|
198
|
-
return
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
case 15:
|
|
262
|
-
_b.sent();
|
|
263
|
-
_b.label = 16;
|
|
264
|
-
case 16: return [3 /*break*/, 18];
|
|
265
|
-
case 17:
|
|
266
|
-
if (e_2) throw e_2.error;
|
|
267
|
-
return [7 /*endfinally*/];
|
|
268
|
-
case 18: return [7 /*endfinally*/];
|
|
269
|
-
case 19: return [2 /*return*/];
|
|
270
|
-
}
|
|
271
|
-
});
|
|
181
|
+
return __generator(this, function (_b) {
|
|
182
|
+
switch (_b.label) {
|
|
183
|
+
case 0:
|
|
184
|
+
hashGen = (0, exports.createGeoHashGenerator)(polygon, tileZoom);
|
|
185
|
+
_b.label = 1;
|
|
186
|
+
case 1:
|
|
187
|
+
_b.trys.push([1, 10, 11, 12]);
|
|
188
|
+
hashGen_1 = __values(hashGen), hashGen_1_1 = hashGen_1.next();
|
|
189
|
+
_b.label = 2;
|
|
190
|
+
case 2:
|
|
191
|
+
if (!!hashGen_1_1.done) return [3 /*break*/, 9];
|
|
192
|
+
hash = hashGen_1_1.value;
|
|
193
|
+
bbox = (0, exports.decodeGeoHash)(hash);
|
|
194
|
+
minTile = (0, geoConvertor_1.degreesToTile)({
|
|
195
|
+
longitude: bbox[0],
|
|
196
|
+
latitude: bbox[1],
|
|
197
|
+
}, tileZoom, origin);
|
|
198
|
+
maxTile = (0, geoConvertor_1.degreesToTile)({
|
|
199
|
+
longitude: bbox[2],
|
|
200
|
+
latitude: bbox[3],
|
|
201
|
+
}, tileZoom, origin);
|
|
202
|
+
minX = Math.min(minTile.x, maxTile.x);
|
|
203
|
+
maxX = minTile.x + maxTile.x - minX;
|
|
204
|
+
minY = Math.min(minTile.y, maxTile.y);
|
|
205
|
+
maxY = minTile.y + maxTile.y - minY;
|
|
206
|
+
x = minX;
|
|
207
|
+
_b.label = 3;
|
|
208
|
+
case 3:
|
|
209
|
+
if (!(x < maxX)) return [3 /*break*/, 8];
|
|
210
|
+
y = minY;
|
|
211
|
+
_b.label = 4;
|
|
212
|
+
case 4:
|
|
213
|
+
if (!(y < maxY)) return [3 /*break*/, 7];
|
|
214
|
+
return [4 /*yield*/, {
|
|
215
|
+
x: x,
|
|
216
|
+
y: y,
|
|
217
|
+
zoom: tileZoom,
|
|
218
|
+
}];
|
|
219
|
+
case 5:
|
|
220
|
+
_b.sent();
|
|
221
|
+
_b.label = 6;
|
|
222
|
+
case 6:
|
|
223
|
+
y++;
|
|
224
|
+
return [3 /*break*/, 4];
|
|
225
|
+
case 7:
|
|
226
|
+
x++;
|
|
227
|
+
return [3 /*break*/, 3];
|
|
228
|
+
case 8:
|
|
229
|
+
hashGen_1_1 = hashGen_1.next();
|
|
230
|
+
return [3 /*break*/, 2];
|
|
231
|
+
case 9: return [3 /*break*/, 12];
|
|
232
|
+
case 10:
|
|
233
|
+
e_2_1 = _b.sent();
|
|
234
|
+
e_2 = { error: e_2_1 };
|
|
235
|
+
return [3 /*break*/, 12];
|
|
236
|
+
case 11:
|
|
237
|
+
try {
|
|
238
|
+
if (hashGen_1_1 && !hashGen_1_1.done && (_a = hashGen_1.return)) _a.call(hashGen_1);
|
|
239
|
+
}
|
|
240
|
+
finally { if (e_2) throw e_2.error; }
|
|
241
|
+
return [7 /*endfinally*/];
|
|
242
|
+
case 12: return [2 /*return*/];
|
|
243
|
+
}
|
|
272
244
|
});
|
|
273
245
|
}
|
|
274
246
|
exports.tileGenerator = tileGenerator;
|
package/dist/geo/geoHash.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geoHash.js","sourceRoot":"","sources":["../../src/geo/geoHash.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"geoHash.js","sourceRoot":"","sources":["../../src/geo/geoHash.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,6 @@ import { ITileRange } from '../models/interfaces/geo/iTile';
|
|
|
4
4
|
* @param batchSize amount of tile per batch
|
|
5
5
|
* @param ranges iterable collection of tile ranges
|
|
6
6
|
*/
|
|
7
|
-
declare function tileBatchGenerator(batchSize: number, ranges: Iterable<ITileRange>):
|
|
7
|
+
declare function tileBatchGenerator(batchSize: number, ranges: Iterable<ITileRange>): Generator<ITileRange[]>;
|
|
8
8
|
export { tileBatchGenerator };
|
|
9
9
|
//# sourceMappingURL=tileBatcher.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tileBatcher.d.ts","sourceRoot":"","sources":["../../src/geo/tileBatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D;;;;GAIG;AACH,
|
|
1
|
+
{"version":3,"file":"tileBatcher.d.ts","sourceRoot":"","sources":["../../src/geo/tileBatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D;;;;GAIG;AACH,iBAAU,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,CAmFrG;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
|
package/dist/geo/tileBatcher.js
CHANGED
|
@@ -26,24 +26,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
26
26
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
27
27
|
}
|
|
28
28
|
};
|
|
29
|
-
var
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
};
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
var g = generator.apply(thisArg, _arguments || []), i, q = [];
|
|
40
|
-
return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
|
|
41
|
-
function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
|
|
42
|
-
function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
|
|
43
|
-
function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
|
|
44
|
-
function fulfill(value) { resume("next", value); }
|
|
45
|
-
function reject(value) { resume("throw", value); }
|
|
46
|
-
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
29
|
+
var __values = (this && this.__values) || function(o) {
|
|
30
|
+
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
31
|
+
if (m) return m.call(o);
|
|
32
|
+
if (o && typeof o.length === "number") return {
|
|
33
|
+
next: function () {
|
|
34
|
+
if (o && i >= o.length) o = void 0;
|
|
35
|
+
return { value: o && o[i++], done: !o };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
47
39
|
};
|
|
48
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
49
41
|
exports.tileBatchGenerator = void 0;
|
|
@@ -53,136 +45,123 @@ exports.tileBatchGenerator = void 0;
|
|
|
53
45
|
* @param ranges iterable collection of tile ranges
|
|
54
46
|
*/
|
|
55
47
|
function tileBatchGenerator(batchSize, ranges) {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
48
|
+
var targetRanges, requiredForFullBatch, ranges_1, ranges_1_1, range, dx, dy, reminderX, remaining, requiredLines, yRange, endX, e_1_1;
|
|
49
|
+
var e_1, _a;
|
|
50
|
+
return __generator(this, function (_b) {
|
|
51
|
+
switch (_b.label) {
|
|
52
|
+
case 0:
|
|
53
|
+
targetRanges = [];
|
|
54
|
+
requiredForFullBatch = batchSize;
|
|
55
|
+
_b.label = 1;
|
|
56
|
+
case 1:
|
|
57
|
+
_b.trys.push([1, 11, 12, 13]);
|
|
58
|
+
ranges_1 = __values(ranges), ranges_1_1 = ranges_1.next();
|
|
59
|
+
_b.label = 2;
|
|
60
|
+
case 2:
|
|
61
|
+
if (!!ranges_1_1.done) return [3 /*break*/, 10];
|
|
62
|
+
range = ranges_1_1.value;
|
|
63
|
+
dx = range.maxX - range.minX;
|
|
64
|
+
dy = range.maxY - range.minY;
|
|
65
|
+
if (dx === 0 || dy === 0) {
|
|
66
|
+
return [3 /*break*/, 9];
|
|
67
|
+
}
|
|
68
|
+
reminderX = range.maxX;
|
|
69
|
+
_b.label = 3;
|
|
70
|
+
case 3:
|
|
71
|
+
if (!(range.minY < range.maxY)) return [3 /*break*/, 9];
|
|
72
|
+
if (!(reminderX < range.maxX)) return [3 /*break*/, 6];
|
|
73
|
+
remaining = range.maxX - reminderX;
|
|
74
|
+
if (!(remaining > requiredForFullBatch)) return [3 /*break*/, 5];
|
|
75
|
+
targetRanges.push({
|
|
76
|
+
minX: reminderX,
|
|
77
|
+
maxX: reminderX + requiredForFullBatch,
|
|
78
|
+
minY: range.minY,
|
|
79
|
+
maxY: range.minY + 1,
|
|
80
|
+
zoom: range.zoom,
|
|
81
|
+
});
|
|
82
|
+
return [4 /*yield*/, targetRanges];
|
|
83
|
+
case 4:
|
|
84
|
+
_b.sent();
|
|
85
|
+
reminderX += requiredForFullBatch;
|
|
86
|
+
targetRanges = [];
|
|
87
|
+
requiredForFullBatch = batchSize;
|
|
88
|
+
return [3 /*break*/, 3];
|
|
89
|
+
case 5:
|
|
90
|
+
targetRanges.push({
|
|
91
|
+
minX: reminderX,
|
|
92
|
+
maxX: reminderX + remaining,
|
|
93
|
+
minY: range.minY,
|
|
94
|
+
maxY: range.minY + 1,
|
|
95
|
+
zoom: range.zoom,
|
|
96
|
+
});
|
|
97
|
+
range.minY++;
|
|
98
|
+
reminderX += remaining;
|
|
99
|
+
requiredForFullBatch -= remaining;
|
|
100
|
+
dy--;
|
|
101
|
+
_b.label = 6;
|
|
102
|
+
case 6:
|
|
103
|
+
requiredLines = Math.floor(requiredForFullBatch / dx);
|
|
104
|
+
yRange = Math.min(requiredLines, dy);
|
|
105
|
+
if (yRange > 0) {
|
|
85
106
|
targetRanges.push({
|
|
86
|
-
minX:
|
|
87
|
-
maxX:
|
|
107
|
+
minX: range.minX,
|
|
108
|
+
maxX: range.maxX,
|
|
88
109
|
minY: range.minY,
|
|
89
|
-
maxY: range.minY +
|
|
110
|
+
maxY: range.minY + yRange,
|
|
90
111
|
zoom: range.zoom,
|
|
91
112
|
});
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
requiredForFullBatch = batchSize;
|
|
100
|
-
return [3 /*break*/, 4];
|
|
101
|
-
case 8:
|
|
113
|
+
range.minY += yRange;
|
|
114
|
+
dy -= yRange;
|
|
115
|
+
requiredForFullBatch -= yRange * dx;
|
|
116
|
+
}
|
|
117
|
+
//add partial lines beginning
|
|
118
|
+
if (requiredForFullBatch > 0 && range.minY < range.maxY) {
|
|
119
|
+
endX = Math.min(range.minX + requiredForFullBatch, range.maxX);
|
|
102
120
|
targetRanges.push({
|
|
103
|
-
minX:
|
|
104
|
-
maxX:
|
|
121
|
+
minX: range.minX,
|
|
122
|
+
maxX: endX,
|
|
105
123
|
minY: range.minY,
|
|
106
124
|
maxY: range.minY + 1,
|
|
107
125
|
zoom: range.zoom,
|
|
108
126
|
});
|
|
109
|
-
range.
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
dy--;
|
|
113
|
-
_b.label = 9;
|
|
114
|
-
case 9:
|
|
115
|
-
requiredLines = Math.floor(requiredForFullBatch / dx);
|
|
116
|
-
yRange = Math.min(requiredLines, dy);
|
|
117
|
-
if (yRange > 0) {
|
|
118
|
-
targetRanges.push({
|
|
119
|
-
minX: range.minX,
|
|
120
|
-
maxX: range.maxX,
|
|
121
|
-
minY: range.minY,
|
|
122
|
-
maxY: range.minY + yRange,
|
|
123
|
-
zoom: range.zoom,
|
|
124
|
-
});
|
|
125
|
-
range.minY += yRange;
|
|
126
|
-
dy -= yRange;
|
|
127
|
-
requiredForFullBatch -= yRange * dx;
|
|
127
|
+
requiredForFullBatch -= endX - range.minX;
|
|
128
|
+
if (endX < range.maxX) {
|
|
129
|
+
reminderX = endX;
|
|
128
130
|
}
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
endX = Math.min(range.minX + requiredForFullBatch, range.maxX);
|
|
132
|
-
targetRanges.push({
|
|
133
|
-
minX: range.minX,
|
|
134
|
-
maxX: endX,
|
|
135
|
-
minY: range.minY,
|
|
136
|
-
maxY: range.minY + 1,
|
|
137
|
-
zoom: range.zoom,
|
|
138
|
-
});
|
|
139
|
-
requiredForFullBatch -= endX - range.minX;
|
|
140
|
-
if (endX < range.maxX) {
|
|
141
|
-
reminderX = endX;
|
|
142
|
-
}
|
|
143
|
-
else {
|
|
144
|
-
range.minY++;
|
|
145
|
-
}
|
|
131
|
+
else {
|
|
132
|
+
range.minY++;
|
|
146
133
|
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
case 23: return [4 /*yield*/, __await.apply(void 0, [_b.sent()])];
|
|
179
|
-
case 24: return [4 /*yield*/, _b.sent()];
|
|
180
|
-
case 25:
|
|
181
|
-
_b.sent();
|
|
182
|
-
_b.label = 26;
|
|
183
|
-
case 26: return [2 /*return*/];
|
|
184
|
-
}
|
|
185
|
-
});
|
|
134
|
+
}
|
|
135
|
+
if (!(requiredForFullBatch === 0)) return [3 /*break*/, 8];
|
|
136
|
+
return [4 /*yield*/, targetRanges];
|
|
137
|
+
case 7:
|
|
138
|
+
_b.sent();
|
|
139
|
+
targetRanges = [];
|
|
140
|
+
requiredForFullBatch = batchSize;
|
|
141
|
+
_b.label = 8;
|
|
142
|
+
case 8: return [3 /*break*/, 3];
|
|
143
|
+
case 9:
|
|
144
|
+
ranges_1_1 = ranges_1.next();
|
|
145
|
+
return [3 /*break*/, 2];
|
|
146
|
+
case 10: return [3 /*break*/, 13];
|
|
147
|
+
case 11:
|
|
148
|
+
e_1_1 = _b.sent();
|
|
149
|
+
e_1 = { error: e_1_1 };
|
|
150
|
+
return [3 /*break*/, 13];
|
|
151
|
+
case 12:
|
|
152
|
+
try {
|
|
153
|
+
if (ranges_1_1 && !ranges_1_1.done && (_a = ranges_1.return)) _a.call(ranges_1);
|
|
154
|
+
}
|
|
155
|
+
finally { if (e_1) throw e_1.error; }
|
|
156
|
+
return [7 /*endfinally*/];
|
|
157
|
+
case 13:
|
|
158
|
+
if (!(targetRanges.length > 0)) return [3 /*break*/, 15];
|
|
159
|
+
return [4 /*yield*/, targetRanges];
|
|
160
|
+
case 14:
|
|
161
|
+
_b.sent();
|
|
162
|
+
_b.label = 15;
|
|
163
|
+
case 15: return [2 /*return*/];
|
|
164
|
+
}
|
|
186
165
|
});
|
|
187
166
|
}
|
|
188
167
|
exports.tileBatchGenerator = tileBatchGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tileBatcher.js","sourceRoot":"","sources":["../../src/geo/tileBatcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tileBatcher.js","sourceRoot":"","sources":["../../src/geo/tileBatcher.ts"],"names":[],"mappings":"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"}
|