refactor: move overlayType to map

src/editor/Catalog/index.tsx

@@ -2,11 +2,10 @@ import { Collapse } from "antd";
 import { useSelector } from "react-redux";
 
 import { editorAction, selectedIdsSelector, mapOptionsSelector } from "@store";
-import { IOverlay } from "@map";
+import { IOverlay, OverlayTypes } from "@map";
 
 import "./style.less";
 import classNames from "classnames";
-import { OverlayTypes } from "../../types/enum";
 
 const { Panel } = Collapse;
 

src/editor/Plot/Tools/index.tsx

@@ -7,7 +7,8 @@ import {
   statusSelector,
   overlayTypeSelector,
 } from "@store";
-import { OverlayTypes, Status } from "@types";
+import { Status } from "@types";
+import { OverlayTypes } from "@map";
 import { SearchModal } from "./SearchModal";
 import { useState } from "react";
 

src/editor/Property/index.tsx

@@ -1,9 +1,7 @@
 import { useSelector } from "react-redux";
 import { Form, Select } from "antd";
 import { selectedIdsSelector, mapOptionsSelector, editorAction } from "@store";
-import { OverlayCategory, IOverlay } from "@map";
+import { OverlayCategory, IOverlay, OverlayTypes } from "@map";
-
-import { OverlayTypes } from "@types";
 
 import { FineInput } from "./FineInput";
 import { OverlayBackground } from "./OverlayBackground";

src/map/MapEditor.ts

@@ -2,6 +2,7 @@ import Emitter from "@finevis/emitter";
 import "@amap/amap-jsapi-types";
 
 import { getOverlayPaths, getUID, registerHotkey } from "@utils";
+import { EventTypes } from "@types";
 
 import {
   BaseOverlayEditor,
@@ -11,12 +12,10 @@ import {
   CircleEditor,
 } from "./editors";
 
-import { IMapOptions, IMapEditor, IOverlay } from "./type";
+import { IMapOptions, IMapEditor, IOverlay, OverlayTypes } from "./type";
 
 import { PolygonOptions, PolylineOptions, SelectedOptions } from "./constants";
 
-import { EventTypes, OverlayTypes } from "../types/enum";
-
 type AMapOverlayEditor =
   | AMap.RectangleEditor
   | AMap.PolygonEditor

src/map/editors/BaseOverlayEditor.ts

@@ -1,5 +1,4 @@
-import { OverlayTypes } from "@types";
+import { IOverlay, OverlayTypes } from "../type";
-import { IOverlay } from "../type";
 
 export abstract class BaseOverlayEditor<T extends AMap.BaseEditor> {
   map: AMap.Map;

src/map/editors/CircleEditor.ts

@@ -1,5 +1,4 @@
-import { OverlayTypes } from "@types";
+import { IOverlay, OverlayTypes } from "../type";
-import { IOverlay } from "../type";
 import { BaseOverlayEditor } from "./BaseOverlayEditor";
 
 export class CircleEditor extends BaseOverlayEditor<AMap.CircleEditor> {

src/map/editors/PolygonEditor.ts

@@ -1,5 +1,4 @@
-import { OverlayTypes } from "@types";
+import { IOverlay, OverlayTypes } from "../type";
-import { IOverlay } from "../type";
 import { BaseOverlayEditor } from "./BaseOverlayEditor";
 
 export class PolygonEditor extends BaseOverlayEditor<AMap.PolygonEditor> {

src/map/editors/PolylineEditor.ts

@@ -1,5 +1,4 @@
-import { OverlayTypes } from "@types";
+import { IOverlay, OverlayTypes } from "../type";
-import { IOverlay } from "../type";
 import { BaseOverlayEditor } from "./BaseOverlayEditor";
 
 export class PolylineEditor extends BaseOverlayEditor<AMap.PolylineEditor> {

src/map/editors/RectangleEditor.ts

@@ -1,5 +1,4 @@
-import { OverlayTypes } from "@types";
+import { IOverlay, OverlayTypes } from "../type";
-import { IOverlay } from "../type";
 import { BaseOverlayEditor } from "./BaseOverlayEditor";
 
 export class RectangleEditor extends BaseOverlayEditor<AMap.RectangleEditor> {

src/map/type.ts

@@ -1,4 +1,4 @@
-import { EventTypes, OverlayTypes } from "@types";
+import { EventTypes } from "@types";
 
 export interface IMapEditor {
   on(type: EventTypes, evt: any): void;
@@ -40,3 +40,10 @@ export interface IMapOptions {
   center?: GeoJSON.Position;
   zoom?: number;
 }
+
+export enum OverlayTypes {
+  Rectangle = "rectangle",
+  Polygon = "polygon",
+  Polyline = "polyline",
+  Circle = "circle",
+}

src/store/actions/StoreAction.ts

@@ -1,5 +1,4 @@
-import { OverlayTypes } from "@types";
+import { IOverlay, OverlayTypes } from "@map";
-import { IOverlay } from "@map";
 import { IEditorState } from "../type";
 export enum ActionTypes {
   CreateOverlay = "createOverlay",

src/store/actions/index.ts

@@ -10,8 +10,8 @@ import {
 } from "@utils";
 
 import { getGeoJSON, getMapOptions } from "../utils";
-import { OverlayTypes, EventTypes } from "@types";
+import { EventTypes } from "@types";
-import { IOverlay, IMapOptions } from "@map";
+import { IOverlay, IMapOptions, OverlayTypes } from "@map";
 import { StoreAction } from "./StoreAction";
 import { IStore } from "../type";
 import { initState } from "../initState";

src/store/constants.ts

@@ -1,4 +1,4 @@
-import { OverlayTypes } from "@types";
+import { OverlayTypes } from "@map";
 
 export const OverlayNamePrefixs: Record<OverlayTypes, string> = {
   [OverlayTypes.Rectangle]: "矩形",

src/store/reducers/map/index.ts

@@ -1,8 +1,8 @@
 import produce from "immer";
 import { initState } from "../../initState";
 import { OverlayNamePrefixs } from "@store";
-import { OverlayTypes, Status } from "@types";
+import { Status } from "@types";
-import { IOverlay, OverlayCategory } from "@map";
+import { IOverlay, OverlayCategory, OverlayTypes } from "@map";
 
 export function createOverlay(state = initState, payload: OverlayTypes) {
   return produce(state, (draft) => {

src/store/utils/getGeoJSON.ts

@@ -1,5 +1,4 @@
-import { OverlayTypes } from "@types";
+import { IMapOptions, IOverlay, OverlayCategory, OverlayTypes } from "@map";
-import { IMapOptions, IOverlay, OverlayCategory } from "@map";
 import { gcj02_To_gps84 } from "@utils";
 import * as turf from "@turf/turf";
 

src/store/utils/getMapOptions.ts

@@ -1,5 +1,4 @@
-import { IMapOptions, IOverlay, OverlayCategory } from "@map";
+import { IMapOptions, IOverlay, OverlayCategory, OverlayTypes } from "@map";
-import { OverlayTypes } from "@types";
 import { getUID, gps84_To_gcj02 } from "@utils";
 
 export function getMapOptions(geojson: GeoJSON.FeatureCollection) {

src/types/enum.ts

@@ -2,13 +2,6 @@ export enum EventTypes {
   FinishEditOverlay = "finishEditOverlay",
 }
 
-export enum OverlayTypes {
-  Rectangle = "rectangle",
-  Polygon = "polygon",
-  Polyline = "polyline",
-  Circle = "circle",
-}
-
 // 操作指令集
 export enum Command {
   CreateOverlay = "createOveraly",

src/utils/index.ts

@@ -1,5 +1,5 @@
 import { uid } from "uid";
-import { OverlayTypes } from "@types";
+import { OverlayTypes } from "@map";
 
 export * from "./hotkeys";
 export * from "./download";