@antv/l7-layers 2.10.1 → 2.10.2

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 (353) hide show
  1. package/es/Geometry/index.d.ts +2 -3
  2. package/es/Geometry/index.js +27 -17
  3. package/es/Geometry/models/billboard.d.ts +2 -2
  4. package/es/Geometry/models/billboard.js +77 -37
  5. package/es/Geometry/models/plane.d.ts +2 -2
  6. package/es/Geometry/models/plane.js +80 -40
  7. package/es/Geometry/models/sprite.d.ts +2 -2
  8. package/es/Geometry/models/sprite.js +83 -45
  9. package/es/canvas/index.d.ts +3 -4
  10. package/es/canvas/index.js +35 -24
  11. package/es/canvas/models/canvas.d.ts +2 -2
  12. package/es/canvas/models/canvas.js +54 -15
  13. package/es/citybuliding/building.d.ts +2 -3
  14. package/es/citybuliding/building.js +26 -17
  15. package/es/citybuliding/models/build.d.ts +2 -2
  16. package/es/citybuliding/models/build.js +70 -25
  17. package/es/core/BaseLayer.d.ts +21 -18
  18. package/es/core/BaseLayer.js +391 -261
  19. package/es/core/BaseModel.d.ts +2 -2
  20. package/es/core/BaseModel.js +47 -6
  21. package/es/core/LayerPickService.d.ts +9 -0
  22. package/es/core/LayerPickService.js +85 -0
  23. package/es/core/triangulation.js +8 -1
  24. package/es/earth/index.d.ts +3 -3
  25. package/es/earth/index.js +28 -9
  26. package/es/earth/models/atmosphere.d.ts +2 -2
  27. package/es/earth/models/atmosphere.js +67 -22
  28. package/es/earth/models/base.d.ts +2 -2
  29. package/es/earth/models/base.js +89 -43
  30. package/es/earth/models/bloomsphere.d.ts +2 -2
  31. package/es/earth/models/bloomsphere.js +67 -22
  32. package/es/heatmap/index.d.ts +2 -3
  33. package/es/heatmap/index.js +33 -22
  34. package/es/heatmap/models/grid.d.ts +2 -2
  35. package/es/heatmap/models/grid.js +68 -27
  36. package/es/heatmap/models/grid3d.d.ts +2 -2
  37. package/es/heatmap/models/grid3d.js +69 -28
  38. package/es/heatmap/models/heatmap.d.ts +2 -2
  39. package/es/heatmap/models/heatmap.js +40 -14
  40. package/es/heatmap/models/hexagon.d.ts +2 -2
  41. package/es/heatmap/models/hexagon.js +69 -28
  42. package/es/image/index.d.ts +2 -3
  43. package/es/image/index.js +27 -17
  44. package/es/image/models/dataImage.d.ts +2 -2
  45. package/es/image/models/dataImage.js +93 -54
  46. package/es/image/models/image.d.ts +2 -2
  47. package/es/image/models/image.js +108 -67
  48. package/es/image/models/tileDataImage.d.ts +2 -2
  49. package/es/image/models/tileDataImage.js +84 -43
  50. package/es/index.d.ts +2 -2
  51. package/es/index.js +2 -2
  52. package/es/line/index.d.ts +5 -4
  53. package/es/line/index.js +51 -25
  54. package/es/line/models/arc.d.ts +2 -2
  55. package/es/line/models/arc.js +73 -38
  56. package/es/line/models/arc_3d.d.ts +2 -2
  57. package/es/line/models/arc_3d.js +69 -34
  58. package/es/line/models/earthArc_3d.d.ts +2 -2
  59. package/es/line/models/earthArc_3d.js +72 -37
  60. package/es/line/models/great_circle.d.ts +2 -2
  61. package/es/line/models/great_circle.js +70 -29
  62. package/es/line/models/half.d.ts +2 -2
  63. package/es/line/models/half.js +40 -17
  64. package/es/line/models/index.d.ts +1 -1
  65. package/es/line/models/index.js +0 -2
  66. package/es/line/models/line.d.ts +2 -2
  67. package/es/line/models/line.js +79 -47
  68. package/es/line/models/linearline.d.ts +2 -2
  69. package/es/line/models/linearline.js +70 -31
  70. package/es/line/models/simpleLine.d.ts +2 -2
  71. package/es/line/models/simpleLine.js +71 -34
  72. package/es/line/models/simpleTileLine.d.ts +2 -2
  73. package/es/line/models/simpleTileLine.js +70 -30
  74. package/es/line/models/tile.d.ts +2 -2
  75. package/es/line/models/tile.js +40 -17
  76. package/es/line/models/wall.d.ts +2 -2
  77. package/es/line/models/wall.js +67 -22
  78. package/es/mask/index.d.ts +2 -4
  79. package/es/mask/index.js +27 -97
  80. package/es/mask/models/fill.d.ts +2 -2
  81. package/es/mask/models/fill.js +40 -16
  82. package/es/mask/models/index.d.ts +1 -1
  83. package/es/mask/models/index.js +1 -3
  84. package/es/plugins/DataMappingPlugin.js +80 -66
  85. package/es/plugins/DataSourcePlugin.js +64 -25
  86. package/es/plugins/FeatureScalePlugin.js +84 -44
  87. package/es/plugins/LayerAnimateStylePlugin.js +6 -3
  88. package/es/plugins/LayerModelPlugin.d.ts +2 -2
  89. package/es/plugins/LayerModelPlugin.js +124 -37
  90. package/es/plugins/LayerStylePlugin.js +1 -6
  91. package/es/plugins/MultiPassRendererPlugin.js +1 -1
  92. package/es/plugins/PixelPickingPlugin.js +1 -1
  93. package/es/plugins/RegisterStyleAttributePlugin.js +4 -17
  94. package/es/plugins/ShaderUniformPlugin.js +7 -2
  95. package/es/plugins/UpdateStyleAttributePlugin.js +8 -5
  96. package/es/point/index.d.ts +4 -4
  97. package/es/point/index.js +55 -23
  98. package/es/point/models/earthExtrude.d.ts +2 -2
  99. package/es/point/models/earthExtrude.js +73 -30
  100. package/es/point/models/earthFill.d.ts +2 -2
  101. package/es/point/models/earthFill.js +66 -21
  102. package/es/point/models/extrude.d.ts +2 -2
  103. package/es/point/models/extrude.js +40 -17
  104. package/es/point/models/fill.d.ts +2 -2
  105. package/es/point/models/fill.js +43 -20
  106. package/es/point/models/fillmage.d.ts +2 -2
  107. package/es/point/models/fillmage.js +82 -43
  108. package/es/point/models/image.d.ts +2 -2
  109. package/es/point/models/image.js +72 -31
  110. package/es/point/models/index.d.ts +1 -1
  111. package/es/point/models/index.js +0 -2
  112. package/es/point/models/normal.d.ts +2 -2
  113. package/es/point/models/normal.js +71 -30
  114. package/es/point/models/radar.d.ts +2 -2
  115. package/es/point/models/radar.js +75 -35
  116. package/es/point/models/simplePoint.d.ts +2 -2
  117. package/es/point/models/simplePoint.js +70 -29
  118. package/es/point/models/text.d.ts +3 -2
  119. package/es/point/models/text.js +164 -107
  120. package/es/point/models/tile.d.ts +2 -2
  121. package/es/point/models/tile.js +77 -35
  122. package/es/point/models/tileText.d.ts +2 -2
  123. package/es/point/models/tileText.js +151 -116
  124. package/es/polygon/index.d.ts +2 -3
  125. package/es/polygon/index.js +27 -24
  126. package/es/polygon/models/extrude.d.ts +2 -2
  127. package/es/polygon/models/extrude.js +66 -29
  128. package/es/polygon/models/fill.d.ts +2 -2
  129. package/es/polygon/models/fill.js +76 -43
  130. package/es/polygon/models/index.d.ts +1 -1
  131. package/es/polygon/models/index.js +0 -2
  132. package/es/polygon/models/ocean.d.ts +2 -2
  133. package/es/polygon/models/ocean.js +69 -28
  134. package/es/polygon/models/tile.d.ts +2 -2
  135. package/es/polygon/models/tile.js +70 -30
  136. package/es/polygon/models/water.d.ts +2 -2
  137. package/es/polygon/models/water.js +69 -28
  138. package/es/raster/index.d.ts +3 -4
  139. package/es/raster/index.js +28 -22
  140. package/es/raster/models/index.d.ts +1 -1
  141. package/es/raster/models/index.js +1 -3
  142. package/es/raster/models/raster.d.ts +2 -2
  143. package/es/raster/models/raster.js +36 -13
  144. package/es/raster/models/rasterRgb.d.ts +2 -2
  145. package/es/raster/models/rasterRgb.js +36 -13
  146. package/es/raster/models/rasterTile.d.ts +2 -2
  147. package/es/raster/models/rasterTile.js +77 -36
  148. package/es/raster/raster.d.ts +1 -1
  149. package/es/raster/raster.js +42 -22
  150. package/es/tile/interaction/getRasterData.d.ts +2 -2
  151. package/es/tile/interaction/utils.js +3 -11
  152. package/es/tile/interface.d.ts +5 -4
  153. package/es/tile/manager/base.d.ts +17 -12
  154. package/es/tile/manager/base.js +212 -47
  155. package/es/tile/service/TileLayerService.d.ts +33 -0
  156. package/es/tile/service/TileLayerService.js +172 -0
  157. package/es/tile/service/TilePickService.d.ts +22 -0
  158. package/es/tile/service/TilePickService.js +124 -0
  159. package/es/tile/style/constants.d.ts +1 -13
  160. package/es/tile/style/constants.js +6 -15
  161. package/es/tile/style/utils.d.ts +1 -8
  162. package/es/tile/style/utils.js +0 -126
  163. package/es/tile/tileFactory/DebugTile.d.ts +16 -0
  164. package/es/tile/tileFactory/DebugTile.js +100 -0
  165. package/es/tile/tileFactory/ImageTile.d.ts +14 -0
  166. package/es/tile/tileFactory/ImageTile.js +89 -0
  167. package/es/tile/tileFactory/MaskTile.d.ts +17 -0
  168. package/es/tile/tileFactory/MaskTile.js +98 -0
  169. package/es/tile/tileFactory/RasterRGBTile.d.ts +16 -0
  170. package/es/tile/tileFactory/RasterRGBTile.js +91 -0
  171. package/es/tile/tileFactory/RasterTile.d.ts +27 -0
  172. package/es/tile/tileFactory/RasterTile.js +186 -0
  173. package/es/tile/tileFactory/Tile.d.ts +23 -0
  174. package/es/tile/tileFactory/Tile.js +136 -0
  175. package/es/tile/tileFactory/VectorTile.d.ts +20 -0
  176. package/es/tile/tileFactory/VectorTile.js +158 -0
  177. package/es/tile/tileFactory/index.d.ts +10 -4
  178. package/es/tile/tileFactory/index.js +30 -23
  179. package/es/tile/tileFactory/layers/{rasterDataLayer.d.ts → RasterDataLayer.d.ts} +3 -3
  180. package/es/tile/tileFactory/layers/{rasterDataLayer.js → RasterDataLayer.js} +33 -21
  181. package/es/tile/tileFactory/layers/{tileTest.d.ts → TileDebugLayer.d.ts} +2 -2
  182. package/es/tile/tileFactory/layers/{tileTest.js → TileDebugLayer.js} +23 -10
  183. package/es/tile/tileFactory/util.d.ts +6 -0
  184. package/es/tile/tileFactory/util.js +33 -0
  185. package/es/tile/tileLayer/BaseLayer.d.ts +46 -0
  186. package/es/tile/tileLayer/BaseLayer.js +358 -0
  187. package/es/tile/utils.d.ts +1 -11
  188. package/es/tile/utils.js +0 -127
  189. package/es/utils/dataMappingStyle.d.ts +4 -4
  190. package/es/utils/dataMappingStyle.js +19 -19
  191. package/es/utils/layerData.js +5 -11
  192. package/es/wind/index.d.ts +2 -3
  193. package/es/wind/index.js +27 -17
  194. package/es/wind/models/wind.d.ts +2 -2
  195. package/es/wind/models/wind.js +120 -104
  196. package/lib/Geometry/index.js +29 -17
  197. package/lib/Geometry/models/billboard.js +79 -37
  198. package/lib/Geometry/models/plane.js +82 -40
  199. package/lib/Geometry/models/sprite.js +85 -45
  200. package/lib/canvas/index.js +37 -24
  201. package/lib/canvas/models/canvas.js +56 -15
  202. package/lib/citybuliding/building.js +28 -17
  203. package/lib/citybuliding/models/build.js +72 -25
  204. package/lib/core/BaseLayer.js +391 -256
  205. package/lib/core/BaseModel.js +48 -6
  206. package/lib/core/LayerPickService.js +96 -0
  207. package/lib/core/triangulation.js +8 -1
  208. package/lib/earth/index.js +30 -9
  209. package/lib/earth/models/atmosphere.js +69 -22
  210. package/lib/earth/models/base.js +90 -42
  211. package/lib/earth/models/bloomsphere.js +69 -22
  212. package/lib/heatmap/index.js +35 -22
  213. package/lib/heatmap/models/grid.js +70 -27
  214. package/lib/heatmap/models/grid3d.js +71 -28
  215. package/lib/heatmap/models/heatmap.js +40 -14
  216. package/lib/heatmap/models/hexagon.js +71 -28
  217. package/lib/image/index.js +29 -17
  218. package/lib/image/models/dataImage.js +95 -54
  219. package/lib/image/models/image.js +110 -67
  220. package/lib/image/models/tileDataImage.js +86 -43
  221. package/lib/index.js +5 -5
  222. package/lib/line/index.js +53 -26
  223. package/lib/line/models/arc.js +75 -38
  224. package/lib/line/models/arc_3d.js +71 -34
  225. package/lib/line/models/earthArc_3d.js +74 -37
  226. package/lib/line/models/great_circle.js +72 -29
  227. package/lib/line/models/half.js +40 -17
  228. package/lib/line/models/index.js +0 -3
  229. package/lib/line/models/line.js +81 -47
  230. package/lib/line/models/linearline.js +72 -31
  231. package/lib/line/models/simpleLine.js +73 -34
  232. package/lib/line/models/simpleTileLine.js +72 -30
  233. package/lib/line/models/tile.js +40 -17
  234. package/lib/line/models/wall.js +69 -22
  235. package/lib/mask/index.js +28 -99
  236. package/lib/mask/models/fill.js +40 -16
  237. package/lib/mask/models/index.js +1 -4
  238. package/lib/plugins/DataMappingPlugin.js +81 -65
  239. package/lib/plugins/DataSourcePlugin.js +71 -30
  240. package/lib/plugins/FeatureScalePlugin.js +86 -44
  241. package/lib/plugins/LayerAnimateStylePlugin.js +6 -3
  242. package/lib/plugins/LayerModelPlugin.js +131 -41
  243. package/lib/plugins/LayerStylePlugin.js +1 -6
  244. package/lib/plugins/MultiPassRendererPlugin.js +1 -1
  245. package/lib/plugins/PixelPickingPlugin.js +1 -1
  246. package/lib/plugins/RegisterStyleAttributePlugin.js +4 -17
  247. package/lib/plugins/ShaderUniformPlugin.js +7 -2
  248. package/lib/plugins/UpdateStyleAttributePlugin.js +8 -5
  249. package/lib/point/index.js +56 -24
  250. package/lib/point/models/earthExtrude.js +75 -30
  251. package/lib/point/models/earthFill.js +68 -21
  252. package/lib/point/models/extrude.js +40 -17
  253. package/lib/point/models/fill.js +44 -21
  254. package/lib/point/models/fillmage.js +84 -43
  255. package/lib/point/models/image.js +74 -31
  256. package/lib/point/models/index.js +0 -3
  257. package/lib/point/models/normal.js +73 -30
  258. package/lib/point/models/radar.js +77 -35
  259. package/lib/point/models/simplePoint.js +72 -29
  260. package/lib/point/models/text.js +164 -106
  261. package/lib/point/models/tile.js +79 -35
  262. package/lib/point/models/tileText.js +151 -115
  263. package/lib/polygon/index.js +29 -25
  264. package/lib/polygon/models/extrude.js +68 -29
  265. package/lib/polygon/models/fill.js +78 -43
  266. package/lib/polygon/models/index.js +0 -3
  267. package/lib/polygon/models/ocean.js +71 -28
  268. package/lib/polygon/models/tile.js +72 -30
  269. package/lib/polygon/models/water.js +71 -28
  270. package/lib/raster/index.js +30 -22
  271. package/lib/raster/models/index.js +1 -4
  272. package/lib/raster/models/raster.js +36 -13
  273. package/lib/raster/models/rasterRgb.js +36 -13
  274. package/lib/raster/models/rasterTile.js +79 -36
  275. package/lib/raster/raster.js +44 -22
  276. package/lib/tile/interaction/utils.js +3 -11
  277. package/lib/tile/manager/base.js +213 -47
  278. package/lib/tile/service/TileLayerService.js +185 -0
  279. package/lib/tile/service/TilePickService.js +136 -0
  280. package/lib/tile/style/constants.js +8 -19
  281. package/lib/tile/style/utils.js +0 -140
  282. package/lib/tile/tileFactory/DebugTile.js +115 -0
  283. package/lib/tile/tileFactory/ImageTile.js +104 -0
  284. package/lib/tile/tileFactory/MaskTile.js +113 -0
  285. package/lib/tile/tileFactory/RasterRGBTile.js +106 -0
  286. package/lib/tile/tileFactory/RasterTile.js +205 -0
  287. package/lib/tile/tileFactory/Tile.js +146 -0
  288. package/lib/tile/tileFactory/VectorTile.js +173 -0
  289. package/lib/tile/tileFactory/index.js +42 -24
  290. package/lib/tile/tileFactory/layers/{rasterDataLayer.js → RasterDataLayer.js} +35 -21
  291. package/lib/tile/tileFactory/layers/{tileTest.js → TileDebugLayer.js} +24 -11
  292. package/lib/tile/tileFactory/util.js +48 -0
  293. package/lib/tile/tileLayer/BaseLayer.js +373 -0
  294. package/lib/tile/utils.js +0 -146
  295. package/lib/utils/dataMappingStyle.js +21 -21
  296. package/lib/utils/layerData.js +4 -10
  297. package/lib/wind/index.js +29 -17
  298. package/lib/wind/models/wind.js +122 -104
  299. package/package.json +7 -7
  300. package/es/tile/interaction/TilePickService.d.ts +0 -16
  301. package/es/tile/interaction/TilePickService.js +0 -129
  302. package/es/tile/manager/layerManager.d.ts +0 -19
  303. package/es/tile/manager/layerManager.js +0 -254
  304. package/es/tile/manager/mapLayerManager.d.ts +0 -7
  305. package/es/tile/manager/mapLayerManager.js +0 -119
  306. package/es/tile/models/tileModel.d.ts +0 -10
  307. package/es/tile/models/tileModel.js +0 -81
  308. package/es/tile/render/TileRenderService.d.ts +0 -10
  309. package/es/tile/render/TileRenderService.js +0 -68
  310. package/es/tile/style/TileStyleService.d.ts +0 -17
  311. package/es/tile/style/TileStyleService.js +0 -118
  312. package/es/tile/tileFactory/base.d.ts +0 -45
  313. package/es/tile/tileFactory/base.js +0 -403
  314. package/es/tile/tileFactory/layers/vectorLayer.d.ts +0 -30
  315. package/es/tile/tileFactory/layers/vectorLayer.js +0 -253
  316. package/es/tile/tileFactory/line.d.ts +0 -12
  317. package/es/tile/tileFactory/line.js +0 -59
  318. package/es/tile/tileFactory/mask.d.ts +0 -12
  319. package/es/tile/tileFactory/mask.js +0 -60
  320. package/es/tile/tileFactory/point.d.ts +0 -12
  321. package/es/tile/tileFactory/point.js +0 -60
  322. package/es/tile/tileFactory/polygon.d.ts +0 -12
  323. package/es/tile/tileFactory/polygon.js +0 -59
  324. package/es/tile/tileFactory/raster.d.ts +0 -12
  325. package/es/tile/tileFactory/raster.js +0 -55
  326. package/es/tile/tileFactory/rasterData.d.ts +0 -12
  327. package/es/tile/tileFactory/rasterData.js +0 -81
  328. package/es/tile/tileFactory/test.d.ts +0 -12
  329. package/es/tile/tileFactory/test.js +0 -94
  330. package/es/tile/tileLayer/MapTileLayer.d.ts +0 -6
  331. package/es/tile/tileLayer/MapTileLayer.js +0 -48
  332. package/es/tile/tileLayer/TileLayer.d.ts +0 -22
  333. package/es/tile/tileLayer/TileLayer.js +0 -198
  334. package/es/tile/tileLayer/base.d.ts +0 -33
  335. package/es/tile/tileLayer/base.js +0 -212
  336. package/lib/tile/interaction/TilePickService.js +0 -143
  337. package/lib/tile/manager/layerManager.js +0 -275
  338. package/lib/tile/manager/mapLayerManager.js +0 -134
  339. package/lib/tile/models/tileModel.js +0 -94
  340. package/lib/tile/render/TileRenderService.js +0 -78
  341. package/lib/tile/style/TileStyleService.js +0 -133
  342. package/lib/tile/tileFactory/base.js +0 -427
  343. package/lib/tile/tileFactory/layers/vectorLayer.js +0 -268
  344. package/lib/tile/tileFactory/line.js +0 -70
  345. package/lib/tile/tileFactory/mask.js +0 -71
  346. package/lib/tile/tileFactory/point.js +0 -71
  347. package/lib/tile/tileFactory/polygon.js +0 -70
  348. package/lib/tile/tileFactory/raster.js +0 -68
  349. package/lib/tile/tileFactory/rasterData.js +0 -93
  350. package/lib/tile/tileFactory/test.js +0 -106
  351. package/lib/tile/tileLayer/MapTileLayer.js +0 -63
  352. package/lib/tile/tileLayer/TileLayer.js +0 -215
  353. package/lib/tile/tileLayer/base.js +0 -225
@@ -1,10 +1,12 @@
1
1
  import _objectSpread from "@babel/runtime/helpers/objectSpread2";
2
+ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
2
3
  import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
3
4
  import _createClass from "@babel/runtime/helpers/createClass";
4
5
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
5
6
 
6
7
  var _scaleMap, _dec, _class;
7
8
 
9
+ import _regeneratorRuntime from "@babel/runtime/regenerator";
8
10
  import { ScaleTypes, StyleScaleType } from '@antv/l7-core';
9
11
  import { extent } from 'd3-array';
10
12
  import * as d3interpolate from 'd3-interpolate';
@@ -44,39 +46,80 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
44
46
  var _this = this;
45
47
 
46
48
  var styleAttributeService = _ref.styleAttributeService;
47
- layer.hooks.init.tap('FeatureScalePlugin', function () {
48
- _this.scaleOptions = layer.getScaleOptions();
49
- var attributes = styleAttributeService.getLayerStyleAttributes();
49
+ layer.hooks.init.tapPromise('FeatureScalePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
50
+ var _layer$getSource;
51
+
52
+ var attributes, dataArray;
53
+ return _regeneratorRuntime.wrap(function _callee$(_context) {
54
+ while (1) {
55
+ switch (_context.prev = _context.next) {
56
+ case 0:
57
+ _this.scaleOptions = layer.getScaleOptions();
58
+ attributes = styleAttributeService.getLayerStyleAttributes();
59
+ dataArray = (_layer$getSource = layer.getSource()) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.data.dataArray;
60
+
61
+ if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
62
+ _context.next = 7;
63
+ break;
64
+ }
50
65
 
51
- _this.getSourceData(layer, function (_ref2) {
52
- var dataArray = _ref2.dataArray;
66
+ return _context.abrupt("return");
53
67
 
54
- if (Array.isArray(dataArray) && dataArray.length === 0) {
55
- return;
56
- } else {
57
- _this.caculateScalesForAttributes(attributes || [], dataArray);
68
+ case 7:
69
+ _this.caculateScalesForAttributes(attributes || [], dataArray);
70
+
71
+ case 8:
72
+ case "end":
73
+ return _context.stop();
74
+ }
58
75
  }
59
- });
60
- }); // 检测数据是否需要更新
76
+ }, _callee);
77
+ }))); // 检测数据是否需要更新
78
+
79
+ layer.hooks.beforeRenderData.tapPromise('FeatureScalePlugin', /*#__PURE__*/function () {
80
+ var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(flag) {
81
+ var attributes, dataArray;
82
+ return _regeneratorRuntime.wrap(function _callee2$(_context2) {
83
+ while (1) {
84
+ switch (_context2.prev = _context2.next) {
85
+ case 0:
86
+ if (flag) {
87
+ _context2.next = 2;
88
+ break;
89
+ }
61
90
 
62
- layer.hooks.beforeRenderData.tap('FeatureScalePlugin', function () {
63
- _this.scaleOptions = layer.getScaleOptions();
64
- var attributes = styleAttributeService.getLayerStyleAttributes();
91
+ return _context2.abrupt("return", flag);
65
92
 
66
- _this.getSourceData(layer, function (_ref3) {
67
- var dataArray = _ref3.dataArray;
93
+ case 2:
94
+ _this.scaleOptions = layer.getScaleOptions();
95
+ attributes = styleAttributeService.getLayerStyleAttributes();
96
+ dataArray = layer.getSource().data.dataArray;
68
97
 
69
- if (Array.isArray(dataArray) && dataArray.length === 0) {
70
- return;
71
- }
98
+ if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
99
+ _context2.next = 7;
100
+ break;
101
+ }
72
102
 
73
- _this.caculateScalesForAttributes(attributes || [], dataArray);
103
+ return _context2.abrupt("return");
74
104
 
75
- layer.layerModelNeedUpdate = true;
76
- });
105
+ case 7:
106
+ _this.caculateScalesForAttributes(attributes || [], dataArray);
77
107
 
78
- return true;
79
- });
108
+ layer.layerModelNeedUpdate = true;
109
+ return _context2.abrupt("return", true);
110
+
111
+ case 10:
112
+ case "end":
113
+ return _context2.stop();
114
+ }
115
+ }
116
+ }, _callee2);
117
+ }));
118
+
119
+ return function (_x) {
120
+ return _ref3.apply(this, arguments);
121
+ };
122
+ }());
80
123
  layer.hooks.beforeRender.tap('FeatureScalePlugin', function () {
81
124
  var _layer$getLayerConfig = layer.getLayerConfig(),
82
125
  usage = _layer$getLayerConfig.usage;
@@ -87,23 +130,20 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
87
130
 
88
131
  _this.scaleOptions = layer.getScaleOptions();
89
132
  var attributes = styleAttributeService.getLayerStyleAttributes();
133
+ var dataArray = layer.getSource().data.dataArray;
90
134
 
91
- if (attributes) {
92
- _this.getSourceData(layer, function (_ref4) {
93
- var dataArray = _ref4.dataArray;
94
-
95
- if (dataArray.length === 0) {
96
- return;
97
- }
98
-
99
- var attributesToRescale = attributes.filter(function (attribute) {
100
- return attribute.needRescale;
101
- });
135
+ if (Array.isArray(dataArray) && dataArray.length === 0) {
136
+ return;
137
+ }
102
138
 
103
- if (attributesToRescale.length) {
104
- _this.caculateScalesForAttributes(attributesToRescale, dataArray);
105
- }
139
+ if (attributes) {
140
+ var attributesToRescale = attributes.filter(function (attribute) {
141
+ return attribute.needRescale;
106
142
  });
143
+
144
+ if (attributesToRescale.length) {
145
+ _this.caculateScalesForAttributes(attributesToRescale, dataArray);
146
+ }
107
147
  }
108
148
  });
109
149
  }
@@ -307,12 +347,12 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
307
347
 
308
348
  }, {
309
349
  key: "createDefaultScale",
310
- value: function createDefaultScale(_ref5) {
311
- var type = _ref5.type,
312
- domain = _ref5.domain,
313
- unknown = _ref5.unknown,
314
- clamp = _ref5.clamp,
315
- nice = _ref5.nice;
350
+ value: function createDefaultScale(_ref4) {
351
+ var type = _ref4.type,
352
+ domain = _ref4.domain,
353
+ unknown = _ref4.unknown,
354
+ clamp = _ref4.clamp,
355
+ nice = _ref4.nice;
316
356
  // @ts-ignore
317
357
  var scale = scaleMap[type]();
318
358
 
@@ -17,9 +17,12 @@ var LayerAnimateStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/f
17
17
  layer.hooks.beforeRender.tap('LayerAnimateStylePlugin', function () {
18
18
  // @ts-ignore
19
19
  var animateStatus = layer.animateStatus;
20
- animateStatus && layer.models.forEach(function (model) {
21
- model.addUniforms(_objectSpread({}, layer.layerModel.getAnimateUniforms()));
22
- });
20
+
21
+ if (animateStatus) {
22
+ layer.models.forEach(function (model) {
23
+ model.addUniforms(_objectSpread({}, layer.layerModel.getAnimateUniforms()));
24
+ });
25
+ }
23
26
  });
24
27
  }
25
28
  }]);
@@ -4,7 +4,7 @@ import 'reflect-metadata';
4
4
  * Layer Model 初始化,更新,销毁
5
5
  */
6
6
  export default class LayerModelPlugin implements ILayerPlugin {
7
- initLayerModel(layer: ILayer): void;
8
- prepareLayerModel(layer: ILayer): void;
7
+ initLayerModel(layer: ILayer): Promise<void>;
8
+ prepareLayerModel(layer: ILayer): Promise<void>;
9
9
  apply(layer: ILayer): void;
10
10
  }
@@ -1,10 +1,13 @@
1
+ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
1
2
  import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
2
3
  import _createClass from "@babel/runtime/helpers/createClass";
3
4
 
4
5
  var _dec, _class;
5
6
 
7
+ import _regeneratorRuntime from "@babel/runtime/regenerator";
6
8
  import { injectable } from 'inversify';
7
9
  import 'reflect-metadata';
10
+ import TileLayer from "../tile/tileLayer/BaseLayer";
8
11
  /**
9
12
  * Layer Model 初始化,更新,销毁
10
13
  */
@@ -16,54 +19,138 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
16
19
 
17
20
  _createClass(LayerModelPlugin, [{
18
21
  key: "initLayerModel",
19
- value: function initLayerModel(layer) {
20
- // 更新Model 配置项
21
- layer.prepareBuildModel(); // 初始化 Model
22
+ value: function () {
23
+ var _initLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
24
+ return _regeneratorRuntime.wrap(function _callee$(_context) {
25
+ while (1) {
26
+ switch (_context.prev = _context.next) {
27
+ case 0:
28
+ // 更新Model 配置项
29
+ layer.prepareBuildModel(); // 初始化 Model
22
30
 
23
- layer.buildModels();
24
- layer.styleNeedUpdate = false;
25
- }
31
+ _context.next = 3;
32
+ return layer.buildModels();
33
+
34
+ case 3:
35
+ layer.styleNeedUpdate = false;
36
+
37
+ case 4:
38
+ case "end":
39
+ return _context.stop();
40
+ }
41
+ }
42
+ }, _callee);
43
+ }));
44
+
45
+ function initLayerModel(_x) {
46
+ return _initLayerModel.apply(this, arguments);
47
+ }
48
+
49
+ return initLayerModel;
50
+ }()
26
51
  }, {
27
52
  key: "prepareLayerModel",
28
- value: function prepareLayerModel(layer) {
29
- var _layer$layerModel;
53
+ value: function () {
54
+ var _prepareLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layer) {
55
+ return _regeneratorRuntime.wrap(function _callee2$(_context2) {
56
+ while (1) {
57
+ switch (_context2.prev = _context2.next) {
58
+ case 0:
59
+ // 更新Model 配置项
60
+ layer.prepareBuildModel(); // clear layerModel resource
61
+ // 初始化 Model
30
62
 
31
- // 更新Model 配置项
32
- layer.prepareBuildModel(); // clear layerModel resource
63
+ _context2.next = 3;
64
+ return layer.buildModels();
33
65
 
34
- (_layer$layerModel = layer.layerModel) === null || _layer$layerModel === void 0 ? void 0 : _layer$layerModel.clearModels(); // 初始化 Model
66
+ case 3:
67
+ layer.layerModelNeedUpdate = false;
35
68
 
36
- layer.buildModels();
37
- layer.layerModelNeedUpdate = false;
38
- }
69
+ case 4:
70
+ case "end":
71
+ return _context2.stop();
72
+ }
73
+ }
74
+ }, _callee2);
75
+ }));
76
+
77
+ function prepareLayerModel(_x2) {
78
+ return _prepareLayerModel.apply(this, arguments);
79
+ }
80
+
81
+ return prepareLayerModel;
82
+ }()
39
83
  }, {
40
84
  key: "apply",
41
85
  value: function apply(layer) {
42
86
  var _this = this;
43
87
 
44
- layer.hooks.init.tap('LayerModelPlugin', function () {
45
- layer.inited = true;
46
- layer.modelLoaded = false;
47
- var source = layer.getSource();
48
-
49
- if (source.inited) {
50
- _this.initLayerModel(layer);
51
- }
52
- });
53
- layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
54
- var source = layer.getSource();
55
- layer.modelLoaded = false;
56
-
57
- if (source.inited) {
58
- _this.prepareLayerModel(layer);
59
- } else {
60
- source.once('update', function () {
61
- _this.prepareLayerModel(layer);
62
- });
63
- }
64
-
65
- return false;
66
- });
88
+ layer.hooks.init.tapPromise('LayerModelPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
89
+ return _regeneratorRuntime.wrap(function _callee3$(_context3) {
90
+ while (1) {
91
+ switch (_context3.prev = _context3.next) {
92
+ case 0:
93
+ if (!layer.getSource().isTile) {
94
+ _context3.next = 4;
95
+ break;
96
+ }
97
+
98
+ layer.prepareBuildModel();
99
+ layer.tileLayer = new TileLayer(layer);
100
+ return _context3.abrupt("return");
101
+
102
+ case 4:
103
+ _context3.next = 6;
104
+ return _this.initLayerModel(layer);
105
+
106
+ case 6:
107
+ case "end":
108
+ return _context3.stop();
109
+ }
110
+ }
111
+ }, _callee3);
112
+ })));
113
+ layer.hooks.beforeRenderData.tapPromise('LayerModelPlugin', /*#__PURE__*/function () {
114
+ var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(flag) {
115
+ return _regeneratorRuntime.wrap(function _callee4$(_context4) {
116
+ while (1) {
117
+ switch (_context4.prev = _context4.next) {
118
+ case 0:
119
+ if (flag) {
120
+ _context4.next = 2;
121
+ break;
122
+ }
123
+
124
+ return _context4.abrupt("return", false);
125
+
126
+ case 2:
127
+ if (!layer.getSource().isTile) {
128
+ _context4.next = 5;
129
+ break;
130
+ }
131
+
132
+ layer.tileLayer = new TileLayer(layer);
133
+ return _context4.abrupt("return");
134
+
135
+ case 5:
136
+ _context4.next = 7;
137
+ return _this.prepareLayerModel(layer);
138
+
139
+ case 7:
140
+ return _context4.abrupt("return", true);
141
+
142
+ case 8:
143
+ case "end":
144
+ return _context4.stop();
145
+ }
146
+ }
147
+ }, _callee4);
148
+ }));
149
+
150
+ return function (_x3) {
151
+ return _ref2.apply(this, arguments);
152
+ };
153
+ }());
67
154
  }
68
155
  }]);
69
156
 
@@ -18,17 +18,12 @@ var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
18
18
  key: "apply",
19
19
  value: function apply(layer) {
20
20
  layer.hooks.afterInit.tap('LayerStylePlugin', function () {
21
- // 更新图层默认状态
22
- layer.updateLayerConfig({});
23
-
24
21
  var _layer$getLayerConfig = layer.getLayerConfig(),
25
22
  autoFit = _layer$getLayerConfig.autoFit,
26
23
  fitBoundsOptions = _layer$getLayerConfig.fitBoundsOptions;
27
24
 
28
25
  if (autoFit) {
29
- setTimeout(function () {
30
- layer.fitBounds(fitBoundsOptions);
31
- }, 100);
26
+ layer.fitBounds(fitBoundsOptions);
32
27
  }
33
28
  });
34
29
  }
@@ -33,7 +33,7 @@ var MultiPassRendererPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/f
33
33
  var rendererService = _ref.rendererService,
34
34
  postProcessingPassFactory = _ref.postProcessingPassFactory,
35
35
  normalPassFactory = _ref.normalPassFactory;
36
- layer.hooks.init.tap('MultiPassRendererPlugin', function () {
36
+ layer.hooks.init.tapPromise('MultiPassRendererPlugin', function () {
37
37
  var _layer$getLayerConfig = layer.getLayerConfig(),
38
38
  enableMultiPassRenderer = _layer$getLayerConfig.enableMultiPassRenderer,
39
39
  _layer$getLayerConfig2 = _layer$getLayerConfig.passes,
@@ -22,7 +22,7 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
22
22
  value: function apply(layer, _ref) {
23
23
  var styleAttributeService = _ref.styleAttributeService;
24
24
  // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改,因此即使不开启也需要生成 a_PickingColor
25
- layer.hooks.init.tap('PixelPickingPlugin', function () {
25
+ layer.hooks.init.tapPromise('PixelPickingPlugin', function () {
26
26
  var _layer$getLayerConfig = layer.getLayerConfig(),
27
27
  enablePicking = _layer$getLayerConfig.enablePicking;
28
28
 
@@ -22,9 +22,11 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
22
22
  var _this = this;
23
23
 
24
24
  var styleAttributeService = _ref.styleAttributeService;
25
- layer.hooks.init.tap('RegisterStyleAttributePlugin', function () {
25
+ layer.hooks.init.tapPromise('RegisterStyleAttributePlugin', function () {
26
26
  // 过滤 tileGroup layer (瓦片图层不需要注册)
27
- if (isTileGroup(layer)) return;
27
+ if (isTileGroup(layer)) {
28
+ return;
29
+ }
28
30
 
29
31
  _this.registerBuiltinAttributes(styleAttributeService, layer);
30
32
  });
@@ -36,21 +38,6 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
36
38
  if (layer.type === 'MaskLayer') {
37
39
  this.registerPositionAttribute(styleAttributeService);
38
40
  return;
39
- } // 用途为 basemap 的 Layer 也只需要注册 a_Position
40
-
41
-
42
- var _layer$getLayerConfig = layer.getLayerConfig(),
43
- usage = _layer$getLayerConfig.usage;
44
-
45
- if (usage === 'basemap') {
46
- this.registerPositionAttribute(styleAttributeService);
47
- return;
48
- }
49
-
50
- if (layer.isTileLayer) {
51
- this.registerPositionAttribute(styleAttributeService);
52
- this.registerColorAttribute(styleAttributeService);
53
- return;
54
41
  } // Tip: normal render layer
55
42
 
56
43
 
@@ -76,8 +76,13 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
76
76
  }, {
77
77
  key: "setLayerCenter",
78
78
  value: function setLayerCenter(layer) {
79
- if (layer.coordCenter === undefined) layer.coordCenter = layer.getSource().center;
80
- this.mapService.setCoordCenter && this.mapService.setCoordCenter(layer.coordCenter);
79
+ if (layer.coordCenter === undefined) {
80
+ layer.coordCenter = layer.getSource().center;
81
+ }
82
+
83
+ if (this.mapService.setCoordCenter) {
84
+ this.mapService.setCoordCenter(layer.coordCenter);
85
+ }
81
86
  }
82
87
  }]);
83
88
 
@@ -20,7 +20,7 @@ var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__
20
20
  var _this = this;
21
21
 
22
22
  var styleAttributeService = _ref.styleAttributeService;
23
- layer.hooks.init.tap('UpdateStyleAttributePlugin', function () {
23
+ layer.hooks.init.tapPromise('UpdateStyleAttributePlugin', function () {
24
24
  _this.initStyleAttribute(layer, {
25
25
  styleAttributeService: styleAttributeService
26
26
  });
@@ -29,13 +29,16 @@ var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__
29
29
  var _layer$getLayerConfig = layer.getLayerConfig(),
30
30
  usage = _layer$getLayerConfig.usage;
31
31
 
32
- if (layer.layerModelNeedUpdate || layer.tileLayer || usage === 'basemap') {
32
+ if (layer.layerModelNeedUpdate || layer.tileLayer || usage === 'basemap' // TODO: Chore 不走该流程 应从外部统一控制,而不是打补丁
33
+ ) {
33
34
  return;
34
35
  }
35
36
 
36
- layer.modelLoaded && _this.updateStyleAttribute(layer, {
37
- styleAttributeService: styleAttributeService
38
- });
37
+ if (layer.inited) {
38
+ _this.updateStyleAttribute(layer, {
39
+ styleAttributeService: styleAttributeService
40
+ });
41
+ }
39
42
  });
40
43
  }
41
44
  }, {
@@ -13,8 +13,8 @@ export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
13
13
  };
14
14
  };
15
15
  };
16
- buildModels(): void;
17
- rebuildModels(): void;
16
+ buildModels(): Promise<void>;
17
+ rebuildModels(): Promise<void>;
18
18
  /**
19
19
  * 在未传入数据的时候判断点图层的 shape 类型
20
20
  * @returns
@@ -26,6 +26,6 @@ export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
26
26
  blend: string;
27
27
  } | {} | {} | {
28
28
  blend: string;
29
- } | {} | {} | {} | {} | {};
30
- protected getModelType(): PointType;
29
+ } | {} | {} | {} | {};
30
+ getModelType(): PointType;
31
31
  }
package/es/point/index.js CHANGED
@@ -1,3 +1,4 @@
1
+ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
1
2
  import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
2
3
  import _createClass from "@babel/runtime/helpers/createClass";
3
4
  import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -12,13 +13,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
12
13
 
13
14
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
14
15
 
16
+ import _regeneratorRuntime from "@babel/runtime/regenerator";
17
+
15
18
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
16
19
 
17
20
  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; } }
18
21
 
19
22
  import BaseLayer from "../core/BaseLayer";
20
23
  import PointModels from "./models/index";
21
- import { isVectorTile } from "../tile/utils";
22
24
 
23
25
  var PointLayer = /*#__PURE__*/function (_BaseLayer) {
24
26
  _inherits(PointLayer, _BaseLayer);
@@ -54,24 +56,57 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
54
56
 
55
57
  _createClass(PointLayer, [{
56
58
  key: "buildModels",
57
- value: function buildModels() {
58
- var _this2 = this;
59
+ value: function () {
60
+ var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
61
+ var modelType;
62
+ return _regeneratorRuntime.wrap(function _callee$(_context) {
63
+ while (1) {
64
+ switch (_context.prev = _context.next) {
65
+ case 0:
66
+ modelType = this.getModelType();
67
+ this.layerModel = new PointModels[modelType](this);
68
+ _context.next = 4;
69
+ return this.initLayerModels();
70
+
71
+ case 4:
72
+ case "end":
73
+ return _context.stop();
74
+ }
75
+ }
76
+ }, _callee, this);
77
+ }));
59
78
 
60
- var modelType = this.getModelType();
61
- this.layerModel = new PointModels[modelType](this);
62
- this.layerModel.initModels(function (models) {
63
- _this2.dispatchModelLoad(models);
64
- });
65
- }
79
+ function buildModels() {
80
+ return _buildModels.apply(this, arguments);
81
+ }
82
+
83
+ return buildModels;
84
+ }()
66
85
  }, {
67
86
  key: "rebuildModels",
68
- value: function rebuildModels() {
69
- var _this3 = this;
87
+ value: function () {
88
+ var _rebuildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
89
+ return _regeneratorRuntime.wrap(function _callee2$(_context2) {
90
+ while (1) {
91
+ switch (_context2.prev = _context2.next) {
92
+ case 0:
93
+ _context2.next = 2;
94
+ return this.buildModels();
95
+
96
+ case 2:
97
+ case "end":
98
+ return _context2.stop();
99
+ }
100
+ }
101
+ }, _callee2, this);
102
+ }));
70
103
 
71
- this.layerModel.buildModels(function (models) {
72
- _this3.dispatchModelLoad(models);
73
- });
74
- }
104
+ function rebuildModels() {
105
+ return _rebuildModels.apply(this, arguments);
106
+ }
107
+
108
+ return rebuildModels;
109
+ }()
75
110
  /**
76
111
  * 在未传入数据的时候判断点图层的 shape 类型
77
112
  * @returns
@@ -94,6 +129,10 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
94
129
  return 'fill';
95
130
  }
96
131
 
132
+ if (values === 'text') {
133
+ return 'text';
134
+ }
135
+
97
136
  if (values && values instanceof Array) {
98
137
  var _iterator = _createForOfIteratorHelper(values),
99
138
  _step;
@@ -135,7 +174,6 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
135
174
  text: {
136
175
  blend: 'normal'
137
176
  },
138
- vectorPoint: {},
139
177
  tile: {},
140
178
  tileText: {},
141
179
  earthFill: {},
@@ -146,13 +184,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
146
184
  }, {
147
185
  key: "getModelType",
148
186
  value: function getModelType() {
149
- var parserType = this.layerSource.getParserType();
150
-
151
- if (isVectorTile(parserType)) {
152
- return 'vectorPoint';
153
- } // 2D、 3d、 shape、image、text、normal、
154
-
155
-
187
+ // 2D、 3d、 shape、image、text、normal、
156
188
  var layerData = this.getEncodedData();
157
189
 
158
190
  var _this$getLayerConfig2 = this.getLayerConfig(),