@antv/l7-layers 2.9.27-alpha.1 → 2.9.27-alpha.2

package/es/Geometry/index.d.ts

@@ -3,6 +3,19 @@ import { IGeometryLayerStyleOptions } from '../core/interface';
 import { GeometryModelType } from './models';
 export default class GeometryLayer extends BaseLayer<IGeometryLayerStyleOptions> {
     type: string;
+    defaultSourceConfig: {
+        data: {
+            x: number;
+            y: number;
+        }[];
+        options: {
+            parser: {
+                type: string;
+                x: string;
+                y: string;
+            };
+        };
+    };
     buildModels(): void;
     rebuildModels(): void;
     protected getConfigSchema(): {

package/es/Geometry/index.js

@@ -31,6 +31,20 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
 
     _defineProperty(_assertThisInitialized(_this), "type", 'GeometryLayer');
 
+    _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
+      data: [{
+        x: 0,
+        y: 0
+      }],
+      options: {
+        parser: {
+          type: 'json',
+          x: 'x',
+          y: 'y'
+        }
+      }
+    });
+
     return _this;
   }
 

package/es/core/BaseLayer.d.ts

@@ -17,6 +17,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     selectedFeatureID: number | null;
     styleNeedUpdate: boolean;
     rendering: boolean;
+    forceRender: boolean;
     clusterZoom: number;
     layerType?: string | undefined;
     triangulation?: Triangulation | undefined;
@@ -176,6 +177,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     setSource(source: Source): void;
     getSource(): Source;
     getScaleOptions(): IScaleOptions;
+    encodeDataLength: number;
     setEncodedData(encodedData: IEncodeFeature[]): void;
     getEncodedData(): IEncodeFeature[];
     getScale(name: string): any;

package/es/core/BaseLayer.js

@@ -87,8 +87,19 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
     _defineProperty(_assertThisInitialized(_this), "styleNeedUpdate", false);
 
+    _defineProperty(_assertThisInitialized(_this), "forceRender", false);
+
     _defineProperty(_assertThisInitialized(_this), "clusterZoom", 0);
 
+    _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
+      data: [],
+      options: {
+        parser: {
+          type: 'json'
+        }
+      }
+    });
+
     _defineProperty(_assertThisInitialized(_this), "dataState", {
       dataSourceNeedUpdate: false,
       dataMappingNeedUpdate: false,
@@ -139,6 +150,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
     _defineProperty(_assertThisInitialized(_this), "isDestroied", false);
 
+    _defineProperty(_assertThisInitialized(_this), "encodeDataLength", 0);
+
     _defineProperty(_assertThisInitialized(_this), "sourceEvent", function () {
       _this.dataState.dataSourceNeedUpdate = true;
 
@@ -606,13 +619,11 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         // 瓦片图层执行单独的 render 渲染队列
         this.tileLayer.render();
         return this;
-      } // TODO: this.getEncodedData().length !== 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
-
-
-      if (this.getEncodedData() && this.getEncodedData().length !== 0) {
-        this.renderModels();
       }
 
+      if (this.encodeDataLength <= 0 && !this.forceRender) return this; // Tip: this.getEncodedData().length !== 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
+
+      this.renderModels();
       return this;
     }
     /**
@@ -627,24 +638,27 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                if (!(this.getEncodedData() && this.getEncodedData().length !== 0)) {
-                  _context.next = 7;
+                if (!(this.encodeDataLength <= 0 && !this.forceRender)) {
+                  _context.next = 2;
                   break;
                 }
 
+                return _context.abrupt("return");
+
+              case 2:
                 if (!(this.multiPassRenderer && this.multiPassRenderer.getRenderFlag())) {
-                  _context.next = 6;
+                  _context.next = 7;
                   break;
                 }
 
-                _context.next = 4;
+                _context.next = 5;
                 return this.multiPassRenderer.render();
 
-              case 4:
-                _context.next = 7;
+              case 5:
+                _context.next = 8;
                 break;
 
-              case 6:
+              case 7:
                 if (this.multiPassRenderer) {
                   // renderPass 触发的渲染
                   this.renderModels();
@@ -652,7 +666,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                   this.renderModels();
                 }
 
-              case 7:
+              case 8:
               case "end":
                 return _context.stop();
             }
@@ -1067,6 +1081,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "setEncodedData",
     value: function setEncodedData(encodedData) {
       this.encodedData = encodedData;
+      this.encodeDataLength = encodedData.length;
     }
   }, {
     key: "getEncodedData",
@@ -1300,33 +1315,31 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "renderModels",
     value: function renderModels(isPicking) {
-      var _this10 = this;
+      var _this10 = this,
+          _this$layerModel4;
 
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
-      if (this.getEncodedData() && this.getEncodedData().length > 0) {
-        var _this$layerModel4;
-
-        if (this.layerModelNeedUpdate && this.layerModel) {
-          this.layerModel.buildModels(function (models) {
-            _this10.models = models;
+      if (this.encodeDataLength <= 0 && !this.forceRender) return this;
 
-            _this10.hooks.beforeRender.call();
-
-            _this10.layerModelNeedUpdate = false;
-          });
-        }
+      if (this.layerModelNeedUpdate && this.layerModel) {
+        this.layerModel.buildModels(function (models) {
+          _this10.models = models;
 
-        if (this !== null && this !== void 0 && (_this$layerModel4 = this.layerModel) !== null && _this$layerModel4 !== void 0 && _this$layerModel4.renderUpdate) {
-          this.layerModel.renderUpdate();
-        }
+          _this10.hooks.beforeRender.call();
 
-        this.models.forEach(function (model) {
-          model.draw({
-            uniforms: _this10.layerModel.getUninforms()
-          }, isPicking);
+          _this10.layerModelNeedUpdate = false;
         });
       }
 
+      if (this !== null && this !== void 0 && (_this$layerModel4 = this.layerModel) !== null && _this$layerModel4 !== void 0 && _this$layerModel4.renderUpdate) {
+        this.layerModel.renderUpdate();
+      }
+
+      this.models.forEach(function (model) {
+        model.draw({
+          uniforms: _this10.layerModel.getUninforms()
+        }, isPicking);
+      });
       return this;
     }
   }, {

package/es/earth/index.d.ts

@@ -1,4 +1,5 @@
 import BaseLayer from '../core/BaseLayer';
+import { ISourceCFG } from '@antv/l7-core';
 interface IEarthLayerStyleOptions {
     opacity: number;
     setEarthTime(time: number): void;
@@ -6,6 +7,10 @@ interface IEarthLayerStyleOptions {
 export declare type EarthModelType = 'base' | 'atomSphere' | 'bloomSphere';
 export default class EarthLayer extends BaseLayer<IEarthLayerStyleOptions> {
     type: string;
+    defaultSourceConfig: {
+        data: any[];
+        options: ISourceCFG | undefined;
+    };
     buildModels(): void;
     /**
      * 设置当前地球时间

package/es/earth/index.js

@@ -39,6 +39,15 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
 
     _defineProperty(_assertThisInitialized(_this), "type", 'EarthLayer');
 
+    _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
+      data: [],
+      options: {
+        parser: {
+          type: 'json'
+        }
+      }
+    });
+
     return _this;
   }
 

package/lib/Geometry/index.js

@@ -45,6 +45,19 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
 
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'GeometryLayer');
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultSourceConfig", {
+      data: [{
+        x: 0,
+        y: 0
+      }],
+      options: {
+        parser: {
+          type: 'json',
+          x: 'x',
+          y: 'y'
+        }
+      }
+    });
     return _this;
   }
 

package/lib/core/BaseLayer.js

@@ -106,7 +106,16 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "pickedFeatureID", null);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "selectedFeatureID", null);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "styleNeedUpdate", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "forceRender", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "clusterZoom", 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultSourceConfig", {
+      data: [],
+      options: {
+        parser: {
+          type: 'json'
+        }
+      }
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "dataState", {
       dataSourceNeedUpdate: false,
       dataMappingNeedUpdate: false,
@@ -143,6 +152,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "aniamateStatus", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "bottomColor", 'rgba(0, 0, 0, 0)');
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isDestroied", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "encodeDataLength", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sourceEvent", function () {
       _this.dataState.dataSourceNeedUpdate = true;
 
@@ -607,13 +617,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         // 瓦片图层执行单独的 render 渲染队列
         this.tileLayer.render();
         return this;
-      } // TODO: this.getEncodedData().length !== 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
-
-
-      if (this.getEncodedData() && this.getEncodedData().length !== 0) {
-        this.renderModels();
       }
 
+      if (this.encodeDataLength <= 0 && !this.forceRender) return this; // Tip: this.getEncodedData().length !== 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
+
+      this.renderModels();
       return this;
     }
     /**
@@ -628,24 +636,27 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                if (!(this.getEncodedData() && this.getEncodedData().length !== 0)) {
-                  _context.next = 7;
+                if (!(this.encodeDataLength <= 0 && !this.forceRender)) {
+                  _context.next = 2;
                   break;
                 }
 
+                return _context.abrupt("return");
+
+              case 2:
                 if (!(this.multiPassRenderer && this.multiPassRenderer.getRenderFlag())) {
-                  _context.next = 6;
+                  _context.next = 7;
                   break;
                 }
 
-                _context.next = 4;
+                _context.next = 5;
                 return this.multiPassRenderer.render();
 
-              case 4:
-                _context.next = 7;
+              case 5:
+                _context.next = 8;
                 break;
 
-              case 6:
+              case 7:
                 if (this.multiPassRenderer) {
                   // renderPass 触发的渲染
                   this.renderModels();
@@ -653,7 +664,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
                   this.renderModels();
                 }
 
-              case 7:
+              case 8:
               case "end":
                 return _context.stop();
             }
@@ -1068,6 +1079,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "setEncodedData",
     value: function setEncodedData(encodedData) {
       this.encodedData = encodedData;
+      this.encodeDataLength = encodedData.length;
     }
   }, {
     key: "getEncodedData",
@@ -1300,33 +1312,31 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "renderModels",
     value: function renderModels(isPicking) {
-      var _this10 = this;
+      var _this10 = this,
+          _this$layerModel4;
 
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
-      if (this.getEncodedData() && this.getEncodedData().length > 0) {
-        var _this$layerModel4;
-
-        if (this.layerModelNeedUpdate && this.layerModel) {
-          this.layerModel.buildModels(function (models) {
-            _this10.models = models;
+      if (this.encodeDataLength <= 0 && !this.forceRender) return this;
 
-            _this10.hooks.beforeRender.call();
+      if (this.layerModelNeedUpdate && this.layerModel) {
+        this.layerModel.buildModels(function (models) {
+          _this10.models = models;
 
-            _this10.layerModelNeedUpdate = false;
-          });
-        }
+          _this10.hooks.beforeRender.call();
 
-        if (this !== null && this !== void 0 && (_this$layerModel4 = this.layerModel) !== null && _this$layerModel4 !== void 0 && _this$layerModel4.renderUpdate) {
-          this.layerModel.renderUpdate();
-        }
-
-        this.models.forEach(function (model) {
-          model.draw({
-            uniforms: _this10.layerModel.getUninforms()
-          }, isPicking);
+          _this10.layerModelNeedUpdate = false;
         });
       }
 
+      if (this !== null && this !== void 0 && (_this$layerModel4 = this.layerModel) !== null && _this$layerModel4 !== void 0 && _this$layerModel4.renderUpdate) {
+        this.layerModel.renderUpdate();
+      }
+
+      this.models.forEach(function (model) {
+        model.draw({
+          uniforms: _this10.layerModel.getUninforms()
+        }, isPicking);
+      });
       return this;
     }
   }, {

package/lib/earth/index.js

@@ -56,6 +56,14 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
 
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'EarthLayer');
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultSourceConfig", {
+      data: [],
+      options: {
+        parser: {
+          type: 'json'
+        }
+      }
+    });
     return _this;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.27-alpha.1",
+  "version": "2.9.27-alpha.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.1.0",
-    "@antv/l7-core": "2.9.27-alpha.1",
-    "@antv/l7-maps": "2.9.27-alpha.1",
-    "@antv/l7-source": "2.9.27-alpha.1",
-    "@antv/l7-utils": "2.9.27-alpha.1",
+    "@antv/l7-core": "2.9.27-alpha.2",
+    "@antv/l7-maps": "2.9.27-alpha.2",
+    "@antv/l7-source": "2.9.27-alpha.2",
+    "@antv/l7-utils": "2.9.27-alpha.2",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/helpers": "^6.1.4",
@@ -60,7 +60,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "4de1a35dd04dcb651d469b77aa66ab821453005c",
+  "gitHead": "209f0b76af7ad1c7342f5ea21aa1c2179e8c460d",
   "publishConfig": {
     "access": "public"
   }