@pirireis/webglobeplugins 0.15.18-alpha → 0.15.20-alpha

package/package.json

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

package/point-tracks/plugin.js

@@ -14,7 +14,7 @@ const _0vec3 = /* @__PURE__ */ [0, 0, 0];
  * @typedef {Array<Point>, rgba, trackID} Track
  */
 class PointTracksPlugin {
-    constructor(id, { pointSize = 2, hoveredPointSize = 4, selectionPointFilling = 4, opacity = 1.0, objectStoreExtraParameters = ["long", "lat", "height"] } = {}) {
+    constructor(id, { pointSize = 2, hoveredPointSize = 4, selectionPointFilling = 4, opacity = 1.0, objectStoreExtraParameters = ["long", "lat", "height"], initialCapacity = 10000000 } = {}) {
         this.id = id;
         this._isFreed = false;
         this._pointProgram = null;
@@ -38,6 +38,7 @@ class PointTracksPlugin {
         this._objectStoreExtraParametersFiltered = objectStoreExtraParameters.filter(param => {
             return !["long", "lat", "height", "ID", "trackID"].includes(param);
         });
+        this._bufferOrchestrator = new BufferOrchestrator({ capacity: initialCapacity });
     }
     init(globe, gl) {
         this.globe = globe;
@@ -49,9 +50,8 @@ class PointTracksPlugin {
     }
     _initBufferManagers() {
         const { gl } = this;
-        const initialCapacity = 10;
+        const initialCapacity = this._bufferOrchestrator.capacity;
         const bufferType = "DYNAMIC_DRAW";
-        this._bufferOrchestrator = new BufferOrchestrator({ initialCapacity });
         this._bufferManagersMap = new Map([
             ["pos3D", {
                     bufferManager: new BufferManager(gl, 3, { bufferType, initialCapacity }),
@@ -224,12 +224,19 @@ class PointTracksPlugin {
             return;
         this._isFreed = true;
         this._pickerDisplayer.free();
+        this._tracksToPointMap.clear();
         PointOnGlobeProgramCache.release(this.globe);
         this.gl.deleteBuffer(this._focusParams.elementBuffer);
         this._bufferManagersMap.forEach(({ bufferManager, adaptor }) => bufferManager.free());
     }
     draw3D() {
         const { gl, _pointProgram, _pickerDisplayer, _bufferOrchestrator, _vao } = this;
+        if (!gl) {
+            throw new Error("GL is not loaded, PointTracks Plugin");
+        }
+        if (this._isFreed) {
+            throw new Error("Plugin is unregistered, PointTracks Plugin");
+        }
         this.resize();
         _pickerDisplayer.bindFBO();
         _pickerDisplayer.clearTextures();
@@ -270,13 +277,17 @@ class PointTracksPlugin {
             const trackID = track.trackID;
             const points = track.points;
             if (!this._tracksToPointsMap.has(trackID)) {
-                this._tracksToPointsMap.set(trackID, []); // TODO: alternative to Set?
-                // this._tracksToPointsMap.set(trackID, new Set()); // TODO: alternative to Set?
+                this._tracksToPointsMap.set(trackID, new Set());
             }
-            const pointList = this._tracksToPointsMap.get(trackID);
+            const pointSet = this._tracksToPointsMap.get(trackID);
             for (let p = 0; p < points.length; p++) {
                 const pointID = points[p].ID;
-                pointList.push(pointID);
+                if (!pointSet.has(pointID)) {
+                    pointSet.add(pointID);
+                }
+                else {
+                    console.warn(`Point with ID ${pointID} already exists in track ${trackID}. Skipping duplicate.`);
+                }
             }
         }
     }
@@ -286,15 +297,22 @@ class PointTracksPlugin {
         }
     }
     _deletePointsFromTracksMap(trackID, pointIDs) {
-        const trackSet = this._tracksToPointsMap.get(trackID);
-        const pointList = new Set(pointIDs);
-        const newList = [];
-        for (const pointID of trackSet) {
-            if (!pointList.has(pointID)) {
-                newList.push(pointID);
+        const trackIDs = this._tracksToPointsMap.get(trackID);
+        if (trackIDs === undefined) {
+            console.warn(`Track with ID ${trackID} not found.`);
+            return;
+        }
+        for (const pointID of pointIDs) {
+            if (!trackIDs.has(pointID)) {
+                console.warn(`Point with ID ${pointID} not found in track ${trackID}.`);
+            }
+            else {
+                trackIDs.delete(pointID);
             }
         }
-        this._tracksToPointsMap.set(trackID, newList);
+        if (trackIDs.size === 0) {
+            this._tracksToPointsMap.delete(trackID);
+        }
     }
     _selfSelect() {
         const { globe } = this;
@@ -324,6 +342,9 @@ class PointTracksPlugin {
             for (const pointID of pointList) {
                 const key = keyMethod(trackID, pointID);
                 const index = this._bufferOrchestrator.offsetMap.get(key);
+                if (index === undefined) {
+                    throw new Error;
+                }
                 indexes.push(index);
                 length++;
             }

package/util/account/single-attribute-buffer-management/buffer-manager.js

@@ -63,8 +63,6 @@ export class BufferManager {
     insertConsecutiveBulk(items, offset, adapter, Constructor = Float32Array) {
         const { gl, buffer, itemSize } = this;
         const cpuBuffer = new Constructor(itemSize * items.length);
-        console.log('cpuBuffer', cpuBuffer);
-        console.log(typeof cpuBuffer);
         for (let i = 0; i < items.length; i++) {
             cpuBuffer.set(adapter(items[i]), i * itemSize);
         }