@antv/l7-layers 2.9.27-alpha.4 → 2.9.28

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 (98) hide show
  1. package/es/Geometry/index.js +2 -8
  2. package/es/canvas/index.js +2 -8
  3. package/es/citybuliding/building.js +2 -8
  4. package/es/core/BaseLayer.d.ts +2 -0
  5. package/es/core/BaseLayer.js +12 -1
  6. package/es/core/interface.d.ts +1 -0
  7. package/es/earth/index.js +1 -5
  8. package/es/heatmap/index.js +2 -8
  9. package/es/image/index.js +2 -8
  10. package/es/line/index.js +2 -8
  11. package/es/line/models/great_circle.js +4 -4
  12. package/es/mask/index.js +2 -6
  13. package/es/plugins/DataMappingPlugin.js +4 -0
  14. package/es/plugins/FeatureScalePlugin.js +4 -1
  15. package/es/plugins/LayerModelPlugin.js +2 -0
  16. package/es/plugins/UpdateStyleAttributePlugin.d.ts +1 -1
  17. package/es/plugins/UpdateStyleAttributePlugin.js +7 -4
  18. package/es/point/index.js +2 -10
  19. package/es/polygon/index.js +2 -8
  20. package/es/raster/index.js +3 -10
  21. package/es/raster/models/raster.js +2 -2
  22. package/es/raster/models/rasterTile.d.ts +18 -0
  23. package/es/raster/models/rasterTile.js +140 -0
  24. package/es/raster/shaders/raster_2d_frag.glsl +38 -2
  25. package/es/raster/shaders/raster_2d_vert.glsl +0 -1
  26. package/es/tile/interface.d.ts +1 -0
  27. package/es/tile/manager/baseMapTileLayerManager.d.ts +3 -25
  28. package/es/tile/manager/baseMapTileLayerManager.js +31 -119
  29. package/es/tile/manager/baseTileManager.d.ts +27 -0
  30. package/es/tile/manager/baseTileManager.js +107 -0
  31. package/es/tile/manager/tileLayerManager.d.ts +4 -26
  32. package/es/tile/manager/tileLayerManager.js +64 -142
  33. package/es/tile/manager/tilePickerManager.d.ts +1 -0
  34. package/es/tile/manager/tilePickerManager.js +5 -0
  35. package/es/tile/models/tileModel.d.ts +1 -0
  36. package/es/tile/models/tileModel.js +3 -0
  37. package/es/tile/tileFactory/base.js +5 -2
  38. package/es/tile/tileFactory/index.js +2 -1
  39. package/es/tile/tileFactory/point.js +2 -1
  40. package/es/tile/tileFactory/rasterData.js +9 -11
  41. package/es/tile/tileFactory/rasterDataLayer.d.ts +1 -1
  42. package/es/tile/tileFactory/rasterDataLayer.js +3 -9
  43. package/es/tile/tileFactory/test.js +4 -2
  44. package/es/tile/tileFactory/vectorLayer.d.ts +4 -1
  45. package/es/tile/tileFactory/vectorLayer.js +4 -8
  46. package/es/tile/tileLayer/baseMapTileLayer.d.ts +1 -0
  47. package/es/tile/tileLayer/baseMapTileLayer.js +8 -1
  48. package/es/tile/tileLayer/baseTileLayer.d.ts +1 -0
  49. package/es/tile/tileLayer/baseTileLayer.js +13 -2
  50. package/es/tile/tileTest.js +1 -3
  51. package/es/tile/tmsMapTileLayer.d.ts +0 -2
  52. package/es/tile/tmsMapTileLayer.js +2 -24
  53. package/es/tile/tmsTileLayer.d.ts +0 -2
  54. package/es/tile/tmsTileLayer.js +2 -24
  55. package/es/tile/utils.d.ts +3 -1
  56. package/es/tile/utils.js +48 -0
  57. package/es/wind/index.js +2 -8
  58. package/lib/Geometry/index.js +2 -8
  59. package/lib/canvas/index.js +2 -8
  60. package/lib/citybuliding/building.js +2 -8
  61. package/lib/core/BaseLayer.js +11 -1
  62. package/lib/earth/index.js +1 -5
  63. package/lib/heatmap/index.js +2 -8
  64. package/lib/image/index.js +2 -8
  65. package/lib/line/index.js +2 -8
  66. package/lib/line/models/great_circle.js +4 -4
  67. package/lib/mask/index.js +2 -6
  68. package/lib/plugins/DataMappingPlugin.js +4 -0
  69. package/lib/plugins/FeatureScalePlugin.js +4 -1
  70. package/lib/plugins/LayerModelPlugin.js +2 -0
  71. package/lib/plugins/UpdateStyleAttributePlugin.js +7 -4
  72. package/lib/point/index.js +2 -10
  73. package/lib/polygon/index.js +2 -8
  74. package/lib/raster/index.js +3 -10
  75. package/lib/raster/models/raster.js +2 -2
  76. package/lib/raster/models/rasterTile.js +154 -0
  77. package/lib/raster/shaders/raster_2d_frag.glsl +38 -2
  78. package/lib/raster/shaders/raster_2d_vert.glsl +0 -1
  79. package/lib/tile/manager/baseMapTileLayerManager.js +33 -121
  80. package/lib/tile/manager/baseTileManager.js +121 -0
  81. package/lib/tile/manager/tileLayerManager.js +66 -144
  82. package/lib/tile/manager/tilePickerManager.js +5 -0
  83. package/lib/tile/models/tileModel.js +3 -0
  84. package/lib/tile/tileFactory/base.js +5 -2
  85. package/lib/tile/tileFactory/index.js +3 -1
  86. package/lib/tile/tileFactory/point.js +2 -1
  87. package/lib/tile/tileFactory/rasterData.js +9 -11
  88. package/lib/tile/tileFactory/rasterDataLayer.js +4 -10
  89. package/lib/tile/tileFactory/test.js +4 -2
  90. package/lib/tile/tileFactory/vectorLayer.js +3 -8
  91. package/lib/tile/tileLayer/baseMapTileLayer.js +8 -1
  92. package/lib/tile/tileLayer/baseTileLayer.js +13 -2
  93. package/lib/tile/tileTest.js +1 -3
  94. package/lib/tile/tmsMapTileLayer.js +1 -23
  95. package/lib/tile/tmsTileLayer.js +1 -23
  96. package/lib/tile/utils.js +52 -0
  97. package/lib/wind/index.js +2 -8
  98. package/package.json +6 -6
@@ -100,7 +100,7 @@ var TMSTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
100
100
 
101
101
  var _layers = _this2.tileLayerManager.getChilds(tile.layerIDList);
102
102
 
103
- _this2.updateTileVisible(tile, _layers);
103
+ (0, _utils.updateTileVisible)(tile, _layers, _this2.layerService);
104
104
 
105
105
  _this2.setPickState(_layers);
106
106
  }
@@ -111,28 +111,6 @@ var TMSTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
111
111
  this.parent.emit('tiles-loaded', this.tilesetManager.currentTiles);
112
112
  }
113
113
  }
114
- }, {
115
- key: "emitTileVisibleEvent",
116
- value: function emitTileVisibleEvent(tile, callback) {
117
- if (tile.isVisible) {
118
- callback();
119
- } else {
120
- (0, _utils.tileAllLoad)(tile, function () {
121
- callback();
122
- });
123
- }
124
- }
125
- }, {
126
- key: "updateTileVisible",
127
- value: function updateTileVisible(tile, layers) {
128
- var _this3 = this;
129
-
130
- this.emitTileVisibleEvent(tile, function () {
131
- _this3.tileLayerManager.updateLayersConfig(layers, 'visible', tile.isVisible);
132
-
133
- _this3.layerService.reRender();
134
- });
135
- }
136
114
  }]);
137
115
  return TMSTileLayer;
138
116
  }(_baseTileLayer.default);
package/lib/tile/utils.js CHANGED
@@ -17,6 +17,10 @@ exports.readRasterValue = readRasterValue;
17
17
  exports.registerLayers = registerLayers;
18
18
  exports.tileAllLoad = tileAllLoad;
19
19
  exports.tileVectorParser = void 0;
20
+ exports.updateLayersConfig = updateLayersConfig;
21
+ exports.updateTileVisible = updateTileVisible;
22
+
23
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
20
24
 
21
25
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
22
26
 
@@ -193,4 +197,52 @@ function tileAllLoad(tile, callback) {
193
197
  window.clearInterval(timer);
194
198
  }
195
199
  }, 36);
200
+ }
201
+
202
+ function updateLayersConfig(layers, key, value) {
203
+ layers.map(function (layer) {
204
+ if (key === 'mask') {
205
+ // Tip: 栅格瓦片生效、设置全局的 mask、瓦片被全局的 mask 影响
206
+ layer.style({
207
+ mask: value
208
+ });
209
+ } else {
210
+ layer.updateLayerConfig((0, _defineProperty2.default)({}, key, value));
211
+ }
212
+ });
213
+ }
214
+
215
+ function dispatchTileVisibleChange(tile, callback) {
216
+ if (tile.isVisible) {
217
+ callback();
218
+ } else {
219
+ tileAllLoad(tile, function () {
220
+ callback();
221
+ });
222
+ }
223
+ }
224
+
225
+ function updateImmediately(layers) {
226
+ var immediately = true;
227
+ layers.map(function (layer) {
228
+ if (layer.type !== 'PointLayer') {
229
+ immediately = false;
230
+ }
231
+ });
232
+ return immediately;
233
+ }
234
+
235
+ function updateTileVisible(tile, layers, layerService) {
236
+ if (layers.length === 0) return;
237
+
238
+ if (updateImmediately(layers)) {
239
+ updateLayersConfig(layers, 'visible', tile.isVisible);
240
+ layerService.reRender();
241
+ return;
242
+ }
243
+
244
+ dispatchTileVisibleChange(tile, function () {
245
+ updateLayersConfig(layers, 'visible', tile.isVisible);
246
+ layerService.reRender();
247
+ });
196
248
  }
package/lib/wind/index.js CHANGED
@@ -56,11 +56,7 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
56
56
  var modelType = this.getModelType();
57
57
  this.layerModel = new _models.default[modelType](this);
58
58
  this.layerModel.initModels(function (models) {
59
- _this2.models = models;
60
-
61
- _this2.emit('modelLoaded', null);
62
-
63
- _this2.layerService.throttleRenderLayers();
59
+ _this2.dispatchModelLoad(models);
64
60
  });
65
61
  }
66
62
  }, {
@@ -69,9 +65,7 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
69
65
  var _this3 = this;
70
66
 
71
67
  this.layerModel.buildModels(function (models) {
72
- _this3.models = models;
73
-
74
- _this3.emit('modelLoaded', null);
68
+ _this3.dispatchModelLoad(models);
75
69
  });
76
70
  }
77
71
  }, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@antv/l7-layers",
3
- "version": "2.9.27-alpha.4",
3
+ "version": "2.9.28",
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.4",
31
- "@antv/l7-maps": "2.9.27-alpha.4",
32
- "@antv/l7-source": "2.9.27-alpha.4",
33
- "@antv/l7-utils": "2.9.27-alpha.4",
30
+ "@antv/l7-core": "2.9.28",
31
+ "@antv/l7-maps": "2.9.28",
32
+ "@antv/l7-source": "2.9.28",
33
+ "@antv/l7-utils": "2.9.28",
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": "9e77012376360246d49d7b5392eecd16b43b9109",
64
+ "gitHead": "bdf2c35d3b632882bf5a8fdd4bd58acfb14b2a97",
65
65
  "publishConfig": {
66
66
  "access": "public"
67
67
  }