Skip to content

Commit 8e86bbd

Browse files
[fix]误提交还原
1 parent 193f29a commit 8e86bbd

File tree

3 files changed

+184
-184
lines changed

3 files changed

+184
-184
lines changed

test/karma.conf.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,28 @@ module.exports = function (config) {
6666
'./resources/**.js',
6767
/***classic的源码***/
6868
/*由于除了classic其他都不依赖于8c,所以classic 的引入放在最后,以免被common覆盖*/
69-
// { pattern: '../src/classic/libs/SuperMap_Basic-8.1.1-17729.js', included: true },
70-
// { pattern: '../src/classic/libs/Lang/*.js', included: true },
71-
// { pattern: '../src/classic/theme/default/*.css', included: true },
72-
// { pattern: './resources/data/**.fgb', included: false },
73-
// { pattern: './resources/data/**.mp4', included: false },
74-
// { pattern: './resources/img/**.svg', included: false },
75-
// { pattern: './resources/img/baiduTileTest.png', included: false },
76-
// /**测试文件**/
77-
// './test-main-classic.js',
69+
{ pattern: '../src/classic/libs/SuperMap_Basic-8.1.1-17729.js', included: true },
70+
{ pattern: '../src/classic/libs/Lang/*.js', included: true },
71+
{ pattern: '../src/classic/theme/default/*.css', included: true },
72+
{ pattern: './resources/data/**.fgb', included: false },
73+
{ pattern: './resources/data/**.mp4', included: false },
74+
{ pattern: './resources/img/**.svg', included: false },
75+
{ pattern: './resources/img/baiduTileTest.png', included: false },
76+
/**测试文件**/
77+
'./test-main-classic.js',
7878

7979
/***common的源码***/
8080
'../src/common/!(ai)/*.js',
8181
/**测试文件**/
82-
// './test-main-common.js',
82+
'./test-main-common.js',
8383

84-
// /***leaflet的源码***/
85-
// { pattern: './libs/workers/TurfWorkerForTest.js', included: false },
86-
// { pattern: '../node_modules/leaflet/dist/leaflet.css', included: true },
87-
// { pattern: '../src/leaflet/**/**/*.css', included: true },
88-
// '../src/leaflet/**/!(index).js',
89-
// /**测试文件**/
90-
// './test-main-leaflet.js',
84+
/***leaflet的源码***/
85+
{ pattern: './libs/workers/TurfWorkerForTest.js', included: false },
86+
{ pattern: '../node_modules/leaflet/dist/leaflet.css', included: true },
87+
{ pattern: '../src/leaflet/**/**/*.css', included: true },
88+
'../src/leaflet/**/!(index).js',
89+
/**测试文件**/
90+
'./test-main-leaflet.js',
9191

9292
/***openlayers的源码***/
9393
{ pattern: '../node_modules/ol/ol.css', included: true },
@@ -102,10 +102,10 @@ module.exports = function (config) {
102102
'../src/mapboxgl/**/!(index).js',
103103
/**测试文件**/
104104
'./test-main-mapboxgl.js',
105-
// { pattern: '../node_modules/maplibre-gl/dist/maplibre-gl.css', included: false },
106-
// '../src/maplibregl/**/!(index).js',
107-
// /**测试文件**/
108-
// './test-main-maplibregl.js'
105+
{ pattern: '../node_modules/maplibre-gl/dist/maplibre-gl.css', included: false },
106+
'../src/maplibregl/**/!(index).js',
107+
/**测试文件**/
108+
'./test-main-maplibregl.js'
109109
],
110110

111111
// list of files to exclude 测试时排除的文件

test/test-main-mapboxgl.js

+83-83
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
1-
// import './mapboxgl/core/MapExtendSpec.js';
2-
// import './mapboxgl/core/UtilSpec.js';
1+
import './mapboxgl/core/MapExtendSpec.js';
2+
import './mapboxgl/core/UtilSpec.js';
33

4-
// /*mapboxgl -- control*/
5-
// import './mapboxgl/control/LogoSpec.js';
4+
/*mapboxgl -- control*/
5+
import './mapboxgl/control/LogoSpec.js';
66

7-
// /*mapboxgl -- overlay*/
8-
// import './mapboxgl/overlay/mapv/MapvDataSetSpec.js';
9-
// import './mapboxgl/overlay/GraphThemeLayerSpec.js';
10-
// import './mapboxgl/overlay/HeatMapLayerSpec.js';
11-
// import './mapboxgl/overlay/LabelThemeLayerSpec.js';
12-
// import './mapboxgl/overlay/MapvLayerSpec.js';
13-
// import './mapboxgl/overlay/RangeThemeLayerSpec.js';
14-
// import './mapboxgl/overlay/RangeTheme3DLayerSpec.js';
15-
// import './mapboxgl/overlay/ThreeLayerSpec.js';
16-
// import './mapboxgl/overlay/UniqueThemeLayerSpec.js';
17-
// import './mapboxgl/overlay/UniqueTheme3DLayerSpec.js';
18-
// import './mapboxgl/overlay/DeckglLayerSpec.js';
19-
// import './mapboxgl/overlay/graphic/GraphicSpec.js';
20-
// import './mapboxgl/overlay/GraphicLayerSpec.js';
21-
// import './mapboxgl/overlay/GraticuleLayerSpec.js';
22-
// import './mapboxgl/overlay/GraphMapSpec';
23-
// import './mapboxgl/overlay/L7LayerSpec.js';
24-
// import './mapboxgl/overlay/symbol/CompositeSymbolRenderSpec';
25-
// import './mapboxgl/overlay/symbol/SingleSymbolRenderSpec';
26-
// import './mapboxgl/overlay/symbol/SymbolManagerSpec';
27-
// import './mapboxgl/overlay/symbol/WebSymbolSpec';
28-
// import './mapboxgl/overlay/symbol/SymbolHandlerSpec';
29-
// import './mapboxgl/overlay/symbol/SymbolUtilSpec';
30-
// import './mapboxgl/overlay/symbol/MapExtendSymbolSpec.js';
7+
/*mapboxgl -- overlay*/
8+
import './mapboxgl/overlay/mapv/MapvDataSetSpec.js';
9+
import './mapboxgl/overlay/GraphThemeLayerSpec.js';
10+
import './mapboxgl/overlay/HeatMapLayerSpec.js';
11+
import './mapboxgl/overlay/LabelThemeLayerSpec.js';
12+
import './mapboxgl/overlay/MapvLayerSpec.js';
13+
import './mapboxgl/overlay/RangeThemeLayerSpec.js';
14+
import './mapboxgl/overlay/RangeTheme3DLayerSpec.js';
15+
import './mapboxgl/overlay/ThreeLayerSpec.js';
16+
import './mapboxgl/overlay/UniqueThemeLayerSpec.js';
17+
import './mapboxgl/overlay/UniqueTheme3DLayerSpec.js';
18+
import './mapboxgl/overlay/DeckglLayerSpec.js';
19+
import './mapboxgl/overlay/graphic/GraphicSpec.js';
20+
import './mapboxgl/overlay/GraphicLayerSpec.js';
21+
import './mapboxgl/overlay/GraticuleLayerSpec.js';
22+
import './mapboxgl/overlay/GraphMapSpec';
23+
import './mapboxgl/overlay/L7LayerSpec.js';
24+
import './mapboxgl/overlay/symbol/CompositeSymbolRenderSpec';
25+
import './mapboxgl/overlay/symbol/SingleSymbolRenderSpec';
26+
import './mapboxgl/overlay/symbol/SymbolManagerSpec';
27+
import './mapboxgl/overlay/symbol/WebSymbolSpec';
28+
import './mapboxgl/overlay/symbol/SymbolHandlerSpec';
29+
import './mapboxgl/overlay/symbol/SymbolUtilSpec';
30+
import './mapboxgl/overlay/symbol/MapExtendSymbolSpec.js';
3131

32-
// /*mapboxgl -- services*/
33-
// import './mapboxgl/services/KnowledgeGraphServiceSpec.js';
34-
// import './mapboxgl/services/AddressMatchServiceSpec.js';
35-
// import './mapboxgl/services/BufferAnalysisSpec.js';
36-
// import './mapboxgl/services/DataFlowServiceSpec.js';
37-
// import './mapboxgl/services/DensityAnalysisSpec.js';
38-
// import './mapboxgl/services/EditFeaturesSpec.js';
39-
// import './mapboxgl/services/EditVideoFeatureSpec.js';
40-
// import './mapboxgl/services/FieldServiceSpec.js';
41-
// import './mapboxgl/services/GenerateSpatialDataSpec.js';
42-
// import './mapboxgl/services/GeoRelationAnalysisSpec.js';
43-
// import './mapboxgl/services/GeometryBatchAnalysisSpec.js';
44-
// import './mapboxgl/services/GeoprocessingServiceSpec.js';
45-
// import './mapboxgl/overlay/FGBLayerSpec.js';
46-
// import './mapboxgl/overlay/VideoLayerSpec.js';
47-
// import './mapboxgl/services/GetFeaturesByBoundsSpec.js';
48-
// import './mapboxgl/services/GetFeaturesByBufferSpec.js';
49-
// import './mapboxgl/services/GetFeaturesByGeometrySpec.js';
50-
// import './mapboxgl/services/GetFeaturesByIDsSpec.js';
51-
// import './mapboxgl/services/GetFeaturesBySQLSpec.js';
52-
// import './mapboxgl/services/GridCellInfosServiceSpec.js';
53-
// import './mapboxgl/services/InterpolationAnalysisSpec.js';
54-
// import './mapboxgl/services/LayerInfoServiceSpec.js';
55-
// import './mapboxgl/services/MapServiceSpec.js';
56-
// import './mapboxgl/services/MathExpressionAnalysisSpec.js';
57-
// import './mapboxgl/services/MeasureServiceSpec.js';
58-
// import './mapboxgl/services/NetworkAnalystServiceSpec.js';
59-
// import './mapboxgl/services/OverlayAnalysisSpec.js';
60-
// import './mapboxgl/services/ProcessingServiceSpec.js';
61-
// import './mapboxgl/services/QueryServiceSpec.js';
62-
// import './mapboxgl/services/RouteCalculateMeasureSpec.js';
63-
// import './mapboxgl/services/RouteLocateSpec.js';
64-
// import './mapboxgl/services/SurfaceAnalysisSpec.js';
65-
// import './mapboxgl/services/TerrainCurvatureCalculateSpec.js';
66-
// import './mapboxgl/services/TerrainAspectCalculateSpec.js';
67-
// import './mapboxgl/services/TerrainSlopeCalculateSpec.js';
68-
// import './mapboxgl/services/TerrainCutFillCalculateSpec.js';
69-
// import './mapboxgl/services/MinDistanceAnalysisSpec.js';
70-
// import './mapboxgl/services/ConvexHullAnalysisSpec.js';
71-
// import './mapboxgl/services/ThemeServiceSpec.js';
72-
// import './mapboxgl/services/ThiessenAnalysisSpec.js';
73-
// import './mapboxgl/services/TrafficTransferAnalystServiceSpec.js';
74-
// import './mapboxgl/services/WebPrintingJobServiceSpec.js';
75-
// import './mapboxgl/services/DatasetServiceSpec.js';
76-
// import './mapboxgl/services/DatasourceServiceSpec.js';
77-
// import './mapboxgl/services/ImageServiceSpec';
78-
// import './mapboxgl/services/ImageCollectionServiceSpec';
79-
// import './mapboxgl/services/ChartServiceSpec';
80-
// import './mapboxgl/services/GetFeatureAttachmentsSpec';
81-
// import './mapboxgl/services/EditFeatureAttachmentsSpec';
82-
// /*mapboxgl -- mapping*/
83-
// import './mapboxgl/mapping/WebMapSpec.js';
32+
/*mapboxgl -- services*/
33+
import './mapboxgl/services/KnowledgeGraphServiceSpec.js';
34+
import './mapboxgl/services/AddressMatchServiceSpec.js';
35+
import './mapboxgl/services/BufferAnalysisSpec.js';
36+
import './mapboxgl/services/DataFlowServiceSpec.js';
37+
import './mapboxgl/services/DensityAnalysisSpec.js';
38+
import './mapboxgl/services/EditFeaturesSpec.js';
39+
import './mapboxgl/services/EditVideoFeatureSpec.js';
40+
import './mapboxgl/services/FieldServiceSpec.js';
41+
import './mapboxgl/services/GenerateSpatialDataSpec.js';
42+
import './mapboxgl/services/GeoRelationAnalysisSpec.js';
43+
import './mapboxgl/services/GeometryBatchAnalysisSpec.js';
44+
import './mapboxgl/services/GeoprocessingServiceSpec.js';
45+
import './mapboxgl/overlay/FGBLayerSpec.js';
46+
import './mapboxgl/overlay/VideoLayerSpec.js';
47+
import './mapboxgl/services/GetFeaturesByBoundsSpec.js';
48+
import './mapboxgl/services/GetFeaturesByBufferSpec.js';
49+
import './mapboxgl/services/GetFeaturesByGeometrySpec.js';
50+
import './mapboxgl/services/GetFeaturesByIDsSpec.js';
51+
import './mapboxgl/services/GetFeaturesBySQLSpec.js';
52+
import './mapboxgl/services/GridCellInfosServiceSpec.js';
53+
import './mapboxgl/services/InterpolationAnalysisSpec.js';
54+
import './mapboxgl/services/LayerInfoServiceSpec.js';
55+
import './mapboxgl/services/MapServiceSpec.js';
56+
import './mapboxgl/services/MathExpressionAnalysisSpec.js';
57+
import './mapboxgl/services/MeasureServiceSpec.js';
58+
import './mapboxgl/services/NetworkAnalystServiceSpec.js';
59+
import './mapboxgl/services/OverlayAnalysisSpec.js';
60+
import './mapboxgl/services/ProcessingServiceSpec.js';
61+
import './mapboxgl/services/QueryServiceSpec.js';
62+
import './mapboxgl/services/RouteCalculateMeasureSpec.js';
63+
import './mapboxgl/services/RouteLocateSpec.js';
64+
import './mapboxgl/services/SurfaceAnalysisSpec.js';
65+
import './mapboxgl/services/TerrainCurvatureCalculateSpec.js';
66+
import './mapboxgl/services/TerrainAspectCalculateSpec.js';
67+
import './mapboxgl/services/TerrainSlopeCalculateSpec.js';
68+
import './mapboxgl/services/TerrainCutFillCalculateSpec.js';
69+
import './mapboxgl/services/MinDistanceAnalysisSpec.js';
70+
import './mapboxgl/services/ConvexHullAnalysisSpec.js';
71+
import './mapboxgl/services/ThemeServiceSpec.js';
72+
import './mapboxgl/services/ThiessenAnalysisSpec.js';
73+
import './mapboxgl/services/TrafficTransferAnalystServiceSpec.js';
74+
import './mapboxgl/services/WebPrintingJobServiceSpec.js';
75+
import './mapboxgl/services/DatasetServiceSpec.js';
76+
import './mapboxgl/services/DatasourceServiceSpec.js';
77+
import './mapboxgl/services/ImageServiceSpec';
78+
import './mapboxgl/services/ImageCollectionServiceSpec';
79+
import './mapboxgl/services/ChartServiceSpec';
80+
import './mapboxgl/services/GetFeatureAttachmentsSpec';
81+
import './mapboxgl/services/EditFeatureAttachmentsSpec';
82+
/*mapboxgl -- mapping*/
83+
import './mapboxgl/mapping/WebMapSpec.js';
8484
import './mapboxgl/mapping/WebMapV2Spec.js';
85-
// import './mapboxgl/mapping/WebMapV3Spec.js';
86-
// import './mapboxgl/mapping/InitMapSpec.js';
87-
// import './mapboxgl/mapping/VideoMapSpec.js';
85+
import './mapboxgl/mapping/WebMapV3Spec.js';
86+
import './mapboxgl/mapping/InitMapSpec.js';
87+
import './mapboxgl/mapping/VideoMapSpec.js';

0 commit comments

Comments
 (0)