@antv/l7-layers 2.9.32-alpha.4 → 2.9.32-alpha.5

package/es/core/BaseLayer.d.ts

@@ -6,6 +6,7 @@ import { Container } from 'inversify';
 export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter<LayerEventType> implements ILayer {
     id: string;
     name: string;
+    coordCenter: number[];
     type: string;
     visible: boolean;
     zIndex: number;

package/es/core/BaseLayer.js

@@ -500,7 +500,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "source",
     value: function source(data, options) {
-      if (data !== null && data !== void 0 && data.data) {
+      if ((data === null || data === void 0 ? void 0 : data.type) === 'source') {
         // 判断是否为source
         this.setSource(data);
         return this;
@@ -1047,6 +1047,15 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
 
       this.layerSource.on('sourceUpdate', function () {
+        if (_this8.coordCenter === undefined) {
+          var layerCenter = _this8.layerSource.center;
+          _this8.coordCenter = layerCenter;
+          _this8.mapService.setCoordCenter && _this8.mapService.setCoordCenter(layerCenter); // // @ts-ignore
+          // this.mapService.map.customCoords.setCenter(layerCenter);
+          // // @ts-ignore
+          // this.mapService.setCustomCoordCenter(layerCenter);
+        }
+
         _this8.sourceEvent();
       });
     }
@@ -1178,6 +1187,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
               return reject(err);
             });
           } else {
+            // console.log(this.encodedData[1].originCoordinates[0])
+            // console.log(this.encodedData[1].coordinates[0])
             var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
                 attributes = _this9$styleAttribute.attributes,
                 elements = _this9$styleAttribute.elements,
@@ -1381,14 +1392,20 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "dispatchModelLoad",
     value: function dispatchModelLoad(models) {
+      var _this11 = this;
+
       this.models.forEach(function (model) {
         return model.destroy();
       });
       this.models = [];
       this.models = models;
       this.emit('modelLoaded', null);
-      this.modelLoaded = true;
-      this.layerService.throttleRenderLayers();
+      this.modelLoaded = true; // Tip: setTimeout 用于延迟绘制，可以让拖动图层时连续的 setData 更加平滑 - L7Draw
+
+      setTimeout(function () {
+        // Tip: 使用 renderLayers 而不是 throttleRenderLayers，让图层之间的 setData 更新绘制不存在延迟
+        _this11.layerService.renderLayers();
+      }, 32);
     }
   }, {
     key: "reRender",

package/es/core/interface.d.ts

@@ -120,6 +120,7 @@ export interface IRasterTileLayerStyleOptions extends IBaseLayerStyleOptions {
 export interface IMaskLayerStyleOptions extends IBaseLayerStyleOptions {
     opacity: number;
     color: string;
+    sourceLayer?: string;
 }
 export interface IWindLayerStyleOptions extends IBaseLayerStyleOptions {
     uMin?: number;
@@ -217,5 +218,8 @@ export interface IRasterLayerStyleOptions extends IBaseLayerStyleOptions {
     clampHigh: boolean;
     rampColors: IColorRamp;
     rampColorsData?: ImageData | IImagedata;
+    channelRMax?: number;
+    channelGMax?: number;
+    channelBMax?: number;
 }
 export {};

package/es/mask/index.js

@@ -19,6 +19,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import BaseLayer from "../core/BaseLayer";
 import MaskModels from "./models";
+import { isVectorTile } from "../tile/utils";
 import { TYPES } from '@antv/l7-core';
 
 var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
@@ -143,6 +144,12 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "getModelType",
     value: function getModelType() {
+      var parserType = this.layerSource.getParserType();
+
+      if (isVectorTile(parserType)) {
+        return 'vectorMask';
+      }
+
       return 'fill';
     }
   }]);

package/es/mask/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type MaskModelType = 'fill';
+export declare type MaskModelType = 'fill' | 'vectorMask';
 declare const MaskModels: {
     [key in MaskModelType]: any;
 };

package/es/mask/models/index.js

@@ -1,5 +1,7 @@
+import MaskTileModel from "../../tile/models/tileModel";
 import FillModel from "./fill";
 var MaskModels = {
-  fill: FillModel
+  fill: FillModel,
+  vectorMask: MaskTileModel
 };
 export default MaskModels;

package/es/plugins/DataMappingPlugin.d.ts

@@ -11,7 +11,6 @@ export default class DataMappingPlugin implements ILayerPlugin {
     private mapLayerMapping;
     private adjustData2Amap2Coordinates;
     private adjustData2SimpleCoordinates;
-    private getLayerCenter;
     private unProjectCoordinates;
     private applyAttributeMapping;
     private applyMapLayerAttributeMapping;

package/es/plugins/DataMappingPlugin.js

@@ -254,7 +254,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
       // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
       if (mappedData.length > 0 && this.mapService.version === Version['GAODE2.x']) {
-        var layerCenter = this.getLayerCenter(layer);
+        var layerCenter = layer.coordCenter || layer.getSource().center;
 
         if (typeof mappedData[0].coordinates[0] === 'number') {
           // 单个的点数据
@@ -273,7 +273,6 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
           });
         } else {
           // 连续的线、面数据
-          // @ts-ignore
           mappedData // TODO: 避免经纬度被重复计算导致坐标位置偏移
           .filter(function (d) {
             return !d.originCoordinates;
@@ -303,12 +302,6 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
         });
       }
     }
-  }, {
-    key: "getLayerCenter",
-    value: function getLayerCenter(layer) {
-      var source = layer.getSource();
-      return source.center;
-    }
   }, {
     key: "unProjectCoordinates",
     value: function unProjectCoordinates(coordinates) {

package/es/plugins/ShaderUniformPlugin.d.ts

@@ -13,5 +13,9 @@ export default class ShaderUniformPlugin implements ILayerPlugin {
     private readonly rendererService;
     private readonly mapService;
     apply(layer: ILayer): void;
-    private getLayerCenter;
+    /**
+     * 对于每个 layer 都有不同的几何中心点，因此在绘制每个 layer 的时候都需要重新设置
+     * @param layer
+     */
+    private setLayerCenter;
 }

package/es/plugins/ShaderUniformPlugin.js

@@ -48,13 +48,7 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
         _this.coordinateSystemService.refresh(offset);
 
         if (version === 'GAODE2.x') {
-          var layerCenter = _this.getLayerCenter(layer); // @ts-ignore
-
-
-          _this.mapService.map.customCoords.setCenter(layerCenter); // @ts-ignore
-
-
-          _this.mapService.setCustomCoordCenter(layerCenter); // @ts-ignore
+          _this.setLayerCenter(layer); // @ts-ignore
 
 
           mvp = _this.mapService.map.customCoords.getMVPMatrix(); // mvp = amapCustomCoords.getMVPMatrix()
@@ -74,11 +68,16 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
         }); // TODO：脏检查，决定是否需要渲染
       });
     }
+    /**
+     * 对于每个 layer 都有不同的几何中心点，因此在绘制每个 layer 的时候都需要重新设置
+     * @param layer
+     */
+
   }, {
-    key: "getLayerCenter",
-    value: function getLayerCenter(layer) {
-      var source = layer.getSource();
-      return source.center;
+    key: "setLayerCenter",
+    value: function setLayerCenter(layer) {
+      if (layer.coordCenter === undefined) layer.coordCenter = layer.getSource().center;
+      this.mapService.setCoordCenter && this.mapService.setCoordCenter(layer.coordCenter);
     }
   }]);
 

package/es/raster/index.d.ts

@@ -14,6 +14,6 @@ export default class RaterLayer extends BaseLayer<IRasterLayerStyleOptions> {
             };
         };
     };
-    protected getDefaultConfig(): {} | {} | {};
+    protected getDefaultConfig(): {} | {} | {} | {};
     protected getModelType(): RasterModelType;
 }

package/es/raster/index.js

@@ -73,6 +73,7 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
       var type = this.getModelType();
       var defaultConfig = {
         raster: {},
+        rasterRgb: {},
         raster3d: {},
         rasterTile: {}
       };
@@ -88,6 +89,9 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
         case 'raster':
           return 'raster';
 
+        case 'rasterRgb':
+          return 'rasterRgb';
+
         case 'rasterTile':
           return 'rasterTile';
 

package/es/raster/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type RasterModelType = 'raster' | 'raster3d' | 'rasterTile';
+export declare type RasterModelType = 'raster' | 'raster3d' | 'rasterTile' | 'rasterRgb';
 declare const RasterModels: {
     [key in RasterModelType]: any;
 };

package/es/raster/models/index.js

@@ -1,7 +1,9 @@
 import RasterTileModel from "../../tile/models/tileModel";
 import RasterModel from "./raster";
+import RasterRgbModel from "./rasterRgb";
 var RasterModels = {
   raster: RasterModel,
+  rasterRgb: RasterRgbModel,
   raster3d: RasterModel,
   rasterTile: RasterTileModel
 };

package/es/raster/models/raster.d.ts

@@ -13,7 +13,8 @@ export default class RasterModel extends BaseModel {
         u_noDataValue: number;
         u_colorTexture: ITexture2D;
     };
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    private getRasterData;
+    initModels(callbackModel: (models: IModel[]) => void): Promise<void>;
     buildModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;

package/es/raster/models/raster.js

@@ -1,8 +1,10 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+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); }; }
 
@@ -62,53 +64,125 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         u_colorTexture: this.colorTexture
       };
     }
+  }, {
+    key: "getRasterData",
+    value: function () {
+      var _getRasterData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(parserDataItem) {
+        var _yield$parserDataItem, rasterData, width, height;
+
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!Array.isArray(parserDataItem.data)) {
+                  _context.next = 4;
+                  break;
+                }
+
+                return _context.abrupt("return", {
+                  data: parserDataItem.data,
+                  width: parserDataItem.width,
+                  height: parserDataItem.height
+                });
+
+              case 4:
+                _context.next = 6;
+                return parserDataItem.data;
+
+              case 6:
+                _yield$parserDataItem = _context.sent;
+                rasterData = _yield$parserDataItem.rasterData;
+                width = _yield$parserDataItem.width;
+                height = _yield$parserDataItem.height;
+                return _context.abrupt("return", {
+                  data: Array.from(rasterData),
+                  width: width,
+                  height: height
+                });
+
+              case 11:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      function getRasterData(_x) {
+        return _getRasterData.apply(this, arguments);
+      }
+
+      return getRasterData;
+    }()
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$mask = _ref2.mask,
-          mask = _ref2$mask === void 0 ? false : _ref2$mask,
-          _ref2$maskInside = _ref2.maskInside,
-          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside,
-          rampColorsData = _ref2.rampColorsData,
-          rampColors = _ref2.rampColors;
-
-      var source = this.layer.getSource();
-      var createTexture2D = this.rendererService.createTexture2D;
-      var parserDataItem = source.data.dataArray[0];
-      this.texture = createTexture2D({
-        data: parserDataItem.data,
-        width: parserDataItem.width,
-        height: parserDataItem.height,
-        format: gl.LUMINANCE,
-        type: gl.FLOAT // aniso: 4,
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(callbackModel) {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, rampColorsData, rampColors, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, imageData;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside, rampColorsData = _ref2.rampColorsData, rampColors = _ref2.rampColors;
+                source = this.layer.getSource();
+                createTexture2D = this.rendererService.createTexture2D;
+                parserDataItem = source.data.dataArray[0];
+                _context2.next = 6;
+                return this.getRasterData(parserDataItem);
+
+              case 6:
+                _yield$this$getRaster = _context2.sent;
+                data = _yield$this$getRaster.data;
+                width = _yield$this$getRaster.width;
+                height = _yield$this$getRaster.height;
+                this.texture = createTexture2D({
+                  data: data,
+                  width: width,
+                  height: height,
+                  format: gl.LUMINANCE,
+                  type: gl.FLOAT // aniso: 4,
+
+                });
+                imageData = rampColorsData ? rampColorsData : generateColorRamp(rampColors);
+                this.colorTexture = createTexture2D({
+                  data: imageData.data,
+                  width: imageData.width,
+                  height: imageData.height,
+                  flipY: false
+                });
+                this.layer.buildLayerModel({
+                  moduleName: 'rasterImageData',
+                  vertexShader: rasterVert,
+                  fragmentShader: rasterFrag,
+                  triangulation: RasterImageTriangulation,
+                  primitive: gl.TRIANGLES,
+                  depth: {
+                    enable: false
+                  },
+                  stencil: getMask(mask, maskInside),
+                  pick: false
+                }).then(function (model) {
+                  callbackModel([model]);
+                }).catch(function (err) {
+                  console.warn(err);
+                  callbackModel([]);
+                });
+
+              case 14:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
 
-      });
-      var imageData = rampColorsData ? rampColorsData : generateColorRamp(rampColors);
-      this.colorTexture = createTexture2D({
-        data: imageData.data,
-        width: imageData.width,
-        height: imageData.height,
-        flipY: false
-      });
-      this.layer.buildLayerModel({
-        moduleName: 'rasterImageData',
-        vertexShader: rasterVert,
-        fragmentShader: rasterFrag,
-        triangulation: RasterImageTriangulation,
-        primitive: gl.TRIANGLES,
-        depth: {
-          enable: false
-        },
-        stencil: getMask(mask, maskInside),
-        pick: false
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+      function initModels(_x2) {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "buildModels",
     value: function buildModels(callbackModel) {

package/es/raster/models/rasterRgb.d.ts

@@ -0,0 +1,20 @@
+import { IModel, ITexture2D } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class RasterModel extends BaseModel {
+    protected texture: ITexture2D;
+    protected channelRMax: number;
+    protected channelGMax: number;
+    protected channelBMax: number;
+    getUninforms(): {
+        u_opacity: number;
+        u_texture: ITexture2D;
+        u_channelRMax: number;
+        u_channelGMax: number;
+        u_channelBMax: number;
+    };
+    private getRasterData;
+    initModels(callbackModel: (models: IModel[]) => void): Promise<void>;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
+    clearModels(): void;
+    protected registerBuiltinAttributes(): void;
+}