some tweaks (#2184)

* some tweaks * restore GlobalConfig.js * remove WorkerPool.broadcastMessage
maptalks · Jan 10, 2024 · e097d5a · e097d5a
1 parent 90ad2be
commit e097d5a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 135 deletions.
diff --git a/src/globalConfig.js → src/GlobalConfig.js b/src/globalConfig.js → src/GlobalConfig.js
@@ -2,20 +2,16 @@
  * global config
  * idle/worker etc
  */
-const globalConfig = {
-    //dev env
-    dev: false,
-    //test env
-    test: false,
+const GlobalConfig = {
     //idle logging
     idleLog: false,
     //idle 时间阈值
     idleTimeRemaining: 8,
     //idle 超时阈值
     idleTimeout: 1000,
     //worker 数量
-    workerCount: 0,
-    //worker 通信并发数量
-    workerConcurrencyCount: 5
+    workerCount: window.MAPTALKS_WORKER_COUNT || 0,
+    //每个Worker Message中封装的task message数量
+    taskCountPerWorkerMessage: 5
 };
-export default globalConfig;
+export default GlobalConfig;
diff --git a/src/core/MicroTask.js b/src/core/MicroTask.js
@@ -3,7 +3,7 @@ import { requestAnimFrame } from './util';
 import { isFunction, isNil, isNumber } from './util/common';
 import { getGlobalWorkerPool } from './worker/WorkerPool';
 import Browser from './Browser';
-import globalConfig from '../globalConfig';
+import GlobalConfig from '../GlobalConfig';
 
 let tasks = [];
 
@@ -88,7 +88,7 @@ function loop() {
 }
 
 function frameLoop(deadline) {
-    const { idleTimeRemaining, idleLog, idleTimeout } = globalConfig;
+    const { idleTimeRemaining, idleLog, idleTimeout } = GlobalConfig;
     if (Browser.requestIdleCallback) {
         if (deadline && deadline.timeRemaining) {
             const t = deadline.timeRemaining();
@@ -118,7 +118,7 @@ export function startTasks() {
         return;
     }
     started = true;
-    const { idleTimeout } = globalConfig;
+    const { idleTimeout } = GlobalConfig;
     if (Browser.requestIdleCallback) {
         requestIdleCallback(frameLoop, { timeout: idleTimeout });
     } else {

diff --git a/src/core/util/pick.js b/src/core/util/pick.js
diff --git a/src/core/worker/WorkerPool.js b/src/core/worker/WorkerPool.js
@@ -1,10 +1,10 @@
 // import { requestAnimFrame } from '../util';
 import { setWorkerPool, setWorkersCreated } from './CoreWorkers';
 import { getWorkerSourcePath } from './Worker';
-import globalConfig from '../../globalConfig';
+import GlobalConfig from '../../GlobalConfig';
 
 const hardwareConcurrency = typeof window !== 'undefined' ? (window.navigator.hardwareConcurrency || 4) : 0;
-const workerCount = Math.max(Math.floor(hardwareConcurrency / 2), 1);
+const hardwareWorkerCount = Math.max(Math.floor(hardwareConcurrency / 2), 1);
 
 class MessageBatch {
     constructor(limit = 50) {
@@ -43,7 +43,7 @@ class MessageBatch {
 export default class WorkerPool {
     constructor() {
         this.active = {};
-        this.workerCount = typeof window !== 'undefined' ? (globalConfig.workerCount || window.MAPTALKS_WORKER_COUNT || workerCount) : 0;
+        this.workerCount = typeof window !== 'undefined' ? (GlobalConfig.workerCount || hardwareWorkerCount) : 0;
         this._messages = [];
         this._messageBuffers = [];
     }
@@ -107,19 +107,14 @@ export default class WorkerPool {
         return this.workers || [];
     }
 
-    broadcastMessage(message) {
+    broadcastIdleMessage() {
         const workers = this.getWorkers();
         workers.forEach(worker => {
-            worker.postMessage({ messageType: message, messageCount: globalConfig.workerConcurrencyCount });
+            worker.postMessage({ messageType: 'idle', messageCount: GlobalConfig.taskCountPerWorkerMessage });
         });
         return this;
     }
 
-    broadcastIdleMessage() {
-        this.broadcastMessage('idle');
-        return this;
-    }
-
 }
 
 let globalWorkerPool;

diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,5 @@
 import { version } from '../package.json';
-export { default as globalconfig } from './globalConfig';
+export { default as Globalconfig } from './GlobalConfig';
 export * from './core/Constants';
 export { default as Browser } from './core/Browser';
 import * as Util from './core/util';

diff --git a/src/map/Map.Topo.js b/src/map/Map.Topo.js
@@ -1,6 +1,5 @@
 import { INTERNAL_LAYER_PREFIX } from '../core/Constants';
 import { isNil, isString, isArrayHasData, pushIn, isFunction } from '../core/util';
-import { isGLRenderLayer, layerIsBlankInPoint } from '../core/util/pick';
 import Coordinate from '../geo/Coordinate';
 import Point from '../geo/Point';
 import Map from './Map';
@@ -108,17 +107,12 @@ Map.include(/** @lends Map.prototype */ {
                 opts.tolerance = opts.tolerance || 0;
                 opts.tolerance += layer.options.geometryEventTolerance;
             }
-            //only gllayer,exclude canvas layer
-            const isGLLayer = isGLRenderLayer(layer);
-            const isBlank = isGLLayer && layerIsBlankInPoint(layer, containerPoint, opts.tolerance);
-            if (!isBlank && layer._hasGeoListeners && isMapGeometryEvent && opts.eventTypes.indexOf('mousemove') >= 0) {
+            if (layer._hasGeoListeners && isMapGeometryEvent && opts.eventTypes.indexOf('mousemove') >= 0) {
                 if (!layer._hasGeoListeners(opts.eventTypes)) {
                     return [];
                 }
             }
-            if (isBlank) {
-                result = [];
-            } else if (layer.identifyAtPoint) {
+            if (layer.identifyAtPoint) {
                 result = layer.identifyAtPoint(containerPoint, opts);
             } else if (coordinate && layer.identify) {
                 result = layer.identify(coordinate, opts);

diff --git a/src/renderer/layer/vectorlayer/VectorLayerCanvasRenderer.js b/src/renderer/layer/vectorlayer/VectorLayerCanvasRenderer.js
@@ -552,12 +552,6 @@ class VectorLayerRenderer extends OverlayLayerCanvasRenderer {
         return this.constructor === VectorLayerRenderer;
     }
 
-    _alwaysDraw() {
-        if (this.canvas && this.isProgressiveRender()) {
-            this.canvas._drawn = true;
-        }
-    }
-
     isProgressiveRender() {
         const layer = this.layer;
         if (!layer) {