@pirireis/webglobeplugins 0.9.11 → 0.9.12

package/rangerings/plugin.js

@@ -30,25 +30,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Z_ALPHA_MODE = exports.RangeRings = void 0;
-var circle_accurate_flat_1 = require("../programs/line-on-globe/circle-accurate-flat");
-var circle_accurate_3d_1 = require("../programs/line-on-globe/circle-accurate-3d");
-var lines_color_instanced_flat_1 = require("../programs/line-on-globe/lines-color-instanced-flat");
-var account_1 = require("../util/account");
-var get_1 = require("../util/check/get");
-var data_filler_1 = require("../util/jshelpers/data-filler");
-var ring_account_1 = require("./ring-account");
-var degree_padding_around_circle_3d_1 = require("../programs/line-on-globe/degree-padding-around-circle-3d");
-var naive_accurate_flexible_1 = require("../programs/line-on-globe/naive-accurate-flexible");
-var rangeringangletext_1 = __importDefault(require("./rangeringangletext"));
-var util_1 = require("../programs/line-on-globe/util");
+const circle_accurate_flat_1 = require("../programs/line-on-globe/circle-accurate-flat");
+const circle_accurate_3d_1 = require("../programs/line-on-globe/circle-accurate-3d");
+const lines_color_instanced_flat_1 = require("../programs/line-on-globe/lines-color-instanced-flat");
+const account_1 = require("../util/account");
+const get_1 = require("../util/check/get");
+const data_filler_1 = require("../util/jshelpers/data-filler");
+const ring_account_1 = require("./ring-account");
+const degree_padding_around_circle_3d_1 = require("../programs/line-on-globe/degree-padding-around-circle-3d");
+const naive_accurate_flexible_1 = require("../programs/line-on-globe/naive-accurate-flexible");
+const rangeringangletext_1 = __importDefault(require("./rangeringangletext"));
+const util_1 = require("../programs/line-on-globe/util");
 Object.defineProperty(exports, "Z_ALPHA_MODE", { enumerable: true, get: function () { return util_1.Z_ALPHA_MODE; } });
-var enum_1 = require("./enum");
-var typecheck_1 = require("../util/check/typecheck");
-var geometry_1 = require("../util/geometry");
-var CIRCLE_FLAT_EDGE_COUNT = 362; // 360 + 2 for closing the circle and a cutting point
-var coordOnSphere = function (long, lat, globe, altitude) {
-    if (altitude === void 0) { altitude = 0; }
-    var coord = globe.api_GetCartesian3DPoint(long, lat, 0, 0);
+const enum_1 = require("./enum");
+const typecheck_1 = require("../util/check/typecheck");
+const geometry_1 = require("../util/geometry");
+const CIRCLE_FLAT_EDGE_COUNT = 362; // 360 + 2 for closing the circle and a cutting point
+const coordOnSphere = (long, lat, globe, altitude = 0) => {
+    const coord = globe.api_GetCartesian3DPoint(long, lat, 0, 0);
     return (0, geometry_1.normalize)(coord, 6378.137 + altitude);
 };
 /**
@@ -74,10 +73,8 @@ var coordOnSphere = function (long, lat, globe, altitude) {
  * @property {number} rgba
  * @property {Array<RangeRing>} rings
  */
-var RangeRings = /** @class */ (function () {
-    function RangeRings(id, _a, _b) {
-        var _c = _a === void 0 ? {} : _a, _d = _c.oneDegreePadding, oneDegreePadding = _d === void 0 ? true : _d, _e = _c.showNumbers, showNumbers = _e === void 0 ? true : _e, _f = _c.numbersStyle, numbersStyle = _f === void 0 ? null : _f, _g = _c.opacity, opacity = _g === void 0 ? 1 : _g, _h = _c.zAlphaOnDegreePadding, zAlphaOnDegreePadding = _h === void 0 ? util_1.Z_ALPHA_MODE.ON : _h;
-        var _j = _b === void 0 ? {} : _b, _k = _j.textDataPreAdaptor, textDataPreAdaptor = _k === void 0 ? null : _k, _l = _j.textWritersMap, textWritersMap = _l === void 0 ? new Map() : _l;
+class RangeRings {
+    constructor(id, { oneDegreePadding = true, showNumbers = true, numbersStyle = null, opacity = 1, zAlphaOnDegreePadding = util_1.Z_ALPHA_MODE.ON } = {}, { textDataPreAdaptor = null, textWritersMap = new Map() } = {}) {
         this.id = id;
         this._oneDegreePadding = oneDegreePadding;
         this._zAlphaOnDegreePadding = zAlphaOnDegreePadding;
@@ -87,44 +84,36 @@ var RangeRings = /** @class */ (function () {
         this._ringAccount = new ring_account_1.RingAccount();
         this._textWritersMap = textWritersMap;
         this._textDataPreAdaptor = textDataPreAdaptor;
-        this._textWritersMap.forEach(function (textWriter) { return textWriter.setKeyAdaptor(function (item) { return item.__identity__; }); });
+        this._textWritersMap.forEach((textWriter) => textWriter.setKeyAdaptor((item) => item.__identity__));
     }
     // USER API
     /**
      * @method updateCentersCoordinate @param { Array < { centerID, long,lat } >} items
     */
-    RangeRings.prototype.updateCentersCoordinate = function (items, _a) {
+    updateCentersCoordinate(items, { textWriterIDs = [] } = {}) {
         // Algorithm
         /**
          * 1. ask centerRingAccount for existing rings COORDINATE RELATED KEYS
          * 2. update centers
          * 3. update buffer orchestators
          */
-        var _b;
-        var _c = _a === void 0 ? {} : _a, _d = _c.textWriterIDs, textWriterIDs = _d === void 0 ? [] : _d;
         this._ringAccount.updateCentersCoordinate(items);
-        var _e = this, globe = _e.globe, bufferOrchestrator = _e.bufferOrchestrator, bufferManagersCompMap = _e.bufferManagersCompMap, paddingBufferOrchestrator = _e.paddingBufferOrchestrator, bufferManagersCompMapPadding = _e.bufferManagersCompMapPadding;
-        for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
-            var centerID = items_1[_i].centerID;
-            var datas = this.__reconstructCentralRings(centerID);
+        const { globe, bufferOrchestrator, bufferManagersCompMap, paddingBufferOrchestrator, bufferManagersCompMapPadding } = this;
+        for (const { centerID } of items) {
+            const datas = this.__reconstructCentralRings(centerID);
             bufferOrchestrator.updateBulk(datas, bufferManagersCompMap, ["centerCoords3d", "centerCoords2dflat", "targetCoords3d", "centerCoords2dflatForPadding"]);
-            var paddingDatas = this.__reconstructCentralRingsBigPaddings(centerID);
+            const paddingDatas = this.__reconstructCentralRingsBigPaddings(centerID);
             paddingBufferOrchestrator.updateBulk(paddingDatas, bufferManagersCompMapPadding, ["circlePoint2d", "paddingPoint2d", "circlePoint3d", "paddingPoint3d"]);
         }
-        (_b = this.paddingTextPlugin) === null || _b === void 0 ? void 0 : _b.updateCentersXY(items);
-        this.__contextTextWriterUpdate(items.map(function (_a) {
-            var centerID = _a.centerID;
-            return centerID;
-        }), textWriterIDs);
+        this.paddingTextPlugin?.updateCentersXY(items);
+        this.__contextTextWriterUpdate(items.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
-    };
+    }
     /**
      * @method insertBulk
      * @param { Array < RangeRingsItem> } items
     */
-    RangeRings.prototype.insertBulk = function (items, _a) {
-        var _b;
-        var _c = _a === void 0 ? {} : _a, _d = _c.textWriterIDs, textWriterIDs = _d === void 0 ? [] : _d;
+    insertBulk(items, { textWriterIDs = [] } = {}) {
         // Algorithm
         /**
          * 1 ask centerRingAccount for existing rings
@@ -132,38 +121,32 @@ var RangeRings = /** @class */ (function () {
          * 3. insert new centerRings to centerRingAccount
          * 4. insert new keys with buffer orchestators
          */
-        var _e = this, globe = _e.globe, _ringAccount = _e._ringAccount, bufferOrchestrator = _e.bufferOrchestrator, bufferManagersCompMap = _e.bufferManagersCompMap, paddingBufferOrchestrator = _e.paddingBufferOrchestrator, bufferManagersCompMapPadding = _e.bufferManagersCompMapPadding;
-        for (var _i = 0, items_2 = items; _i < items_2.length; _i++) {
-            var item = items_2[_i];
-            var existingKeys = _ringAccount.ringKeys(item.centerID);
+        const { globe, _ringAccount, bufferOrchestrator, bufferManagersCompMap, paddingBufferOrchestrator, bufferManagersCompMapPadding } = this;
+        for (const item of items) {
+            const existingKeys = _ringAccount.ringKeys(item.centerID);
             if (existingKeys.length) {
                 bufferOrchestrator.deleteBulk(existingKeys, bufferManagersCompMap);
             }
-            var paddingKeys = _ringAccount.ringBigPaddingKeys(item.centerID);
+            const paddingKeys = _ringAccount.ringBigPaddingKeys(item.centerID);
             if (paddingKeys.length) {
                 paddingBufferOrchestrator.deleteBulk(paddingKeys, bufferManagersCompMapPadding);
             }
         }
-        for (var _f = 0, items_3 = items; _f < items_3.length; _f++) {
-            var item = items_3[_f];
+        for (const item of items) {
             _ringAccount.insertCenter(item);
-            var datas = this.__reconstructCentralRings(item.centerID);
+            const datas = this.__reconstructCentralRings(item.centerID);
             bufferOrchestrator.insertBulk(datas, bufferManagersCompMap);
-            var paddingDatas = this.__reconstructCentralRingsBigPaddings(item.centerID);
+            const paddingDatas = this.__reconstructCentralRingsBigPaddings(item.centerID);
             paddingBufferOrchestrator.insertBulk(paddingDatas, bufferManagersCompMapPadding);
         }
-        (_b = this.paddingTextPlugin) === null || _b === void 0 ? void 0 : _b.insertBulk(items);
-        this.__contextTextWriterUpdate(items.map(function (_a) {
-            var centerID = _a.centerID;
-            return centerID;
-        }), textWriterIDs);
+        this.paddingTextPlugin?.insertBulk(items);
+        this.__contextTextWriterUpdate(items.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
-    };
+    }
     /**
      * @method updateCentersColor @param { Array < { centerID, rgba: [4 numbers] } >} centerColors
     */
-    RangeRings.prototype.updateCentersColor = function (centerColors, _a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.textWriterIDs, textWriterIDs = _c === void 0 ? [] : _c;
+    updateCentersColor(centerColors, { textWriterIDs = [] } = {}) {
         // Algorithm
         /**
          * 1. ask centerRingAccount for existing rings COLOR KEYS
@@ -171,27 +154,21 @@ var RangeRings = /** @class */ (function () {
          * 3. update buffer orchestators
          */
         this._ringAccount.updateCentersColor(centerColors);
-        var _d = this, globe = _d.globe, bufferOrchestrator = _d.bufferOrchestrator, bufferManagersCompMap = _d.bufferManagersCompMap, paddingBufferOrchestrator = _d.paddingBufferOrchestrator, bufferManagersCompMapPadding = _d.bufferManagersCompMapPadding;
-        for (var _i = 0, centerColors_1 = centerColors; _i < centerColors_1.length; _i++) {
-            var centerID = centerColors_1[_i].centerID;
-            var datas = this.__reconstructCentralProperties(centerID);
+        const { globe, bufferOrchestrator, bufferManagersCompMap, paddingBufferOrchestrator, bufferManagersCompMapPadding } = this;
+        for (const { centerID } of centerColors) {
+            const datas = this.__reconstructCentralProperties(centerID);
             bufferOrchestrator.updateBulk(datas, bufferManagersCompMap, ["rgba", "rgbaMercator"]);
-            var paddingDatas = this.__reconstructCentralPaddingProperties(centerID);
+            const paddingDatas = this.__reconstructCentralPaddingProperties(centerID);
             paddingBufferOrchestrator.updateBulk(paddingDatas, bufferManagersCompMapPadding, ["rgba"]);
         }
-        this.__contextTextWriterUpdate(centerColors.map(function (_a) {
-            var centerID = _a.centerID;
-            return centerID;
-        }), textWriterIDs);
+        this.__contextTextWriterUpdate(centerColors.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
-    };
+    }
     /**
      *
      * @method updateCentersHide @param { Array < { centerID, hide, textHide } >} centerHides
     */
-    RangeRings.prototype.updateCentersHide = function (centerHides, _a) {
-        var _b;
-        var _c = _a === void 0 ? {} : _a, _d = _c.textWriterIDs, textWriterIDs = _d === void 0 ? [] : _d;
+    updateCentersHide(centerHides, { textWriterIDs = [] } = {}) {
         // Algorithm
         /**
          * Simple
@@ -200,21 +177,17 @@ var RangeRings = /** @class */ (function () {
          * 3. update color buffer
          * */
         this._ringAccount.updateCentersHide(centerHides);
-        var _e = this, globe = _e.globe, bufferOrchestrator = _e.bufferOrchestrator, bufferManagersCompMap = _e.bufferManagersCompMap, paddingBufferOrchestrator = _e.paddingBufferOrchestrator, bufferManagersCompMapPadding = _e.bufferManagersCompMapPadding;
-        for (var _i = 0, centerHides_1 = centerHides; _i < centerHides_1.length; _i++) {
-            var centerID = centerHides_1[_i].centerID;
-            var datas = this.__reconstructCentralProperties(centerID);
+        const { globe, bufferOrchestrator, bufferManagersCompMap, paddingBufferOrchestrator, bufferManagersCompMapPadding } = this;
+        for (const { centerID } of centerHides) {
+            const datas = this.__reconstructCentralProperties(centerID);
             bufferOrchestrator.updateBulk(datas, bufferManagersCompMap, ["rgba", "rgbaMercator"]);
-            var paddingDatas0 = this.__reconstructCentralRings(centerID);
+            const paddingDatas0 = this.__reconstructCentralRings(centerID);
             bufferOrchestrator.updateBulk(paddingDatas0, bufferManagersCompMap, ["radius3dsmall", "centerCoords2dflatForPadding"]);
-            var paddingDatas = this.__reconstructCentralPaddingProperties(centerID);
+            const paddingDatas = this.__reconstructCentralPaddingProperties(centerID);
             paddingBufferOrchestrator.updateBulk(paddingDatas, bufferManagersCompMapPadding, ["rgba"]);
         }
-        (_b = this.paddingTextPlugin) === null || _b === void 0 ? void 0 : _b.updateCentersHide(centerHides);
-        this.__contextTextWriterUpdate(centerHides.map(function (_a) {
-            var centerID = _a.centerID;
-            return centerID;
-        }), textWriterIDs);
+        this.paddingTextPlugin?.updateCentersHide(centerHides);
+        this.__contextTextWriterUpdate(centerHides.map(({ centerID }) => centerID), textWriterIDs);
         globe.DrawRender();
         /**
          * Complicated
@@ -222,195 +195,181 @@ var RangeRings = /** @class */ (function () {
          * 2. delete from buffer orchestators
          * 3. mark centers as hidden
          */
-    };
+    }
     /**
      * @param {Array<string>} textWriterIDs textWritersMap keys to be used for writing text.
      * @param {Array<string>} itemKeys if empty, all texts will be updated. Use  {@link ringKeyMethod} method to get keys
      */
-    RangeRings.prototype.updateText = function (textWriterIDs, itemKeys) {
-        var _this = this;
-        if (textWriterIDs === void 0) { textWriterIDs = []; }
-        if (itemKeys === void 0) { itemKeys = null; }
-        var textWritersMap = textWriterGetOrThrow(this._textWritersMap, textWriterIDs);
+    updateText(textWriterIDs = [], itemKeys = null) {
+        const textWritersMap = textWriterGetOrThrow(this._textWritersMap, textWriterIDs);
         if (itemKeys === null) {
             this._ringAccount.updateAllText(textWritersMap, this._textDataPreAdaptor);
             this.globe.DrawRender();
         }
         else {
-            itemKeys.forEach(function (key) {
-                var item = _this._ringAccount.getCenter(key);
+            itemKeys.forEach((key) => {
+                const item = this._ringAccount.getCenter(key);
                 if (item === undefined)
                     throw new Error("Center not found");
-                var textData = _this._textDataPreAdaptor(item);
-                textWritersMap.forEach(function (textWriter) { return textWriter.insertText(textData); });
+                const textData = this._textDataPreAdaptor(item);
+                textWritersMap.forEach((textWriter) => textWriter.insertText(textData));
             });
         }
         this.globe.DrawRender();
-    };
+    }
     /**
      * @method removeCenters @param { Array < { centerID } >} centerIDs
     */
-    RangeRings.prototype.removeCenters = function (centerIDs) {
-        var _a;
-        var _b = this, globe = _b.globe, bufferOrchestrator = _b.bufferOrchestrator, bufferManagersCompMap = _b.bufferManagersCompMap, paddingBufferOrchestrator = _b.paddingBufferOrchestrator, bufferManagersCompMapPadding = _b.bufferManagersCompMapPadding, _ringAccount = _b._ringAccount;
-        var _loop_1 = function (centerID) {
-            var existingKeys = _ringAccount.ringKeys(centerID);
+    removeCenters(centerIDs) {
+        const { globe, bufferOrchestrator, bufferManagersCompMap, paddingBufferOrchestrator, bufferManagersCompMapPadding, _ringAccount } = this;
+        for (const centerID of centerIDs) {
+            const existingKeys = _ringAccount.ringKeys(centerID);
             if (existingKeys.length) {
                 bufferOrchestrator.deleteBulk(existingKeys, bufferManagersCompMap);
-                this_1._textWritersMap.forEach(function (textWriter) { return textWriter.deleteTextBulk(existingKeys); });
+                this._textWritersMap.forEach((textWriter) => textWriter.deleteTextBulk(existingKeys));
             }
-        };
-        var this_1 = this;
-        for (var _i = 0, centerIDs_1 = centerIDs; _i < centerIDs_1.length; _i++) {
-            var centerID = centerIDs_1[_i];
-            _loop_1(centerID);
         }
-        for (var _c = 0, centerIDs_2 = centerIDs; _c < centerIDs_2.length; _c++) {
-            var centerID = centerIDs_2[_c];
-            var paddingKeys = _ringAccount.ringBigPaddingKeys(centerID);
+        for (const centerID of centerIDs) {
+            const paddingKeys = _ringAccount.ringBigPaddingKeys(centerID);
             if (paddingKeys.length) {
                 paddingBufferOrchestrator.deleteBulk(paddingKeys, bufferManagersCompMapPadding);
             }
         }
-        (_a = this.paddingTextPlugin) === null || _a === void 0 ? void 0 : _a.removeCenters(centerIDs);
+        this.paddingTextPlugin?.removeCenters(centerIDs);
         this._ringAccount.removeCenters(centerIDs);
         globe.DrawRender();
-    };
+    }
     /**
      * @method setOpacity @param { number } opacity
     */
-    RangeRings.prototype.setOpacity = function (opacity) {
-        var _a;
+    setOpacity(opacity) {
         (0, typecheck_1.opacityCheck)(opacity);
         this._opacity = opacity;
-        (_a = this.paddingTextPlugin) === null || _a === void 0 ? void 0 : _a.setOpacity(opacity);
-        this._textWritersMap.forEach(function (writer) { return writer.setOpacity(opacity); });
+        this.paddingTextPlugin?.setOpacity(opacity);
+        this._textWritersMap.forEach((writer) => writer.setOpacity(opacity));
         this.globe.DrawRender();
-    };
+    }
     /**
      * @method setOneDegreePaddingOn //  performance consuming, might be removed
     */
-    RangeRings.prototype.setOneDegreePaddingOn = function (isOneDegreePaddingOn) {
+    setOneDegreePaddingOn(isOneDegreePaddingOn) {
         if (typeof isOneDegreePaddingOn !== "boolean")
             throw new Error("Invalid value for one degree padding");
         if (this._oneDegreePadding === isOneDegreePaddingOn)
             return;
         this._oneDegreePadding = isOneDegreePaddingOn;
         this.globe.DrawRender();
-    };
-    RangeRings.prototype.setZAlphaOnDegreePadding = function (zAlphaOnDegreePadding) {
+    }
+    setZAlphaOnDegreePadding(zAlphaOnDegreePadding) {
         if (zAlphaOnDegreePadding !== 0 && zAlphaOnDegreePadding !== 1)
             throw new Error("Invalid value for zAlphaOnDegreePadding");
         if (this._zAlphaOnDegreePadding === zAlphaOnDegreePadding)
             return;
         this._zAlphaOnDegreePadding = zAlphaOnDegreePadding;
         this.globe.DrawRender();
-    };
+    }
     // PRIVATE METHODS
-    RangeRings.prototype._initPrograms = function () {
-        var globe = this.globe;
+    _initPrograms() {
+        const { globe } = this;
         this._circleProgram2D = circle_accurate_flat_1.CircleCache.get(globe);
         this._circleProgram3D = circle_accurate_3d_1.CircleCache.get(globe);
         this._padding2dProgram = lines_color_instanced_flat_1.LinesColorInstancedFlatCache.get(globe);
         this._padding3dProgram = degree_padding_around_circle_3d_1.CirclePadding3DCache.get(globe);
         this._lineOnGlobe_bigPadding = naive_accurate_flexible_1.LineOnGlobeCache.get(globe);
-    };
-    RangeRings.prototype._initBufferManagers = function () {
-        var _a, _b, _c, _d;
-        var _this = this;
-        var gl = this.gl;
-        var initialCapacity = 10;
-        var bufferType = "DYNAMIC_DRAW";
+    }
+    _initBufferManagers() {
+        const { gl } = this;
+        const initialCapacity = 10;
+        const bufferType = "DYNAMIC_DRAW";
         // circle2d, circle3d, 1 degree paddings,
         this.bufferOrchestrator = new account_1.BufferOrchestrator({ capacity: initialCapacity });
         this.bufferManagersCompMap = new Map([
             // circle 3D
             ["centerCoords3d", {
-                    'bufferManager': new account_1.BufferManager(gl, 3, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return new Float32Array(item.centerCoords3d); },
+                    'bufferManager': new account_1.BufferManager(gl, 3, { bufferType, initialCapacity }),
+                    'adaptor': (item) => new Float32Array(item.centerCoords3d),
                 }],
             ["targetCoords3d", {
-                    'bufferManager': new account_1.BufferManager(gl, 3, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return new Float32Array(item.targetCoords3d); },
+                    'bufferManager': new account_1.BufferManager(gl, 3, { bufferType, initialCapacity }),
+                    'adaptor': (item) => new Float32Array(item.targetCoords3d),
                 }],
             ["rgba", {
-                    'bufferManager': new account_1.BufferManager(gl, 4, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return new Float32Array(item.hide === enum_1.ENUM_HIDE.HIDE ? [0, 0, 0, 0] : item.rgba); }
+                    'bufferManager': new account_1.BufferManager(gl, 4, { bufferType, initialCapacity }),
+                    'adaptor': (item) => new Float32Array(item.hide === enum_1.ENUM_HIDE.HIDE ? [0, 0, 0, 0] : item.rgba)
                 }],
             ["radius3d", {
-                    'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return new Float32Array([item.radius]); }
+                    'bufferManager': new account_1.BufferManager(gl, 1, { bufferType, initialCapacity }),
+                    'adaptor': (item) => new Float32Array([item.radius])
                 }],
             ["radius3dsmall", {
-                    'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) {
+                    'bufferManager': new account_1.BufferManager(gl, 1, { bufferType, initialCapacity }),
+                    'adaptor': (item) => {
                         if (item.hide === enum_1.ENUM_HIDE.HIDE_1_DEGREE_PADDINGS)
                             return new Float32Array([item.radius]);
                         return new Float32Array([item.radius - item.padding / 3]);
                     }
                 }],
             ["circleDashAngle", {
-                    'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return new Float32Array([1]); },
+                    'bufferManager': new account_1.BufferManager(gl, 1, { bufferType, initialCapacity }),
+                    'adaptor': (item) => new Float32Array([1]),
                 }],
             ["dashOpacity", {
-                    'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return new Float32Array([1]); },
+                    'bufferManager': new account_1.BufferManager(gl, 1, { bufferType, initialCapacity }),
+                    'adaptor': (item) => new Float32Array([1]),
                 }],
             // circle 2D 
             ["centerCoords2dflatForPadding", {
-                    'bufferManager': new account_1.BufferManager(gl, CIRCLE_FLAT_EDGE_COUNT * 2, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return item.centerCoords2dflatForPadding; },
+                    'bufferManager': new account_1.BufferManager(gl, CIRCLE_FLAT_EDGE_COUNT * 2, { bufferType, initialCapacity }),
+                    'adaptor': (item) => item.centerCoords2dflatForPadding,
                 }],
             ["centerCoords2dflat", {
-                    'bufferManager': new account_1.BufferManager(gl, CIRCLE_FLAT_EDGE_COUNT * 2, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return item.centerCoords2dflat; },
+                    'bufferManager': new account_1.BufferManager(gl, CIRCLE_FLAT_EDGE_COUNT * 2, { bufferType, initialCapacity }),
+                    'adaptor': (item) => item.centerCoords2dflat,
                 }],
             ["rgbaMercator", {
-                    'bufferManager': new account_1.BufferManager(gl, 4 * CIRCLE_FLAT_EDGE_COUNT, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return data_filler_1.populateFloat32Array.fillWithListData(CIRCLE_FLAT_EDGE_COUNT, item.hide === enum_1.ENUM_HIDE.HIDE ? [0, 0, 0, 0] : item.rgba); },
+                    'bufferManager': new account_1.BufferManager(gl, 4 * CIRCLE_FLAT_EDGE_COUNT, { bufferType, initialCapacity }),
+                    'adaptor': (item) => data_filler_1.populateFloat32Array.fillWithListData(CIRCLE_FLAT_EDGE_COUNT, item.hide === enum_1.ENUM_HIDE.HIDE ? [0, 0, 0, 0] : item.rgba),
                 }],
             ["circleDashAngleMercator", {
-                    'bufferManager': new account_1.BufferManager(gl, CIRCLE_FLAT_EDGE_COUNT, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return data_filler_1.populateFloat32Array.fillFloat32Array(CIRCLE_FLAT_EDGE_COUNT, 1); },
+                    'bufferManager': new account_1.BufferManager(gl, CIRCLE_FLAT_EDGE_COUNT, { bufferType, initialCapacity }),
+                    'adaptor': (item) => data_filler_1.populateFloat32Array.fillFloat32Array(CIRCLE_FLAT_EDGE_COUNT, 1),
                 }],
             ["dashOpacityMercator", {
-                    'bufferManager': new account_1.BufferManager(gl, CIRCLE_FLAT_EDGE_COUNT, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return data_filler_1.populateFloat32Array.fillFloat32Array(CIRCLE_FLAT_EDGE_COUNT, 1); },
+                    'bufferManager': new account_1.BufferManager(gl, CIRCLE_FLAT_EDGE_COUNT, { bufferType, initialCapacity }),
+                    'adaptor': (item) => data_filler_1.populateFloat32Array.fillFloat32Array(CIRCLE_FLAT_EDGE_COUNT, 1),
                 }],
         ]);
-        var obj = function (bufferManagerComp, divisor) {
-            if (divisor === void 0) { divisor = 1; }
+        const obj = function (bufferManagerComp, divisor = 1) {
             if (bufferManagerComp === null)
                 return null;
-            return { 'buffer': bufferManagerComp.bufferManager.buffer, 'stride': 0, 'offset': 0, divisor: divisor };
+            return { 'buffer': bufferManagerComp.bufferManager.buffer, 'stride': 0, 'offset': 0, divisor };
         };
-        this._circle2DVao = (_a = this._circleProgram2D).createVAO.apply(_a, ["centerCoords2dflat", "rgbaMercator", "circleDashAngleMercator", "dashOpacityMercator"].map(function (key) { return obj(_this.bufferManagersCompMap.get(key)); }));
-        this._circle3DVao = (_b = this._circleProgram3D).createVAO.apply(_b, ["centerCoords3d", "targetCoords3d", "rgba", "circleDashAngle", "dashOpacity"].map(function (key) { return obj(_this.bufferManagersCompMap.get(key)); }));
+        this._circle2DVao = this._circleProgram2D.createVAO(...["centerCoords2dflat", "rgbaMercator", "circleDashAngleMercator", "dashOpacityMercator"].map(key => obj(this.bufferManagersCompMap.get(key))));
+        this._circle3DVao = this._circleProgram3D.createVAO(...["centerCoords3d", "targetCoords3d", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
         this._oneDegree2DPaddingVao = this._padding2dProgram.createVAO({ buffer: this.bufferManagersCompMap.get("centerCoords2dflat").bufferManager.buffer, size: 2, stride: 0, offset: 0 }, { buffer: this.bufferManagersCompMap.get("centerCoords2dflatForPadding").bufferManager.buffer, size: 2, stride: 0, offset: 0 }, { buffer: this.bufferManagersCompMap.get("rgbaMercator").bufferManager.buffer, size: 4, stride: 0, offset: 0 });
         // PADDING 
         // this one needs glue to assosiate rings and their big paddings since the count for center is not fixed
         this.paddingBufferOrchestrator = new account_1.BufferOrchestrator({ capacity: initialCapacity });
         this.bufferManagersCompMapPadding = new Map([
             ["circlePoint2d", {
-                    'bufferManager': new account_1.BufferManager(gl, 2, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return item.circlePoint2d; },
+                    'bufferManager': new account_1.BufferManager(gl, 2, { bufferType, initialCapacity }),
+                    'adaptor': (item) => item.circlePoint2d,
                 }],
             ["paddingPoint2d", {
-                    'bufferManager': new account_1.BufferManager(gl, 2, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return item.paddingPoint2d; },
+                    'bufferManager': new account_1.BufferManager(gl, 2, { bufferType, initialCapacity }),
+                    'adaptor': (item) => item.paddingPoint2d,
                 }],
             ["circlePoint3d", {
-                    'bufferManager': new account_1.BufferManager(gl, 3, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return item.circlePoint3d; }
+                    'bufferManager': new account_1.BufferManager(gl, 3, { bufferType, initialCapacity }),
+                    'adaptor': (item) => item.circlePoint3d
                 }],
             ["paddingPoint3d", {
-                    'bufferManager': new account_1.BufferManager(gl, 3, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return item.paddingPoint3d; }
+                    'bufferManager': new account_1.BufferManager(gl, 3, { bufferType, initialCapacity }),
+                    'adaptor': (item) => item.paddingPoint3d
                 }],
             ["rgba", {
-                    'bufferManager': new account_1.BufferManager(gl, 4, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                    'adaptor': function (item) { return new Float32Array(item.rgba); }
+                    'bufferManager': new account_1.BufferManager(gl, 4, { bufferType, initialCapacity }),
+                    'adaptor': (item) => new Float32Array(item.rgba)
                 }],
             // ["dashOpacity", {
             //     'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
@@ -421,26 +380,24 @@ var RangeRings = /** @class */ (function () {
             //     'adaptor': (item) => new Float32Array([1]),
             // }],
         ]);
-        this._bigPadding3dFlatVAO = (_c = this._lineOnGlobe_bigPadding).createVAO.apply(_c, ["circlePoint2d", "circlePoint3d", "paddingPoint2d", "paddingPoint3d", null, null, "rgba",].map(function (key) {
-            return (key === null) ? null : obj(_this.bufferManagersCompMapPadding.get(key));
-        }));
-        this._padding3dOneDegreeVao = (_d = this._padding3dProgram).createVAO.apply(_d, ["centerCoords3d", "radius3d", "radius3dsmall", "rgba"].map(function (key) { return obj(_this.bufferManagersCompMap.get(key)); }));
-    };
+        this._bigPadding3dFlatVAO = this._lineOnGlobe_bigPadding.createVAO(//"dashRatio", "dashOpacity"
+        ...["circlePoint2d", "circlePoint3d", "paddingPoint2d", "paddingPoint3d", null, null, "rgba",].map(key => (key === null) ? null : obj(this.bufferManagersCompMapPadding.get(key))));
+        this._padding3dOneDegreeVao = this._padding3dProgram.createVAO(...["centerCoords3d", "radius3d", "radius3dsmall", "rgba"].map(key => obj(this.bufferManagersCompMap.get(key))));
+    }
     // IMPLICIT METHODS
-    RangeRings.prototype.__reconstructCentralRingsBigPaddings = function (centerID) {
-        var globe = this.globe;
-        var centerItem = this._ringAccount.getCenter(centerID);
+    __reconstructCentralRingsBigPaddings(centerID) {
+        const { globe } = this;
+        const centerItem = this._ringAccount.getCenter(centerID);
         if (centerItem === undefined)
             throw new Error("Center not found");
-        var long = centerItem.long, lat = centerItem.lat, stepAngle = centerItem.stepAngle, rgba = centerItem.rgba, rings = centerItem.rings, _a = centerItem.hide, hide = _a === void 0 ? 0 : _a, _b = centerItem.textHide, textHide = _b === void 0 ? 0 : _b, _c = centerItem.altitude, centerAltitude = _c === void 0 ? 0 : _c;
-        var result = [];
-        var color = hide === 1 ? new Float32Array([0, 0, 0, 0]) : new Float32Array(rgba);
-        for (var _i = 0, rings_1 = rings; _i < rings_1.length; _i++) {
-            var _d = rings_1[_i], ringID = _d.ringID, radius = _d.radius, padding = _d.padding, _e = _d.altitude, altitude = _e === void 0 ? centerAltitude : _e;
-            var azimuthAngle = 0;
+        const { long, lat, stepAngle, rgba, rings, hide = 0, textHide = 0, altitude: centerAltitude = 0 } = centerItem;
+        const result = [];
+        const color = hide === 1 ? new Float32Array([0, 0, 0, 0]) : new Float32Array(rgba);
+        for (const { ringID, radius, padding, altitude = centerAltitude } of rings) {
+            let azimuthAngle = 0;
             while (azimuthAngle < 360) {
-                var circlePoint = globe.Math.FindPointByPolar(long, lat, radius, azimuthAngle); // long lat
-                var paddingPoint = globe.Math.FindPointByPolar(long, lat, radius - padding, azimuthAngle); // long lat
+                const circlePoint = globe.Math.FindPointByPolar(long, lat, radius, azimuthAngle); // long lat
+                const paddingPoint = globe.Math.FindPointByPolar(long, lat, radius - padding, azimuthAngle); // long lat
                 result.push({
                     key: (0, ring_account_1.ringBigPaddingKeyMethod)(centerID, ringID, azimuthAngle),
                     circlePoint2d: new Float32Array(globe.api_GetMercator2DPoint(circlePoint.long, circlePoint.lat)),
@@ -448,84 +405,81 @@ var RangeRings = /** @class */ (function () {
                     circlePoint3d: coordOnSphere(circlePoint.long, circlePoint.lat, globe, altitude / 1000),
                     paddingPoint3d: coordOnSphere(paddingPoint.long, paddingPoint.lat, globe, altitude / 1000),
                     rgba: color,
-                    hide: hide,
-                    textHide: textHide
+                    hide,
+                    textHide
                 });
                 azimuthAngle += stepAngle;
             }
         }
         return result;
-    };
-    RangeRings.prototype.__reconstructCentralRings = function (centerID) {
-        var globe = this.globe;
-        var centerItem = this._ringAccount.getCenter(centerID);
+    }
+    __reconstructCentralRings(centerID) {
+        const { globe } = this;
+        const centerItem = this._ringAccount.getCenter(centerID);
         if (centerItem === undefined)
             throw new Error("Center not found");
-        var long = centerItem.long, lat = centerItem.lat, rgba = centerItem.rgba, rings = centerItem.rings, _a = centerItem.hide, hide = _a === void 0 ? 0 : _a, _b = centerItem.textHide, textHide = _b === void 0 ? 0 : _b, _c = centerItem.altitude, centralAltitude = _c === void 0 ? 0 : _c;
-        var centerCoords3d = coordOnSphere(long, lat, globe, centralAltitude / 1000);
-        var result = [];
-        for (var _i = 0, rings_2 = rings; _i < rings_2.length; _i++) {
-            var _d = rings_2[_i], ringID = _d.ringID, radius = _d.radius, padding = _d.padding, __identity__ = _d.__identity__, _e = _d.altitude, altitude = _e === void 0 ? centralAltitude : _e;
-            var key = __identity__;
-            var centerCoords2dflat = (0, circle_accurate_flat_1.centerCoords2dflatDataCreatorWithRadius)(globe, long, lat, radius, { edgeCount: CIRCLE_FLAT_EDGE_COUNT });
-            var radiusPadding = hide === enum_1.ENUM_HIDE.HIDE_1_DEGREE_PADDINGS ? radius : radius - padding / 3;
-            var targetPoint = globe.Math.FindPointByPolar(long, lat, radius, 0); // long lat
-            var targetCoords3d = coordOnSphere(targetPoint.long, targetPoint.lat, globe, altitude / 1000);
-            var centerCoords2dflatForPadding = (0, circle_accurate_flat_1.centerCoords2dflatDataCreatorWithRadius)(globe, long, lat, radiusPadding, { edgeCount: CIRCLE_FLAT_EDGE_COUNT });
+        const { long, lat, rgba, rings, hide = 0, textHide = 0, altitude: centralAltitude = 0 } = centerItem;
+        const centerCoords3d = coordOnSphere(long, lat, globe, centralAltitude / 1000);
+        const result = [];
+        for (const { ringID, radius, padding, __identity__, altitude = centralAltitude } of rings) {
+            const key = __identity__;
+            const centerCoords2dflat = (0, circle_accurate_flat_1.centerCoords2dflatDataCreatorWithRadius)(globe, long, lat, radius, { edgeCount: CIRCLE_FLAT_EDGE_COUNT });
+            const radiusPadding = hide === enum_1.ENUM_HIDE.HIDE_1_DEGREE_PADDINGS ? radius : radius - padding / 3;
+            const targetPoint = globe.Math.FindPointByPolar(long, lat, radius, 0); // long lat
+            const targetCoords3d = coordOnSphere(targetPoint.long, targetPoint.lat, globe, altitude / 1000);
+            const centerCoords2dflatForPadding = (0, circle_accurate_flat_1.centerCoords2dflatDataCreatorWithRadius)(globe, long, lat, radiusPadding, { edgeCount: CIRCLE_FLAT_EDGE_COUNT });
             result.push({
-                key: key,
-                centerCoords3d: centerCoords3d,
-                targetCoords3d: targetCoords3d,
-                centerCoords2dflat: centerCoords2dflat,
-                radius: radius,
-                padding: padding,
-                rgba: rgba,
-                centerCoords2dflatForPadding: centerCoords2dflatForPadding,
-                hide: hide,
-                textHide: textHide
+                key,
+                centerCoords3d,
+                targetCoords3d,
+                centerCoords2dflat,
+                radius,
+                padding,
+                rgba,
+                centerCoords2dflatForPadding,
+                hide,
+                textHide
             });
         }
         return result;
-    };
-    RangeRings.prototype.__reconstructCentralPaddingProperties = function (centerID) {
-        var centerItem = this._ringAccount.getCenter(centerID);
+    }
+    __reconstructCentralPaddingProperties(centerID) {
+        const centerItem = this._ringAccount.getCenter(centerID);
         if (centerItem === undefined)
             throw new Error("Center not found");
-        var stepAngle = centerItem.stepAngle, rgba = centerItem.rgba, rings = centerItem.rings, _a = centerItem.hide, hide = _a === void 0 ? 0 : _a, _b = centerItem.textHide, textHide = _b === void 0 ? 0 : _b;
-        var result = [];
-        for (var _i = 0, rings_3 = rings; _i < rings_3.length; _i++) {
-            var ringID = rings_3[_i].ringID;
-            var angle = 0;
+        const { stepAngle, rgba, rings, hide = 0, textHide = 0 } = centerItem;
+        const result = [];
+        for (const { ringID, } of rings) {
+            let angle = 0;
             while (angle < 360) {
                 result.push({
                     key: (0, ring_account_1.ringBigPaddingKeyMethod)(centerID, ringID, angle),
                     rgba: hide === 1 ? new Float32Array([0, 0, 0, 0]) : rgba,
-                    textHide: textHide
+                    textHide
                 });
                 angle += stepAngle;
             }
         }
         return result;
-    };
-    RangeRings.prototype.__reconstructCentralProperties = function (centerID) {
-        var centerItem = this._ringAccount.getCenter(centerID);
+    }
+    __reconstructCentralProperties(centerID) {
+        const centerItem = this._ringAccount.getCenter(centerID);
         if (centerItem === undefined)
             throw new Error("Center not found");
-        var rgba = centerItem.rgba, rings = centerItem.rings, _a = centerItem.hide, hide = _a === void 0 ? 0 : _a, _b = centerItem.textHide, textHide = _b === void 0 ? 0 : _b;
-        var result = [];
-        for (var _i = 0, rings_4 = rings; _i < rings_4.length; _i++) {
-            var _c = rings_4[_i], ringID = _c.ringID, __identity__ = _c.__identity__;
-            var key = __identity__;
+        const { rgba, rings, hide = 0, textHide = 0 } = centerItem;
+        const result = [];
+        for (const { ringID, __identity__ } of rings) {
+            const key = __identity__;
             result.push({
-                key: key,
+                key,
                 rgba: hide === enum_1.ENUM_HIDE.HIDE ? new Float32Array([0, 0, 0, 0]) : rgba,
-                textHide: textHide
+                textHide
             });
         }
         return result;
-    };
+    }
     // GLOBE API
-    RangeRings.prototype.init = function (globe, gl) {
+    init(globe, gl) {
         this.globe = globe;
         this.gl = gl;
         this._initPrograms();
@@ -534,11 +488,11 @@ var RangeRings = /** @class */ (function () {
             this.paddingTextPlugin = new rangeringangletext_1.default(globe, this.id + "text", { style: this._numbersStyle, opacity: this._opacity });
             delete this._numbersStyle;
         }
-    };
-    RangeRings.prototype.draw3D = function () {
-        var _a = this, globe = _a.globe, gl = _a.gl, _circleProgram2D = _a._circleProgram2D, _circleProgram3D = _a._circleProgram3D, _padding2dProgram = _a._padding2dProgram, _padding3dProgram = _a._padding3dProgram, _lineOnGlobe_bigPadding = _a._lineOnGlobe_bigPadding, _circle2DVao = _a._circle2DVao, _circle3DVao = _a._circle3DVao, _oneDegree2DPaddingVao = _a._oneDegree2DPaddingVao, _padding3dOneDegreeVao = _a._padding3dOneDegreeVao, _bigPadding3dFlatVAO = _a._bigPadding3dFlatVAO, bufferOrchestrator = _a.bufferOrchestrator, paddingBufferOrchestrator = _a.paddingBufferOrchestrator, _opacity = _a._opacity, _oneDegreePadding = _a._oneDegreePadding, _zAlphaOnDegreePadding = _a._zAlphaOnDegreePadding;
+    }
+    draw3D() {
+        const { globe, gl, _circleProgram2D, _circleProgram3D, _padding2dProgram, _padding3dProgram, _lineOnGlobe_bigPadding, _circle2DVao, _circle3DVao, _oneDegree2DPaddingVao, _padding3dOneDegreeVao, _bigPadding3dFlatVAO, bufferOrchestrator, paddingBufferOrchestrator, _opacity, _oneDegreePadding, _zAlphaOnDegreePadding } = this;
         gl.disable(gl.DEPTH_TEST);
-        var is3D = globe.api_GetCurrentGeometry() === 0;
+        const is3D = globe.api_GetCurrentGeometry() === 0;
         // const lod = globe.api_GetCurrentLOD();
         if (is3D) {
             _circleProgram3D.draw(_circle3DVao, bufferOrchestrator.length, _opacity);
@@ -551,24 +505,17 @@ var RangeRings = /** @class */ (function () {
             if (_oneDegreePadding)
                 _padding2dProgram.draw(_oneDegree2DPaddingVao, bufferOrchestrator.length * CIRCLE_FLAT_EDGE_COUNT, _opacity, _zAlphaOnDegreePadding);
         }
-        var drawOptions = { drawRange: { first: 0, count: paddingBufferOrchestrator.length } };
+        const drawOptions = { drawRange: { first: 0, count: paddingBufferOrchestrator.length } };
         _lineOnGlobe_bigPadding.draw(_bigPadding3dFlatVAO, drawOptions, _opacity);
-        this._textWritersMap.forEach(function (textWriter) { return textWriter.draw(); });
+        this._textWritersMap.forEach((textWriter) => textWriter.draw());
         gl.enable(gl.DEPTH_TEST);
-    };
-    RangeRings.prototype.free = function () {
-        var _a;
+    }
+    free() {
         if (this._isFreed)
             return;
-        var globe = this.globe;
-        this.bufferManagersCompMap.forEach(function (_a) {
-            var bufferManager = _a.bufferManager;
-            return bufferManager.free();
-        });
-        this.bufferManagersCompMapPadding.forEach(function (_a) {
-            var bufferManager = _a.bufferManager;
-            return bufferManager.free();
-        });
+        const { globe } = this;
+        this.bufferManagersCompMap.forEach(({ bufferManager }) => bufferManager.free());
+        this.bufferManagersCompMapPadding.forEach(({ bufferManager }) => bufferManager.free());
         // delete vaos
         this.gl.deleteVertexArray(this._circle2DVao);
         this.gl.deleteVertexArray(this._circle3DVao);
@@ -586,13 +533,11 @@ var RangeRings = /** @class */ (function () {
         this._padding2dProgram = null;
         this._padding3dProgram = null;
         this._lineOnGlobe_bigPadding = null;
-        (_a = this.paddingTextPlugin) === null || _a === void 0 ? void 0 : _a.free();
+        this.paddingTextPlugin?.free();
         this._isFreed = true;
-    };
-    RangeRings.prototype.__contextTextWriterUpdate = function (centerIDs, textWriterIDs) {
-        var _this = this;
-        if (textWriterIDs === void 0) { textWriterIDs = null; }
-        var textWriters = null;
+    }
+    __contextTextWriterUpdate(centerIDs, textWriterIDs = null) {
+        let textWriters = null;
         if (textWriterIDs === null) {
             textWriters = Array.from(this._textWritersMap.values());
         }
@@ -602,9 +547,8 @@ var RangeRings = /** @class */ (function () {
         else {
             textWriters = textWriterGetOrThrow(this._textWritersMap, textWriterIDs);
         }
-        centerIDs.forEach(function (centerID) { _this._ringAccount.textUpdate(centerID, textWriters, _this._textDataPreAdaptor); });
-    };
-    return RangeRings;
-}());
+        centerIDs.forEach((centerID) => { this._ringAccount.textUpdate(centerID, textWriters, this._textDataPreAdaptor); });
+    }
+}
 exports.RangeRings = RangeRings;
-var textWriterGetOrThrow = (0, get_1.mapGetOrThrow)("textWriterIDs is invalid");
+const textWriterGetOrThrow = (0, get_1.mapGetOrThrow)("textWriterIDs is invalid");