@antv/l7-layers 2.17.1 → 2.17.3

package/es/core/BaseModel.js

@@ -238,7 +238,8 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.layer.enableEncodeStyles.forEach(function (key) {
         if (!_this.layer.encodeStyleAttribute[key]) {
           // @ts-ignore
-          var value = _this.layer.getLayerConfig()[key] || defualtValue[key];
+          var keyValue = _this.layer.getLayerConfig()[key];
+          var value = typeof keyValue === 'undefined' ? defualtValue[key] : keyValue;
           if (key === 'stroke') {
             value = rgb2arr(value);
           }

package/es/line/models/arc.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 { AttributeType, gl } from '@antv/l7-core';
 import { rgb2arr } from '@antv/l7-utils';
+import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LineArcTriangulation } from "../../core/triangulation";
 // arc dash line
@@ -103,7 +104,7 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
       return {
         u_thetaOffset: thetaOffset,
         // u_thetaOffset:  0.0,
-        u_opacity: opacity,
+        u_opacity: isNumber(opacity) ? opacity : 1,
         u_textureBlend: textureBlend === 'normal' ? 0.0 : 1.0,
         segmentNumber: segmentNumber,
         u_line_type: lineStyleObj[lineType || 'solid'],

package/es/line/models/line.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 { AttributeType, gl } from '@antv/l7-core';
 import { LineTriangulation, rgb2arr } from '@antv/l7-utils';
+import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LinearDir, TextureBlend } from "../../core/interface";
 // import { LineTriangulation } from '../../core/triangulation';
@@ -124,7 +125,7 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
         useLinearColor = 1;
       }
       return {
-        u_opacity: opacity,
+        u_opacity: isNumber(opacity) ? opacity : 1,
         u_textureBlend: textureBlend === TextureBlend.NORMAL ? 0.0 : 1.0,
         u_line_type: lineStyleObj[lineType],
         u_dash_array: dashArray,

package/es/line/models/linearline.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 { AttributeType, gl } from '@antv/l7-core';
 import { generateColorRamp } from '@antv/l7-utils';
+import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LinearDir } from "../../core/interface";
 import { LineTriangulation } from "../../core/triangulation";
@@ -68,7 +69,7 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
       }
       return {
         u_linearDir: linearDir === LinearDir.VERTICAL ? 1.0 : 0.0,
-        u_opacity: opacity,
+        u_opacity: isNumber(opacity) ? opacity : 1,
         // 纹理支持参数
         u_texture: this.colorTexture,
         // 贴图

package/es/line/models/simpleLine.js

@@ -9,6 +9,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 { AttributeType, gl } from '@antv/l7-core';
 import { rgb2arr } from '@antv/l7-utils';
+import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { SimpleLineTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/simple/simpleline_frag.glsl' */
@@ -45,7 +46,7 @@ var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
         useLinearColor = 1;
       }
       return {
-        u_opacity: opacity,
+        u_opacity: isNumber(opacity) ? opacity : 1,
         // 渐变色支持参数
         u_linearColor: useLinearColor,
         u_sourceColor: sourceColorArr,

package/lib/core/BaseModel.js

@@ -245,7 +245,8 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.layer.enableEncodeStyles.forEach(function (key) {
         if (!_this.layer.encodeStyleAttribute[key]) {
           // @ts-ignore
-          var value = _this.layer.getLayerConfig()[key] || defualtValue[key];
+          var keyValue = _this.layer.getLayerConfig()[key];
+          var value = typeof keyValue === 'undefined' ? defualtValue[key] : keyValue;
           if (key === 'stroke') {
             value = (0, _l7Utils.rgb2arr)(value);
           }

package/lib/line/models/arc.js

@@ -16,6 +16,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
+var _lodash = require("lodash");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
 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); }; }
@@ -110,7 +111,7 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
       return {
         u_thetaOffset: thetaOffset,
         // u_thetaOffset:  0.0,
-        u_opacity: opacity,
+        u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 1,
         u_textureBlend: textureBlend === 'normal' ? 0.0 : 1.0,
         segmentNumber: segmentNumber,
         u_line_type: lineStyleObj[lineType || 'solid'],

package/lib/line/models/line.js

@@ -16,6 +16,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
+var _lodash = require("lodash");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _interface = require("../../core/interface");
 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); }; }
@@ -131,7 +132,7 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
         useLinearColor = 1;
       }
       return {
-        u_opacity: opacity,
+        u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 1,
         u_textureBlend: textureBlend === _interface.TextureBlend.NORMAL ? 0.0 : 1.0,
         u_line_type: lineStyleObj[lineType],
         u_dash_array: dashArray,

package/lib/line/models/linearline.js

@@ -16,6 +16,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
+var _lodash = require("lodash");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _interface = require("../../core/interface");
 var _triangulation = require("../../core/triangulation");
@@ -75,7 +76,7 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
       }
       return {
         u_linearDir: linearDir === _interface.LinearDir.VERTICAL ? 1.0 : 0.0,
-        u_opacity: opacity,
+        u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 1,
         // 纹理支持参数
         u_texture: this.colorTexture,
         // 贴图

package/lib/line/models/simpleLine.js

@@ -14,6 +14,7 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
+var _lodash = require("lodash");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
 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); }; }
@@ -52,7 +53,7 @@ var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
         useLinearColor = 1;
       }
       return {
-        u_opacity: opacity,
+        u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 1,
         // 渐变色支持参数
         u_linearColor: useLinearColor,
         u_sourceColor: sourceColorArr,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.17.1",
+  "version": "2.17.3",
   "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.17.1",
-    "@antv/l7-maps": "2.17.1",
-    "@antv/l7-source": "2.17.1",
-    "@antv/l7-utils": "2.17.1",
+    "@antv/l7-core": "2.17.3",
+    "@antv/l7-maps": "2.17.3",
+    "@antv/l7-source": "2.17.3",
+    "@antv/l7-utils": "2.17.3",
     "@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.17.1",
+    "@antv/l7-test-utils": "2.17.3",
     "@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": "09315c9a649a3fda3f94f738ab9589dc53984b6c",
+  "gitHead": "740ab519d12bb71130b430a5925914611c3ada18",
   "publishConfig": {
     "access": "public"
   }