Skip to content

Commit 2a75cd8

Browse files
yang-mengyueyang-mengyue
committed
【 update 】优化前缀类似的类的导出名不一致的问题； review by luox
1 parent 8d18806 commit 2a75cd8

10 files changed

Lines changed: 420 additions & 324 deletions

File tree

‎src/common/commontypes/geometry/index.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
/* Copyright© 2000 - 2021 SuperMap Software Co.Ltd. All rights reserved.
22
* This program are made available under the terms of the Apache License, Version 2.0
33
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
4-
import {Collection} from './Collection';
5-
import {Curve} from './Curve';
6-
import {GeoText} from './GeoText' ;
7-
import {LinearRing} from './LinearRing' ;
8-
import {LineString} from './LineString' ;
9-
import {MultiLineString} from './MultiLineString' ;
10-
import {MultiPoint} from './MultiPoint' ;
11-
import {MultiPolygon} from './MultiPolygon' ;
4+
import {Collection, Collection as GeometryCollection} from './Collection';
5+
import {Curve, Curve as GeometryCurve} from './Curve';
6+
import {GeoText, GeoText as GeometryGeoText} from './GeoText' ;
7+
import {LinearRing, LinearRing as GeometryLinearRing} from './LinearRing' ;
8+
import {LineString, LineString as GeometryLineString} from './LineString' ;
9+
import {MultiLineString, MultiLineString as GeometryMultiLineString} from './MultiLineString' ;
10+
import {MultiPoint, MultiPoint as GeometryMultiPoint} from './MultiPoint' ;
11+
import {MultiPolygon, MultiPolygon as GeometryMultiPolygon} from './MultiPolygon' ;
1212
import {Point as GeometryPoint} from './Point' ;
13-
import {Polygon} from './Polygon' ;
14-
import {Rectangle} from './Rectangle';
13+
import {Polygon, Polygon as GeometryPolygon} from './Polygon' ;
14+
import {Rectangle, Rectangle as GeometryRectangle} from './Rectangle';
1515

16-
export {Collection} ;
17-
export {Curve} ;
18-
export {GeoText} ;
19-
export {LinearRing};
20-
export {LineString} ;
21-
export {MultiLineString} ;
22-
export {MultiPoint} ;
23-
export {MultiPolygon} ;
16+
export {Collection, GeometryCollection} ;
17+
export {Curve, GeometryCurve} ;
18+
export {GeoText, GeometryGeoText} ;
19+
export {LinearRing, GeometryLinearRing};
20+
export {LineString, GeometryLineString} ;
21+
export {MultiLineString, GeometryMultiLineString} ;
22+
export {MultiPoint, GeometryMultiPoint} ;
23+
export {MultiPolygon, GeometryMultiPolygon} ;
2424
export {GeometryPoint} ;
25-
export {Polygon};
26-
export {Rectangle} ;
25+
export {Polygon, GeometryPolygon};
26+
export {Rectangle, GeometryRectangle} ;

‎src/common/commontypes/index.js‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,26 @@
33
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
44
import {
55
Collection,
6+
GeometryCollection,
67
Curve,
8+
GeometryCurve,
79
GeoText,
10+
GeometryGeoText,
811
LinearRing,
12+
GeometryLinearRing,
913
LineString,
14+
GeometryLineString,
1015
MultiLineString,
16+
GeometryMultiLineString,
1117
MultiPoint,
18+
GeometryMultiPoint,
1219
MultiPolygon,
20+
GeometryMultiPolygon,
1321
GeometryPoint,
1422
Polygon,
15-
Rectangle
23+
GeometryPolygon,
24+
Rectangle,
25+
GeometryRectangle
1626
} from './geometry/index';
1727
import { inheritExt, mixinExt, StringExt, NumberExt, FunctionExt, ArrayExt } from './BaseTypes';
1828
import { Bounds } from './Bounds';
@@ -33,20 +43,30 @@ import {
3343
DOTS_PER_INCH,
3444
IS_GECKO
3545
} from './Util';
36-
import { Vector as GeometryVector } from './Vector';
46+
import { Vector as GeometryVector, Vector as FeatureVector } from './Vector';
3747

3848
export {
3949
Collection,
50+
GeometryCollection,
4051
Curve,
52+
GeometryCurve,
4153
GeoText,
54+
GeometryGeoText,
4255
LinearRing,
56+
GeometryLinearRing,
4357
LineString,
58+
GeometryLineString,
4459
MultiLineString,
60+
GeometryMultiLineString,
4561
MultiPoint,
62+
GeometryMultiPoint,
4663
MultiPolygon,
64+
GeometryMultiPolygon,
4765
GeometryPoint,
4866
Polygon,
49-
Rectangle
67+
GeometryPolygon,
68+
Rectangle,
69+
GeometryRectangle
5070
};
5171
export { inheritExt, mixinExt, StringExt, NumberExt, FunctionExt, ArrayExt };
5272
export { Bounds };
@@ -60,4 +80,4 @@ export { LonLat };
6080
export { Pixel };
6181
export { Size };
6282
export { CommonUtil, Browser, INCHES_PER_UNIT, METERS_PER_INCH, DOTS_PER_INCH, IS_GECKO };
63-
export { GeometryVector };
83+
export { GeometryVector, FeatureVector };

‎src/common/format/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* This program are made available under the terms of the Apache License, Version 2.0
33
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
44
import {Format} from './Format';
5-
import {GeoJSON} from './GeoJSON';
5+
import {GeoJSON, GeoJSON as GeoJSONFormat} from './GeoJSON';
66
import {JSONFormat} from './JSON';
7-
import {WKT} from './WKT';
7+
import {WKT, WKT as WKTFormat} from './WKT';
88

99
export {Format} ;
1010
export {JSONFormat} ;
11-
export {GeoJSON} ;
12-
export {WKT} ;
11+
export {GeoJSON, GeoJSONFormat} ;
12+
export {WKT, WKTFormat} ;

‎src/common/index.js‎

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,26 @@ import {
7676
} from './REST';
7777
import {
7878
Collection,
79+
GeometryCollection,
7980
Curve,
81+
GeometryCurve,
8082
GeoText,
83+
GeometryGeoText,
8184
LinearRing,
85+
GeometryLinearRing,
8286
LineString,
87+
GeometryLineString,
8388
MultiLineString,
89+
GeometryMultiLineString,
8490
MultiPoint,
91+
GeometryMultiPoint,
8592
MultiPolygon,
93+
GeometryMultiPolygon,
8694
GeometryPoint,
8795
Polygon,
96+
GeometryPolygon,
8897
Rectangle,
98+
GeometryRectangle,
8999
inheritExt,
90100
mixinExt,
91101
StringExt,
@@ -104,9 +114,10 @@ import {
104114
Size,
105115
CommonUtil,
106116
Browser,
107-
GeometryVector
117+
GeometryVector,
118+
FeatureVector
108119
} from './commontypes';
109-
import { Format, GeoJSON, JSONFormat } from './format';
120+
import { Format, GeoJSON, GeoJSONFormat, JSONFormat } from './format';
110121

111122
import { TimeControlBase, TimeFlowControl } from './control';
112123
import { IManager, IManagerCreateNodeParam, IManagerServiceBase } from './iManager';
@@ -400,16 +411,26 @@ import {
400411
import { CartoCSS, ThemeStyle } from './style';
401412
import {
402413
Graph,
414+
FeatureThemeGraph,
403415
RankSymbol,
416+
FeatureThemeRankSymbol,
404417
ThemeVector,
418+
FeatureThemeVector,
405419
ShapeFactory,
420+
FeatureShapeFactory,
406421
ShapeParameters,
407422
Image,
423+
ShapeParametersImage,
408424
Label,
425+
ShapeParametersLabel,
409426
FeatureLine,
427+
ShapeParametersLine,
410428
FeaturePolygon,
429+
ShapeParametersPolygon,
411430
FeatureRectangle,
431+
ShapeParametersRectangle,
412432
Sector,
433+
ShapeParametersSector,
413434
FeatureTheme,
414435
LevelRenderer,
415436
Render,
@@ -491,7 +512,6 @@ export {
491512
ComponentsUtil,
492513
FileReaderUtil,
493514
ChartView,
494-
ChartView as Chart,
495515
ChartViewModel,
496516
TemplateBase
497517
};
@@ -570,16 +590,26 @@ export {
570590
};
571591
export {
572592
Collection,
593+
GeometryCollection,
573594
Curve,
595+
GeometryCurve,
574596
GeoText,
597+
GeometryGeoText,
575598
LinearRing,
599+
GeometryLinearRing,
576600
LineString,
601+
GeometryLineString,
577602
MultiLineString,
603+
GeometryMultiLineString,
578604
MultiPoint,
605+
GeometryMultiPoint,
579606
MultiPolygon,
607+
GeometryMultiPolygon,
580608
GeometryPoint,
581609
Polygon,
610+
GeometryPolygon,
582611
Rectangle,
612+
GeometryRectangle,
583613
inheritExt,
584614
mixinExt,
585615
StringExt,
@@ -598,10 +628,11 @@ export {
598628
Size,
599629
CommonUtil,
600630
Browser,
601-
GeometryVector
631+
GeometryVector,
632+
FeatureVector
602633
};
603634
export { TimeControlBase, TimeFlowControl };
604-
export { Format, GeoJSON, JSONFormat };
635+
export { Format, GeoJSON, GeoJSONFormat, JSONFormat };
605636
export {
606637
isCORS,
607638
FetchRequest,
@@ -891,16 +922,26 @@ export {
891922
};
892923
export {
893924
Graph,
925+
FeatureThemeGraph,
894926
RankSymbol,
927+
FeatureThemeRankSymbol,
895928
ThemeVector,
929+
FeatureThemeVector,
896930
ShapeFactory,
931+
FeatureShapeFactory,
897932
ShapeParameters,
898933
Image,
934+
ShapeParametersImage,
899935
Label,
936+
ShapeParametersLabel,
900937
FeatureLine,
938+
ShapeParametersLine,
901939
FeaturePolygon,
940+
ShapeParametersPolygon,
902941
FeatureRectangle,
942+
ShapeParametersRectangle,
903943
Sector,
944+
ShapeParametersSector,
904945
FeatureTheme,
905946
LevelRenderer,
906947
Render,

0 commit comments

Comments
 (0)