@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
@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
+
12
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
13
+
10
14
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
15
 
12
16
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -147,11 +151,34 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
147
151
  }
148
152
  }, {
149
153
  key: "initModels",
150
- value: function initModels(callbackModel) {
151
- this.updateTexture();
152
- this.iconService.on('imageUpdate', this.updateTexture);
153
- this.buildModels(callbackModel);
154
- }
154
+ value: function () {
155
+ var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
156
+ return _regenerator.default.wrap(function _callee$(_context) {
157
+ while (1) {
158
+ switch (_context.prev = _context.next) {
159
+ case 0:
160
+ this.updateTexture();
161
+ this.iconService.on('imageUpdate', this.updateTexture);
162
+ _context.next = 4;
163
+ return this.buildModels();
164
+
165
+ case 4:
166
+ return _context.abrupt("return", _context.sent);
167
+
168
+ case 5:
169
+ case "end":
170
+ return _context.stop();
171
+ }
172
+ }
173
+ }, _callee, this);
174
+ }));
175
+
176
+ function initModels() {
177
+ return _initModels.apply(this, arguments);
178
+ }
179
+
180
+ return initModels;
181
+ }()
155
182
  }, {
156
183
  key: "clearModels",
157
184
  value: function clearModels() {
@@ -162,23 +189,43 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
162
189
  }
163
190
  }, {
164
191
  key: "buildModels",
165
- value: function buildModels(callbackModel) {
166
- this.layer.buildLayerModel({
167
- moduleName: 'lineWall',
168
- vertexShader: line_vert,
169
- fragmentShader: line_frag,
170
- triangulation: _triangulation.LineTriangulation,
171
- depth: {
172
- enable: false
173
- },
174
- blend: this.getBlend()
175
- }).then(function (model) {
176
- callbackModel([model]);
177
- }).catch(function (err) {
178
- console.warn(err);
179
- callbackModel([]);
180
- });
181
- }
192
+ value: function () {
193
+ var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
194
+ var model;
195
+ return _regenerator.default.wrap(function _callee2$(_context2) {
196
+ while (1) {
197
+ switch (_context2.prev = _context2.next) {
198
+ case 0:
199
+ _context2.next = 2;
200
+ return this.layer.buildLayerModel({
201
+ moduleName: 'lineWall',
202
+ vertexShader: line_vert,
203
+ fragmentShader: line_frag,
204
+ triangulation: _triangulation.LineTriangulation,
205
+ depth: {
206
+ enable: false
207
+ },
208
+ blend: this.getBlend()
209
+ });
210
+
211
+ case 2:
212
+ model = _context2.sent;
213
+ return _context2.abrupt("return", [model]);
214
+
215
+ case 4:
216
+ case "end":
217
+ return _context2.stop();
218
+ }
219
+ }
220
+ }, _callee2, this);
221
+ }));
222
+
223
+ function buildModels() {
224
+ return _buildModels.apply(this, arguments);
225
+ }
226
+
227
+ return buildModels;
228
+ }()
182
229
  }, {
183
230
  key: "registerBuiltinAttributes",
184
231
  value: function registerBuiltinAttributes() {
package/lib/mask/index.js CHANGED
@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
- var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
10
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
+
12
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
11
13
 
12
14
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
13
15
 
@@ -27,16 +29,6 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
27
29
 
28
30
  var _models = _interopRequireDefault(require("./models"));
29
31
 
30
- var _utils = require("../tile/utils");
31
-
32
- var _l7Core = require("@antv/l7-core");
33
-
34
- function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
35
-
36
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
37
-
38
- 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; }
39
-
40
32
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
41
33
 
42
34
  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; } }
@@ -61,99 +53,36 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
61
53
  }
62
54
 
63
55
  (0, _createClass2.default)(MaskLayer, [{
64
- key: "init",
65
- value: function init() {
66
- var _this2 = this;
67
-
68
- // 设置配置项
69
- var sceneId = this.container.get(_l7Core.TYPES.SceneID);
70
- this.configService.setLayerConfig(sceneId, this.id, this.rawConfig);
71
- this.layerType = this.rawConfig.layerType;
72
- this.rendererService = this.container.get(_l7Core.TYPES.IRendererService);
73
- this.layerService = this.container.get(_l7Core.TYPES.ILayerService);
74
- this.mapService = this.container.get(_l7Core.TYPES.IMapService);
75
- this.cameraService = this.container.get(_l7Core.TYPES.ICameraService);
76
- this.coordinateService = this.container.get(_l7Core.TYPES.ICoordinateSystemService);
77
- this.shaderModuleService = this.container.get(_l7Core.TYPES.IShaderModuleService);
78
- this.postProcessingPassFactory = this.container.get(_l7Core.TYPES.IFactoryPostProcessingPass);
79
- this.normalPassFactory = this.container.get(_l7Core.TYPES.IFactoryNormalPass); // 图层容器服务
80
-
81
- this.styleAttributeService = this.container.get(_l7Core.TYPES.IStyleAttributeService); // 完成样式服务注册完成前添加的属性
82
-
83
- this.pendingStyleAttributes.forEach(function (_ref) {
84
- var attributeName = _ref.attributeName,
85
- attributeField = _ref.attributeField,
86
- attributeValues = _ref.attributeValues,
87
- updateOptions = _ref.updateOptions;
88
-
89
- _this2.styleAttributeService.updateStyleAttribute(attributeName, {
90
- // @ts-ignore
91
- scale: (0, _objectSpread2.default)({
92
- field: attributeField
93
- }, _this2.splitValuesAndCallbackInAttribute( // @ts-ignore
94
- attributeValues, // @ts-ignore
95
- _this2.getLayerConfig()[attributeName]))
96
- }, // @ts-ignore
97
- updateOptions);
98
- });
99
- this.pendingStyleAttributes = []; // 获取插件集
100
-
101
- this.plugins = this.container.getAll(_l7Core.TYPES.ILayerPlugin); // 完成插件注册,传入场景和图层容器内的服务
102
-
103
- var _iterator = _createForOfIteratorHelper(this.plugins),
104
- _step;
105
-
106
- try {
107
- for (_iterator.s(); !(_step = _iterator.n()).done;) {
108
- var plugin = _step.value;
109
- plugin.apply(this, {
110
- rendererService: this.rendererService,
111
- mapService: this.mapService,
112
- styleAttributeService: this.styleAttributeService,
113
- normalPassFactory: this.normalPassFactory,
114
- postProcessingPassFactory: this.postProcessingPassFactory
115
- });
116
- } // 触发 init 生命周期插件
117
-
118
- } catch (err) {
119
- _iterator.e(err);
120
- } finally {
121
- _iterator.f();
122
- }
123
-
124
- this.hooks.init.call();
125
- this.hooks.afterInit.call();
126
- return this;
127
- }
128
- }, {
129
56
  key: "buildModels",
130
- value: function buildModels() {
131
- var _this3 = this;
132
-
133
- var shape = this.getModelType();
134
- this.layerModel = new _models.default[shape](this);
135
- this.layerModel.initModels(function (models) {
136
- _this3.dispatchModelLoad(models);
137
- });
138
- }
139
- }, {
140
- key: "rebuildModels",
141
- value: function rebuildModels() {
142
- var _this4 = this;
57
+ value: function () {
58
+ var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
59
+ var shape;
60
+ return _regenerator.default.wrap(function _callee$(_context) {
61
+ while (1) {
62
+ switch (_context.prev = _context.next) {
63
+ case 0:
64
+ shape = this.getModelType();
65
+ this.layerModel = new _models.default[shape](this);
66
+ _context.next = 4;
67
+ return this.initLayerModels();
68
+
69
+ case 4:
70
+ case "end":
71
+ return _context.stop();
72
+ }
73
+ }
74
+ }, _callee, this);
75
+ }));
76
+
77
+ function buildModels() {
78
+ return _buildModels.apply(this, arguments);
79
+ }
143
80
 
144
- this.layerModel.buildModels(function (models) {
145
- _this4.dispatchModelLoad(models);
146
- });
147
- }
81
+ return buildModels;
82
+ }()
148
83
  }, {
149
84
  key: "getModelType",
150
85
  value: function getModelType() {
151
- var parserType = this.layerSource.getParserType();
152
-
153
- if ((0, _utils.isVectorTile)(parserType)) {
154
- return 'vectorMask';
155
- }
156
-
157
86
  return 'fill';
158
87
  }
159
88
  }]);
@@ -67,18 +67,43 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
67
67
  }
68
68
  }, {
69
69
  key: "initModels",
70
- value: function initModels(callbackModel) {
71
- this.buildModels(callbackModel);
72
- }
73
- }, {
74
- key: "buildModels",
75
70
  value: function () {
76
- var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(callbackModel) {
71
+ var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
77
72
  return _regenerator.default.wrap(function _callee$(_context) {
78
73
  while (1) {
79
74
  switch (_context.prev = _context.next) {
80
75
  case 0:
81
- this.layer.buildLayerModel({
76
+ _context.next = 2;
77
+ return this.buildModels();
78
+
79
+ case 2:
80
+ return _context.abrupt("return", _context.sent);
81
+
82
+ case 3:
83
+ case "end":
84
+ return _context.stop();
85
+ }
86
+ }
87
+ }, _callee, this);
88
+ }));
89
+
90
+ function initModels() {
91
+ return _initModels.apply(this, arguments);
92
+ }
93
+
94
+ return initModels;
95
+ }()
96
+ }, {
97
+ key: "buildModels",
98
+ value: function () {
99
+ var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
100
+ var model;
101
+ return _regenerator.default.wrap(function _callee2$(_context2) {
102
+ while (1) {
103
+ switch (_context2.prev = _context2.next) {
104
+ case 0:
105
+ _context2.next = 2;
106
+ return this.layer.buildLayerModel({
82
107
  moduleName: 'mask',
83
108
  vertexShader: mask_vert,
84
109
  fragmentShader: mask_frag,
@@ -102,22 +127,21 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
102
127
  }
103
128
  },
104
129
  pick: false
105
- }).then(function (model) {
106
- callbackModel([model]);
107
- }).catch(function (err) {
108
- console.warn(err);
109
- callbackModel([]);
110
130
  });
111
131
 
112
- case 1:
132
+ case 2:
133
+ model = _context2.sent;
134
+ return _context2.abrupt("return", [model]);
135
+
136
+ case 4:
113
137
  case "end":
114
- return _context.stop();
138
+ return _context2.stop();
115
139
  }
116
140
  }
117
- }, _callee, this);
141
+ }, _callee2, this);
118
142
  }));
119
143
 
120
- function buildModels(_x) {
144
+ function buildModels() {
121
145
  return _buildModels.apply(this, arguments);
122
146
  }
123
147
 
@@ -7,13 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
- var _tileModel = _interopRequireDefault(require("../../tile/models/tileModel"));
11
-
12
10
  var _fill = _interopRequireDefault(require("./fill"));
13
11
 
14
12
  var MaskModels = {
15
- fill: _fill.default,
16
- vectorMask: _tileModel.default
13
+ fill: _fill.default
17
14
  };
18
15
  var _default = MaskModels;
19
16
  exports.default = _default;
@@ -7,8 +7,12 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
+
10
12
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
11
13
 
14
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
15
+
12
16
  var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
13
17
 
14
18
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -48,53 +52,72 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
48
52
  var _this = this;
49
53
 
50
54
  var styleAttributeService = _ref.styleAttributeService;
51
- layer.hooks.init.tap('DataMappingPlugin', function () {
52
- // 初始化重新生成 map
53
- var source = layer.getSource();
54
-
55
- if (source.inited) {
56
- _this.generateMaping(layer, {
57
- styleAttributeService: styleAttributeService
58
- });
59
- } else {
60
- source.once('update', function () {
61
- _this.generateMaping(layer, {
62
- styleAttributeService: styleAttributeService
63
- });
64
- });
65
- }
66
- });
67
- layer.hooks.beforeRenderData.tap('DataMappingPlugin', function () {
68
- layer.dataState.dataMappingNeedUpdate = false;
69
- var source = layer.getSource();
70
-
71
- if (source.inited) {
72
- _this.generateMaping(layer, {
73
- styleAttributeService: styleAttributeService
74
- });
75
- } else {
76
- source.once('update', function () {
77
- _this.generateMaping(layer, {
78
- styleAttributeService: styleAttributeService
79
- });
80
- });
81
- }
55
+ layer.hooks.init.tapPromise('DataMappingPlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
56
+ return _regenerator.default.wrap(function _callee$(_context) {
57
+ while (1) {
58
+ switch (_context.prev = _context.next) {
59
+ case 0:
60
+ // 初始化重新生成 map
61
+ _this.generateMaping(layer, {
62
+ styleAttributeService: styleAttributeService
63
+ });
64
+
65
+ case 1:
66
+ case "end":
67
+ return _context.stop();
68
+ }
69
+ }
70
+ }, _callee);
71
+ })));
72
+ layer.hooks.beforeRenderData.tapPromise('DataMappingPlugin', /*#__PURE__*/function () {
73
+ var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(flag) {
74
+ return _regenerator.default.wrap(function _callee2$(_context2) {
75
+ while (1) {
76
+ switch (_context2.prev = _context2.next) {
77
+ case 0:
78
+ if (flag) {
79
+ _context2.next = 2;
80
+ break;
81
+ }
82
+
83
+ return _context2.abrupt("return", flag);
84
+
85
+ case 2:
86
+ layer.dataState.dataMappingNeedUpdate = false;
87
+
88
+ _this.generateMaping(layer, {
89
+ styleAttributeService: styleAttributeService
90
+ });
91
+
92
+ return _context2.abrupt("return", true);
93
+
94
+ case 5:
95
+ case "end":
96
+ return _context2.stop();
97
+ }
98
+ }
99
+ }, _callee2);
100
+ }));
82
101
 
83
- return true;
84
- }); // remapping before render
102
+ return function (_x) {
103
+ return _ref3.apply(this, arguments);
104
+ };
105
+ }()); // remapping before render
85
106
 
86
107
  layer.hooks.beforeRender.tap('DataMappingPlugin', function () {
87
108
  var _layer$getLayerConfig = layer.getLayerConfig(),
88
109
  usage = _layer$getLayerConfig.usage;
89
110
 
90
- if (usage === 'basemap') return;
111
+ if (usage === 'basemap') {
112
+ return;
113
+ }
114
+
91
115
  var source = layer.getSource();
92
116
 
93
117
  if (layer.layerModelNeedUpdate || !source || !source.inited) {
94
118
  return;
95
119
  }
96
120
 
97
- var bottomColor = layer.getBottomColor();
98
121
  var attributes = styleAttributeService.getLayerStyleAttributes() || [];
99
122
  var filter = styleAttributeService.getLayerStyleAttribute('filter');
100
123
  var dataArray = source.data.dataArray;
@@ -106,19 +129,19 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
106
129
 
107
130
  if (filter !== null && filter !== void 0 && filter.needRemapping && filter !== null && filter !== void 0 && filter.scale) {
108
131
  filterData = dataArray.filter(function (record) {
109
- return _this.applyAttributeMapping(filter, record, bottomColor)[0];
132
+ return _this.applyAttributeMapping(filter, record)[0];
110
133
  });
111
134
  }
112
135
 
113
136
  if (attributesToRemapping.length) {
114
137
  // 过滤数据
115
138
  if (filter !== null && filter !== void 0 && filter.needRemapping) {
116
- var encodeData = _this.mapping(layer, attributes, filterData, undefined, bottomColor);
139
+ var encodeData = _this.mapping(layer, attributes, filterData, undefined);
117
140
 
118
141
  layer.setEncodedData(encodeData);
119
142
  filter.needRemapping = false;
120
143
  } else {
121
- var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData(), bottomColor);
144
+ var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData());
122
145
 
123
146
  layer.setEncodedData(_encodeData);
124
147
  } // 处理文本更新
@@ -130,11 +153,10 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
130
153
  }
131
154
  }, {
132
155
  key: "generateMaping",
133
- value: function generateMaping(layer, _ref2) {
156
+ value: function generateMaping(layer, _ref4) {
134
157
  var _this2 = this;
135
158
 
136
- var styleAttributeService = _ref2.styleAttributeService;
137
- var bottomColor = layer.getBottomColor();
159
+ var styleAttributeService = _ref4.styleAttributeService;
138
160
  var attributes = styleAttributeService.getLayerStyleAttributes() || [];
139
161
  var filter = styleAttributeService.getLayerStyleAttribute('filter');
140
162
  var dataArray = layer.getSource().data.dataArray;
@@ -142,30 +164,29 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
142
164
 
143
165
  if (filter !== null && filter !== void 0 && filter.scale) {
144
166
  filterData = dataArray.filter(function (record) {
145
- return _this2.applyAttributeMapping(filter, record, bottomColor)[0];
167
+ return _this2.applyAttributeMapping(filter, record)[0];
146
168
  });
147
- }
169
+ } // Tip: layer 对数据做处理
170
+ // 数据处理 在数据进行 mapping 生成 encodeData 之前对数据进行处理
171
+ // 在各个 layer 中继承
172
+
148
173
 
149
- var encodeData = this.mapping(layer, attributes, filterData, undefined, bottomColor);
174
+ filterData = layer.processData(filterData);
175
+ var encodeData = this.mapping(layer, attributes, filterData, undefined);
150
176
  layer.setEncodedData(encodeData); // 对外暴露事件
151
177
 
152
178
  layer.emit('dataUpdate', null);
153
179
  }
154
180
  }, {
155
181
  key: "mapping",
156
- value: function mapping(layer, attributes, data, predata, minimumColor) {
182
+ value: function mapping(layer, attributes, data, predata) {
157
183
  var _this3 = this;
158
184
 
159
- var _ref3 = layer.getLayerConfig(),
160
- _ref3$arrow = _ref3.arrow,
161
- arrow = _ref3$arrow === void 0 ? {
185
+ var _ref5 = layer.getLayerConfig(),
186
+ _ref5$arrow = _ref5.arrow,
187
+ arrow = _ref5$arrow === void 0 ? {
162
188
  enable: false
163
- } : _ref3$arrow,
164
- usage = _ref3.usage;
165
-
166
- if (usage === 'basemap') {
167
- return this.mapLayerMapping(layer, attributes, data, predata);
168
- }
189
+ } : _ref5$arrow;
169
190
 
170
191
  var usedAttributes = attributes.filter(function (attribute) {
171
192
  return attribute.scale !== undefined;
@@ -177,7 +198,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
177
198
  coordinates: record.coordinates
178
199
  }, preRecord);
179
200
  usedAttributes.forEach(function (attribute) {
180
- var values = _this3.applyAttributeMapping(attribute, record, minimumColor);
201
+ var values = _this3.applyAttributeMapping(attribute, record);
181
202
 
182
203
  attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
183
204
 
@@ -353,7 +374,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
353
374
  }
354
375
  }, {
355
376
  key: "applyAttributeMapping",
356
- value: function applyAttributeMapping(attribute, record, minimumColor) {
377
+ value: function applyAttributeMapping(attribute, record) {
357
378
  var _attribute$scale;
358
379
 
359
380
  if (!attribute.scale) {
@@ -362,10 +383,10 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
362
383
 
363
384
  var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
364
385
  var params = [];
365
- scalers.forEach(function (_ref4) {
386
+ scalers.forEach(function (_ref6) {
366
387
  var _attribute$scale2;
367
388
 
368
- var field = _ref4.field;
389
+ var field = _ref6.field;
369
390
 
370
391
  if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
371
392
  // TODO:多字段,常量
@@ -373,11 +394,6 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
373
394
  }
374
395
  });
375
396
  var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
376
-
377
- if (attribute.name === 'color' && !(0, _l7Utils.isColor)(mappingResult[0])) {
378
- return [minimumColor];
379
- }
380
-
381
397
  return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
382
398
  }
383
399
  }, {
@@ -391,10 +407,10 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
391
407
 
392
408
  var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale3 = attribute.scale) === null || _attribute$scale3 === void 0 ? void 0 : _attribute$scale3.scalers) || [];
393
409
  var params = [];
394
- scalers.forEach(function (_ref5) {
410
+ scalers.forEach(function (_ref7) {
395
411
  var _attribute$scale4;
396
412
 
397
- var field = _ref5.field;
413
+ var field = _ref7.field;
398
414
 
399
415
  if (record.hasOwnProperty(field) || ((_attribute$scale4 = attribute.scale) === null || _attribute$scale4 === void 0 ? void 0 : _attribute$scale4.type) === 'variable') {
400
416
  params.push(record[field]);