@antv/l7-layers 2.20.16 → 2.20.17

package/es/core/LayerPickService.js

@@ -21,10 +21,13 @@ var BaseLayerPickService = /*#__PURE__*/function () {
       if (layer.tileLayer) {
         return layer.tileLayer.pickRender(target);
       }
+      // 渲染瓦片图层的拾取
+      layer.hooks.beforePickingEncode.call();
       layerService.renderTileLayerMask(layer);
       layer.renderModels({
         ispick: true
       });
+      layer.hooks.afterPickingEncode.call();
     }
   }, {
     key: "pick",

package/es/heatmap/index.d.ts

@@ -1,4 +1,4 @@
-import type { IAttributeAndElements, IRenderOptions } from '@antv/l7-core';
+import type { IAttributeAndElements, ILegend, IRenderOptions } from '@antv/l7-core';
 import BaseLayer from '../core/BaseLayer';
 import type { IHeatMapLayerStyleOptions } from '../core/interface';
 import type { HeatMapModelType } from './models';
@@ -9,4 +9,5 @@ export default class HeatMapLayer extends BaseLayer<IHeatMapLayerStyleOptions> {
     renderModels(options?: Partial<IRenderOptions>): this;
     updateModelData(data: IAttributeAndElements): void;
     getModelType(): HeatMapModelType;
+    getLegend(name: string): ILegend;
 }

package/es/heatmap/index.js

@@ -2,6 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
+import _get from "@babel/runtime/helpers/esm/get";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
@@ -11,6 +12,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import BaseLayer from "../core/BaseLayer";
 import HeatMapModels from "./models";
+import { rampColor2legend } from "../utils/rampcolor_legend";
 var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(HeatMapLayer, _BaseLayer);
   var _super = _createSuper(HeatMapLayer);
@@ -114,6 +116,21 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
       }
       return 'heatmap';
     }
+  }, {
+    key: "getLegend",
+    value: function getLegend(name) {
+      if (this.getModelType() === 'heatmap') {
+        if (name !== 'color') return {
+          type: undefined,
+          field: undefined,
+          items: []
+        };
+        var rampColors = this.getLayerConfig().rampColors;
+        return rampColor2legend(rampColors, name);
+      } else {
+        return _get(_getPrototypeOf(HeatMapLayer.prototype), "getLegend", this).call(this, name);
+      }
+    }
   }]);
   return HeatMapLayer;
 }(BaseLayer);

package/es/raster/index.d.ts

@@ -1,3 +1,4 @@
+import type { ILegend } from '@antv/l7-core';
 import BaseLayer from '../core/BaseLayer';
 import type { IRasterLayerStyleOptions } from '../core/interface';
 import type { RasterModelType } from './models/index';
@@ -6,4 +7,5 @@ export default class RaterLayer extends BaseLayer<IRasterLayerStyleOptions> {
     buildModels(): Promise<void>;
     protected getDefaultConfig(): {} | {} | {} | {};
     getModelType(): RasterModelType;
+    getLegend(name: string): ILegend;
 }

package/es/raster/index.js

@@ -11,6 +11,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import BaseLayer from "../core/BaseLayer";
 import RasterModels from "./models/index";
+import { rampColor2legend } from "../utils/rampcolor_legend";
 var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(RaterLayer, _BaseLayer);
   var _super = _createSuper(RaterLayer);
@@ -77,6 +78,17 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
           return 'raster';
       }
     }
+  }, {
+    key: "getLegend",
+    value: function getLegend(name) {
+      if (name !== 'color') return {
+        type: undefined,
+        field: undefined,
+        items: []
+      };
+      var rampColors = this.getLayerConfig().rampColors;
+      return rampColor2legend(rampColors, name);
+    }
   }]);
   return RaterLayer;
 }(BaseLayer);

package/es/utils/rampcolor_legend.d.ts

@@ -0,0 +1,6 @@
+import type { ILegend, ScaleTypeName } from '@antv/l7-core';
+export declare function rampColor2legend(rampColors: {
+    type: ScaleTypeName;
+    colors: string[];
+    positions: number[];
+}, name: string): ILegend;

package/es/utils/rampcolor_legend.js

@@ -0,0 +1,11 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+export function rampColor2legend(rampColors, name) {
+  return {
+    type: rampColors.type,
+    field: 'value',
+    items: rampColors.positions.map(function (value, index) {
+      var _ref;
+      return _ref = {}, _defineProperty(_ref, name, index >= rampColors.colors.length ? null : rampColors.colors[index]), _defineProperty(_ref, "value", value), _ref;
+    })
+  };
+}

package/lib/core/LayerPickService.js

@@ -28,10 +28,13 @@ var BaseLayerPickService = exports.default = /*#__PURE__*/function () {
       if (layer.tileLayer) {
         return layer.tileLayer.pickRender(target);
       }
+      // 渲染瓦片图层的拾取
+      layer.hooks.beforePickingEncode.call();
       layerService.renderTileLayerMask(layer);
       layer.renderModels({
         ispick: true
       });
+      layer.hooks.afterPickingEncode.call();
     }
   }, {
     key: "pick",

package/lib/heatmap/index.js

@@ -10,12 +10,14 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 var _models = _interopRequireDefault(require("./models"));
+var _rampcolor_legend = require("../utils/rampcolor_legend");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var HeatMapLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
@@ -121,6 +123,21 @@ var HeatMapLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
       }
       return 'heatmap';
     }
+  }, {
+    key: "getLegend",
+    value: function getLegend(name) {
+      if (this.getModelType() === 'heatmap') {
+        if (name !== 'color') return {
+          type: undefined,
+          field: undefined,
+          items: []
+        };
+        var rampColors = this.getLayerConfig().rampColors;
+        return (0, _rampcolor_legend.rampColor2legend)(rampColors, name);
+      } else {
+        return (0, _get2.default)((0, _getPrototypeOf2.default)(HeatMapLayer.prototype), "getLegend", this).call(this, name);
+      }
+    }
   }]);
   return HeatMapLayer;
 }(_BaseLayer2.default);

package/lib/raster/index.js

@@ -16,6 +16,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 var _index = _interopRequireDefault(require("./models/index"));
+var _rampcolor_legend = require("../utils/rampcolor_legend");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var RaterLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
@@ -84,6 +85,17 @@ var RaterLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
           return 'raster';
       }
     }
+  }, {
+    key: "getLegend",
+    value: function getLegend(name) {
+      if (name !== 'color') return {
+        type: undefined,
+        field: undefined,
+        items: []
+      };
+      var rampColors = this.getLayerConfig().rampColors;
+      return (0, _rampcolor_legend.rampColor2legend)(rampColors, name);
+    }
   }]);
   return RaterLayer;
 }(_BaseLayer2.default);

package/lib/utils/rampcolor_legend.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.rampColor2legend = rampColor2legend;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+function rampColor2legend(rampColors, name) {
+  return {
+    type: rampColors.type,
+    field: 'value',
+    items: rampColors.positions.map(function (value, index) {
+      var _ref;
+      return _ref = {}, (0, _defineProperty2.default)(_ref, name, index >= rampColors.colors.length ? null : rampColors.colors[index]), (0, _defineProperty2.default)(_ref, "value", value), _ref;
+    })
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.20.16",
+  "version": "2.20.17",
   "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.9",
-    "@antv/l7-core": "2.20.16",
-    "@antv/l7-maps": "2.20.16",
-    "@antv/l7-source": "2.20.16",
-    "@antv/l7-utils": "2.20.16",
+    "@antv/l7-core": "2.20.17",
+    "@antv/l7-maps": "2.20.17",
+    "@antv/l7-source": "2.20.17",
+    "@antv/l7-utils": "2.20.17",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -52,7 +52,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.20.16",
+    "@antv/l7-test-utils": "2.20.17",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "63b45d16a6d3cab498f5d6b298d51a6d30bb3f3b",
+  "gitHead": "e37d5cc24eec17a0949b827d76d1ac7c97a8fef3",
   "publishConfig": {
     "access": "public"
   }