@openglobus/og 0.13.7 → 0.13.10

package/src/og/utils/PlainSegmentWorker.js

@@ -2,50 +2,27 @@
 
 // import { QueueArray } from '../QueueArray.js';
 import { EPSG4326 } from "../proj/EPSG4326.js";
+import { BaseWorker } from "./BaseWorker.js";
 
-class PlainSegmentWorker {
+class PlainSegmentWorker extends BaseWorker {
     constructor(numWorkers = 2) {
-        this._id = 0;
-        this._segments = {};
-
-        this._workerQueue = [];
-
-        var elevationProgramm = new Blob([_programm], { type: "application/javascript" });
-
-        let _this = this;
-
-        for (let i = 0; i < numWorkers; i++) {
-            let w = new Worker(URL.createObjectURL(elevationProgramm));
-
-            w.onmessage = function (e) {
-                _this._segments[e.data.id]._plainSegmentWorkerCallback(e.data);
-
-                e.data.plainVertices = null;
-                e.data.plainVerticesHigh = null;
-                e.data.plainVerticesLow = null;
-                e.data.plainNormals = null;
-                e.data.normalMapNormals = null;
-                e.data.normalMapVertices = null;
-                e.data.normalMapVerticesHigh = null;
-                e.data.normalMapVerticesLow = null;
-
-                _this._segments[e.data.id] = null;
-                delete _this._segments[e.data.id];
-
-                _this._workerQueue.unshift(this);
-                _this.check();
-            };
+        super(numWorkers, _programm);
+        this._segments = new Map();
+    }
 
-            this._workerQueue.push(w);
-        }
+    _onMessage(e) {
+        this._segments.get(e.data.id)._plainSegmentWorkerCallback(e.data);
 
-        this._pendingQueue = [];
-    }
+        e.data.plainVertices = null;
+        e.data.plainVerticesHigh = null;
+        e.data.plainVerticesLow = null;
+        e.data.plainNormals = null;
+        e.data.normalMapNormals = null;
+        e.data.normalMapVertices = null;
+        e.data.normalMapVerticesHigh = null;
+        e.data.normalMapVerticesLow = null;
 
-    check() {
-        if (this._pendingQueue.length) {
-            this.make(this._pendingQueue.pop());
-        }
+        this._segments.delete(e.data.id)
     }
 
     setGeoid(geoid) {
@@ -68,21 +45,19 @@ class PlainSegmentWorker {
                 let rawfile = new Uint8Array(m.rawfile.length);
                 rawfile.set(m.rawfile);
 
-                w.postMessage(
-                    {
+                w.postMessage({
                         model: model,
                         rawfile: rawfile
-                    },
-                    [rawfile.buffer]
+                    }, [
+                        rawfile.buffer
+                    ]
                 );
             });
         } else {
             this._workerQueue.forEach((w) => {
-                w.postMessage(
-                    {
-                        model: null
-                    }
-                );
+                w.postMessage({
+                    model: null
+                });
             });
         }
     }
@@ -92,7 +67,7 @@ class PlainSegmentWorker {
             if (this._workerQueue.length) {
                 let w = this._workerQueue.pop();
 
-                this._segments[this._id] = segment;
+                this._segments.set(this._id, segment);
 
                 let params = new Float64Array([
                     this._id++,
@@ -111,12 +86,11 @@ class PlainSegmentWorker {
                     segment.planet._heightFactor
                 ]);
 
-                w.postMessage(
-                    {
-                        params: params
-                    },
-                    [params.buffer]
-                );
+                w.postMessage({
+                    params: params
+                }, [
+                    params.buffer
+                ]);
             } else {
                 this._pendingQueue.push(segment);
             }