@pirireis/webglobeplugins 0.15.7-alpha → 0.15.9-alpha

package/package.json

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

package/range-tools-on-terrain/circle-line-chain/adapters.js

@@ -9,12 +9,11 @@ export const circleDataAdaptor = (globe, chain) => {
     const { chainKey, chainProperties, nodes } = chain;
     for (let i = 0; i < nodes.length - 1; i++) {
         const node = nodes[i];
-        const { key, long, lat, circleProperties } = node;
-        const color = circleProperties?.rgba ?? chainProperties.rgba ?? [1, 1, 1, 1]; // Default color if not specified
-        if (key === "Sakarya") {
-            console.log("circleProperties", circleProperties, "chainProperties", chainProperties);
-            console.log("Sakarya color", color);
-        }
+        // const circleOn = nodes[i + 1]?.circleOn ?? true; // Default to true if not specified
+        const { key, long, lat, circleProperties, circleOn = true } = node;
+        if (!circleOn)
+            continue; // Skip if circle is not enabled for this node
+        const color = circleProperties?.rgba ?? chainProperties.rgba ?? [1, 1, 1, 1]; // Default color if not specifie
         const radius = globe.Math.GetDist2D(long, lat, nodes[i + 1].long, nodes[i + 1].lat);
         const nodeKey = keyMethod(chainKey, key);
         circleInputs.push({
@@ -32,8 +31,11 @@ export function arcDataAdaptor(chain) {
     const { chainKey, chainProperties, nodes } = chain;
     for (let i = 0; i < nodes.length - 1; i++) {
         const node = nodes[i];
+        // const arcOn = nodes[i + 1]?.arcOn ?? true; // Default to true if not specified
         const nextNode = nodes[i + 1];
-        const { key, long, lat, lineProperties } = node;
+        const { key, long, lat, lineProperties, arcOn = true } = node;
+        if (!arcOn)
+            continue; // Skip if arc is not enabled for this node
         const nodeKey = keyMethod(chainKey, key);
         const { long: nextLong, lat: nextLat } = nextNode;
         const color = lineProperties?.rgba ?? chainProperties.rgba ?? [1, 1, 1, 1]; // Default color if not specified
@@ -53,7 +55,10 @@ export function lineDataAdaptor(chain) {
     for (let i = 0; i < nodes.length - 1; i++) {
         const node = nodes[i];
         const nextNode = nodes[i + 1];
-        const { key, long, lat, lineProperties } = node;
+        // const lineOn = nextNode?.lineOn ?? true; // Default to true if not specified
+        const { key, long, lat, lineProperties, lineOn = true } = node;
+        if (!lineOn)
+            continue; // Skip if line is not enabled for this node
         const nodeKey = keyMethod(chainKey, key);
         const { long: nextLong, lat: nextLat } = nextNode;
         const color = lineProperties?.rgba ?? chainProperties.rgba ?? [1, 1, 1, 1]; // Default color if not specified

package/range-tools-on-terrain/circle-line-chain/chain-list-map.js

@@ -114,13 +114,13 @@ export class ChainListMap {
         chain[index] = node;
     }
     updateNodesProperties(chainKey, nodes) {
+        const chain = this._chainMap.get(chainKey);
+        if (!chain)
+            return;
         nodes.forEach((node) => {
             const index = this.getIndexOfNode(chainKey, node.key);
             if (index === undefined)
                 return;
-            const chain = this._chainMap.get(chainKey);
-            if (!chain)
-                return;
             const chainNode = chain[index];
             if (node.circleProperties) {
                 if (typeof chainNode.circleProperties !== 'object')
@@ -136,6 +136,12 @@ export class ChainListMap {
                     chainNode.lineProperties[key] = value;
                 });
             }
+            if (node.circleOn !== undefined)
+                chainNode.circleOn = node.circleOn;
+            if (node.arcOn !== undefined)
+                chainNode.arcOn = node.arcOn;
+            if (node.lineOn !== undefined)
+                chainNode.lineOn = node.lineOn;
         });
     }
     updateCoordsinatesOfNode(node, chainKey) {

package/range-tools-on-terrain/circle-line-chain/plugin.js

@@ -116,11 +116,17 @@ export class CircleLineChainPlugin {
             if (this._chainListMap.hasChain(chainKey)) {
                 chainsToClean.push(chainKey);
             }
+        }
+        this._cleanChainsFromSemiPlugins(chainsToClean);
+        for (const { chainKey, chainProperties, nodes } of chains) {
+            if (!chainKey || !chainProperties || !nodes || nodes.length === 0) {
+                console.warn("Invalid chain data, skipping insertion.");
+                continue;
+            }
             this._chainListMap.setChain(chainKey, nodes);
             this._chainListMap.setChainProperties(chainKey, chainProperties);
             chainKeys.push(chainKey);
         }
-        this._cleanChainsFromSemiPlugins(chainsToClean);
         // Reconstruct chains
         this._reconstructChains(chainKeys);
         // Update texts
@@ -191,17 +197,44 @@ export class CircleLineChainPlugin {
         this._updateTexts(chainKeysToReconstruct, Array.from(this._textWritersMap.keys()));
         this.globe?.DrawRender();
     }
-    updateNodesProperties(chainKey, nodesAndPropertyMap, { textWriterIDs = [] } = {}) {
+    updateNodesProperties(chainKey, nodesAndPropertyList, { textWriterIDs = [] } = {}) {
         if (this._freed) {
             console.warn("CircleLineChainPlugin is freed, cannot update nodes properties.");
             return;
         }
-        this._chainListMap.updateNodesProperties(chainKey, nodesAndPropertyMap);
+        this._chainListMap.updateNodesProperties(chainKey, nodesAndPropertyList);
         this._cleanChainsFromSemiPlugins([chainKey]);
         this._reconstructChains([chainKey]);
         this._updateTexts([chainKey], textWriterIDs);
         this.globe?.DrawRender();
     }
+    updateChainDrawOptionsProperties(chainKey, drawOptions) {
+        if (this._freed) {
+            console.warn("CircleLineChainPlugin is freed, cannot update chain draw options properties.");
+            return;
+        }
+        const chain = this._chainListMap.getChain(chainKey);
+        if (!chain) {
+            console.warn(`Chain with key ${chainKey} not found.`);
+            return;
+        }
+        const { nodes } = chain;
+        nodes.forEach((node) => {
+            if (drawOptions.circleOn !== undefined) {
+                node.circleOn = drawOptions.circleOn;
+            }
+            if (drawOptions.arcOn !== undefined) {
+                node.arcOn = drawOptions.arcOn;
+            }
+            if (drawOptions.line !== undefined) {
+                node.lineOn = drawOptions.line;
+            }
+        });
+        this._cleanChainsFromSemiPlugins([chainKey]);
+        this._reconstructChains([chainKey]);
+        this._updateTexts([chainKey], Array.from(this._textWritersMap.keys()));
+        this.globe?.DrawRender();
+    }
     updateCoordinatesBulk(chains, { textWriterIDs = [] } = {}) {
         if (this._freed) {
             console.warn("CircleLineChainPlugin is freed, cannot update coordinates.");