@pirireis/webglobeplugins 0.6.29-c → 0.6.31-a

package/bearing-line/plugin copy.js

@@ -0,0 +1,542 @@
+import { pieceOfPieProgramCache } from '../programs/rings/partial-ring/piece-of-pie';
+import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate';
+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 { ContextTextWriter } from '../write-text/context-text'
+
+
+export const RINGPARTIAL_DRAW_MODE = Object.freeze({
+    LINE_STRIP: "LINE_STRIP",
+    TRIANGLE_FAN: "TRIANGLE_FAN",
+});
+
+const constraintFloat = (x, lowerBound, upperBound) => {
+    if (typeof x !== "number") throw new Error("type must be numberic")
+    if (lowerBound > x || x > upperBound) throw new Error(`input must be between ${lowerBound} - ${upperBound}`)
+}
+
+/**
+ * partial ring angle should be different on globe and mercator.
+ * 
+ */
+
+
+/**
+ * @typedef {Object}textContextInjection
+ * @property {string} id
+ * @property {function} coordsAdaptor
+ * @property {function} textAdaptor
+ * @property {ContextTextWriter} writer
+ * 
+ */
+
+// TODO UPDATE TO ContextTextWriter3
+
+
+export default class Plugin {
+    /**
+     * 
+     * @param {*} id 
+     * @param {Map<[K ,{writer:ContextTextWriter, coordsAdaptor, textAdaptor}]} textContextInjectionMap  import { ContextTextWriter } from '@pirireis/webglobeplugins/write-text/context-text';
+     *
+     */
+
+    constructor(id,
+        {
+            opacity = 1,
+            textContextInjectionMap = new Map(),
+            drawVRM = true,
+            drawBearingLine = true,
+            drawAngleRing = true,
+            drawText = true,
+            circleFlatEdgeCount = flatCircleEdgeCount - 2
+        } = {}) {
+        this.id = id;
+        this._opacity = opacity;
+        this.bufferOrchestrator = new BufferOrchestrator({ capacity: 10 });
+        this._checkTextContextInjectionMap(textContextInjectionMap);
+        this._textContextInjectionMap = textContextInjectionMap;
+        this.drawVRM = drawVRM;
+        this.drawBearingLine = drawBearingLine;
+        this.drawAngleRing = drawAngleRing;
+
+
+        this.drawText = drawText;
+
+        this.circleFlatEdgeCount = circleFlatEdgeCount + 2; //circleFlatEdgeCount;
+    }
+
+    setDoDrawVRM(bool) {
+        if (bool === this.drawVRM) return;
+        this.drawVRM = bool;
+        this.globe.DrawRender();
+    }
+
+    setDoDrawText(bool) {
+        if (bool === this.drawText) return;
+        this.drawText = bool;
+        this.globe.DrawRender();
+    }
+
+    setDoDrawText(bool) {
+        if (bool === this.drawText) return;
+        this.drawText = bool;
+        this.globe.DrawRender();
+    }
+
+    _checkTextContextInjectionMap(textContextInjectionMap) {
+        if (!(textContextInjectionMap instanceof Map)) throw new TypeError("textContextInjectionMap is not instance of Map");
+        textContextInjectionMap.forEach((v) => {
+            if (typeof v !== 'object') throw new TypeError("textContextInjectionMap format is wrong");
+            if (typeof v.coordsAdaptor !== 'function') throw new TypeError("textContextInjectionMap coordsAdaptor format is wrong");
+            if (typeof v.textAdaptor !== 'function') throw new TypeError("textContextInjectionMap textAdaptor format is wrong");
+            if (!(v.writer instanceof ContextTextWriter)) throw new TypeError("textContextInjectionMap writer is not instance of ContextTextWriter");
+        })
+    }
+
+    setDoDrawAngleRing(bool) {
+        if (bool === this.drawAngleRing) return;
+        this.drawAngleRing = bool;
+        this.globe.DrawRender();
+    }
+
+
+    settextContextInjectionMap(textContextInjectionMap, data = null) {
+        this._textContextInjectionMap = textContextInjectionMap;
+        this._textContextInjectionMap.forEach(({ writer }) => writer.clear());
+        if (data) {
+            for (const item of data) {
+                this._insertTexts(item);
+            }
+        }
+    }
+
+
+    setOpacity(opacity) {
+        constraintFloat(opacity, 0, 1);
+        this._opacity = opacity;
+        this._textContextInjectionMap.forEach(({ writer }) => writer.setOpacity(opacity));
+        this.globe.DrawRender();
+    }
+
+
+
+
+    init(globe, gl) {
+        this.gl = gl;
+        this.globe = globe;
+        this.lineProgram = LineOnGlobeCache.get(globe);
+        this.ringProgram = pieceOfPieProgramCache.get(globe);
+        this.circleProgram = CircleCache.get(globe);
+        this.circle3DProgram = Circle3DCache.get(globe);
+        const circleFlatEdgeCount = this.circleFlatEdgeCount
+        {
+            // createBuffers
+            const bufferType = "DYNAMIC_DRAW";
+            const initialCapacity = this.bufferOrchestrator.capacity;
+            this.bufferManagersCompMap = new Map(
+                [
+
+                    ["centerCoords2d", {
+                        'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.long, item.lat)),
+                    }],
+                    ["centerCoords2dflat", {
+                        'bufferManager': new BufferManager(gl, circleFlatEdgeCount * 2, { bufferType, initialCapacity }),
+                        'adaptor': (item) => item.centerCoords2dflat,
+                    }],
+                    ["centerCoords3d", {
+                        'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetCartesian3DPoint(item.long, item.lat, 0, 0)),
+                    }],
+                    ["targetCoords2d", {
+                        'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.endLong, item.endLat))
+                    }],
+                    ["targetCoords3d", {
+                        'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetCartesian3DPoint(item.endLong, item.endLat, 0, 0))
+                    }],
+                    ["bearingTargetCoords2d", {
+                        'bufferManager': new BufferManager(gl, 2, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetMercator2DPoint(item.bearingLong, item.bearingLat))
+                    }],
+                    ["bearingTargetCoords3d", {
+                        'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(globe.api_GetCartesian3DPoint(item.bearingLong, item.bearingLat, 0, 0))
+                    }],
+                    ["startAngle", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.startAngle])
+                    }],
+                    ["tailAngle", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.tailAngle])
+                    }],
+                    ["startAngle2d", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.startAngle2d])
+                    }],
+                    ["tailAngle2d", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.tailAngle2d])
+                    }],
+                    ["startAngle3d", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.startAngle3d])
+                    }],
+                    ["tailAngle3d", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.tailAngle3d])
+                    }],
+                    ["bearingDashRatio", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([0])
+                    }],
+                    ["rgba", {
+                        'bufferManager': new BufferManager(gl, 4, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array(item.rgba)
+                    }],
+                    ["radius", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.radius])
+                    }],
+                    ["rgbaMode", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.rgbaMode])
+                    }],
+                    ["dashRatio", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.dashRatio])
+                    }],
+                    ["bearingAngle", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.bearingAngle])
+                    }],
+                    ["bigRadius", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.bigRadius])
+                    }],
+                    ["dashOpacity", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.dashOpacity]),
+                    }],
+
+                    // normal circle
+                    ["circleDashAngle", {
+                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
+                        'adaptor': (item) => new Float32Array([item.circleDashAngle / 360]),
+                    }],
+                    // CIRCLE Mercator
+                    ["rgbaMercator", {
+                        'bufferManager': new BufferManager(gl, 4 * circleFlatEdgeCount, { bufferType, initialCapacity }),
+                        'adaptor': (item) => populateFloat32Array.fillWithListData(circleFlatEdgeCount, item.rgba),
+                    }],
+                    ["circleDashAngleMercator", {
+                        'bufferManager': new BufferManager(gl, circleFlatEdgeCount, { bufferType, initialCapacity }),
+                        'adaptor': (item) => populateFloat32Array.fillFloat32Array(circleFlatEdgeCount, item.circleDashAngle / 360),
+                    }],
+                    ["dashOpacityMercator", {
+                        'bufferManager': new BufferManager(gl, circleFlatEdgeCount, { bufferType, initialCapacity }),
+                        'adaptor': (item) => populateFloat32Array.fillFloat32Array(circleFlatEdgeCount, item.dashOpacity),
+                    }],
+
+                ]
+            );
+        }
+
+
+        const obj = function (bufferManagerComp, divisor = 1) {
+            return { 'buffer': bufferManagerComp.bufferManager.buffer, 'stride': 0, 'offset': 0, divisor }
+
+        };
+
+        this.lineVao = this.lineProgram.createVAO(
+            ...['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
+        this.ringVao = this.ringProgram.createVAO(
+            ...['centerCoords2d', 'centerCoords3d',
+                'startAngle2d',
+                'tailAngle2d',
+                'startAngle3d',
+                'tailAngle3d',
+                'rgba',
+                'radius',
+                'rgbaMode'].map(key => obj(this.bufferManagersCompMap.get(key))));
+        {
+            this.bearingLineVAO = this.lineProgram.createVAO(
+                ...['centerCoords2d', 'centerCoords3d', 'bearingTargetCoords2d', 'bearingTargetCoords3d', 'bearingDashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
+        }
+        // centerObj, startAngleObj, radiusObj, colorObj, dashRatioObj, dashOpacityObj
+        this.circleVao = this.circleProgram.createVAO(
+            ...["centerCoords2dflat", "rgbaMercator", "circleDashAngleMercator", "dashOpacityMercator"].map(key => obj(this.bufferManagersCompMap.get(key)))
+        );
+        this.circle3DVao = this.circle3DProgram.createVAO(
+            ...["centerCoords3d", "bigRadius", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key)))
+        );
+
+    }
+
+
+
+    draw3D() {
+        const { gl } = this;
+        gl.disable(gl.DEPTH_TEST);
+        const is3D = this.globe.api_GetCurrentGeometry() === 0;
+        this.lineProgram.draw(this.lineVao, this.bufferOrchestrator.length, this._opacity);
+        if (this.drawAngleRing) {
+            this.ringProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, RINGPARTIAL_DRAW_MODE.TRIANGLE_FAN);
+            this.ringProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity, RINGPARTIAL_DRAW_MODE.LINE_STRIP);
+        }
+        if (this.drawBearingLine) {
+            this.lineProgram.draw(this.bearingLineVAO, this.bufferOrchestrator.length, this._opacity * 0.8);
+        }
+        if (this.drawVRM) {
+            if (is3D) {
+                this.circle3DProgram.draw(this.circle3DVao, this.bufferOrchestrator.length, this._opacity);
+            } else {
+                this.circleProgram.draw(this.circleVao, this.bufferOrchestrator.length, this.circleFlatEdgeCount, this._opacity);
+            }
+        }
+        if (this.drawText) {
+            this._textContextInjectionMap.forEach((e) => { e.writer.draw(); });
+        }
+        gl.enable(gl.DEPTH_TEST);
+    }
+
+
+    /**
+     * @typedef {{key, long, lat, endLong, endLat, bearingAngle, radius,  rgba:[4numbers], rgbaMode, bigRadius, dashRatio, dashOpacity, circleDashAngle}} item
+     * @property {string} key   
+     * @property {number} long
+     * @property {number} lat
+     * @property {number} endLong
+     * @property {number} endLat 
+     * @property {number} bearingAngle 0-360
+     * @property {number} radius angle ring radius
+     * @property {Array<4numbers>} rgba [r,g,b,a]
+     * @property {number} rgbaMode 0 constant, 1 fading, 2 hides angle ring
+     * @property {number} bigRadius undefined means it will be calculated from long, lat, endLong, endLat
+     * @property {number} dashRatio 0-1
+     * @property {number} dashOpacity 0-1
+     * @property {number} circleDashAngle 0-360
+     * @param {Array<item>} items 
+     * @param {Array<string>} textWriterInjectionSubSetIDs | textContextInjectionMap keys to be used for writing text.
+     */
+    insertBulk(items, textWriterInjectionSubSetIDs = []) {
+        const { globe, bufferOrchestrator, bufferManagersCompMap } = this;// angleTextContext, distanceTextContext,
+        const textWriterInjectionSubSets = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);
+        const data = []
+        for (let item of items) {
+            this._insertTexts(item, textWriterInjectionSubSets);
+            data.push(this.__insertAdaptor(item));
+        }
+        bufferOrchestrator.insertBulk(data, bufferManagersCompMap);
+        this._textContextInjectionMap.forEach((v) => {
+            const { writer } = v;
+            writer.updateOpacityBulk(items, (e) => e.key, (e) => e.rgba[3]);
+        })
+        globe.DrawRender();
+    }
+
+
+
+
+    deleteBulk(keys) {
+        this.bufferOrchestrator.deleteBulk(keys, this.bufferManagersCompMap);
+        this._deleteTexts(keys);
+        this.globe.DrawRender();
+    }
+
+
+    defrag() {
+        this.bufferOrchestrator.defrag(this.bufferManagersCompMap);
+    }
+
+    /**
+     * 
+     * @param {Array<{key, long, lat, endLong, endLat, bearingAngle}>} items
+     * @param {Array<string>} textWriterInjectionSubSetIDs | textContextInjectionMap keys to be used for writing text.
+     */
+    updateCoordinatesBulk(items, textWriterInjectionSubSetIDs = []) {
+        const injectionsSubSet = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);;
+        const { globe, bufferOrchestrator, bufferManagersCompMap, } = this;
+        const data = []
+        for (let item of items) {
+            this._insertTexts(item, injectionsSubSet);
+            data.push(this.__updateCoordsAdaptor(item));
+        }
+
+        bufferOrchestrator.updateBulk(data, bufferManagersCompMap, ["centerCoords2d", "centerCoords3d", "targetCoords2d", "targetCoords3d", "startAngle", "tailAngle",
+            "startAngle2d", "tailAngle2d", "startAngle3d", "tailAngle3d", "bearingTargetCoords2d", "bearingTargetCoords3d", "centerCoords2dflat",
+            "bearingAngle", "bigRadius", "radius"]);
+        globe.DrawRender();
+    }
+
+
+    /**
+     * 
+     * @param {*} items some colums EXCEPT positional ones
+     * @param {string} propertyIDs 
+     * @param {string} textWriterInjectionSubSetIDs 
+     * 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.
+     */
+    updatePartial(items, propertyIDs = [], textWriterInjectionSubSetIDs = []) { // textWriterInjectionSubSetIDs = []
+        if (propertyIDs.length === 0) console.warn("updatePartial is called with no target propertyIDs");
+        const fixedPropertyIDs = this.__fixPartialProperties(propertyIDs)
+        const { _textContextInjectionMap, bufferOrchestrator, bufferManagersCompMap } = this;
+        const writers = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);
+        for (let item of items) { this._insertTexts(item, writers) }
+        bufferOrchestrator.updateBulk(items, bufferManagersCompMap, fixedPropertyIDs);
+        // patch to update text opacity
+        for (const property of fixedPropertyIDs) {
+            if (property === "rgba") {
+                _textContextInjectionMap.forEach((v) => {
+                    const { writer } = v;
+                    writer.updateOpacityBulk(items, (e) => e.key, (e) => e.rgba[3]);
+                })
+            }
+        }
+        this.globe.DrawRender();
+    }
+
+
+    __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 bigRadius = item.bigRadius !== undefined ? item.bigRadius : globe.Math.GetDist3D(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;
+        }
+        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;
+        }
+
+        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,
+            bearingAngle,
+            radius,
+            bigRadius,
+            startAngle2d,
+            tailAngle2d,
+            startAngle3d,
+            tailAngle3d,
+            bearingLong,
+            bearingLat,
+            centerCoords2dflat
+        };
+    }
+
+
+    __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;
+    }
+
+    //TODO free
+    free() {
+        if (this.isFreed) return;
+        this.bufferManagersCompMap.forEach(({ bufferManager, adaptor }) => {
+            bufferManager.free();
+        });
+        const { gl, globe } = this;
+        gl.deleteVertexArray(this.lineVao);
+        gl.deleteVertexArray(this.ringVao);
+        gl.deleteVertexArray(this.bearingLineVAO);
+        gl.deleteVertexArray(this.circleVao);
+        gl.deleteVertexArray(this.circle3DVao);
+        LineOnGlobeCache.release(globe);
+        pieceOfPieProgramCache.release(globe);
+        CircleCache.release(globe);
+        Circle3DCache.release(globe)
+        this.isFreed = true;
+    }
+
+
+
+
+    _insertTexts(item, textWriterInjectionSubSet) {
+        //TODO This method can be more performant if it works horizontally, tabular
+        textWriterInjectionSubSet.forEach((v) => {
+            const { coordsAdaptor, textAdaptor, writer } = v
+            const { lat, long } = coordsAdaptor(item);
+            const text = textAdaptor(item);
+            writer.insertText(item.key, lat, long, text);
+        });
+    }
+
+
+    _deleteTexts(keys) {
+        this._textContextInjectionMap.forEach((e) => {
+            e.writer.deleteTextBulk(keys);
+        });
+    }
+
+
+}
+
+
+
+const radian = (degree) => degree * Math.PI / 180;
+
+const integralSec = (angle) => {
+    return Math.log(Math.tan(angle / 2 + Math.PI / 4));
+}
+
+const textWriterGetOrThrow = mapGetOrThrow("BearingLine textContextInjection id does not exist in map")
+
+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;
+}
+

package/bearing-line/plugin.js

@@ -5,7 +5,7 @@ import { CircleCache, EDGE_COUNT as flatCircleEdgeCount, centerCoords2dflatDataC
 import { BufferOrchestrator, BufferManager } from '../util/account';
 import { mapGetOrThrow } from "../util/check/get";
 import { populateFloat32Array } from "../util/jshelpers/data-filler";
-import { ContextTextWriter } from '../write-text/context-text'
+import { ContextTextWriter3 } from '../write-text/context-text3'
 
 
 export const RINGPARTIAL_DRAW_MODE = Object.freeze({
@@ -29,7 +29,7 @@ const constraintFloat = (x, lowerBound, upperBound) => {
  * @property {string} id
  * @property {function} coordsAdaptor
  * @property {function} textAdaptor
- * @property {ContextTextWriter} writer
+ * @property {ContextTextWriter3} writer
  * 
  */
 
@@ -40,14 +40,15 @@ export default class Plugin {
     /**
      * 
      * @param {*} id 
-     * @param {Map<[K ,{writer:ContextTextWriter, coordsAdaptor, textAdaptor}]} textContextInjectionMap  import { ContextTextWriter } from '@pirireis/webglobeplugins/write-text/context-text';
+     * @param {Map<[key, ContextTextWriter3]>} textWritersMap
      *
      */
 
     constructor(id,
         {
             opacity = 1,
-            textContextInjectionMap = new Map(),
+            textWritersMap = new Map(),
+            textDataPreAdaptor = null,
             drawVRM = true,
             drawBearingLine = true,
             drawAngleRing = true,
@@ -57,12 +58,15 @@ export default class Plugin {
         this.id = id;
         this._opacity = opacity;
         this.bufferOrchestrator = new BufferOrchestrator({ capacity: 10 });
-        this._checkTextContextInjectionMap(textContextInjectionMap);
-        this._textContextInjectionMap = textContextInjectionMap;
+        this._checkTextContextWriterInjectionMap(textWritersMap);
+        this._textWritersMap = textWritersMap;
+        this._textWritersMap.forEach((writer) => writer.keyAdaptor = (item) => item.key);
         this.drawVRM = drawVRM;
         this.drawBearingLine = drawBearingLine;
         this.drawAngleRing = drawAngleRing;
 
+        this._textDataPreAdaptor = textDataPreAdaptor;
+        this._memoryForText = new Map();
 
         this.drawText = drawText;
 
@@ -87,15 +91,7 @@ export default class Plugin {
         this.globe.DrawRender();
     }
 
-    _checkTextContextInjectionMap(textContextInjectionMap) {
-        if (!(textContextInjectionMap instanceof Map)) throw new TypeError("textContextInjectionMap is not instance of Map");
-        textContextInjectionMap.forEach((v) => {
-            if (typeof v !== 'object') throw new TypeError("textContextInjectionMap format is wrong");
-            if (typeof v.coordsAdaptor !== 'function') throw new TypeError("textContextInjectionMap coordsAdaptor format is wrong");
-            if (typeof v.textAdaptor !== 'function') throw new TypeError("textContextInjectionMap textAdaptor format is wrong");
-            if (!(v.writer instanceof ContextTextWriter)) throw new TypeError("textContextInjectionMap writer is not instance of ContextTextWriter");
-        })
-    }
+
 
     setDoDrawAngleRing(bool) {
         if (bool === this.drawAngleRing) return;
@@ -104,27 +100,14 @@ export default class Plugin {
     }
 
 
-    settextContextInjectionMap(textContextInjectionMap, data = null) {
-        this._textContextInjectionMap = textContextInjectionMap;
-        this._textContextInjectionMap.forEach(({ writer }) => writer.clear());
-        if (data) {
-            for (const item of data) {
-                this._insertTexts(item);
-            }
-        }
-    }
-
-
     setOpacity(opacity) {
         constraintFloat(opacity, 0, 1);
         this._opacity = opacity;
-        this._textContextInjectionMap.forEach(({ writer }) => writer.setOpacity(opacity));
+        this._textWritersMap.forEach((writer) => writer.setOpacity(opacity));
         this.globe.DrawRender();
     }
 
 
-
-
     init(globe, gl) {
         this.gl = gl;
         this.globe = globe;
@@ -168,14 +151,7 @@ export default class Plugin {
                         'bufferManager': new BufferManager(gl, 3, { bufferType, initialCapacity }),
                         'adaptor': (item) => new Float32Array(globe.api_GetCartesian3DPoint(item.bearingLong, item.bearingLat, 0, 0))
                     }],
-                    ["startAngle", {
-                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array([item.startAngle])
-                    }],
-                    ["tailAngle", {
-                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array([item.tailAngle])
-                    }],
+
                     ["startAngle2d", {
                         'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
                         'adaptor': (item) => new Float32Array([item.startAngle2d])
@@ -212,10 +188,7 @@ export default class Plugin {
                         'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
                         'adaptor': (item) => new Float32Array([item.dashRatio])
                     }],
-                    ["bearingAngle", {
-                        'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array([item.bearingAngle])
-                    }],
+
                     ["bigRadius", {
                         'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
                         'adaptor': (item) => new Float32Array([item.bigRadius])
@@ -277,6 +250,7 @@ export default class Plugin {
             ...["centerCoords3d", "bigRadius", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key)))
         );
 
+
     }
 
 
@@ -301,7 +275,7 @@ export default class Plugin {
             }
         }
         if (this.drawText) {
-            this._textContextInjectionMap.forEach((e) => { e.writer.draw(); });
+            this._textWritersMap.forEach((writer) => writer.draw());
         }
         gl.enable(gl.DEPTH_TEST);
     }
@@ -323,29 +297,34 @@ export default class Plugin {
      * @property {number} dashOpacity 0-1
      * @property {number} circleDashAngle 0-360
      * @param {Array<item>} items 
-     * @param {Array<string>} textWriterInjectionSubSetIDs | textContextInjectionMap keys to be used for writing text.
+     * @param {Array<string>} textWriterIDs | textWritersMap keys to be used for writing text.
      */
-    insertBulk(items, textWriterInjectionSubSetIDs = []) {
+    insertBulk(items, { textWriterIDs = [] } = {}) {
         const { globe, bufferOrchestrator, bufferManagersCompMap } = this;// angleTextContext, distanceTextContext,
-        const textWriterInjectionSubSets = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);
         const data = []
         for (let item of items) {
-            this._insertTexts(item, textWriterInjectionSubSets);
             data.push(this.__insertAdaptor(item));
         }
         bufferOrchestrator.insertBulk(data, bufferManagersCompMap);
-        this._textContextInjectionMap.forEach((v) => {
-            const { writer } = v;
-            writer.updateOpacityBulk(items, (e) => e.key, (e) => e.rgba[3]);
-        })
+        this.__insertTexts(items, textWriterIDs);
+
         globe.DrawRender();
     }
 
 
-
+    updateText(textWriterIDs) {
+        const textWritersMap = textWriterGetOrThrow(this._textWritersMap, textWriterIDs);
+        this._memoryForText.forEach((item) => {
+            textWritersMap.forEach((writer) => writer.insertText(item));
+        });
+        this.globe.DrawRender();
+    }
 
     deleteBulk(keys) {
         this.bufferOrchestrator.deleteBulk(keys, this.bufferManagersCompMap);
+        for (const key of keys) {
+            this._memoryForText.delete(key);
+        }
         this._deleteTexts(keys);
         this.globe.DrawRender();
     }
@@ -355,23 +334,21 @@ export default class Plugin {
         this.bufferOrchestrator.defrag(this.bufferManagersCompMap);
     }
 
+
     /**
-     * 
      * @param {Array<{key, long, lat, endLong, endLat, bearingAngle}>} items
-     * @param {Array<string>} textWriterInjectionSubSetIDs | textContextInjectionMap keys to be used for writing text.
+     * @param {Array<string>} textWriterIDs | textWritersMap keys to be used for writing text.
      */
-    updateCoordinatesBulk(items, textWriterInjectionSubSetIDs = []) {
-        const injectionsSubSet = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);;
+    updateCoordinatesBulk(items, { textWriterIDs = [] } = {}) {
         const { globe, bufferOrchestrator, bufferManagersCompMap, } = this;
         const data = []
         for (let item of items) {
-            this._insertTexts(item, injectionsSubSet);
             data.push(this.__updateCoordsAdaptor(item));
         }
-
-        bufferOrchestrator.updateBulk(data, bufferManagersCompMap, ["centerCoords2d", "centerCoords3d", "targetCoords2d", "targetCoords3d", "startAngle", "tailAngle",
+        this.__insertTexts(items, textWriterIDs);
+        bufferOrchestrator.updateBulk(data, bufferManagersCompMap, ["centerCoords2d", "centerCoords3d", "targetCoords2d", "targetCoords3d",
             "startAngle2d", "tailAngle2d", "startAngle3d", "tailAngle3d", "bearingTargetCoords2d", "bearingTargetCoords3d", "centerCoords2dflat",
-            "bearingAngle", "bigRadius", "radius"]);
+            "bigRadius", "radius"]);
         globe.DrawRender();
     }
 
@@ -380,37 +357,46 @@ export default class Plugin {
      * 
      * @param {*} items some colums EXCEPT positional ones
      * @param {string} propertyIDs 
-     * @param {string} textWriterInjectionSubSetIDs 
+     * @param {string} textWriterIDs 
      * 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 = []}
      */
-    updatePartial(items, propertyIDs = [], textWriterInjectionSubSetIDs = []) { // textWriterInjectionSubSetIDs = []
+    updatePartial(items, propertyIDs = [], { textWriterIDs = [] } = {}) {
         if (propertyIDs.length === 0) console.warn("updatePartial is called with no target propertyIDs");
         const fixedPropertyIDs = this.__fixPartialProperties(propertyIDs)
-        const { _textContextInjectionMap, bufferOrchestrator, bufferManagersCompMap } = this;
-        const writers = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);
-        for (let item of items) { this._insertTexts(item, writers) }
+        const { bufferOrchestrator, bufferManagersCompMap } = this;
         bufferOrchestrator.updateBulk(items, bufferManagersCompMap, fixedPropertyIDs);
         // patch to update text opacity
-        for (const property of fixedPropertyIDs) {
-            if (property === "rgba") {
-                _textContextInjectionMap.forEach((v) => {
-                    const { writer } = v;
-                    writer.updateOpacityBulk(items, (e) => e.key, (e) => e.rgba[3]);
-                })
-            }
-        }
+        this.__insertTexts(items, textWriterIDs);
         this.globe.DrawRender();
     }
 
 
-    __insertAdaptor(item) {
+    _checkTextContextWriterInjectionMap(textContextWriterInjectionMap) {
+        if (!(textContextWriterInjectionMap instanceof Map)) throw new Error("textContextWriterInjectionMap is not an instance of Map");
+        textContextWriterInjectionMap.forEach((v) => {
+            if (!(v instanceof ContextTextWriter3)) throw new Error("textContextWriterInjectionMap element is not an instance of ContextTextWriter3");
+        });
+    }
+
 
+    __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;
+            if (this._textDataPreAdaptor !== null) _item = this._textDataPreAdaptor(_item);
+            this._memoryForText.set(item.key, _item);
+            textWritersMap.forEach((writer) => writer.insertText(_item));
+        }
+    }
+
+    __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 {
@@ -502,24 +488,14 @@ export default class Plugin {
 
 
 
-    _insertTexts(item, textWriterInjectionSubSet) {
-        //TODO This method can be more performant if it works horizontally, tabular
-        textWriterInjectionSubSet.forEach((v) => {
-            const { coordsAdaptor, textAdaptor, writer } = v
-            const { lat, long } = coordsAdaptor(item);
-            const text = textAdaptor(item);
-            writer.insertText(item.key, lat, long, text);
-        });
-    }
-
-
     _deleteTexts(keys) {
-        this._textContextInjectionMap.forEach((e) => {
-            e.writer.deleteTextBulk(keys);
+        this._textWritersMap.forEach((writer) => {
+            writer.deleteTextBulk(keys);
         });
     }
 
 
+
 }
 
 

package/circle-line-chain/plugin.js

@@ -41,18 +41,18 @@ export class CircleLineChainPlugin {
     /**
      * 
      * @param {*} id 
-     * @param {Map<[key, ContextTextWriter3]} textContextWriterInjectionMap //import { ContextTextWriter3 } from "@pirireis/webglobeplugins/write-text/context-text3"; 
+     * @param {Map<[key, ContextTextWriter3]} textWritersMap //import { ContextTextWriter3 } from "@pirireis/webglobeplugins/write-text/context-text3"; 
      */
     constructor(id, {
         drawCircleOn = true,
-        textContextWriterInjectionMap = new Map(),
+        textWritersMap = new Map(),
         textDataPreAdaptor = null,
         circleFlatEdgeCount = flatCircleEdgeCount - 2
     } = {}) {
         this.id = id;
-        this._checkTextContextWriterInjectionMap(textContextWriterInjectionMap);
-        this._textContextWriterInjectionMap = textContextWriterInjectionMap;
-        this._textContextWriterInjectionMap.forEach((writer) => writer.setKeyAdaptor((v, i, c, properties) => v.__identity__));
+        this._checktextWritersMap(textWritersMap);
+        this._textWritersMap = textWritersMap;
+        this._textWritersMap.forEach((writer) => writer.setKeyAdaptor((v, i, c, properties) => v.__identity__));
         this._opacity = 1;
         this._chainListMap = new ChainListMap(keyMethod);
         this.bufferOrchestrator = new BufferOrchestrator({ capacity: 10 });
@@ -69,10 +69,10 @@ export class CircleLineChainPlugin {
         this._initOrchestrations()
     }
 
-    _checkTextContextWriterInjectionMap(textContextWriterInjectionMap) {
-        if (!(textContextWriterInjectionMap instanceof Map)) throw new Error("textContextWriterInjectionMap is not an instance of Map");
-        textContextWriterInjectionMap.forEach((v) => {
-            if (!(v instanceof ContextTextWriter3)) throw new Error("textContextWriterInjectionMap element is not an instance of ContextTextWriter3");
+    _checktextWritersMap(textWritersMap) {
+        if (!(textWritersMap instanceof Map)) throw new Error("textWritersMap is not an instance of Map");
+        textWritersMap.forEach((v) => {
+            if (!(v instanceof ContextTextWriter3)) throw new Error("textWritersMap element is not an instance of ContextTextWriter3");
         });
     }
 
@@ -258,7 +258,7 @@ export class CircleLineChainPlugin {
      * @property {number} lat  
      * @property {StyleProperties} circleProperties
      */
-    insertBulk(data, { textWriterIDs = [] } = []) {
+    insertBulk(data, { textWriterIDs = [] } = {}) {
         // first insert everything to implicit structure,
         // then iterate over data again to update text
         // let _reconstractChainBufferData method interact with data and bufferOrchestrator.
@@ -302,7 +302,7 @@ export class CircleLineChainPlugin {
     setOpacity(opacity) {
         if (typeof opacity !== 'number') throw new Error("opacity must be a number");
         if (opacity < 0 || 1 < opacity) throw new Error("opacity must be between 0-1");
-        this._textContextWriterInjectionMap.forEach((writer) => writer.setOpacity(opacity));
+        this._textWritersMap.forEach((writer) => writer.setOpacity(opacity));
         this._opacity = opacity;
         this.globe.DrawRender();
     }
@@ -322,8 +322,8 @@ export class CircleLineChainPlugin {
         for (const chainKey of chainKeys) {
             bufferKeys.push(...this._chainListMap.deleteChainAndReturnChainKeys(chainKey));
         }
-        this._textContextWriterInjectionMap.forEach((writer) => writer.deleteTextBulk(bufferKeys));
-        this._updateTexts(chainKeys, this._textContextWriterInjectionMap.keys());
+        this._textWritersMap.forEach((writer) => writer.deleteTextBulk(bufferKeys));
+        this._updateTexts(chainKeys, this._textWritersMap.keys());
         this.bufferOrchestrator.deleteBulk(bufferKeys, this.bufferManagersCompMap);
         this.globe.DrawRender();
     }
@@ -340,7 +340,7 @@ export class CircleLineChainPlugin {
             bufferKeys.push(...this._chainListMap.deleteNodesBelongToAChain(chainKey, nodeKeys));
             chainKeysToReconstuct.push(chainKey);
         });
-        this._textContextWriterInjectionMap.forEach((writer) => writer.deleteTextBulk(bufferKeys));
+        this._textWritersMap.forEach((writer) => writer.deleteTextBulk(bufferKeys));
         this.bufferOrchestrator.deleteBulk(bufferKeys, this.bufferManagersCompMap);
         this._reconstructChains(chainKeysToReconstuct);
         this._updateTexts(chainKeysToReconstuct, textWriterIDs);
@@ -359,7 +359,7 @@ export class CircleLineChainPlugin {
 
     _updateTexts(chainKeys, textWriterIDs) {
         if (textWriterIDs.length === 0) return;
-        const textWriters = textWriterGetOrThrow(this._textContextWriterInjectionMap, textWriterIDs)
+        const textWriters = textWriterGetOrThrow(this._textWritersMap, textWriterIDs)
         chainKeys.forEach((chainKey) => {
             this._chainListMap.textUpdate(chainKey, textWriters, this._textDataPreAdaptor);
         })
@@ -419,7 +419,7 @@ export class CircleLineChainPlugin {
         CircleCache.release(this.globe);
         Circle3DCache.release(this.globe);
         LineToTheOriginCache.release(this.globe);
-        this._textContextWriterInjectionMap.forEach((writer) => writer.free());
+        this._textWritersMap.forEach((writer) => writer.free());
         const { gl } = this;
         gl.deleteVertexArray(this.lineVao);
         gl.deleteVertexArray(this.circleVao2d);
@@ -434,7 +434,7 @@ export class CircleLineChainPlugin {
         const { gl, globe } = this;
         gl.disable(gl.DEPTH_TEST);
         this.lineProgram.draw(this.lineVao, this.bufferOrchestrator.length, this._opacity);
-        this._textContextWriterInjectionMap.forEach((writer) => writer.draw());
+        this._textWritersMap.forEach((writer) => writer.draw());
         // this.lineToTheOriginProgram.draw(this.toOriginVao, this.bufferOrchestrator.length, this._opacity);
         const is3D = globe.api_GetCurrentGeometry() === 0;
         if (this._drawCircleOn) {
@@ -454,4 +454,4 @@ const radiusMethod = (globe) => (v, i, array) => {
     return globe.Math.GetDist3D(v.long, v.lat, array[i + 1].long, array[i + 1].lat)
 }
 
-const textWriterGetOrThrow = mapGetOrThrow("textWriterIds is invalid")
+const textWriterGetOrThrow = mapGetOrThrow("textWriterIDs is invalid")

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "0.6.29-c",
+    "version": "0.6.31-a",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT"

package/util/check/get.js

@@ -1,6 +1,7 @@
 
 export const mapGetOrThrow = (errorNote) => {
     return (mapInstance, ids) => {
+        if (!ids) throw new Error("There is no map keys to get");
         const result = [];
         for (let i = 0; i < ids.length; i++) {
             const e = mapInstance.get(ids[i]);

package/write-text/context-text3.js

@@ -159,6 +159,8 @@ export class ContextTextWriter3 {
         this.itemMap.set(key, { long: coords.long, lat: coords.lat, text, opacity, angle, payload: item, position });
     }
 
+
+
     clear() {
         this.itemMap.clear();
     }