@pirireis/webglobeplugins 0.15.27 → 0.15.29

package/Math/vec3.js

@@ -60,7 +60,7 @@ function length(a) {
 function normalize(outVec, inVec) {
     const len = length(inVec);
     if (len === 0) {
-        console.warn('Cannot normalize a zero vector');
+        // console.warn('Cannot normalize a zero vector');
         outVec[0] = 0;
         outVec[1] = 0;
         outVec[2] = 0;

package/package.json

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

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

@@ -19,9 +19,6 @@ export class CircleLineChainPlugin {
     _textWritersMap;
     _textDataPreAdaptor = undefined;
     _chainListMap;
-    _arcAdaptor = arcDataAdaptor;
-    _lineAdaptor = lineDataAdaptor;
-    _circleAdaptor = circleDataAdaptor;
     _semiPluginOptions = {
         circleOnTerrainOptions: {
             variativeColorsOn: false,
@@ -50,14 +47,11 @@ export class CircleLineChainPlugin {
             opacity: 1.0,
         }
     };
-    constructor(id, { drawCircleOn, textWritersMap, textDataPreAdaptor, opacities, lineAdaptor, arcAdaptor, circleAdaptor, arcOnTerrainOptions, circleOnTerrainOptions, lineOptions } = {}) {
+    constructor(id, { drawCircleOn, textWritersMap, textDataPreAdaptor, opacities, arcOnTerrainOptions, circleOnTerrainOptions, lineOptions } = {}) {
         const defaults = {
             drawCircleOn: true,
             textWritersMap: new Map(),
             textDataPreAdaptor: undefined,
-            lineAdaptor: lineDataAdaptor,
-            arcAdaptor: arcDataAdaptor,
-            circleAdaptor: circleDataAdaptor,
             opacities: {
                 general: 1,
                 circle: null,
@@ -73,9 +67,6 @@ export class CircleLineChainPlugin {
             drawCircleOn: drawCircleOn ?? defaults.drawCircleOn,
             textWritersMap: textWritersMap ?? defaults.textWritersMap,
             textDataPreAdaptor: textDataPreAdaptor ?? defaults.textDataPreAdaptor,
-            lineAdaptor: lineAdaptor ?? defaults.lineAdaptor,
-            arcAdaptor: arcAdaptor ?? defaults.arcAdaptor,
-            circleAdaptor: circleAdaptor ?? defaults.circleAdaptor,
             opacities: finalOpacities
         };
         this._semiPluginOptions.circleOnTerrainOptions = {
@@ -95,9 +86,6 @@ export class CircleLineChainPlugin {
         this._textWritersMap = config.textWritersMap;
         this._textDataPreAdaptor = config.textDataPreAdaptor;
         this._chainListMap = new ChainListMap(keyMethod);
-        this._arcAdaptor = config.arcAdaptor;
-        this._lineAdaptor = config.lineAdaptor;
-        this._circleAdaptor = config.circleAdaptor;
         this._opacities = config.opacities;
         this._checktextWritersMap(this._textWritersMap);
         this._textWritersMap.forEach((writer) => {
@@ -182,11 +170,16 @@ export class CircleLineChainPlugin {
             console.warn("CircleLineChainPlugin is freed, cannot delete chains.");
             return;
         }
+        // type check chainKeys
+        if (!Array.isArray(chainKeys) || chainKeys.some(key => typeof key !== "string")) {
+            console.warn("Invalid chainKeys array.");
+            return;
+        }
         for (const chainKey of chainKeys) {
             const keys = this._chainListMap.deleteChainAndReturnChainKeys(chainKey, this._textWritersMap);
             if (keys.length <= 1) {
-                console.warn("No chains were deleted, chainKeys might be invalid.");
-                return;
+                console.warn(`Deleted chain ${chainKey}, was too small to be displayed.`);
+                continue;
             }
             keys.pop(); // Remove the last key which which is destination of the last circle
             this.linePlugin?.deleteBulk(keys);
@@ -216,6 +209,11 @@ export class CircleLineChainPlugin {
             console.warn("CircleLineChainPlugin is freed, cannot update nodes properties.");
             return;
         }
+        const hasChain = this._chainListMap.hasChain(chainKey);
+        if (!hasChain) {
+            console.warn(`Chain with key ${chainKey} not found.`);
+            return;
+        }
         this._chainListMap.updateNodesProperties(chainKey, nodesAndPropertyList);
         this._cleanChainsFromSemiPlugins([chainKey]);
         this._reconstructChains([chainKey]);
@@ -373,9 +371,9 @@ export class CircleLineChainPlugin {
                 console.warn(`Chain with key ${chainKey} not found.`);
                 continue;
             }
-            const lineInput = this._lineAdaptor(chain);
-            const arcInput = this._arcAdaptor(chain);
-            const circleInput = this._circleAdaptor(globe, chain);
+            const lineInput = lineDataAdaptor(chain);
+            const arcInput = arcDataAdaptor(chain);
+            const circleInput = circleDataAdaptor(globe, chain);
             this.linePlugin?.insertBulk(lineInput);
             this.arcPlugin?.insertBulk(arcInput);
             this.circlePlugin?.insertBulk(circleInput);

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

@@ -215,7 +215,6 @@ export class RangeRingPlugin {
             if (textHide !== undefined) {
                 rangeRingInput.textHide = textHide;
             }
-            // Update hide state first
             if (hide !== undefined) {
                 if (rangeRingInput.hide !== hide) {
                     if (hide === ENUM_HIDE.HIDE) {

package/semiplugins/shape-on-terrain/circle-plugin.js

@@ -164,12 +164,12 @@ export class CircleOnTerrainPlugin {
         const keys = [];
         let newItemCount = 0;
         for (const circleInput of circles) {
-            if (!circleInput.key || !circleInput.center || !circleInput.radius) {
+            if (circleInput.key == null || circleInput.center == null || circleInput.radius == null) {
                 console.warn(`CircleOnTerrainPlugin: Circle input is missing required properties: ${circleInput.radius} or ${circleInput.center} or ${circleInput.key}`);
                 continue;
             }
             if (circleInput.radius <= 0) {
-                console.warn(`CircleOnTerrainPlugin: Circle ${circleInput.key} has non-positive radius ${circleInput.radius}. Skipping.`);
+                // console.warn(`CircleOnTerrainPlugin: Circle ${circleInput.key} has non-positive radius ${circleInput.radius}. Skipping.`);
                 continue;
             }
             keys.push(circleInput.key);
@@ -348,6 +348,10 @@ export class CircleOnTerrainPlugin {
             const [{ radius, center, height = null, msl = null }, circleForAzimuthCalc] = this.circleMap.get(key);
             const closestAzimuthAngle = CircleMethods.closestAzimuthAngle(circleForAzimuthCalc, cameraPosition);
             const stregthLevel = defineStregthLevel(currentLOD, radius);
+            if (typeof stregthLevel !== "number") {
+                console.warn(`CircleOnTerrainPlugin: Circle ${key} has invalid strength level for current LOD ${currentLOD}. Skipping., radius: ${radius}, stregthLevel: ${stregthLevel}`);
+                continue;
+            }
             if (stregthLevel < 0) {
                 console.warn(`CircleOnTerrainPlugin: Circle ${key} has too small radius for current LOD ${currentLOD}. Skipping., radius: ${radius}, stregthLevel: ${stregthLevel}`);
                 continue;