@antv/l7-layers 2.9.27 → 2.9.28

package/lib/tile/tileFactory/index.js

@@ -10,6 +10,8 @@ var _exportNames = {
 };
 exports.getTileFactory = getTileFactory;
 
+var _l7Source = require("@antv/l7-source");
+
 var _line = _interopRequireDefault(require("./line"));
 
 var _point = _interopRequireDefault(require("./point"));
@@ -51,7 +53,7 @@ function getTileFactory(tileType, parser) {
       return _test.default;
 
     case 'RasterLayer':
-      if (parser.dataType === 'arraybuffer') {
+      if (_l7Source.rasterDataTypes.includes(parser.dataType)) {
         return _rasterData.default;
       } else {
         return _raster.default;

package/lib/tile/tileFactory/point.js

@@ -56,7 +56,8 @@ var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
         tile: tile,
         initOptions: initOptions,
         vectorTileLayer: vectorTileLayer,
-        source: source
+        source: source,
+        needListen: false
       });
       layer.once('modelLoaded', function () {
         tile.layerLoad();

package/lib/tile/tileFactory/rasterDataLayer.js

@@ -56,11 +56,7 @@ var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
       var model = this.getModelType();
       this.layerModel = new model(this);
       this.layerModel.initModels(function (models) {
-        _this2.models = models;
-
-        _this2.emit('modelLoaded', null);
-
-        _this2.layerService.throttleRenderLayers();
+        _this2.dispatchModelLoad(models);
       });
     }
   }, {
@@ -69,9 +65,7 @@ var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        _this3.models = models;
-
-        _this3.emit('modelLoaded', null);
+        _this3.dispatchModelLoad(models);
       });
     }
   }, {

package/lib/tile/tileFactory/test.js

@@ -66,7 +66,8 @@ var TestTile = /*#__PURE__*/function (_TileFactory) {
       var properties = features[0].properties;
       var text = new _vectorLayer.default({
         layerType: 'PointLayer',
-        usage: 'basemap'
+        usage: 'basemap',
+        needListen: false
       }).source([properties], {
         parser: {
           type: 'json',
@@ -82,7 +83,8 @@ var TestTile = /*#__PURE__*/function (_TileFactory) {
       });
       var line = new _vectorLayer.default({
         layerType: 'LineLayer',
-        usage: 'basemap'
+        usage: 'basemap',
+        needListen: false
       }).source({
         type: 'FeatureCollection',
         features: features

package/lib/tile/tileFactory/vectorLayer.js

@@ -62,6 +62,7 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "needListen", true);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isVector", true);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", _this.layerType || 'vectorLayer');
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "pickedID", null);
@@ -176,11 +177,7 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
       var model = this.getModelType();
       this.layerModel = new model(this);
       this.layerModel.initModels(function (models) {
-        _this4.models = models;
-
-        _this4.emit('modelLoaded', null);
-
-        _this4.layerService.throttleRenderLayers();
+        _this4.dispatchModelLoad(models);
       });
     }
   }, {
@@ -189,9 +186,7 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this5 = this;
 
       this.layerModel.buildModels(function (models) {
-        _this5.models = models;
-
-        _this5.emit('modelLoaded', null);
+        _this5.dispatchModelLoad(models);
       });
     }
   }, {

package/lib/tile/tileLayer/baseMapTileLayer.js

@@ -139,7 +139,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
         zoom: zoom,
         latLonBounds: latLonBounds
       };
-      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.update(zoom, latLonBounds);
+      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.throttleUpdate(zoom, latLonBounds);
     }
   }, {
     key: "bindTilesetEvent",

package/lib/tile/tileLayer/baseTileLayer.js

@@ -364,7 +364,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
         zoom: zoom,
         latLonBounds: latLonBounds
       };
-      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.update(zoom, latLonBounds);
+      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.throttleUpdate(zoom, latLonBounds);
     }
   }, {
     key: "bindTilesetEvent",

package/lib/tile/tileTest.js

@@ -64,9 +64,7 @@ var TileDebugLayer = /*#__PURE__*/function (_BaseLayer) {
 
       this.layerModel = new _tileModel.default(this);
       this.layerModel.initModels(function (models) {
-        _this2.models = models;
-
-        _this2.emit('modelLoaded', null);
+        _this2.dispatchModelLoad(models);
       });
     }
   }]);

package/lib/tile/tmsMapTileLayer.js

@@ -98,7 +98,7 @@ var TMSBaseMapTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
 
           var _layers = _this2.tileLayerManager.getChilds(tile.layerIDList);
 
-          _this2.updateTileVisible(tile, _layers);
+          (0, _utils.updateTileVisible)(tile, _layers, _this2.layerService);
         }
       });
 
@@ -107,28 +107,6 @@ var TMSBaseMapTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
         this.parent.emit('tiles-loaded', this.tilesetManager.currentTiles);
       }
     }
-  }, {
-    key: "emitTileVisibleEvent",
-    value: function emitTileVisibleEvent(tile, callback) {
-      if (tile.isVisible) {
-        callback();
-      } else {
-        (0, _utils.tileAllLoad)(tile, function () {
-          callback();
-        });
-      }
-    }
-  }, {
-    key: "updateTileVisible",
-    value: function updateTileVisible(tile, layers) {
-      var _this3 = this;
-
-      this.emitTileVisibleEvent(tile, function () {
-        (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
-
-        _this3.layerService.reRender();
-      });
-    }
   }]);
   return TMSBaseMapTileLayer;
 }(_baseMapTileLayer.default);

package/lib/tile/tmsTileLayer.js

@@ -100,7 +100,7 @@ var TMSTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
 
           var _layers = _this2.tileLayerManager.getChilds(tile.layerIDList);
 
-          _this2.updateTileVisible(tile, _layers);
+          (0, _utils.updateTileVisible)(tile, _layers, _this2.layerService);
 
           _this2.setPickState(_layers);
         }
@@ -111,28 +111,6 @@ var TMSTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
         this.parent.emit('tiles-loaded', this.tilesetManager.currentTiles);
       }
     }
-  }, {
-    key: "emitTileVisibleEvent",
-    value: function emitTileVisibleEvent(tile, callback) {
-      if (tile.isVisible) {
-        callback();
-      } else {
-        (0, _utils.tileAllLoad)(tile, function () {
-          callback();
-        });
-      }
-    }
-  }, {
-    key: "updateTileVisible",
-    value: function updateTileVisible(tile, layers) {
-      var _this3 = this;
-
-      this.emitTileVisibleEvent(tile, function () {
-        (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
-
-        _this3.layerService.reRender();
-      });
-    }
   }]);
   return TMSTileLayer;
 }(_baseTileLayer.default);

package/lib/tile/utils.js

@@ -18,6 +18,7 @@ exports.registerLayers = registerLayers;
 exports.tileAllLoad = tileAllLoad;
 exports.tileVectorParser = void 0;
 exports.updateLayersConfig = updateLayersConfig;
+exports.updateTileVisible = updateTileVisible;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -209,4 +210,39 @@ function updateLayersConfig(layers, key, value) {
       layer.updateLayerConfig((0, _defineProperty2.default)({}, key, value));
     }
   });
+}
+
+function dispatchTileVisibleChange(tile, callback) {
+  if (tile.isVisible) {
+    callback();
+  } else {
+    tileAllLoad(tile, function () {
+      callback();
+    });
+  }
+}
+
+function updateImmediately(layers) {
+  var immediately = true;
+  layers.map(function (layer) {
+    if (layer.type !== 'PointLayer') {
+      immediately = false;
+    }
+  });
+  return immediately;
+}
+
+function updateTileVisible(tile, layers, layerService) {
+  if (layers.length === 0) return;
+
+  if (updateImmediately(layers)) {
+    updateLayersConfig(layers, 'visible', tile.isVisible);
+    layerService.reRender();
+    return;
+  }
+
+  dispatchTileVisibleChange(tile, function () {
+    updateLayersConfig(layers, 'visible', tile.isVisible);
+    layerService.reRender();
+  });
 }

package/lib/wind/index.js

@@ -56,11 +56,7 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
       var modelType = this.getModelType();
       this.layerModel = new _models.default[modelType](this);
       this.layerModel.initModels(function (models) {
-        _this2.models = models;
-
-        _this2.emit('modelLoaded', null);
-
-        _this2.layerService.throttleRenderLayers();
+        _this2.dispatchModelLoad(models);
       });
     }
   }, {
@@ -69,9 +65,7 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        _this3.models = models;
-
-        _this3.emit('modelLoaded', null);
+        _this3.dispatchModelLoad(models);
       });
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.27",
+  "version": "2.9.28",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.2",
-    "@antv/l7-core": "2.9.27",
-    "@antv/l7-maps": "2.9.27",
-    "@antv/l7-source": "2.9.27",
-    "@antv/l7-utils": "2.9.27",
+    "@antv/l7-core": "2.9.28",
+    "@antv/l7-maps": "2.9.28",
+    "@antv/l7-source": "2.9.28",
+    "@antv/l7-utils": "2.9.28",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "fe24bbe041becf325b1dfd36258c11662a8d22f4",
+  "gitHead": "bdf2c35d3b632882bf5a8fdd4bd58acfb14b2a97",
   "publishConfig": {
     "access": "public"
   }