revert enums from types

Signed-off-by: Ihor Dykhta <[email protected]>

src/components/src/hooks/use-fetch-vector-tile-metadata.ts

@@ -6,8 +6,7 @@ import {useCallback, useEffect, useState} from 'react';
 import {MVTSource, TileJSON} from '@loaders.gl/mvt';
 import {PMTilesSource, PMTilesMetadata} from '@loaders.gl/pmtiles';
 
-import {VectorTileType} from '@kepler.gl/types';
-import {VectorTileMetadata} from '@kepler.gl/layers';
+import {VectorTileMetadata, VectorTileType} from '@kepler.gl/layers';
 
 type FetchVectorTileMetadataProps = {
   url: string | null;

src/components/src/modals/export-data-modal.tsx

@@ -14,7 +14,7 @@ import {
 } from '../common/styled-components';
 import {StyledWarning} from './export-map-modal/components';
 import {injectIntl, IntlShape} from 'react-intl';
-import {DatasetType} from '@kepler.gl/types';
+import {DatasetType} from '@kepler.gl/layers';
 import {FormattedMessage} from '@kepler.gl/localization';
 import {Datasets} from '@kepler.gl/table';
 

src/components/src/modals/tilesets-modals/tileset-vector-form.tsx

@@ -4,10 +4,15 @@
 import React, {useCallback, useEffect, useState, useMemo} from 'react';
 import styled from 'styled-components';
 
-import {getMetaUrl, parseVectorMetadata, VectorTileMetadata} from '@kepler.gl/layers';
+import {
+  getMetaUrl,
+  parseVectorMetadata,
+  VectorTileMetadata,
+  DatasetType,
+  VectorTileType
+} from '@kepler.gl/layers';
 import {TileJSON} from '@loaders.gl/mvt';
 import {PMTilesMetadata} from '@loaders.gl/pmtiles';
-import {DatasetType, VectorTileType} from '@kepler.gl/types';
 
 import {default as useFetchVectorTileMetadata} from '../../hooks/use-fetch-vector-tile-metadata';
 import {DatasetCreationAttributes, MetaResponse, StyledInput} from './common';

src/components/src/side-panel/common/dataset-info.tsx

@@ -4,9 +4,10 @@
 import React from 'react';
 import styled from 'styled-components';
 import {format} from 'd3-format';
+
+import {DatasetType} from '@kepler.gl/layers';
 import {FormattedMessage} from '@kepler.gl/localization';
 import {DataContainerInterface} from '@kepler.gl/utils';
-import {DatasetType} from '@kepler.gl/types';
 
 const numFormat = format(',');
 

src/layers/src/index.ts

@@ -46,9 +46,15 @@ import {default as VectorTileLayer} from './vector-tile/vector-tile-layer';
 export {
   getMetaUrl,
   parseVectorMetadata,
-  matchDatasetType
+  matchDatasetType,
+  DatasetType,
+  TileType,
+  VectorTileType
+} from './vector-tile/utils/vector-tile-utils';
+export type {
+  VectorTileDatasetMetadata,
+  VectorTileMetadata
 } from './vector-tile/utils/vector-tile-utils';
-export type {VectorTileMetadata} from './vector-tile/utils/vector-tile-utils';
 export {default as VectorTileIcon} from './vector-tile/vector-tile-icon';
 export {default as VectorTileLayer} from './vector-tile/vector-tile-layer';
 

src/layers/src/vector-tile/utils/vector-tile-utils.ts

@@ -23,11 +23,31 @@ import {
   StringFieldFilterProps,
   KeplerTable as KeplerDataset
 } from '@kepler.gl/table';
-import {DatasetType, Field as KeplerField} from '@kepler.gl/types';
+import {Field as KeplerField} from '@kepler.gl/types';
 import {clamp, formatNumberByStep, getNumericStepSize, timeToUnixMilli} from '@kepler.gl/utils';
 
 import {default as BaseLayer} from '../../base-layer';
 
+export enum DatasetType {
+  LOCAL = 'local',
+  VECTOR_TILE = 'vectorTile'
+}
+
+export enum TileType {
+  VECTOR_TILE = 'vectorTile'
+}
+
+export enum VectorTileType {
+  REMOTE = 'remote',
+  PMTILES = 'pmtiles'
+}
+
+export type VectorTileDatasetMetadata = {
+  type: VectorTileType.REMOTE;
+  tilesetDataUrl: string;
+  tilesetMetadataUrl?: string;
+};
+
 export const getLoaderOptions = () => {
   return {
     mvt: {

src/layers/src/vector-tile/vector-tile-layer.ts

@@ -17,7 +17,14 @@ import {
   DEFAULT_COLOR_UI,
   LAYER_VIS_CONFIGS
 } from '@kepler.gl/constants';
-import {Layer as KeplerLayer, VisualChannel} from '@kepler.gl/layers';
+import {
+  Layer as KeplerLayer,
+  VisualChannel,
+  DatasetType,
+  TileType,
+  VectorTileType,
+  VectorTileDatasetMetadata
+} from '@kepler.gl/layers';
 import {
   KeplerTable as KeplerDataset,
   Datasets as KeplerDatasets,
@@ -33,11 +40,7 @@ import {
   BindedLayerCallbacks,
   VisConfigRange,
   VisConfigNumber,
-  DatasetType,
-  VectorTileType,
-  VectorTileDatasetMetadata,
-  DomainStops,
-  TileType
+  DomainStops
 } from '@kepler.gl/types';
 import {DataContainerInterface} from '@kepler.gl/utils';
 

src/types/datasets.d.ts

@@ -1,26 +1,6 @@
 // SPDX-License-Identifier: MIT
 // Copyright contributors to the kepler.gl project
 
-export enum DatasetType {
-  LOCAL = 'local',
-  VECTOR_TILE = 'vectorTile'
-}
-
-export enum TileType {
-  VECTOR_TILE = 'vectorTile'
-}
-
-export enum VectorTileType {
-  REMOTE = 'remote',
-  PMTILES = 'pmtiles'
-}
-
-export type VectorTileDatasetMetadata = {
-  type: VectorTileType.REMOTE;
-  tilesetDataUrl: string;
-  tilesetMetadataUrl?: string;
-};
-
 export type ZoomStops = number[][];
 
 export type DomainStops = {