@pirireis/webglobeplugins 1.2.9 → 1.2.11

package/package.json

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

package/semiplugins/shape-on-terrain/terrain-polygon/data/worker.js

@@ -11,6 +11,10 @@ function fineTuneBboxZooms(bboxZooms) {
     if (bboxZooms.length >= 3 && bboxZooms[0].zoom > 12) {
         const first = bboxZooms.shift();
         bboxZooms[0].zoom = first.zoom;
+        bboxZooms[0].minX = Math.min(first.minX, bboxZooms[0].minX);
+        bboxZooms[0].minY = Math.min(first.minY, bboxZooms[0].minY);
+        bboxZooms[0].maxX = Math.max(first.maxX, bboxZooms[0].maxX);
+        bboxZooms[0].maxY = Math.max(first.maxY, bboxZooms[0].maxY);
     }
     return bboxZooms;
 }
@@ -63,7 +67,7 @@ self.onmessage = (event) => {
             const fineTunedBboxes = fineTuneBboxZooms(bboxes);
             cache.setBBOXes(fineTunedBboxes);
             if (fineTunedBboxes.length > 0) {
-                showThreshold = zoomLevelShowThreshold(fineTunedBboxes[0].zoom, 0.15);
+                showThreshold = zoomLevelShowThreshold(fineTunedBboxes[0].zoom, 0.05);
             }
         }
         const trianglesInView = cache.search();

package/semiplugins/shape-on-terrain/terrain-polygon/terrain-polygon.js

@@ -5,6 +5,7 @@ import { PickerDisplayer } from "../../../util/picking/picker-displayer";
 import { IndexPolygonMap } from "./data/index-polygon-map";
 import { TestRecords } from "./test-records";
 import { defaultblendfunction } from "../../../util/globe-default-gl-states";
+import { opacityCheck } from "../../../util/check/typecheck";
 export class TerrainPolygonSemiPlugin {
     id;
     globe = null;
@@ -184,7 +185,7 @@ export class TerrainPolygonSemiPlugin {
             throw new Error(`Cannot set private uniform ${name}`);
         }
         const isStyleKey = name === "defaultColor" || name === "hoverColor" || name === "opacity" || name === "useDefaultColor";
-        const ubo = this.__getUBO(target);
+        const ubo = this._getUBO(target);
         if (isStyleKey) {
             const prev = this._options.polygonStyle[name];
             if (prev === value)
@@ -225,28 +226,31 @@ export class TerrainPolygonSemiPlugin {
         this.globe.DrawRender();
     }
     setUsePickedColorState(state, target = "polygon") {
-        const oldState = this._options[`${target}Style`].changePickedColor;
-        if (oldState === state)
-            return;
-        this._options[`${target}Style`].changePickedColor = state;
-        const ubo = this.__getUBO(target);
-        ubo.updateSingle("private_changeHoverColor", new Float32Array([state ? 1 : 0]));
-        this.globe.DrawRender();
+        throw new Error("use setChangeColorOnHoverState instead");
     }
-    setOpacity(opacity) {
-        if (this._options.opacity !== opacity) {
-            this._options.opacity = opacity;
-            this._uboHandler.updateSingle("opacity", this._effectiveOpacity("polygon"));
-            this._uboForRealEdgeArcs?.updateSingle("opacity", this._effectiveOpacity("edgeArc"));
-            this.globe.DrawRender();
+    setOpacity(opacities) {
+        if (opacities.common !== undefined) {
+            opacityCheck(opacities.common);
+            this._options.opacity = opacities.common;
         }
+        if (opacities.polygon !== undefined) {
+            opacityCheck(opacities.polygon);
+            this._options.polygonStyle.opacity = opacities.polygon;
+        }
+        if (opacities.edgeArc !== undefined) {
+            opacityCheck(opacities.edgeArc);
+            this._options.edgeStyle.opacity = opacities.edgeArc;
+        }
+        this._uboHandler.updateSingle("opacity", this._effectiveOpacity("polygon"));
+        this._uboForRealEdgeArcs?.updateSingle("opacity", this._effectiveOpacity("edgeArc"));
+        this.globe.DrawRender();
     }
     setChangeColorOnHoverState(state, target = "polygon") {
         const oldState = this._options[`${target}Style`].changeHoverColor;
         if (oldState === state)
             return;
         this._options[`${target}Style`].changeHoverColor = state;
-        const ubo = this.__getUBO(target);
+        const ubo = this._getUBO(target);
         ubo.updateSingle("private_changeHoverColor", new Float32Array([state ? 1 : 0]));
         this.globe.DrawRender();
     }
@@ -432,7 +436,7 @@ export class TerrainPolygonSemiPlugin {
             this.insertBulk(TestRecords.get(recordName));
         }
     }
-    __getUBO(target = "polygon") {
+    _getUBO(target = "polygon") {
         let targetUBO;
         if (target === "polygon") {
             targetUBO = this._uboHandler;
@@ -441,7 +445,7 @@ export class TerrainPolygonSemiPlugin {
             targetUBO = this._uboForRealEdgeArcs;
         }
         else {
-            throw new Error(`unknown target ${target} for __getUBO, must be "polygon" or "edgeArc"`);
+            throw new Error(`unknown target ${target} for _getUBO, must be "polygon" or "edgeArc"`);
         }
         return targetUBO;
     }