Skip to content

Commit e3c5744

Browse files
xilanhuaweidapaoxilanhuaweidapao
committed
修改fgb 示例fgb服务地址 修复mapbox测试配置文件
1 parent 20edbcb commit e3c5744

File tree

8 files changed

+73
-75
lines changed

8 files changed

+73
-75
lines changed

‎examples/leaflet/fgb_all_load.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<script type="text/javascript">
1616
var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
1717
var map, baseUrl = host + '/iserver/services/map-china400/rest/maps/China_4326',
18-
fgbUrl = 'https://iclient.supermap.io/web/data/fgb/waterways.fgb';
18+
fgbUrl = 'https://iclient.supermap.io/minio/fgb/roads.fgb';
1919
map = L.map('map', {
2020
preferCanvas: true,
2121
crs: L.CRS.EPSG4326,

‎examples/leaflet/fgb_bbox_load.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
1616
var map,
1717
baseUrl = host + '/iserver/services/map-china400/rest/maps/China_4326',
18-
fgbUrl = 'https://iclient.supermap.io/web/data/fgb/waterways.fgb';
18+
fgbUrl = 'https://iclient.supermap.io/minio/fgb/roads.fgb';
1919
map = L.map('map', {
2020
preferCanvas: true,
2121
crs: L.CRS.EPSG4326,
22-
center: [40.05, 116.3],
22+
center: [39.91313934326172, 116.3966453552246],
2323
maxZoom: 18,
24-
zoom: 8
24+
zoom: 12
2525
});
2626
new L.supermap.TiledMapLayer(baseUrl).addTo(map);
2727
new L.supermap.FGBLayer(fgbUrl, {

‎examples/mapboxgl/fgb_all_load.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
" Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span>";
3434
var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
3535
var baseUrl = host + '/iserver/services/map-china400/rest/maps/China/zxyTileImage.png?z={z}&x={x}&y={y}';
36-
var fgbUrl = 'https://iclient.supermap.io/web/data/fgb/waterways.fgb';
36+
var fgbUrl = 'https://iclient.supermap.io/minio/fgb/roads.fgb';
3737

3838
var map = new mapboxgl.Map({
3939
container: 'map',

‎examples/mapboxgl/fgb_bbox_load.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
" Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span>";
3333
var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
3434
var baseUrl = host + '/iserver/services/map-china400/rest/maps/China/zxyTileImage.png?z={z}&x={x}&y={y}';
35-
var fgbUrl = 'https://iclient.supermap.io/web/data/fgb/waterways.fgb';
35+
var fgbUrl = 'https://iclient.supermap.io/minio/fgb/roads.fgb';
3636
var map = new mapboxgl.Map({
3737
container: 'map',
38-
center: [116.3, 40],
39-
zoom: 9,
38+
center: [116.3966453552246, 39.91313934326172],
39+
zoom: 12,
4040
style: {
4141
version: 8,
4242
sources: {

‎examples/openlayers/fgb_all_load.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<script type="text/javascript">
1515
var host = window.isLocal ? window.server : 'https://iserver.supermap.io',
1616
url = host + '/iserver/services/map-china400/rest/maps/China_4326';
17-
var fgbUrl = 'https://iclient.supermap.io/web/data/fgb/waterways.fgb';
17+
var fgbUrl = 'https://iclient.supermap.io/minio/fgb/roads.fgb';
1818
var map;
1919
map = new ol.Map({
2020
target: 'map',

‎examples/openlayers/fgb_bbox_load.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@
1414
<script type="text/javascript">
1515
var host = window.isLocal ? window.server : "https://iserver.supermap.io",
1616
url = host + "/iserver/services/map-china400/rest/maps/China_4326";
17-
var fgbUrl = 'https://iclient.supermap.io/web/data/fgb/waterways.fgb';
17+
var fgbUrl = 'https://iclient.supermap.io/minio/fgb/roads.fgb';
1818
var map;
19-
var dataSourceName = 'osm-line';
20-
var dataSetsName = 'waterways';
2119
map = new ol.Map({
2220
target: 'map',
2321
controls: ol.control
2422
.defaults({ attributionOptions: { collapsed: false } })
2523
.extend([new ol.supermap.control.Logo()]),
2624
view: new ol.View({
27-
center: [116.3, 40],
28-
zoom: 9,
25+
center: [116.3966453552246, 39.91313934326172],
26+
zoom: 13,
2927
projection: 'EPSG:4326',
3028
multiWorld: true
3129
})

‎test/karma.conf.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ module.exports = function (config) {
5858
'./resources/**.js',
5959
/***classic的源码***/
6060
/*由于除了classic其他都不依赖于8c,所以classic 的引入放在最后，以免被common覆盖*/
61-
{ pattern: '../src/classic/libs/SuperMap_Basic-8.1.1-17729.js', included: false },
62-
{ pattern: '../src/classic/libs/Lang/*.js', included: false },
63-
{ pattern: '../src/classic/theme/default/*.css', included: false },
61+
{ pattern: '../src/classic/libs/SuperMap_Basic-8.1.1-17729.js', included: true },
62+
{ pattern: '../src/classic/libs/Lang/*.js', included: true },
63+
{ pattern: '../src/classic/theme/default/*.css', included: true },
6464
/**测试文件**/
6565
'./test-main-classic.js',
6666

‎test/test-main-mapboxgl.js‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
// /*mapboxgl -- control*/
2-
// import './mapboxgl/control/LogoSpec.js';
1+
/*mapboxgl -- control*/
2+
import './mapboxgl/control/LogoSpec.js';
33

4-
// /*mapboxgl -- overlay*/
5-
// import './mapboxgl/overlay/mapv/MapvDataSetSpec.js';
6-
// import './mapboxgl/overlay/GraphThemeLayerSpec.js';
7-
// import './mapboxgl/overlay/HeatMapLayerSpec.js';
8-
// import './mapboxgl/overlay/LabelThemeLayerSpec.js';
9-
// import './mapboxgl/overlay/MapvLayerSpec.js';
10-
// import './mapboxgl/overlay/RangeThemeLayerSpec.js';
11-
// import './mapboxgl/overlay/RangeTheme3DLayerSpec.js';
12-
// import './mapboxgl/overlay/ThreeLayerSpec.js';
13-
// import './mapboxgl/overlay/UniqueThemeLayerSpec.js';
14-
// import './mapboxgl/overlay/UniqueTheme3DLayerSpec.js';
15-
// import './mapboxgl/overlay/DeckglLayerSpec.js';
4+
/*mapboxgl -- overlay*/
5+
import './mapboxgl/overlay/mapv/MapvDataSetSpec.js';
6+
import './mapboxgl/overlay/GraphThemeLayerSpec.js';
7+
import './mapboxgl/overlay/HeatMapLayerSpec.js';
8+
import './mapboxgl/overlay/LabelThemeLayerSpec.js';
9+
import './mapboxgl/overlay/MapvLayerSpec.js';
10+
import './mapboxgl/overlay/RangeThemeLayerSpec.js';
11+
import './mapboxgl/overlay/RangeTheme3DLayerSpec.js';
12+
import './mapboxgl/overlay/ThreeLayerSpec.js';
13+
import './mapboxgl/overlay/UniqueThemeLayerSpec.js';
14+
import './mapboxgl/overlay/UniqueTheme3DLayerSpec.js';
15+
import './mapboxgl/overlay/DeckglLayerSpec.js';
1616

17-
// import './mapboxgl/overlay/graphic/GraphicSpec.js';
18-
// import './mapboxgl/overlay/GraphicLayerSpec.js';
19-
// import './mapboxgl/overlay/mapv/MapvRenderSpec.js';
20-
// import './mapboxgl/overlay/GraticuleLayerSpec.js';
17+
import './mapboxgl/overlay/graphic/GraphicSpec.js';
18+
import './mapboxgl/overlay/GraphicLayerSpec.js';
19+
import './mapboxgl/overlay/mapv/MapvRenderSpec.js';
20+
import './mapboxgl/overlay/GraticuleLayerSpec.js';
2121

22-
// /*mapboxgl -- services*/
23-
// import './mapboxgl/services/AddressMatchServiceSpec.js';
24-
// import './mapboxgl/services/BufferAnalysisSpec.js';
25-
// import './mapboxgl/services/DataFlowServiceSpec.js';
26-
// import './mapboxgl/services/DensityAnalysisSpec.js';
27-
// import './mapboxgl/services/EditFeaturesSpec.js';
28-
// import './mapboxgl/services/FieldServiceSpec.js';
29-
// import './mapboxgl/services/GenerateSpatialDataSpec.js';
30-
// import './mapboxgl/services/GeoRelationAnalysisSpec.js';
31-
// import './mapboxgl/services/GeometryBatchAnalysisSpec.js';
32-
// import './mapboxgl/services/GeoprocessingServiceSpec.js';
22+
/*mapboxgl -- services*/
23+
import './mapboxgl/services/AddressMatchServiceSpec.js';
24+
import './mapboxgl/services/BufferAnalysisSpec.js';
25+
import './mapboxgl/services/DataFlowServiceSpec.js';
26+
import './mapboxgl/services/DensityAnalysisSpec.js';
27+
import './mapboxgl/services/EditFeaturesSpec.js';
28+
import './mapboxgl/services/FieldServiceSpec.js';
29+
import './mapboxgl/services/GenerateSpatialDataSpec.js';
30+
import './mapboxgl/services/GeoRelationAnalysisSpec.js';
31+
import './mapboxgl/services/GeometryBatchAnalysisSpec.js';
32+
import './mapboxgl/services/GeoprocessingServiceSpec.js';
3333
import './mapboxgl/overlay/FGBLayerSpec.js';
34-
// import './mapboxgl/services/GetFeaturesByBoundsSpec.js';
35-
// import './mapboxgl/services/GetFeaturesByBufferSpec.js';
36-
// import './mapboxgl/services/GetFeaturesByGeometrySpec.js';
37-
// import './mapboxgl/services/GetFeaturesByIDsSpec.js';
38-
// import './mapboxgl/services/GetFeaturesBySQLSpec.js';
39-
// import './mapboxgl/services/GridCellInfosServiceSpec.js';
40-
// import './mapboxgl/services/InterpolationAnalysisSpec.js';
41-
// import './mapboxgl/services/LayerInfoServiceSpec.js';
42-
// import './mapboxgl/services/MapServiceSpec.js';
43-
// import './mapboxgl/services/MathExpressionAnalysisSpec.js';
44-
// import './mapboxgl/services/MeasureServiceSpec.js';
45-
// import './mapboxgl/services/NetworkAnalystServiceSpec.js';
46-
// import './mapboxgl/services/OverlayAnalysisSpec.js';
47-
// import './mapboxgl/services/ProcessingServiceSpec.js';
48-
// import './mapboxgl/services/QueryServiceSpec.js';
49-
// import './mapboxgl/services/RouteCalculateMeasureSpec.js';
50-
// import './mapboxgl/services/RouteLocateSpec.js';
51-
// import './mapboxgl/services/SurfaceAnalysisSpec.js';
52-
// import './mapboxgl/services/TerrainCurvatureCalculateSpec.js';
53-
// import './mapboxgl/services/ThemeServiceSpec.js';
54-
// import './mapboxgl/services/ThiessenAnalysisSpec.js';
55-
// import './mapboxgl/services/TrafficTransferAnalystServiceSpec.js';
56-
// import './mapboxgl/services/WebPrintingJobServiceSpec.js';
57-
// import './mapboxgl/services/DatasetServiceSpec.js';
58-
// import './mapboxgl/services/DatasourceServiceSpec.js';
59-
// import './mapboxgl/services/ImageServiceSpec';
60-
// import './mapboxgl/services/ImageCollectionServiceSpec';
34+
import './mapboxgl/services/GetFeaturesByBoundsSpec.js';
35+
import './mapboxgl/services/GetFeaturesByBufferSpec.js';
36+
import './mapboxgl/services/GetFeaturesByGeometrySpec.js';
37+
import './mapboxgl/services/GetFeaturesByIDsSpec.js';
38+
import './mapboxgl/services/GetFeaturesBySQLSpec.js';
39+
import './mapboxgl/services/GridCellInfosServiceSpec.js';
40+
import './mapboxgl/services/InterpolationAnalysisSpec.js';
41+
import './mapboxgl/services/LayerInfoServiceSpec.js';
42+
import './mapboxgl/services/MapServiceSpec.js';
43+
import './mapboxgl/services/MathExpressionAnalysisSpec.js';
44+
import './mapboxgl/services/MeasureServiceSpec.js';
45+
import './mapboxgl/services/NetworkAnalystServiceSpec.js';
46+
import './mapboxgl/services/OverlayAnalysisSpec.js';
47+
import './mapboxgl/services/ProcessingServiceSpec.js';
48+
import './mapboxgl/services/QueryServiceSpec.js';
49+
import './mapboxgl/services/RouteCalculateMeasureSpec.js';
50+
import './mapboxgl/services/RouteLocateSpec.js';
51+
import './mapboxgl/services/SurfaceAnalysisSpec.js';
52+
import './mapboxgl/services/TerrainCurvatureCalculateSpec.js';
53+
import './mapboxgl/services/ThemeServiceSpec.js';
54+
import './mapboxgl/services/ThiessenAnalysisSpec.js';
55+
import './mapboxgl/services/TrafficTransferAnalystServiceSpec.js';
56+
import './mapboxgl/services/WebPrintingJobServiceSpec.js';
57+
import './mapboxgl/services/DatasetServiceSpec.js';
58+
import './mapboxgl/services/DatasourceServiceSpec.js';
59+
import './mapboxgl/services/ImageServiceSpec';
60+
import './mapboxgl/services/ImageCollectionServiceSpec';
6161

62-
// /*mapboxgl -- mapping*/
63-
// import './mapboxgl/mapping/WebMapSpec.js';
62+
/*mapboxgl -- mapping*/
63+
import './mapboxgl/mapping/WebMapSpec.js';

0 commit comments

Comments
 (0)