@pirireis/webglobeplugins 0.4.1-a → 0.5.0

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

@@ -1,19 +1,20 @@
-import { keyMethod } from "./util";
 /**
  * set and get node data 
  * node indexes; 
  */
 export class ChainListMap {
 
-    constructor() {
+    constructor(keyMethod) {
         this._chainMap = new Map();
         this._chainSideProperties = new Map();
         this._indexMap = new Map(); // hold list index of lastly updated nodes. on add delete goes empty
+        this.keyMethod = keyMethod;
     }
 
     getChain(chainKey) {
         if (!this._chainMap.has(chainKey)) this._chainMap.set(chainKey, []);
         return this._chainMap.get(chainKey);
+
     }
 
     /**
@@ -35,6 +36,7 @@ export class ChainListMap {
                 break;
             }
         }
+        node.identity = this.keyMethod(chainKey, node.key);
         this._resetIndexChain(chainKey);
     }
 
@@ -51,7 +53,7 @@ export class ChainListMap {
         const removeSet = new Set(nodeKeys);
         const newChain = []
         for (const node of chain) {
-            const dKey = keyMethod(chainKey, node.key);
+            const dKey = node.identity;
             this._indexMap.delete(dKey);
             if (removeSet.has(node.key)) {
                 compKeys.push(dKey);
@@ -65,7 +67,6 @@ export class ChainListMap {
 
     deleteChainAndReturnChainKeys(chainKey) {
         const keys = this.getNodeKeysOfChain(chainKey);
-        console.log('chainKey', chainKey, "keys", keys);
         this._chainMap.delete(chainKey);
         for (const key of keys) this._indexMap.delete(key);
         return keys;
@@ -74,6 +75,7 @@ export class ChainListMap {
     updateNode(node, chainKey) {
         const index = this.getIndexOfNode(chainKey, node.key)
         const chain = this._chainMap.get(chainKey);
+        node.identity = this.keyMethod(chainKey, node.key);
         chain[index] = node;
     }
 
@@ -81,6 +83,7 @@ export class ChainListMap {
     setChain(chainKey, nodeList) {
         if (this._chainMap.has(chainKey)) this._flushIndexMap();
         this._chainMap.set(chainKey, nodeList);
+        nodeList.forEach((v) => v.identity = this.keyMethod(chainKey, v.key))
     }
 
 
@@ -151,7 +154,7 @@ export class ChainListMap {
 
 
     getIndexOfNode(chainKey, nodeKey) {
-        const key = keyMethod(chainKey, nodeKey);
+        const key = this.keyMethod(chainKey, nodeKey);
         if (this._indexMap.has(key)) return this._indexMap.get(key);
 
         const chain = this._chainMap.get(chainKey);
@@ -172,16 +175,14 @@ export class ChainListMap {
         const chain = this._chainMap.get(chainKey);
         for (let i = 0; i < chain.length; i++) {
             const node = chain[i]
-            this._indexMap.set(keyMethod(chainKey, node.key), i);
+            this._indexMap.set(this.keyMethod(chainKey, node.key), i);
         }
     }
 
     getNodeKeysOfChain(chainKey) {
         const chain = this._chainMap.get(chainKey);
-        console.log("node keys", chain);
         if (!chain) return [];
-        const result = chain.map((v) => keyMethod(chainKey, v.key));
-        console.log("buffer Keys", result);
+        const result = chain.map((v) => v.identity);
         return result
     }
 

package/circle-line-chain/plugin.js

@@ -2,8 +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
 
 
@@ -29,9 +28,9 @@ export class CircleLineChainPlugin {
     constructor(id, { textContextWriterInjectionMap = new Map() } = {}) {
         this.id = id;
         this._textContextWriterInjectionMap = textContextWriterInjectionMap;
-        this._textContextWriterInjectionMap.forEach((writer) => writer.keyAdaptor = (v, i, c, probs) => keyMethod(probs.chainKey, v.key));
+        this._textContextWriterInjectionMap.forEach((writer) => writer.setKeyAdaptor((v, i, c, probs) => v.identity));
         this._opacity = 1;
-        this._chainListMap = new ChainListMap();
+        this._chainListMap = new ChainListMap(keyMethod);
         this.bufferOrchestrator = new BufferOrchestrator({ capacity: 10 });
     }
 
@@ -107,7 +106,6 @@ export class CircleLineChainPlugin {
      * @typedef chain
      * @property {string} chainKey
      * @property {Array<node>} nodes
-     * 
      * @typedef {Object} node
      * @property {string} key
      * @property {number} long
@@ -126,7 +124,7 @@ export class CircleLineChainPlugin {
             });
         }
         this._reconstructChains(chainKeys);
-        this._insertTexts(chainKeys, textWriterIDs);
+        this._updateTexts(chainKeys, textWriterIDs);
     }
 
 
@@ -138,7 +136,7 @@ export class CircleLineChainPlugin {
     updateChainProperties(chainKey, propertyMap, { textWriterIDs = [] } = {}) {
         this._chainListMap.updateChainProperties(chainKey, propertyMap);
         this._reconstructChains([chainKey]);
-        if (textWriterIDs) this._insertTexts([chainKey], textWriterIDs);
+        if (textWriterIDs) this._updateTexts([chainKey], textWriterIDs);
     }
 
     // ---- insertBulk family
@@ -172,7 +170,7 @@ export class CircleLineChainPlugin {
             chainKeysToConstruct.push(chainKey);
         }
         this._reconstructChains(chainKeysToConstruct);
-        if (textWriterIDs) this._insertTexts(chainKeysToConstruct, textWriterIDs);
+        if (textWriterIDs) this._updateTexts(chainKeysToConstruct, textWriterIDs);
     }
 
     /**
@@ -181,20 +179,19 @@ export class CircleLineChainPlugin {
      * @param {*} chainKey 
      * @param {*} theNodeKeyFront | node key of the next node, null places to the last
      */
-    addNode(node, chainKey, { theNodeKeyFront = null, textContextIDs = [] } = {}) {
+    addNode(node, chainKey, { theNodeKeyFront = null, textWriterIDs = [] } = {}) {
         // TODO: if before object is null update the last two elements of the chain only. 
-        console.log("addNode", node, chainKey, theNodeKeyFront);
         this._chainListMap.addNode(node, chainKey, theNodeKeyFront);
-        if (textContextIDs) this._insertTexts([chainKey], textContextIDs);
+        if (textWriterIDs) this._updateTexts([chainKey], textWriterIDs);
         this._reconstructChains([chainKey]);
 
     }
 
 
 
-    updateNodeCoordinates(node, chainKey, { textContextIDs = [] } = {}) {
+    updateNodeCoordinates(node, chainKey, { textWriterIDs = [] } = {}) {
         this._chainListMap.updateNode(node, chainKey);
-        if (textContextIDs) this._insertTexts([chainKey], textContextIDs);
+        if (textWriterIDs) this._updateTexts([chainKey], textWriterIDs);
         this._reconstructChains([chainKey]);
     }
 
@@ -219,9 +216,7 @@ export class CircleLineChainPlugin {
         for (const chainKey of chainKeys) {
             bufferKeys.push(...this._chainListMap.deleteChainAndReturnChainKeys(chainKey));
         }
-        console.log("delete chain keys", chainKeys);
-        console.log("deletechains bufferKeys", bufferKeys);
-        this._insertTexts(chainKeys, this._textContextWriterInjectionMap.keys());
+        this._updateTexts(chainKeys, this._textContextWriterInjectionMap.keys());
         this._textContextWriterInjectionMap.forEach((writer) => writer.deleteTextBulk(bufferKeys));
         this.bufferOrchestrator.deleteBulk(bufferKeys, this.bufferManagersCompMap);
     }
@@ -231,7 +226,7 @@ export class CircleLineChainPlugin {
      * 
      * @param {Array<{key, nodeKeys:[]} keysAndNodes
      */
-    deleteNodes(keysAndNodes) {
+    deleteNodes(keysAndNodes, { textWriterIDs = [] } = {}) {
         const bufferKeys = [];
         const chainKeysToReconstuct = [];
         keysAndNodes.forEach(({ chainKey, nodeKeys }) => {
@@ -240,13 +235,14 @@ export class CircleLineChainPlugin {
         });
         this._reconstructChains(chainKeysToReconstuct);
         this._textContextWriterInjectionMap.forEach((writer) => writer.deleteTextBulk(bufferKeys));
+        if (textWriterIDs) this._updateTexts(chainKeysToReconstuct, textWriterIDs)
         this.bufferOrchestrator.deleteBulk(bufferKeys, this.bufferManagersCompMap);
     }
 
 
     // implicit
 
-    _insertTexts(chainKeys, textWriterIDs) {
+    _updateTexts(chainKeys, textWriterIDs) {
         const textWriters = textWriterIDs.map((v) => this._textContextWriterInjectionMap.get(v));
         chainKeys.forEach((chainKey) => {
             this._chainListMap.textUpdate(chainKey, textWriters);
@@ -276,7 +272,7 @@ export class CircleLineChainPlugin {
                 lat: v.lat,
                 targetLong: array[i + 1].long,
                 targetLat: array[i + 1].lat,
-                key: keyMethod(probs.chainKey, v.key)
+                key: v.identity
             }
         }
         const bulkData = [];

package/package.json

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

package/write-text/context-text2.js

@@ -14,6 +14,9 @@ const defaultStyle = {
     zMode: CSZMode.Z_GROUND_PERVERTEX,
 }
 
+/**
+ * keyAdaptor should be set but higher context since it nows key methods and key method might be implicit to user
+ */
 export class ContextTextWriter2 {
     constructor(globe, { style = null, doDraw = true, textAdaptor = null, coordinatesAdaptor = null, keyAdaptor = null, opacityAdaptor = null } = {}) {
         this.globe = globe;
@@ -32,6 +35,9 @@ export class ContextTextWriter2 {
         }
     }
 
+    setKeyAdaptor(adaptor) {
+        this.keyAdaptor = adaptor;
+    }
 
     setDoDraw(bool) {
         this.doDraw = bool;