@antv/l7-layers 2.9.36 → 2.9.37

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 (194) hide show
  1. package/es/Geometry/index.d.ts +0 -9
  2. package/es/Geometry/index.js +0 -13
  3. package/es/Geometry/models/billboard.d.ts +0 -9
  4. package/es/Geometry/models/billboard.js +0 -13
  5. package/es/Geometry/models/plane.d.ts +0 -9
  6. package/es/Geometry/models/plane.js +0 -13
  7. package/es/Geometry/models/sprite.d.ts +0 -9
  8. package/es/Geometry/models/sprite.js +0 -13
  9. package/es/canvas/index.d.ts +0 -9
  10. package/es/canvas/index.js +0 -13
  11. package/es/citybuliding/building.d.ts +0 -9
  12. package/es/citybuliding/building.js +0 -13
  13. package/es/core/BaseLayer.d.ts +2 -2
  14. package/es/core/BaseLayer.js +20 -13
  15. package/es/core/BaseModel.js +1 -0
  16. package/es/core/triangulation.d.ts +2 -0
  17. package/es/core/triangulation.js +2 -3
  18. package/es/heatmap/index.d.ts +0 -9
  19. package/es/heatmap/index.js +0 -13
  20. package/es/heatmap/models/heatmap.js +1 -3
  21. package/es/image/index.d.ts +0 -9
  22. package/es/image/index.js +0 -13
  23. package/es/image/models/dataImage.d.ts +0 -9
  24. package/es/image/models/dataImage.js +1 -15
  25. package/es/image/models/image.d.ts +0 -9
  26. package/es/image/models/image.js +1 -15
  27. package/es/image/models/tileDataImage.d.ts +0 -9
  28. package/es/image/models/tileDataImage.js +1 -15
  29. package/es/index.d.ts +1 -1
  30. package/es/index.js +1 -1
  31. package/es/line/index.d.ts +0 -9
  32. package/es/line/index.js +0 -13
  33. package/es/line/models/great_circle.js +3 -3
  34. package/es/mask/index.d.ts +0 -9
  35. package/es/mask/index.js +0 -13
  36. package/es/plugins/DataMappingPlugin.js +2 -2
  37. package/es/plugins/DataSourcePlugin.js +1 -1
  38. package/es/plugins/FeatureScalePlugin.js +5 -3
  39. package/es/plugins/LayerModelPlugin.js +1 -1
  40. package/es/plugins/LightingPlugin.js +1 -1
  41. package/es/plugins/RegisterStyleAttributePlugin.js +8 -13
  42. package/es/plugins/UpdateStyleAttributePlugin.js +1 -1
  43. package/es/point/index.d.ts +0 -9
  44. package/es/point/index.js +0 -13
  45. package/es/point/models/earthFill.js +2 -2
  46. package/es/point/models/image.js +1 -1
  47. package/es/polygon/index.d.ts +0 -9
  48. package/es/polygon/index.js +0 -13
  49. package/es/polygon/models/ocean.js +1 -2
  50. package/es/polygon/models/water.js +1 -2
  51. package/es/raster/index.d.ts +0 -9
  52. package/es/raster/index.js +0 -13
  53. package/es/raster/models/raster.js +1 -2
  54. package/es/raster/models/rasterRgb.js +1 -2
  55. package/es/raster/models/rasterTile.js +1 -2
  56. package/es/raster/raster.d.ts +0 -9
  57. package/es/raster/raster.js +0 -13
  58. package/es/tile/interaction/TilePickService.d.ts +16 -0
  59. package/es/tile/{manager/tilePickerManager.js → interaction/TilePickService.js} +19 -84
  60. package/es/tile/interaction/getFeatureData.d.ts +0 -0
  61. package/es/tile/interaction/getFeatureData.js +0 -0
  62. package/es/tile/interaction/getRasterData.d.ts +4 -0
  63. package/es/tile/interaction/getRasterData.js +70 -0
  64. package/es/tile/interaction/utils.d.ts +11 -0
  65. package/es/tile/interaction/utils.js +97 -0
  66. package/es/tile/interface.d.ts +1 -2
  67. package/es/tile/manager/{baseTileManager.d.ts → base.d.ts} +8 -5
  68. package/es/tile/manager/{baseTileManager.js → base.js} +53 -14
  69. package/es/tile/manager/layerManager.d.ts +19 -0
  70. package/es/tile/manager/{tileLayerManager.js → layerManager.js} +75 -76
  71. package/es/tile/manager/{baseMapTileLayerManager.d.ts → mapLayerManager.d.ts} +2 -2
  72. package/es/tile/manager/{baseMapTileLayerManager.js → mapLayerManager.js} +4 -4
  73. package/es/tile/models/tileModel.js +4 -4
  74. package/es/tile/render/TileRenderService.d.ts +10 -0
  75. package/es/tile/render/TileRenderService.js +68 -0
  76. package/es/tile/{manager/tileConfigManager.d.ts → style/TileStyleService.d.ts} +2 -2
  77. package/es/tile/{manager/tileConfigManager.js → style/TileStyleService.js} +8 -11
  78. package/es/tile/style/constants.d.ts +13 -0
  79. package/es/tile/style/constants.js +17 -0
  80. package/es/tile/style/utils.d.ts +9 -0
  81. package/es/tile/style/utils.js +139 -0
  82. package/es/tile/tileFactory/base.d.ts +8 -7
  83. package/es/tile/tileFactory/base.js +116 -187
  84. package/es/tile/tileFactory/layers/rasterDataLayer.d.ts +11 -0
  85. package/es/tile/tileFactory/{rasterDataLayer.js → layers/rasterDataLayer.js} +3 -16
  86. package/es/tile/{tileTest.d.ts → tileFactory/layers/tileTest.d.ts} +2 -2
  87. package/es/tile/{tileTest.js → tileFactory/layers/tileTest.js} +2 -2
  88. package/es/tile/tileFactory/{vectorLayer.d.ts → layers/vectorLayer.d.ts} +9 -17
  89. package/es/tile/tileFactory/{vectorLayer.js → layers/vectorLayer.js} +9 -20
  90. package/es/tile/tileFactory/line.js +0 -3
  91. package/es/tile/tileFactory/mask.js +0 -3
  92. package/es/tile/tileFactory/point.js +0 -3
  93. package/es/tile/tileFactory/polygon.js +0 -3
  94. package/es/tile/tileFactory/raster.js +0 -3
  95. package/es/tile/tileFactory/rasterData.js +2 -7
  96. package/es/tile/tileFactory/test.js +1 -12
  97. package/es/tile/tileLayer/MapTileLayer.d.ts +6 -0
  98. package/es/tile/tileLayer/MapTileLayer.js +48 -0
  99. package/es/tile/tileLayer/TileLayer.d.ts +22 -0
  100. package/es/tile/tileLayer/TileLayer.js +198 -0
  101. package/es/tile/tileLayer/{baseMapTileLayer.d.ts → base.d.ts} +19 -16
  102. package/es/tile/tileLayer/{baseMapTileLayer.js → base.js} +118 -101
  103. package/es/tile/utils.d.ts +7 -4
  104. package/es/tile/utils.js +14 -74
  105. package/es/utils/dataMappingStyle.js +0 -3
  106. package/es/utils/extrude_polyline.d.ts +1 -0
  107. package/es/utils/extrude_polyline.js +5 -3
  108. package/es/utils/multiPassRender.js +0 -1
  109. package/es/wind/index.d.ts +0 -9
  110. package/es/wind/index.js +0 -13
  111. package/es/wind/models/wind.d.ts +0 -9
  112. package/es/wind/models/wind.js +1 -15
  113. package/lib/Geometry/index.js +0 -13
  114. package/lib/Geometry/models/billboard.js +0 -13
  115. package/lib/Geometry/models/plane.js +0 -13
  116. package/lib/Geometry/models/sprite.js +0 -13
  117. package/lib/canvas/index.js +0 -13
  118. package/lib/citybuliding/building.js +0 -13
  119. package/lib/core/BaseLayer.js +20 -13
  120. package/lib/core/BaseModel.js +1 -0
  121. package/lib/core/triangulation.js +2 -1
  122. package/lib/heatmap/index.js +0 -13
  123. package/lib/heatmap/models/heatmap.js +1 -3
  124. package/lib/image/index.js +0 -13
  125. package/lib/image/models/dataImage.js +1 -15
  126. package/lib/image/models/image.js +1 -15
  127. package/lib/image/models/tileDataImage.js +1 -15
  128. package/lib/index.js +1 -1
  129. package/lib/line/index.js +0 -13
  130. package/lib/line/models/great_circle.js +3 -3
  131. package/lib/mask/index.js +0 -13
  132. package/lib/plugins/DataMappingPlugin.js +2 -2
  133. package/lib/plugins/DataSourcePlugin.js +1 -1
  134. package/lib/plugins/FeatureScalePlugin.js +5 -3
  135. package/lib/plugins/LayerModelPlugin.js +1 -1
  136. package/lib/plugins/LightingPlugin.js +1 -1
  137. package/lib/plugins/RegisterStyleAttributePlugin.js +9 -13
  138. package/lib/plugins/UpdateStyleAttributePlugin.js +1 -1
  139. package/lib/point/index.js +0 -13
  140. package/lib/point/models/earthFill.js +2 -2
  141. package/lib/point/models/image.js +1 -1
  142. package/lib/polygon/index.js +0 -13
  143. package/lib/polygon/models/ocean.js +1 -2
  144. package/lib/polygon/models/water.js +1 -2
  145. package/lib/raster/index.js +0 -13
  146. package/lib/raster/models/raster.js +1 -2
  147. package/lib/raster/models/rasterRgb.js +1 -2
  148. package/lib/raster/models/rasterTile.js +1 -2
  149. package/lib/raster/raster.js +0 -13
  150. package/lib/tile/{manager/tilePickerManager.js → interaction/TilePickService.js} +20 -82
  151. package/lib/tile/interaction/getFeatureData.js +1 -0
  152. package/lib/tile/interaction/getRasterData.js +83 -0
  153. package/lib/tile/interaction/utils.js +120 -0
  154. package/lib/tile/manager/{baseTileManager.js → base.js} +56 -16
  155. package/lib/tile/manager/{tileLayerManager.js → layerManager.js} +77 -75
  156. package/lib/tile/manager/{baseMapTileLayerManager.js → mapLayerManager.js} +4 -4
  157. package/lib/tile/models/tileModel.js +4 -4
  158. package/lib/tile/render/TileRenderService.js +78 -0
  159. package/lib/tile/{manager/tileConfigManager.js → style/TileStyleService.js} +9 -9
  160. package/lib/tile/style/constants.js +26 -0
  161. package/lib/tile/style/utils.js +163 -0
  162. package/lib/tile/tileFactory/base.js +117 -187
  163. package/lib/tile/tileFactory/{rasterDataLayer.js → layers/rasterDataLayer.js} +3 -16
  164. package/lib/tile/{tileTest.js → tileFactory/layers/tileTest.js} +2 -2
  165. package/lib/tile/tileFactory/{vectorLayer.js → layers/vectorLayer.js} +8 -20
  166. package/lib/tile/tileFactory/line.js +0 -3
  167. package/lib/tile/tileFactory/mask.js +0 -3
  168. package/lib/tile/tileFactory/point.js +0 -3
  169. package/lib/tile/tileFactory/polygon.js +0 -3
  170. package/lib/tile/tileFactory/raster.js +0 -3
  171. package/lib/tile/tileFactory/rasterData.js +2 -8
  172. package/lib/tile/tileFactory/test.js +1 -13
  173. package/lib/tile/tileLayer/MapTileLayer.js +63 -0
  174. package/lib/tile/tileLayer/TileLayer.js +215 -0
  175. package/lib/tile/tileLayer/{baseMapTileLayer.js → base.js} +119 -96
  176. package/lib/tile/utils.js +19 -86
  177. package/lib/utils/dataMappingStyle.js +0 -3
  178. package/lib/utils/extrude_polyline.js +5 -2
  179. package/lib/utils/multiPassRender.js +0 -1
  180. package/lib/wind/index.js +0 -13
  181. package/lib/wind/models/wind.js +1 -15
  182. package/package.json +6 -6
  183. package/es/tile/manager/tileLayerManager.d.ts +0 -15
  184. package/es/tile/manager/tilePickerManager.d.ts +0 -21
  185. package/es/tile/tileFactory/rasterDataLayer.d.ts +0 -20
  186. package/es/tile/tileLayer/baseTileLayer.d.ts +0 -48
  187. package/es/tile/tileLayer/baseTileLayer.js +0 -420
  188. package/es/tile/tmsMapTileLayer.d.ts +0 -7
  189. package/es/tile/tmsMapTileLayer.js +0 -97
  190. package/es/tile/tmsTileLayer.d.ts +0 -7
  191. package/es/tile/tmsTileLayer.js +0 -101
  192. package/lib/tile/tileLayer/baseTileLayer.js +0 -429
  193. package/lib/tile/tmsMapTileLayer.js +0 -114
  194. package/lib/tile/tmsTileLayer.js +0 -118
@@ -4,9 +4,10 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
4
4
  import _createClass from "@babel/runtime/helpers/createClass";
5
5
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
6
6
  import Source from '@antv/l7-source';
7
- import { osmLonLat2TileXY } from '@antv/l7-utils';
8
- import { getLayerShape, readRasterValue, registerLayers } from "../utils";
9
- import VectorLayer from "./vectorLayer";
7
+ import { setStyleAttributeField, setScale } from "../style/utils";
8
+ import { registerLayers } from "../utils";
9
+ import { readRasterValue } from "../interaction/getRasterData";
10
+ import VectorLayer from "./layers/vectorLayer";
10
11
  import * as turf from '@turf/helpers';
11
12
  import union from '@turf/union';
12
13
  import clone from '@turf/clone';
@@ -151,13 +152,13 @@ var TileFactory = /*#__PURE__*/function () {
151
152
 
152
153
  layer.source(source); // set scale attribute field
153
154
 
154
- this.setStyleAttributeField(layer, 'shape', shape);
155
+ setStyleAttributeField(layer, this.parentLayer, 'shape', shape);
155
156
 
156
157
  if (usage !== 'basemap') {
157
158
  // set scale
158
- this.setScale(layer);
159
- this.setStyleAttributeField(layer, 'color', color);
160
- this.setStyleAttributeField(layer, 'size', size);
159
+ setScale(layer, this.parentLayer);
160
+ setStyleAttributeField(layer, this.parentLayer, 'color', color);
161
+ setStyleAttributeField(layer, this.parentLayer, 'size', size);
161
162
  } else {
162
163
  layer.style({
163
164
  color: basemapColor,
@@ -166,8 +167,6 @@ var TileFactory = /*#__PURE__*/function () {
166
167
  } // set mask
167
168
 
168
169
 
169
- var layers = [layer];
170
-
171
170
  if (mask && layer.isVector) {
172
171
  var masklayer = new VectorLayer({
173
172
  layerType: "MaskLayer"
@@ -180,12 +179,10 @@ var TileFactory = /*#__PURE__*/function () {
180
179
  cancelExtent: true
181
180
  }
182
181
  });
183
- layers.push(masklayer);
182
+ registerLayers(this.parentLayer, [masklayer]);
184
183
  layer.addMaskLayer(masklayer);
185
- } // regist layer
186
-
184
+ }
187
185
 
188
- registerLayers(this.parentLayer, layers);
189
186
  this.layers = [layer];
190
187
  return layer;
191
188
  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -196,172 +193,121 @@ var TileFactory = /*#__PURE__*/function () {
196
193
  return '';
197
194
  }
198
195
  }, {
199
- key: "getDefaultStyleAttributeField",
200
- value: function getDefaultStyleAttributeField(layer, type) {
201
- switch (type) {
202
- case 'size':
203
- return 1;
196
+ key: "getTile",
197
+ value: function getTile(lng, lat) {
198
+ var zoom = this.mapService.getZoom();
199
+ return this.tilesetManager.getTileByLngLat(lng, lat, zoom);
200
+ }
201
+ }, {
202
+ key: "bindVectorEvent",
203
+ value: function bindVectorEvent(layer) {
204
+ var _this = this;
204
205
 
205
- case 'color':
206
- return '#fff';
206
+ layer.on('click', function (e) {
207
+ _this.eventCache.click = 1;
207
208
 
208
- case 'shape':
209
- return getLayerShape(this.parentLayer.type, layer);
209
+ _this.getFeatureAndEmitEvent('subLayerClick', e);
210
+ });
211
+ layer.on('mousemove', function (e) {
212
+ _this.eventCache.mousemove = 1;
210
213
 
211
- default:
212
- return '';
213
- }
214
+ _this.getFeatureAndEmitEvent('subLayerMouseMove', e);
215
+ });
216
+ layer.on('mouseenter', function (e) {
217
+ _this.getFeatureAndEmitEvent('subLayerMouseEnter', e);
218
+ });
214
219
  }
215
220
  }, {
216
- key: "setStyleAttributeField",
217
- value: function setStyleAttributeField(layer, type, value) {
218
- if (Array.isArray(value)) {
219
- // @ts-ignore
220
- layer[type].apply(layer, _toConsumableArray(value));
221
- return;
222
- }
223
-
224
- if (typeof value === 'string') {
225
- layer[type](value);
226
- return;
227
- }
228
-
229
- var defaultValue = this.getDefaultStyleAttributeField(layer, type);
221
+ key: "readRasterTile",
222
+ value: function readRasterTile(e, name) {
223
+ var _e$lngLat = e.lngLat,
224
+ lng = _e$lngLat.lng,
225
+ lat = _e$lngLat.lat;
226
+ var tile = this.getTile(lng, lat);
227
+ if (!tile) return;
228
+ var data = readRasterValue(tile, this.mapService, e.x, e.y);
229
+ e.value = data;
230
+ this.parentLayer.emit(name, e);
231
+ }
232
+ }, {
233
+ key: "bindRasterEvent",
234
+ value: function bindRasterEvent(layer) {
235
+ var _this2 = this;
230
236
 
231
- if (!value) {
232
- layer[type](defaultValue);
233
- return layer;
234
- }
237
+ layer.on('click', function (e) {
238
+ _this2.eventCache.click = 1;
235
239
 
236
- var params = this.parseScaleValue(value, type);
240
+ _this2.readRasterTile(e, 'subLayerClick');
241
+ });
242
+ layer.on('mousemove', function (e) {
243
+ _this2.eventCache.mousemove = 1;
237
244
 
238
- if (params.length === 0) {
239
- layer[type](defaultValue);
240
- } else {
241
- // @ts-ignore
242
- layer[type].apply(layer, _toConsumableArray(params));
243
- }
245
+ _this2.readRasterTile(e, 'subLayerMouseMove');
246
+ });
247
+ layer.on('mouseenter', function (e) {
248
+ _this2.readRasterTile(e, 'subLayerMouseMove');
249
+ });
244
250
  }
245
251
  }, {
246
- key: "parseScaleValue",
247
- value: function parseScaleValue(value, type) {
248
- if (type === 'shape') {
249
- if (typeof value === 'string') {
250
- return [value];
251
- } else if (value !== null && value !== void 0 && value.field) {
252
- return [value === null || value === void 0 ? void 0 : value.field];
253
- } else {
254
- return [];
255
- }
256
- }
252
+ key: "bindCommonEvent",
253
+ value: function bindCommonEvent(layer) {
254
+ var _this3 = this;
257
255
 
258
- var _ref = value,
259
- field = _ref.field,
260
- values = _ref.values,
261
- callback = _ref.callback;
262
-
263
- if (field && values && Array.isArray(values)) {
264
- return [field, values];
265
- } else if (field && callback) {
266
- return [field, callback];
267
- } else if (field) {
268
- return [field];
269
- }
256
+ layer.on('mouseup', function (e) {
257
+ _this3.eventCache.mouseup = 1;
270
258
 
271
- return [];
272
- }
273
- }, {
274
- key: "getTile",
275
- value: function getTile(lng, lat) {
276
- var zoom = this.mapService.getZoom();
277
- var z = Math.ceil(zoom) + this.zoomOffset;
278
- var xy = osmLonLat2TileXY(lng, lat, z);
279
- var tiles = this.tilesetManager.tiles.filter(function (t) {
280
- return t.key === "".concat(xy[0], ",").concat(xy[1], ",").concat(z);
259
+ _this3.getFeatureAndEmitEvent('subLayerMouseUp', e);
260
+ });
261
+ layer.on('mouseout', function (e) {
262
+ _this3.getFeatureAndEmitEvent('subLayerMouseOut', e);
263
+ });
264
+ layer.on('mousedown', function (e) {
265
+ _this3.eventCache.mousedown = 1;
266
+
267
+ _this3.getFeatureAndEmitEvent('subLayerMouseDown', e);
268
+ });
269
+ layer.on('contextmenu', function (e) {
270
+ _this3.eventCache.contextmenu = 1;
271
+
272
+ _this3.getFeatureAndEmitEvent('subLayerContextmenu', e);
273
+ }); // out side
274
+
275
+ layer.on('unclick', function (e) {
276
+ return _this3.handleOutsideEvent('click', 'subLayerUnClick', layer, e);
277
+ });
278
+ layer.on('unmouseup', function (e) {
279
+ return _this3.handleOutsideEvent('mouseup', 'subLayerUnMouseUp', layer, e);
280
+ });
281
+ layer.on('unmousedown', function (e) {
282
+ return _this3.handleOutsideEvent('mousedown', 'subLayerUnMouseDown', layer, e);
283
+ });
284
+ layer.on('uncontextmenu', function (e) {
285
+ return _this3.handleOutsideEvent('contextmenu', 'subLayerUnContextmenu', layer, e);
281
286
  });
282
- return tiles[0];
283
287
  }
284
288
  }, {
285
289
  key: "emitEvent",
286
- value: function emitEvent(layers, isVector) {
287
- var _this = this;
290
+ value: function emitEvent(layers) {
291
+ var _this4 = this;
288
292
 
289
293
  layers.map(function (layer) {
290
294
  layer.once('modelLoaded', function () {
291
- layer.on('click', function (e) {
292
- _this.eventCache.click = 1;
293
-
294
- if (_this.parentLayer.type === 'RasterLayer') {
295
- var _e$lngLat = e.lngLat,
296
- lng = _e$lngLat.lng,
297
- lat = _e$lngLat.lat;
298
-
299
- var tile = _this.getTile(lng, lat);
300
-
301
- tile && _this.getFeatureAndEmitEvent(layer, 'subLayerClick', e, isVector, tile);
302
- } else {
303
- _this.getFeatureAndEmitEvent(layer, 'subLayerClick', e);
304
- }
305
- });
306
- layer.on('mousemove', function (e) {
307
- _this.eventCache.mousemove = 1;
308
-
309
- if (_this.parentLayer.type === 'RasterLayer') {
310
- var _e$lngLat2 = e.lngLat,
311
- lng = _e$lngLat2.lng,
312
- lat = _e$lngLat2.lat;
295
+ _this4.bindVectorEvent(layer);
313
296
 
314
- var tile = _this.getTile(lng, lat);
315
-
316
- tile && _this.getFeatureAndEmitEvent(layer, 'subLayerMouseMove', e, isVector, tile);
317
- } else {
318
- _this.getFeatureAndEmitEvent(layer, 'subLayerMouseMove', e);
319
- }
320
- });
321
- layer.on('mouseup', function (e) {
322
- _this.eventCache.mouseup = 1;
323
-
324
- _this.getFeatureAndEmitEvent(layer, 'subLayerMouseUp', e);
325
- });
326
- layer.on('mouseenter', function (e) {
327
- if (_this.parentLayer.type === 'RasterLayer') {
328
- var _e$lngLat3 = e.lngLat,
329
- lng = _e$lngLat3.lng,
330
- lat = _e$lngLat3.lat;
331
-
332
- var tile = _this.getTile(lng, lat);
333
-
334
- tile && _this.getFeatureAndEmitEvent(layer, 'subLayerMouseMove', e, isVector, tile);
335
- } else {
336
- _this.getFeatureAndEmitEvent(layer, 'subLayerMouseEnter', e);
337
- }
338
- });
339
- layer.on('mouseout', function (e) {
340
- _this.getFeatureAndEmitEvent(layer, 'subLayerMouseOut', e);
341
- });
342
- layer.on('mousedown', function (e) {
343
- _this.eventCache.mousedown = 1;
344
-
345
- _this.getFeatureAndEmitEvent(layer, 'subLayerMouseDown', e);
346
- });
347
- layer.on('contextmenu', function (e) {
348
- _this.eventCache.contextmenu = 1;
297
+ _this4.bindCommonEvent(layer);
298
+ });
299
+ });
300
+ }
301
+ }, {
302
+ key: "emitRasterEvent",
303
+ value: function emitRasterEvent(layers) {
304
+ var _this5 = this;
349
305
 
350
- _this.getFeatureAndEmitEvent(layer, 'subLayerContextmenu', e);
351
- }); // out side
306
+ layers.map(function (layer) {
307
+ layer.once('modelLoaded', function () {
308
+ _this5.bindRasterEvent(layer);
352
309
 
353
- layer.on('unclick', function (e) {
354
- return _this.handleOutsideEvent('click', 'subLayerUnClick', layer, e);
355
- });
356
- layer.on('unmouseup', function (e) {
357
- return _this.handleOutsideEvent('mouseup', 'subLayerUnMouseUp', layer, e);
358
- });
359
- layer.on('unmousedown', function (e) {
360
- return _this.handleOutsideEvent('mousedown', 'subLayerUnMouseDown', layer, e);
361
- });
362
- layer.on('uncontextmenu', function (e) {
363
- return _this.handleOutsideEvent('contextmenu', 'subLayerUnContextmenu', layer, e);
364
- });
310
+ _this5.bindCommonEvent(layer);
365
311
  });
366
312
  });
367
313
  }
@@ -390,36 +336,19 @@ var TileFactory = /*#__PURE__*/function () {
390
336
  }
391
337
  }, {
392
338
  key: "getFeatureAndEmitEvent",
393
- value: function getFeatureAndEmitEvent(layer, eventName, e, isVector, tile) {
394
- if (isVector === false) {
395
- // raster tile get rgb
396
- // e.pickedColors = readPixel(e.x, e.y, this.rendererService);
397
- // raster tile origin value
398
- e.value = readRasterValue(tile, this.mapService, e.x, e.y);
399
- } else {
400
- // VectorLayer
401
- var featureId = e.featureId;
402
- var features = this.getAllFeatures(featureId);
403
-
404
- try {
405
- e.feature = this.getCombineFeature(features);
406
- } catch (err) {
407
- console.warn('Combine Featuer Err! Return First Feature!');
408
- e.feature = features[0];
409
- }
339
+ value: function getFeatureAndEmitEvent(eventName, e) {
340
+ var featureId = e.featureId;
341
+ var features = this.getAllFeatures(featureId);
342
+
343
+ try {
344
+ e.feature = this.getCombineFeature(features);
345
+ } catch (err) {
346
+ console.warn('Combine Featuer Err! Return First Feature!');
347
+ e.feature = features[0];
410
348
  }
411
349
 
412
350
  this.parentLayer.emit(eventName, e);
413
351
  }
414
- }, {
415
- key: "setScale",
416
- value: function setScale(layer) {
417
- var scaleOptions = this.parentLayer.tileLayer.scaleField;
418
- var scaleKeys = Object.keys(scaleOptions);
419
- scaleKeys.map(function (key) {
420
- layer.scale(key, scaleOptions[key]);
421
- });
422
- }
423
352
  }, {
424
353
  key: "getAllFeatures",
425
354
  value: function getAllFeatures(featureId) {
@@ -451,7 +380,7 @@ var TileFactory = /*#__PURE__*/function () {
451
380
  }, {
452
381
  key: "handleOutsideEvent",
453
382
  value: function handleOutsideEvent(type, emitType, layer, e) {
454
- var _this2 = this;
383
+ var _this6 = this;
455
384
 
456
385
  if (this.outSideEventTimer) {
457
386
  clearTimeout(this.outSideEventTimer);
@@ -459,10 +388,10 @@ var TileFactory = /*#__PURE__*/function () {
459
388
  }
460
389
 
461
390
  this.outSideEventTimer = setTimeout(function () {
462
- if (_this2.eventCache[type] > 0) {
463
- _this2.eventCache[type] = 0;
391
+ if (_this6.eventCache[type] > 0) {
392
+ _this6.eventCache[type] = 0;
464
393
  } else {
465
- _this2.getFeatureAndEmitEvent(layer, emitType, e);
394
+ _this6.getFeatureAndEmitEvent(emitType, e);
466
395
  }
467
396
  }, 64);
468
397
  }
@@ -0,0 +1,11 @@
1
+ import BaseLayer from '../../../core/BaseLayer';
2
+ import { IRasterLayerStyleOptions } from '../../../core/interface';
3
+ import RasterModel from '../../../raster/models/rasterTile';
4
+ import RasterRgbModel from '../../../raster/models/rasterRgb';
5
+ export default class RasterTiffLayer extends BaseLayer<Partial<IRasterLayerStyleOptions>> {
6
+ type: string;
7
+ buildModels(): void;
8
+ rebuildModels(): void;
9
+ protected getModelType(): typeof RasterModel | typeof RasterRgbModel;
10
+ protected getDefaultConfig(): {};
11
+ }
@@ -10,9 +10,9 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
10
10
 
11
11
  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; } }
12
12
 
13
- import BaseLayer from "../../core/BaseLayer";
14
- import RasterModel from "../../raster/models/rasterTile";
15
- import RasterRgbModel from "../../raster/models/rasterRgb";
13
+ import BaseLayer from "../../../core/BaseLayer";
14
+ import RasterModel from "../../../raster/models/rasterTile";
15
+ import RasterRgbModel from "../../../raster/models/rasterRgb";
16
16
 
17
17
  var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
18
18
  _inherits(RasterTiffLayer, _BaseLayer);
@@ -64,19 +64,6 @@ var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
64
64
  return RasterModel;
65
65
  }
66
66
  }
67
- }, {
68
- key: "getConfigSchema",
69
- value: function getConfigSchema() {
70
- return {
71
- properties: {
72
- opacity: {
73
- type: 'number',
74
- minimum: 0,
75
- maximum: 1
76
- }
77
- }
78
- };
79
- }
80
67
  }, {
81
68
  key: "getDefaultConfig",
82
69
  value: function getDefaultConfig() {
@@ -1,5 +1,5 @@
1
- import BaseLayer from '../core/BaseLayer';
2
- import { IBaseLayerStyleOptions } from '../core/interface';
1
+ import BaseLayer from '../../../core/BaseLayer';
2
+ import { IBaseLayerStyleOptions } from '../../../core/interface';
3
3
  export default class TileDebugLayer extends BaseLayer<IBaseLayerStyleOptions> {
4
4
  type: string;
5
5
  defaultSourceConfig: {
@@ -10,8 +10,8 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
10
10
 
11
11
  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; } }
12
12
 
13
- import BaseLayer from "../core/BaseLayer";
14
- import TileModel from "./models/tileModel";
13
+ import BaseLayer from "../../../core/BaseLayer";
14
+ import TileModel from "../../models/tileModel";
15
15
 
16
16
  var TileDebugLayer = /*#__PURE__*/function (_BaseLayer) {
17
17
  _inherits(TileDebugLayer, _BaseLayer);
@@ -1,17 +1,18 @@
1
- import BaseLayer from '../../core/BaseLayer';
2
- import { ILineLayerStyleOptions, IPointLayerStyleOptions, IPolygonLayerStyleOptions, IMaskLayerStyleOptions } from '../../core/interface';
3
- import lineFillModel from '../../line/models/tile';
4
- import lineSimpleModel from '../../line/models/simpleTileLine';
5
- import pointTextModel from '../../point/models/tileText';
6
- import pointFillModel from '../../point/models/tile';
7
- import polygonFillModel from '../../polygon/models/tile';
8
- import maskModel from '../../mask/models/fill';
1
+ import BaseLayer from '../../../core/BaseLayer';
2
+ import { ILineLayerStyleOptions, IPointLayerStyleOptions, IPolygonLayerStyleOptions, IMaskLayerStyleOptions } from '../../../core/interface';
3
+ import lineFillModel from '../../../line/models/tile';
4
+ import lineSimpleModel from '../../../line/models/simpleTileLine';
5
+ import pointTextModel from '../../../point/models/tileText';
6
+ import pointFillModel from '../../../point/models/tile';
7
+ import polygonFillModel from '../../../polygon/models/tile';
8
+ import maskModel from '../../../mask/models/fill';
9
9
  declare type ILayerStyleOptions = IPolygonLayerStyleOptions & ILineLayerStyleOptions & IPointLayerStyleOptions & IMaskLayerStyleOptions;
10
10
  export default class VectorLayer extends BaseLayer<Partial<ILayerStyleOptions & {
11
11
  needListen: boolean;
12
12
  }>> {
13
13
  needListen: boolean;
14
14
  isVector: boolean;
15
+ isTileLayer: boolean;
15
16
  type: string;
16
17
  private pickedID;
17
18
  init(): this;
@@ -24,15 +25,6 @@ export default class VectorLayer extends BaseLayer<Partial<ILayerStyleOptions &
24
25
  protected getModelType(): typeof lineFillModel | typeof lineSimpleModel | typeof pointTextModel | typeof pointFillModel | typeof polygonFillModel | typeof maskModel;
25
26
  protected getLineModel(): typeof lineFillModel | typeof lineSimpleModel;
26
27
  protected getPointModel(): typeof pointTextModel | typeof pointFillModel;
27
- protected getConfigSchema(): {
28
- properties: {
29
- opacity: {
30
- type: string;
31
- minimum: number;
32
- maximum: number;
33
- };
34
- };
35
- };
36
28
  protected getDefaultConfig(): {};
37
29
  }
38
30
  export {};
@@ -18,13 +18,13 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
18
18
  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; } }
19
19
 
20
20
  import { TYPES } from '@antv/l7-core';
21
- import BaseLayer from "../../core/BaseLayer";
22
- import lineFillModel from "../../line/models/tile";
23
- import lineSimpleModel from "../../line/models/simpleTileLine";
24
- import pointTextModel from "../../point/models/tileText";
25
- import pointFillModel from "../../point/models/tile";
26
- import polygonFillModel from "../../polygon/models/tile";
27
- import maskModel from "../../mask/models/fill";
21
+ import BaseLayer from "../../../core/BaseLayer";
22
+ import lineFillModel from "../../../line/models/tile";
23
+ import lineSimpleModel from "../../../line/models/simpleTileLine";
24
+ import pointTextModel from "../../../point/models/tileText";
25
+ import pointFillModel from "../../../point/models/tile";
26
+ import polygonFillModel from "../../../polygon/models/tile";
27
+ import maskModel from "../../../mask/models/fill";
28
28
 
29
29
  var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
30
30
  _inherits(VectorLayer, _BaseLayer);
@@ -46,6 +46,8 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
46
46
 
47
47
  _defineProperty(_assertThisInitialized(_this), "isVector", true);
48
48
 
49
+ _defineProperty(_assertThisInitialized(_this), "isTileLayer", true);
50
+
49
51
  _defineProperty(_assertThisInitialized(_this), "type", _this.layerType || 'vectorLayer');
50
52
 
51
53
  _defineProperty(_assertThisInitialized(_this), "pickedID", null);
@@ -238,19 +240,6 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
238
240
  return pointFillModel;
239
241
  }
240
242
  }
241
- }, {
242
- key: "getConfigSchema",
243
- value: function getConfigSchema() {
244
- return {
245
- properties: {
246
- opacity: {
247
- type: 'number',
248
- minimum: 0,
249
- maximum: 1
250
- }
251
- }
252
- };
253
- }
254
243
  }, {
255
244
  key: "getDefaultConfig",
256
245
  value: function getDefaultConfig() {
@@ -46,9 +46,6 @@ var VectorLineTile = /*#__PURE__*/function (_TileFactory) {
46
46
  vectorTileLayer: vectorTileLayer,
47
47
  source: source
48
48
  });
49
- layer.once('modelLoaded', function () {
50
- tile.layerLoad();
51
- });
52
49
  return {
53
50
  layers: [layer],
54
51
  layerIDList: [layer.id]
@@ -47,9 +47,6 @@ var VectorMaskTile = /*#__PURE__*/function (_TileFactory) {
47
47
  source: source,
48
48
  needListen: false
49
49
  });
50
- layer.once('modelLoaded', function () {
51
- tile.layerLoad();
52
- });
53
50
  return {
54
51
  layers: [layer],
55
52
  layerIDList: [layer.id]
@@ -47,9 +47,6 @@ var VectorPointTile = /*#__PURE__*/function (_TileFactory) {
47
47
  source: source,
48
48
  needListen: false
49
49
  });
50
- layer.once('modelLoaded', function () {
51
- tile.layerLoad();
52
- });
53
50
  return {
54
51
  layers: [layer],
55
52
  layerIDList: [layer.id]
@@ -46,9 +46,6 @@ var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
46
46
  vectorTileLayer: vectorTileLayer,
47
47
  source: source
48
48
  });
49
- layer.once('modelLoaded', function () {
50
- tile.layerLoad();
51
- });
52
49
  return {
53
50
  layers: [layer],
54
51
  layerIDList: [layer.id]
@@ -42,9 +42,6 @@ var RasterTile = /*#__PURE__*/function (_TileFactory) {
42
42
  initOptions: initOptions,
43
43
  source: source
44
44
  });
45
- layer.once('modelLoaded', function () {
46
- tile.layerLoad();
47
- });
48
45
  return {
49
46
  layers: [layer],
50
47
  layerIDList: [layer.id]
@@ -8,9 +8,8 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
8
8
 
9
9
  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; } }
10
10
 
11
- import { registerLayers } from "../utils";
12
11
  import TileFactory from "./base";
13
- import RasterDataLayer from "./rasterDataLayer";
12
+ import RasterDataLayer from "./layers/rasterDataLayer";
14
13
 
15
14
  var RasterTiffTile = /*#__PURE__*/function (_TileFactory) {
16
15
  _inherits(RasterTiffTile, _TileFactory);
@@ -68,11 +67,7 @@ var RasterTiffTile = /*#__PURE__*/function (_TileFactory) {
68
67
  clampHigh: clampHigh,
69
68
  clampLow: clampLow
70
69
  });
71
- this.emitEvent([layer], false);
72
- registerLayers(this.parentLayer, [layer]);
73
- layer.once('modelLoaded', function () {
74
- tile.layerLoad();
75
- });
70
+ this.emitRasterEvent([layer]);
76
71
  return {
77
72
  layers: [layer],
78
73
  layerIDList: [layer.id]
@@ -9,8 +9,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
9
9
  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; } }
10
10
 
11
11
  import TileFactory from "./base";
12
- import VectorLayer from "./vectorLayer";
13
- import { registerLayers } from "../utils";
12
+ import VectorLayer from "./layers/vectorLayer";
14
13
 
15
14
  var TestTile = /*#__PURE__*/function (_TileFactory) {
16
15
  _inherits(TestTile, _TileFactory);
@@ -81,16 +80,6 @@ var TestTile = /*#__PURE__*/function (_TileFactory) {
81
80
  }
82
81
  }).shape('simple').style({
83
82
  color: '#000'
84
- }); // Tip: sign tile layer
85
-
86
- text.isTileLayer = true;
87
- line.isTileLayer = true;
88
- registerLayers(this.parentLayer, [line, text]);
89
- text.once('modelLoaded', function () {
90
- tile.layerLoad();
91
- });
92
- line.once('modelLoaded', function () {
93
- tile.layerLoad();
94
83
  });
95
84
  return {
96
85
  layers: [line, text],