@antv/l7-layers 2.9.27 → 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 (72) 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 +10 -0
  6. package/es/earth/index.js +1 -5
  7. package/es/heatmap/index.js +2 -8
  8. package/es/image/index.js +2 -8
  9. package/es/line/index.js +2 -8
  10. package/es/line/models/great_circle.js +4 -4
  11. package/es/mask/index.js +2 -6
  12. package/es/plugins/DataMappingPlugin.js +4 -0
  13. package/es/plugins/FeatureScalePlugin.js +4 -1
  14. package/es/plugins/LayerModelPlugin.js +2 -0
  15. package/es/plugins/UpdateStyleAttributePlugin.d.ts +1 -1
  16. package/es/plugins/UpdateStyleAttributePlugin.js +7 -4
  17. package/es/point/index.js +2 -10
  18. package/es/polygon/index.js +2 -8
  19. package/es/raster/index.js +2 -8
  20. package/es/raster/models/rasterTile.js +1 -1
  21. package/es/raster/shaders/raster_2d_frag.glsl +38 -0
  22. package/es/tile/interface.d.ts +1 -0
  23. package/es/tile/tileFactory/base.js +5 -2
  24. package/es/tile/tileFactory/index.js +2 -1
  25. package/es/tile/tileFactory/point.js +2 -1
  26. package/es/tile/tileFactory/rasterDataLayer.js +2 -8
  27. package/es/tile/tileFactory/test.js +4 -2
  28. package/es/tile/tileFactory/vectorLayer.d.ts +4 -1
  29. package/es/tile/tileFactory/vectorLayer.js +4 -8
  30. package/es/tile/tileLayer/baseMapTileLayer.js +1 -1
  31. package/es/tile/tileLayer/baseTileLayer.js +1 -1
  32. package/es/tile/tileTest.js +1 -3
  33. package/es/tile/tmsMapTileLayer.d.ts +0 -2
  34. package/es/tile/tmsMapTileLayer.js +2 -24
  35. package/es/tile/tmsTileLayer.d.ts +0 -2
  36. package/es/tile/tmsTileLayer.js +2 -24
  37. package/es/tile/utils.d.ts +2 -1
  38. package/es/tile/utils.js +35 -0
  39. package/es/wind/index.js +2 -8
  40. package/lib/Geometry/index.js +2 -8
  41. package/lib/canvas/index.js +2 -8
  42. package/lib/citybuliding/building.js +2 -8
  43. package/lib/core/BaseLayer.js +9 -0
  44. package/lib/earth/index.js +1 -5
  45. package/lib/heatmap/index.js +2 -8
  46. package/lib/image/index.js +2 -8
  47. package/lib/line/index.js +2 -8
  48. package/lib/line/models/great_circle.js +4 -4
  49. package/lib/mask/index.js +2 -6
  50. package/lib/plugins/DataMappingPlugin.js +4 -0
  51. package/lib/plugins/FeatureScalePlugin.js +4 -1
  52. package/lib/plugins/LayerModelPlugin.js +2 -0
  53. package/lib/plugins/UpdateStyleAttributePlugin.js +7 -4
  54. package/lib/point/index.js +2 -10
  55. package/lib/polygon/index.js +2 -8
  56. package/lib/raster/index.js +2 -8
  57. package/lib/raster/models/rasterTile.js +1 -1
  58. package/lib/raster/shaders/raster_2d_frag.glsl +38 -0
  59. package/lib/tile/tileFactory/base.js +5 -2
  60. package/lib/tile/tileFactory/index.js +3 -1
  61. package/lib/tile/tileFactory/point.js +2 -1
  62. package/lib/tile/tileFactory/rasterDataLayer.js +2 -8
  63. package/lib/tile/tileFactory/test.js +4 -2
  64. package/lib/tile/tileFactory/vectorLayer.js +3 -8
  65. package/lib/tile/tileLayer/baseMapTileLayer.js +1 -1
  66. package/lib/tile/tileLayer/baseTileLayer.js +1 -1
  67. package/lib/tile/tileTest.js +1 -3
  68. package/lib/tile/tmsMapTileLayer.js +1 -23
  69. package/lib/tile/tmsTileLayer.js +1 -23
  70. package/lib/tile/utils.js +36 -0
  71. package/lib/wind/index.js +2 -8
  72. package/package.json +6 -6
@@ -56,11 +56,7 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
56
56
  var modelType = this.getModelType();
57
57
  this.layerModel = new GeometryModels[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 GeometryLayer = /*#__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
  }, {
@@ -44,11 +44,7 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
44
44
  var modelType = this.getModelType();
45
45
  this.layerModel = new CanvasModels[modelType](this);
46
46
  this.layerModel.initModels(function (models) {
47
- _this2.models = models;
48
-
49
- _this2.emit('modelLoaded', null);
50
-
51
- _this2.layerService.throttleRenderLayers();
47
+ _this2.dispatchModelLoad(models);
52
48
  });
53
49
  }
54
50
  }, {
@@ -57,9 +53,7 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
57
53
  var _this3 = this;
58
54
 
59
55
  this.layerModel.buildModels(function (models) {
60
- _this3.models = models;
61
-
62
- _this3.emit('modelLoaded', null);
56
+ _this3.dispatchModelLoad(models);
63
57
  });
64
58
  }
65
59
  }, {
@@ -41,11 +41,7 @@ var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
41
41
 
42
42
  this.layerModel = new CityBuildModel(this);
43
43
  this.layerModel.initModels(function (models) {
44
- _this2.models = models;
45
-
46
- _this2.emit('modelLoaded', null);
47
-
48
- _this2.layerService.throttleRenderLayers();
44
+ _this2.dispatchModelLoad(models);
49
45
  });
50
46
  }
51
47
  }, {
@@ -54,9 +50,7 @@ var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
54
50
  var _this3 = this;
55
51
 
56
52
  this.layerModel.buildModels(function (models) {
57
- _this3.models = models;
58
-
59
- _this3.emit('modelLoaded', null);
53
+ _this3.dispatchModelLoad(models);
60
54
  });
61
55
  }
62
56
  }, {
@@ -42,6 +42,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
42
42
  afterDestroy: SyncHook;
43
43
  };
44
44
  models: IModel[];
45
+ modelLoaded: boolean;
45
46
  multiPassRenderer: IMultiPassRenderer;
46
47
  plugins: ILayerPlugin[];
47
48
  sourceOption: {
@@ -214,6 +215,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
214
215
  protected getModelType(): unknown;
215
216
  protected getDefaultConfig(): {};
216
217
  protected sourceEvent: () => void;
218
+ protected dispatchModelLoad(models: IModel[]): void;
217
219
  protected reRender(): void;
218
220
  protected splitValuesAndCallbackInAttribute(valuesOrCallback?: unknown[], defaultValues?: unknown[]): {
219
221
  values: unknown[] | undefined;
@@ -126,6 +126,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
126
126
 
127
127
  _defineProperty(_assertThisInitialized(_this), "models", []);
128
128
 
129
+ _defineProperty(_assertThisInitialized(_this), "modelLoaded", false);
130
+
129
131
  _defineProperty(_assertThisInitialized(_this), "layerChildren", []);
130
132
 
131
133
  _defineProperty(_assertThisInitialized(_this), "masks", []);
@@ -1374,6 +1376,14 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
1374
1376
  value: function getDefaultConfig() {
1375
1377
  return {};
1376
1378
  }
1379
+ }, {
1380
+ key: "dispatchModelLoad",
1381
+ value: function dispatchModelLoad(models) {
1382
+ this.models = models;
1383
+ this.emit('modelLoaded', null);
1384
+ this.modelLoaded = true;
1385
+ this.layerService.throttleRenderLayers();
1386
+ }
1377
1387
  }, {
1378
1388
  key: "reRender",
1379
1389
  value: function reRender() {
package/es/earth/index.js CHANGED
@@ -59,11 +59,7 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
59
59
  var shape = this.getModelType();
60
60
  this.layerModel = new EarthModels[shape](this);
61
61
  this.layerModel.initModels(function (models) {
62
- _this2.models = models;
63
-
64
- _this2.emit('modelLoaded', null);
65
-
66
- _this2.layerService.throttleRenderLayers();
62
+ _this2.dispatchModelLoad(models);
67
63
  });
68
64
  }
69
65
  /**
@@ -42,11 +42,7 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
42
42
  var shape = this.getModelType();
43
43
  this.layerModel = new HeatMapModels[shape](this);
44
44
  this.layerModel.initModels(function (models) {
45
- _this2.models = models;
46
-
47
- _this2.emit('modelLoaded', null);
48
-
49
- _this2.layerService.throttleRenderLayers();
45
+ _this2.dispatchModelLoad(models);
50
46
  });
51
47
  }
52
48
  }, {
@@ -55,9 +51,7 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
55
51
  var _this3 = this;
56
52
 
57
53
  this.layerModel.buildModels(function (models) {
58
- _this3.models = models;
59
-
60
- _this3.emit('modelLoaded', null);
54
+ _this3.dispatchModelLoad(models);
61
55
  });
62
56
  }
63
57
  }, {
package/es/image/index.js CHANGED
@@ -42,11 +42,7 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
42
42
  var modelType = this.getModelType();
43
43
  this.layerModel = new ImageModels[modelType](this);
44
44
  this.layerModel.initModels(function (models) {
45
- _this2.models = models;
46
-
47
- _this2.emit('modelLoaded', null);
48
-
49
- _this2.layerService.throttleRenderLayers();
45
+ _this2.dispatchModelLoad(models);
50
46
  });
51
47
  }
52
48
  }, {
@@ -55,9 +51,7 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
55
51
  var _this3 = this;
56
52
 
57
53
  this.layerModel.buildModels(function (models) {
58
- _this3.models = models;
59
-
60
- _this3.emit('modelLoaded', null);
54
+ _this3.dispatchModelLoad(models);
61
55
  });
62
56
  }
63
57
  }, {
package/es/line/index.js CHANGED
@@ -63,11 +63,7 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
63
63
  var shape = this.getModelType();
64
64
  this.layerModel = new LineModels[shape](this);
65
65
  this.layerModel.initModels(function (models) {
66
- _this2.models = models;
67
-
68
- _this2.emit('modelLoaded', null);
69
-
70
- _this2.layerService.throttleRenderLayers();
66
+ _this2.dispatchModelLoad(models);
71
67
  });
72
68
  }
73
69
  }, {
@@ -76,9 +72,7 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
76
72
  var _this3 = this;
77
73
 
78
74
  this.layerModel.buildModels(function (models) {
79
- _this3.models = models;
80
-
81
- _this3.emit('modelLoaded', null);
75
+ _this3.dispatchModelLoad(models);
82
76
  });
83
77
  }
84
78
  }, {
@@ -233,7 +233,7 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
233
233
  type: gl.FLOAT
234
234
  },
235
235
  size: 1,
236
- update: function update(feature) {
236
+ update: function update(feature, featureIdx, vertex, attributeIdx) {
237
237
  var _feature$size = feature.size,
238
238
  size = _feature$size === void 0 ? 1 : _feature$size;
239
239
  return Array.isArray(size) ? [size[0]] : [size];
@@ -252,7 +252,7 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
252
252
  type: gl.FLOAT
253
253
  },
254
254
  size: 4,
255
- update: function update(feature, featureIdx, vertex) {
255
+ update: function update(feature, featureIdx, vertex, attributeIdx) {
256
256
  return [vertex[3], vertex[4], vertex[5], vertex[6]];
257
257
  }
258
258
  }
@@ -269,10 +269,10 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
269
269
  type: gl.FLOAT
270
270
  },
271
271
  size: 2,
272
- update: function update(feature) {
272
+ update: function update(feature, featureIdx, vertex, attributeIdx) {
273
273
  var iconMap = _this2.iconService.getIconMap();
274
274
 
275
- var texture = feature.texture;
275
+ var texture = feature.texture; // console.log('icon feature', feature)
276
276
 
277
277
  var _ref4 = iconMap[texture] || {
278
278
  x: 0,
package/es/mask/index.js CHANGED
@@ -115,9 +115,7 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
115
115
  var shape = this.getModelType();
116
116
  this.layerModel = new MaskModels[shape](this);
117
117
  this.layerModel.initModels(function (models) {
118
- _this3.models = models;
119
-
120
- _this3.emit('modelLoaded', null);
118
+ _this3.dispatchModelLoad(models);
121
119
  });
122
120
  }
123
121
  }, {
@@ -126,9 +124,7 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
126
124
  var _this4 = this;
127
125
 
128
126
  this.layerModel.buildModels(function (models) {
129
- _this4.models = models;
130
-
131
- _this4.emit('modelLoaded', null);
127
+ _this4.dispatchModelLoad(models);
132
128
  });
133
129
  }
134
130
  }, {
@@ -65,6 +65,10 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
65
65
  }); // remapping before render
66
66
 
67
67
  layer.hooks.beforeRender.tap('DataMappingPlugin', function () {
68
+ var _layer$getLayerConfig = layer.getLayerConfig(),
69
+ usage = _layer$getLayerConfig.usage;
70
+
71
+ if (usage === 'basemap') return;
68
72
  var source = layer.getSource();
69
73
 
70
74
  if (layer.layerModelNeedUpdate || !source || !source.inited) {
@@ -78,7 +78,10 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
78
78
  return true;
79
79
  });
80
80
  layer.hooks.beforeRender.tap('FeatureScalePlugin', function () {
81
- if (layer.layerModelNeedUpdate) {
81
+ var _layer$getLayerConfig = layer.getLayerConfig(),
82
+ usage = _layer$getLayerConfig.usage;
83
+
84
+ if (layer.layerModelNeedUpdate || usage === 'basemap') {
82
85
  return;
83
86
  }
84
87
 
@@ -40,6 +40,7 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
40
40
 
41
41
  layer.hooks.init.tap('LayerModelPlugin', function () {
42
42
  layer.inited = true;
43
+ layer.modelLoaded = false;
43
44
  var source = layer.getSource();
44
45
 
45
46
  if (source.inited) {
@@ -48,6 +49,7 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
48
49
  });
49
50
  layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
50
51
  var source = layer.getSource();
52
+ layer.modelLoaded = false;
51
53
 
52
54
  if (source.inited) {
53
55
  _this.prepareLayerModel(layer);
@@ -7,6 +7,6 @@ export default class UpdateStyleAttributePlugin implements ILayerPlugin {
7
7
  apply(layer: ILayer, { styleAttributeService, }: {
8
8
  styleAttributeService: IStyleAttributeService;
9
9
  }): void;
10
- private updateStyleAtrribute;
10
+ private updateStyleAttribute;
11
11
  private initStyleAttribute;
12
12
  }
@@ -26,18 +26,21 @@ var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__
26
26
  });
27
27
  });
28
28
  layer.hooks.beforeRender.tap('UpdateStyleAttributePlugin', function () {
29
- if (layer.layerModelNeedUpdate) {
29
+ var _layer$getLayerConfig = layer.getLayerConfig(),
30
+ usage = _layer$getLayerConfig.usage;
31
+
32
+ if (layer.layerModelNeedUpdate || layer.tileLayer || usage === 'basemap') {
30
33
  return;
31
34
  }
32
35
 
33
- _this.updateStyleAtrribute(layer, {
36
+ layer.modelLoaded && _this.updateStyleAttribute(layer, {
34
37
  styleAttributeService: styleAttributeService
35
38
  });
36
39
  });
37
40
  }
38
41
  }, {
39
- key: "updateStyleAtrribute",
40
- value: function updateStyleAtrribute(layer, _ref2) {
42
+ key: "updateStyleAttribute",
43
+ value: function updateStyleAttribute(layer, _ref2) {
41
44
  var styleAttributeService = _ref2.styleAttributeService;
42
45
  var attributes = styleAttributeService.getLayerStyleAttributes() || [];
43
46
  var filter = styleAttributeService.getLayerStyleAttribute('filter');
package/es/point/index.js CHANGED
@@ -60,13 +60,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
60
60
  var modelType = this.getModelType();
61
61
  this.layerModel = new PointModels[modelType](this);
62
62
  this.layerModel.initModels(function (models) {
63
- _this2.models = models;
64
-
65
- _this2.layerService.updateLayerRenderList();
66
-
67
- _this2.emit('modelLoaded', null);
68
-
69
- _this2.layerService.throttleRenderLayers();
63
+ _this2.dispatchModelLoad(models);
70
64
  });
71
65
  }
72
66
  }, {
@@ -75,9 +69,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
75
69
  var _this3 = this;
76
70
 
77
71
  this.layerModel.buildModels(function (models) {
78
- _this3.models = models;
79
-
80
- _this3.emit('modelLoaded', null);
72
+ _this3.dispatchModelLoad(models);
81
73
  });
82
74
  }
83
75
  /**
@@ -43,11 +43,7 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
43
43
  var shape = this.getModelType();
44
44
  this.layerModel = new PolygonModels[shape](this);
45
45
  this.layerModel.initModels(function (models) {
46
- _this2.models = models;
47
-
48
- _this2.emit('modelLoaded', null);
49
-
50
- _this2.layerService.throttleRenderLayers();
46
+ _this2.dispatchModelLoad(models);
51
47
  });
52
48
  }
53
49
  }, {
@@ -56,9 +52,7 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
56
52
  var _this3 = this;
57
53
 
58
54
  this.layerModel.buildModels(function (models) {
59
- _this3.models = models;
60
-
61
- _this3.emit('modelLoaded', null);
55
+ _this3.dispatchModelLoad(models);
62
56
  });
63
57
  }
64
58
  }, {
@@ -42,11 +42,7 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
42
42
  var modelType = this.getModelType();
43
43
  this.layerModel = new RasterModels[modelType](this);
44
44
  this.layerModel.initModels(function (models) {
45
- _this2.models = models;
46
-
47
- _this2.emit('modelLoaded', null);
48
-
49
- _this2.layerService.throttleRenderLayers();
45
+ _this2.dispatchModelLoad(models);
50
46
  });
51
47
  }
52
48
  }, {
@@ -55,9 +51,7 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
55
51
  var _this3 = this;
56
52
 
57
53
  this.layerModel.buildModels(function (models) {
58
- _this3.models = models;
59
-
60
- _this3.emit('modelLoaded', null);
54
+ _this3.dispatchModelLoad(models);
61
55
  });
62
56
  }
63
57
  }, {
@@ -14,7 +14,7 @@ import BaseModel from "../../core/BaseModel";
14
14
  import { RasterImageTriangulation } from "../../core/triangulation";
15
15
 
16
16
  /* babel-plugin-inline-import '../shaders/raster_2d_frag.glsl' */
17
- 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;\n\nvoid main() {\n\n float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n if (value == u_noDataValue)\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";
17
+ 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;\n\n\n\n// float getBlurIndusty() {\n// vec2 u_ViewportSize = vec2(1024);\n\n// float vW = 2.0/u_ViewportSize.x;\n// float vH = 2.0/u_ViewportSize.y;\n// vec2 vUv = v_texCoord;\n// float i11 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y + 1.0 * vH) ).r;\n// float i12 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y + 1.0 * vH) ).r;\n// float i13 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y + 1.0 * vH) ).r;\n\n// float i21 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y) ).r;\n// float i22 = texture2D( u_texture, vec2( vUv.x , vUv.y) ).r;\n// float i23 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y) ).r;\n\n// float i31 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y-1.0*vH) ).r;\n// float i32 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y-1.0*vH) ).r;\n// float i33 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y-1.0*vH) ).r;\n\n// return(\n// i11 + \n// i12 + \n// i13 + \n// i21 + \n// i21 + \n// i22 + \n// i23 + \n// i31 + \n// i32 + \n// i33\n// )/9.0;\n// }\n\nvoid main() {\n\n float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n\n // float value = getBlurIndusty();\n\n\n if (value == u_noDataValue)\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";
18
18
 
19
19
  /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
20
20
  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";
@@ -10,9 +10,47 @@ uniform bool u_clampLow: true;
10
10
  uniform bool u_clampHigh: true;
11
11
  varying vec2 v_texCoord;
12
12
 
13
+
14
+
15
+ // float getBlurIndusty() {
16
+ // vec2 u_ViewportSize = vec2(1024);
17
+
18
+ // float vW = 2.0/u_ViewportSize.x;
19
+ // float vH = 2.0/u_ViewportSize.y;
20
+ // vec2 vUv = v_texCoord;
21
+ // float i11 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y + 1.0 * vH) ).r;
22
+ // float i12 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y + 1.0 * vH) ).r;
23
+ // float i13 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y + 1.0 * vH) ).r;
24
+
25
+ // float i21 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y) ).r;
26
+ // float i22 = texture2D( u_texture, vec2( vUv.x , vUv.y) ).r;
27
+ // float i23 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y) ).r;
28
+
29
+ // float i31 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y-1.0*vH) ).r;
30
+ // float i32 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y-1.0*vH) ).r;
31
+ // float i33 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y-1.0*vH) ).r;
32
+
33
+ // return(
34
+ // i11 +
35
+ // i12 +
36
+ // i13 +
37
+ // i21 +
38
+ // i21 +
39
+ // i22 +
40
+ // i23 +
41
+ // i31 +
42
+ // i32 +
43
+ // i33
44
+ // )/9.0;
45
+ // }
46
+
13
47
  void main() {
14
48
 
15
49
  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;
50
+
51
+ // float value = getBlurIndusty();
52
+
53
+
16
54
  if (value == u_noDataValue)
17
55
  gl_FragColor = vec4(0.0, 0, 0, 0.0);
18
56
  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))
@@ -16,6 +16,7 @@ export interface ILayerTileConfig {
16
16
  initOptions: ISubLayerInitOptions;
17
17
  vectorTileLayer?: any;
18
18
  source: ISource;
19
+ needListen?: boolean;
19
20
  }
20
21
  export interface ITileFactory {
21
22
  createTile(tile: Tile, initOptions: ISubLayerInitOptions): {
@@ -121,7 +121,9 @@ var TileFactory = /*#__PURE__*/function () {
121
121
  tile = tileLayerOption.tile,
122
122
  initOptions = tileLayerOption.initOptions,
123
123
  vectorTileLayer = tileLayerOption.vectorTileLayer,
124
- source = tileLayerOption.source;
124
+ source = tileLayerOption.source,
125
+ _tileLayerOption$need = tileLayerOption.needListen,
126
+ needListen = _tileLayerOption$need === void 0 ? true : _tileLayerOption$need;
125
127
  var mask = initOptions.mask,
126
128
  color = initOptions.color,
127
129
  layerType = initOptions.layerType,
@@ -134,7 +136,8 @@ var TileFactory = /*#__PURE__*/function () {
134
136
  var layer = new FactoryTileLayer(_objectSpread({
135
137
  visible: tile.isVisible,
136
138
  tileOrigin: vectorTileLayer === null || vectorTileLayer === void 0 ? void 0 : vectorTileLayer.l7TileOrigin,
137
- coord: vectorTileLayer === null || vectorTileLayer === void 0 ? void 0 : vectorTileLayer.l7TileCoord
139
+ coord: vectorTileLayer === null || vectorTileLayer === void 0 ? void 0 : vectorTileLayer.l7TileCoord,
140
+ needListen: needListen
138
141
  }, this.getLayerInitOption(initOptions)));
139
142
  if (layerType) layer.type = layerType; // Tip: sign tile layer
140
143
 
@@ -1,3 +1,4 @@
1
+ import { rasterDataTypes } from '@antv/l7-source';
1
2
  import VectorLineTile from "./line";
2
3
  import VectorPointLayer from "./point";
3
4
  import VectorPolygonTile from "./polygon";
@@ -19,7 +20,7 @@ export function getTileFactory(tileType, parser) {
19
20
  return TestTile;
20
21
 
21
22
  case 'RasterLayer':
22
- if (parser.dataType === 'arraybuffer') {
23
+ if (rasterDataTypes.includes(parser.dataType)) {
23
24
  return RasterDataFactory;
24
25
  } else {
25
26
  return RasterTileFactory;
@@ -44,7 +44,8 @@ var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
44
44
  tile: tile,
45
45
  initOptions: initOptions,
46
46
  vectorTileLayer: vectorTileLayer,
47
- source: source
47
+ source: source,
48
+ needListen: false
48
49
  });
49
50
  layer.once('modelLoaded', function () {
50
51
  tile.layerLoad();
@@ -42,11 +42,7 @@ var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
42
42
  var model = this.getModelType();
43
43
  this.layerModel = new model(this);
44
44
  this.layerModel.initModels(function (models) {
45
- _this2.models = models;
46
-
47
- _this2.emit('modelLoaded', null);
48
-
49
- _this2.layerService.throttleRenderLayers();
45
+ _this2.dispatchModelLoad(models);
50
46
  });
51
47
  }
52
48
  }, {
@@ -55,9 +51,7 @@ var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
55
51
  var _this3 = this;
56
52
 
57
53
  this.layerModel.buildModels(function (models) {
58
- _this3.models = models;
59
-
60
- _this3.emit('modelLoaded', null);
54
+ _this3.dispatchModelLoad(models);
61
55
  });
62
56
  }
63
57
  }, {
@@ -52,7 +52,8 @@ var TestTile = /*#__PURE__*/function (_TileFactory) {
52
52
  var properties = features[0].properties;
53
53
  var text = new VectorLayer({
54
54
  layerType: 'PointLayer',
55
- usage: 'basemap'
55
+ usage: 'basemap',
56
+ needListen: false
56
57
  }).source([properties], {
57
58
  parser: {
58
59
  type: 'json',
@@ -68,7 +69,8 @@ var TestTile = /*#__PURE__*/function (_TileFactory) {
68
69
  });
69
70
  var line = new VectorLayer({
70
71
  layerType: 'LineLayer',
71
- usage: 'basemap'
72
+ usage: 'basemap',
73
+ needListen: false
72
74
  }).source({
73
75
  type: 'FeatureCollection',
74
76
  features: features
@@ -5,7 +5,10 @@ import lineSimpleModel from '../../line/models/simpleTileLine';
5
5
  import pointTextModel from '../../point/models/tileText';
6
6
  import pointFillModel from '../../point/models/tile';
7
7
  import polygonFillModel from '../../polygon/models/tile';
8
- export default class VectorLayer extends BaseLayer<Partial<IPolygonLayerStyleOptions & ILineLayerStyleOptions & IPointLayerStyleOptions>> {
8
+ export default class VectorLayer extends BaseLayer<Partial<IPolygonLayerStyleOptions & ILineLayerStyleOptions & IPointLayerStyleOptions & {
9
+ needListen: boolean;
10
+ }>> {
11
+ needListen: boolean;
9
12
  isVector: boolean;
10
13
  type: string;
11
14
  private pickedID;
@@ -41,6 +41,8 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
41
41
 
42
42
  _this = _super.call.apply(_super, [this].concat(args));
43
43
 
44
+ _defineProperty(_assertThisInitialized(_this), "needListen", true);
45
+
44
46
  _defineProperty(_assertThisInitialized(_this), "isVector", true);
45
47
 
46
48
  _defineProperty(_assertThisInitialized(_this), "type", _this.layerType || 'vectorLayer');
@@ -159,11 +161,7 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
159
161
  var model = this.getModelType();
160
162
  this.layerModel = new model(this);
161
163
  this.layerModel.initModels(function (models) {
162
- _this4.models = models;
163
-
164
- _this4.emit('modelLoaded', null);
165
-
166
- _this4.layerService.throttleRenderLayers();
164
+ _this4.dispatchModelLoad(models);
167
165
  });
168
166
  }
169
167
  }, {
@@ -172,9 +170,7 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
172
170
  var _this5 = this;
173
171
 
174
172
  this.layerModel.buildModels(function (models) {
175
- _this5.models = models;
176
-
177
- _this5.emit('modelLoaded', null);
173
+ _this5.dispatchModelLoad(models);
178
174
  });
179
175
  }
180
176
  }, {
@@ -131,7 +131,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
131
131
  zoom: zoom,
132
132
  latLonBounds: latLonBounds
133
133
  };
134
- (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.update(zoom, latLonBounds);
134
+ (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.throttleUpdate(zoom, latLonBounds);
135
135
  }
136
136
  }, {
137
137
  key: "bindTilesetEvent",
@@ -354,7 +354,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
354
354
  zoom: zoom,
355
355
  latLonBounds: latLonBounds
356
356
  };
357
- (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.update(zoom, latLonBounds);
357
+ (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.throttleUpdate(zoom, latLonBounds);
358
358
  }
359
359
  }, {
360
360
  key: "bindTilesetEvent",
@@ -51,9 +51,7 @@ var TileDebugLayer = /*#__PURE__*/function (_BaseLayer) {
51
51
 
52
52
  this.layerModel = new TileModel(this);
53
53
  this.layerModel.initModels(function (models) {
54
- _this2.models = models;
55
-
56
- _this2.emit('modelLoaded', null);
54
+ _this2.dispatchModelLoad(models);
57
55
  });
58
56
  }
59
57
  }]);