From 4483968e9145a6310890ee9e68bb0354accf2099 Mon Sep 17 00:00:00 2001 From: thinkinggis Date: Fri, 1 Mar 2019 11:38:38 +0800 Subject: [PATCH] fix bug --- package.json | 3 ++- src/core/scene.js | 4 ++-- src/layer/index.js | 4 ++-- src/worker/geojsonSourceWorker.js | 2 -- 4 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 src/worker/geojsonSourceWorker.js diff --git a/package.json b/package.json index c28b5a396a..bf6a16b346 100755 --- a/package.json +++ b/package.json @@ -53,7 +53,8 @@ "string-replace-loader": "~1.3.0", "torchjs": "~2.1.0", "uglify-js": "~3.1.10", - "webpack": "~3.10.0", + "webpack": "~4.29.6", + "webpack-cli": "^3.2.3", "worker-loader": "^2.0.0" }, "scripts": { diff --git a/src/core/scene.js b/src/core/scene.js index c86c5cf65c..0ab5e653f5 100644 --- a/src/core/scene.js +++ b/src/core/scene.js @@ -2,7 +2,7 @@ import Engine from './engine'; import { LAYER_MAP } from '../layer'; import Base from './base'; import LoadImage from './image'; -import WorkerPool from './worker'; +// import WorkerPool from './worker'; // import { MapProvider } from '../map/AMap'; import { getMap } from '../map/index'; import Global from '../global'; @@ -22,7 +22,7 @@ export default class Scene extends Base { _initEngine(mapContainer) { this._engine = new Engine(mapContainer, this); this._engine.run(); - this.workerPool = new WorkerPool(); + // this.workerPool = new WorkerPool(); compileBuiltinModules(); } // 为pickup场景添加 object 对象 diff --git a/src/layer/index.js b/src/layer/index.js index f7754776e2..ea30bf91e7 100644 --- a/src/layer/index.js +++ b/src/layer/index.js @@ -4,14 +4,14 @@ import PointLayer from './pointLayer'; import LineLayer from './lineLayer'; import ImageLayer from './imageLayer'; import RasterLayer from './rasterLayer'; -import HeatmapLayer from './heatmapLayer'; +// import HeatmapLayer from './heatmapLayer'; registerLayer('PolygonLayer', PolygonLayer); registerLayer('PointLayer', PointLayer); registerLayer('LineLayer', LineLayer); registerLayer('ImageLayer', ImageLayer); registerLayer('RasterLayer', RasterLayer); -registerLayer('HeatmapLayer', HeatmapLayer); +// registerLayer('HeatmapLayer', HeatmapLayer); export { LAYER_MAP } from './factory'; diff --git a/src/worker/geojsonSourceWorker.js b/src/worker/geojsonSourceWorker.js deleted file mode 100644 index 139597f9cb..0000000000 --- a/src/worker/geojsonSourceWorker.js +++ /dev/null @@ -1,2 +0,0 @@ - -