@antv/l7-layers 2.21.0 → 2.21.2

package/lib/core/CommonStyleAttribute.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ShaderLocation = void 0;
 exports.getCommonStyleAttributeOptions = getCommonStyleAttributeOptions;
 var _l7Core = require("@antv/l7-core");
-var ShaderLocation = exports.ShaderLocation = /*#__PURE__*/function (ShaderLocation) {
+let ShaderLocation = exports.ShaderLocation = /*#__PURE__*/function (ShaderLocation) {
   ShaderLocation[ShaderLocation["POSITION"] = 0] = "POSITION";
   ShaderLocation[ShaderLocation["COLOR"] = 1] = "COLOR";
   ShaderLocation[ShaderLocation["VERTEX_ID"] = 2] = "VERTEX_ID";
@@ -41,9 +41,10 @@ function getCommonStyleAttributeOptions(name) {
             type: _l7Core.gl.FLOAT
           },
           size: 1,
-          update: function update(feature) {
-            var _feature$rotation = feature.rotation,
-              rotation = _feature$rotation === void 0 ? 0 : _feature$rotation;
+          update: feature => {
+            const {
+              rotation = 0
+            } = feature;
             return Array.isArray(rotation) ? [rotation[0]] : [rotation];
           }
         }
@@ -62,9 +63,10 @@ function getCommonStyleAttributeOptions(name) {
             type: _l7Core.gl.FLOAT
           },
           size: 4,
-          update: function update(feature) {
-            var _feature$stroke = feature.stroke,
-              stroke = _feature$stroke === void 0 ? [1, 1, 1, 1] : _feature$stroke;
+          update: feature => {
+            const {
+              stroke = [1, 1, 1, 1]
+            } = feature;
             return stroke;
           }
         }
@@ -83,9 +85,10 @@ function getCommonStyleAttributeOptions(name) {
             type: _l7Core.gl.FLOAT
           },
           size: 1,
-          update: function update(feature) {
-            var _feature$opacity = feature.opacity,
-              op = _feature$opacity === void 0 ? 1 : _feature$opacity;
+          update: feature => {
+            const {
+              opacity: op = 1
+            } = feature;
             return [op];
           }
         }
@@ -104,9 +107,10 @@ function getCommonStyleAttributeOptions(name) {
             type: _l7Core.gl.FLOAT
           },
           size: 1,
-          update: function update(feature) {
-            var _feature$extrusionBas = feature.extrusionBase,
-              op = _feature$extrusionBas === void 0 ? 0 : _feature$extrusionBas;
+          update: feature => {
+            const {
+              extrusionBase: op = 0
+            } = feature;
             return [op];
           }
         }
@@ -125,8 +129,10 @@ function getCommonStyleAttributeOptions(name) {
             type: _l7Core.gl.FLOAT
           },
           size: 2,
-          update: function update(feature) {
-            var epo = feature.offsets;
+          update: feature => {
+            const {
+              offsets: epo
+            } = feature;
             return epo;
           }
         }
@@ -145,9 +151,10 @@ function getCommonStyleAttributeOptions(name) {
             type: _l7Core.gl.FLOAT
           },
           size: 1,
-          update: function update(feature) {
-            var _feature$thetaOffset = feature.thetaOffset,
-              op = _feature$thetaOffset === void 0 ? 1 : _feature$thetaOffset;
+          update: feature => {
+            const {
+              thetaOffset: op = 1
+            } = feature;
             return [op];
           }
         }

package/lib/core/LayerPickService.d.ts

@@ -0,0 +1,12 @@
+import type { IInteractionTarget, ILayer, ILayerPickService, IMapService } from '@antv/l7-core';
+export default class BaseLayerPickService implements ILayerPickService {
+    private layer;
+    constructor(layer: ILayer);
+    pickRender(target: IInteractionTarget): void;
+    pick(layer: ILayer, target: IInteractionTarget): Promise<boolean>;
+    pickRasterLayer(layer: ILayer, target: IInteractionTarget, parent?: ILayer): boolean;
+    readRasterValue(layer: ILayer, bbox: number[], mapService: IMapService, x: number, y: number): any;
+    selectFeature(pickedColors: Uint8Array | undefined): void;
+    highlightPickedFeature(pickedColors: Uint8Array | undefined): void;
+    getFeatureById(pickedFeatureIdx: number): any;
+}

package/lib/core/LayerPickService.js

@@ -5,152 +5,104 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Utils = require("@antv/l7-utils");
-var BaseLayerPickService = exports.default = /*#__PURE__*/function () {
-  function BaseLayerPickService(layer) {
-    (0, _classCallCheck2.default)(this, BaseLayerPickService);
+class BaseLayerPickService {
+  constructor(layer) {
+    (0, _defineProperty2.default)(this, "layer", void 0);
     this.layer = layer;
   }
-  (0, _createClass2.default)(BaseLayerPickService, [{
-    key: "pickRender",
-    value: function pickRender(target) {
-      var container = this.layer.getContainer();
-      var layerService = container.layerService;
-      var layer = this.layer;
-      // 瓦片图层的拾取绘制
-      if (layer.tileLayer) {
-        return layer.tileLayer.pickRender(target);
-      }
-      // 渲染瓦片图层的拾取
-      layer.hooks.beforePickingEncode.call();
-      layerService.renderTileLayerMask(layer);
-      layer.renderModels({
-        ispick: true
-      });
-      layer.hooks.afterPickingEncode.call();
+  pickRender(target) {
+    const container = this.layer.getContainer();
+    const layerService = container.layerService;
+    const layer = this.layer;
+    // 瓦片图层的拾取绘制
+    if (layer.tileLayer) {
+      return layer.tileLayer.pickRender(target);
     }
-  }, {
-    key: "pick",
-    value: function () {
-      var _pick = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer, target) {
-        var container, pickingService;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              container = this.layer.getContainer();
-              pickingService = container.pickingService;
-              if (!(layer.type === 'RasterLayer')) {
-                _context.next = 4;
-                break;
-              }
-              return _context.abrupt("return", this.pickRasterLayer(layer, target));
-            case 4:
-              this.pickRender(target);
-              return _context.abrupt("return", pickingService.pickFromPickingFBO(layer, target));
-            case 6:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function pick(_x, _x2) {
-        return _pick.apply(this, arguments);
-      }
-      return pick;
-    }()
-  }, {
-    key: "pickRasterLayer",
-    value: function pickRasterLayer(layer, target, parent) {
-      var container = this.layer.getContainer();
-      var pickingService = container.pickingService;
-      var mapService = container.mapService;
-      var extent = this.layer.getSource().extent;
-      var isPick = (0, _l7Utils.lngLatInExtent)(target.lngLat, extent);
-      var layerTarget = {
-        x: target.x,
-        y: target.y,
-        type: target.type,
-        lngLat: target.lngLat,
-        target: target,
-        rasterValue: null
-      };
-      var adviceTarget = parent ? parent : layer;
-      if (isPick) {
-        var rasterValue = this.readRasterValue(layer, extent, mapService, target.x, target.y);
-        layerTarget.rasterValue = rasterValue;
-        pickingService.triggerHoverOnLayer(adviceTarget, layerTarget);
-        return true;
-      } else {
-        layerTarget.type = target.type === 'mousemove' ? 'mouseout' : 'un' + target.type;
-        pickingService.triggerHoverOnLayer(adviceTarget, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, layerTarget), {}, {
-          type: 'unpick'
-        }));
-        pickingService.triggerHoverOnLayer(adviceTarget, layerTarget);
-        return false;
+    // 渲染瓦片图层的拾取
+    layer.hooks.beforePickingEncode.call();
+    layerService.renderTileLayerMask(layer);
+    layer.renderModels({
+      ispick: true
+    });
+    layer.hooks.afterPickingEncode.call();
+  }
+  pick(layer, target) {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      const container = _this.layer.getContainer();
+      const pickingService = container.pickingService;
+      if (layer.type === 'RasterLayer') {
+        return _this.pickRasterLayer(layer, target);
       }
+      _this.pickRender(target);
+      return pickingService.pickFromPickingFBO(layer, target);
+    })();
+  }
+  pickRasterLayer(layer, target, parent) {
+    const container = this.layer.getContainer();
+    const pickingService = container.pickingService;
+    const mapService = container.mapService;
+    const extent = this.layer.getSource().extent;
+    const isPick = (0, _l7Utils.lngLatInExtent)(target.lngLat, extent);
+    const layerTarget = {
+      x: target.x,
+      y: target.y,
+      type: target.type,
+      lngLat: target.lngLat,
+      target,
+      rasterValue: null
+    };
+    const adviceTarget = parent ? parent : layer;
+    if (isPick) {
+      const rasterValue = this.readRasterValue(layer, extent, mapService, target.x, target.y);
+      layerTarget.rasterValue = rasterValue;
+      pickingService.triggerHoverOnLayer(adviceTarget, layerTarget);
+      return true;
+    } else {
+      layerTarget.type = target.type === 'mousemove' ? 'mouseout' : 'un' + target.type;
+      pickingService.triggerHoverOnLayer(adviceTarget, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, layerTarget), {}, {
+        type: 'unpick'
+      }));
+      pickingService.triggerHoverOnLayer(adviceTarget, layerTarget);
+      return false;
     }
-  }, {
-    key: "readRasterValue",
-    value: function readRasterValue(layer, bbox, mapService, x, y) {
-      var rasterData = layer.getSource().data.dataArray[0];
-      var _bbox = (0, _slicedToArray2.default)(bbox, 4),
-        _bbox$ = _bbox[0],
-        minLng = _bbox$ === void 0 ? 0 : _bbox$,
-        _bbox$2 = _bbox[1],
-        minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
-        _bbox$3 = _bbox[2],
-        maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
-        _bbox$4 = _bbox[3],
-        maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
-      var tileXY = mapService.lngLatToContainer([minLng, minLat]);
-      var tileMaxXY = mapService.lngLatToContainer([maxLng, maxLat]);
-      var tilePixelWidth = tileMaxXY.x - tileXY.x;
-      var tilePixelHeight = tileXY.y - tileMaxXY.y;
-      var pos = [(x - tileXY.x) / tilePixelWidth,
-      // x
-      (y - tileMaxXY.y) / tilePixelHeight // y
-      ];
-
-      var tileWidth = rasterData.width || 1;
-      var tileHeight = rasterData.height || 1;
-      var indexX = Math.floor(pos[0] * tileWidth);
-      var indexY = Math.floor(pos[1] * tileHeight);
-      var index = Math.max(0, indexY - 1) * tileWidth + indexX;
-      var data = rasterData.data[index];
-      return data;
-    }
-  }, {
-    key: "selectFeature",
-    value: function selectFeature(pickedColors) {
-      var layer = this.layer;
-      // @ts-ignore
-      var _pickedColors = (0, _slicedToArray2.default)(pickedColors, 3),
-        r = _pickedColors[0],
-        g = _pickedColors[1],
-        b = _pickedColors[2];
-      layer.hooks.beforeSelect.call([r, g, b]);
-    }
-  }, {
-    key: "highlightPickedFeature",
-    value: function highlightPickedFeature(pickedColors) {
-      // @ts-ignore
-      var _pickedColors2 = (0, _slicedToArray2.default)(pickedColors, 3),
-        r = _pickedColors2[0],
-        g = _pickedColors2[1],
-        b = _pickedColors2[2];
-      this.layer.hooks.beforeHighlight.call([r, g, b]);
-    }
-  }, {
-    key: "getFeatureById",
-    value: function getFeatureById(pickedFeatureIdx) {
-      return this.layer.getSource().getFeatureById(pickedFeatureIdx);
-    }
-  }]);
-  return BaseLayerPickService;
-}();
+  }
+  readRasterValue(layer, bbox, mapService, x, y) {
+    const rasterData = layer.getSource().data.dataArray[0];
+    const [minLng = 0, minLat = 0, maxLng = 10, maxLat = -10] = bbox;
+    const tileXY = mapService.lngLatToContainer([minLng, minLat]);
+    const tileMaxXY = mapService.lngLatToContainer([maxLng, maxLat]);
+    const tilePixelWidth = tileMaxXY.x - tileXY.x;
+    const tilePixelHeight = tileXY.y - tileMaxXY.y;
+    const pos = [(x - tileXY.x) / tilePixelWidth,
+    // x
+    (y - tileMaxXY.y) / tilePixelHeight // y
+    ];
+    const tileWidth = rasterData.width || 1;
+    const tileHeight = rasterData.height || 1;
+    const indexX = Math.floor(pos[0] * tileWidth);
+    const indexY = Math.floor(pos[1] * tileHeight);
+    const index = Math.max(0, indexY - 1) * tileWidth + indexX;
+    const data = rasterData.data[index];
+    return data;
+  }
+  selectFeature(pickedColors) {
+    const layer = this.layer;
+    // @ts-ignore
+    const [r, g, b] = pickedColors;
+    layer.hooks.beforeSelect.call([r, g, b]);
+  }
+  highlightPickedFeature(pickedColors) {
+    // @ts-ignore
+    const [r, g, b] = pickedColors;
+    this.layer.hooks.beforeHighlight.call([r, g, b]);
+  }
+  getFeatureById(pickedFeatureIdx) {
+    return this.layer.getSource().getFeatureById(pickedFeatureIdx);
+  }
+}
+exports.default = BaseLayerPickService;

package/lib/core/TextureService.d.ts

@@ -0,0 +1,15 @@
+import type { ILayer, ITexture2D, ITextureService } from '@antv/l7-core';
+import type { IColorRamp } from '@antv/l7-utils';
+export default class TextureService implements ITextureService {
+    private layer;
+    private rendererService;
+    private colorTexture;
+    private key;
+    constructor(layer: ILayer);
+    getColorTexture(colorRamp: IColorRamp, domain?: [number, number]): ITexture2D;
+    createColorTexture(colorRamp: IColorRamp, domain?: [number, number]): ITexture2D;
+    setColorTexture(texture: ITexture2D, colorRamp: IColorRamp, domain: [number, number]): void;
+    destroy(): void;
+    private getColorRampBar;
+    private getTextureKey;
+}

package/lib/core/TextureService.js

@@ -5,78 +5,69 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Utils = require("@antv/l7-utils");
-var TextureService = exports.default = /*#__PURE__*/function () {
-  function TextureService(layer) {
-    (0, _classCallCheck2.default)(this, TextureService);
+class TextureService {
+  constructor(layer) {
+    (0, _defineProperty2.default)(this, "layer", void 0);
+    (0, _defineProperty2.default)(this, "rendererService", void 0);
+    (0, _defineProperty2.default)(this, "colorTexture", void 0);
+    (0, _defineProperty2.default)(this, "key", void 0);
     this.layer = layer;
-    var container = this.layer.getContainer();
+    const container = this.layer.getContainer();
     this.rendererService = container.rendererService;
   }
-  (0, _createClass2.default)(TextureService, [{
-    key: "getColorTexture",
-    value: function getColorTexture(colorRamp, domain) {
-      // TODO 支持传入图片
-      var currentkey = this.getTextureKey(colorRamp, domain);
-      if (this.key === currentkey) {
-        return this.colorTexture;
-      } else {
-        this.createColorTexture(colorRamp, domain);
-      }
-      this.key = currentkey;
+  getColorTexture(colorRamp, domain) {
+    // TODO 支持传入图片
+    const currentkey = this.getTextureKey(colorRamp, domain);
+    if (this.key === currentkey) {
       return this.colorTexture;
+    } else {
+      this.createColorTexture(colorRamp, domain);
     }
-  }, {
-    key: "createColorTexture",
-    value: function createColorTexture(colorRamp, domain) {
-      var createTexture2D = this.rendererService.createTexture2D;
-      var imageData = this.getColorRampBar(colorRamp, domain);
-      var texture = createTexture2D({
-        data: new Uint8Array(imageData.data),
-        width: imageData.width,
-        height: imageData.height,
-        flipY: false,
-        unorm: true
-      });
-      this.colorTexture = texture;
-      return texture;
-    }
-  }, {
-    key: "setColorTexture",
-    value: function setColorTexture(texture, colorRamp, domain) {
-      this.key = this.getTextureKey(colorRamp, domain);
-      this.colorTexture = texture;
-    }
-  }, {
-    key: "destroy",
-    value: function destroy() {
-      var _this$colorTexture;
-      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 || _this$colorTexture.destroy();
-    }
-  }, {
-    key: "getColorRampBar",
-    value: function getColorRampBar(colorRamp, domain) {
-      switch (colorRamp.type) {
-        case 'cat':
-          return (0, _l7Utils.generateCatRamp)(colorRamp);
-        case 'quantize':
-          return (0, _l7Utils.generateQuantizeRamp)(colorRamp);
-        case 'custom':
-          return (0, _l7Utils.generateCustomRamp)(colorRamp, domain);
-        case 'linear':
-          return (0, _l7Utils.generateLinearRamp)(colorRamp, domain);
-        default:
-          return (0, _l7Utils.generateColorRamp)(colorRamp);
-      }
-    }
-  }, {
-    key: "getTextureKey",
-    value: function getTextureKey(colorRamp, domain) {
-      var _colorRamp$positions;
-      return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp === null || colorRamp === void 0 || (_colorRamp$positions = colorRamp.positions) === null || _colorRamp$positions === void 0 ? void 0 : _colorRamp$positions.join('_'), "_").concat(colorRamp.type, "_").concat(domain === null || domain === void 0 ? void 0 : domain.join('_'));
+    this.key = currentkey;
+    return this.colorTexture;
+  }
+  createColorTexture(colorRamp, domain) {
+    const {
+      createTexture2D
+    } = this.rendererService;
+    const imageData = this.getColorRampBar(colorRamp, domain);
+    const texture = createTexture2D({
+      data: new Uint8Array(imageData.data),
+      width: imageData.width,
+      height: imageData.height,
+      flipY: false,
+      unorm: true
+    });
+    this.colorTexture = texture;
+    return texture;
+  }
+  setColorTexture(texture, colorRamp, domain) {
+    this.key = this.getTextureKey(colorRamp, domain);
+    this.colorTexture = texture;
+  }
+  destroy() {
+    var _this$colorTexture;
+    (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 || _this$colorTexture.destroy();
+  }
+  getColorRampBar(colorRamp, domain) {
+    switch (colorRamp.type) {
+      case 'cat':
+        return (0, _l7Utils.generateCatRamp)(colorRamp);
+      case 'quantize':
+        return (0, _l7Utils.generateQuantizeRamp)(colorRamp);
+      case 'custom':
+        return (0, _l7Utils.generateCustomRamp)(colorRamp, domain);
+      case 'linear':
+        return (0, _l7Utils.generateLinearRamp)(colorRamp, domain);
+      default:
+        return (0, _l7Utils.generateColorRamp)(colorRamp);
     }
-  }]);
-  return TextureService;
-}();
+  }
+  getTextureKey(colorRamp, domain) {
+    var _colorRamp$positions;
+    return `${colorRamp.colors.join('_')}_${colorRamp === null || colorRamp === void 0 || (_colorRamp$positions = colorRamp.positions) === null || _colorRamp$positions === void 0 ? void 0 : _colorRamp$positions.join('_')}_${colorRamp.type}_${domain === null || domain === void 0 ? void 0 : domain.join('_')}`;
+  }
+}
+exports.default = TextureService;

package/lib/core/constant.d.ts

@@ -0,0 +1,6 @@
+export declare const DefaultUniformStyleValue: {
+    [key: string]: any;
+};
+export declare const DefaultUniformStyleType: {
+    [key: string]: any;
+};

package/lib/core/constant.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DefaultUniformStyleValue = exports.DefaultUniformStyleType = void 0;
-var DefaultUniformStyleValue = exports.DefaultUniformStyleValue = {
+const DefaultUniformStyleValue = exports.DefaultUniformStyleValue = {
   opacity: 1,
   stroke: [1, 0, 0, 1],
   offsets: [0, 0],
@@ -13,7 +13,7 @@ var DefaultUniformStyleValue = exports.DefaultUniformStyleValue = {
   strokeOpacity: 1,
   thetaOffset: 0.314
 };
-var DefaultUniformStyleType = exports.DefaultUniformStyleType = {
+const DefaultUniformStyleType = exports.DefaultUniformStyleType = {
   opacity: 'float',
   stroke: 'vec4',
   offsets: 'vec2',