@pirireis/webglobeplugins 0.9.11 → 0.9.13

package/bearing-line/plugin.js

@@ -1,29 +1,15 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RINGPARTIAL_DRAW_MODE = void 0;
-var piece_of_pie_1 = require("../programs/rings/partial-ring/piece-of-pie");
-var naive_accurate_flexible_1 = require("../programs/line-on-globe/naive-accurate-flexible");
-var circle_accurate_3d_1 = require("../programs/line-on-globe/circle-accurate-3d");
-var circle_accurate_flat_1 = require("../programs/line-on-globe/circle-accurate-flat");
-var account_1 = require("../util/account");
-var get_1 = require("../util/check/get");
-var data_filler_1 = require("../util/jshelpers/data-filler");
-var context_text3_1 = require("../write-text/context-text3");
-var typecheck_1 = require("../util/check/typecheck");
-var geometry_1 = require("../util/geometry");
-var attribute_loader_1 = require("../util/gl-util/buffer/attribute-loader");
-exports.RINGPARTIAL_DRAW_MODE = Object.freeze({
+import { PieceOfPieProgramCache } from '../programs/rings/partial-ring/piece-of-pie';
+import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate-flexible';
+import { CircleCache as Circle3DCache } from '../programs/line-on-globe/circle-accurate-3d';
+import { CircleCache, EDGE_COUNT as flatCircleEdgeCount, centerCoords2dflatDataCreator } from '../programs/line-on-globe/circle-accurate-flat';
+import { BufferOrchestrator, BufferManager } from '../util/account';
+import { mapGetOrThrow } from "../util/check/get";
+import { populateFloat32Array } from "../util/jshelpers/data-filler";
+import { ContextTextWriter3 } from '../write-text/context-text3';
+import { constraintFloat, isBoolean } from '../util/check/typecheck';
+import { sphereCoord } from '../util/geometry';
+import { createBufferAndReadInfo } from '../util/gl-util/buffer/attribute-loader';
+export const RINGPARTIAL_DRAW_MODE = Object.freeze({
     LINE_STRIP: "LINE_STRIP",
     TRIANGLE_FAN: "TRIANGLE_FAN",
 });
@@ -44,30 +30,29 @@ exports.RINGPARTIAL_DRAW_MODE = Object.freeze({
      * @property {number} dashOpacity 0-1
      * @property {number} circleDashAngle 0-360
  */
-var textWriterGetOrThrow = (0, get_1.mapGetOrThrow)("BearingLine textContextInjection id does not exist in map");
-var radian = function (degree) { return degree * Math.PI / 180; };
-var integralSec = function (angle) {
+const textWriterGetOrThrow = mapGetOrThrow("BearingLine textContextInjection id does not exist in map");
+const radian = (degree) => degree * Math.PI / 180;
+const integralSec = (angle) => {
     return Math.log(Math.tan(angle / 2 + Math.PI / 4));
 };
-var calculateStartAngle = function (long, lat, endLong, endLat) {
-    var dLat = (integralSec(endLat) - integralSec(lat)); // Because lines are strectes toward poles.
-    var dLong = endLong - long;
-    var angle = -Math.atan2(dLat, dLong);
+const calculateStartAngle = (long, lat, endLong, endLat) => {
+    const dLat = (integralSec(endLat) - integralSec(lat)); // Because lines are strectes toward poles.
+    const dLong = endLong - long;
+    let angle = -Math.atan2(dLat, dLong);
     return angle;
 };
-var BearingLinePlugin = /** @class */ (function () {
+export default class BearingLinePlugin {
     /**
      * @param {*} id
      * @param {Map<[key, ContextTextWriter3]>} textWritersMap
      */
-    function BearingLinePlugin(id, _a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.opacity, opacity = _c === void 0 ? 1 : _c, _d = _b.textWritersMap, textWritersMap = _d === void 0 ? new Map() : _d, _e = _b.textDataPreAdaptor, textDataPreAdaptor = _e === void 0 ? function (x) { return x; } : _e, _f = _b.drawVRM, drawVRM = _f === void 0 ? true : _f, _g = _b.drawBearingLine, drawBearingLine = _g === void 0 ? true : _g, _h = _b.drawAngleRing, drawAngleRing = _h === void 0 ? true : _h, _j = _b.drawText, drawText = _j === void 0 ? true : _j, _k = _b.circleFlatEdgeCount, circleFlatEdgeCount = _k === void 0 ? circle_accurate_flat_1.EDGE_COUNT - 2 : _k;
+    constructor(id, { opacity = 1, textWritersMap = new Map(), textDataPreAdaptor = (x) => x, drawVRM = true, drawBearingLine = true, drawAngleRing = true, drawText = true, circleFlatEdgeCount = flatCircleEdgeCount - 2 } = {}) {
         this.id = id;
         this._opacity = opacity;
-        this.bufferOrchestrator = new account_1.BufferOrchestrator({ capacity: 10 });
+        this.bufferOrchestrator = new BufferOrchestrator({ capacity: 10 });
         this._checkTextContextWriterInjectionMap(textWritersMap);
         this._textWritersMap = textWritersMap;
-        this._textWritersMap.forEach(function (writer) { return writer.keyAdaptor = function (item) { return item.key; }; });
+        this._textWritersMap.forEach((writer) => writer.keyAdaptor = (item) => item.key);
         this.drawVRM = drawVRM;
         this.drawBearingLine = drawBearingLine;
         this.drawAngleRing = drawAngleRing;
@@ -76,105 +61,97 @@ var BearingLinePlugin = /** @class */ (function () {
         this._memoryForText = new Map();
         this.circleFlatEdgeCount = circleFlatEdgeCount + 2;
     }
-    BearingLinePlugin.prototype.setDoDrawVRM = function (bool) {
-        (0, typecheck_1.isBoolean)(bool);
+    setDoDrawVRM(bool) {
+        isBoolean(bool);
         if (bool === this.drawVRM)
             return;
         this.drawVRM = bool;
         this.globe.DrawRender();
-    };
-    BearingLinePlugin.prototype.setDoDrawText = function (bool) {
-        (0, typecheck_1.isBoolean)(bool);
+    }
+    setDoDrawText(bool) {
+        isBoolean(bool);
         if (bool === this.drawText)
             return;
         this.drawText = bool;
         this.globe.DrawRender();
-    };
-    BearingLinePlugin.prototype.setDoDrawText = function (bool) {
-        (0, typecheck_1.isBoolean)(bool);
+    }
+    setDoDrawText(bool) {
+        isBoolean(bool);
         if (bool === this.drawText)
             return;
         this.drawText = bool;
         this.globe.DrawRender();
-    };
-    BearingLinePlugin.prototype.setDoDrawAngleRing = function (bool) {
-        (0, typecheck_1.isBoolean)(bool);
+    }
+    setDoDrawAngleRing(bool) {
+        isBoolean(bool);
         if (bool === this.drawAngleRing)
             return;
         this.drawAngleRing = bool;
         this.globe.DrawRender();
-    };
-    BearingLinePlugin.prototype.setOpacity = function (opacity) {
-        (0, typecheck_1.constraintFloat)(opacity, 0, 1);
+    }
+    setOpacity(opacity) {
+        constraintFloat(opacity, 0, 1);
         this._opacity = opacity;
-        this._textWritersMap.forEach(function (writer) { return writer.setOpacity(opacity); });
+        this._textWritersMap.forEach((writer) => writer.setOpacity(opacity));
         this.globe.DrawRender();
-    };
+    }
     /**
 
      * @param {Array<BearingLineItem>} items
      * @param {Array<string>} textWriterIDs | textWritersMap keys to be used for writing text.
      */
-    BearingLinePlugin.prototype.insertBulk = function (items, _a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.textWriterIDs, textWriterIDs = _c === void 0 ? [] : _c;
-        var _d = this, globe = _d.globe, bufferOrchestrator = _d.bufferOrchestrator, bufferManagersCompMap = _d.bufferManagersCompMap; // angleTextContext, distanceTextContext,
-        var data = [];
-        for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
-            var item = items_1[_i];
+    insertBulk(items, { textWriterIDs = [] } = {}) {
+        const { globe, bufferOrchestrator, bufferManagersCompMap } = this; // angleTextContext, distanceTextContext,
+        const data = [];
+        for (let item of items) {
             data.push(this.__insertAdaptor(item));
         }
         bufferOrchestrator.insertBulk(data, bufferManagersCompMap);
         this.__insertTexts(items, textWriterIDs);
         globe.DrawRender();
-    };
+    }
     /**
      * @param {Array<string>} textWriterIDs | textWritersMap keys to be used for writing text.
      * @param {Array<string>} itemKeys | if empty, all texts will be updated.
      */
-    BearingLinePlugin.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._memoryForText.forEach(function (item) {
-                var _item = _this._textDataPreAdaptor(item);
-                textWritersMap.forEach(function (writer) { return writer.insertText(_item); });
+            this._memoryForText.forEach((item) => {
+                let _item = this._textDataPreAdaptor(item);
+                textWritersMap.forEach((writer) => writer.insertText(_item));
             });
         }
         else {
-            itemKeys.forEach(function (key) {
-                var item = _this._memoryForText.get(key);
+            itemKeys.forEach((key) => {
+                let item = this._memoryForText.get(key);
                 if (item === undefined)
                     return;
-                var _item = _this._textDataPreAdaptor(item);
-                textWritersMap.forEach(function (writer) { return writer.insertText(_item); });
+                let _item = this._textDataPreAdaptor(item);
+                textWritersMap.forEach((writer) => writer.insertText(_item));
             });
         }
         this.globe.DrawRender();
-    };
-    BearingLinePlugin.prototype.deleteBulk = function (keys) {
+    }
+    deleteBulk(keys) {
         this.bufferOrchestrator.deleteBulk(keys, this.bufferManagersCompMap);
-        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-            var key = keys_1[_i];
+        for (const key of keys) {
             this._memoryForText.delete(key);
         }
         this._deleteTexts(keys);
         this.globe.DrawRender();
-    };
-    BearingLinePlugin.prototype.defrag = function () {
+    }
+    defrag() {
         this.bufferOrchestrator.defrag(this.bufferManagersCompMap);
-    };
+    }
     /**
      * @param {Array<{key, long, lat, endLong, endLat, bearingAngle}>} items
      * @param {Array<string>} textWriterIDs | textWritersMap keys to be used for writing text.
      */
-    BearingLinePlugin.prototype.updateCoordinatesBulk = function (items, _a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.textWriterIDs, textWriterIDs = _c === void 0 ? [] : _c;
-        var _d = this, globe = _d.globe, bufferOrchestrator = _d.bufferOrchestrator, bufferManagersCompMap = _d.bufferManagersCompMap;
-        var data = [];
-        for (var _i = 0, items_2 = items; _i < items_2.length; _i++) {
-            var item = items_2[_i];
+    updateCoordinatesBulk(items, { textWriterIDs = [] } = {}) {
+        const { globe, bufferOrchestrator, bufferManagersCompMap, } = this;
+        const data = [];
+        for (let item of items) {
             data.push(this.__updateCoordsAdaptor(item));
         }
         this.__insertTexts(items, textWriterIDs);
@@ -182,7 +159,7 @@ var BearingLinePlugin = /** @class */ (function () {
             "startAngle2d", "tailAngle2d", "startAngle3d", "tailAngle3d", "bearingTargetCoords2d", "bearingTargetCoords3d", "centerCoords2dflat",
             "bigRadius", "radius"]);
         globe.DrawRender();
-    };
+    }
     /**
      *
      * @param {Array<BearingLineItem>} items some colums EXCEPT positional ones
@@ -191,218 +168,214 @@ var BearingLinePlugin = /** @class */ (function () {
      * Do NOT send empty data if property ID of this data is entered or NaN is loaded to the buffer, resulting in an unwanted behaviour.
      *{ textWriterIDs = []}
      */
-    BearingLinePlugin.prototype.updatePartial = function (items, propertyIDs, _a) {
-        if (propertyIDs === void 0) { propertyIDs = []; }
-        var _b = _a === void 0 ? {} : _a, _c = _b.textWriterIDs, textWriterIDs = _c === void 0 ? [] : _c;
+    updatePartial(items, propertyIDs = [], { textWriterIDs = [] } = {}) {
         if (propertyIDs.length === 0)
             console.warn("updatePartial is called with no target propertyIDs");
-        var fixedPropertyIDs = this.__fixPartialProperties(propertyIDs);
-        var _d = this, bufferOrchestrator = _d.bufferOrchestrator, bufferManagersCompMap = _d.bufferManagersCompMap;
+        const fixedPropertyIDs = this.__fixPartialProperties(propertyIDs);
+        const { bufferOrchestrator, bufferManagersCompMap } = this;
         bufferOrchestrator.updateBulk(items, bufferManagersCompMap, fixedPropertyIDs);
         // patch to update text opacity
         this.__insertTexts(items, textWriterIDs);
         this.globe.DrawRender();
-    };
+    }
     // Private methods
-    BearingLinePlugin.prototype._checkTextContextWriterInjectionMap = function (textContextWriterInjectionMap) {
+    _checkTextContextWriterInjectionMap(textContextWriterInjectionMap) {
         if (!(textContextWriterInjectionMap instanceof Map))
             throw new Error("textContextWriterInjectionMap is not an instance of Map");
-        textContextWriterInjectionMap.forEach(function (v) {
-            if (!(v instanceof context_text3_1.ContextTextWriter3))
+        textContextWriterInjectionMap.forEach((v) => {
+            if (!(v instanceof ContextTextWriter3))
                 throw new Error("textContextWriterInjectionMap element is not an instance of ContextTextWriter3");
         });
-    };
-    BearingLinePlugin.prototype.__insertTexts = function (items, textWriterIDs) {
-        var textWritersMap = textWriterGetOrThrow(this._textWritersMap, textWriterIDs);
-        var _loop_1 = function (item) {
-            var oldItem = this_1._memoryForText.get(item.key);
-            var _item = oldItem !== undefined ? __assign(__assign({}, oldItem), item) : item;
-            this_1._memoryForText.set(item.key, _item);
-            if (this_1._textDataPreAdaptor !== null)
-                _item = this_1._textDataPreAdaptor(_item);
-            textWritersMap.forEach(function (writer) { return writer.insertText(_item); });
-        };
-        var this_1 = this;
-        for (var _i = 0, items_3 = items; _i < items_3.length; _i++) {
-            var item = items_3[_i];
-            _loop_1(item);
+    }
+    __insertTexts(items, textWriterIDs) {
+        const textWritersMap = textWriterGetOrThrow(this._textWritersMap, textWriterIDs);
+        for (const item of items) {
+            const oldItem = this._memoryForText.get(item.key);
+            let _item = oldItem !== undefined ? { ...oldItem, ...item } : item;
+            this._memoryForText.set(item.key, _item);
+            if (this._textDataPreAdaptor !== null)
+                _item = this._textDataPreAdaptor(_item);
+            textWritersMap.forEach((writer) => writer.insertText(_item));
         }
-    };
-    BearingLinePlugin.prototype.__insertAdaptor = function (item) {
-        var rgba = item.rgba !== undefined ? item.rgba : [0, 0, 0, 0];
-        var rgbaMode = item.rgbaMode !== undefined ? item.rgbaMode : 0;
-        var dashRatio = item.dashRatio !== undefined ? item.dashRatio : 1.0;
-        var dashOpacity = item.dashOpacity !== undefined ? item.dashOpacity : 0.9;
-        var circleDashAngle = item.circleDashAngle !== undefined ? item.circleDashAngle : 360;
-        var coordsData = this.__updateCoordsAdaptor(item);
-        return __assign(__assign({}, coordsData), { rgba: rgba, dashRatio: dashRatio, dashOpacity: dashOpacity, circleDashAngle: circleDashAngle, rgbaMode: rgbaMode });
-    };
-    BearingLinePlugin.prototype.__updateCoordsAdaptor = function (item) {
-        var _a, _b;
-        var globe = this.globe;
-        var lat = radian(item.lat);
-        var long = radian(item.long);
-        var endLat = radian(item.endLat);
-        var endLong = radian(item.endLong);
-        var altitude = ((_a = item.altitude) !== null && _a !== void 0 ? _a : 0) / 1000;
-        var bigRadius = (_b = item.bigRadius) !== null && _b !== void 0 ? _b : globe.Math.GetDist2D(item.long, item.lat, item.endLong, item.endLat);
-        var radius = item.radius !== undefined ? item.radius : bigRadius * 0.2;
-        var _c = globe.Math.FindPointByPolar(item.long, item.lat, bigRadius, item.bearingAngle), bearingLong = _c.long, bearingLat = _c.lat;
-        var startAngle2d = calculateStartAngle(long, lat, endLong, endLat);
-        var bearingAngle2d = calculateStartAngle(long, lat, radian(bearingLong), radian(bearingLat));
-        var tailAngle2d = bearingAngle2d - startAngle2d;
+    }
+    __insertAdaptor(item) {
+        const rgba = item.rgba !== undefined ? item.rgba : [0, 0, 0, 0];
+        const rgbaMode = item.rgbaMode !== undefined ? item.rgbaMode : 0;
+        const dashRatio = item.dashRatio !== undefined ? item.dashRatio : 1.0;
+        const dashOpacity = item.dashOpacity !== undefined ? item.dashOpacity : 0.9;
+        const circleDashAngle = item.circleDashAngle !== undefined ? item.circleDashAngle : 360;
+        const coordsData = this.__updateCoordsAdaptor(item);
+        return {
+            ...coordsData,
+            rgba,
+            dashRatio,
+            dashOpacity,
+            circleDashAngle,
+            rgbaMode
+        };
+    }
+    __updateCoordsAdaptor(item) {
+        const { globe } = this;
+        const lat = radian(item.lat);
+        const long = radian(item.long);
+        const endLat = radian(item.endLat);
+        const endLong = radian(item.endLong);
+        const altitude = (item.altitude ?? 0) / 1000;
+        const bigRadius = item.bigRadius ?? globe.Math.GetDist2D(item.long, item.lat, item.endLong, item.endLat);
+        const radius = item.radius !== undefined ? item.radius : bigRadius * 0.2;
+        const { long: bearingLong, lat: bearingLat } = globe.Math.FindPointByPolar(item.long, item.lat, bigRadius, item.bearingAngle);
+        const startAngle2d = calculateStartAngle(long, lat, endLong, endLat);
+        const bearingAngle2d = calculateStartAngle(long, lat, radian(bearingLong), radian(bearingLat));
+        let tailAngle2d = bearingAngle2d - startAngle2d;
         if (tailAngle2d > 0) {
             tailAngle2d -= Math.PI * 2;
         }
-        var bearingAngle = radian(item.bearingAngle - 90);
-        var startAngleOfCircle = globe.Math.GetAzimuthAngle(item.long, item.lat, item.endLong, item.endLat); //startAngle2d * 180 / Math.PI;
-        var startAngle3d = radian(startAngleOfCircle) - radian(90);
-        var tailAngle3d = bearingAngle - startAngle3d;
+        const bearingAngle = radian(item.bearingAngle - 90);
+        const startAngleOfCircle = globe.Math.GetAzimuthAngle(item.long, item.lat, item.endLong, item.endLat); //startAngle2d * 180 / Math.PI;
+        const startAngle3d = radian(startAngleOfCircle) - radian(90);
+        let tailAngle3d = bearingAngle - startAngle3d;
         if (tailAngle3d > 0) {
             tailAngle3d -= Math.PI * 2;
         }
-        var centerCoords2dflat = (0, circle_accurate_flat_1.centerCoords2dflatDataCreator)(globe, item.long, item.lat, item.endLong, item.endLat, { startAngleOfCircle: startAngleOfCircle, edgeCount: this.circleFlatEdgeCount });
+        const centerCoords2dflat = centerCoords2dflatDataCreator(globe, item.long, item.lat, item.endLong, item.endLat, { startAngleOfCircle, edgeCount: this.circleFlatEdgeCount });
         return {
             key: item.key,
             lat: item.lat,
             long: item.long,
             endLat: item.endLat,
             endLong: item.endLong,
-            altitude: altitude,
-            bearingAngle: bearingAngle,
-            radius: radius,
-            bigRadius: bigRadius,
-            startAngle2d: startAngle2d,
-            tailAngle2d: tailAngle2d,
-            startAngle3d: startAngle3d,
-            tailAngle3d: tailAngle3d,
-            bearingLong: bearingLong,
-            bearingLat: bearingLat,
-            centerCoords2dflat: centerCoords2dflat
+            altitude,
+            bearingAngle,
+            radius,
+            bigRadius,
+            startAngle2d,
+            tailAngle2d,
+            startAngle3d,
+            tailAngle3d,
+            bearingLong,
+            bearingLat,
+            centerCoords2dflat
         };
-    };
-    BearingLinePlugin.prototype.__fixPartialProperties = function (propertyIDs) {
-        var s = new Set(["rgba", "dashOpacity", "circleDashAngle"]);
-        var result = [];
-        for (var _i = 0, propertyIDs_1 = propertyIDs; _i < propertyIDs_1.length; _i++) {
-            var item = propertyIDs_1[_i];
+    }
+    __fixPartialProperties(propertyIDs) {
+        const s = new Set(["rgba", "dashOpacity", "circleDashAngle"]);
+        const result = [];
+        for (const item of propertyIDs) {
             result.push(item);
             if (s.has(item)) {
                 result.push(item + "Mercator");
             }
         }
         return result;
-    };
+    }
     // Globe API
-    BearingLinePlugin.prototype.init = function (globe, gl) {
-        var _a, _b, _c, _d, _e;
-        var _this = this;
+    init(globe, gl) {
         this.gl = gl;
         this.globe = globe;
-        this.lineProgram = naive_accurate_flexible_1.LineOnGlobeCache.get(globe);
-        this.pieceOfPieProgram = piece_of_pie_1.PieceOfPieProgramCache.get(globe);
-        this.circleProgram = circle_accurate_flat_1.CircleCache.get(globe);
-        this.circle3DProgram = circle_accurate_3d_1.CircleCache.get(globe);
-        var circleFlatEdgeCount = this.circleFlatEdgeCount;
+        this.lineProgram = LineOnGlobeCache.get(globe);
+        this.pieceOfPieProgram = PieceOfPieProgramCache.get(globe);
+        this.circleProgram = CircleCache.get(globe);
+        this.circle3DProgram = Circle3DCache.get(globe);
+        const circleFlatEdgeCount = this.circleFlatEdgeCount;
         {
             // createBuffers
-            var bufferType = "DYNAMIC_DRAW";
-            var initialCapacity = this.bufferOrchestrator.capacity;
+            const bufferType = "DYNAMIC_DRAW";
+            const initialCapacity = this.bufferOrchestrator.capacity;
             this.bufferManagersCompMap = new Map([
                 ["centerCoords2d", {
-                        'bufferManager': new account_1.BufferManager(gl, 2, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array(globe.api_GetMercator2DPoint(item.long, item.lat)); },
+                        'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.long, item.lat)),
                     }],
                 ["centerCoords2dflat", {
-                        'bufferManager': new account_1.BufferManager(gl, circleFlatEdgeCount * 2, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return item.centerCoords2dflat; },
+                        'bufferManager': new BufferManager(gl, circleFlatEdgeCount * 2, { bufferType, initialCapacity }),
+                        'adaptor': (item) => item.centerCoords2dflat,
                     }],
                 ["centerCoords3d", {
-                        'bufferManager': new account_1.BufferManager(gl, 3, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return (0, geometry_1.sphereCoord)(item.long, item.lat, globe, item.altitude); },
+                        'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
+                        'adaptor': (item) => sphereCoord(item.long, item.lat, globe, item.altitude),
                     }],
                 ["targetCoords2d", {
-                        'bufferManager': new account_1.BufferManager(gl, 2, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array(globe.api_GetMercator2DPoint(item.endLong, item.endLat)); }
+                        'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.endLong, item.endLat))
                     }],
                 ["targetCoords3d", {
-                        'bufferManager': new account_1.BufferManager(gl, 3, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return (0, geometry_1.sphereCoord)(item.endLong, item.endLat, globe, item.altitude); }
+                        'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
+                        'adaptor': (item) => sphereCoord(item.endLong, item.endLat, globe, item.altitude)
                     }],
                 ["bearingTargetCoords2d", {
-                        'bufferManager': new account_1.BufferManager(gl, 2, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array(globe.api_GetMercator2DPoint(item.bearingLong, item.bearingLat)); }
+                        'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.bearingLong, item.bearingLat))
                     }],
                 ["bearingTargetCoords3d", {
-                        'bufferManager': new account_1.BufferManager(gl, 3, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return (0, geometry_1.sphereCoord)(item.bearingLong, item.bearingLat, globe, item.altitude); }
+                        'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
+                        'adaptor': (item) => sphereCoord(item.bearingLong, item.bearingLat, globe, item.altitude)
                     }],
                 ["startAngle2d", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([item.startAngle2d]); }
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.startAngle2d])
                     }],
                 ["tailAngle2d", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([item.tailAngle2d]); }
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.tailAngle2d])
                     }],
                 ["startAngle3d", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([item.startAngle3d]); }
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.startAngle3d])
                     }],
                 ["tailAngle3d", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([item.tailAngle3d]); }
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.tailAngle3d])
                     }],
                 ["bearingDashRatio", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([0]); }
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([0])
                     }],
                 ["rgba", {
-                        'bufferManager': new account_1.BufferManager(gl, 4, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array(item.rgba); }
+                        'bufferManager': new BufferManager(gl, 4, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(item.rgba)
                     }],
                 ["radius", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([item.radius]); }
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.radius])
                     }],
                 ["rgbaMode", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([item.rgbaMode]); }
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.rgbaMode])
                     }],
                 ["dashRatio", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([item.dashRatio]); }
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.dashRatio])
                     }],
                 ["bigRadius", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([item.bigRadius]); }
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.bigRadius])
                     }],
                 ["dashOpacity", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([item.dashOpacity]); },
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.dashOpacity]),
                     }],
                 ["circleDashAngle", {
-                        'bufferManager': new account_1.BufferManager(gl, 1, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return new Float32Array([item.circleDashAngle / 360]); },
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.circleDashAngle / 360]),
                     }],
                 // Mercator circle properties are duplicated for the sake of performance.
                 ["rgbaMercator", {
-                        'bufferManager': new account_1.BufferManager(gl, 4 * circleFlatEdgeCount, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return data_filler_1.populateFloat32Array.fillWithListData(circleFlatEdgeCount, item.rgba); },
+                        'bufferManager': new BufferManager(gl, 4 * circleFlatEdgeCount, { bufferType, initialCapacity }),
+                        'adaptor': (item) => populateFloat32Array.fillWithListData(circleFlatEdgeCount, item.rgba),
                     }],
                 ["circleDashAngleMercator", {
-                        'bufferManager': new account_1.BufferManager(gl, circleFlatEdgeCount, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return data_filler_1.populateFloat32Array.fillFloat32Array(circleFlatEdgeCount, item.circleDashAngle / 360); },
+                        'bufferManager': new BufferManager(gl, circleFlatEdgeCount, { bufferType, initialCapacity }),
+                        'adaptor': (item) => populateFloat32Array.fillFloat32Array(circleFlatEdgeCount, item.circleDashAngle / 360),
                     }],
                 ["dashOpacityMercator", {
-                        'bufferManager': new account_1.BufferManager(gl, circleFlatEdgeCount, { bufferType: bufferType, initialCapacity: initialCapacity }),
-                        'adaptor': function (item) { return data_filler_1.populateFloat32Array.fillFloat32Array(circleFlatEdgeCount, item.dashOpacity); },
+                        'bufferManager': new BufferManager(gl, circleFlatEdgeCount, { bufferType, initialCapacity }),
+                        'adaptor': (item) => populateFloat32Array.fillFloat32Array(circleFlatEdgeCount, item.dashOpacity),
                     }],
             ]);
         }
-        var vaoOBJ = function (key) { return (0, attribute_loader_1.createBufferAndReadInfo)(_this.bufferManagersCompMap.get(key).bufferManager.buffer); };
-        this.lineVao = (_a = this.lineProgram).createVAO.apply(_a, ['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashOpacity', 'dashOpacity', 'rgba'].map(function (key) { return vaoOBJ(key); }));
-        this.ringVao = (_b = this.pieceOfPieProgram).createVAO.apply(_b, ['centerCoords2d',
+        const vaoOBJ = (key) => createBufferAndReadInfo(this.bufferManagersCompMap.get(key).bufferManager.buffer);
+        this.lineVao = this.lineProgram.createVAO(...['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashOpacity', 'dashOpacity', 'rgba'].map(key => vaoOBJ(key)));
+        this.ringVao = this.pieceOfPieProgram.createVAO(...['centerCoords2d',
             'centerCoords3d',
             'startAngle2d',
             'tailAngle2d',
@@ -410,27 +383,27 @@ var BearingLinePlugin = /** @class */ (function () {
             'tailAngle3d',
             'rgba',
             'radius',
-            'rgbaMode'].map(function (key) { return vaoOBJ(key); }));
-        this.bearingLineVAO = (_c = this.lineProgram).createVAO.apply(_c, ['centerCoords2d', 'centerCoords3d', 'bearingTargetCoords2d', 'bearingTargetCoords3d', 'bearingDashRatio', 'dashOpacity', 'rgba'
-        ].map(function (key) { return vaoOBJ(key); }));
-        this.circleVao = (_d = this.circleProgram).createVAO.apply(_d, ["centerCoords2dflat", "rgbaMercator", "circleDashAngleMercator", "dashOpacityMercator"
-        ].map(function (key) { return vaoOBJ(key); }));
-        this.circle3DVao = (_e = this.circle3DProgram).createVAO.apply(_e, ["centerCoords3d", "targetCoords3d", "rgba", "circleDashAngle", "dashOpacity"
-        ].map(function (key) { return vaoOBJ(key); }));
-    };
-    BearingLinePlugin.prototype.draw3D = function () {
-        var gl = this.gl;
+            'rgbaMode'].map(key => vaoOBJ(key)));
+        this.bearingLineVAO = this.lineProgram.createVAO(...['centerCoords2d', 'centerCoords3d', 'bearingTargetCoords2d', 'bearingTargetCoords3d', 'bearingDashRatio', 'dashOpacity', 'rgba'
+        ].map(key => vaoOBJ(key)));
+        this.circleVao = this.circleProgram.createVAO(...["centerCoords2dflat", "rgbaMercator", "circleDashAngleMercator", "dashOpacityMercator"
+        ].map(key => vaoOBJ(key)));
+        this.circle3DVao = this.circle3DProgram.createVAO(...["centerCoords3d", "targetCoords3d", "rgba", "circleDashAngle", "dashOpacity"
+        ].map(key => vaoOBJ(key)));
+    }
+    draw3D() {
+        const { gl } = this;
         gl.disable(gl.DEPTH_TEST);
-        var is3D = this.globe.api_GetCurrentGeometry() === 0;
-        var drawRange = { first: 0, count: this.bufferOrchestrator.length };
-        this.lineProgram.draw(this.lineVao, { drawRange: drawRange }, this._opacity);
+        const is3D = this.globe.api_GetCurrentGeometry() === 0;
+        const drawRange = { first: 0, count: this.bufferOrchestrator.length };
+        this.lineProgram.draw(this.lineVao, { drawRange }, this._opacity);
         if (this.drawAngleRing) {
-            this.pieceOfPieProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, exports.RINGPARTIAL_DRAW_MODE.TRIANGLE_FAN);
-            this.pieceOfPieProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, exports.RINGPARTIAL_DRAW_MODE.LINE_STRIP);
+            this.pieceOfPieProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, RINGPARTIAL_DRAW_MODE.TRIANGLE_FAN);
+            this.pieceOfPieProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, RINGPARTIAL_DRAW_MODE.LINE_STRIP);
         }
         if (this.drawBearingLine) {
             // this.lineProgram.draw(this.bearingLineVAO, this.bufferOrchestrator.length, this._opacity );
-            this.lineProgram.draw(this.bearingLineVAO, { drawRange: drawRange }, this._opacity);
+            this.lineProgram.draw(this.bearingLineVAO, { drawRange }, this._opacity);
         }
         if (this.drawVRM) {
             if (is3D) {
@@ -441,34 +414,31 @@ var BearingLinePlugin = /** @class */ (function () {
             }
         }
         if (this.drawText) {
-            this._textWritersMap.forEach(function (writer) { return writer.draw(); });
+            this._textWritersMap.forEach((writer) => writer.draw());
         }
         gl.enable(gl.DEPTH_TEST);
-    };
-    BearingLinePlugin.prototype.free = function () {
+    }
+    free() {
         if (this.isFreed)
             return;
-        this.bufferManagersCompMap.forEach(function (_a) {
-            var bufferManager = _a.bufferManager, adaptor = _a.adaptor;
+        this.bufferManagersCompMap.forEach(({ bufferManager, adaptor }) => {
             bufferManager.free();
         });
-        var _a = this, gl = _a.gl, globe = _a.globe;
+        const { gl, globe } = this;
         gl.deleteVertexArray(this.lineVao);
         gl.deleteVertexArray(this.ringVao);
         gl.deleteVertexArray(this.bearingLineVAO);
         gl.deleteVertexArray(this.circleVao);
         gl.deleteVertexArray(this.circle3DVao);
-        naive_accurate_flexible_1.LineOnGlobeCache.release(globe);
-        piece_of_pie_1.PieceOfPieProgramCache.release(globe);
-        circle_accurate_flat_1.CircleCache.release(globe);
-        circle_accurate_3d_1.CircleCache.release(globe);
+        LineOnGlobeCache.release(globe);
+        PieceOfPieProgramCache.release(globe);
+        CircleCache.release(globe);
+        Circle3DCache.release(globe);
         this.isFreed = true;
-    };
-    BearingLinePlugin.prototype._deleteTexts = function (keys) {
-        this._textWritersMap.forEach(function (writer) {
+    }
+    _deleteTexts(keys) {
+        this._textWritersMap.forEach((writer) => {
             writer.deleteTextBulk(keys);
         });
-    };
-    return BearingLinePlugin;
-}());
-exports.default = BearingLinePlugin;
+    }
+}