@pirireis/webglobeplugins 0.6.30-c → 0.6.31-a

package/bearing-line/plugin.js

@@ -40,14 +40,14 @@ export default class Plugin {
     /**
      * 
      * @param {*} id 
-     * @param {Map<[key, ContextTextWriter3]>} textContextInjectionMap
+     * @param {Map<[key, ContextTextWriter3]>} textWritersMap
      *
      */
 
     constructor(id,
         {
             opacity = 1,
-            textContextInjectionMap = new Map(),
+            textWritersMap = new Map(),
             textDataPreAdaptor = null,
             drawVRM = true,
             drawBearingLine = true,
@@ -58,9 +58,9 @@ export default class Plugin {
         this.id = id;
         this._opacity = opacity;
         this.bufferOrchestrator = new BufferOrchestrator({ capacity: 10 });
-        this._checkTextContextWriterInjectionMap(textContextInjectionMap);
-        this._textContextInjectionMap = textContextInjectionMap;
-        this._textContextInjectionMap.forEach((writer) => writer.keyAdaptor = (item) => item.key);
+        this._checkTextContextWriterInjectionMap(textWritersMap);
+        this._textWritersMap = textWritersMap;
+        this._textWritersMap.forEach((writer) => writer.keyAdaptor = (item) => item.key);
         this.drawVRM = drawVRM;
         this.drawBearingLine = drawBearingLine;
         this.drawAngleRing = drawAngleRing;
@@ -93,7 +93,6 @@ export default class Plugin {
 
 
 
-
     setDoDrawAngleRing(bool) {
         if (bool === this.drawAngleRing) return;
         this.drawAngleRing = bool;
@@ -101,19 +100,14 @@ export default class Plugin {
     }
 
 
-
-
-
     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;
@@ -157,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])
@@ -201,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])
@@ -291,7 +275,7 @@ export default class Plugin {
             }
         }
         if (this.drawText) {
-            this._textContextInjectionMap.forEach((writer) => writer.draw());
+            this._textWritersMap.forEach((writer) => writer.draw());
         }
         gl.enable(gl.DEPTH_TEST);
     }
@@ -313,9 +297,9 @@ export default class Plugin {
      * @property {number} dashOpacity 0-1
      * @property {number} circleDashAngle 0-360
      * @param {Array<item>} items 
-     * @param {Array<string>} textWriterIDs | textContextInjectionMap keys to be used for writing text.
+     * @param {Array<string>} textWriterIDs | textWritersMap keys to be used for writing text.
      */
-    insertBulk(items, textWriterIDs = []) {
+    insertBulk(items, { textWriterIDs = [] } = {}) {
         const { globe, bufferOrchestrator, bufferManagersCompMap } = this;// angleTextContext, distanceTextContext,
         const data = []
         for (let item of items) {
@@ -329,9 +313,9 @@ export default class Plugin {
 
 
     updateText(textWriterIDs) {
-        const textContextInjectionMap = textWriterGetOrThrow(this._textContextInjectionMap, textWriterIDs);
+        const textWritersMap = textWriterGetOrThrow(this._textWritersMap, textWriterIDs);
         this._memoryForText.forEach((item) => {
-            textContextInjectionMap.forEach((writer) => writer.insertText(item));
+            textWritersMap.forEach((writer) => writer.insertText(item));
         });
         this.globe.DrawRender();
     }
@@ -353,18 +337,18 @@ export default class Plugin {
 
     /**
      * @param {Array<{key, long, lat, endLong, endLat, bearingAngle}>} items
-     * @param {Array<string>} textWriterIDs | textContextInjectionMap keys to be used for writing text.
+     * @param {Array<string>} textWriterIDs | textWritersMap keys to be used for writing text.
      */
-    updateCoordinatesBulk(items, textWriterIDs = []) {
+    updateCoordinatesBulk(items, { textWriterIDs = [] } = {}) {
         const { globe, bufferOrchestrator, bufferManagersCompMap, } = this;
         const data = []
         for (let item of items) {
             data.push(this.__updateCoordsAdaptor(item));
         }
         this.__insertTexts(items, textWriterIDs);
-        bufferOrchestrator.updateBulk(data, bufferManagersCompMap, ["centerCoords2d", "centerCoords3d", "targetCoords2d", "targetCoords3d", "startAngle", "tailAngle",
+        bufferOrchestrator.updateBulk(data, bufferManagersCompMap, ["centerCoords2d", "centerCoords3d", "targetCoords2d", "targetCoords3d",
             "startAngle2d", "tailAngle2d", "startAngle3d", "tailAngle3d", "bearingTargetCoords2d", "bearingTargetCoords3d", "centerCoords2dflat",
-            "bearingAngle", "bigRadius", "radius"]);
+            "bigRadius", "radius"]);
         globe.DrawRender();
     }
 
@@ -375,9 +359,9 @@ export default class Plugin {
      * @param {string} propertyIDs 
      * @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 = []
+     *{ textWriterIDs = []}
      */
-    updatePartial(items, propertyIDs = [], textWriterIDs = []) {
+    updatePartial(items, propertyIDs = [], { textWriterIDs = [] } = {}) {
         if (propertyIDs.length === 0) console.warn("updatePartial is called with no target propertyIDs");
         const fixedPropertyIDs = this.__fixPartialProperties(propertyIDs)
         const { bufferOrchestrator, bufferManagersCompMap } = this;
@@ -397,13 +381,13 @@ export default class Plugin {
 
 
     __insertTexts(items, textWriterIDs) {
-        const textContextInjectionMap = textWriterGetOrThrow(this._textContextInjectionMap, 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);
-            textContextInjectionMap.forEach((writer) => writer.insertText(_item));
+            textWritersMap.forEach((writer) => writer.insertText(_item));
         }
     }
 
@@ -505,7 +489,7 @@ export default class Plugin {
 
 
     _deleteTexts(keys) {
-        this._textContextInjectionMap.forEach((writer) => {
+        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.30-c",
+    "version": "0.6.31-a",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT"

package/write-text/context-text3.js

@@ -160,12 +160,6 @@ export class ContextTextWriter3 {
     }
 
 
-    updateText() {
-        this.itemMap.forEach((v, k, m) => {
-            const { payload } = v;
-            this.insertText(payload, 0, m, payload);
-        });
-    }
 
     clear() {
         this.itemMap.clear();