@pirireis/webglobeplugins 0.5.3-a → 0.5.4

package/circle-line-chain/chain-list-map.js

@@ -25,16 +25,24 @@ export class ChainListMap {
      */
     addNode(node, chainKey, theNodeKeyFront = null) {
         const chain = this.getChain(chainKey);
-        if (theNodeKeyFront == null) {
-            chain.push(node);
-            return;
-        }
+        let frontIndex = null;
         for (let i = 0; i < chain.length; i++) {
             const n_ode = chain[i];
-            if (n_ode.key == theNodeKeyFront) {
-                chain.splice(i, 0, node);
-                break;
+            if (n_ode.key === node.key) {
+                throw new Error("Chain node already exists");
             }
+            if (n_ode.key === theNodeKeyFront) {
+                frontIndex = i;
+            }
+        }
+        if (theNodeKeyFront !== null) {
+            if (frontIndex !== null) {
+                chain.splice(frontIndex, 0, node);
+            } else {
+                throw new Error("Could not find theNodeKeyFront");
+            }
+        } else {
+            chain.push(node);
         }
         node.__identity__ = this.keyMethod(chainKey, node.key);
         this._resetIndexChain(chainKey);
@@ -49,20 +57,20 @@ export class ChainListMap {
 
     deleteNodesBelongToAChain(chainKey, nodeKeys) {
         const chain = this._chainMap.get(chainKey);
-        const compKeys = [];
+        const deleteKeys = [];
         const removeSet = new Set(nodeKeys);
         const newChain = []
         for (const node of chain) {
             const dKey = node.__identity__;
             this._indexMap.delete(dKey);
             if (removeSet.has(node.key)) {
-                compKeys.push(dKey);
+                deleteKeys.push(dKey);
             } else {
                 newChain.push(node);
             }
         }
         this._chainMap.set(chainKey, newChain);
-        return compKeys;
+        return deleteKeys;
     }
 
     deleteChainAndReturnChainKeys(chainKey) {
@@ -80,11 +88,20 @@ export class ChainListMap {
     }
 
 
-    updateCoordsinatesOfNode(node, chainKey) {
+    updateNodeProperties(node, chainKey) {
+        const index = this.getIndexOfNode(chainKey, node.key)
+        const chainNode = this._chainMap.get(chainKey)[index];
+        if (node.circleProperties) {
+            node.circleProperties.forEach((value, key, container) => chainNode[key] = value);
+        }
+        if (node.lineProperties) {
+            node.lineProperties.forEach((value, key, container) => chainNode[key] = value);
+        }
+    }
 
+    updateCoordsinatesOfNode(node, chainKey) {
         const index = this.getIndexOfNode(chainKey, node.key)
         const chain = this._chainMap.get(chainKey);
-        node.__identity__ = this.keyMethod(chainKey, node.key);
         chain[index].long = node.long;
         chain[index].long = node.lat;
 

package/circle-line-chain/plugin.js

@@ -2,7 +2,7 @@ import { LineOnGlobeCache } from '../programs/line-on-globe/naive';
 import { CircleCache } from '../programs/line-on-globe/circle';
 import { BufferOrchestrator, BufferManager } from "../util/account";
 import { ChainListMap } from "./chain-list-map";
-import { keyMethod } from './util';
+import { keyMethod } from "./util";
 // TODO: Add update buffer and update text mehods on add, delete, update methods
 
 
@@ -110,7 +110,6 @@ export class CircleLineChainPlugin {
             );
             // (startPotisionBufferObj, endPositionBufferObj, dashRatioBufferObj, colorBufferObj)
             const obj = function (bufferManagerComp) {
-                console.log(bufferManagerComp);
                 return { 'buffer': bufferManagerComp.bufferManager.buffer, 'stride': 0, 'offset': 0 }
             };
             this.lineVao = this.lineProgram.createVAO(
@@ -159,6 +158,18 @@ export class CircleLineChainPlugin {
     }
 
 
+    /**
+     * 
+     * @param {*} chainKey 
+     * @param {Array<{nodeKey, Map[propertyName ,value]}} propertyMap 
+     */
+    updateNodeProperties(chainKey, nodesAndPropertyMap, { textWriterIDs = [] } = {}) {
+        this._chainListMap.updateNodeProperties(chainKey, nodesAndPropertyMap)
+        this._reconstructChains([chainKey]);
+        this._textUpdate(chainKey, textWriterIDs);
+        this.globe.DrawRender();
+    }
+
     /**
      * 
      * @param {*} chainKey 
@@ -199,6 +210,7 @@ export class CircleLineChainPlugin {
         }
         this._reconstructChains(chainKeysToConstruct);
         if (textWriterIDs) this._updateTexts(chainKeysToConstruct, textWriterIDs);
+        this.globe.DrawRender();
     }
 
     /**
@@ -212,6 +224,7 @@ export class CircleLineChainPlugin {
         this._chainListMap.addNode(node, chainKey, theNodeKeyFront);
         if (textWriterIDs) this._updateTexts([chainKey], textWriterIDs);
         this._reconstructChains([chainKey]);
+        this.globe.DrawRender();
 
     }
 
@@ -221,6 +234,7 @@ export class CircleLineChainPlugin {
         this._chainListMap.updateNode(node, chainKey);
         if (textWriterIDs) this._updateTexts([chainKey], textWriterIDs);
         this._reconstructChains([chainKey]);
+        this.globe.DrawRender();
     }
 
 
@@ -251,6 +265,7 @@ export class CircleLineChainPlugin {
         this._updateTexts(chainKeys, this._textContextWriterInjectionMap.keys());
         this._textContextWriterInjectionMap.forEach((writer) => writer.deleteTextBulk(bufferKeys));
         this.bufferOrchestrator.deleteBulk(bufferKeys, this.bufferManagersCompMap);
+        this.globe.DrawRender();
     }
 
 
@@ -267,8 +282,10 @@ export class CircleLineChainPlugin {
         });
         this._reconstructChains(chainKeysToReconstuct);
         this._textContextWriterInjectionMap.forEach((writer) => writer.deleteTextBulk(bufferKeys));
-        if (textWriterIDs) this._updateTexts(chainKeysToReconstuct, textWriterIDs)
+        // if (textWriterIDs) this._updateTexts(chainKeysToReconstuct, textWriterIDs)
         this.bufferOrchestrator.deleteBulk(bufferKeys, this.bufferManagersCompMap);
+        this.globe.DrawRender();
+
     }
 
 

package/package.json

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

package/util/account/single-attribute-buffer-management/buffer-manager.js

@@ -54,7 +54,6 @@ export class BufferManager {
         const offsetMultiplier = itemSize * 4;
         for (let i = 0; i < blocks.length; i++) {
             const block = blocks[i];
-            console.log(block)
             const offset = offsets[i] * offsetMultiplier;
             if (offset !== undefined) gl.bufferSubData(gl.ARRAY_BUFFER, offset, block);
         }
@@ -68,12 +67,10 @@ export class BufferManager {
 
         const newArray = new Float32Array(newCapacity * itemSize);
         const bufferData = this._getBufferData(occupiedCapacity);
-        // console.log("bufferData", bufferData);
         let newOffset = 0;
         for (const offset of offsetValues) {
             const itemOffset = offset * itemSize;
             newArray.set(bufferData.slice(itemOffset, itemOffset + itemSize), newOffset);
-            // console.log("oldOffset", itemOffset, "newOffset", newOffset);
             newOffset += itemSize;
         }
 
@@ -88,7 +85,6 @@ export class BufferManager {
         const { gl, buffer, bufferType } = this;
         const itemSize = this.itemSize;
         const bufferData = this._getBufferData(occupiedCapacity);
-        // console.log("extending buffer from", occupiedCapacity, "to", newCapacity, 'item size', itemSize);
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
         gl.bufferData(gl.ARRAY_BUFFER, newCapacity * itemSize * 4, gl[bufferType]);
         gl.bufferSubData(gl.ARRAY_BUFFER, 0, bufferData);
@@ -97,9 +93,7 @@ export class BufferManager {
 
     _getBufferData(occupiedCapacity) {
         const { gl, buffer } = this;
-        // console.log(occupiedCapacity, this.itemSize)
         const size = occupiedCapacity * this.itemSize;
-        // console.log("size", size);
         const bufferData = new Float32Array(size);
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
         gl.getBufferSubData(gl.ARRAY_BUFFER, 0, bufferData);

package/util/account/single-attribute-buffer-management/buffer-orchestrator.js

@@ -129,23 +129,26 @@ export class BufferOrchestrator {
         const { offsetMap } = this;
         const offsets = [];
         for (const item of items) {
-            const offset = offsetMap.get(item.key) || this.nextOffset();
+            let o = offsetMap.get(item.key);
+            const offset = o !== undefined ? o : this.nextOffset();
             offsetMap.set(item.key, offset);
             offsets.push(offset);
         }
         for (const [key, { bufferManager, adaptor }] of bufferManagersMap) {
             bufferManager.insertBulk(items.map(adaptor), offsets);
         }
+
     }
 
 
-    // doesnot assign offset to the new items.
+    // does not assign offset to the new items.
     updateBulk(items, bufferManagersMap, bufferKeys) {
         const { offsetMap } = this;
         const offsets = [];
         for (const item of items) {
             const offset = offsetMap.get(item.key);
-            offsets.push(offset);
+            if (offset !== undefined) { offsets.push(offset); } else { throw new Error("updateBulk item Key does not exist"); }
+
         }
         if (bufferKeys) {
             for (const key of bufferKeys) {
@@ -174,7 +177,6 @@ export class BufferOrchestrator {
         for (const [key, { bufferManager }] of bufferManagersMap) {
             bufferManager.deleteBulk(offsets);
         }
-        //console.log("deleteBulk after item size", this.offsetMap.size);
     }
 
 
@@ -198,9 +200,7 @@ export class BufferOrchestrator {
     autoExtendBuffers(itemsLength, bufferManagersMap) {
         if (itemsLength <= this.emptySpace) return;
         const newCapacity = this.length + itemsLength;
-        //console.log("autoExtendBuffers", "item L", itemsLength, "E space", this.emptySpace, "cap", this.capacity, "length", this.length, 'new Cap', newCapacity);
         for (const [key, { bufferManager }] of bufferManagersMap) {
-            //console.log("length", this.length, "newCapacity", newCapacity);
             bufferManager.extendBuffer(this.length, newCapacity);
         }
         this._capacity = newCapacity;
@@ -235,7 +235,6 @@ export class BufferOrchestrator {
         const newOffsetMap = new Map();
         let newOffset = 0;
         for (const [key, offset] of this.offsetMap) {
-            //console.log("defrag", key, offset, newOffset);
             newOffsetMap.set(key, newOffset++);
         }
         this.offsetMap = newOffsetMap

package/write-text/context-text2.js

@@ -134,7 +134,6 @@ export class ContextTextWriter2 {
         if (text == null) return;
         const opacity = this.opacityAdaptor(item, id, container, properties);
         const angle = this.angleAdaptor(item, id, container, properties);
-        console.log(angle, "angle")
         const key = this.keyAdaptor(item, id, container, properties)
         this.itemMap.set(key, { long: coords.long, lat: coords.lat, text, opacity, angle });
     }