@pirireis/webglobeplugins 0.15.1-alpha → 0.15.2-3.alpha

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({
@@ -23,6 +22,7 @@ export const circleDataAdaptor = (globe, chain) => {
             radius,
             height: chainProperties.altitude ?? 0,
             color: color,
+            msl: chainProperties.msl ?? null
         });
     }
     return circleInputs;
@@ -32,8 +32,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
@@ -43,6 +46,7 @@ export function arcDataAdaptor(chain) {
             end: [nextLong, nextLat],
             height: chainProperties.altitude ?? 0,
             color: color,
+            msl: chainProperties.msl ?? null
         });
     }
     return arcInputs;
@@ -53,7 +57,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

@@ -1,7 +1,3 @@
-/**
- * set and get node data
- * node indexes;
- */
 export class ChainListMap {
     _chainMap;
     _chainSideProperties;
@@ -79,6 +75,9 @@ export class ChainListMap {
                     deleteKeys.push(chain[chain.length - 2].__identity__);
                     deleteKeys.push(chain[chain.length - 1].__identity__);
                 }
+                else if (chain.length === 1) {
+                    deleteKeys.push(lastItem.__identity__);
+                }
             }
             else {
                 newChain.push(lastItem);
@@ -87,10 +86,15 @@ export class ChainListMap {
         this._chainMap.set(chainKey, newChain);
         return deleteKeys;
     }
-    deleteChainAndReturnChainKeys(chainKey) {
+    deleteChainAndReturnChainKeys(chainKey, textWritersMap = null) {
         const keys = this.getNodeKeysOfChain(chainKey);
+        if (textWritersMap && textWritersMap.size > 0) {
+            textWritersMap.forEach((writer) => {
+                writer.deleteTextBulk(keys);
+            });
+        }
         this._chainMap.delete(chainKey);
-        this._chainSideProperties.delete(chainKey); // TODO: this might be this way but adding this know can cause side effects
+        this._chainSideProperties.delete(chainKey);
         for (const key of keys)
             this._indexMap.delete(key);
         return keys;
@@ -106,13 +110,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')
@@ -128,6 +132,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) {
@@ -163,13 +173,25 @@ export class ChainListMap {
             memoryProperties[key] = value;
         });
     }
-    // TODO: bad name clean up, need to check on frontend
-    getNodeProperties(chainKey) {
-        return this._chainSideProperties.get(chainKey);
-    }
+    // getNodeProperties(chainKey: string): ChainProperties | undefined {
+    //     return this._chainSideProperties.get(chainKey);
+    // }
     getChainProperties(chainKey) {
         return this._chainSideProperties.get(chainKey);
     }
+    deleteTexts(chainKeys, textWriters) {
+        if (!textWriters || textWriters.size === 0)
+            return;
+        textWriters.forEach((writer) => {
+            chainKeys.forEach((chainKey) => {
+                const chain = this._chainMap.get(chainKey);
+                if (!chain)
+                    return;
+                const keys = chain.map((node) => node.__identity__);
+                writer.deleteTextBulk(keys);
+            });
+        });
+    }
     /**
      *
      * @param chainKey

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

@@ -27,6 +27,7 @@ export class CircleLineChainPlugin {
             variativeColorsOn: false,
             defaultColor: [1, 1, 1, 1],
             defaultHeightFromGroundIn3D: 30,
+            isMSL: false
         },
         arcOnTerrainOptions: {
             flatViewOn: true,
@@ -35,7 +36,8 @@ export class CircleLineChainPlugin {
             defaultColor: [1, 1, 1, 1],
             defaultHeightFromGroundIn3D: 0,
             vertexCount: 32,
-            cameraAttractionIsOn: true // If true, camera attraction is enabled else evenly distributed arc points are used
+            cameraAttractionIsOn: true, // If true, camera attraction is enabled else evenly distributed arc points are used
+            isMSL: false, // If true, no elevation of terrain
         },
         lineOptions: {
             flatViewOn: true,
@@ -45,7 +47,7 @@ export class CircleLineChainPlugin {
             dashedLineOpacityVariativeOn: false,
             dashedLineRatioVariativeOn: false,
             bufferType: "DYNAMIC_DRAW",
-            opacity: 1.0
+            opacity: 1.0,
         }
     };
     constructor(id, { drawCircleOn, textWritersMap, textDataPreAdaptor, opacities, lineAdaptor, arcAdaptor, circleAdaptor, arcOnTerrainOptions, circleOnTerrainOptions, lineOptions } = {}) {
@@ -116,11 +118,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
@@ -150,12 +158,23 @@ export class CircleLineChainPlugin {
         this.globe?.DrawRender();
     }
     setOpacities(opacities) {
-        // TODO: Check opacities
+        if (this._freed) {
+            console.warn("CircleLineChainPlugin is freed, cannot set opacities.");
+            return;
+        }
         this._opacities = {
             ...this._opacities,
             ...opacities
         };
-        // set Opacities of plugins
+        this.globe?.DrawRender();
+    }
+    setElevationMode(mode) {
+        if (this._freed) {
+            console.warn("CircleLineChainPlugin is freed, cannot set elevation mode.");
+            return;
+        }
+        this.arcPlugin?.setElevationMode(mode);
+        this.circlePlugin?.setElevationMode(mode);
         this.globe?.DrawRender();
     }
     deleteChains(chainKeys) {
@@ -164,7 +183,7 @@ export class CircleLineChainPlugin {
             return;
         }
         for (const chainKey of chainKeys) {
-            const keys = this._chainListMap.deleteChainAndReturnChainKeys(chainKey);
+            const keys = this._chainListMap.deleteChainAndReturnChainKeys(chainKey, this._textWritersMap);
             if (keys.length <= 1) {
                 console.warn("No chains were deleted, chainKeys might be invalid.");
                 return;
@@ -175,33 +194,61 @@ export class CircleLineChainPlugin {
             this.circlePlugin?.deleteBulk(keys);
             this._updateTexts(chainKeys, Array.from(this._textWritersMap.keys()));
         }
+        this.globe?.DrawRender();
     }
-    deleteNodes(keysAndNodes, { textWriterIDs = [] } = {}) {
+    deleteNodes(keysAndNodes) {
         if (this._freed) {
             console.warn("CircleLineChainPlugin is freed, cannot delete nodes.");
             return;
         }
-        const chainKeysToReconstruct = [];
+        const chainKeysToReconstruct = keysAndNodes.map(({ chainKey }) => chainKey);
+        // this._chainListMap.deleteTexts(chainKeysToReconstruct, this._textWritersMap); // TODO: delete this method from chain-list-map
+        this._cleanChainsFromSemiPlugins(chainKeysToReconstruct);
         keysAndNodes.forEach(({ chainKey, nodeKeys }) => {
             this._chainListMap.deleteNodesBelongToAChain(chainKey, nodeKeys);
-            chainKeysToReconstruct.push(chainKey);
         });
-        this._cleanChainsFromSemiPlugins(chainKeysToReconstruct);
         this._reconstructChains(chainKeysToReconstruct);
-        this._updateTexts(chainKeysToReconstruct, textWriterIDs);
+        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.");
@@ -253,6 +300,15 @@ export class CircleLineChainPlugin {
         this.globe?.DrawRender();
     }
     setDefaultSemiPluginColor(semiPluginName, color) {
+        if (semiPluginName === "ALL") {
+            this._semiPluginOptions.circleOnTerrainOptions.defaultColor = color;
+            this._semiPluginOptions.arcOnTerrainOptions.defaultColor = color;
+            this._semiPluginOptions.lineOptions.defaultColor = color;
+            this.circlePlugin?.setDefaultColor(color);
+            this.arcPlugin?.setDefaultColor(color);
+            this.linePlugin?.setDefaultColor(color);
+            return;
+        }
         switch (semiPluginName) {
             case "circleOnTerrain":
                 this._semiPluginOptions.circleOnTerrainOptions.defaultColor = color;
@@ -294,7 +350,11 @@ export class CircleLineChainPlugin {
         for (const chainKey of chainKeys) {
             // Clean chains from text writers
             const nodeKeys = this._chainListMap.getNodeKeysOfChain(chainKey);
+            this._textWritersMap.forEach((writer) => {
+                writer.deleteTextBulk(nodeKeys);
+            });
             nodeKeys.pop(); // Remove the last key which is destination of the last circle
+            // Clean chains from semi-plugins
             this.circlePlugin?.deleteBulk(nodeKeys);
             this.linePlugin?.deleteBulk(nodeKeys);
             this.arcPlugin?.deleteBulk(nodeKeys);
@@ -345,7 +405,7 @@ export class CircleLineChainPlugin {
         }
         const circleOpacity = getOpacity(this._opacities, "circle");
         if (this._drawCircleOn && circleOpacity !== 0) {
-            this.circlePlugin?.setPluginOpacity(circleOpacity);
+            this.circlePlugin?.setPluginOpacity(circleOpacity, false);
             this.circlePlugin?.draw3D();
         }
         const currentGeometry = globe.api_GetCurrentGeometry();
@@ -354,12 +414,12 @@ export class CircleLineChainPlugin {
                 // globe view
                 const lineOpacity = getOpacity(this._opacities, "globeArc");
                 if (lineOpacity !== 0) {
-                    this.linePlugin?.setPluginOpacity(lineOpacity);
+                    this.linePlugin?.setPluginOpacity(lineOpacity, false);
                     this.linePlugin?.draw3D();
                 }
                 const arcOpacity = getOpacity(this._opacities, "globeArcFitsTerrain");
                 if (arcOpacity !== 0) {
-                    this.arcPlugin?.setPluginOpacity(arcOpacity);
+                    this.arcPlugin?.setPluginOpacity(arcOpacity, false);
                     this.arcPlugin?.draw3D();
                 }
                 break;

package/range-tools-on-terrain/range-ring/adapters.js

@@ -7,19 +7,87 @@
 //         altitude: rangeRing.altitude,
 //     };
 // }
+export const keyAdapter = (centerID, rangeID) => {
+    return `${centerID}-${rangeID}`;
+};
+export const allCircleKeysAdapter = (rangeRing) => {
+    const result = new Array(rangeRing.rings.length);
+    for (let i = 0; i < rangeRing.rings.length; i++) {
+        result[i] = keyAdapter(rangeRing.centerID, rangeRing.rings[i].ringID);
+    }
+    return result;
+};
 export const rangeRingToCircleInputAdapter = (rangeRing) => {
+    const centerID = rangeRing.centerID;
     return rangeRing.rings.map(ring => ({
-        key: ring.rindID,
+        key: keyAdapter(centerID, ring.ringID),
         center: [rangeRing.long, rangeRing.lat],
         radius: ring.radius,
         color: rangeRing.rgba,
         altitude: rangeRing.altitude,
     }));
 };
-function rangeRingToPaddingsCoordinatesAdapter(globe, center, rangeRing, startAngle, stepAngle) {
-    return new Float32Array();
+export const allArcKeysAdapter = (rangeRing) => {
+    const arcEachRing = Math.ceil(360 / rangeRing.stepAngle);
+    const result = new Array(arcEachRing * rangeRing.rings.length);
+    for (let i = 0; i < rangeRing.rings.length; i++)
+        for (let j = 0; j < arcEachRing; j++)
+            result[i * arcEachRing + j] = keyAdapter(rangeRing.centerID, rangeRing.rings[i].ringID) + `-${j}`;
+    return result;
+};
+export const rangeRingToArcInputAdapter = (globe, rangeRingInput) => {
+    const { long, lat, stepAngle, altitude = 0, rgba, rings } = rangeRingInput;
+    const arcEachRing = Math.ceil(360 / stepAngle);
+    const result = new Array(rings.length * arcEachRing);
+    for (let i = 0; i < rings.length; i++) {
+        const ring = rings[i];
+        for (let j = 0; j < arcEachRing; j++) {
+            const angle = Math.min(stepAngle * j, 360);
+            const startLongLat = globe.Math.FindPointByPolar(long, lat, ring.radius, angle);
+            const endLongLat = globe.Math.FindPointByPolar(long, lat, ring.radius - ring.padding, angle);
+            result[i * arcEachRing + j] = {
+                key: keyAdapter(rangeRingInput.centerID, ring.ringID) + `-${j}`,
+                start: [startLongLat.long, startLongLat.lat],
+                end: [endLongLat.long, endLongLat.lat],
+                color: rgba,
+                height: altitude,
+            };
+        }
+    }
+    return result;
+};
+export function createColorRatios(color, stepAngle, colorFade = 0.4) {
+    const angleCount = Math.ceil(360 / stepAngle) * 2;
+    let angleLeft = 360;
+    const result = new Array(angleCount);
+    for (let i = 0; i < angleCount; i++) {
+        const currentAngle = Math.min(stepAngle, angleLeft);
+        angleLeft -= currentAngle;
+        result[i * 2] = {
+            color: [0, 0, 0, 0],
+            ratio: 1,
+        };
+        const colorRatio = {
+            // color: i % 2 === 0 ? color : [color[0] * colorFade, color[1] * colorFade, color[2] * colorFade, color[3]] as Color,
+            color: i % 2 === 0 ? color : [1 - color[0] * colorFade, 1 - color[1] * colorFade, 1 - color[2] * colorFade, color[3]],
+            ratio: currentAngle - 1
+        };
+        result[i * 2 + 1] = colorRatio;
+    }
+    return result;
 }
-export const rangeRingToArcInputAdapter = (globe, rangeRing) => {
-    // TODO;
-    return [];
+export const padding1DegreeInputAdapter = (bearingLine) => {
+    const { long, lat, rgba, altitude = 0, rings, stepAngle } = bearingLine;
+    const result = new Array(rings.length);
+    for (let i = 0; i < rings.length; i++) {
+        const ring = rings[i];
+        result[i] = {
+            key: keyAdapter(bearingLine.centerID, ring.ringID),
+            center: [long, lat],
+            radius: ring.radius,
+            colorsRatios: createColorRatios(rgba, stepAngle, 0.5),
+            heightFromGroundIn3D: altitude,
+        };
+    }
+    return result;
 };