@antv/l7-layers 2.10.1 → 2.10.2

package/es/tile/utils.js

@@ -1,6 +1,4 @@
-import { createLayerContainer } from '@antv/l7-core';
 import { DOM } from '@antv/l7-utils';
-import { updateLayersConfig } from "./style/utils";
 export var tileVectorParser = ['mvt', 'geojsonvt', 'testTile'];
 /**
  * 判断当前图层是否是瓦片图层
@@ -12,66 +10,6 @@ export function isTileGroup(layer) {
   var source = layer.getSource();
   return tileVectorParser.includes(source.parser.type);
 }
-export function isVectorTile(parserType) {
-  return tileVectorParser.indexOf(parserType) >= 0;
-}
-export function registerLayers(parentLayer, layers) {
-  layers.map(function (layer) {
-    var container = createLayerContainer(parentLayer.sceneContainer);
-    layer.setContainer(container, parentLayer.sceneContainer);
-    layer.init();
-  });
-}
-export function getLayerShape(layerType, layer) {
-  var _layerShape$scale;
-
-  var layerShape = layer.getAttribute('shape');
-
-  if (layerShape && (_layerShape$scale = layerShape.scale) !== null && _layerShape$scale !== void 0 && _layerShape$scale.field) {
-    var _layerShape$scale2;
-
-    if (((_layerShape$scale2 = layerShape.scale) === null || _layerShape$scale2 === void 0 ? void 0 : _layerShape$scale2.values) === 'text') {
-      return [layerShape.scale.field, layerShape.scale.values];
-    }
-
-    return layerShape.scale.field;
-  }
-
-  switch (layerType) {
-    case 'PolygonLayer':
-      return 'fill';
-
-    case 'LineLayer':
-      return 'tileline';
-
-    case 'PointLayer':
-      return 'circle';
-
-    case 'RasterLayer':
-      return 'image';
-
-    default:
-      return '';
-  }
-}
-export function getMaskValue(layerType, mask) {
-  switch (layerType) {
-    case 'PolygonLayer':
-      return true;
-
-    case 'LineLayer':
-      return true;
-
-    case 'PointLayer':
-      return false;
-
-    case 'RasterLayer':
-      return mask;
-
-    default:
-      return mask;
-  }
-}
 export function getContainerSize(container) {
   if (container.getContext) {
     return {
@@ -81,69 +19,4 @@ export function getContainerSize(container) {
   } else {
     return container.getBoundingClientRect();
   }
-}
-export function isTileLoaded(tile) {
-  return tile.layerIDList.length === tile.loadedLayers;
-}
-export function isTileChildLoaded(tile) {
-  var children = tile.children;
-  return children.filter(function (child) {
-    return isTileLoaded(child);
-  }).length === children.length;
-}
-export function isTileParentLoaded(tile) {
-  var parent = tile.parent;
-
-  if (!parent) {
-    return true;
-  } else {
-    return isTileLoaded(parent);
-  }
-}
-export function tileAllLoad(tile, callback) {
-  var timer = window.setInterval(function () {
-    var tileLoaded = isTileLoaded(tile);
-    var tileChildLoaded = isTileChildLoaded(tile);
-    var tileParentLoaded = isTileParentLoaded(tile);
-
-    if (tileLoaded && tileChildLoaded && tileParentLoaded) {
-      callback();
-      window.clearInterval(timer);
-    }
-  }, 36);
-}
-
-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;
-}
-
-export 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/es/utils/dataMappingStyle.d.ts

@@ -16,16 +16,16 @@ interface IConfigToUpdate {
  * @param configToUpdate
  * @param layer
  */
-declare function handleStyleDataMapping(configToUpdate: IConfigToUpdate, layer: any): void;
+declare function styleDataMapping(configToUpdate: IConfigToUpdate, layer: any): void;
 /**
  * 根据传入参数 float 的类型和值做相应的操作
  */
-declare function handleStyleFloat(fieldName: string, layer: ILayer, styleFloat: any): void;
+declare function floatStyleMapping(fieldName: string, layer: ILayer, styleFloat: any): void;
 /**
  * 根据传入参数 stroke / color 的类型和值做相应的操作
  * @param fieldName
  * @param layer
  * @param styleColor
  */
-declare function handleStyleColor(fieldName: string, layer: ILayer, styleColor: any): void;
-export { handleStyleDataMapping, handleStyleFloat, handleStyleColor };
+declare function colorStyleMapping(fieldName: string, layer: ILayer, styleColor: any): void;
+export { styleDataMapping, floatStyleMapping, colorStyleMapping };

package/es/utils/dataMappingStyle.js

@@ -19,43 +19,45 @@ function registerStyleAttribute(fieldName, layer, field, values, updateOptions)
  */
 
 
-function handleStyleDataMapping(configToUpdate, layer) {
+function styleDataMapping(configToUpdate, layer) {
   // 瓦片图层不需要进行样式数据映射
-  if (layer.tileLayer || layer.isTileLayer) return;
+  if (layer.tileLayer || layer.isTileLayer) {
+    return;
+  }
 
   if (configToUpdate.opacity) {
     // 处理 style 中 opacity 属性的数据映射
-    handleStyleFloat('opacity', layer, configToUpdate.opacity);
+    floatStyleMapping('opacity', layer, configToUpdate.opacity);
   }
 
   if (configToUpdate.strokeWidth) {
     // 处理 style 中 strokeWidth 属性的数据映射
-    handleStyleFloat('strokeWidth', layer, configToUpdate.strokeWidth);
+    floatStyleMapping('strokeWidth', layer, configToUpdate.strokeWidth);
   }
 
   if (configToUpdate.strokeOpacity) {
     // 处理 style 中 strokeOpacity 属性的数据映射
-    handleStyleFloat('strokeOpacity', layer, configToUpdate.strokeOpacity);
+    floatStyleMapping('strokeOpacity', layer, configToUpdate.strokeOpacity);
   }
 
   if (configToUpdate.stroke) {
     // 处理 style 中 stroke (strokeColor) 属性的数据映射
-    handleStyleColor('stroke', layer, configToUpdate.stroke);
+    colorStyleMapping('stroke', layer, configToUpdate.stroke);
   }
 
   if (configToUpdate.offsets) {
     // 处理 style 中 offsets 属性的数据映射
-    handleStyleOffsets('offsets', layer, configToUpdate.offsets);
+    offsetStyleMapping('offsets', layer, configToUpdate.offsets);
   }
 
   if (configToUpdate.textOffset) {
     // 处理 style 中 textOffset 属性的数据映射
-    handleStyleOffsets('textOffset', layer, configToUpdate.textOffset);
+    offsetStyleMapping('textOffset', layer, configToUpdate.textOffset);
   }
 
   if (configToUpdate.thetaOffset) {
     // 处理 style 中 thetaOffset 属性的数据映射
-    handleStyleFloat('thetaOffset', layer, configToUpdate.thetaOffset);
+    floatStyleMapping('thetaOffset', layer, configToUpdate.thetaOffset);
   }
 }
 /**
@@ -63,15 +65,14 @@ function handleStyleDataMapping(configToUpdate, layer) {
  */
 
 
-function handleStyleFloat(fieldName, layer, styleFloat) {
+function floatStyleMapping(fieldName, layer, styleFloat) {
   if (isString(styleFloat)) {
     // 如果传入的 styleFloat 是 string 类型，那么就认为其对应的是传入数据的字段
     registerStyleAttribute(fieldName, layer, styleFloat, function (value) {
       return value;
     });
-  } else if (isNumber(styleFloat)) {
-    // 传入 number、默认值处理
-    registerStyleAttribute(fieldName, layer, [styleFloat], undefined);
+  } else if (isNumber(styleFloat)) {// 传入 number、默认值处理
+    // registerStyleAttribute(fieldName, layer, [styleFloat], undefined);
   } else if (Array.isArray(styleFloat) && styleFloat.length === 2) {
     // 传入的 styleFloat 是长度为 2 的数组
     if (isString(styleFloat[0]) && isFunction(styleFloat[1])) {
@@ -97,7 +98,7 @@ function handleStyleFloat(fieldName, layer, styleFloat) {
  */
 
 
-function handleStyleOffsets(fieldName, layer, styleOffsets) {
+function offsetStyleMapping(fieldName, layer, styleOffsets) {
   if (isString(styleOffsets)) {
     // 如果传入的 styleOffsets 是 string 类型，那么就认为其对应的是传入数据的字段
     registerStyleAttribute(fieldName, layer, styleOffsets, function (value) {
@@ -122,10 +123,9 @@ function handleStyleOffsets(fieldName, layer, styleOffsets) {
  */
 
 
-function handleStyleColor(fieldName, layer, styleColor) {
-  if (isString(styleColor)) {
-    // 如果传入的 styleColor 是 string 类型，那么就认为其是颜色值
-    registerStyleAttribute(fieldName, layer, styleColor, undefined);
+function colorStyleMapping(fieldName, layer, styleColor) {
+  if (isString(styleColor)) {// 如果传入的 styleColor 是 string 类型，那么就认为其是颜色值
+    // registerStyleAttribute(fieldName, layer, styleColor, undefined);
   } else if (Array.isArray(styleColor) && styleColor.length === 2) {
     // 传入的 styleColor 是长度为 2 的数组
     if (isString(styleColor[0]) && isFunction(styleColor[1])) {
@@ -144,4 +144,4 @@ function handleStyleColor(fieldName, layer, styleColor) {
   }
 }
 
-export { handleStyleDataMapping, handleStyleFloat, handleStyleColor };
+export { styleDataMapping, floatStyleMapping, colorStyleMapping };

package/es/utils/layerData.js

@@ -1,6 +1,6 @@
 import { Version } from '@antv/l7-maps';
 import Source from '@antv/l7-source';
-import { isColor, normalize, rgb2arr } from '@antv/l7-utils';
+import { normalize, rgb2arr } from '@antv/l7-utils';
 import { cloneDeep } from 'lodash';
 
 function getArrowPoints(p1, p2) {
@@ -91,7 +91,7 @@ function unProjectCoordinates(coordinates, mapService) {
   }
 }
 
-function applyAttributeMapping(attribute, record, minimumColor) {
+function applyAttributeMapping(attribute, record) {
   var _attribute$scale;
 
   if (!attribute.scale) {
@@ -111,15 +111,10 @@ function applyAttributeMapping(attribute, record, minimumColor) {
     }
   });
   var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
-
-  if (attribute.name === 'color' && !isColor(mappingResult[0])) {
-    return [minimumColor];
-  }
-
   return mappingResult;
 }
 
-function mapping(attributes, data, fontService, mapService, minimumColor, layer) {
+function mapping(attributes, data, fontService, mapService, layer) {
   var _ref2 = layer === null || layer === void 0 ? void 0 : layer.getLayerConfig(),
       _ref2$arrow = _ref2.arrow,
       arrow = _ref2$arrow === void 0 ? {
@@ -134,7 +129,7 @@ function mapping(attributes, data, fontService, mapService, minimumColor, layer)
     attributes.filter(function (attribute) {
       return attribute.scale !== undefined;
     }).forEach(function (attribute) {
-      var values = applyAttributeMapping(attribute, record, minimumColor);
+      var values = applyAttributeMapping(attribute, record);
       attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
       if (attribute.name === 'color') {
@@ -169,11 +164,10 @@ function mapping(attributes, data, fontService, mapService, minimumColor, layer)
 
 export function calculateData(layer, fontService, mapService, styleAttributeService, data, options) {
   var source = new Source(data, options);
-  var bottomColor = layer.getBottomColor();
   var attributes = styleAttributeService.getLayerStyleAttributes() || [];
   var dataArray = source.data.dataArray;
   var filterData = dataArray;
-  var mappedEncodeData = mapping(attributes, filterData, fontService, mapService, bottomColor, layer);
+  var mappedEncodeData = mapping(attributes, filterData, fontService, mapService, layer);
   source.destroy();
   return mappedEncodeData;
 }

package/es/wind/index.d.ts

@@ -3,9 +3,8 @@ import { IWindLayerStyleOptions } from '../core/interface';
 import { WindModelType } from './models';
 export default class WindLayer extends BaseLayer<IWindLayerStyleOptions> {
     type: string;
-    buildModels(): void;
-    rebuildModels(): void;
+    buildModels(): Promise<void>;
     renderModels(): this;
     protected getDefaultConfig(): {};
-    protected getModelType(): WindModelType;
+    getModelType(): WindModelType;
 }

package/es/wind/index.js

@@ -1,3 +1,4 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -5,6 +6,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -36,24 +38,32 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(WindLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var modelType = this.getModelType();
-      this.layerModel = new WindModels[modelType](this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var modelType;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                modelType = this.getModelType();
+                this.layerModel = new WindModels[modelType](this);
+                _context.next = 4;
+                return this.initLayerModels();
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
 
-      this.layerModel.buildModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
+      return buildModels;
+    }()
   }, {
     key: "renderModels",
     value: function renderModels() {

package/es/wind/models/wind.d.ts

@@ -10,12 +10,12 @@ export default class WindModel extends BaseModel {
     private cacheZoom;
     render(): void;
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     getWindSize(): {
         imageWidth: number;
         imageHeight: number;
     };
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
     private getZoomScale;