@pirireis/webglobeplugins 0.5.5 → 0.5.7

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

@@ -48,19 +48,14 @@ export class ChainListMap {
         this._resetIndexChain(chainKey);
     }
 
-    deleteNode(chainKey, nodeKey) {
-        const index = this.getIndexOfNode(chainKey, nodeKey);
-        const chain = this._chainMap.get(chainKey);
-        chain.splice(index, 1);
-        this._resetIndexChain(chainKey);
-    }
 
     deleteNodesBelongToAChain(chainKey, nodeKeys) {
         const chain = this._chainMap.get(chainKey);
         const deleteKeys = [];
         const removeSet = new Set(nodeKeys);
         const newChain = []
-        for (const node of chain) {
+        for (let i = 0; i < chain.length - 1; i++) {
+            const node = chain[i];
             const dKey = node.__identity__;
             this._indexMap.delete(dKey);
             if (removeSet.has(node.key)) {
@@ -69,6 +64,21 @@ export class ChainListMap {
                 newChain.push(node);
             }
         }
+        { // last item case
+            const lastItem = chain[chain.length - 1];
+            if (removeSet.has(lastItem.key)) {
+                this._indexMap.delete(lastItem.__identity__);
+                console.log("lastItem", lastItem);
+                if (chain.length > 1) {
+                    console.log(chain[chain.length - 2])
+                    deleteKeys.push(chain[chain.length - 2].__identity__);
+                    deleteKeys.push(chain[chain.length - 1].__identity__);
+                };
+            } else {
+                newChain.push(lastItem);
+            }
+        }
+        console.log("deleteKeys");
         this._chainMap.set(chainKey, newChain);
         return deleteKeys;
     }
@@ -160,10 +170,10 @@ export class ChainListMap {
      */
     textUpdate(chainKey, textWriterObjs) {
         const chain = this._chainMap.get(chainKey);
+        console.log(chainKey, this._chainMap, "chain", chain)
         if (!chain) return;
         const properties = this._chainSideProperties.get(chainKey);
         textWriterObjs.forEach((writer) => {
-
             writer.insertTextBulk(chain, properties);
         });
 

package/circle-line-chain/plugin.js

@@ -166,7 +166,7 @@ export class CircleLineChainPlugin {
     updateNodeProperties(chainKey, nodesAndPropertyMap, { textWriterIDs = [] } = {}) {
         this._chainListMap.updateNodeProperties(chainKey, nodesAndPropertyMap)
         this._reconstructChains([chainKey]);
-        this._textUpdate(chainKey, textWriterIDs);
+        this._updateTexts(chainKey, textWriterIDs);
         this.globe.DrawRender();
     }
 
@@ -271,7 +271,7 @@ export class CircleLineChainPlugin {
 
     /**
      * 
-     * @param {Array<{key, nodeKeys:[]} keysAndNodes
+     * @param {Array<{chainKey, nodeKeys:[]} keysAndNodes
      */
     deleteNodes(keysAndNodes) {
         const bufferKeys = [];
@@ -294,6 +294,7 @@ export class CircleLineChainPlugin {
     _updateTexts(chainKeys, textWriterIDs) {
         const textWriters = textWriterIDs.map((v) => this._textContextWriterInjectionMap.get(v));
         chainKeys.forEach((chainKey) => {
+            console.log("textUpdate");
             this._chainListMap.textUpdate(chainKey, textWriters);
         })
     }

package/package.json

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

package/write-text/context-text2.js

@@ -128,13 +128,19 @@ export class ContextTextWriter2 {
 
 
     insertText(item, id, container, properties) {
+        const key = this.keyAdaptor(item, id, container, properties)
         const coords = this.coordinatesAdaptor(item, id, container, properties)
-        if (coords == null) return;
+        if (coords == null) {
+            this.itemMap.delete(key);
+            return;
+        }
         const text = this.textAdaptor(item, id, container, properties)
-        if (text == null) return;
+        if (text == null) {
+            this.itemMap.delete(key);
+            return
+        };
         const opacity = this.opacityAdaptor(item, id, container, properties);
         const angle = this.angleAdaptor(item, id, container, properties);
-        const key = this.keyAdaptor(item, id, container, properties)
         this.itemMap.set(key, { long: coords.long, lat: coords.lat, text, opacity, angle });
     }