@kepler.gl/deckgl-layers 3.3.0-alpha.0 → 3.3.0-alpha.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/dist/cluster-layer/cluster-layer.js +1 -4
- package/dist/grid-layer/enhanced-cpu-grid-layer.d.ts +92 -7
- package/dist/grid-layer/enhanced-cpu-grid-layer.js +29 -8
- package/dist/hexagon-layer/enhanced-hexagon-layer.d.ts +92 -7
- package/dist/hexagon-layer/enhanced-hexagon-layer.js +29 -8
- package/dist/index.d.ts +1 -0
- package/dist/index.js +13 -1
- package/dist/layer-utils/aggregation-utils.d.ts +44 -0
- package/dist/layer-utils/aggregation-utils.js +181 -0
- package/dist/layer-utils/shader-utils.d.ts +1 -0
- package/dist/layer-utils/shader-utils.js +10 -1
- package/dist/raster/pipeline-validation-patch.js +61 -20
- package/dist/raster/raster-layer/raster-layer-shaders.js +44 -10
- package/dist/raster/raster-layer/raster-layer.js +8 -27
- package/dist/raster/raster-mesh-layer/matrix.d.ts +1 -1
- package/dist/raster/raster-mesh-layer/matrix.js +1 -1
- package/dist/raster/raster-mesh-layer/raster-mesh-layer.js +15 -26
- package/dist/raster/raster-processing-uniforms.d.ts +38 -0
- package/dist/raster/raster-processing-uniforms.js +124 -0
- package/dist/raster/util.d.ts +15 -0
- package/dist/raster/util.js +113 -3
- package/dist/wms/wms-layer.d.ts +5 -2
- package/dist/wms/wms-layer.js +94 -21
- package/package.json +20 -17
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.rasterProcessingUniforms = exports.UNIFORM_NAME_MAP = exports.RASTER_PROCESSING_FS = void 0;
|
|
7
|
+
// SPDX-License-Identifier: MIT
|
|
8
|
+
// Copyright contributors to the kepler.gl project
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Shared UBO for all raster processing module uniforms.
|
|
12
|
+
*
|
|
13
|
+
* WebGL2 guarantees only 12 fragment uniform blocks (GL_MAX_FRAGMENT_UNIFORM_BUFFERS).
|
|
14
|
+
* Without consolidation, the base layer already uses 8–9 blocks (project, picking,
|
|
15
|
+
* lighting, phongMaterial, floatColors, layer, shadow, simpleMesh/rasterMesh, raster),
|
|
16
|
+
* leaving only 3–4 for raster processing modules. Since a typical pipeline can use
|
|
17
|
+
* 5–9 raster modules (combineBands, mask, reorderBands, linearRescale, gammaContrast,
|
|
18
|
+
* sigmoidalContrast, colormap, filter, saturation), each declaring its own UBO block
|
|
19
|
+
* would exceed the limit.
|
|
20
|
+
*
|
|
21
|
+
* This module declares a single UBO that contains all possible raster processing
|
|
22
|
+
* uniforms. Individual modules' GLSL code still references the uniforms through
|
|
23
|
+
* the block instance name, and prepareLumaModules() rewires the declarations.
|
|
24
|
+
*/
|
|
25
|
+
|
|
26
|
+
var RASTER_PROCESSING_UNIFORM_BLOCK = "uniform rasterProcessingUniforms {\n // linear_rescale\n float linear_rescale_scaler;\n float linear_rescale_offset;\n\n // gamma_contrast\n float gamma_contrast_gamma1;\n float gamma_contrast_gamma2;\n float gamma_contrast_gamma3;\n float gamma_contrast_gamma4;\n\n // sigmoidalContrast\n float sigmoidalContrast_contrast;\n float sigmoidalContrast_bias;\n\n // colormap\n int colormap_hasCategoricalColors;\n int colormap_categoricalMinValue;\n int colormap_categoricalMaxValue;\n int colormap_maxPixelValue;\n\n // bandFilter\n float bandFilter_min1;\n float bandFilter_max1;\n float bandFilter_min2;\n float bandFilter_max2;\n float bandFilter_min3;\n float bandFilter_max3;\n float bandFilter_min4;\n float bandFilter_max4;\n\n // saturation\n float saturation_value;\n\n // reorder_bands\n mat4 reorder_bands_ordering;\n\n // mask (shared by mask_image_float, mask_image_uint, mask_image_int)\n float mask_keepMin;\n float mask_keepMax;\n\n // pansharpen_brovey\n float pansharpen_brovey_panWeight;\n} rasterProcessing;\n";
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* GLSL #define aliases that let per-module code continue referencing uniforms
|
|
30
|
+
* through their original block instance names (e.g. `linear_rescale.scaler`).
|
|
31
|
+
*/
|
|
32
|
+
var ALIAS_DEFINES = "#define linear_rescale_scaler_ALIAS rasterProcessing.linear_rescale_scaler\n#define linear_rescale_offset_ALIAS rasterProcessing.linear_rescale_offset\n#define gamma_contrast_gamma1_ALIAS rasterProcessing.gamma_contrast_gamma1\n#define gamma_contrast_gamma2_ALIAS rasterProcessing.gamma_contrast_gamma2\n#define gamma_contrast_gamma3_ALIAS rasterProcessing.gamma_contrast_gamma3\n#define gamma_contrast_gamma4_ALIAS rasterProcessing.gamma_contrast_gamma4\n#define sigmoidalContrast_contrast_ALIAS rasterProcessing.sigmoidalContrast_contrast\n#define sigmoidalContrast_bias_ALIAS rasterProcessing.sigmoidalContrast_bias\n#define colormap_hasCategoricalColors_ALIAS rasterProcessing.colormap_hasCategoricalColors\n#define colormap_categoricalMinValue_ALIAS rasterProcessing.colormap_categoricalMinValue\n#define colormap_categoricalMaxValue_ALIAS rasterProcessing.colormap_categoricalMaxValue\n#define colormap_maxPixelValue_ALIAS rasterProcessing.colormap_maxPixelValue\n#define bandFilter_min1_ALIAS rasterProcessing.bandFilter_min1\n#define bandFilter_max1_ALIAS rasterProcessing.bandFilter_max1\n#define bandFilter_min2_ALIAS rasterProcessing.bandFilter_min2\n#define bandFilter_max2_ALIAS rasterProcessing.bandFilter_max2\n#define bandFilter_min3_ALIAS rasterProcessing.bandFilter_min3\n#define bandFilter_max3_ALIAS rasterProcessing.bandFilter_max3\n#define bandFilter_min4_ALIAS rasterProcessing.bandFilter_min4\n#define bandFilter_max4_ALIAS rasterProcessing.bandFilter_max4\n#define saturation_value_ALIAS rasterProcessing.saturation_value\n#define reorder_bands_ordering_ALIAS rasterProcessing.reorder_bands_ordering\n#define mask_keepMin_ALIAS rasterProcessing.mask_keepMin\n#define mask_keepMax_ALIAS rasterProcessing.mask_keepMax\n#define pansharpen_brovey_panWeight_ALIAS rasterProcessing.pansharpen_brovey_panWeight\n";
|
|
33
|
+
var RASTER_PROCESSING_FS = exports.RASTER_PROCESSING_FS = RASTER_PROCESSING_UNIFORM_BLOCK + ALIAS_DEFINES;
|
|
34
|
+
var rasterProcessingUniforms = exports.rasterProcessingUniforms = {
|
|
35
|
+
name: 'rasterProcessing',
|
|
36
|
+
fs: RASTER_PROCESSING_FS,
|
|
37
|
+
vs: '',
|
|
38
|
+
uniformTypes: {
|
|
39
|
+
linear_rescale_scaler: 'f32',
|
|
40
|
+
linear_rescale_offset: 'f32',
|
|
41
|
+
gamma_contrast_gamma1: 'f32',
|
|
42
|
+
gamma_contrast_gamma2: 'f32',
|
|
43
|
+
gamma_contrast_gamma3: 'f32',
|
|
44
|
+
gamma_contrast_gamma4: 'f32',
|
|
45
|
+
sigmoidalContrast_contrast: 'f32',
|
|
46
|
+
sigmoidalContrast_bias: 'f32',
|
|
47
|
+
colormap_hasCategoricalColors: 'i32',
|
|
48
|
+
colormap_categoricalMinValue: 'i32',
|
|
49
|
+
colormap_categoricalMaxValue: 'i32',
|
|
50
|
+
colormap_maxPixelValue: 'i32',
|
|
51
|
+
bandFilter_min1: 'f32',
|
|
52
|
+
bandFilter_max1: 'f32',
|
|
53
|
+
bandFilter_min2: 'f32',
|
|
54
|
+
bandFilter_max2: 'f32',
|
|
55
|
+
bandFilter_min3: 'f32',
|
|
56
|
+
bandFilter_max3: 'f32',
|
|
57
|
+
bandFilter_min4: 'f32',
|
|
58
|
+
bandFilter_max4: 'f32',
|
|
59
|
+
saturation_value: 'f32',
|
|
60
|
+
reorder_bands_ordering: 'mat4x4<f32>',
|
|
61
|
+
mask_keepMin: 'f32',
|
|
62
|
+
mask_keepMax: 'f32',
|
|
63
|
+
pansharpen_brovey_panWeight: 'f32'
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* Map from original module uniform names (as returned by getUniforms) to
|
|
69
|
+
* the prefixed names used in the shared UBO.
|
|
70
|
+
*/
|
|
71
|
+
var UNIFORM_NAME_MAP = exports.UNIFORM_NAME_MAP = {
|
|
72
|
+
linear_rescale: {
|
|
73
|
+
scaler: 'linear_rescale_scaler',
|
|
74
|
+
offset: 'linear_rescale_offset'
|
|
75
|
+
},
|
|
76
|
+
gamma_contrast: {
|
|
77
|
+
gamma1: 'gamma_contrast_gamma1',
|
|
78
|
+
gamma2: 'gamma_contrast_gamma2',
|
|
79
|
+
gamma3: 'gamma_contrast_gamma3',
|
|
80
|
+
gamma4: 'gamma_contrast_gamma4'
|
|
81
|
+
},
|
|
82
|
+
sigmoidalContrast: {
|
|
83
|
+
contrast: 'sigmoidalContrast_contrast',
|
|
84
|
+
bias: 'sigmoidalContrast_bias'
|
|
85
|
+
},
|
|
86
|
+
colormap: {
|
|
87
|
+
hasCategoricalColors: 'colormap_hasCategoricalColors',
|
|
88
|
+
categoricalMinValue: 'colormap_categoricalMinValue',
|
|
89
|
+
categoricalMaxValue: 'colormap_categoricalMaxValue',
|
|
90
|
+
maxPixelValue: 'colormap_maxPixelValue'
|
|
91
|
+
},
|
|
92
|
+
bandFilter: {
|
|
93
|
+
min1: 'bandFilter_min1',
|
|
94
|
+
max1: 'bandFilter_max1',
|
|
95
|
+
min2: 'bandFilter_min2',
|
|
96
|
+
max2: 'bandFilter_max2',
|
|
97
|
+
min3: 'bandFilter_min3',
|
|
98
|
+
max3: 'bandFilter_max3',
|
|
99
|
+
min4: 'bandFilter_min4',
|
|
100
|
+
max4: 'bandFilter_max4'
|
|
101
|
+
},
|
|
102
|
+
saturation: {
|
|
103
|
+
value: 'saturation_value'
|
|
104
|
+
},
|
|
105
|
+
reorder_bands: {
|
|
106
|
+
ordering: 'reorder_bands_ordering'
|
|
107
|
+
},
|
|
108
|
+
mask_image_float: {
|
|
109
|
+
keepMin: 'mask_keepMin',
|
|
110
|
+
keepMax: 'mask_keepMax'
|
|
111
|
+
},
|
|
112
|
+
mask_image_uint: {
|
|
113
|
+
keepMin: 'mask_keepMin',
|
|
114
|
+
keepMax: 'mask_keepMax'
|
|
115
|
+
},
|
|
116
|
+
mask_image_int: {
|
|
117
|
+
keepMin: 'mask_keepMin',
|
|
118
|
+
keepMax: 'mask_keepMax'
|
|
119
|
+
},
|
|
120
|
+
pansharpen_brovey: {
|
|
121
|
+
panWeight: 'pansharpen_brovey_panWeight'
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["RASTER_PROCESSING_UNIFORM_BLOCK","ALIAS_DEFINES","RASTER_PROCESSING_FS","exports","rasterProcessingUniforms","name","fs","vs","uniformTypes","linear_rescale_scaler","linear_rescale_offset","gamma_contrast_gamma1","gamma_contrast_gamma2","gamma_contrast_gamma3","gamma_contrast_gamma4","sigmoidalContrast_contrast","sigmoidalContrast_bias","colormap_hasCategoricalColors","colormap_categoricalMinValue","colormap_categoricalMaxValue","colormap_maxPixelValue","bandFilter_min1","bandFilter_max1","bandFilter_min2","bandFilter_max2","bandFilter_min3","bandFilter_max3","bandFilter_min4","bandFilter_max4","saturation_value","reorder_bands_ordering","mask_keepMin","mask_keepMax","pansharpen_brovey_panWeight","UNIFORM_NAME_MAP","linear_rescale","scaler","offset","gamma_contrast","gamma1","gamma2","gamma3","gamma4","sigmoidalContrast","contrast","bias","colormap","hasCategoricalColors","categoricalMinValue","categoricalMaxValue","maxPixelValue","bandFilter","min1","max1","min2","max2","min3","max3","min4","max4","saturation","value","reorder_bands","ordering","mask_image_float","keepMin","keepMax","mask_image_uint","mask_image_int","pansharpen_brovey","panWeight"],"sources":["../../src/raster/raster-processing-uniforms.ts"],"sourcesContent":["// SPDX-License-Identifier: MIT\n// Copyright contributors to the kepler.gl project\n\n/**\n * Shared UBO for all raster processing module uniforms.\n *\n * WebGL2 guarantees only 12 fragment uniform blocks (GL_MAX_FRAGMENT_UNIFORM_BUFFERS).\n * Without consolidation, the base layer already uses 8–9 blocks (project, picking,\n * lighting, phongMaterial, floatColors, layer, shadow, simpleMesh/rasterMesh, raster),\n * leaving only 3–4 for raster processing modules. Since a typical pipeline can use\n * 5–9 raster modules (combineBands, mask, reorderBands, linearRescale, gammaContrast,\n * sigmoidalContrast, colormap, filter, saturation), each declaring its own UBO block\n * would exceed the limit.\n *\n * This module declares a single UBO that contains all possible raster processing\n * uniforms. Individual modules' GLSL code still references the uniforms through\n * the block instance name, and prepareLumaModules() rewires the declarations.\n */\n\nconst RASTER_PROCESSING_UNIFORM_BLOCK = `\\\nuniform rasterProcessingUniforms {\n  // linear_rescale\n  float linear_rescale_scaler;\n  float linear_rescale_offset;\n\n  // gamma_contrast\n  float gamma_contrast_gamma1;\n  float gamma_contrast_gamma2;\n  float gamma_contrast_gamma3;\n  float gamma_contrast_gamma4;\n\n  // sigmoidalContrast\n  float sigmoidalContrast_contrast;\n  float sigmoidalContrast_bias;\n\n  // colormap\n  int colormap_hasCategoricalColors;\n  int colormap_categoricalMinValue;\n  int colormap_categoricalMaxValue;\n  int colormap_maxPixelValue;\n\n  // bandFilter\n  float bandFilter_min1;\n  float bandFilter_max1;\n  float bandFilter_min2;\n  float bandFilter_max2;\n  float bandFilter_min3;\n  float bandFilter_max3;\n  float bandFilter_min4;\n  float bandFilter_max4;\n\n  // saturation\n  float saturation_value;\n\n  // reorder_bands\n  mat4 reorder_bands_ordering;\n\n  // mask (shared by mask_image_float, mask_image_uint, mask_image_int)\n  float mask_keepMin;\n  float mask_keepMax;\n\n  // pansharpen_brovey\n  float pansharpen_brovey_panWeight;\n} rasterProcessing;\n`;\n\n/**\n * GLSL #define aliases that let per-module code continue referencing uniforms\n * through their original block instance names (e.g. `linear_rescale.scaler`).\n */\nconst ALIAS_DEFINES = `\\\n#define linear_rescale_scaler_ALIAS rasterProcessing.linear_rescale_scaler\n#define linear_rescale_offset_ALIAS rasterProcessing.linear_rescale_offset\n#define gamma_contrast_gamma1_ALIAS rasterProcessing.gamma_contrast_gamma1\n#define gamma_contrast_gamma2_ALIAS rasterProcessing.gamma_contrast_gamma2\n#define gamma_contrast_gamma3_ALIAS rasterProcessing.gamma_contrast_gamma3\n#define gamma_contrast_gamma4_ALIAS rasterProcessing.gamma_contrast_gamma4\n#define sigmoidalContrast_contrast_ALIAS rasterProcessing.sigmoidalContrast_contrast\n#define sigmoidalContrast_bias_ALIAS rasterProcessing.sigmoidalContrast_bias\n#define colormap_hasCategoricalColors_ALIAS rasterProcessing.colormap_hasCategoricalColors\n#define colormap_categoricalMinValue_ALIAS rasterProcessing.colormap_categoricalMinValue\n#define colormap_categoricalMaxValue_ALIAS rasterProcessing.colormap_categoricalMaxValue\n#define colormap_maxPixelValue_ALIAS rasterProcessing.colormap_maxPixelValue\n#define bandFilter_min1_ALIAS rasterProcessing.bandFilter_min1\n#define bandFilter_max1_ALIAS rasterProcessing.bandFilter_max1\n#define bandFilter_min2_ALIAS rasterProcessing.bandFilter_min2\n#define bandFilter_max2_ALIAS rasterProcessing.bandFilter_max2\n#define bandFilter_min3_ALIAS rasterProcessing.bandFilter_min3\n#define bandFilter_max3_ALIAS rasterProcessing.bandFilter_max3\n#define bandFilter_min4_ALIAS rasterProcessing.bandFilter_min4\n#define bandFilter_max4_ALIAS rasterProcessing.bandFilter_max4\n#define saturation_value_ALIAS rasterProcessing.saturation_value\n#define reorder_bands_ordering_ALIAS rasterProcessing.reorder_bands_ordering\n#define mask_keepMin_ALIAS rasterProcessing.mask_keepMin\n#define mask_keepMax_ALIAS rasterProcessing.mask_keepMax\n#define pansharpen_brovey_panWeight_ALIAS rasterProcessing.pansharpen_brovey_panWeight\n`;\n\nexport const RASTER_PROCESSING_FS = RASTER_PROCESSING_UNIFORM_BLOCK + ALIAS_DEFINES;\n\nexport const rasterProcessingUniforms = {\n  name: 'rasterProcessing',\n  fs: RASTER_PROCESSING_FS,\n  vs: '',\n  uniformTypes: {\n    linear_rescale_scaler: 'f32',\n    linear_rescale_offset: 'f32',\n    gamma_contrast_gamma1: 'f32',\n    gamma_contrast_gamma2: 'f32',\n    gamma_contrast_gamma3: 'f32',\n    gamma_contrast_gamma4: 'f32',\n    sigmoidalContrast_contrast: 'f32',\n    sigmoidalContrast_bias: 'f32',\n    colormap_hasCategoricalColors: 'i32',\n    colormap_categoricalMinValue: 'i32',\n    colormap_categoricalMaxValue: 'i32',\n    colormap_maxPixelValue: 'i32',\n    bandFilter_min1: 'f32',\n    bandFilter_max1: 'f32',\n    bandFilter_min2: 'f32',\n    bandFilter_max2: 'f32',\n    bandFilter_min3: 'f32',\n    bandFilter_max3: 'f32',\n    bandFilter_min4: 'f32',\n    bandFilter_max4: 'f32',\n    saturation_value: 'f32',\n    reorder_bands_ordering: 'mat4x4<f32>',\n    mask_keepMin: 'f32',\n    mask_keepMax: 'f32',\n    pansharpen_brovey_panWeight: 'f32'\n  }\n};\n\n/**\n * Map from original module uniform names (as returned by getUniforms) to\n * the prefixed names used in the shared UBO.\n */\nexport const UNIFORM_NAME_MAP: Record<string, Record<string, string>> = {\n  linear_rescale: {\n    scaler: 'linear_rescale_scaler',\n    offset: 'linear_rescale_offset'\n  },\n  gamma_contrast: {\n    gamma1: 'gamma_contrast_gamma1',\n    gamma2: 'gamma_contrast_gamma2',\n    gamma3: 'gamma_contrast_gamma3',\n    gamma4: 'gamma_contrast_gamma4'\n  },\n  sigmoidalContrast: {\n    contrast: 'sigmoidalContrast_contrast',\n    bias: 'sigmoidalContrast_bias'\n  },\n  colormap: {\n    hasCategoricalColors: 'colormap_hasCategoricalColors',\n    categoricalMinValue: 'colormap_categoricalMinValue',\n    categoricalMaxValue: 'colormap_categoricalMaxValue',\n    maxPixelValue: 'colormap_maxPixelValue'\n  },\n  bandFilter: {\n    min1: 'bandFilter_min1',\n    max1: 'bandFilter_max1',\n    min2: 'bandFilter_min2',\n    max2: 'bandFilter_max2',\n    min3: 'bandFilter_min3',\n    max3: 'bandFilter_max3',\n    min4: 'bandFilter_min4',\n    max4: 'bandFilter_max4'\n  },\n  saturation: {\n    value: 'saturation_value'\n  },\n  reorder_bands: {\n    ordering: 'reorder_bands_ordering'\n  },\n  mask_image_float: {\n    keepMin: 'mask_keepMin',\n    keepMax: 'mask_keepMax'\n  },\n  mask_image_uint: {\n    keepMin: 'mask_keepMin',\n    keepMax: 'mask_keepMax'\n  },\n  mask_image_int: {\n    keepMin: 'mask_keepMin',\n    keepMax: 'mask_keepMax'\n  },\n  pansharpen_brovey: {\n    panWeight: 'pansharpen_brovey_panWeight'\n  }\n};\n"],"mappings":";;;;;;AAAA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,IAAMA,+BAA+B,0iCA6CpC;;AAED;AACA;AACA;AACA;AACA,IAAMC,aAAa,2yDA0BlB;AAEM,IAAMC,oBAAoB,GAAAC,OAAA,CAAAD,oBAAA,GAAGF,+BAA+B,GAAGC,aAAa;AAE5E,IAAMG,wBAAwB,GAAAD,OAAA,CAAAC,wBAAA,GAAG;EACtCC,IAAI,EAAE,kBAAkB;EACxBC,EAAE,EAAEJ,oBAAoB;EACxBK,EAAE,EAAE,EAAE;EACNC,YAAY,EAAE;IACZC,qBAAqB,EAAE,KAAK;IAC5BC,qBAAqB,EAAE,KAAK;IAC5BC,qBAAqB,EAAE,KAAK;IAC5BC,qBAAqB,EAAE,KAAK;IAC5BC,qBAAqB,EAAE,KAAK;IAC5BC,qBAAqB,EAAE,KAAK;IAC5BC,0BAA0B,EAAE,KAAK;IACjCC,sBAAsB,EAAE,KAAK;IAC7BC,6BAA6B,EAAE,KAAK;IACpCC,4BAA4B,EAAE,KAAK;IACnCC,4BAA4B,EAAE,KAAK;IACnCC,sBAAsB,EAAE,KAAK;IAC7BC,eAAe,EAAE,KAAK;IACtBC,eAAe,EAAE,KAAK;IACtBC,eAAe,EAAE,KAAK;IACtBC,eAAe,EAAE,KAAK;IACtBC,eAAe,EAAE,KAAK;IACtBC,eAAe,EAAE,KAAK;IACtBC,eAAe,EAAE,KAAK;IACtBC,eAAe,EAAE,KAAK;IACtBC,gBAAgB,EAAE,KAAK;IACvBC,sBAAsB,EAAE,aAAa;IACrCC,YAAY,EAAE,KAAK;IACnBC,YAAY,EAAE,KAAK;IACnBC,2BAA2B,EAAE;EAC/B;AACF,CAAC;;AAED;AACA;AACA;AACA;AACO,IAAMC,gBAAwD,GAAA/B,OAAA,CAAA+B,gBAAA,GAAG;EACtEC,cAAc,EAAE;IACdC,MAAM,EAAE,uBAAuB;IAC/BC,MAAM,EAAE;EACV,CAAC;EACDC,cAAc,EAAE;IACdC,MAAM,EAAE,uBAAuB;IAC/BC,MAAM,EAAE,uBAAuB;IAC/BC,MAAM,EAAE,uBAAuB;IAC/BC,MAAM,EAAE;EACV,CAAC;EACDC,iBAAiB,EAAE;IACjBC,QAAQ,EAAE,4BAA4B;IACtCC,IAAI,EAAE;EACR,CAAC;EACDC,QAAQ,EAAE;IACRC,oBAAoB,EAAE,+BAA+B;IACrDC,mBAAmB,EAAE,8BAA8B;IACnDC,mBAAmB,EAAE,8BAA8B;IACnDC,aAAa,EAAE;EACjB,CAAC;EACDC,UAAU,EAAE;IACVC,IAAI,EAAE,iBAAiB;IACvBC,IAAI,EAAE,iBAAiB;IACvBC,IAAI,EAAE,iBAAiB;IACvBC,IAAI,EAAE,iBAAiB;IACvBC,IAAI,EAAE,iBAAiB;IACvBC,IAAI,EAAE,iBAAiB;IACvBC,IAAI,EAAE,iBAAiB;IACvBC,IAAI,EAAE;EACR,CAAC;EACDC,UAAU,EAAE;IACVC,KAAK,EAAE;EACT,CAAC;EACDC,aAAa,EAAE;IACbC,QAAQ,EAAE;EACZ,CAAC;EACDC,gBAAgB,EAAE;IAChBC,OAAO,EAAE,cAAc;IACvBC,OAAO,EAAE;EACX,CAAC;EACDC,eAAe,EAAE;IACfF,OAAO,EAAE,cAAc;IACvBC,OAAO,EAAE;EACX,CAAC;EACDE,cAAc,EAAE;IACdH,OAAO,EAAE,cAAc;IACvBC,OAAO,EAAE;EACX,CAAC;EACDG,iBAAiB,EAAE;IACjBC,SAAS,EAAE;EACb;AACF,CAAC","ignoreList":[]}
|
package/dist/raster/util.d.ts
CHANGED
|
@@ -8,3 +8,18 @@ import { ShaderModule } from './webgl/types';
|
|
|
8
8
|
* @return true if both lists are equal
|
|
9
9
|
*/
|
|
10
10
|
export declare function modulesEqual(modules: ShaderModule[], oldModules: ShaderModule[]): boolean;
|
|
11
|
+
/**
|
|
12
|
+
* Apply module uniforms/bindings to shaderInputs, calling each module's
|
|
13
|
+
* getUniforms exactly once and writing the result directly — avoiding the
|
|
14
|
+
* double-getUniforms bug where shaderInputs.setProps() would re-invoke
|
|
15
|
+
* getUniforms on already-transformed values.
|
|
16
|
+
*
|
|
17
|
+
* For modules whose uniforms have been consolidated into the shared
|
|
18
|
+
* rasterProcessing UBO, the uniform values are remapped (prefixed) and
|
|
19
|
+
* written to the rasterProcessing slot instead of the individual module slot.
|
|
20
|
+
*/
|
|
21
|
+
export declare function applyModuleUniforms(shaderInputs: {
|
|
22
|
+
moduleUniforms: Record<string, Record<string, unknown>>;
|
|
23
|
+
moduleBindings: Record<string, Record<string, unknown>>;
|
|
24
|
+
setProps?: (props: any) => void;
|
|
25
|
+
}, modules: ShaderModule[], allModuleProps: Record<string, unknown>): void;
|
package/dist/raster/util.js
CHANGED
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
7
|
+
exports.applyModuleUniforms = applyModuleUniforms;
|
|
6
8
|
exports.modulesEqual = modulesEqual;
|
|
7
|
-
|
|
9
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
|
+
var _rasterProcessingUniforms = require("./raster-processing-uniforms");
|
|
12
|
+
function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
|
|
13
|
+
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
14
|
+
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } // SPDX-License-Identifier: MIT
|
|
8
15
|
// Copyright contributors to the kepler.gl project
|
|
9
|
-
|
|
10
16
|
/**
|
|
11
17
|
* Test if two lists of modules are equal
|
|
12
18
|
*
|
|
@@ -26,4 +32,108 @@ function modulesEqual(modules, oldModules) {
|
|
|
26
32
|
}
|
|
27
33
|
return true;
|
|
28
34
|
}
|
|
29
|
-
|
|
35
|
+
function isUniformValue(value) {
|
|
36
|
+
return typeof value === 'number' || typeof value === 'boolean' || ArrayBuffer.isView(value) || Array.isArray(value);
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* Apply module uniforms/bindings to shaderInputs, calling each module's
|
|
41
|
+
* getUniforms exactly once and writing the result directly — avoiding the
|
|
42
|
+
* double-getUniforms bug where shaderInputs.setProps() would re-invoke
|
|
43
|
+
* getUniforms on already-transformed values.
|
|
44
|
+
*
|
|
45
|
+
* For modules whose uniforms have been consolidated into the shared
|
|
46
|
+
* rasterProcessing UBO, the uniform values are remapped (prefixed) and
|
|
47
|
+
* written to the rasterProcessing slot instead of the individual module slot.
|
|
48
|
+
*/
|
|
49
|
+
function applyModuleUniforms(shaderInputs, modules, allModuleProps) {
|
|
50
|
+
var _iterator = _createForOfIteratorHelper(modules),
|
|
51
|
+
_step;
|
|
52
|
+
try {
|
|
53
|
+
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
54
|
+
var mod = _step.value;
|
|
55
|
+
if (mod.getUniforms) {
|
|
56
|
+
var result = mod.getUniforms(allModuleProps);
|
|
57
|
+
if (result) {
|
|
58
|
+
var uniforms = {};
|
|
59
|
+
var bindings = {};
|
|
60
|
+
for (var _i = 0, _Object$entries = Object.entries(result); _i < _Object$entries.length; _i++) {
|
|
61
|
+
var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
|
|
62
|
+
key = _Object$entries$_i[0],
|
|
63
|
+
value = _Object$entries$_i[1];
|
|
64
|
+
if (isUniformValue(value)) {
|
|
65
|
+
uniforms[key] = value;
|
|
66
|
+
} else {
|
|
67
|
+
bindings[key] = value;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
try {
|
|
71
|
+
var nameMap = _rasterProcessingUniforms.UNIFORM_NAME_MAP[mod.name];
|
|
72
|
+
if (nameMap && mod.uniformTypes) {
|
|
73
|
+
// Consolidated module: remap uniforms to the shared rasterProcessing UBO
|
|
74
|
+
if (!shaderInputs.moduleUniforms.rasterProcessing) {
|
|
75
|
+
shaderInputs.moduleUniforms.rasterProcessing = {};
|
|
76
|
+
}
|
|
77
|
+
for (var _i2 = 0, _Object$entries2 = Object.entries(uniforms); _i2 < _Object$entries2.length; _i2++) {
|
|
78
|
+
var _Object$entries2$_i = (0, _slicedToArray2["default"])(_Object$entries2[_i2], 2),
|
|
79
|
+
_key = _Object$entries2$_i[0],
|
|
80
|
+
_value = _Object$entries2$_i[1];
|
|
81
|
+
var remapped = nameMap[_key];
|
|
82
|
+
if (remapped) {
|
|
83
|
+
shaderInputs.moduleUniforms.rasterProcessing[remapped] = _value;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
// Bindings (textures) stay on the original module name
|
|
87
|
+
if (Object.keys(bindings).length > 0) {
|
|
88
|
+
if (!shaderInputs.moduleBindings[mod.name]) {
|
|
89
|
+
shaderInputs.moduleBindings[mod.name] = {};
|
|
90
|
+
}
|
|
91
|
+
Object.assign(shaderInputs.moduleBindings[mod.name], bindings);
|
|
92
|
+
}
|
|
93
|
+
} else {
|
|
94
|
+
// Non-consolidated module: write directly as before
|
|
95
|
+
if (!shaderInputs.moduleUniforms[mod.name]) {
|
|
96
|
+
shaderInputs.moduleUniforms[mod.name] = {};
|
|
97
|
+
}
|
|
98
|
+
if (!shaderInputs.moduleBindings[mod.name]) {
|
|
99
|
+
shaderInputs.moduleBindings[mod.name] = {};
|
|
100
|
+
}
|
|
101
|
+
Object.assign(shaderInputs.moduleUniforms[mod.name], uniforms);
|
|
102
|
+
Object.assign(shaderInputs.moduleBindings[mod.name], bindings);
|
|
103
|
+
}
|
|
104
|
+
} catch (_unused) {
|
|
105
|
+
var _nameMap = _rasterProcessingUniforms.UNIFORM_NAME_MAP[mod.name];
|
|
106
|
+
if (_nameMap && mod.uniformTypes) {
|
|
107
|
+
var _shaderInputs$setProp;
|
|
108
|
+
var remappedUniforms = {};
|
|
109
|
+
for (var _i3 = 0, _Object$entries3 = Object.entries(uniforms); _i3 < _Object$entries3.length; _i3++) {
|
|
110
|
+
var _Object$entries3$_i = (0, _slicedToArray2["default"])(_Object$entries3[_i3], 2),
|
|
111
|
+
_key2 = _Object$entries3$_i[0],
|
|
112
|
+
val = _Object$entries3$_i[1];
|
|
113
|
+
var _remapped = _nameMap[_key2];
|
|
114
|
+
if (_remapped) {
|
|
115
|
+
remappedUniforms[_remapped] = val;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
(_shaderInputs$setProp = shaderInputs.setProps) === null || _shaderInputs$setProp === void 0 || _shaderInputs$setProp.call(shaderInputs, {
|
|
119
|
+
rasterProcessing: remappedUniforms
|
|
120
|
+
});
|
|
121
|
+
if (Object.keys(bindings).length > 0) {
|
|
122
|
+
var _shaderInputs$setProp2;
|
|
123
|
+
(_shaderInputs$setProp2 = shaderInputs.setProps) === null || _shaderInputs$setProp2 === void 0 || _shaderInputs$setProp2.call(shaderInputs, (0, _defineProperty2["default"])({}, mod.name, bindings));
|
|
124
|
+
}
|
|
125
|
+
} else {
|
|
126
|
+
var _shaderInputs$setProp4;
|
|
127
|
+
(_shaderInputs$setProp4 = shaderInputs.setProps) === null || _shaderInputs$setProp4 === void 0 || _shaderInputs$setProp4.call(shaderInputs, (0, _defineProperty2["default"])({}, mod.name, result));
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
} catch (err) {
|
|
134
|
+
_iterator.e(err);
|
|
135
|
+
} finally {
|
|
136
|
+
_iterator.f();
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_rasterProcessingUniforms","require","_createForOfIteratorHelper","r","e","t","Symbol","iterator","Array","isArray","_unsupportedIterableToArray","length","_n","F","s","n","done","value","f","TypeError","o","a","u","call","next","_arrayLikeToArray","toString","slice","constructor","name","from","test","modulesEqual","modules","oldModules","i","isUniformValue","ArrayBuffer","isView","applyModuleUniforms","shaderInputs","allModuleProps","_iterator","_step","mod","getUniforms","result","uniforms","bindings","_i","_Object$entries","Object","entries","_Object$entries$_i","_slicedToArray2","key","nameMap","UNIFORM_NAME_MAP","uniformTypes","moduleUniforms","rasterProcessing","_i2","_Object$entries2","_Object$entries2$_i","remapped","keys","moduleBindings","assign","_unused","_shaderInputs$setProp","remappedUniforms","_i3","_Object$entries3","_Object$entries3$_i","val","setProps","_shaderInputs$setProp2","_defineProperty2","_shaderInputs$setProp4","err"],"sources":["../../src/raster/util.ts"],"sourcesContent":["// SPDX-License-Identifier: MIT\n// Copyright contributors to the kepler.gl project\n\nimport {ShaderModule} from './webgl/types';\nimport {UNIFORM_NAME_MAP} from './raster-processing-uniforms';\n\n/**\n * Test if two lists of modules are equal\n *\n * @param modules     Modules list\n * @param oldModules  Modules list\n *\n * @return true if both lists are equal\n */\nexport function modulesEqual(modules: ShaderModule[], oldModules: ShaderModule[]): boolean {\n  if (modules.length !== oldModules.length) {\n    return false;\n  }\n\n  for (let i = 0; i < modules.length; i++) {\n    if (modules[i].name !== oldModules[i].name) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\nfunction isUniformValue(value: unknown): boolean {\n  return (\n    typeof value === 'number' ||\n    typeof value === 'boolean' ||\n    ArrayBuffer.isView(value) ||\n    Array.isArray(value)\n  );\n}\n\n/**\n * Apply module uniforms/bindings to shaderInputs, calling each module's\n * getUniforms exactly once and writing the result directly — avoiding the\n * double-getUniforms bug where shaderInputs.setProps() would re-invoke\n * getUniforms on already-transformed values.\n *\n * For modules whose uniforms have been consolidated into the shared\n * rasterProcessing UBO, the uniform values are remapped (prefixed) and\n * written to the rasterProcessing slot instead of the individual module slot.\n */\nexport function applyModuleUniforms(\n  shaderInputs: {\n    moduleUniforms: Record<string, Record<string, unknown>>;\n    moduleBindings: Record<string, Record<string, unknown>>;\n    setProps?: (props: any) => void;\n  },\n  modules: ShaderModule[],\n  allModuleProps: Record<string, unknown>\n): void {\n  for (const mod of modules) {\n    if (mod.getUniforms) {\n      const result = mod.getUniforms(allModuleProps as object);\n      if (result) {\n        const uniforms: Record<string, unknown> = {};\n        const bindings: Record<string, unknown> = {};\n        for (const [key, value] of Object.entries(result)) {\n          if (isUniformValue(value)) {\n            uniforms[key] = value;\n          } else {\n            bindings[key] = value;\n          }\n        }\n        try {\n          const nameMap = UNIFORM_NAME_MAP[mod.name];\n          if (nameMap && mod.uniformTypes) {\n            // Consolidated module: remap uniforms to the shared rasterProcessing UBO\n            if (!shaderInputs.moduleUniforms.rasterProcessing) {\n              shaderInputs.moduleUniforms.rasterProcessing = {};\n            }\n            for (const [key, value] of Object.entries(uniforms)) {\n              const remapped = nameMap[key];\n              if (remapped) {\n                shaderInputs.moduleUniforms.rasterProcessing[remapped] = value;\n              }\n            }\n            // Bindings (textures) stay on the original module name\n            if (Object.keys(bindings).length > 0) {\n              if (!shaderInputs.moduleBindings[mod.name]) {\n                shaderInputs.moduleBindings[mod.name] = {};\n              }\n              Object.assign(shaderInputs.moduleBindings[mod.name], bindings);\n            }\n          } else {\n            // Non-consolidated module: write directly as before\n            if (!shaderInputs.moduleUniforms[mod.name]) {\n              shaderInputs.moduleUniforms[mod.name] = {};\n            }\n            if (!shaderInputs.moduleBindings[mod.name]) {\n              shaderInputs.moduleBindings[mod.name] = {};\n            }\n            Object.assign(shaderInputs.moduleUniforms[mod.name], uniforms);\n            Object.assign(shaderInputs.moduleBindings[mod.name], bindings);\n          }\n        } catch {\n          const nameMap = UNIFORM_NAME_MAP[mod.name];\n          if (nameMap && mod.uniformTypes) {\n            const remappedUniforms: Record<string, unknown> = {};\n            for (const [key, val] of Object.entries(uniforms)) {\n              const remapped = nameMap[key];\n              if (remapped) {\n                remappedUniforms[remapped] = val;\n              }\n            }\n            shaderInputs.setProps?.({rasterProcessing: remappedUniforms});\n            if (Object.keys(bindings).length > 0) {\n              shaderInputs.setProps?.({[mod.name]: bindings});\n            }\n          } else {\n            shaderInputs.setProps?.({[mod.name]: result});\n          }\n        }\n      }\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;AAIA,IAAAA,yBAAA,GAAAC,OAAA;AAA8D,SAAAC,2BAAAC,CAAA,EAAAC,CAAA,QAAAC,CAAA,yBAAAC,MAAA,IAAAH,CAAA,CAAAG,MAAA,CAAAC,QAAA,KAAAJ,CAAA,qBAAAE,CAAA,QAAAG,KAAA,CAAAC,OAAA,CAAAN,CAAA,MAAAE,CAAA,GAAAK,2BAAA,CAAAP,CAAA,MAAAC,CAAA,IAAAD,CAAA,uBAAAA,CAAA,CAAAQ,MAAA,IAAAN,CAAA,KAAAF,CAAA,GAAAE,CAAA,OAAAO,EAAA,MAAAC,CAAA,YAAAA,EAAA,eAAAC,CAAA,EAAAD,CAAA,EAAAE,CAAA,WAAAA,EAAA,WAAAH,EAAA,IAAAT,CAAA,CAAAQ,MAAA,KAAAK,IAAA,WAAAA,IAAA,MAAAC,KAAA,EAAAd,CAAA,CAAAS,EAAA,UAAAR,CAAA,WAAAA,EAAAD,CAAA,UAAAA,CAAA,KAAAe,CAAA,EAAAL,CAAA,gBAAAM,SAAA,iJAAAC,CAAA,EAAAC,CAAA,OAAAC,CAAA,gBAAAR,CAAA,WAAAA,EAAA,IAAAT,CAAA,GAAAA,CAAA,CAAAkB,IAAA,CAAApB,CAAA,MAAAY,CAAA,WAAAA,EAAA,QAAAZ,CAAA,GAAAE,CAAA,CAAAmB,IAAA,WAAAH,CAAA,GAAAlB,CAAA,CAAAa,IAAA,EAAAb,CAAA,KAAAC,CAAA,WAAAA,EAAAD,CAAA,IAAAmB,CAAA,OAAAF,CAAA,GAAAjB,CAAA,KAAAe,CAAA,WAAAA,EAAA,UAAAG,CAAA,YAAAhB,CAAA,cAAAA,CAAA,8BAAAiB,CAAA,QAAAF,CAAA;AAAA,SAAAV,4BAAAP,CAAA,EAAAkB,CAAA,QAAAlB,CAAA,2BAAAA,CAAA,SAAAsB,iBAAA,CAAAtB,CAAA,EAAAkB,CAAA,OAAAhB,CAAA,MAAAqB,QAAA,CAAAH,IAAA,CAAApB,CAAA,EAAAwB,KAAA,6BAAAtB,CAAA,IAAAF,CAAA,CAAAyB,WAAA,KAAAvB,CAAA,GAAAF,CAAA,CAAAyB,WAAA,CAAAC,IAAA,aAAAxB,CAAA,cAAAA,CAAA,GAAAG,KAAA,CAAAsB,IAAA,CAAA3B,CAAA,oBAAAE,CAAA,+CAAA0B,IAAA,CAAA1B,CAAA,IAAAoB,iBAAA,CAAAtB,CAAA,EAAAkB,CAAA;AAAA,SAAAI,kBAAAtB,CAAA,EAAAkB,CAAA,aAAAA,CAAA,IAAAA,CAAA,GAAAlB,CAAA,CAAAQ,MAAA,MAAAU,CAAA,GAAAlB,CAAA,CAAAQ,MAAA,YAAAP,CAAA,MAAAW,CAAA,GAAAP,KAAA,CAAAa,CAAA,GAAAjB,CAAA,GAAAiB,CAAA,EAAAjB,CAAA,IAAAW,CAAA,CAAAX,CAAA,IAAAD,CAAA,CAAAC,CAAA,UAAAW,CAAA,IAJ9D;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASiB,YAAYA,CAACC,OAAuB,EAAEC,UAA0B,EAAW;EACzF,IAAID,OAAO,CAACtB,MAAM,KAAKuB,UAAU,CAACvB,MAAM,EAAE;IACxC,OAAO,KAAK;EACd;EAEA,KAAK,IAAIwB,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,OAAO,CAACtB,MAAM,EAAEwB,CAAC,EAAE,EAAE;IACvC,IAAIF,OAAO,CAACE,CAAC,CAAC,CAACN,IAAI,KAAKK,UAAU,CAACC,CAAC,CAAC,CAACN,IAAI,EAAE;MAC1C,OAAO,KAAK;IACd;EACF;EAEA,OAAO,IAAI;AACb;AAEA,SAASO,cAAcA,CAACnB,KAAc,EAAW;EAC/C,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,SAAS,IAC1BoB,WAAW,CAACC,MAAM,CAACrB,KAAK,CAAC,IACzBT,KAAK,CAACC,OAAO,CAACQ,KAAK,CAAC;AAExB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASsB,mBAAmBA,CACjCC,YAIC,EACDP,OAAuB,EACvBQ,cAAuC,EACjC;EAAA,IAAAC,SAAA,GAAAxC,0BAAA,CACY+B,OAAO;IAAAU,KAAA;EAAA;IAAzB,KAAAD,SAAA,CAAA5B,CAAA,MAAA6B,KAAA,GAAAD,SAAA,CAAA3B,CAAA,IAAAC,IAAA,GAA2B;MAAA,IAAhB4B,GAAG,GAAAD,KAAA,CAAA1B,KAAA;MACZ,IAAI2B,GAAG,CAACC,WAAW,EAAE;QACnB,IAAMC,MAAM,GAAGF,GAAG,CAACC,WAAW,CAACJ,cAAwB,CAAC;QACxD,IAAIK,MAAM,EAAE;UACV,IAAMC,QAAiC,GAAG,CAAC,CAAC;UAC5C,IAAMC,QAAiC,GAAG,CAAC,CAAC;UAC5C,SAAAC,EAAA,MAAAC,eAAA,GAA2BC,MAAM,CAACC,OAAO,CAACN,MAAM,CAAC,EAAAG,EAAA,GAAAC,eAAA,CAAAvC,MAAA,EAAAsC,EAAA,IAAE;YAA9C,IAAAI,kBAAA,OAAAC,eAAA,aAAAJ,eAAA,CAAAD,EAAA;cAAOM,GAAG,GAAAF,kBAAA;cAAEpC,KAAK,GAAAoC,kBAAA;YACpB,IAAIjB,cAAc,CAACnB,KAAK,CAAC,EAAE;cACzB8B,QAAQ,CAACQ,GAAG,CAAC,GAAGtC,KAAK;YACvB,CAAC,MAAM;cACL+B,QAAQ,CAACO,GAAG,CAAC,GAAGtC,KAAK;YACvB;UACF;UACA,IAAI;YACF,IAAMuC,OAAO,GAAGC,0CAAgB,CAACb,GAAG,CAACf,IAAI,CAAC;YAC1C,IAAI2B,OAAO,IAAIZ,GAAG,CAACc,YAAY,EAAE;cAC/B;cACA,IAAI,CAAClB,YAAY,CAACmB,cAAc,CAACC,gBAAgB,EAAE;gBACjDpB,YAAY,CAACmB,cAAc,CAACC,gBAAgB,GAAG,CAAC,CAAC;cACnD;cACA,SAAAC,GAAA,MAAAC,gBAAA,GAA2BX,MAAM,CAACC,OAAO,CAACL,QAAQ,CAAC,EAAAc,GAAA,GAAAC,gBAAA,CAAAnD,MAAA,EAAAkD,GAAA,IAAE;gBAAhD,IAAAE,mBAAA,OAAAT,eAAA,aAAAQ,gBAAA,CAAAD,GAAA;kBAAON,IAAG,GAAAQ,mBAAA;kBAAE9C,MAAK,GAAA8C,mBAAA;gBACpB,IAAMC,QAAQ,GAAGR,OAAO,CAACD,IAAG,CAAC;gBAC7B,IAAIS,QAAQ,EAAE;kBACZxB,YAAY,CAACmB,cAAc,CAACC,gBAAgB,CAACI,QAAQ,CAAC,GAAG/C,MAAK;gBAChE;cACF;cACA;cACA,IAAIkC,MAAM,CAACc,IAAI,CAACjB,QAAQ,CAAC,CAACrC,MAAM,GAAG,CAAC,EAAE;gBACpC,IAAI,CAAC6B,YAAY,CAAC0B,cAAc,CAACtB,GAAG,CAACf,IAAI,CAAC,EAAE;kBAC1CW,YAAY,CAAC0B,cAAc,CAACtB,GAAG,CAACf,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5C;gBACAsB,MAAM,CAACgB,MAAM,CAAC3B,YAAY,CAAC0B,cAAc,CAACtB,GAAG,CAACf,IAAI,CAAC,EAAEmB,QAAQ,CAAC;cAChE;YACF,CAAC,MAAM;cACL;cACA,IAAI,CAACR,YAAY,CAACmB,cAAc,CAACf,GAAG,CAACf,IAAI,CAAC,EAAE;gBAC1CW,YAAY,CAACmB,cAAc,CAACf,GAAG,CAACf,IAAI,CAAC,GAAG,CAAC,CAAC;cAC5C;cACA,IAAI,CAACW,YAAY,CAAC0B,cAAc,CAACtB,GAAG,CAACf,IAAI,CAAC,EAAE;gBAC1CW,YAAY,CAAC0B,cAAc,CAACtB,GAAG,CAACf,IAAI,CAAC,GAAG,CAAC,CAAC;cAC5C;cACAsB,MAAM,CAACgB,MAAM,CAAC3B,YAAY,CAACmB,cAAc,CAACf,GAAG,CAACf,IAAI,CAAC,EAAEkB,QAAQ,CAAC;cAC9DI,MAAM,CAACgB,MAAM,CAAC3B,YAAY,CAAC0B,cAAc,CAACtB,GAAG,CAACf,IAAI,CAAC,EAAEmB,QAAQ,CAAC;YAChE;UACF,CAAC,CAAC,OAAAoB,OAAA,EAAM;YACN,IAAMZ,QAAO,GAAGC,0CAAgB,CAACb,GAAG,CAACf,IAAI,CAAC;YAC1C,IAAI2B,QAAO,IAAIZ,GAAG,CAACc,YAAY,EAAE;cAAA,IAAAW,qBAAA;cAC/B,IAAMC,gBAAyC,GAAG,CAAC,CAAC;cACpD,SAAAC,GAAA,MAAAC,gBAAA,GAAyBrB,MAAM,CAACC,OAAO,CAACL,QAAQ,CAAC,EAAAwB,GAAA,GAAAC,gBAAA,CAAA7D,MAAA,EAAA4D,GAAA,IAAE;gBAA9C,IAAAE,mBAAA,OAAAnB,eAAA,aAAAkB,gBAAA,CAAAD,GAAA;kBAAOhB,KAAG,GAAAkB,mBAAA;kBAAEC,GAAG,GAAAD,mBAAA;gBAClB,IAAMT,SAAQ,GAAGR,QAAO,CAACD,KAAG,CAAC;gBAC7B,IAAIS,SAAQ,EAAE;kBACZM,gBAAgB,CAACN,SAAQ,CAAC,GAAGU,GAAG;gBAClC;cACF;cACA,CAAAL,qBAAA,GAAA7B,YAAY,CAACmC,QAAQ,cAAAN,qBAAA,eAArBA,qBAAA,CAAA9C,IAAA,CAAAiB,YAAY,EAAY;gBAACoB,gBAAgB,EAAEU;cAAgB,CAAC,CAAC;cAC7D,IAAInB,MAAM,CAACc,IAAI,CAACjB,QAAQ,CAAC,CAACrC,MAAM,GAAG,CAAC,EAAE;gBAAA,IAAAiE,sBAAA;gBACpC,CAAAA,sBAAA,GAAApC,YAAY,CAACmC,QAAQ,cAAAC,sBAAA,eAArBA,sBAAA,CAAArD,IAAA,CAAAiB,YAAY,MAAAqC,gBAAA,iBAAcjC,GAAG,CAACf,IAAI,EAAGmB,QAAQ,CAAC,CAAC;cACjD;YACF,CAAC,MAAM;cAAA,IAAA8B,sBAAA;cACL,CAAAA,sBAAA,GAAAtC,YAAY,CAACmC,QAAQ,cAAAG,sBAAA,eAArBA,sBAAA,CAAAvD,IAAA,CAAAiB,YAAY,MAAAqC,gBAAA,iBAAcjC,GAAG,CAACf,IAAI,EAAGiB,MAAM,CAAC,CAAC;YAC/C;UACF;QACF;MACF;IACF;EAAC,SAAAiC,GAAA;IAAArC,SAAA,CAAAtC,CAAA,CAAA2E,GAAA;EAAA;IAAArC,SAAA,CAAAxB,CAAA;EAAA;AACH","ignoreList":[]}
|
package/dist/wms/wms-layer.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { Layer, CompositeLayer, CompositeLayerProps, UpdateParameters, DefaultProps, Viewport } from '@deck.gl/core';
|
|
2
2
|
import { ImageSource } from '@loaders.gl/wms';
|
|
3
3
|
import type { ImageSourceMetadata } from '@loaders.gl/loader-utils';
|
|
4
|
-
import type { ImageType
|
|
4
|
+
import type { ImageType } from '@loaders.gl/wms';
|
|
5
5
|
/** All props supported by the TileLayer */
|
|
6
6
|
export type WMSLayerProps = CompositeLayerProps & _WMSLayerProps;
|
|
7
7
|
/** Props added by the TileLayer */
|
|
8
8
|
type _WMSLayerProps = {
|
|
9
9
|
data: string | ImageSource;
|
|
10
|
-
serviceType?:
|
|
10
|
+
serviceType?: string | 'auto';
|
|
11
11
|
layers?: string[];
|
|
12
12
|
srs?: 'EPSG:4326' | 'EPSG:3857' | 'auto';
|
|
13
13
|
transparent?: boolean;
|
|
@@ -37,6 +37,7 @@ export default class WMSLayer extends CompositeLayer<Required<_WMSLayerProps>> {
|
|
|
37
37
|
/** TODO: Change any => setTimeout return type. Different between Node and browser... */
|
|
38
38
|
_timeoutId: any;
|
|
39
39
|
loadCounter: number;
|
|
40
|
+
_lastRequestZoom: number;
|
|
40
41
|
};
|
|
41
42
|
/** Returns true if all async resources are loaded */
|
|
42
43
|
get isLoaded(): boolean;
|
|
@@ -55,6 +56,8 @@ export default class WMSLayer extends CompositeLayer<Required<_WMSLayerProps>> {
|
|
|
55
56
|
private getRequestId;
|
|
56
57
|
/** Runs an action in the future, cancels it if the new action is issued before it executes */
|
|
57
58
|
private debounce;
|
|
59
|
+
/** Compare request parameters to determine if a new request is needed */
|
|
60
|
+
private _areRequestParamsEqual;
|
|
58
61
|
}
|
|
59
62
|
/** Projects EPSG:4326 to EPSG:3857
|
|
60
63
|
* This is a lightweight replacement of proj4. Use tests to ensure conformance.
|