@antv/l7-layers 2.21.5 → 2.21.7

package/es/core/BaseLayer.js

@@ -849,7 +849,7 @@ export default class BaseLayer extends EventEmitter {
     this.layerChildren.map(child => child.destroy(false));
     this.layerChildren = [];
 
-    // remove mask list maskfence 掩膜需要销毁
+    // remove mask list maskfence 掩模需要销毁
     const {
       maskfence
     } = this.getLayerConfig();

package/es/core/BaseModel.js

@@ -120,6 +120,12 @@ export default class BaseModel {
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
     this.updateStyleUnifoms();
     const result = _objectSpread(_objectSpread({}, attributeInfo.uniformsOption), commoninfo.uniformsOption);
+    // 兼容 Regl Boolean 类型
+    Object.keys(result).forEach(key => {
+      if (typeof result[key] === 'boolean') {
+        result[key] = result[key] ? 1 : 0;
+      }
+    });
     //如果是regl渲染 需要在uniform中带上u_texture 暂时用this.rendererService.device判断
     if (!this.rendererService.hasOwnProperty('device') && this.textures && this.textures.length === 1) {
       result['u_texture'] = this.textures[0];

package/es/core/utils.d.ts

@@ -1,4 +1 @@
-export declare function formatUniformsOption2Std140(uniformsOption: {
-    [key: string]: any;
-}): string;
 export declare function MultipleOfFourNumber(num: number): number;

package/es/core/utils.js

@@ -1,15 +1,3 @@
-export function formatUniformsOption2Std140(uniformsOption) {
-  let std140_str = '';
-  Object.keys(uniformsOption).forEach(key => {
-    const value = uniformsOption[key];
-    if (Array.isArray(value)) {
-      std140_str += `vec${value.length} ${key};\n`;
-    } else {
-      std140_str += `flot ${key};\n`;
-    }
-  });
-  return std140_str;
-}
 export function MultipleOfFourNumber(num) {
   return Math.max(Math.ceil(num / 4) * 4, 4);
 }

package/es/utils/stencil.js

@@ -1,5 +1,5 @@
 import { MaskOperation, StencilType, gl } from '@antv/l7-core';
-// 掩膜配置
+// 掩模配置
 export function getStencil(mask, maskInside) {
   return {
     enable: mask,

package/lib/core/BaseLayer.js

@@ -855,7 +855,7 @@ class BaseLayer extends _eventemitter.EventEmitter {
     this.layerChildren.map(child => child.destroy(false));
     this.layerChildren = [];
 
-    // remove mask list maskfence 掩膜需要销毁
+    // remove mask list maskfence 掩模需要销毁
     const {
       maskfence
     } = this.getLayerConfig();

package/lib/core/BaseModel.js

@@ -127,6 +127,12 @@ class BaseModel {
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
     this.updateStyleUnifoms();
     const result = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, attributeInfo.uniformsOption), commoninfo.uniformsOption);
+    // 兼容 Regl Boolean 类型
+    Object.keys(result).forEach(key => {
+      if (typeof result[key] === 'boolean') {
+        result[key] = result[key] ? 1 : 0;
+      }
+    });
     //如果是regl渲染 需要在uniform中带上u_texture 暂时用this.rendererService.device判断
     if (!this.rendererService.hasOwnProperty('device') && this.textures && this.textures.length === 1) {
       result['u_texture'] = this.textures[0];

package/lib/core/utils.d.ts

@@ -1,4 +1 @@
-export declare function formatUniformsOption2Std140(uniformsOption: {
-    [key: string]: any;
-}): string;
 export declare function MultipleOfFourNumber(num: number): number;

package/lib/core/utils.js

@@ -4,19 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MultipleOfFourNumber = MultipleOfFourNumber;
-exports.formatUniformsOption2Std140 = formatUniformsOption2Std140;
-function formatUniformsOption2Std140(uniformsOption) {
-  let std140_str = '';
-  Object.keys(uniformsOption).forEach(key => {
-    const value = uniformsOption[key];
-    if (Array.isArray(value)) {
-      std140_str += `vec${value.length} ${key};\n`;
-    } else {
-      std140_str += `flot ${key};\n`;
-    }
-  });
-  return std140_str;
-}
 function MultipleOfFourNumber(num) {
   return Math.max(Math.ceil(num / 4) * 4, 4);
 }

package/lib/utils/stencil.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getStencil = getStencil;
 exports.getStencilMask = getStencilMask;
 var _l7Core = require("@antv/l7-core");
-// 掩膜配置
+// 掩模配置
 function getStencil(mask, maskInside) {
   return {
     enable: mask,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.21.5",
+  "version": "2.21.7",
   "description": "L7's collection of built-in layers",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
@@ -33,10 +33,10 @@
     "gl-matrix": "^3.1.0",
     "gl-vec2": "^1.3.0",
     "polyline-miter-util": "^1.0.1",
-    "@antv/l7-core": "2.21.5",
-    "@antv/l7-maps": "2.21.5",
-    "@antv/l7-source": "2.21.5",
-    "@antv/l7-utils": "2.21.5"
+    "@antv/l7-core": "2.21.7",
+    "@antv/l7-maps": "2.21.7",
+    "@antv/l7-source": "2.21.7",
+    "@antv/l7-utils": "2.21.7"
   },
   "devDependencies": {
     "@types/d3-array": "^2.0.0",
@@ -45,7 +45,7 @@
     "@types/d3-scale": "^2.1.1",
     "@types/earcut": "^2.1.0",
     "@types/gl-matrix": "^2.4.5",
-    "@antv/l7-test-utils": "^2.21.5"
+    "@antv/l7-test-utils": "^2.21.7"
   },
   "publishConfig": {
     "access": "public",