Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

add types for svg-icon-layer (#1796)

dariaterekhovaae258c82da9208
diff --git a/src/deckgl-layers/svg-icon-layer/scatterplot-icon-layer.js b/src/deckgl-layers/svg-icon-layer/scatterplot-icon-layer.ts
similarity index 85%
rename from src/deckgl-layers/svg-icon-layer/scatterplot-icon-layer.js
rename to src/deckgl-layers/svg-icon-layer/scatterplot-icon-layer.ts
index aff5718e7..a77cf10bb 100644
--- a/src/deckgl-layers/svg-icon-layer/scatterplot-icon-layer.js
+++ b/src/deckgl-layers/svg-icon-layer/scatterplot-icon-layer.ts
@@ -18,15 +18,20 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-import {ScatterplotLayer} from '@deck.gl/layers';
+import {ScatterplotLayer, ScatterplotLayerProps} from '@deck.gl/layers';
import {Geometry, Model} from '@luma.gl/core';
import GL from '@luma.gl/constants';
const DEFAULT_POS = [-1, -1, 0, -1, 1, 0, 1, 1, 0, 1, -1, 0];
-export default class ScatterplotIconLayer extends ScatterplotLayer {
- _getModel(gl) {
+
+export interface ScatterplotIconLayerProps extends ScatterplotLayerProps<any> {
+ iconGeometry: number;
+}
+
+export default class ScatterplotIconLayer extends ScatterplotLayer<any, ScatterplotIconLayerProps> {
+ _getModel(gl: WebGLRenderingContext) {
// use default scatterplot shaders
- const shaders = this.getShaders();
+ const shaders = this.getShaders(undefined);
const {iconGeometry} = this.props;
@@ -49,6 +54,7 @@ export default class ScatterplotIconLayer extends ScatterplotLayer {
id: this.props.id,
geometry,
isInstanced: true,
+ // @ts-ignore
shaderCache: this.context.shaderCache
});
}
diff --git a/src/deckgl-layers/svg-icon-layer/svg-icon-layer.js b/src/deckgl-layers/svg-icon-layer/svg-icon-layer.ts
similarity index 86%
rename from src/deckgl-layers/svg-icon-layer/svg-icon-layer.js
rename to src/deckgl-layers/svg-icon-layer/svg-icon-layer.ts
index b84708c5e..0d96340a7 100644
--- a/src/deckgl-layers/svg-icon-layer/svg-icon-layer.js
+++ b/src/deckgl-layers/svg-icon-layer/svg-icon-layer.ts
@@ -19,17 +19,23 @@
// THE SOFTWARE.
import {CompositeLayer} from '@deck.gl/core';
+import {CompositeLayerProps} from '@deck.gl/core/lib/composite-layer';
import ScatterplotIconLayer from './scatterplot-icon-layer';
// default icon geometry is a square
const DEFAULT_ICON_GEOMETRY = [1, 1, 0, 1, -1, 0, -1, -1, 0, -1, -1, 0, -1, 1, 0, 1, 1, 0];
const defaultProps = {
- getIconGeometry: iconId => DEFAULT_ICON_GEOMETRY,
- getIcon: d => d.icon
+ getIconGeometry: (iconId: string) => DEFAULT_ICON_GEOMETRY,
+ getIcon: (d: {icon: string}) => d.icon
};
-export default class SvgIconLayer extends CompositeLayer {
+export interface SvgIconLayerProps extends CompositeLayerProps<any> {
+ getIconGeometry: (i: string) => number[];
+ getIcon: (d: {icon: string}) => string;
+}
+
+export default class SvgIconLayer extends CompositeLayer<any, SvgIconLayerProps> {
// Must be defined
initializeState() {
this.state = {