@antv/l7-layers 2.12.2 → 2.13.1

package/es/polygon/models/index.js

@@ -7,7 +7,6 @@ import TextModel from "../../point/models/text";
 import ExtrudeModel from "./extrude";
 import FillModel from "./fill";
 import Ocean from "./ocean";
-import TilePolygonModel from "./tile";
 import Water from "./water";
 var PolygonModels = {
   fill: FillModel,
@@ -19,8 +18,7 @@ var PolygonModels = {
   point_normal: NormalModel,
   point_extrude: PointExtrudeModel,
   water: Water,
-  ocean: Ocean,
-  // point_fill: PointModels.fill,
-  tile: TilePolygonModel
+  ocean: Ocean // point_fill: PointModels.fill,
+
 };
 export default PolygonModels;

package/es/raster/models/raster.d.ts

@@ -3,7 +3,6 @@ import BaseModel from '../../core/BaseModel';
 export default class RasterModel extends BaseModel {
     protected texture: ITexture2D;
     protected colorTexture: ITexture2D;
-    private rampColors;
     getUninforms(): {
         u_opacity: number;
         u_texture: ITexture2D;
@@ -18,5 +17,4 @@ export default class RasterModel extends BaseModel {
     buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
-    private updateColorTexture;
 }

package/es/raster/models/raster.js

@@ -11,12 +11,12 @@ 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, getMask } from '@antv/l7-utils';
+import { getMask, getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n    gl_FragColor = vec4(0, 0, 0, 0);\n  else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
+var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n    gl_FragColor = vec4(0, 0, 0, 0);\n  else {\n   \n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
 var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
@@ -44,15 +44,15 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
           clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
           _ref$noDataValue = _ref.noDataValue,
           noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
-          _ref$domain = _ref.domain,
-          domain = _ref$domain === void 0 ? [0, 1] : _ref$domain,
+          domain = _ref.domain,
           rampColors = _ref.rampColors;
 
-      this.colorTexture = this.layer.textureService.getColorTexture(rampColors);
+      var newdomain = domain || getDefaultDomain(rampColors);
+      this.colorTexture = this.layer.textureService.getColorTexture(rampColors, newdomain);
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture,
-        u_domain: domain,
+        u_domain: newdomain,
         u_clampLow: clampLow,
         u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
         u_noDataValue: noDataValue,
@@ -228,22 +228,6 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }
       });
     }
-  }, {
-    key: "updateColorTexture",
-    value: function updateColorTexture() {
-      var createTexture2D = this.rendererService.createTexture2D;
-
-      var _ref3 = this.layer.getLayerConfig(),
-          rampColors = _ref3.rampColors;
-
-      var imageData = generateColorRamp(rampColors);
-      this.colorTexture = createTexture2D({
-        data: imageData.data,
-        width: imageData.width,
-        height: imageData.height,
-        flipY: false
-      });
-    }
   }]);
 
   return RasterModel;

package/es/raster/models/rasterTerrainRgb.js

@@ -11,7 +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 { getMask } from '@antv/l7-utils';
+import { getMask, getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
@@ -43,23 +43,23 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
           clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
           _ref$noDataValue = _ref.noDataValue,
           noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
-          _ref$domain = _ref.domain,
-          domain = _ref$domain === void 0 ? [0, 1] : _ref$domain,
+          domain = _ref.domain,
           rampColors = _ref.rampColors,
           colorTexture = _ref.colorTexture;
 
+      var newdomain = domain || getDefaultDomain(rampColors);
       var texture = colorTexture;
 
       if (!colorTexture) {
-        texture = this.layer.textureService.getColorTexture(rampColors);
+        texture = this.layer.textureService.getColorTexture(rampColors, newdomain);
       } else {
-        this.layer.textureService.setColorTexture(colorTexture, rampColors);
+        this.layer.textureService.setColorTexture(colorTexture, rampColors, newdomain);
       }
 
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture,
-        u_domain: domain,
+        u_domain: newdomain,
         u_clampLow: clampLow,
         u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
         u_noDataValue: noDataValue,

package/es/raster/shaders/raster_2d_frag.glsl

@@ -20,6 +20,7 @@ void main() {
   else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))
     gl_FragColor = vec4(0, 0, 0, 0);
   else {
+   
     float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);
     vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));
     gl_FragColor = color;

package/es/tile/tileFactory/RasterRGBTile.js

@@ -13,7 +13,6 @@ 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 RasterLayer from './layers/RasterDataLayer';
 import RasterLayer from "../../raster";
 import Tile from "./Tile";
 

package/es/tile/tileFactory/RasterTile.js

@@ -15,6 +15,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import RasterLayer from "../../raster";
 import Tile from "./Tile";
+import { getDefaultDomain } from '@antv/l7-utils';
 var DEFAULT_COLOR_TEXTURE_OPTION = {
   positions: [0, 1],
   colors: ['#000', '#fff']
@@ -35,7 +36,8 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
     key: "initTileLayer",
     value: function () {
       var _initTileLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var attributes, layerOptions, sourceOptions, layer;
+        var attributes, layerOptions, sourceOptions, _ref, rampColors, domain, layer;
+
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -43,7 +45,8 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
                 attributes = this.parent.getLayerAttributeConfig();
                 layerOptions = this.getLayerOptions();
                 sourceOptions = this.getSourceOption();
-                this.colorTexture = this.parent.textureService.getColorTexture(layerOptions.rampColors);
+                _ref = this.getLayerOptions(), rampColors = _ref.rampColors, domain = _ref.domain;
+                this.colorTexture = this.parent.textureService.getColorTexture(rampColors, domain);
                 layer = new RasterLayer(_objectSpread(_objectSpread({}, layerOptions), {}, {
                   colorTexture: this.colorTexture
                 })).source(sourceOptions.data, sourceOptions.options); // 初始化数据映射
@@ -55,13 +58,13 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
 
                   layer[attr]((_attributes$attr = attributes[attr]) === null || _attributes$attr === void 0 ? void 0 : _attributes$attr.field, (_attributes$attr2 = attributes[attr]) === null || _attributes$attr2 === void 0 ? void 0 : _attributes$attr2.values);
                 });
-                _context.next = 8;
+                _context.next = 9;
                 return this.addLayer(layer);
 
-              case 8:
+              case 9:
                 this.isLoaded = true;
 
-              case 9:
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -109,9 +112,11 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
         arg[_key] = arguments[_key];
       }
 
-      var _arg$rampColors = arg.rampColors,
-          rampColors = _arg$rampColors === void 0 ? DEFAULT_COLOR_TEXTURE_OPTION : _arg$rampColors;
-      this.colorTexture = this.parent.textureService.getColorTexture(rampColors);
+      var _ref2 = arg,
+          _ref2$rampColors = _ref2.rampColors,
+          rampColors = _ref2$rampColors === void 0 ? DEFAULT_COLOR_TEXTURE_OPTION : _ref2$rampColors,
+          domain = _ref2.domain;
+      this.colorTexture = this.parent.textureService.getColorTexture(rampColors, domain || getDefaultDomain(rampColors));
       this.layers.forEach(function (layer) {
         return layer.style({
           colorTexture: _this.colorTexture

package/lib/core/BaseLayer.js

@@ -471,8 +471,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "filter",
     value: function filter(field, values, updateOptions) {
-      this.updateStyleAttribute('filter', field, values, updateOptions);
-      this.dataState.dataSourceNeedUpdate = true;
+      var flag = this.updateStyleAttribute('filter', field, values, updateOptions);
+      this.dataState.dataSourceNeedUpdate = flag;
       return this;
     }
   }, {
@@ -482,9 +482,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         field: field,
         values: values
       };
-      this.updateStyleAttribute('shape', field, values, updateOptions);
-      this.dataState.dataSourceNeedUpdate = true; // 通过数据更新驱动shape 更新
-
+      var flag = this.updateStyleAttribute('shape', field, values, updateOptions);
+      this.dataState.dataSourceNeedUpdate = flag;
       return this;
     }
   }, {
@@ -1439,7 +1438,17 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "updateStyleAttribute",
     value: function updateStyleAttribute(type, field, values, updateOptions) {
-      // 存储 Attribute
+      // encode diff
+      var preAttribute = this.configService.getAttributeConfig(this.id) || {}; // @ts-ignore
+
+      if ((0, _lodash.isEqual)(preAttribute[type], {
+        field: field,
+        values: values
+      })) {
+        return false;
+      } // 存储 Attribute
+
+
       if (['color', 'size', 'texture', 'rotate', 'filter', 'label', 'shape'].indexOf(type) !== -1) {
         this.configService.setAttributeConfig(this.id, (0, _defineProperty2.default)({}, type, {
           field: field,
@@ -1466,6 +1475,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         }, // @ts-ignore
         updateOptions);
       }
+
+      return true;
     }
   }, {
     key: "getLayerAttributeConfig",

package/lib/core/TextureService.js

@@ -25,14 +25,14 @@ var TextureService = /*#__PURE__*/function () {
 
   (0, _createClass2.default)(TextureService, [{
     key: "getColorTexture",
-    value: function getColorTexture(colorRamp) {
+    value: function getColorTexture(colorRamp, domain) {
       // TODO 支持传入图片
-      var currentkey = this.getTextureKey(colorRamp);
+      var currentkey = this.getTextureKey(colorRamp, domain);
 
       if (this.key === currentkey) {
         return this.colorTexture;
       } else {
-        this.createColorTexture(colorRamp);
+        this.createColorTexture(colorRamp, domain);
       }
 
       this.key = currentkey;
@@ -40,9 +40,9 @@ var TextureService = /*#__PURE__*/function () {
     }
   }, {
     key: "createColorTexture",
-    value: function createColorTexture(colorRamp) {
+    value: function createColorTexture(colorRamp, domain) {
       var createTexture2D = this.rendererService.createTexture2D;
-      var imageData = (0, _l7Utils.generateColorRamp)(colorRamp);
+      var imageData = this.getColorRampBar(colorRamp, domain);
       var texture = createTexture2D({
         data: imageData.data,
         width: imageData.width,
@@ -54,8 +54,8 @@ var TextureService = /*#__PURE__*/function () {
     }
   }, {
     key: "setColorTexture",
-    value: function setColorTexture(texture, colorRamp) {
-      this.key = this.getTextureKey(colorRamp);
+    value: function setColorTexture(texture, colorRamp, domain) {
+      this.key = this.getTextureKey(colorRamp, domain);
       this.colorTexture = texture;
     }
   }, {
@@ -65,10 +65,32 @@ var TextureService = /*#__PURE__*/function () {
 
       (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? 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) {
-      return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp.positions.join('_'));
+    value: function getTextureKey(colorRamp, domain) {
+      var _colorRamp$positions;
+
+      return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp === null || colorRamp === void 0 ? 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('_'));
     }
   }]);
   return TextureService;

package/lib/core/interface.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.lineStyleType = exports.TextureBlend = exports.LinearDir = exports.CanvasUpdateType = void 0;
+exports.lineStyleType = exports.TextureBlend = exports.SizeUnitType = exports.LinearDir = exports.CanvasUpdateType = void 0;
 var lineStyleType;
 exports.lineStyleType = lineStyleType;
 
@@ -32,6 +32,14 @@ exports.TextureBlend = TextureBlend;
   TextureBlend["REPLACE"] = "replace";
 })(TextureBlend || (exports.TextureBlend = TextureBlend = {}));
 
+var SizeUnitType;
+exports.SizeUnitType = SizeUnitType;
+
+(function (SizeUnitType) {
+  SizeUnitType[SizeUnitType["pixel"] = 0] = "pixel";
+  SizeUnitType[SizeUnitType["meter"] = 1] = "meter";
+})(SizeUnitType || (exports.SizeUnitType = SizeUnitType = {}));
+
 var CanvasUpdateType;
 exports.CanvasUpdateType = CanvasUpdateType;
 

package/lib/line/models/index.js

@@ -23,8 +23,6 @@ var _linearline = _interopRequireDefault(require("./linearline"));
 
 var _simpleLine = _interopRequireDefault(require("./simpleLine"));
 
-var _tile = _interopRequireDefault(require("./tile"));
-
 var _wall = _interopRequireDefault(require("./wall"));
 
 var LineModels = {
@@ -36,7 +34,6 @@ var LineModels = {
   halfLine: _half.default,
   simple: _simpleLine.default,
   linearline: _linearline.default,
-  tileLine: _tile.default,
   earthArc3d: _earthArc_3d.default
 };
 var _default = LineModels;

package/lib/line/models/line.js

@@ -83,14 +83,6 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
       width: 1,
       height: 1
     }));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "dataTexture", _this.createTexture2D({
-      flipY: true,
-      data: [1],
-      format: _l7Core.gl.LUMINANCE,
-      type: _l7Core.gl.FLOAT,
-      width: 1,
-      height: 1
-    }));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateTexture", function () {
       var createTexture2D = _this.rendererService.createTexture2D;
 

package/lib/plugins/DataMappingPlugin.js

@@ -84,14 +84,11 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
                 case 2:
                   layer.dataState.dataMappingNeedUpdate = false;
-
-                  _this.generateMaping(layer, {
+                  return _context2.abrupt("return", _this.generateMaping(layer, {
                     styleAttributeService: styleAttributeService
-                  });
-
-                  return _context2.abrupt("return", true);
+                  }));
 
-                case 5:
+                case 4:
                 case "end":
                   return _context2.stop();
               }
@@ -163,9 +160,15 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       filterData = layer.processData(filterData);
       var encodeData = this.mapping(layer, attributes, filterData, undefined);
-      layer.setEncodedData(encodeData); // 对外暴露事件
+      layer.setEncodedData(encodeData);
+
+      if (dataArray.length === 0 && layer.encodeDataLength === 0) {
+        return false;
+      } // 对外暴露事件
+
 
       layer.emit('dataUpdate', null);
+      return true;
     }
   }, {
     key: "mapping",