Skip to content

Commit 204b688

Browse files
chenxianhuiichenxianhuii
committed
【fix】ISVJ-7398 修复带有token的restmap和叠加的数据401问题
1 parent f6e77a4 commit 204b688

File tree

3 files changed

+102
-77
lines changed

3 files changed

+102
-77
lines changed

‎test/openlayers/mapping/WebMapSpec.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,4 +1579,27 @@ describe('openlayers_WebMap', () => {
15791579
done();
15801580
}
15811581
});
1582+
1583+
it('createBaseLayer-SUPERMAP_REST-token', (done) => {
1584+
spyOn(FetchRequest, 'get').and.callFake((url, params, options) => {
1585+
if (url.indexOf('map.json') > -1) {
1586+
var mapJson = datavizWebMap_RestMap_token;
1587+
return Promise.resolve(new Response(mapJson));
1588+
} else if (url.indexOf('content.json') > -1) {
1589+
expect(url.indexOf('testtoken')).toBe(-1);
1590+
return Promise.resolve(new Response(geojsonData));
1591+
} else {
1592+
expect(url.indexOf('testtoken')).not.toBe(-1);
1593+
return Promise.resolve()
1594+
}
1595+
});
1596+
var datavizWebmap = new WebMap(id, {successCallback, errorCallback, server: defaultServer });
1597+
function successCallback(map, mapInfo, layers, baseLayer){
1598+
expect(baseLayer.credential).toEqual({token: 'testtoken'});
1599+
done();
1600+
}
1601+
function errorCallback(error) {
1602+
console.log(error);
1603+
}
1604+
});
15821605
});

‎test/resources/WebMapV5.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/test-main-openlayers.js‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
1-
/*openlayers -- control*/
2-
import './openlayers/control/ChangeTileVersionSpec.js';
3-
import './openlayers/control/ScaleLineSpec';
1+
// /*openlayers -- control*/
2+
// import './openlayers/control/ChangeTileVersionSpec.js';
3+
// import './openlayers/control/ScaleLineSpec';
44

5-
/*openlayers -- core*/
6-
import './openlayers/core/StyleUtilsSpec.js';
7-
import './openlayers/core/UtilSpec.js';
8-
import './openlayers/core/MapExtendSpec.js';
5+
// /*openlayers -- core*/
6+
// import './openlayers/core/StyleUtilsSpec.js';
7+
// import './openlayers/core/UtilSpec.js';
8+
// import './openlayers/core/MapExtendSpec.js';
99

10-
// /*openlayers -- mapping*/
11-
import './openlayers/mapping/ImageSuperMapRestSpec.js';
12-
import './openlayers/mapping/TileSuperMapRestSpec.js';
10+
// // /*openlayers -- mapping*/
11+
// import './openlayers/mapping/ImageSuperMapRestSpec.js';
12+
// import './openlayers/mapping/TileSuperMapRestSpec.js';
1313
import './openlayers/mapping/WebMapSpec.js';
14-
import './openlayers/mapping/ImageTileSuperMapRestSpec.js';
15-
import './openlayers/mapping/initMapSpec.js';
14+
// import './openlayers/mapping/ImageTileSuperMapRestSpec.js';
15+
// import './openlayers/mapping/initMapSpec.js';
1616

17-
/*openlayers -- overlay*/
18-
import './openlayers/overlay/DataFlowSpec.js';
19-
import './openlayers/overlay/graphic/GraphicSpec.js';
20-
import './openlayers/overlay/GraphicSpec.js';
21-
import './openlayers/overlay/graphic/CanvasRendererSpec';
17+
// /*openlayers -- overlay*/
18+
// import './openlayers/overlay/DataFlowSpec.js';
19+
// import './openlayers/overlay/graphic/GraphicSpec.js';
20+
// import './openlayers/overlay/GraphicSpec.js';
21+
// import './openlayers/overlay/graphic/CanvasRendererSpec';
2222

23-
import './openlayers/overlay/GraphSpec.js';
24-
import './openlayers/overlay/HeatMapSpec.js';
25-
import './openlayers/overlay/LabelSpec.js';
26-
import './openlayers/overlay/MapvSpec.js';
27-
import './openlayers/overlay/RangeSpec.js';
28-
import './openlayers/overlay/RankSymbolSpec.js';
29-
import './openlayers/overlay/UniqueSpec.js';
30-
import './openlayers/overlay/VectorTileSuperMapRestMapboxstyleSpec.js';
31-
import './openlayers/overlay/VectorTileSuperMapRestSpec.js';
32-
import './openlayers/overlay/theme/GeoFeatureSpec.js';
33-
import './openlayers/overlay/theme/ThemeFeatureSpec.js';
34-
import './openlayers/overlay/theme/ThemeSpec.js';
35-
import './openlayers/overlay/vectortile/VectorTileStylesSpec.js';
36-
import './openlayers/overlay/vectortile/MapboxStylesSpec.js';
37-
import './openlayers/overlay/TurfSpec.js';
38-
import './openlayers/overlay/FGBSpec.js';
39-
import './openlayers/overlay/GraphMapSpec';
23+
// import './openlayers/overlay/GraphSpec.js';
24+
// import './openlayers/overlay/HeatMapSpec.js';
25+
// import './openlayers/overlay/LabelSpec.js';
26+
// import './openlayers/overlay/MapvSpec.js';
27+
// import './openlayers/overlay/RangeSpec.js';
28+
// import './openlayers/overlay/RankSymbolSpec.js';
29+
// import './openlayers/overlay/UniqueSpec.js';
30+
// import './openlayers/overlay/VectorTileSuperMapRestMapboxstyleSpec.js';
31+
// import './openlayers/overlay/VectorTileSuperMapRestSpec.js';
32+
// import './openlayers/overlay/theme/GeoFeatureSpec.js';
33+
// import './openlayers/overlay/theme/ThemeFeatureSpec.js';
34+
// import './openlayers/overlay/theme/ThemeSpec.js';
35+
// import './openlayers/overlay/vectortile/VectorTileStylesSpec.js';
36+
// import './openlayers/overlay/vectortile/MapboxStylesSpec.js';
37+
// import './openlayers/overlay/TurfSpec.js';
38+
// import './openlayers/overlay/FGBSpec.js';
39+
// import './openlayers/overlay/GraphMapSpec';
4040

41-
// /**openlayers --services**/
42-
import './openlayers/services/BufferAnalysisSpec.js';
43-
import './openlayers/services/DensityAnalysisSpec.js';
44-
import './openlayers/services/EditFeaturesSpec.js';
45-
import './openlayers/services/FieldServiceSpec.js';
46-
import './openlayers/services/GenerateSpatialDataSpec.js';
47-
import './openlayers/services/GeoRelationAnalysisSpec.js';
48-
import './openlayers/services/GeometryBatchAnalysisSpec.js';
49-
import './openlayers/services/GetFeaturesByBoundsSpec.js';
50-
import './openlayers/services/GetFeaturesByBufferSpec.js';
51-
import './openlayers/services/GetFeaturesByGeometrySpec.js';
52-
import './openlayers/services/GetFeaturesByIDsSpec.js';
53-
import './openlayers/services/GetFeaturesBySQLSpec.js';
54-
import './openlayers/services/GeoprocessingServiceSpec.js';
41+
// // /**openlayers --services**/
42+
// import './openlayers/services/BufferAnalysisSpec.js';
43+
// import './openlayers/services/DensityAnalysisSpec.js';
44+
// import './openlayers/services/EditFeaturesSpec.js';
45+
// import './openlayers/services/FieldServiceSpec.js';
46+
// import './openlayers/services/GenerateSpatialDataSpec.js';
47+
// import './openlayers/services/GeoRelationAnalysisSpec.js';
48+
// import './openlayers/services/GeometryBatchAnalysisSpec.js';
49+
// import './openlayers/services/GetFeaturesByBoundsSpec.js';
50+
// import './openlayers/services/GetFeaturesByBufferSpec.js';
51+
// import './openlayers/services/GetFeaturesByGeometrySpec.js';
52+
// import './openlayers/services/GetFeaturesByIDsSpec.js';
53+
// import './openlayers/services/GetFeaturesBySQLSpec.js';
54+
// import './openlayers/services/GeoprocessingServiceSpec.js';
5555

56-
import './openlayers/services/InterpolationAnalysisSpec.js';
57-
import './openlayers/services/LayerInfoServiceSpec.js';
58-
import './openlayers/services/MathExpressionAnalysisSpec.js';
59-
import './openlayers/services/MeasureServiceSpec.js';
60-
import './openlayers/services/NetworkAnalystServiceSpec.js';
61-
import './openlayers/services/OverlayAnalysisSpec.js';
62-
import './openlayers/services/ProcessingServiceSpec.js';
63-
import './openlayers/services/QueryServiceSpec.js';
64-
import './openlayers/services/RouteCalculateMeasureSpec.js';
65-
import './openlayers/services/RouteLocateSpec.js';
66-
import './openlayers/services/SurfaceAnalysisSpec.js';
67-
import './openlayers/services/TerrainCurvatureCalculateSpec.js';
68-
import './openlayers/services/TerrainAspectCalculateSpec.js';
69-
import './openlayers/services/TerrainSlopeCalculateSpec.js';
70-
import './openlayers/services/TerrainCutFillCalculateSpec.js';
71-
import './openlayers/services/MinDistanceAnalysisSpec.js';
72-
import './openlayers/services/ConvexHullAnalysisSpec.js';
73-
import './openlayers/services/ThemeServiceSpec.js';
74-
import './openlayers/services/ThiessenAnalysisSpec.js';
75-
import './openlayers/services/TrafficTransferAnalystServiceSpec.js';
76-
import './openlayers/services/AddressMatchServiceSpec.js';
77-
import './openlayers/services/GridCellInfosServiceSpec.js';
78-
import './openlayers/services/WebPrintingJobServiceSpec.js';
79-
import './openlayers/services/DatasetServiceSpec.js';
80-
import './openlayers/services/DatasourceServiceSpec.js';
81-
import './openlayers/services/ImageServiceSpec';
82-
import './openlayers/services/ImageCollectionServiceSpec';
83-
import './openlayers/services/KnowledgeGraphServiceSpec.js';
84-
import './openlayers/services/ChartServiceSpec.js';
56+
// import './openlayers/services/InterpolationAnalysisSpec.js';
57+
// import './openlayers/services/LayerInfoServiceSpec.js';
58+
// import './openlayers/services/MathExpressionAnalysisSpec.js';
59+
// import './openlayers/services/MeasureServiceSpec.js';
60+
// import './openlayers/services/NetworkAnalystServiceSpec.js';
61+
// import './openlayers/services/OverlayAnalysisSpec.js';
62+
// import './openlayers/services/ProcessingServiceSpec.js';
63+
// import './openlayers/services/QueryServiceSpec.js';
64+
// import './openlayers/services/RouteCalculateMeasureSpec.js';
65+
// import './openlayers/services/RouteLocateSpec.js';
66+
// import './openlayers/services/SurfaceAnalysisSpec.js';
67+
// import './openlayers/services/TerrainCurvatureCalculateSpec.js';
68+
// import './openlayers/services/TerrainAspectCalculateSpec.js';
69+
// import './openlayers/services/TerrainSlopeCalculateSpec.js';
70+
// import './openlayers/services/TerrainCutFillCalculateSpec.js';
71+
// import './openlayers/services/MinDistanceAnalysisSpec.js';
72+
// import './openlayers/services/ConvexHullAnalysisSpec.js';
73+
// import './openlayers/services/ThemeServiceSpec.js';
74+
// import './openlayers/services/ThiessenAnalysisSpec.js';
75+
// import './openlayers/services/TrafficTransferAnalystServiceSpec.js';
76+
// import './openlayers/services/AddressMatchServiceSpec.js';
77+
// import './openlayers/services/GridCellInfosServiceSpec.js';
78+
// import './openlayers/services/WebPrintingJobServiceSpec.js';
79+
// import './openlayers/services/DatasetServiceSpec.js';
80+
// import './openlayers/services/DatasourceServiceSpec.js';
81+
// import './openlayers/services/ImageServiceSpec';
82+
// import './openlayers/services/ImageCollectionServiceSpec';
83+
// import './openlayers/services/KnowledgeGraphServiceSpec.js';
84+
// import './openlayers/services/ChartServiceSpec.js';
8585

0 commit comments

Comments
 (0)