@antv/l7-layers 2.15.0 → 2.15.2

package/es/core/BaseLayer.js

@@ -800,7 +800,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           highlightColor: isObject(options) ? options.color : this.getLayerConfig().highlightColor,
           activeMix: isObject(options) ? options.mix : this.getLayerConfig().activeMix
         });
-        this.hooks.beforeSelect.call(encodePickingColor(id)) // @ts-ignore
+        this.hooks.beforeHighlight.call(encodePickingColor(id)) // @ts-ignore
         .then(function () {
           setTimeout(function () {
             _this6.reRender();

package/es/point/models/text.d.ts

@@ -43,6 +43,8 @@ export default class TextModel extends BaseModel {
      * 生成文字布局（对照文字纹理字典提取对应文字的位置很好信息）
      */
     private generateGlyphLayout;
+    private getFontServiceMapping;
+    private getFontServiceCanvas;
     /**
      * 文字避让 depend on originCentorid
      */

package/es/point/models/text.js

@@ -130,9 +130,8 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           _ref2$raisingHeight = _ref2.raisingHeight,
           raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight;
 
-      var _this$fontService = this.fontService,
-          canvas = _this$fontService.canvas,
-          mapping = _this$fontService.mapping;
+      var mapping = this.getFontServiceMapping();
+      var canvas = this.getFontServiceCanvas();
 
       if (mapping && Object.keys(mapping).length !== this.textCount && canvas) {
         this.updateTexture();
@@ -557,8 +556,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     value: function generateGlyphLayout(iconfont) {
       var _this2 = this;
 
-      // 更新文字布局
-      var mapping = this.fontService.mapping;
+      var mapping = this.getFontServiceMapping();
 
       var _ref6 = this.layer.getLayerConfig(),
           _ref6$spacing = _ref6.spacing,
@@ -591,6 +589,29 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
         return feature;
       });
     }
+  }, {
+    key: "getFontServiceMapping",
+    value: function getFontServiceMapping() {
+      var _ref7 = this.layer.getLayerConfig(),
+          _ref7$fontWeight = _ref7.fontWeight,
+          fontWeight = _ref7$fontWeight === void 0 ? '400' : _ref7$fontWeight,
+          _ref7$fontFamily = _ref7.fontFamily,
+          fontFamily = _ref7$fontFamily === void 0 ? 'sans-serif' : _ref7$fontFamily;
+
+      return this.fontService.getMappingByKey("".concat(fontFamily, "_").concat(fontWeight));
+    }
+  }, {
+    key: "getFontServiceCanvas",
+    value: function getFontServiceCanvas() {
+      var _ref8 = this.layer.getLayerConfig(),
+          _ref8$fontWeight = _ref8.fontWeight,
+          fontWeight = _ref8$fontWeight === void 0 ? '400' : _ref8$fontWeight,
+          _ref8$fontFamily = _ref8.fontFamily,
+          fontFamily = _ref8$fontFamily === void 0 ? 'sans-serif' : _ref8$fontFamily; // 更新文字布局
+
+
+      return this.fontService.getCanvasByKey("".concat(fontFamily, "_").concat(fontWeight));
+    }
     /**
      * 文字避让 depend on originCentorid
      */
@@ -600,11 +621,11 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     value: function filterGlyphs() {
       var _this3 = this;
 
-      var _ref7 = this.layer.getLayerConfig(),
-          _ref7$padding = _ref7.padding,
-          padding = _ref7$padding === void 0 ? [0, 0] : _ref7$padding,
-          _ref7$textAllowOverla = _ref7.textAllowOverlap,
-          textAllowOverlap = _ref7$textAllowOverla === void 0 ? false : _ref7$textAllowOverla;
+      var _ref9 = this.layer.getLayerConfig(),
+          _ref9$padding = _ref9.padding,
+          padding = _ref9$padding === void 0 ? [0, 0] : _ref9$padding,
+          _ref9$textAllowOverla = _ref9.textAllowOverlap,
+          textAllowOverlap = _ref9$textAllowOverla === void 0 ? false : _ref9$textAllowOverla;
 
       if (textAllowOverlap) {
         // 如果允许文本覆盖
@@ -678,7 +699,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "updateTexture",
     value: function updateTexture() {
       var createTexture2D = this.rendererService.createTexture2D;
-      var canvas = this.fontService.canvas;
+      var canvas = this.getFontServiceCanvas();
       this.textureHeight = canvas.height;
 
       if (this.texture) {

package/lib/core/BaseLayer.js

@@ -801,7 +801,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           highlightColor: (0, _lodash.isObject)(options) ? options.color : this.getLayerConfig().highlightColor,
           activeMix: (0, _lodash.isObject)(options) ? options.mix : this.getLayerConfig().activeMix
         });
-        this.hooks.beforeSelect.call((0, _l7Utils.encodePickingColor)(id)) // @ts-ignore
+        this.hooks.beforeHighlight.call((0, _l7Utils.encodePickingColor)(id)) // @ts-ignore
         .then(function () {
           setTimeout(function () {
             _this6.reRender();

package/lib/point/models/text.js

@@ -147,9 +147,8 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           _ref2$raisingHeight = _ref2.raisingHeight,
           raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight;
 
-      var _this$fontService = this.fontService,
-          canvas = _this$fontService.canvas,
-          mapping = _this$fontService.mapping;
+      var mapping = this.getFontServiceMapping();
+      var canvas = this.getFontServiceCanvas();
 
       if (mapping && Object.keys(mapping).length !== this.textCount && canvas) {
         this.updateTexture();
@@ -574,8 +573,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     value: function generateGlyphLayout(iconfont) {
       var _this2 = this;
 
-      // 更新文字布局
-      var mapping = this.fontService.mapping;
+      var mapping = this.getFontServiceMapping();
 
       var _ref6 = this.layer.getLayerConfig(),
           _ref6$spacing = _ref6.spacing,
@@ -608,6 +606,29 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
         return feature;
       });
     }
+  }, {
+    key: "getFontServiceMapping",
+    value: function getFontServiceMapping() {
+      var _ref7 = this.layer.getLayerConfig(),
+          _ref7$fontWeight = _ref7.fontWeight,
+          fontWeight = _ref7$fontWeight === void 0 ? '400' : _ref7$fontWeight,
+          _ref7$fontFamily = _ref7.fontFamily,
+          fontFamily = _ref7$fontFamily === void 0 ? 'sans-serif' : _ref7$fontFamily;
+
+      return this.fontService.getMappingByKey("".concat(fontFamily, "_").concat(fontWeight));
+    }
+  }, {
+    key: "getFontServiceCanvas",
+    value: function getFontServiceCanvas() {
+      var _ref8 = this.layer.getLayerConfig(),
+          _ref8$fontWeight = _ref8.fontWeight,
+          fontWeight = _ref8$fontWeight === void 0 ? '400' : _ref8$fontWeight,
+          _ref8$fontFamily = _ref8.fontFamily,
+          fontFamily = _ref8$fontFamily === void 0 ? 'sans-serif' : _ref8$fontFamily; // 更新文字布局
+
+
+      return this.fontService.getCanvasByKey("".concat(fontFamily, "_").concat(fontWeight));
+    }
     /**
      * 文字避让 depend on originCentorid
      */
@@ -617,11 +638,11 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     value: function filterGlyphs() {
       var _this3 = this;
 
-      var _ref7 = this.layer.getLayerConfig(),
-          _ref7$padding = _ref7.padding,
-          padding = _ref7$padding === void 0 ? [0, 0] : _ref7$padding,
-          _ref7$textAllowOverla = _ref7.textAllowOverlap,
-          textAllowOverlap = _ref7$textAllowOverla === void 0 ? false : _ref7$textAllowOverla;
+      var _ref9 = this.layer.getLayerConfig(),
+          _ref9$padding = _ref9.padding,
+          padding = _ref9$padding === void 0 ? [0, 0] : _ref9$padding,
+          _ref9$textAllowOverla = _ref9.textAllowOverlap,
+          textAllowOverlap = _ref9$textAllowOverla === void 0 ? false : _ref9$textAllowOverla;
 
       if (textAllowOverlap) {
         // 如果允许文本覆盖
@@ -695,7 +716,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "updateTexture",
     value: function updateTexture() {
       var createTexture2D = this.rendererService.createTexture2D;
-      var canvas = this.fontService.canvas;
+      var canvas = this.getFontServiceCanvas();
       this.textureHeight = canvas.height;
 
       if (this.texture) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.15.0",
+  "version": "2.15.2",
   "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.15.0",
-    "@antv/l7-maps": "2.15.0",
-    "@antv/l7-source": "2.15.0",
-    "@antv/l7-utils": "2.15.0",
+    "@antv/l7-core": "2.15.2",
+    "@antv/l7-maps": "2.15.2",
+    "@antv/l7-source": "2.15.2",
+    "@antv/l7-utils": "2.15.2",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -53,7 +53,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.15.0",
+    "@antv/l7-test-utils": "2.15.2",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -62,7 +62,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "cc53366f3fc0867f2d4ca9b4b321b8792f8bb126",
+  "gitHead": "89b84277323240e51f75d4e486072b8bb17b0c93",
   "publishConfig": {
     "access": "public"
   }