@antv/l7-layers 2.10.3 → 2.10.5
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.
- package/es/Geometry/index.d.ts +3 -2
- package/es/Geometry/index.js +17 -27
- package/es/Geometry/models/billboard.d.ts +2 -2
- package/es/Geometry/models/billboard.js +37 -77
- package/es/Geometry/models/plane.d.ts +2 -2
- package/es/Geometry/models/plane.js +40 -80
- package/es/Geometry/models/sprite.d.ts +2 -2
- package/es/Geometry/models/sprite.js +45 -83
- package/es/canvas/index.d.ts +3 -2
- package/es/canvas/index.js +19 -29
- package/es/canvas/models/canvas.d.ts +2 -2
- package/es/canvas/models/canvas.js +15 -54
- package/es/citybuliding/building.d.ts +3 -2
- package/es/citybuliding/building.js +17 -26
- package/es/citybuliding/models/build.d.ts +2 -2
- package/es/citybuliding/models/build.js +25 -70
- package/es/core/BaseLayer.d.ts +18 -21
- package/es/core/BaseLayer.js +273 -382
- package/es/core/BaseModel.d.ts +2 -2
- package/es/core/BaseModel.js +6 -47
- package/es/core/triangulation.js +1 -8
- package/es/earth/index.d.ts +2 -2
- package/es/earth/index.js +9 -28
- package/es/earth/models/atmosphere.d.ts +2 -2
- package/es/earth/models/atmosphere.js +22 -67
- package/es/earth/models/base.d.ts +2 -2
- package/es/earth/models/base.js +43 -89
- package/es/earth/models/bloomsphere.d.ts +2 -2
- package/es/earth/models/bloomsphere.js +22 -67
- package/es/heatmap/index.d.ts +3 -2
- package/es/heatmap/index.js +22 -33
- package/es/heatmap/models/grid.d.ts +2 -2
- package/es/heatmap/models/grid.js +27 -68
- package/es/heatmap/models/grid3d.d.ts +2 -2
- package/es/heatmap/models/grid3d.js +28 -69
- package/es/heatmap/models/heatmap.d.ts +2 -2
- package/es/heatmap/models/heatmap.js +14 -40
- package/es/heatmap/models/hexagon.d.ts +2 -2
- package/es/heatmap/models/hexagon.js +28 -69
- package/es/image/index.d.ts +3 -2
- package/es/image/index.js +17 -27
- package/es/image/models/dataImage.d.ts +2 -2
- package/es/image/models/dataImage.js +54 -93
- package/es/image/models/image.d.ts +2 -2
- package/es/image/models/image.js +67 -108
- package/es/image/models/tileDataImage.d.ts +2 -2
- package/es/image/models/tileDataImage.js +43 -84
- package/es/index.d.ts +2 -2
- package/es/index.js +2 -2
- package/es/line/index.d.ts +4 -5
- package/es/line/index.js +25 -51
- package/es/line/models/arc.d.ts +2 -2
- package/es/line/models/arc.js +38 -73
- package/es/line/models/arc_3d.d.ts +2 -2
- package/es/line/models/arc_3d.js +34 -69
- package/es/line/models/earthArc_3d.d.ts +2 -2
- package/es/line/models/earthArc_3d.js +37 -72
- package/es/line/models/great_circle.d.ts +2 -2
- package/es/line/models/great_circle.js +29 -70
- package/es/line/models/half.d.ts +2 -2
- package/es/line/models/half.js +17 -40
- package/es/line/models/index.d.ts +1 -1
- package/es/line/models/index.js +2 -0
- package/es/line/models/line.d.ts +2 -2
- package/es/line/models/line.js +47 -79
- package/es/line/models/linearline.d.ts +2 -2
- package/es/line/models/linearline.js +31 -70
- package/es/line/models/simpleLine.d.ts +2 -2
- package/es/line/models/simpleLine.js +34 -71
- package/es/line/models/simpleTileLine.d.ts +2 -2
- package/es/line/models/simpleTileLine.js +30 -70
- package/es/line/models/tile.d.ts +2 -2
- package/es/line/models/tile.js +17 -40
- package/es/line/models/wall.d.ts +2 -2
- package/es/line/models/wall.js +22 -67
- package/es/mask/index.d.ts +4 -2
- package/es/mask/index.js +97 -27
- package/es/mask/models/fill.d.ts +2 -2
- package/es/mask/models/fill.js +16 -40
- package/es/mask/models/index.d.ts +1 -1
- package/es/mask/models/index.js +3 -1
- package/es/plugins/DataMappingPlugin.d.ts +2 -0
- package/es/plugins/DataMappingPlugin.js +152 -90
- package/es/plugins/DataSourcePlugin.js +30 -74
- package/es/plugins/FeatureScalePlugin.d.ts +1 -0
- package/es/plugins/FeatureScalePlugin.js +61 -85
- package/es/plugins/LayerModelPlugin.d.ts +2 -2
- package/es/plugins/LayerModelPlugin.js +37 -121
- package/es/plugins/LayerStylePlugin.js +6 -1
- package/es/plugins/MultiPassRendererPlugin.js +1 -1
- package/es/plugins/PixelPickingPlugin.js +1 -1
- package/es/plugins/RegisterStyleAttributePlugin.js +16 -1
- package/es/plugins/UpdateModelPlugin.js +0 -3
- package/es/plugins/UpdateStyleAttributePlugin.js +6 -3
- package/es/point/index.d.ts +4 -4
- package/es/point/index.js +23 -55
- package/es/point/models/earthExtrude.d.ts +2 -2
- package/es/point/models/earthExtrude.js +30 -73
- package/es/point/models/earthFill.d.ts +2 -2
- package/es/point/models/earthFill.js +21 -66
- package/es/point/models/extrude.d.ts +2 -2
- package/es/point/models/extrude.js +17 -40
- package/es/point/models/fill.d.ts +2 -2
- package/es/point/models/fill.js +20 -43
- package/es/point/models/fillmage.d.ts +2 -2
- package/es/point/models/fillmage.js +43 -82
- package/es/point/models/image.d.ts +2 -2
- package/es/point/models/image.js +31 -72
- package/es/point/models/index.d.ts +1 -1
- package/es/point/models/index.js +2 -0
- package/es/point/models/normal.d.ts +2 -2
- package/es/point/models/normal.js +30 -71
- package/es/point/models/radar.d.ts +2 -2
- package/es/point/models/radar.js +35 -75
- package/es/point/models/simplePoint.d.ts +2 -2
- package/es/point/models/simplePoint.js +29 -70
- package/es/point/models/text.d.ts +2 -3
- package/es/point/models/text.js +110 -183
- package/es/point/models/tile.d.ts +2 -2
- package/es/point/models/tile.js +35 -77
- package/es/point/models/tileText.d.ts +2 -2
- package/es/point/models/tileText.js +116 -151
- package/es/polygon/index.d.ts +3 -2
- package/es/polygon/index.js +24 -27
- package/es/polygon/models/extrude.d.ts +2 -2
- package/es/polygon/models/extrude.js +32 -69
- package/es/polygon/models/fill.d.ts +2 -2
- package/es/polygon/models/fill.js +43 -76
- package/es/polygon/models/index.d.ts +1 -1
- package/es/polygon/models/index.js +2 -0
- package/es/polygon/models/ocean.d.ts +2 -2
- package/es/polygon/models/ocean.js +28 -69
- package/es/polygon/models/tile.d.ts +2 -2
- package/es/polygon/models/tile.js +30 -70
- package/es/polygon/models/water.d.ts +2 -2
- package/es/polygon/models/water.js +28 -69
- package/es/polygon/shaders/extrude/polygon_extrude_frag.glsl +2 -1
- package/es/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl +2 -1
- package/es/polygon/shaders/extrude/polygon_extrudetex_frag.glsl +2 -1
- package/es/raster/index.d.ts +4 -3
- package/es/raster/index.js +22 -28
- package/es/raster/models/index.d.ts +1 -1
- package/es/raster/models/index.js +3 -1
- package/es/raster/models/raster.d.ts +2 -2
- package/es/raster/models/raster.js +13 -36
- package/es/raster/models/rasterRgb.d.ts +2 -2
- package/es/raster/models/rasterRgb.js +13 -36
- package/es/raster/models/rasterTile.d.ts +2 -2
- package/es/raster/models/rasterTile.js +36 -77
- package/es/raster/raster.d.ts +1 -1
- package/es/raster/raster.js +22 -42
- package/es/tile/interaction/TilePickService.d.ts +16 -0
- package/es/tile/interaction/TilePickService.js +129 -0
- package/es/tile/interaction/getRasterData.d.ts +2 -2
- package/es/tile/interaction/utils.js +11 -3
- package/es/tile/interface.d.ts +4 -5
- package/es/tile/manager/base.d.ts +12 -17
- package/es/tile/manager/base.js +47 -212
- package/es/tile/manager/layerManager.d.ts +19 -0
- package/es/tile/manager/layerManager.js +254 -0
- package/es/tile/manager/mapLayerManager.d.ts +7 -0
- package/es/tile/manager/mapLayerManager.js +119 -0
- package/es/tile/models/tileModel.d.ts +10 -0
- package/es/tile/models/tileModel.js +81 -0
- package/es/tile/render/TileRenderService.d.ts +10 -0
- package/es/tile/render/TileRenderService.js +68 -0
- package/es/tile/style/TileStyleService.d.ts +17 -0
- package/es/tile/style/TileStyleService.js +118 -0
- package/es/tile/style/constants.d.ts +13 -1
- package/es/tile/style/constants.js +15 -6
- package/es/tile/style/utils.d.ts +8 -1
- package/es/tile/style/utils.js +126 -0
- package/es/tile/tileFactory/base.d.ts +45 -0
- package/es/tile/tileFactory/base.js +403 -0
- package/es/tile/tileFactory/index.d.ts +4 -10
- package/es/tile/tileFactory/index.js +23 -30
- package/es/tile/tileFactory/layers/{RasterDataLayer.d.ts → rasterDataLayer.d.ts} +3 -3
- package/es/tile/tileFactory/layers/{RasterDataLayer.js → rasterDataLayer.js} +21 -33
- package/es/tile/tileFactory/layers/{TileDebugLayer.d.ts → tileTest.d.ts} +2 -2
- package/es/tile/tileFactory/layers/{TileDebugLayer.js → tileTest.js} +10 -23
- package/es/tile/tileFactory/layers/vectorLayer.d.ts +30 -0
- package/es/tile/tileFactory/layers/vectorLayer.js +253 -0
- package/es/tile/tileFactory/line.d.ts +12 -0
- package/es/tile/tileFactory/line.js +59 -0
- package/es/tile/tileFactory/mask.d.ts +12 -0
- package/es/tile/tileFactory/mask.js +60 -0
- package/es/tile/tileFactory/point.d.ts +12 -0
- package/es/tile/tileFactory/point.js +60 -0
- package/es/tile/tileFactory/polygon.d.ts +12 -0
- package/es/tile/tileFactory/polygon.js +59 -0
- package/es/tile/tileFactory/raster.d.ts +12 -0
- package/es/tile/tileFactory/raster.js +55 -0
- package/es/tile/tileFactory/rasterData.d.ts +12 -0
- package/es/tile/tileFactory/rasterData.js +81 -0
- package/es/tile/tileFactory/test.d.ts +12 -0
- package/es/tile/tileFactory/test.js +94 -0
- package/es/tile/tileLayer/MapTileLayer.d.ts +6 -0
- package/es/tile/tileLayer/MapTileLayer.js +48 -0
- package/es/tile/tileLayer/TileLayer.d.ts +22 -0
- package/es/tile/tileLayer/TileLayer.js +198 -0
- package/es/tile/tileLayer/base.d.ts +33 -0
- package/es/tile/tileLayer/base.js +212 -0
- package/es/tile/utils.d.ts +11 -1
- package/es/tile/utils.js +129 -0
- package/es/utils/dataMappingStyle.d.ts +4 -4
- package/es/utils/dataMappingStyle.js +18 -16
- package/es/utils/layerData.js +11 -5
- package/es/wind/index.d.ts +3 -2
- package/es/wind/index.js +17 -27
- package/es/wind/models/wind.d.ts +2 -2
- package/es/wind/models/wind.js +104 -123
- package/lib/Geometry/index.js +17 -29
- package/lib/Geometry/models/billboard.js +37 -79
- package/lib/Geometry/models/plane.js +40 -82
- package/lib/Geometry/models/sprite.js +45 -85
- package/lib/canvas/index.js +19 -31
- package/lib/canvas/models/canvas.js +15 -56
- package/lib/citybuliding/building.js +17 -28
- package/lib/citybuliding/models/build.js +25 -72
- package/lib/core/BaseLayer.js +268 -382
- package/lib/core/BaseModel.js +6 -48
- package/lib/core/triangulation.js +1 -8
- package/lib/earth/index.js +9 -30
- package/lib/earth/models/atmosphere.js +22 -69
- package/lib/earth/models/base.js +42 -90
- package/lib/earth/models/bloomsphere.js +22 -69
- package/lib/heatmap/index.js +22 -35
- package/lib/heatmap/models/grid.js +27 -70
- package/lib/heatmap/models/grid3d.js +28 -71
- package/lib/heatmap/models/heatmap.js +14 -40
- package/lib/heatmap/models/hexagon.js +28 -71
- package/lib/image/index.js +17 -29
- package/lib/image/models/dataImage.js +54 -95
- package/lib/image/models/image.js +67 -110
- package/lib/image/models/tileDataImage.js +43 -86
- package/lib/index.js +5 -5
- package/lib/line/index.js +26 -53
- package/lib/line/models/arc.js +38 -75
- package/lib/line/models/arc_3d.js +34 -71
- package/lib/line/models/earthArc_3d.js +37 -74
- package/lib/line/models/great_circle.js +29 -72
- package/lib/line/models/half.js +17 -40
- package/lib/line/models/index.js +3 -0
- package/lib/line/models/line.js +47 -81
- package/lib/line/models/linearline.js +31 -72
- package/lib/line/models/simpleLine.js +34 -73
- package/lib/line/models/simpleTileLine.js +30 -72
- package/lib/line/models/tile.js +17 -40
- package/lib/line/models/wall.js +22 -69
- package/lib/mask/index.js +99 -28
- package/lib/mask/models/fill.js +16 -40
- package/lib/mask/models/index.js +4 -1
- package/lib/plugins/DataMappingPlugin.js +149 -91
- package/lib/plugins/DataSourcePlugin.js +30 -76
- package/lib/plugins/FeatureScalePlugin.js +61 -87
- package/lib/plugins/LayerModelPlugin.js +41 -128
- package/lib/plugins/LayerStylePlugin.js +6 -1
- package/lib/plugins/MultiPassRendererPlugin.js +1 -1
- package/lib/plugins/PixelPickingPlugin.js +1 -1
- package/lib/plugins/RegisterStyleAttributePlugin.js +16 -1
- package/lib/plugins/UpdateModelPlugin.js +0 -3
- package/lib/plugins/UpdateStyleAttributePlugin.js +6 -3
- package/lib/point/index.js +24 -56
- package/lib/point/models/earthExtrude.js +30 -75
- package/lib/point/models/earthFill.js +21 -68
- package/lib/point/models/extrude.js +17 -40
- package/lib/point/models/fill.js +21 -44
- package/lib/point/models/fillmage.js +43 -84
- package/lib/point/models/image.js +31 -74
- package/lib/point/models/index.js +3 -0
- package/lib/point/models/normal.js +30 -73
- package/lib/point/models/radar.js +35 -77
- package/lib/point/models/simplePoint.js +29 -72
- package/lib/point/models/text.js +109 -183
- package/lib/point/models/tile.js +35 -79
- package/lib/point/models/tileText.js +115 -151
- package/lib/polygon/index.js +25 -29
- package/lib/polygon/models/extrude.js +32 -71
- package/lib/polygon/models/fill.js +43 -78
- package/lib/polygon/models/index.js +3 -0
- package/lib/polygon/models/ocean.js +28 -71
- package/lib/polygon/models/tile.js +30 -72
- package/lib/polygon/models/water.js +28 -71
- package/lib/polygon/shaders/extrude/polygon_extrude_frag.glsl +2 -1
- package/lib/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl +2 -1
- package/lib/polygon/shaders/extrude/polygon_extrudetex_frag.glsl +2 -1
- package/lib/raster/index.js +22 -30
- package/lib/raster/models/index.js +4 -1
- package/lib/raster/models/raster.js +13 -36
- package/lib/raster/models/rasterRgb.js +13 -36
- package/lib/raster/models/rasterTile.js +36 -79
- package/lib/raster/raster.js +22 -44
- package/lib/tile/interaction/TilePickService.js +143 -0
- package/lib/tile/interaction/utils.js +11 -3
- package/lib/tile/manager/base.js +47 -213
- package/lib/tile/manager/layerManager.js +275 -0
- package/lib/tile/manager/mapLayerManager.js +134 -0
- package/lib/tile/models/tileModel.js +94 -0
- package/lib/tile/render/TileRenderService.js +78 -0
- package/lib/tile/style/TileStyleService.js +133 -0
- package/lib/tile/style/constants.js +19 -8
- package/lib/tile/style/utils.js +140 -0
- package/lib/tile/tileFactory/base.js +427 -0
- package/lib/tile/tileFactory/index.js +24 -42
- package/lib/tile/tileFactory/layers/{RasterDataLayer.js → rasterDataLayer.js} +21 -35
- package/lib/tile/tileFactory/layers/{TileDebugLayer.js → tileTest.js} +11 -24
- package/lib/tile/tileFactory/layers/vectorLayer.js +268 -0
- package/lib/tile/tileFactory/line.js +70 -0
- package/lib/tile/tileFactory/mask.js +71 -0
- package/lib/tile/tileFactory/point.js +71 -0
- package/lib/tile/tileFactory/polygon.js +70 -0
- package/lib/tile/tileFactory/raster.js +68 -0
- package/lib/tile/tileFactory/rasterData.js +93 -0
- package/lib/tile/tileFactory/test.js +106 -0
- package/lib/tile/tileLayer/MapTileLayer.js +63 -0
- package/lib/tile/tileLayer/TileLayer.js +215 -0
- package/lib/tile/tileLayer/base.js +225 -0
- package/lib/tile/utils.js +148 -0
- package/lib/utils/dataMappingStyle.js +20 -18
- package/lib/utils/layerData.js +10 -4
- package/lib/wind/index.js +17 -29
- package/lib/wind/models/wind.js +104 -125
- package/package.json +7 -7
- package/es/core/LayerPickService.d.ts +0 -9
- package/es/core/LayerPickService.js +0 -85
- package/es/tile/service/TileLayerService.d.ts +0 -33
- package/es/tile/service/TileLayerService.js +0 -172
- package/es/tile/service/TilePickService.d.ts +0 -22
- package/es/tile/service/TilePickService.js +0 -148
- package/es/tile/service/TileSourceService.d.ts +0 -7
- package/es/tile/service/TileSourceService.js +0 -39
- package/es/tile/tileFactory/DebugTile.d.ts +0 -16
- package/es/tile/tileFactory/DebugTile.js +0 -100
- package/es/tile/tileFactory/ImageTile.d.ts +0 -14
- package/es/tile/tileFactory/ImageTile.js +0 -89
- package/es/tile/tileFactory/MaskTile.d.ts +0 -17
- package/es/tile/tileFactory/MaskTile.js +0 -98
- package/es/tile/tileFactory/RasterRGBTile.d.ts +0 -16
- package/es/tile/tileFactory/RasterRGBTile.js +0 -91
- package/es/tile/tileFactory/RasterTile.d.ts +0 -27
- package/es/tile/tileFactory/RasterTile.js +0 -186
- package/es/tile/tileFactory/Tile.d.ts +0 -34
- package/es/tile/tileFactory/Tile.js +0 -199
- package/es/tile/tileFactory/VectorTile.d.ts +0 -20
- package/es/tile/tileFactory/VectorTile.js +0 -152
- package/es/tile/tileFactory/util.d.ts +0 -6
- package/es/tile/tileFactory/util.js +0 -33
- package/es/tile/tileLayer/BaseLayer.d.ts +0 -46
- package/es/tile/tileLayer/BaseLayer.js +0 -358
- package/lib/core/LayerPickService.js +0 -96
- package/lib/tile/service/TileLayerService.js +0 -185
- package/lib/tile/service/TilePickService.js +0 -162
- package/lib/tile/service/TileSourceService.js +0 -59
- package/lib/tile/tileFactory/DebugTile.js +0 -115
- package/lib/tile/tileFactory/ImageTile.js +0 -104
- package/lib/tile/tileFactory/MaskTile.js +0 -113
- package/lib/tile/tileFactory/RasterRGBTile.js +0 -106
- package/lib/tile/tileFactory/RasterTile.js +0 -205
- package/lib/tile/tileFactory/Tile.js +0 -210
- package/lib/tile/tileFactory/VectorTile.js +0 -167
- package/lib/tile/tileFactory/util.js +0 -48
- package/lib/tile/tileLayer/BaseLayer.js +0 -373
package/es/mask/models/fill.d.ts
CHANGED
|
@@ -5,8 +5,8 @@ export default class MaskModel extends BaseModel {
|
|
|
5
5
|
u_opacity: number;
|
|
6
6
|
u_color: number[];
|
|
7
7
|
};
|
|
8
|
-
initModels(
|
|
9
|
-
buildModels(): Promise<
|
|
8
|
+
initModels(callbackModel: (models: IModel[]) => void): void;
|
|
9
|
+
buildModels(callbackModel: (models: IModel[]) => void): Promise<void>;
|
|
10
10
|
clearModels(refresh?: boolean): void;
|
|
11
11
|
protected registerBuiltinAttributes(): string;
|
|
12
12
|
}
|
package/es/mask/models/fill.js
CHANGED
|
@@ -49,43 +49,18 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
49
49
|
}
|
|
50
50
|
}, {
|
|
51
51
|
key: "initModels",
|
|
52
|
-
value: function () {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
while (1) {
|
|
56
|
-
switch (_context.prev = _context.next) {
|
|
57
|
-
case 0:
|
|
58
|
-
_context.next = 2;
|
|
59
|
-
return this.buildModels();
|
|
60
|
-
|
|
61
|
-
case 2:
|
|
62
|
-
return _context.abrupt("return", _context.sent);
|
|
63
|
-
|
|
64
|
-
case 3:
|
|
65
|
-
case "end":
|
|
66
|
-
return _context.stop();
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
}, _callee, this);
|
|
70
|
-
}));
|
|
71
|
-
|
|
72
|
-
function initModels() {
|
|
73
|
-
return _initModels.apply(this, arguments);
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
return initModels;
|
|
77
|
-
}()
|
|
52
|
+
value: function initModels(callbackModel) {
|
|
53
|
+
this.buildModels(callbackModel);
|
|
54
|
+
}
|
|
78
55
|
}, {
|
|
79
56
|
key: "buildModels",
|
|
80
57
|
value: function () {
|
|
81
|
-
var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function
|
|
82
|
-
|
|
83
|
-
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
58
|
+
var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(callbackModel) {
|
|
59
|
+
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
84
60
|
while (1) {
|
|
85
|
-
switch (
|
|
61
|
+
switch (_context.prev = _context.next) {
|
|
86
62
|
case 0:
|
|
87
|
-
|
|
88
|
-
return this.layer.buildLayerModel({
|
|
63
|
+
this.layer.buildLayerModel({
|
|
89
64
|
moduleName: 'mask',
|
|
90
65
|
vertexShader: mask_vert,
|
|
91
66
|
fragmentShader: mask_frag,
|
|
@@ -109,21 +84,22 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
109
84
|
}
|
|
110
85
|
},
|
|
111
86
|
pick: false
|
|
87
|
+
}).then(function (model) {
|
|
88
|
+
callbackModel([model]);
|
|
89
|
+
}).catch(function (err) {
|
|
90
|
+
console.warn(err);
|
|
91
|
+
callbackModel([]);
|
|
112
92
|
});
|
|
113
93
|
|
|
114
|
-
case
|
|
115
|
-
model = _context2.sent;
|
|
116
|
-
return _context2.abrupt("return", [model]);
|
|
117
|
-
|
|
118
|
-
case 4:
|
|
94
|
+
case 1:
|
|
119
95
|
case "end":
|
|
120
|
-
return
|
|
96
|
+
return _context.stop();
|
|
121
97
|
}
|
|
122
98
|
}
|
|
123
|
-
},
|
|
99
|
+
}, _callee, this);
|
|
124
100
|
}));
|
|
125
101
|
|
|
126
|
-
function buildModels() {
|
|
102
|
+
function buildModels(_x) {
|
|
127
103
|
return _buildModels.apply(this, arguments);
|
|
128
104
|
}
|
|
129
105
|
|
package/es/mask/models/index.js
CHANGED
|
@@ -8,9 +8,11 @@ export default class DataMappingPlugin implements ILayerPlugin {
|
|
|
8
8
|
}): void;
|
|
9
9
|
private generateMaping;
|
|
10
10
|
private mapping;
|
|
11
|
+
private mapLayerMapping;
|
|
11
12
|
private adjustData2Amap2Coordinates;
|
|
12
13
|
private adjustData2SimpleCoordinates;
|
|
13
14
|
private unProjectCoordinates;
|
|
14
15
|
private applyAttributeMapping;
|
|
16
|
+
private applyMapLayerAttributeMapping;
|
|
15
17
|
private getArrowPoints;
|
|
16
18
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
2
|
-
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
3
2
|
import _initializerDefineProperty from "@babel/runtime/helpers/esm/initializerDefineProperty";
|
|
4
3
|
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
5
4
|
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
@@ -9,10 +8,9 @@ import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWar
|
|
|
9
8
|
|
|
10
9
|
var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
|
|
11
10
|
|
|
12
|
-
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
13
11
|
import { TYPES } from '@antv/l7-core';
|
|
14
12
|
import { Version } from '@antv/l7-maps';
|
|
15
|
-
import { normalize, rgb2arr } from '@antv/l7-utils';
|
|
13
|
+
import { isColor, normalize, rgb2arr } from '@antv/l7-utils';
|
|
16
14
|
import { inject, injectable } from 'inversify';
|
|
17
15
|
import { cloneDeep } from 'lodash';
|
|
18
16
|
import 'reflect-metadata';
|
|
@@ -31,73 +29,59 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
31
29
|
var _this = this;
|
|
32
30
|
|
|
33
31
|
var styleAttributeService = _ref.styleAttributeService;
|
|
34
|
-
layer.hooks.init.
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
switch (_context.prev = _context.next) {
|
|
38
|
-
case 0:
|
|
39
|
-
// 初始化重新生成 map
|
|
40
|
-
_this.generateMaping(layer, {
|
|
41
|
-
styleAttributeService: styleAttributeService
|
|
42
|
-
});
|
|
43
|
-
|
|
44
|
-
case 1:
|
|
45
|
-
case "end":
|
|
46
|
-
return _context.stop();
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
}, _callee);
|
|
50
|
-
})));
|
|
51
|
-
layer.hooks.beforeRenderData.tapPromise('DataMappingPlugin', /*#__PURE__*/function () {
|
|
52
|
-
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(flag) {
|
|
53
|
-
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
54
|
-
while (1) {
|
|
55
|
-
switch (_context2.prev = _context2.next) {
|
|
56
|
-
case 0:
|
|
57
|
-
if (flag) {
|
|
58
|
-
_context2.next = 2;
|
|
59
|
-
break;
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
return _context2.abrupt("return", flag);
|
|
63
|
-
|
|
64
|
-
case 2:
|
|
65
|
-
layer.dataState.dataMappingNeedUpdate = false;
|
|
66
|
-
|
|
67
|
-
_this.generateMaping(layer, {
|
|
68
|
-
styleAttributeService: styleAttributeService
|
|
69
|
-
});
|
|
70
|
-
|
|
71
|
-
return _context2.abrupt("return", true);
|
|
72
|
-
|
|
73
|
-
case 5:
|
|
74
|
-
case "end":
|
|
75
|
-
return _context2.stop();
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
}, _callee2);
|
|
79
|
-
}));
|
|
32
|
+
layer.hooks.init.tap('DataMappingPlugin', function () {
|
|
33
|
+
// 初始化重新生成 map
|
|
34
|
+
var source = layer.getSource();
|
|
80
35
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
36
|
+
if (source.inited) {
|
|
37
|
+
_this.generateMaping(layer, {
|
|
38
|
+
styleAttributeService: styleAttributeService
|
|
39
|
+
});
|
|
40
|
+
} else {
|
|
41
|
+
source.once('update', function () {
|
|
42
|
+
_this.generateMaping(layer, {
|
|
43
|
+
styleAttributeService: styleAttributeService
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
layer.hooks.beforeRenderData.tap('DataMappingPlugin', function () {
|
|
49
|
+
layer.dataState.dataMappingNeedUpdate = false;
|
|
50
|
+
var source = layer.getSource();
|
|
51
|
+
|
|
52
|
+
if (source.inited) {
|
|
53
|
+
_this.generateMaping(layer, {
|
|
54
|
+
styleAttributeService: styleAttributeService
|
|
55
|
+
});
|
|
56
|
+
} else {
|
|
57
|
+
source.once('update', function () {
|
|
58
|
+
_this.generateMaping(layer, {
|
|
59
|
+
styleAttributeService: styleAttributeService
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
return true;
|
|
65
|
+
}); // remapping before render
|
|
85
66
|
|
|
86
67
|
layer.hooks.beforeRender.tap('DataMappingPlugin', function () {
|
|
87
|
-
var
|
|
68
|
+
var _layer$getLayerConfig = layer.getLayerConfig(),
|
|
69
|
+
usage = _layer$getLayerConfig.usage;
|
|
88
70
|
|
|
89
|
-
if (
|
|
71
|
+
if (usage === 'basemap') {
|
|
90
72
|
return;
|
|
91
73
|
}
|
|
92
74
|
|
|
93
|
-
var
|
|
94
|
-
var filter = styleAttributeService.getLayerStyleAttribute('filter');
|
|
95
|
-
var dataArray = source.data.dataArray; // TODO 数据为空的情况
|
|
75
|
+
var source = layer.getSource();
|
|
96
76
|
|
|
97
|
-
if (
|
|
77
|
+
if (layer.layerModelNeedUpdate || !source || !source.inited) {
|
|
98
78
|
return;
|
|
99
79
|
}
|
|
100
80
|
|
|
81
|
+
var bottomColor = layer.getBottomColor();
|
|
82
|
+
var attributes = styleAttributeService.getLayerStyleAttributes() || [];
|
|
83
|
+
var filter = styleAttributeService.getLayerStyleAttribute('filter');
|
|
84
|
+
var dataArray = source.data.dataArray;
|
|
101
85
|
var attributesToRemapping = attributes.filter(function (attribute) {
|
|
102
86
|
return attribute.needRemapping;
|
|
103
87
|
} // 如果filter变化
|
|
@@ -106,33 +90,35 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
106
90
|
|
|
107
91
|
if (filter !== null && filter !== void 0 && filter.needRemapping && filter !== null && filter !== void 0 && filter.scale) {
|
|
108
92
|
filterData = dataArray.filter(function (record) {
|
|
109
|
-
return _this.applyAttributeMapping(filter, record)[0];
|
|
93
|
+
return _this.applyAttributeMapping(filter, record, bottomColor)[0];
|
|
110
94
|
});
|
|
111
95
|
}
|
|
112
96
|
|
|
113
97
|
if (attributesToRemapping.length) {
|
|
114
98
|
// 过滤数据
|
|
115
99
|
if (filter !== null && filter !== void 0 && filter.needRemapping) {
|
|
116
|
-
var encodeData = _this.mapping(layer, attributes, filterData, undefined);
|
|
100
|
+
var encodeData = _this.mapping(layer, attributes, filterData, undefined, bottomColor);
|
|
117
101
|
|
|
118
102
|
layer.setEncodedData(encodeData);
|
|
119
103
|
filter.needRemapping = false;
|
|
120
104
|
} else {
|
|
121
|
-
var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData());
|
|
105
|
+
var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData(), bottomColor);
|
|
122
106
|
|
|
123
107
|
layer.setEncodedData(_encodeData);
|
|
124
|
-
} //
|
|
125
|
-
|
|
108
|
+
} // 处理文本更新
|
|
109
|
+
|
|
126
110
|
|
|
111
|
+
layer.emit('remapping', null);
|
|
127
112
|
}
|
|
128
113
|
});
|
|
129
114
|
}
|
|
130
115
|
}, {
|
|
131
116
|
key: "generateMaping",
|
|
132
|
-
value: function generateMaping(layer,
|
|
117
|
+
value: function generateMaping(layer, _ref2) {
|
|
133
118
|
var _this2 = this;
|
|
134
119
|
|
|
135
|
-
var styleAttributeService =
|
|
120
|
+
var styleAttributeService = _ref2.styleAttributeService;
|
|
121
|
+
var bottomColor = layer.getBottomColor();
|
|
136
122
|
var attributes = styleAttributeService.getLayerStyleAttributes() || [];
|
|
137
123
|
var filter = styleAttributeService.getLayerStyleAttribute('filter');
|
|
138
124
|
var dataArray = layer.getSource().data.dataArray;
|
|
@@ -140,29 +126,30 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
140
126
|
|
|
141
127
|
if (filter !== null && filter !== void 0 && filter.scale) {
|
|
142
128
|
filterData = dataArray.filter(function (record) {
|
|
143
|
-
return _this2.applyAttributeMapping(filter, record)[0];
|
|
129
|
+
return _this2.applyAttributeMapping(filter, record, bottomColor)[0];
|
|
144
130
|
});
|
|
145
|
-
}
|
|
146
|
-
// 数据处理 在数据进行 mapping 生成 encodeData 之前对数据进行处理
|
|
147
|
-
// 在各个 layer 中继承
|
|
148
|
-
|
|
131
|
+
}
|
|
149
132
|
|
|
150
|
-
|
|
151
|
-
var encodeData = this.mapping(layer, attributes, filterData, undefined);
|
|
133
|
+
var encodeData = this.mapping(layer, attributes, filterData, undefined, bottomColor);
|
|
152
134
|
layer.setEncodedData(encodeData); // 对外暴露事件
|
|
153
135
|
|
|
154
136
|
layer.emit('dataUpdate', null);
|
|
155
137
|
}
|
|
156
138
|
}, {
|
|
157
139
|
key: "mapping",
|
|
158
|
-
value: function mapping(layer, attributes, data, predata) {
|
|
140
|
+
value: function mapping(layer, attributes, data, predata, minimumColor) {
|
|
159
141
|
var _this3 = this;
|
|
160
142
|
|
|
161
|
-
var
|
|
162
|
-
|
|
163
|
-
arrow =
|
|
143
|
+
var _ref3 = layer.getLayerConfig(),
|
|
144
|
+
_ref3$arrow = _ref3.arrow,
|
|
145
|
+
arrow = _ref3$arrow === void 0 ? {
|
|
164
146
|
enable: false
|
|
165
|
-
} :
|
|
147
|
+
} : _ref3$arrow,
|
|
148
|
+
usage = _ref3.usage;
|
|
149
|
+
|
|
150
|
+
if (usage === 'basemap') {
|
|
151
|
+
return this.mapLayerMapping(layer, attributes, data, predata);
|
|
152
|
+
}
|
|
166
153
|
|
|
167
154
|
var usedAttributes = attributes.filter(function (attribute) {
|
|
168
155
|
return attribute.scale !== undefined;
|
|
@@ -176,7 +163,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
176
163
|
}, preRecord);
|
|
177
164
|
|
|
178
165
|
usedAttributes.forEach(function (attribute) {
|
|
179
|
-
var values = _this3.applyAttributeMapping(attribute, record);
|
|
166
|
+
var values = _this3.applyAttributeMapping(attribute, record, minimumColor);
|
|
180
167
|
|
|
181
168
|
attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
|
|
182
169
|
|
|
@@ -216,10 +203,57 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
216
203
|
this.adjustData2SimpleCoordinates(mappedData);
|
|
217
204
|
return mappedData;
|
|
218
205
|
}
|
|
206
|
+
}, {
|
|
207
|
+
key: "mapLayerMapping",
|
|
208
|
+
value: function mapLayerMapping(layer, attributes, data, predata) {
|
|
209
|
+
var _this4 = this;
|
|
210
|
+
|
|
211
|
+
var usedAttributes = attributes.filter(function (attribute) {
|
|
212
|
+
return attribute.scale !== undefined;
|
|
213
|
+
});
|
|
214
|
+
var mappedData = data.map(function (record, i) {
|
|
215
|
+
var preRecord = predata ? predata[i] : {};
|
|
216
|
+
|
|
217
|
+
var encodeRecord = _objectSpread({
|
|
218
|
+
id: record._id,
|
|
219
|
+
coordinates: record.coordinates
|
|
220
|
+
}, preRecord);
|
|
221
|
+
|
|
222
|
+
usedAttributes.forEach(function (attribute) {
|
|
223
|
+
var _layer$shapeOption;
|
|
224
|
+
|
|
225
|
+
if (attribute.name === 'shape' && // @ts-ignore
|
|
226
|
+
((_layer$shapeOption = layer.shapeOption) === null || _layer$shapeOption === void 0 ? void 0 : _layer$shapeOption.field) === 'simple') {
|
|
227
|
+
encodeRecord[attribute.name] = 'simple';
|
|
228
|
+
attribute.needRemapping = false;
|
|
229
|
+
} else {
|
|
230
|
+
var values = _this4.applyMapLayerAttributeMapping(attribute, record);
|
|
231
|
+
|
|
232
|
+
attribute.needRemapping = false; // @ts-ignore
|
|
233
|
+
|
|
234
|
+
encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values; // 增加对 layer/text/iconfont unicode 映射的解析
|
|
235
|
+
|
|
236
|
+
if (attribute.name === 'shape') {
|
|
237
|
+
encodeRecord.shape = _this4.fontService.getIconFontKey(encodeRecord[attribute.name]);
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
});
|
|
241
|
+
|
|
242
|
+
if (encodeRecord.size === undefined) {
|
|
243
|
+
// in case not set size
|
|
244
|
+
encodeRecord.size = 1;
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
return encodeRecord;
|
|
248
|
+
}); // 调整数据兼容 Amap2.0
|
|
249
|
+
|
|
250
|
+
this.adjustData2Amap2Coordinates(mappedData, layer);
|
|
251
|
+
return mappedData;
|
|
252
|
+
}
|
|
219
253
|
}, {
|
|
220
254
|
key: "adjustData2Amap2Coordinates",
|
|
221
255
|
value: function adjustData2Amap2Coordinates(mappedData, layer) {
|
|
222
|
-
var
|
|
256
|
+
var _this5 = this;
|
|
223
257
|
|
|
224
258
|
// 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
|
|
225
259
|
if (mappedData.length > 0 && this.mapService.version === Version['GAODE2.x']) {
|
|
@@ -238,7 +272,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
238
272
|
// @ts-ignore
|
|
239
273
|
// d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
|
|
240
274
|
|
|
241
|
-
d.coordinates =
|
|
275
|
+
d.coordinates = _this5.mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
|
|
242
276
|
});
|
|
243
277
|
} else {
|
|
244
278
|
// 连续的线、面数据
|
|
@@ -252,7 +286,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
252
286
|
// @ts-ignore
|
|
253
287
|
// d.coordinates = this.mapService.lngLatToCoords(d.coordinates);
|
|
254
288
|
|
|
255
|
-
d.coordinates =
|
|
289
|
+
d.coordinates = _this5.mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
|
|
256
290
|
});
|
|
257
291
|
}
|
|
258
292
|
}
|
|
@@ -260,12 +294,12 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
260
294
|
}, {
|
|
261
295
|
key: "adjustData2SimpleCoordinates",
|
|
262
296
|
value: function adjustData2SimpleCoordinates(mappedData) {
|
|
263
|
-
var
|
|
297
|
+
var _this6 = this;
|
|
264
298
|
|
|
265
299
|
if (mappedData.length > 0 && this.mapService.version === Version.SIMPLE) {
|
|
266
300
|
mappedData.map(function (d) {
|
|
267
301
|
if (!d.simpleCoordinate) {
|
|
268
|
-
d.coordinates =
|
|
302
|
+
d.coordinates = _this6.unProjectCoordinates(d.coordinates);
|
|
269
303
|
d.simpleCoordinate = true;
|
|
270
304
|
}
|
|
271
305
|
});
|
|
@@ -274,7 +308,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
274
308
|
}, {
|
|
275
309
|
key: "unProjectCoordinates",
|
|
276
310
|
value: function unProjectCoordinates(coordinates) {
|
|
277
|
-
var
|
|
311
|
+
var _this7 = this;
|
|
278
312
|
|
|
279
313
|
if (typeof coordinates[0] === 'number') {
|
|
280
314
|
return this.mapService.simpleMapCoord.unproject(coordinates);
|
|
@@ -287,7 +321,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
287
321
|
// @ts-ignore
|
|
288
322
|
var c1 = [];
|
|
289
323
|
coord.map(function (co) {
|
|
290
|
-
c1.push(
|
|
324
|
+
c1.push(_this7.mapService.simpleMapCoord.unproject(co));
|
|
291
325
|
}); // @ts-ignore
|
|
292
326
|
|
|
293
327
|
coords.push(c1);
|
|
@@ -299,7 +333,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
299
333
|
var _coords = []; // @ts-ignore
|
|
300
334
|
|
|
301
335
|
coordinates.map(function (coord) {
|
|
302
|
-
_coords.push(
|
|
336
|
+
_coords.push(_this7.mapService.simpleMapCoord.unproject(coord));
|
|
303
337
|
}); // @ts-ignore
|
|
304
338
|
|
|
305
339
|
return _coords;
|
|
@@ -307,7 +341,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
307
341
|
}
|
|
308
342
|
}, {
|
|
309
343
|
key: "applyAttributeMapping",
|
|
310
|
-
value: function applyAttributeMapping(attribute, record) {
|
|
344
|
+
value: function applyAttributeMapping(attribute, record, minimumColor) {
|
|
311
345
|
var _attribute$scale;
|
|
312
346
|
|
|
313
347
|
if (!attribute.scale) {
|
|
@@ -316,10 +350,10 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
316
350
|
|
|
317
351
|
var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
|
|
318
352
|
var params = [];
|
|
319
|
-
scalers.forEach(function (
|
|
353
|
+
scalers.forEach(function (_ref4) {
|
|
320
354
|
var _attribute$scale2;
|
|
321
355
|
|
|
322
|
-
var field =
|
|
356
|
+
var field = _ref4.field;
|
|
323
357
|
|
|
324
358
|
if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
|
|
325
359
|
// TODO:多字段,常量
|
|
@@ -327,8 +361,36 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
|
|
|
327
361
|
}
|
|
328
362
|
});
|
|
329
363
|
var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
|
|
364
|
+
|
|
365
|
+
if (attribute.name === 'color' && !isColor(mappingResult[0])) {
|
|
366
|
+
return [minimumColor];
|
|
367
|
+
}
|
|
368
|
+
|
|
330
369
|
return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
|
|
331
370
|
}
|
|
371
|
+
}, {
|
|
372
|
+
key: "applyMapLayerAttributeMapping",
|
|
373
|
+
value: function applyMapLayerAttributeMapping(attribute, record) {
|
|
374
|
+
var _attribute$scale3;
|
|
375
|
+
|
|
376
|
+
if (!attribute.scale) {
|
|
377
|
+
return [];
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale3 = attribute.scale) === null || _attribute$scale3 === void 0 ? void 0 : _attribute$scale3.scalers) || [];
|
|
381
|
+
var params = [];
|
|
382
|
+
scalers.forEach(function (_ref5) {
|
|
383
|
+
var _attribute$scale4;
|
|
384
|
+
|
|
385
|
+
var field = _ref5.field;
|
|
386
|
+
|
|
387
|
+
if (record.hasOwnProperty(field) || ((_attribute$scale4 = attribute.scale) === null || _attribute$scale4 === void 0 ? void 0 : _attribute$scale4.type) === 'variable') {
|
|
388
|
+
params.push(record[field]);
|
|
389
|
+
}
|
|
390
|
+
});
|
|
391
|
+
var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
|
|
392
|
+
return mappingResult;
|
|
393
|
+
}
|
|
332
394
|
}, {
|
|
333
395
|
key: "getArrowPoints",
|
|
334
396
|
value: function getArrowPoints(p1, p2) {
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
2
1
|
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
2
|
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
4
3
|
|
|
5
4
|
var _dec, _class;
|
|
6
5
|
|
|
7
|
-
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
8
6
|
import { TYPES } from '@antv/l7-core';
|
|
9
7
|
import Source from '@antv/l7-source';
|
|
10
8
|
import { injectable } from 'inversify';
|
|
@@ -20,83 +18,41 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
|
|
|
20
18
|
var _this = this;
|
|
21
19
|
|
|
22
20
|
this.mapService = layer.getContainer().get(TYPES.IMapService);
|
|
23
|
-
layer.hooks.init.
|
|
24
|
-
var source
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
_context.next = 8;
|
|
54
|
-
break;
|
|
55
|
-
|
|
56
|
-
case 6:
|
|
57
|
-
_context.next = 8;
|
|
58
|
-
return new Promise(function (resolve) {
|
|
59
|
-
source.on('update', function (e) {
|
|
60
|
-
if (e.type === 'inited') {
|
|
61
|
-
_this.updateClusterData(layer);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
resolve(null);
|
|
65
|
-
});
|
|
66
|
-
});
|
|
67
|
-
|
|
68
|
-
case 8:
|
|
69
|
-
case "end":
|
|
70
|
-
return _context.stop();
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
}, _callee);
|
|
74
|
-
}))); // 检测数据是否需要更新
|
|
75
|
-
|
|
76
|
-
layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
|
|
77
|
-
var neeUpdateCluster, dataSourceNeedUpdate;
|
|
78
|
-
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
79
|
-
while (1) {
|
|
80
|
-
switch (_context2.prev = _context2.next) {
|
|
81
|
-
case 0:
|
|
82
|
-
neeUpdateCluster = _this.updateClusterData(layer);
|
|
83
|
-
dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
|
|
84
|
-
layer.dataState.dataSourceNeedUpdate = false;
|
|
85
|
-
return _context2.abrupt("return", neeUpdateCluster || dataSourceNeedUpdate);
|
|
86
|
-
|
|
87
|
-
case 4:
|
|
88
|
-
case "end":
|
|
89
|
-
return _context2.stop();
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
}, _callee2);
|
|
93
|
-
})));
|
|
21
|
+
layer.hooks.init.tap('DataSourcePlugin', function () {
|
|
22
|
+
var source = layer.getSource();
|
|
23
|
+
|
|
24
|
+
if (!source) {
|
|
25
|
+
// Tip: 用户没有传入 source 的时候使用图层的默认数据
|
|
26
|
+
var _ref = layer.sourceOption || layer.defaultSourceConfig,
|
|
27
|
+
data = _ref.data,
|
|
28
|
+
options = _ref.options;
|
|
29
|
+
|
|
30
|
+
source = new Source(data, options);
|
|
31
|
+
layer.setSource(source);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
if (source.inited) {
|
|
35
|
+
_this.updateClusterData(layer);
|
|
36
|
+
} else {
|
|
37
|
+
source.once('update', function () {
|
|
38
|
+
_this.updateClusterData(layer);
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
}); // 检测数据是否需要更新
|
|
42
|
+
|
|
43
|
+
layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
|
|
44
|
+
var neeUpdateCluster = _this.updateClusterData(layer);
|
|
45
|
+
|
|
46
|
+
var dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
|
|
47
|
+
layer.dataState.dataSourceNeedUpdate = false;
|
|
48
|
+
return neeUpdateCluster || dataSourceNeedUpdate;
|
|
49
|
+
});
|
|
94
50
|
}
|
|
95
51
|
}, {
|
|
96
52
|
key: "updateClusterData",
|
|
97
53
|
value: function updateClusterData(layer) {
|
|
98
54
|
// Tip: 矢量瓦片不需要进行聚合操作
|
|
99
|
-
if (layer.isTileLayer || layer.tileLayer
|
|
55
|
+
if (layer.isTileLayer || layer.tileLayer) {
|
|
100
56
|
return false;
|
|
101
57
|
}
|
|
102
58
|
|