@map-colonies/mc-utils 2.0.2 → 3.1.0

package/dist/geo/geoIntersection.js

@@ -1,71 +1,71 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.featureCollectionBooleanEqual = exports.multiIntersect = void 0;
-var turf_1 = require("@turf/turf");
-var lodash_1 = __importDefault(require("lodash"));
-var featuresCustomizer = function (objectValue, otherValue) {
-    // compare features
-    // https://lodash.com/docs/4.17.15#find
-    if (!lodash_1.default.isEqual(objectValue.length, otherValue.length)) {
-        return false;
-    }
-    for (var i = 0; i < objectValue.length; i++) {
-        var isFeatureContained = lodash_1.default.find(otherValue, objectValue[i]);
-        if (isFeatureContained === undefined) {
-            return false;
-        }
-    }
-    for (var i = 0; i < otherValue.length; i++) {
-        var isFeatureContained = lodash_1.default.find(objectValue, otherValue[i]);
-        if (isFeatureContained === undefined) {
-            return false;
-        }
-    }
-    return true;
-};
-var featureCollectionCustomized = function (objectValue, otherValue) {
-    // compare type
-    if (!lodash_1.default.isEqual(objectValue.type, otherValue.type)) {
-        return false;
-    }
-    // compare features
-    var isFeaturesEqual = lodash_1.default.isEqualWith(objectValue.features, otherValue.features, featuresCustomizer);
-    return isFeaturesEqual;
-};
-/**
- * return the intersection footprint of all specified footprints or null when there is no intersection
- * @param footprints footprint list to intersect
- * @returns intersection footprint or null
- */
-var multiIntersect = function (footprints) {
-    if (footprints.length === 0) {
-        return null;
-    }
-    else if (footprints.length === 1) {
-        return footprints[0];
-    }
-    var intersection = footprints[0];
-    for (var i = 1; i < footprints.length; i++) {
-        var curIntersection = (0, turf_1.intersect)(intersection, footprints[i]);
-        if (curIntersection === null) {
-            return null;
-        }
-        intersection = curIntersection;
-    }
-    return intersection;
-};
-exports.multiIntersect = multiIntersect;
-/**
- * indicates if 2 object of type FeatureCollection are equal by validating properties and features array (order not important)
- * @param fc1 first featureCollection to compare equal
- * @param fc2 second featureCollection to compare equal
- * @returns true if same featureCollection, false if not
- */
-var featureCollectionBooleanEqual = function (fc1, fc2) {
-    return lodash_1.default.isEqualWith(fc1, fc2, featureCollectionCustomized);
-};
-exports.featureCollectionBooleanEqual = featureCollectionBooleanEqual;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.featureCollectionBooleanEqual = exports.multiIntersect = void 0;
+const turf_1 = require("@turf/turf");
+const lodash_1 = __importDefault(require("lodash"));
+const featuresCustomizer = (objectValue, otherValue) => {
+    // compare features
+    // https://lodash.com/docs/4.17.15#find
+    if (!lodash_1.default.isEqual(objectValue.length, otherValue.length)) {
+        return false;
+    }
+    for (let i = 0; i < objectValue.length; i++) {
+        const isFeatureContained = lodash_1.default.find(otherValue, objectValue[i]);
+        if (isFeatureContained === undefined) {
+            return false;
+        }
+    }
+    for (let i = 0; i < otherValue.length; i++) {
+        const isFeatureContained = lodash_1.default.find(objectValue, otherValue[i]);
+        if (isFeatureContained === undefined) {
+            return false;
+        }
+    }
+    return true;
+};
+const featureCollectionCustomized = (objectValue, otherValue) => {
+    // compare type
+    if (!lodash_1.default.isEqual(objectValue.type, otherValue.type)) {
+        return false;
+    }
+    // compare features
+    const isFeaturesEqual = lodash_1.default.isEqualWith(objectValue.features, otherValue.features, featuresCustomizer);
+    return isFeaturesEqual;
+};
+/**
+ * return the intersection footprint of all specified footprints or null when there is no intersection
+ * @param footprints footprint list to intersect
+ * @returns intersection footprint or null
+ */
+const multiIntersect = (footprints) => {
+    if (footprints.length === 0) {
+        return null;
+    }
+    else if (footprints.length === 1) {
+        return footprints[0];
+    }
+    let intersection = footprints[0];
+    for (let i = 1; i < footprints.length; i++) {
+        const curIntersection = (0, turf_1.intersect)(intersection, footprints[i]);
+        if (curIntersection === null) {
+            return null;
+        }
+        intersection = curIntersection;
+    }
+    return intersection;
+};
+exports.multiIntersect = multiIntersect;
+/**
+ * indicates if 2 object of type FeatureCollection are equal by validating properties and features array (order not important)
+ * @param fc1 first featureCollection to compare equal
+ * @param fc2 second featureCollection to compare equal
+ * @returns true if same featureCollection, false if not
+ */
+const featureCollectionBooleanEqual = (fc1, fc2) => {
+    return lodash_1.default.isEqualWith(fc1, fc2, featureCollectionCustomized);
+};
+exports.featureCollectionBooleanEqual = featureCollectionBooleanEqual;
 //# sourceMappingURL=geoIntersection.js.map

package/dist/geo/geoIntersection.js.map

@@ -1 +1 @@
-{"version":3,"file":"geoIntersection.js","sourceRoot":"","sources":["../../src/geo/geoIntersection.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA0F;AAC1F,kDAAuB;AAOvB,IAAM,kBAAkB,GAAG,UAAC,WAAsB,EAAE,UAAqB;IACvE,mBAAmB;IACnB,uCAAuC;IAEvC,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE;QACrD,OAAO,KAAK,CAAC;KACd;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,IAAM,kBAAkB,GAAG,gBAAC,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,kBAAkB,KAAK,SAAS,EAAE;YACpC,OAAO,KAAK,CAAC;SACd;KACF;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,IAAM,kBAAkB,GAAG,gBAAC,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,kBAAkB,KAAK,SAAS,EAAE;YACpC,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,IAAM,2BAA2B,GAAG,UAAC,WAA8B,EAAE,UAA6B;IAChG,eAAe;IACf,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE;QACjD,OAAO,KAAK,CAAC;KACd;IACD,mBAAmB;IACnB,IAAM,eAAe,GAAG,gBAAC,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IACrG,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF;;;;GAIG;AACH,IAAM,cAAc,GAAG,UAAC,UAAuB;IAC7C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC;KACtB;IACD,IAAI,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,IAAM,eAAe,GAAG,IAAA,gBAAS,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,IAAI,eAAe,KAAK,IAAI,EAAE;YAC5B,OAAO,IAAI,CAAC;SACb;QACD,YAAY,GAAG,eAAe,CAAC;KAChC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAYO,wCAAc;AAVvB;;;;;GAKG;AACH,IAAM,6BAA6B,GAAG,UAAC,GAAsB,EAAE,GAAsB;IACnF,OAAO,gBAAC,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,2BAA2B,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEuB,sEAA6B"}
+{"version":3,"file":"geoIntersection.js","sourceRoot":"","sources":["../../src/geo/geoIntersection.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA0F;AAC1F,oDAAuB;AAOvB,MAAM,kBAAkB,GAAG,CAAC,WAAsB,EAAE,UAAqB,EAAW,EAAE;IACpF,mBAAmB;IACnB,uCAAuC;IAEvC,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE;QACrD,OAAO,KAAK,CAAC;KACd;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,gBAAC,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,kBAAkB,KAAK,SAAS,EAAE;YACpC,OAAO,KAAK,CAAC;SACd;KACF;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,kBAAkB,GAAG,gBAAC,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,kBAAkB,KAAK,SAAS,EAAE;YACpC,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,WAA8B,EAAE,UAA6B,EAAW,EAAE;IAC7G,eAAe;IACf,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE;QACjD,OAAO,KAAK,CAAC;KACd;IACD,mBAAmB;IACnB,MAAM,eAAe,GAAG,gBAAC,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IACrG,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,cAAc,GAAG,CAAC,UAAuB,EAAoB,EAAE;IACnE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC;KACtB;IACD,IAAI,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,eAAe,GAAG,IAAA,gBAAS,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,IAAI,eAAe,KAAK,IAAI,EAAE;YAC5B,OAAO,IAAI,CAAC;SACb;QACD,YAAY,GAAG,eAAe,CAAC;KAChC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAYO,wCAAc;AAVvB;;;;;GAKG;AACH,MAAM,6BAA6B,GAAG,CAAC,GAAsB,EAAE,GAAsB,EAAW,EAAE;IAChG,OAAO,gBAAC,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,2BAA2B,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEuB,sEAA6B"}

package/dist/geo/index.d.ts

@@ -1,9 +1,9 @@
-export * from './bboxUtils';
-export * from './geoConvertor';
-export * from './geoHash';
-export * from './geoIntersection';
-export * from './tileBatcher';
-export * from './tileRanger';
-export * from './tiles';
-export * from './tilesGenerator';
+export * from './bboxUtils';
+export * from './geoConvertor';
+export * from './geoHash';
+export * from './geoIntersection';
+export * from './tileBatcher';
+export * from './tileRanger';
+export * from './tiles';
+export * from './tilesGenerator';
 //# sourceMappingURL=index.d.ts.map

package/dist/geo/index.js

@@ -1,25 +1,25 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./bboxUtils"), exports);
-__exportStar(require("./geoConvertor"), exports);
-__exportStar(require("./geoHash"), exports);
-__exportStar(require("./geoIntersection"), exports);
-__exportStar(require("./tileBatcher"), exports);
-__exportStar(require("./tileRanger"), exports);
-__exportStar(require("./tiles"), exports);
-__exportStar(require("./tilesGenerator"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./bboxUtils"), exports);
+__exportStar(require("./geoConvertor"), exports);
+__exportStar(require("./geoHash"), exports);
+__exportStar(require("./geoIntersection"), exports);
+__exportStar(require("./tileBatcher"), exports);
+__exportStar(require("./tileRanger"), exports);
+__exportStar(require("./tiles"), exports);
+__exportStar(require("./tilesGenerator"), exports);
 //# sourceMappingURL=index.js.map

package/dist/geo/tileBatcher.d.ts

@@ -1,9 +1,9 @@
-import { ITileRange } from '../models/interfaces/geo/iTile';
-/**
- * split collection of tile ranges to batches based on tile count
- * @param batchSize amount of tile per batch
- * @param ranges iterable collection of tile ranges
- */
-declare function tileBatchGenerator(batchSize: number, ranges: Iterable<ITileRange>): Generator<ITileRange[]>;
-export { tileBatchGenerator };
+import { ITileRange } from '../models/interfaces/geo/iTile';
+/**
+ * split collection of tile ranges to batches based on tile count
+ * @param batchSize amount of tile per batch
+ * @param ranges iterable collection of tile ranges
+ */
+declare function tileBatchGenerator(batchSize: number, ranges: AsyncGenerator<ITileRange>): AsyncGenerator<ITileRange[]>;
+export { tileBatchGenerator };
 //# sourceMappingURL=tileBatcher.d.ts.map

package/dist/geo/tileBatcher.d.ts.map

@@ -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,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"}
+{"version":3,"file":"tileBatcher.d.ts","sourceRoot":"","sources":["../../src/geo/tileBatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAG5D;;;;GAIG;AACH,iBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,cAAc,CAAC,UAAU,EAAE,CAAC,CAoFtH;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/geo/tileBatcher.js

@@ -1,168 +1,98 @@
-"use strict";
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tileBatchGenerator = void 0;
-/**
- * split collection of tile ranges to batches based on tile count
- * @param batchSize amount of tile per batch
- * @param ranges iterable collection of tile ranges
- */
-function tileBatchGenerator(batchSize, ranges) {
-    var targetRanges, requiredForFullBatch, ranges_1, ranges_1_1, range, dx, dy, reminderX, remaining, requiredLines, yRange, endX, e_1_1;
-    var e_1, _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                targetRanges = [];
-                requiredForFullBatch = batchSize;
-                _b.label = 1;
-            case 1:
-                _b.trys.push([1, 11, 12, 13]);
-                ranges_1 = __values(ranges), ranges_1_1 = ranges_1.next();
-                _b.label = 2;
-            case 2:
-                if (!!ranges_1_1.done) return [3 /*break*/, 10];
-                range = ranges_1_1.value;
-                dx = range.maxX - range.minX;
-                dy = range.maxY - range.minY;
-                if (dx === 0 || dy === 0) {
-                    return [3 /*break*/, 9];
-                }
-                reminderX = range.maxX;
-                _b.label = 3;
-            case 3:
-                if (!(range.minY < range.maxY)) return [3 /*break*/, 9];
-                if (!(reminderX < range.maxX)) return [3 /*break*/, 6];
-                remaining = range.maxX - reminderX;
-                if (!(remaining > requiredForFullBatch)) return [3 /*break*/, 5];
-                targetRanges.push({
-                    minX: reminderX,
-                    maxX: reminderX + requiredForFullBatch,
-                    minY: range.minY,
-                    maxY: range.minY + 1,
-                    zoom: range.zoom,
-                });
-                return [4 /*yield*/, targetRanges];
-            case 4:
-                _b.sent();
-                reminderX += requiredForFullBatch;
-                targetRanges = [];
-                requiredForFullBatch = batchSize;
-                return [3 /*break*/, 3];
-            case 5:
-                targetRanges.push({
-                    minX: reminderX,
-                    maxX: reminderX + remaining,
-                    minY: range.minY,
-                    maxY: range.minY + 1,
-                    zoom: range.zoom,
-                });
-                range.minY++;
-                reminderX += remaining;
-                requiredForFullBatch -= remaining;
-                dy--;
-                _b.label = 6;
-            case 6:
-                requiredLines = Math.floor(requiredForFullBatch / dx);
-                yRange = Math.min(requiredLines, dy);
-                if (yRange > 0) {
-                    targetRanges.push({
-                        minX: range.minX,
-                        maxX: range.maxX,
-                        minY: range.minY,
-                        maxY: range.minY + yRange,
-                        zoom: range.zoom,
-                    });
-                    range.minY += yRange;
-                    dy -= yRange;
-                    requiredForFullBatch -= yRange * dx;
-                }
-                //add partial lines beginning
-                if (requiredForFullBatch > 0 && range.minY < range.maxY) {
-                    endX = Math.min(range.minX + requiredForFullBatch, range.maxX);
-                    targetRanges.push({
-                        minX: range.minX,
-                        maxX: endX,
-                        minY: range.minY,
-                        maxY: range.minY + 1,
-                        zoom: range.zoom,
-                    });
-                    requiredForFullBatch -= endX - range.minX;
-                    if (endX < range.maxX) {
-                        reminderX = endX;
-                    }
-                    else {
-                        range.minY++;
-                    }
-                }
-                if (!(requiredForFullBatch === 0)) return [3 /*break*/, 8];
-                return [4 /*yield*/, targetRanges];
-            case 7:
-                _b.sent();
-                targetRanges = [];
-                requiredForFullBatch = batchSize;
-                _b.label = 8;
-            case 8: return [3 /*break*/, 3];
-            case 9:
-                ranges_1_1 = ranges_1.next();
-                return [3 /*break*/, 2];
-            case 10: return [3 /*break*/, 13];
-            case 11:
-                e_1_1 = _b.sent();
-                e_1 = { error: e_1_1 };
-                return [3 /*break*/, 13];
-            case 12:
-                try {
-                    if (ranges_1_1 && !ranges_1_1.done && (_a = ranges_1.return)) _a.call(ranges_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-                return [7 /*endfinally*/];
-            case 13:
-                if (!(targetRanges.length > 0)) return [3 /*break*/, 15];
-                return [4 /*yield*/, targetRanges];
-            case 14:
-                _b.sent();
-                _b.label = 15;
-            case 15: return [2 /*return*/];
-        }
-    });
-}
-exports.tileBatchGenerator = tileBatchGenerator;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tileBatchGenerator = void 0;
+const timeout_1 = require("../utils/timeout");
+/**
+ * split collection of tile ranges to batches based on tile count
+ * @param batchSize amount of tile per batch
+ * @param ranges iterable collection of tile ranges
+ */
+async function* tileBatchGenerator(batchSize, ranges) {
+    let targetRanges = [];
+    let requiredForFullBatch = batchSize;
+    for await (const range of ranges) {
+        const dx = range.maxX - range.minX;
+        let dy = range.maxY - range.minY;
+        if (dx === 0 || dy === 0) {
+            continue;
+        }
+        let reminderX = range.maxX;
+        while (range.minY < range.maxY) {
+            //remaining tiles in batch row row
+            if (reminderX < range.maxX) {
+                const remaining = range.maxX - reminderX;
+                if (remaining > requiredForFullBatch) {
+                    targetRanges.push({
+                        minX: reminderX,
+                        maxX: reminderX + requiredForFullBatch,
+                        minY: range.minY,
+                        maxY: range.minY + 1,
+                        zoom: range.zoom,
+                    });
+                    yield await Promise.resolve(targetRanges);
+                    reminderX += requiredForFullBatch;
+                    targetRanges = [];
+                    requiredForFullBatch = batchSize;
+                    continue;
+                }
+                else {
+                    targetRanges.push({
+                        minX: reminderX,
+                        maxX: reminderX + remaining,
+                        minY: range.minY,
+                        maxY: range.minY + 1,
+                        zoom: range.zoom,
+                    });
+                    range.minY++;
+                    reminderX += remaining;
+                    requiredForFullBatch -= remaining;
+                    dy--;
+                }
+            }
+            //add max full lines
+            const requiredLines = Math.floor(requiredForFullBatch / dx);
+            const yRange = Math.min(requiredLines, dy);
+            if (yRange > 0) {
+                targetRanges.push({
+                    minX: range.minX,
+                    maxX: range.maxX,
+                    minY: range.minY,
+                    maxY: range.minY + yRange,
+                    zoom: range.zoom,
+                });
+                range.minY += yRange;
+                dy -= yRange;
+                requiredForFullBatch -= yRange * dx;
+            }
+            //add partial lines beginning
+            if (requiredForFullBatch > 0 && range.minY < range.maxY) {
+                const endX = Math.min(range.minX + requiredForFullBatch, range.maxX);
+                targetRanges.push({
+                    minX: range.minX,
+                    maxX: endX,
+                    minY: range.minY,
+                    maxY: range.minY + 1,
+                    zoom: range.zoom,
+                });
+                requiredForFullBatch -= endX - range.minX;
+                if (endX < range.maxX) {
+                    reminderX = endX;
+                }
+                else {
+                    range.minY++;
+                }
+            }
+            if (requiredForFullBatch === 0) {
+                yield await Promise.resolve(targetRanges);
+                targetRanges = [];
+                requiredForFullBatch = batchSize;
+            }
+        }
+        await (0, timeout_1.timeout)(0); // TODO: * This is a hot fix to keep work async and handle concurrency requests while handling the task batch merging, remove this when moving to the new utils package ! *
+    }
+    if (targetRanges.length > 0) {
+        yield await Promise.resolve(targetRanges);
+    }
+}
+exports.tileBatchGenerator = tileBatchGenerator;
 //# sourceMappingURL=tileBatcher.js.map

package/dist/geo/tileBatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"tileBatcher.js","sourceRoot":"","sources":["../../src/geo/tileBatcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tileBatcher.js","sourceRoot":"","sources":["../../src/geo/tileBatcher.ts"],"names":[],"mappings":"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"}

package/dist/geo/tileRanger.d.ts

@@ -1,47 +1,47 @@
-import { BBox2d } from '@turf/helpers/dist/js/lib/geojson';
-import { Feature, MultiPolygon, Polygon } from '@turf/turf';
-import { ITile, ITileRange } from '../models/interfaces/geo/iTile';
-/**
- * class for generating and decoding tile hashes
- */
-export declare class TileRanger {
-    /**
-     * converts tile to tile range of specified zoom level
-     * @param tile
-     * @param zoom target tile range zoom
-     * @returns
-     */
-    tileToRange(tile: ITile, zoom: number): ITileRange;
-    /**
-     * generate tile hashes
-     * @param footprint footprint to cover with generated tile hashes
-     * @param zoom max hash zoom
-     * @returns
-     */
-    encodeFootprint(footprint: Polygon | Feature<Polygon | MultiPolygon>, zoom: number, verbose?: boolean): Generator<ITileRange>;
-    /**
-     * generate tile
-     * @param bbox bbox to cover with generated tiles
-     * @param zoom target tiles zoom level
-     */
-    generateTiles(bbox: BBox2d, zoom: number): Generator<ITile>;
-    /**
-     * generate tile
-     * @param footprint footprint to cover with generated tiles
-     * @param zoom target tiles zoom level
-     */
-    generateTiles(footprint: Polygon | Feature<Polygon | MultiPolygon>, zoom: number): Generator<ITile>;
-    private generateRanges;
-    /**
-     * generate tile
-     * @param tile tile to get all intersecting tiles from
-     * @param targetZoom target tiles zoom level
-     * @param intersectionTarget original zoom level and footprint to intersect
-     * @param intersectionFunction the intersection function to be called
-     */
-    private optimizeHash;
-    private generateSubTiles;
-    private readonly tileFootprintIntersection;
-    private isBbox;
-}
+import { BBox2d } from '@turf/helpers/dist/js/lib/geojson';
+import { Feature, MultiPolygon, Polygon } from '@turf/turf';
+import { ITile, ITileRange } from '../models/interfaces/geo/iTile';
+/**
+ * class for generating and decoding tile hashes
+ */
+export declare class TileRanger {
+    /**
+     * converts tile to tile range of specified zoom level
+     * @param tile
+     * @param zoom target tile range zoom
+     * @returns
+     */
+    tileToRange(tile: ITile, zoom: number): ITileRange;
+    /**
+     * generate tile hashes
+     * @param footprint footprint to cover with generated tile hashes
+     * @param zoom max hash zoom
+     * @returns
+     */
+    encodeFootprint(footprint: Polygon | Feature<Polygon | MultiPolygon>, zoom: number, verbose?: boolean): AsyncGenerator<ITileRange>;
+    /**
+     * generate tile
+     * @param bbox bbox to cover with generated tiles
+     * @param zoom target tiles zoom level
+     */
+    generateTiles(bbox: BBox2d, zoom: number): AsyncGenerator<ITile>;
+    /**
+     * generate tile
+     * @param footprint footprint to cover with generated tiles
+     * @param zoom target tiles zoom level
+     */
+    generateTiles(footprint: Polygon | Feature<Polygon | MultiPolygon>, zoom: number): AsyncGenerator<ITile>;
+    private generateRanges;
+    /**
+     * generate tile
+     * @param tile tile to get all intersecting tiles from
+     * @param targetZoom target tiles zoom level
+     * @param intersectionTarget original zoom level and footprint to intersect
+     * @param intersectionFunction the intersection function to be called
+     */
+    private optimizeHash;
+    private generateSubTiles;
+    private readonly tileFootprintIntersection;
+    private isBbox;
+}
 //# sourceMappingURL=tileRanger.d.ts.map