@antv/l7-layers 2.16.0 → 2.16.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.
- package/es/core/BaseLayer.d.ts +3 -0
- package/es/core/BaseLayer.js +76 -80
- package/es/core/BaseModel.d.ts +9 -71
- package/es/core/BaseModel.js +75 -357
- package/es/core/CommonStyleAttribute.d.ts +2 -0
- package/es/core/CommonStyleAttribute.js +66 -0
- package/es/core/interface.d.ts +13 -3
- package/es/core/shape/extrude.js +18 -6
- package/es/core/triangulation.d.ts +12 -0
- package/es/core/triangulation.js +70 -0
- package/es/heatmap/models/grid.js +1 -1
- package/es/heatmap/models/grid3d.js +1 -1
- package/es/heatmap/models/heatmap.d.ts +1 -0
- package/es/heatmap/models/heatmap.js +17 -13
- package/es/heatmap/models/hexagon.js +1 -1
- package/es/heatmap/shaders/grid_vert.glsl +2 -2
- package/es/heatmap/shaders/hexagon_3d_vert.glsl +2 -2
- package/es/heatmap/shaders/hexagon_vert.glsl +2 -2
- package/es/line/index.d.ts +1 -0
- package/es/line/index.js +3 -2
- package/es/line/models/arc.js +9 -45
- package/es/line/models/arc_3d.js +12 -45
- package/es/line/models/earthArc_3d.js +6 -40
- package/es/line/models/{half.d.ts → flow.d.ts} +1 -11
- package/es/line/models/flow.js +167 -0
- package/es/line/models/great_circle.js +4 -38
- package/es/line/models/index.d.ts +1 -1
- package/es/line/models/index.js +3 -3
- package/es/line/models/line.js +7 -41
- package/es/line/models/linearline.js +4 -38
- package/es/line/models/simpleLine.d.ts +0 -1
- package/es/line/models/simpleLine.js +4 -43
- package/es/line/shaders/dash/arc_dash_frag.glsl +3 -6
- package/es/line/shaders/dash/arc_dash_vert.glsl +6 -46
- package/es/line/shaders/dash/line_dash_frag.glsl +4 -7
- package/es/line/shaders/dash/line_dash_vert.glsl +3 -33
- package/es/line/shaders/flow/flow_line_frag.glsl +13 -0
- package/es/line/shaders/flow/flow_line_vert.glsl +83 -0
- package/es/line/shaders/line_arc_3d_frag.glsl +6 -6
- package/es/line/shaders/line_arc_3d_vert.glsl +4 -34
- package/es/line/shaders/line_arc_frag.glsl +7 -11
- package/es/line/shaders/line_arc_great_circle_frag.glsl +5 -6
- package/es/line/shaders/line_arc_great_circle_vert.glsl +4 -32
- package/es/line/shaders/line_arc_vert.glsl +9 -45
- package/es/line/shaders/line_frag.glsl +15 -17
- package/es/line/shaders/line_vert.glsl +3 -34
- package/es/line/shaders/linear/arc3d_linear_frag.glsl +5 -19
- package/es/line/shaders/linear/arc3d_linear_vert.glsl +9 -48
- package/es/line/shaders/linear/arc_linear_frag.glsl +2 -30
- package/es/line/shaders/linear/arc_linear_vert.glsl +9 -45
- package/es/line/shaders/linear/line_linear_frag.glsl +5 -6
- package/es/line/shaders/linearLine/line_linear_frag.glsl +2 -14
- package/es/line/shaders/linearLine/line_linear_vert.glsl +14 -32
- package/es/line/shaders/simple/simpleline_frag.glsl +1 -5
- package/es/line/shaders/simple/simpleline_linear_frag.glsl +2 -6
- package/es/line/shaders/simple/simpleline_vert.glsl +7 -33
- package/es/plugins/DataMappingPlugin.js +20 -34
- package/es/plugins/LayerModelPlugin.js +13 -1
- package/es/plugins/ShaderUniformPlugin.js +3 -3
- package/es/point/index.d.ts +1 -0
- package/es/point/index.js +1 -0
- package/es/point/models/earthExtrude.d.ts +0 -3
- package/es/point/models/earthExtrude.js +2 -40
- package/es/point/models/earthFill.d.ts +0 -1
- package/es/point/models/earthFill.js +9 -60
- package/es/point/models/extrude.d.ts +0 -3
- package/es/point/models/extrude.js +3 -42
- package/es/point/models/fill.d.ts +0 -1
- package/es/point/models/fill.js +15 -76
- package/es/point/models/fillmage.js +6 -43
- package/es/point/models/image.js +7 -41
- package/es/point/models/normal.js +2 -2
- package/es/point/models/radar.d.ts +0 -1
- package/es/point/models/radar.js +4 -13
- package/es/point/models/simplePoint.d.ts +0 -1
- package/es/point/models/simplePoint.js +8 -49
- package/es/point/models/text.js +17 -47
- package/es/point/shaders/animate/wave_frag.glsl +1 -11
- package/es/point/shaders/earth/extrude_frag.glsl +5 -17
- package/es/point/shaders/earth/extrude_vert.glsl +14 -29
- package/es/point/shaders/earth/fill_frag.glsl +5 -14
- package/es/point/shaders/earth/fill_vert.glsl +1 -75
- package/es/point/shaders/extrude/extrude_frag.glsl +3 -29
- package/es/point/shaders/extrude/extrude_vert.glsl +27 -35
- package/es/point/shaders/fill_frag.glsl +9 -20
- package/es/point/shaders/fill_vert.glsl +16 -101
- package/es/point/shaders/image/fillImage_frag.glsl +2 -5
- package/es/point/shaders/image/fillImage_vert.glsl +4 -47
- package/es/point/shaders/image_frag.glsl +1 -5
- package/es/point/shaders/image_vert.glsl +1 -44
- package/es/point/shaders/normal_frag.glsl +0 -2
- package/es/point/shaders/normal_vert.glsl +2 -1
- package/es/point/shaders/radar/radar_vert.glsl +2 -2
- package/es/point/shaders/simplePoint_frag.glsl +0 -7
- package/es/point/shaders/simplePoint_vert.glsl +3 -45
- package/es/point/shaders/text_frag.glsl +6 -19
- package/es/point/shaders/text_vert.glsl +5 -66
- package/es/polygon/index.d.ts +1 -0
- package/es/polygon/index.js +1 -0
- package/es/polygon/models/extrude.d.ts +0 -3
- package/es/polygon/models/extrude.js +86 -82
- package/es/polygon/models/fill.d.ts +0 -4
- package/es/polygon/models/fill.js +8 -47
- package/es/polygon/shaders/extrude/polygon_extrude_frag.glsl +2 -23
- package/es/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl +7 -5
- package/es/polygon/shaders/extrude/polygon_extrude_picklight_vert.glsl +7 -32
- package/es/polygon/shaders/extrude/polygon_extrude_vert.glsl +33 -38
- package/es/polygon/shaders/extrude/polygon_extrudetex_frag.glsl +12 -9
- package/es/polygon/shaders/extrude/polygon_extrudetex_vert.glsl +16 -44
- package/es/polygon/shaders/polygon_frag.glsl +0 -5
- package/es/polygon/shaders/polygon_linear_frag.glsl +0 -8
- package/es/polygon/shaders/polygon_linear_vert.glsl +0 -32
- package/es/polygon/shaders/polygon_vert.glsl +1 -27
- package/es/utils/layerData.js +2 -2
- package/lib/core/BaseLayer.js +74 -78
- package/lib/core/BaseModel.js +74 -356
- package/lib/core/CommonStyleAttribute.js +72 -0
- package/lib/core/shape/extrude.js +18 -6
- package/lib/core/triangulation.js +72 -0
- package/lib/heatmap/models/grid.js +1 -1
- package/lib/heatmap/models/grid3d.js +1 -1
- package/lib/heatmap/models/heatmap.js +17 -13
- package/lib/heatmap/models/hexagon.js +1 -1
- package/lib/heatmap/shaders/grid_vert.glsl +2 -2
- package/lib/heatmap/shaders/hexagon_3d_vert.glsl +2 -2
- package/lib/heatmap/shaders/hexagon_vert.glsl +2 -2
- package/lib/line/index.js +3 -2
- package/lib/line/models/arc.js +9 -45
- package/lib/line/models/arc_3d.js +12 -45
- package/lib/line/models/earthArc_3d.js +6 -40
- package/lib/line/models/flow.js +174 -0
- package/lib/line/models/great_circle.js +4 -38
- package/lib/line/models/index.js +3 -3
- package/lib/line/models/line.js +7 -41
- package/lib/line/models/linearline.js +4 -38
- package/lib/line/models/simpleLine.js +4 -43
- package/lib/line/shaders/dash/arc_dash_frag.glsl +3 -6
- package/lib/line/shaders/dash/arc_dash_vert.glsl +6 -46
- package/lib/line/shaders/dash/line_dash_frag.glsl +4 -7
- package/lib/line/shaders/dash/line_dash_vert.glsl +3 -33
- package/lib/line/shaders/flow/flow_line_frag.glsl +13 -0
- package/lib/line/shaders/flow/flow_line_vert.glsl +83 -0
- package/lib/line/shaders/line_arc_3d_frag.glsl +6 -6
- package/lib/line/shaders/line_arc_3d_vert.glsl +4 -34
- package/lib/line/shaders/line_arc_frag.glsl +7 -11
- package/lib/line/shaders/line_arc_great_circle_frag.glsl +5 -6
- package/lib/line/shaders/line_arc_great_circle_vert.glsl +4 -32
- package/lib/line/shaders/line_arc_vert.glsl +9 -45
- package/lib/line/shaders/line_frag.glsl +15 -17
- package/lib/line/shaders/line_vert.glsl +3 -34
- package/lib/line/shaders/linear/arc3d_linear_frag.glsl +5 -19
- package/lib/line/shaders/linear/arc3d_linear_vert.glsl +9 -48
- package/lib/line/shaders/linear/arc_linear_frag.glsl +2 -30
- package/lib/line/shaders/linear/arc_linear_vert.glsl +9 -45
- package/lib/line/shaders/linear/line_linear_frag.glsl +5 -6
- package/lib/line/shaders/linearLine/line_linear_frag.glsl +2 -14
- package/lib/line/shaders/linearLine/line_linear_vert.glsl +14 -32
- package/lib/line/shaders/simple/simpleline_frag.glsl +1 -5
- package/lib/line/shaders/simple/simpleline_linear_frag.glsl +2 -6
- package/lib/line/shaders/simple/simpleline_vert.glsl +7 -33
- package/lib/plugins/DataMappingPlugin.js +20 -34
- package/lib/plugins/LayerModelPlugin.js +13 -1
- package/lib/plugins/ShaderUniformPlugin.js +3 -3
- package/lib/point/index.js +1 -0
- package/lib/point/models/earthExtrude.js +2 -40
- package/lib/point/models/earthFill.js +9 -60
- package/lib/point/models/extrude.js +3 -42
- package/lib/point/models/fill.js +15 -76
- package/lib/point/models/fillmage.js +6 -43
- package/lib/point/models/image.js +7 -41
- package/lib/point/models/normal.js +2 -2
- package/lib/point/models/radar.js +4 -13
- package/lib/point/models/simplePoint.js +8 -49
- package/lib/point/models/text.js +15 -45
- package/lib/point/shaders/animate/wave_frag.glsl +1 -11
- package/lib/point/shaders/earth/extrude_frag.glsl +5 -17
- package/lib/point/shaders/earth/extrude_vert.glsl +14 -29
- package/lib/point/shaders/earth/fill_frag.glsl +5 -14
- package/lib/point/shaders/earth/fill_vert.glsl +1 -75
- package/lib/point/shaders/extrude/extrude_frag.glsl +3 -29
- package/lib/point/shaders/extrude/extrude_vert.glsl +27 -35
- package/lib/point/shaders/fill_frag.glsl +9 -20
- package/lib/point/shaders/fill_vert.glsl +16 -101
- package/lib/point/shaders/image/fillImage_frag.glsl +2 -5
- package/lib/point/shaders/image/fillImage_vert.glsl +4 -47
- package/lib/point/shaders/image_frag.glsl +1 -5
- package/lib/point/shaders/image_vert.glsl +1 -44
- package/lib/point/shaders/normal_frag.glsl +0 -2
- package/lib/point/shaders/normal_vert.glsl +2 -1
- package/lib/point/shaders/radar/radar_vert.glsl +2 -2
- package/lib/point/shaders/simplePoint_frag.glsl +0 -7
- package/lib/point/shaders/simplePoint_vert.glsl +3 -45
- package/lib/point/shaders/text_frag.glsl +6 -19
- package/lib/point/shaders/text_vert.glsl +5 -66
- package/lib/polygon/index.js +1 -0
- package/lib/polygon/models/extrude.js +86 -82
- package/lib/polygon/models/fill.js +8 -47
- package/lib/polygon/shaders/extrude/polygon_extrude_frag.glsl +2 -23
- package/lib/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl +7 -5
- package/lib/polygon/shaders/extrude/polygon_extrude_picklight_vert.glsl +7 -32
- package/lib/polygon/shaders/extrude/polygon_extrude_vert.glsl +33 -38
- package/lib/polygon/shaders/extrude/polygon_extrudetex_frag.glsl +12 -9
- package/lib/polygon/shaders/extrude/polygon_extrudetex_vert.glsl +16 -44
- package/lib/polygon/shaders/polygon_frag.glsl +0 -5
- package/lib/polygon/shaders/polygon_linear_frag.glsl +0 -8
- package/lib/polygon/shaders/polygon_linear_vert.glsl +0 -32
- package/lib/polygon/shaders/polygon_vert.glsl +1 -27
- package/lib/utils/layerData.js +2 -2
- package/package.json +7 -7
- package/es/line/models/half.js +0 -267
- package/es/line/shaders/half/line_half_frag.glsl +0 -53
- package/es/line/shaders/half/line_half_vert.glsl +0 -169
- package/es/utils/dataMappingStyle.d.ts +0 -31
- package/es/utils/dataMappingStyle.js +0 -137
- package/lib/line/models/half.js +0 -274
- package/lib/line/shaders/half/line_half_frag.glsl +0 -53
- package/lib/line/shaders/half/line_half_vert.glsl +0 -169
- package/lib/utils/dataMappingStyle.js +0 -140
|
@@ -1,140 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.colorStyleMapping = colorStyleMapping;
|
|
7
|
-
exports.floatStyleMapping = floatStyleMapping;
|
|
8
|
-
exports.styleDataMapping = styleDataMapping;
|
|
9
|
-
var _lodash = require("lodash");
|
|
10
|
-
/**
|
|
11
|
-
* 当 style 中使用的 opacity 不是常数的时候根据数据进行映射
|
|
12
|
-
* @param field
|
|
13
|
-
* @param values
|
|
14
|
-
* @param updateOptions
|
|
15
|
-
*/
|
|
16
|
-
function registerStyleAttribute(fieldName, layer, field, values, updateOptions) {
|
|
17
|
-
layer.updateStyleAttribute(fieldName, field, values, updateOptions);
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
/**
|
|
21
|
-
* 当样式发生变化时判断是否需要进行数据映射
|
|
22
|
-
* @param configToUpdate
|
|
23
|
-
* @param layer
|
|
24
|
-
*/
|
|
25
|
-
function styleDataMapping(configToUpdate, layer) {
|
|
26
|
-
// 瓦片图层不需要进行样式数据映射
|
|
27
|
-
if (layer.tileLayer || layer.isTileLayer) {
|
|
28
|
-
return;
|
|
29
|
-
}
|
|
30
|
-
if (configToUpdate.opacity) {
|
|
31
|
-
// 处理 style 中 opacity 属性的数据映射
|
|
32
|
-
floatStyleMapping('opacity', layer, configToUpdate.opacity);
|
|
33
|
-
}
|
|
34
|
-
if (configToUpdate.strokeWidth) {
|
|
35
|
-
// 处理 style 中 strokeWidth 属性的数据映射
|
|
36
|
-
|
|
37
|
-
floatStyleMapping('strokeWidth', layer, configToUpdate.strokeWidth);
|
|
38
|
-
}
|
|
39
|
-
if (configToUpdate.strokeOpacity) {
|
|
40
|
-
// 处理 style 中 strokeOpacity 属性的数据映射
|
|
41
|
-
floatStyleMapping('strokeOpacity', layer, configToUpdate.strokeOpacity);
|
|
42
|
-
}
|
|
43
|
-
if (configToUpdate.stroke) {
|
|
44
|
-
// 处理 style 中 stroke (strokeColor) 属性的数据映射
|
|
45
|
-
colorStyleMapping('stroke', layer, configToUpdate.stroke);
|
|
46
|
-
}
|
|
47
|
-
if (configToUpdate.offsets) {
|
|
48
|
-
// 处理 style 中 offsets 属性的数据映射
|
|
49
|
-
offsetStyleMapping('offsets', layer, configToUpdate.offsets);
|
|
50
|
-
}
|
|
51
|
-
if (configToUpdate.textOffset) {
|
|
52
|
-
// 处理 style 中 textOffset 属性的数据映射
|
|
53
|
-
offsetStyleMapping('textOffset', layer, configToUpdate.textOffset);
|
|
54
|
-
}
|
|
55
|
-
if (configToUpdate.thetaOffset) {
|
|
56
|
-
// 处理 style 中 thetaOffset 属性的数据映射
|
|
57
|
-
floatStyleMapping('thetaOffset', layer, configToUpdate.thetaOffset);
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
/**
|
|
62
|
-
* 根据传入参数 float 的类型和值做相应的操作
|
|
63
|
-
*/
|
|
64
|
-
function floatStyleMapping(fieldName, layer, styleFloat) {
|
|
65
|
-
if ((0, _lodash.isString)(styleFloat)) {
|
|
66
|
-
// 如果传入的 styleFloat 是 string 类型,那么就认为其对应的是传入数据的字段
|
|
67
|
-
registerStyleAttribute(fieldName, layer, styleFloat, function (value) {
|
|
68
|
-
return value;
|
|
69
|
-
});
|
|
70
|
-
} else if ((0, _lodash.isNumber)(styleFloat)) {
|
|
71
|
-
// 传入 number、默认值处理
|
|
72
|
-
// registerStyleAttribute(fieldName, layer, [styleFloat], undefined);
|
|
73
|
-
} else if (Array.isArray(styleFloat) && styleFloat.length === 2) {
|
|
74
|
-
// 传入的 styleFloat 是长度为 2 的数组
|
|
75
|
-
if ((0, _lodash.isString)(styleFloat[0]) && (0, _lodash.isFunction)(styleFloat[1])) {
|
|
76
|
-
// 字段回调函数 [string, callback]
|
|
77
|
-
registerStyleAttribute(fieldName, layer, styleFloat[0], styleFloat[1]);
|
|
78
|
-
} else if ((0, _lodash.isString)(styleFloat[0]) && Array.isArray(styleFloat[1]) && (0, _lodash.isNumber)(styleFloat[1][0]) && (0, _lodash.isNumber)(styleFloat[1][1])) {
|
|
79
|
-
// 字段映射 [string, [start: number, end: number]]
|
|
80
|
-
registerStyleAttribute(fieldName, layer, styleFloat[0], styleFloat[1]);
|
|
81
|
-
} else {
|
|
82
|
-
// 兼容
|
|
83
|
-
registerStyleAttribute(fieldName, layer, [1.0], undefined);
|
|
84
|
-
}
|
|
85
|
-
} else {
|
|
86
|
-
// 兼容
|
|
87
|
-
registerStyleAttribute(fieldName, layer, [1.0], undefined);
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
/**
|
|
91
|
-
* 根据传入参数 offsets 的类型和值做相应的操作
|
|
92
|
-
* @param fieldName
|
|
93
|
-
* @param layer
|
|
94
|
-
* @param styleOffsets
|
|
95
|
-
*/
|
|
96
|
-
function offsetStyleMapping(fieldName, layer, styleOffsets) {
|
|
97
|
-
if ((0, _lodash.isString)(styleOffsets)) {
|
|
98
|
-
// 如果传入的 styleOffsets 是 string 类型,那么就认为其对应的是传入数据的字段
|
|
99
|
-
registerStyleAttribute(fieldName, layer, styleOffsets, function (value) {
|
|
100
|
-
return value;
|
|
101
|
-
});
|
|
102
|
-
} else if (Array.isArray(styleOffsets) && styleOffsets.length === 2 && (0, _lodash.isString)(styleOffsets[0]) && (0, _lodash.isFunction)(styleOffsets[1])) {
|
|
103
|
-
// 字段回调函数 [string, callback]
|
|
104
|
-
registerStyleAttribute(fieldName, layer, styleOffsets[0], styleOffsets[1]);
|
|
105
|
-
} else if (Array.isArray(styleOffsets) && styleOffsets.length === 2 && (0, _lodash.isNumber)(styleOffsets[0]) && (0, _lodash.isNumber)(styleOffsets[1])) {
|
|
106
|
-
// 字段映射 [string, [start: number, end: number]]
|
|
107
|
-
registerStyleAttribute(fieldName, layer, styleOffsets, undefined);
|
|
108
|
-
} else {
|
|
109
|
-
// 兼容
|
|
110
|
-
registerStyleAttribute(fieldName, layer, [0, 0], undefined);
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
/**
|
|
115
|
-
* 根据传入参数 stroke / color 的类型和值做相应的操作
|
|
116
|
-
* @param fieldName
|
|
117
|
-
* @param layer
|
|
118
|
-
* @param styleColor
|
|
119
|
-
*/
|
|
120
|
-
function colorStyleMapping(fieldName, layer, styleColor) {
|
|
121
|
-
if ((0, _lodash.isString)(styleColor)) {
|
|
122
|
-
// 如果传入的 styleColor 是 string 类型,那么就认为其是颜色值
|
|
123
|
-
// registerStyleAttribute(fieldName, layer, styleColor, undefined);
|
|
124
|
-
} else if (Array.isArray(styleColor) && styleColor.length === 2) {
|
|
125
|
-
// 传入的 styleColor 是长度为 2 的数组
|
|
126
|
-
if ((0, _lodash.isString)(styleColor[0]) && (0, _lodash.isFunction)(styleColor[1])) {
|
|
127
|
-
// 字段回调函数 [string, callback]
|
|
128
|
-
registerStyleAttribute(fieldName, layer, styleColor[0], styleColor[1]);
|
|
129
|
-
} else if ((0, _lodash.isString)(styleColor[0]) && Array.isArray(styleColor[1]) && styleColor[1].length > 0) {
|
|
130
|
-
// 字段映射 [string, [start: string, end: string]]
|
|
131
|
-
registerStyleAttribute(fieldName, layer, styleColor[0], styleColor[1]);
|
|
132
|
-
} else {
|
|
133
|
-
// 兼容
|
|
134
|
-
registerStyleAttribute(fieldName, layer, '#fff', undefined);
|
|
135
|
-
}
|
|
136
|
-
} else {
|
|
137
|
-
// 兼容
|
|
138
|
-
registerStyleAttribute(fieldName, layer, '#fff', undefined);
|
|
139
|
-
}
|
|
140
|
-
}
|