Skip to content

Commit

Permalink
Merge changes
Browse files Browse the repository at this point in the history
Signed-off-by: Daria Terekhova <daria.terekhova@actionengine.com>
  • Loading branch information
dariaterekhova-actionengine committed Jun 24, 2022
1 parent 24fb99e commit 4b385de
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 254 deletions.
252 changes: 0 additions & 252 deletions src/deckgl-layers/src/cluster-layer/cluster-layer.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import CPUAggregator, {
import {getDistanceScales} from 'viewport-mercator-project';
import {max} from 'd3-array';

import {LAYER_VIS_CONFIGS} from 'layers/layer-factory';
import {LAYER_VIS_CONFIGS} from '../../../layers/layer-factory';
import {SCALE_TYPES, DEFAULT_COLOR_RANGE} from '@kepler.gl/constants';
import ClusterBuilder, {getGeoJSON} from '../layer-utils/cluster-utils';
import {RGBAColor} from '@kepler.gl/types';
Expand Down
8 changes: 7 additions & 1 deletion src/utils/export-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {set, generateHashId} from 'utils/utils';

import {createIndexedDataContainer} from './table-utils/data-container-utils';
import {ExportImage} from 'reducers/ui-state-updaters';
import { VisState } from 'reducers';

/**
* Default file names
Expand Down Expand Up @@ -208,7 +209,12 @@ export function exportHtml(state, options) {
downloadFile(fileBlob, state.appName ? `${state.appName}.html` : DEFAULT_HTML_NAME);
}

export function exportData(state, options) {
interface StateType {
visState: VisState,
appName?: string
}

export function exportData(state: StateType, options) {
const {visState, appName} = state;
const {datasets} = visState;
const {selectedDataset, dataType, filtered} = options;
Expand Down

0 comments on commit 4b385de

Please sign in to comment.