@antv/l7-layers 2.9.27-alpha.3 → 2.9.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (178) hide show
  1. package/es/Geometry/models/billboard.js +2 -5
  2. package/es/Geometry/models/plane.js +3 -3
  3. package/es/Geometry/models/sprite.js +2 -3
  4. package/es/core/BaseLayer.d.ts +5 -6
  5. package/es/core/BaseLayer.js +15 -20
  6. package/es/core/BaseModel.d.ts +1 -1
  7. package/es/core/BaseModel.js +15 -16
  8. package/es/core/interface.d.ts +3 -1
  9. package/es/earth/models/atmosphere.js +4 -7
  10. package/es/earth/models/base.js +10 -14
  11. package/es/earth/models/bloomsphere.js +4 -8
  12. package/es/heatmap/index.d.ts +2 -2
  13. package/es/heatmap/index.js +1 -3
  14. package/es/heatmap/models/grid.js +1 -3
  15. package/es/heatmap/models/grid3d.js +4 -11
  16. package/es/heatmap/models/heatmap.js +3 -6
  17. package/es/heatmap/models/hexagon.js +2 -6
  18. package/es/heatmap/triangulation.js +0 -1
  19. package/es/image/index.d.ts +1 -1
  20. package/es/image/index.js +4 -1
  21. package/es/image/models/dataImage.d.ts +1 -1
  22. package/es/image/models/dataImage.js +12 -34
  23. package/es/image/models/image.js +1 -3
  24. package/es/image/models/index.d.ts +1 -1
  25. package/es/image/models/index.js +3 -1
  26. package/es/image/models/tileDataImage.d.ts +19 -0
  27. package/es/image/models/tileDataImage.js +174 -0
  28. package/es/line/models/arc.js +7 -8
  29. package/es/line/models/arc_3d.js +8 -10
  30. package/es/line/models/earthArc_3d.js +8 -10
  31. package/es/line/models/great_circle.js +7 -7
  32. package/es/line/models/line.js +4 -4
  33. package/es/line/models/linearline.js +3 -4
  34. package/es/line/models/simpleLine.js +3 -3
  35. package/es/line/models/tile.js +1 -1
  36. package/es/line/models/wall.js +3 -3
  37. package/es/line/shaders/dash/line_dash_frag.glsl +1 -1
  38. package/es/line/shaders/line_arc2d_vert.glsl +2 -2
  39. package/es/line/shaders/line_arc_3d_frag.glsl +10 -10
  40. package/es/line/shaders/line_arc_3d_vert.glsl +3 -4
  41. package/es/line/shaders/line_arc_frag.glsl +9 -10
  42. package/es/line/shaders/line_arc_great_circle_frag.glsl +6 -6
  43. package/es/line/shaders/line_arc_great_circle_vert.glsl +2 -3
  44. package/es/line/shaders/line_arc_vert.glsl +2 -2
  45. package/es/line/shaders/line_bezier_vert.glsl +2 -2
  46. package/es/line/shaders/line_frag.glsl +5 -5
  47. package/es/line/shaders/line_vert.glsl +1 -1
  48. package/es/line/shaders/linear/arc3d_linear_frag.glsl +6 -7
  49. package/es/line/shaders/linear/arc3d_linear_vert.glsl +9 -10
  50. package/es/line/shaders/linear/arc_linear_frag.glsl +1 -1
  51. package/es/line/shaders/wall/wall_frag.glsl +5 -5
  52. package/es/line/shaders/wall/wall_vert.glsl +2 -2
  53. package/es/plugins/LayerAnimateStylePlugin.js +2 -2
  54. package/es/point/index.js +3 -4
  55. package/es/point/models/earthExtrude.d.ts +1 -1
  56. package/es/point/models/earthExtrude.js +9 -14
  57. package/es/point/models/earthFill.js +2 -2
  58. package/es/point/models/extrude.d.ts +1 -1
  59. package/es/point/models/extrude.js +9 -12
  60. package/es/point/models/fill.d.ts +1 -1
  61. package/es/point/models/fill.js +7 -8
  62. package/es/point/models/fillmage.js +4 -5
  63. package/es/point/models/image.js +2 -2
  64. package/es/point/models/index.d.ts +1 -1
  65. package/es/point/models/index.js +3 -3
  66. package/es/point/models/normal.js +0 -2
  67. package/es/point/models/radar.js +1 -1
  68. package/es/point/models/text.js +1 -3
  69. package/es/point/models/tile.js +2 -3
  70. package/es/point/models/tileText.js +3 -5
  71. package/es/point/shaders/animate/wave_frag.glsl +2 -2
  72. package/es/polygon/models/extrude.js +3 -5
  73. package/es/raster/index.js +1 -2
  74. package/es/raster/models/raster.d.ts +1 -1
  75. package/es/raster/models/raster.js +5 -5
  76. package/es/raster/models/rasterTile.d.ts +18 -0
  77. package/es/raster/models/rasterTile.js +140 -0
  78. package/es/raster/shaders/raster_2d_frag.glsl +0 -2
  79. package/es/raster/shaders/raster_2d_vert.glsl +0 -1
  80. package/es/tile/manager/baseMapTileLayerManager.d.ts +3 -25
  81. package/es/tile/manager/baseMapTileLayerManager.js +31 -119
  82. package/es/tile/manager/baseTileManager.d.ts +27 -0
  83. package/es/tile/manager/baseTileManager.js +107 -0
  84. package/es/tile/manager/tileLayerManager.d.ts +4 -26
  85. package/es/tile/manager/tileLayerManager.js +64 -132
  86. package/es/tile/manager/tilePickerManager.d.ts +1 -0
  87. package/es/tile/manager/tilePickerManager.js +5 -0
  88. package/es/tile/models/tileModel.d.ts +1 -0
  89. package/es/tile/models/tileModel.js +3 -0
  90. package/es/tile/tileFactory/rasterData.js +9 -11
  91. package/es/tile/tileFactory/rasterDataLayer.d.ts +1 -1
  92. package/es/tile/tileFactory/rasterDataLayer.js +1 -1
  93. package/es/tile/tileLayer/baseMapTileLayer.d.ts +1 -0
  94. package/es/tile/tileLayer/baseMapTileLayer.js +7 -0
  95. package/es/tile/tileLayer/baseTileLayer.d.ts +1 -0
  96. package/es/tile/tileLayer/baseTileLayer.js +12 -1
  97. package/es/tile/tmsMapTileLayer.js +2 -2
  98. package/es/tile/tmsTileLayer.js +2 -2
  99. package/es/tile/utils.d.ts +1 -0
  100. package/es/tile/utils.js +13 -0
  101. package/lib/Geometry/models/billboard.js +2 -5
  102. package/lib/Geometry/models/plane.js +3 -3
  103. package/lib/Geometry/models/sprite.js +2 -3
  104. package/lib/core/BaseLayer.js +15 -20
  105. package/lib/core/BaseModel.js +15 -16
  106. package/lib/earth/models/atmosphere.js +4 -7
  107. package/lib/earth/models/base.js +10 -14
  108. package/lib/earth/models/bloomsphere.js +4 -8
  109. package/lib/heatmap/index.js +1 -3
  110. package/lib/heatmap/models/grid.js +1 -3
  111. package/lib/heatmap/models/grid3d.js +4 -11
  112. package/lib/heatmap/models/heatmap.js +3 -6
  113. package/lib/heatmap/models/hexagon.js +2 -6
  114. package/lib/heatmap/triangulation.js +0 -1
  115. package/lib/image/index.js +4 -1
  116. package/lib/image/models/dataImage.js +11 -33
  117. package/lib/image/models/image.js +1 -3
  118. package/lib/image/models/index.js +4 -1
  119. package/lib/image/models/tileDataImage.js +188 -0
  120. package/lib/line/models/arc.js +7 -8
  121. package/lib/line/models/arc_3d.js +8 -10
  122. package/lib/line/models/earthArc_3d.js +8 -10
  123. package/lib/line/models/great_circle.js +7 -7
  124. package/lib/line/models/line.js +4 -4
  125. package/lib/line/models/linearline.js +3 -4
  126. package/lib/line/models/simpleLine.js +3 -3
  127. package/lib/line/models/tile.js +1 -1
  128. package/lib/line/models/wall.js +3 -3
  129. package/lib/line/shaders/dash/line_dash_frag.glsl +1 -1
  130. package/lib/line/shaders/line_arc2d_vert.glsl +2 -2
  131. package/lib/line/shaders/line_arc_3d_frag.glsl +10 -10
  132. package/lib/line/shaders/line_arc_3d_vert.glsl +3 -4
  133. package/lib/line/shaders/line_arc_frag.glsl +9 -10
  134. package/lib/line/shaders/line_arc_great_circle_frag.glsl +6 -6
  135. package/lib/line/shaders/line_arc_great_circle_vert.glsl +2 -3
  136. package/lib/line/shaders/line_arc_vert.glsl +2 -2
  137. package/lib/line/shaders/line_bezier_vert.glsl +2 -2
  138. package/lib/line/shaders/line_frag.glsl +5 -5
  139. package/lib/line/shaders/line_vert.glsl +1 -1
  140. package/lib/line/shaders/linear/arc3d_linear_frag.glsl +6 -7
  141. package/lib/line/shaders/linear/arc3d_linear_vert.glsl +9 -10
  142. package/lib/line/shaders/linear/arc_linear_frag.glsl +1 -1
  143. package/lib/line/shaders/wall/wall_frag.glsl +5 -5
  144. package/lib/line/shaders/wall/wall_vert.glsl +2 -2
  145. package/lib/plugins/LayerAnimateStylePlugin.js +2 -2
  146. package/lib/point/index.js +3 -4
  147. package/lib/point/models/earthExtrude.js +9 -14
  148. package/lib/point/models/earthFill.js +2 -2
  149. package/lib/point/models/extrude.js +9 -12
  150. package/lib/point/models/fill.js +7 -8
  151. package/lib/point/models/fillmage.js +4 -5
  152. package/lib/point/models/image.js +2 -2
  153. package/lib/point/models/index.js +1 -1
  154. package/lib/point/models/normal.js +0 -2
  155. package/lib/point/models/radar.js +1 -1
  156. package/lib/point/models/text.js +1 -3
  157. package/lib/point/models/tile.js +2 -3
  158. package/lib/point/models/tileText.js +3 -5
  159. package/lib/point/shaders/animate/wave_frag.glsl +2 -2
  160. package/lib/polygon/models/extrude.js +3 -5
  161. package/lib/raster/index.js +1 -2
  162. package/lib/raster/models/raster.js +5 -5
  163. package/lib/raster/models/rasterTile.js +154 -0
  164. package/lib/raster/shaders/raster_2d_frag.glsl +0 -2
  165. package/lib/raster/shaders/raster_2d_vert.glsl +0 -1
  166. package/lib/tile/manager/baseMapTileLayerManager.js +33 -121
  167. package/lib/tile/manager/baseTileManager.js +121 -0
  168. package/lib/tile/manager/tileLayerManager.js +66 -134
  169. package/lib/tile/manager/tilePickerManager.js +5 -0
  170. package/lib/tile/models/tileModel.js +3 -0
  171. package/lib/tile/tileFactory/rasterData.js +9 -11
  172. package/lib/tile/tileFactory/rasterDataLayer.js +2 -2
  173. package/lib/tile/tileLayer/baseMapTileLayer.js +7 -0
  174. package/lib/tile/tileLayer/baseTileLayer.js +12 -1
  175. package/lib/tile/tmsMapTileLayer.js +1 -1
  176. package/lib/tile/tmsTileLayer.js +1 -1
  177. package/lib/tile/utils.js +16 -0
  178. package/package.json +6 -6
@@ -23,7 +23,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
23
23
 
24
24
  var _BaseLayer2 = _interopRequireDefault(require("../../core/BaseLayer"));
25
25
 
26
- var _raster = _interopRequireDefault(require("../../raster/models/raster"));
26
+ var _rasterTile = _interopRequireDefault(require("../../raster/models/rasterTile"));
27
27
 
28
28
  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); }; }
29
29
 
@@ -77,7 +77,7 @@ var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
77
77
  }, {
78
78
  key: "getModelType",
79
79
  value: function getModelType() {
80
- return _raster.default;
80
+ return _rasterTile.default;
81
81
  }
82
82
  }, {
83
83
  key: "getConfigSchema",
@@ -188,6 +188,13 @@ var BaseTileLayer = /*#__PURE__*/function () {
188
188
  zoom: zoom
189
189
  };
190
190
  }
191
+ }, {
192
+ key: "destroy",
193
+ value: function destroy() {
194
+ var _this$tilesetManager3;
195
+
196
+ (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 ? void 0 : _this$tilesetManager3.destroy();
197
+ }
191
198
  }]);
192
199
  return BaseTileLayer;
193
200
  }();
@@ -109,7 +109,8 @@ var BaseTileLayer = /*#__PURE__*/function () {
109
109
  key: "pickLayers",
110
110
  value: function pickLayers(target) {
111
111
  return this.tileLayerManager.pickLayers(target);
112
- }
112
+ } // eslint-disable-next-line @typescript-eslint/no-unused-vars
113
+
113
114
  }, {
114
115
  key: "tileLoaded",
115
116
  value: function tileLoaded(tile) {//
@@ -373,6 +374,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
373
374
  if (!this.tilesetManager) {
374
375
  return;
375
376
  } // 瓦片数据加载成功
377
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
376
378
 
377
379
 
378
380
  this.tilesetManager.on('tile-loaded', function (tile) {// 将事件抛出,图层上可以监听使用
@@ -382,6 +384,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
382
384
  // 将事件抛出,图层上可以监听使用
383
385
  _this6.tileUnLoad(tile);
384
386
  }); // 瓦片数据加载失败
387
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
385
388
 
386
389
  this.tilesetManager.on('tile-error', function (error, tile) {
387
390
  // 将事件抛出,图层上可以监听使用
@@ -411,6 +414,14 @@ var BaseTileLayer = /*#__PURE__*/function () {
411
414
  zoom: zoom
412
415
  };
413
416
  }
417
+ }, {
418
+ key: "destroy",
419
+ value: function destroy() {
420
+ var _this$tilesetManager3;
421
+
422
+ (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 ? void 0 : _this$tilesetManager3.destroy();
423
+ this.tileLayerManager.destroy();
424
+ }
414
425
  }]);
415
426
  return BaseTileLayer;
416
427
  }();
@@ -124,7 +124,7 @@ var TMSBaseMapTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
124
124
  var _this3 = this;
125
125
 
126
126
  this.emitTileVisibleEvent(tile, function () {
127
- _this3.tileLayerManager.updateLayersConfig(layers, 'visible', tile.isVisible);
127
+ (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
128
128
 
129
129
  _this3.layerService.reRender();
130
130
  });
@@ -128,7 +128,7 @@ var TMSTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
128
128
  var _this3 = this;
129
129
 
130
130
  this.emitTileVisibleEvent(tile, function () {
131
- _this3.tileLayerManager.updateLayersConfig(layers, 'visible', tile.isVisible);
131
+ (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
132
132
 
133
133
  _this3.layerService.reRender();
134
134
  });
package/lib/tile/utils.js CHANGED
@@ -17,6 +17,9 @@ exports.readRasterValue = readRasterValue;
17
17
  exports.registerLayers = registerLayers;
18
18
  exports.tileAllLoad = tileAllLoad;
19
19
  exports.tileVectorParser = void 0;
20
+ exports.updateLayersConfig = updateLayersConfig;
21
+
22
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
20
23
 
21
24
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
22
25
 
@@ -193,4 +196,17 @@ function tileAllLoad(tile, callback) {
193
196
  window.clearInterval(timer);
194
197
  }
195
198
  }, 36);
199
+ }
200
+
201
+ function updateLayersConfig(layers, key, value) {
202
+ layers.map(function (layer) {
203
+ if (key === 'mask') {
204
+ // Tip: 栅格瓦片生效、设置全局的 mask、瓦片被全局的 mask 影响
205
+ layer.style({
206
+ mask: value
207
+ });
208
+ } else {
209
+ layer.updateLayerConfig((0, _defineProperty2.default)({}, key, value));
210
+ }
211
+ });
196
212
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@antv/l7-layers",
3
- "version": "2.9.27-alpha.3",
3
+ "version": "2.9.27",
4
4
  "description": "L7's collection of built-in layers",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -27,10 +27,10 @@
27
27
  "license": "ISC",
28
28
  "dependencies": {
29
29
  "@antv/async-hook": "^2.2.2",
30
- "@antv/l7-core": "2.9.27-alpha.3",
31
- "@antv/l7-maps": "2.9.27-alpha.3",
32
- "@antv/l7-source": "2.9.27-alpha.3",
33
- "@antv/l7-utils": "2.9.27-alpha.3",
30
+ "@antv/l7-core": "2.9.27",
31
+ "@antv/l7-maps": "2.9.27",
32
+ "@antv/l7-source": "2.9.27",
33
+ "@antv/l7-utils": "2.9.27",
34
34
  "@babel/runtime": "^7.7.7",
35
35
  "@mapbox/martini": "^0.2.0",
36
36
  "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
61
61
  "@types/gl-matrix": "^2.4.5",
62
62
  "@types/lodash": "^4.14.138"
63
63
  },
64
- "gitHead": "395ceeac3d64e838604f6acf8a84668488762ee3",
64
+ "gitHead": "fe24bbe041becf325b1dfd36258c11662a8d22f4",
65
65
  "publishConfig": {
66
66
  "access": "public"
67
67
  }