Skip to content

Commit 8bb45a5

Browse files
author
zhaokai
committed
非规则符号标准化
1 parent 2d22cd0 commit 8bb45a5

File tree

21 files changed

+330
-285
lines changed

21 files changed

+330
-285
lines changed

‎src/service/2DPlot/Draw/index.js‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,27 @@
11
/*
2-
* @Description:
2+
* @Description:
33
* @Author: zk
44
* @Date: 2021-11-15 17:47:45
55
* @LastEditors: zk
6-
* @LastEditTime: 2022-05-18 09:51:56
6+
* @LastEditTime: 2022-06-13 15:33:26
77
*/
8-
import DrawPoint2D from './DrawPoint2D';
9-
import DrawPolyline2D from './DrawPolyline2D';
10-
import {DrawPlotObjectFactory2D} from './DrawPlotObjectFactory2D'
11-
12-
DrawPlotObjectFactory2D.register('msbl_regularpoint', DrawPoint2D)
13-
DrawPlotObjectFactory2D.register('msbl_regularLine1', DrawPolyline2D)
14-
DrawPlotObjectFactory2D.register('msbl_regularLine2', DrawPolyline2D)
15-
DrawPlotObjectFactory2D.register("msbl_regularsurface", DrawPolyline2D);
16-
DrawPlotObjectFactory2D.register("msbl_kidneyarea", DrawPolyline2D);
8+
import DrawPoint2D from './DrawPoint2D';
9+
import DrawPolyline2D from './DrawPolyline2D';
10+
import { DrawPlotObjectFactory2D } from './DrawPlotObjectFactory2D';
1711

1812
// 新修规则
19-
DrawPlotObjectFactory2D.register("simpleline", DrawPolyline2D);
20-
DrawPlotObjectFactory2D.register("simplearea", DrawPolyline2D);
21-
DrawPlotObjectFactory2D.register("simplepoint", DrawPoint2D);
13+
DrawPlotObjectFactory2D.register('simpleline', DrawPolyline2D);
14+
DrawPlotObjectFactory2D.register('simplearea', DrawPolyline2D);
15+
DrawPlotObjectFactory2D.register('simplepoint', DrawPoint2D);
16+
2217
// 非规则符号
23-
DrawPlotObjectFactory2D.register("msbl_AssaultArrow", DrawPolyline2D);
24-
DrawPlotObjectFactory2D.register("msbl_MultiArrow", DrawPolyline2D);
25-
DrawPlotObjectFactory2D.register("msbl_CombinationalCircle",DrawPolyline2D);
26-
DrawPlotObjectFactory2D.register("msbl_AntiAircraftGroup", DrawPolyline2D);
27-
DrawPlotObjectFactory2D.register("msbl_cannonGroup", DrawPolyline2D);
28-
DrawPlotObjectFactory2D.register("msbl_Kidney", DrawPolyline2D);
18+
DrawPlotObjectFactory2D.register('combinationcircle', DrawPolyline2D);
19+
DrawPlotObjectFactory2D.register('kidney', DrawPolyline2D);
20+
DrawPlotObjectFactory2D.register('sector', DrawPolyline2D);
2921

30-
DrawPlotObjectFactory2D.register("msbl_doublearrow", DrawPolyline2D);
31-
DrawPlotObjectFactory2D.register("msbl_singleArrow", DrawPolyline2D);
32-
DrawPlotObjectFactory2D.register("msbl_squadarrow", DrawPolyline2D);
33-
DrawPlotObjectFactory2D.register("msbl_FigureFan", DrawPolyline2D);
22+
DrawPlotObjectFactory2D.register('singlearrow', DrawPolyline2D);
23+
DrawPlotObjectFactory2D.register('squadarrow', DrawPolyline2D);
24+
DrawPlotObjectFactory2D.register('multiarrow', DrawPolyline2D);
25+
DrawPlotObjectFactory2D.register('doublearrow', DrawPolyline2D);
26+
DrawPlotObjectFactory2D.register('assaultarrow', DrawPolyline2D);
27+
DrawPlotObjectFactory2D.register('tailedsquadarrow', DrawPolyline2D);

‎src/service/2DPlot/Shapes/index.js‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,28 @@
33
* @Author: zk
44
* @Date: 2021-11-15 17:47:45
55
* @LastEditors: zk
6-
* @LastEditTime: 2022-05-18 09:45:46
6+
* @LastEditTime: 2022-06-13 15:33:34
77
*/
88
import {PlotObjectFactory} from "./PlotObjectFactory";
99
import PlotRegularPoint from "./RegularShapes/PlotRegularPoint";
1010
import PlotRegularObject from "./RegularShapes/PlotRegularObject";
11-
import PlotRegularSurface from "./RegularShapes/PlotRegularSurface";
1211
import PlotIrregularShape from "./IrregularShapes/PlotIrregularShape";
1312
import PlotIrregularShapeByLatlng from "./IrregularShapes/PlotIrregularShapeByLatlng";
14-
import PlotKidneyarea from "./RegularShapes/PlotKidneyarea";
1513
import PlotSimpleArea from "./RegularShapes/PlotSimpleArea";
1614

17-
PlotObjectFactory.register("msbl_regularpoint", PlotRegularPoint);
18-
PlotObjectFactory.register("msbl_regularLine1", PlotRegularObject);
19-
PlotObjectFactory.register("msbl_regularLine2", PlotRegularObject);
20-
PlotObjectFactory.register("msbl_regularsurface", PlotRegularSurface);
21-
PlotObjectFactory.register("msbl_kidneyarea", PlotKidneyarea);
22-
2315
// 新修规则
2416
PlotObjectFactory.register("simpleline", PlotRegularObject);
2517
PlotObjectFactory.register("simplearea", PlotSimpleArea);
2618
PlotObjectFactory.register("simplepoint", PlotRegularPoint);
2719

28-
2920
// 非规则符号
30-
PlotObjectFactory.register("msbl_AssaultArrow", PlotIrregularShape);
31-
PlotObjectFactory.register("msbl_MultiArrow", PlotIrregularShape);
32-
PlotObjectFactory.register(
33-
"msbl_CombinationalCircle",
34-
PlotIrregularShapeByLatlng
35-
);
36-
PlotObjectFactory.register(
37-
"msbl_AntiAircraftGroup",
38-
PlotIrregularShapeByLatlng
39-
);
40-
PlotObjectFactory.register("msbl_cannonGroup", PlotIrregularShapeByLatlng);
41-
PlotObjectFactory.register("msbl_Kidney", PlotIrregularShape);
21+
PlotObjectFactory.register("combinationcircle", PlotIrregularShapeByLatlng);
22+
PlotObjectFactory.register("kidney", PlotIrregularShape);
23+
PlotObjectFactory.register("sector", PlotIrregularShape);
4224

43-
PlotObjectFactory.register("msbl_doublearrow", PlotIrregularShape);
44-
PlotObjectFactory.register("msbl_singleArrow", PlotIrregularShape);
45-
PlotObjectFactory.register("msbl_squadarrow", PlotIrregularShape);
46-
PlotObjectFactory.register("msbl_FigureFan", PlotIrregularShape);
25+
PlotObjectFactory.register("singlearrow", PlotIrregularShape);
26+
PlotObjectFactory.register("squadarrow", PlotIrregularShape);
27+
PlotObjectFactory.register("multiarrow", PlotIrregularShape);
28+
PlotObjectFactory.register("doublearrow", PlotIrregularShape);
29+
PlotObjectFactory.register("assaultarrow", PlotIrregularShape);
30+
PlotObjectFactory.register("tailedsquadarrow", PlotIrregularShape);

‎src/service/3DPlot/Draw/DrawPlotObjectFactory3D.js‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
1+
/*
2+
* @class:
3+
* @Description:
4+
* @Author: zk
5+
* @Date: 2022-06-13 14:58:40
6+
* @LastEditors: zk
7+
* @LastEditTime: 2022-06-13 15:28:25
8+
*/
19
import SimpleFactory from "../../../service/PlotUtilBase/SimpleFactory";
210
import DrawPoint from "./DrawPoint";
311
import DrawPolyline from "./DrawPolyline";
412

513
const DrawPlotObjectFactory3D = new SimpleFactory();
614

7-
DrawPlotObjectFactory3D.register("msbl_regularpoint", DrawPoint);
8-
DrawPlotObjectFactory3D.register("msbl_regularline1", DrawPolyline);
9-
DrawPlotObjectFactory3D.register("msbl_regularline2", DrawPolyline);
10-
DrawPlotObjectFactory3D.register("msbl_regularsurface", DrawPolyline);
11-
DrawPlotObjectFactory3D.register("msbl_KidneyArea", DrawPolyline);
12-
1315
DrawPlotObjectFactory3D.register("simplepoint", DrawPoint);
1416
DrawPlotObjectFactory3D.register("simpleline", DrawPolyline);
1517
DrawPlotObjectFactory3D.register("simplearea", DrawPolyline);
1618

17-
DrawPlotObjectFactory3D.register("msbl_AssaultArrow", DrawPolyline);
18-
DrawPlotObjectFactory3D.register("msbl_MultiArrow", DrawPolyline);
19-
DrawPlotObjectFactory3D.register("msbl_CombinationalCircle", DrawPolyline);
20-
DrawPlotObjectFactory3D.register("msbl_AntiAircraftGroup", DrawPolyline);
21-
DrawPlotObjectFactory3D.register("msbl_cannonGroup", DrawPolyline);
22-
DrawPlotObjectFactory3D.register("msbl_Kidney", DrawPolyline);
19+
DrawPlotObjectFactory3D.register("combinationcircle", DrawPolyline);
20+
DrawPlotObjectFactory3D.register("kidney", DrawPolyline);
21+
DrawPlotObjectFactory3D.register("sector", DrawPolyline);
22+
23+
DrawPlotObjectFactory3D.register("singlearrow", DrawPolyline);
24+
DrawPlotObjectFactory3D.register("squadarrow", DrawPolyline);
25+
DrawPlotObjectFactory3D.register("multiarrow", DrawPolyline);
26+
DrawPlotObjectFactory3D.register("doublearrow", DrawPolyline);
27+
DrawPlotObjectFactory3D.register("assaultarrow", DrawPolyline);
28+
DrawPlotObjectFactory3D.register("tailedsquadarrow", DrawPolyline);
2329

24-
DrawPlotObjectFactory3D.register("msbl_doublearrow", DrawPolyline);
25-
DrawPlotObjectFactory3D.register("msbl_singleArrow", DrawPolyline);
26-
DrawPlotObjectFactory3D.register("msbl_squadarrow", DrawPolyline);
27-
DrawPlotObjectFactory3D.register("msbl_FigureFan", DrawPolyline);
2830

2931
export { DrawPlotObjectFactory3D };

‎src/service/3DPlot/Primitive/index.js‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* @Author: your name
33
* @Date: 2021-09-17 16:36:53
4-
* @LastEditTime: 2022-05-23 15:58:22
4+
* @LastEditTime: 2022-06-13 15:28:14
55
* @LastEditors: zk
66
* @Description: In User Settings Edit
77
* @FilePath: \MapGISPlotBase\src\3DPlot\RegularElement.js
@@ -17,30 +17,22 @@ import SimplePointPrimitive from "./RegularPrimitive/SimplePointPrimitive";
1717
import SimpleLinePrimitive from "./RegularPrimitive/SimpleLinePrimitive";
1818
import SimpleAreaPrimitive from "./RegularPrimitive/SimpleAreaPrimitive";
1919

20-
// 规则符号
21-
PrimitiveFactory.register("msbl_regularpoint", RegularPointPrimitive);
22-
PrimitiveFactory.register("msbl_regularline1", RegularLine1Primitive);
23-
PrimitiveFactory.register("msbl_regularline2", RegularLine2Primitive);
24-
PrimitiveFactory.register("msbl_regularsurface", RegularSurfacePrimitive);
25-
PrimitiveFactory.register("msbl_kidneyarea", KidneyAreaPrimitive);
26-
2720
// 新修规则
2821
PrimitiveFactory.register("simplepoint", SimplePointPrimitive);
2922
PrimitiveFactory.register("simpleline", SimpleLinePrimitive);
3023
PrimitiveFactory.register("simplearea", SimpleAreaPrimitive);
3124

32-
3325
// 非规则符号
34-
PrimitiveFactory.register("msbl_AssaultArrow", BaseIrregularPrimitive);
35-
PrimitiveFactory.register("msbl_MultiArrow", BaseIrregularPrimitive);
36-
PrimitiveFactory.register("msbl_CombinationalCircle",BaseIrregularPrimitive);
37-
PrimitiveFactory.register("msbl_AntiAircraftGroup", BaseIrregularPrimitive);
38-
PrimitiveFactory.register("msbl_cannonGroup", BaseIrregularPrimitive);
39-
PrimitiveFactory.register("msbl_Kidney", BaseIrregularPrimitive);
26+
PrimitiveFactory.register("combinationcircle", BaseIrregularPrimitive);
27+
PrimitiveFactory.register("kidney", BaseIrregularPrimitive);
28+
PrimitiveFactory.register("sector", BaseIrregularPrimitive);
29+
30+
PrimitiveFactory.register("singlearrow", BaseIrregularPrimitive);
31+
PrimitiveFactory.register("squadarrow", BaseIrregularPrimitive);
32+
PrimitiveFactory.register("multiarrow", BaseIrregularPrimitive);
33+
PrimitiveFactory.register("doublearrow", BaseIrregularPrimitive);
34+
PrimitiveFactory.register("assaultarrow", BaseIrregularPrimitive);
35+
PrimitiveFactory.register("tailedsquadarrow", BaseIrregularPrimitive);
4036

41-
PrimitiveFactory.register("msbl_doublearrow", BaseIrregularPrimitive);
42-
PrimitiveFactory.register("msbl_singleArrow", BaseIrregularPrimitive);
43-
PrimitiveFactory.register("msbl_squadarrow", BaseIrregularPrimitive);
44-
PrimitiveFactory.register("msbl_FigureFan", BaseIrregularPrimitive);
4537

4638
export default PrimitiveFactory;

‎src/service/PlotBase/Animation/AnimationTypes/PlotExtendAnimation/PlotGrowAnimation/PlotCoordsAnimation.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @Author: zk
44
* @Date: 2022-03-23 10:02:49
55
* @LastEditors: zk
6-
* @LastEditTime: 2022-06-07 15:43:10
6+
* @LastEditTime: 2022-06-13 11:51:25
77
*/
88
import Point from '../../../../../PlotUtilBase/Geometry/Point';
99
import PlotBaseAnimation from '../../PlotBaseAnimation';
@@ -45,5 +45,3 @@ export default class PlotCoordsAnimation extends PlotBaseAnimation {
4545
}
4646
}
4747
}
48-
49-

‎src/service/PlotBase/SvgLoader/element/IrregularElement/Arrow/AssaultArrowGeometry.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* @Author: your name
33
* @Date: 2021-11-09 10:21:27
4-
* @LastEditTime: 2021-11-09 11:00:40
5-
* @LastEditors: Please set LastEditors
4+
* @LastEditTime: 2022-06-13 14:49:58
5+
* @LastEditors: zk
66
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
77
* @FilePath: \MapGISPlotBase\src\base\SvgLoader\element\IrregularElement\Arrow\AssaultArrow.js
88
*/
@@ -12,7 +12,7 @@ import AssaultArrow from "../../../../../PlotUtilBase/Geometry/Arrow/AssaultArro
1212
export default class AssaultArrowGeometry extends BaseIrregularElement {
1313
constructor(node) {
1414
super(node);
15-
this.type = 'msbl_AssaultArrow';
15+
this.type = 'assaultarrow';
1616
}
1717

1818
_insertGeometry(points) {

‎src/service/PlotBase/SvgLoader/element/IrregularElement/Arrow/DoubleArrowGeometry.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* @Author: your name
33
* @Date: 2021-11-09 10:29:43
4-
* @LastEditTime: 2022-02-15 13:47:47
5-
* @LastEditors: Do not edit
4+
* @LastEditTime: 2022-06-13 14:48:14
5+
* @LastEditors: zk
66
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
77
* @FilePath: \MapGISPlotBase\src\base\SvgLoader\element\IrregularElement\Arrow\DoubleArrow.js
88
*/
@@ -13,7 +13,7 @@ import Point from "../../../../../PlotUtilBase/Geometry/Point";
1313
export default class DoubleArrowGeometry extends BaseIrregularElement{
1414
constructor(node) {
1515
super(node);
16-
this.type='msbl_doublearrow';
16+
this.type='doublearrow';
1717
}
1818
_insertGeometry(points){
1919
const pnts= points.map((s)=> [s.x,s.y])

‎src/service/PlotBase/SvgLoader/element/IrregularElement/Arrow/MultiArrowGeometry.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* @Author: your name
33
* @Date: 2021-11-09 10:37:25
4-
* @LastEditTime: 2022-05-11 10:38:54
5-
* @LastEditors: Do not edit
4+
* @LastEditTime: 2022-06-13 14:48:21
5+
* @LastEditors: zk
66
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
77
* @FilePath: \MapGISPlotBase\src\base\SvgLoader\element\IrregularElement\Arrow\MultiArrow.js
88
*/
@@ -12,7 +12,7 @@ import MultiArrow from '../../../../../PlotUtilBase/Geometry/Arrow/MultiArrow';
1212
export default class MultiArrowGeometry extends BaseIrregularElement{
1313
constructor(node) {
1414
super(node);
15-
this.type='msbl_MultiArrow';
15+
this.type='multiArrow';
1616
}
1717
_insertGeometry(points){
1818
const mutiArrow=new MultiArrow({

‎src/service/PlotBase/SvgLoader/element/IrregularElement/Arrow/SimpleArrowGeometry.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* @Author: your name
33
* @Date: 2021-10-18 10:17:39
4-
* @LastEditTime: 2022-05-11 10:23:54
5-
* @LastEditors: Do not edit
4+
* @LastEditTime: 2022-06-13 14:48:35
5+
* @LastEditors: zk
66
* @Description: In User Settings Edit
77
* @FilePath: \MapGISPlotBase\src\base\SvgLoader\element\IrregularElement\Arrow\SimpleArrow.js
88
*/
@@ -13,7 +13,7 @@ import Point from "../../../../../PlotUtilBase/Geometry/Point";
1313
export default class SimpleArrowGeometry extends BaseIrregularElement {
1414
constructor(node) {
1515
super(node);
16-
this.type = "msbl_singleArrow";
16+
this.type = "singlearrow";
1717
}
1818
_insertGeometry(points) {
1919
const pnts = points.map((s) => [s.x, s.y]);

‎src/service/PlotBase/SvgLoader/element/IrregularElement/Arrow/SquadArrowGeometry.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* @Author: your name
33
* @Date: 2021-11-09 10:38:10
4-
* @LastEditTime: 2021-11-09 11:03:29
5-
* @LastEditors: Please set LastEditors
4+
* @LastEditTime: 2022-06-13 14:48:40
5+
* @LastEditors: zk
66
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
77
* @FilePath: \MapGISPlotBase\src\base\SvgLoader\element\IrregularElement\Arrow\SquadArrow.js
88
*/
@@ -13,7 +13,7 @@ import Point from "../../../../../PlotUtilBase/Geometry/Point";
1313
export default class SquadArrowGeometry extends BaseIrregularElement {
1414
constructor(node) {
1515
super(node);
16-
this.type = 'msbl_squadarrow';
16+
this.type = 'squadarrow';
1717
}
1818

1919
_insertGeometry(points) {

0 commit comments

Comments
 (0)