Skip to content

Commit e8692de

Browse files
songyumengsongyumeng
committed
【fix】优化例子显示 修复侧边栏异常展开的问题 review by zhurch
1 parent 08106f7 commit e8692de

File tree

3 files changed

+84
-96
lines changed

3 files changed

+84
-96
lines changed

‎examples/mapboxgl/config.js

Lines changed: 79 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,7 @@ var exampleConfig = {
308308
"VectorTileLayer": {
309309
name: "矢量瓦片",
310310
name_en: "Vector tile",
311-
content: [
312-
{
311+
content: [{
313312
name: "China",
314313
name_en: "China",
315314
thumbnail: "mvtVectorTile.png",
@@ -378,39 +377,36 @@ var exampleConfig = {
378377
version: "9.1.0",
379378
thumbnail: "mvtVectorTile_landuse.png",
380379
fileName: "mvtVectorTile_landuse"
381-
}
380+
}
382381
]
383382
},
384-
"Multi_coordinate_cluster": {
383+
"cluster": {
385384
name: "聚合",
386385
name_en: "Cluster",
387386
version: "9.1.1",
388-
content: [ {
387+
content: [{
389388
name: "点聚合",
390389
name_en: "Marker cluster",
391390
version: "9.1.1",
392391
thumbnail: "markerCluster_3857.png",
393392
fileName: "markerCluster_3857"
394-
},]
393+
}]
395394
},
396395
"graphicLayer": {
397396
name: "高效率点图层",
398397
name_en: "High efficiency point layer",
399-
content: [
400-
{
401-
name: "纽约出租车145万上车点",
402-
name_en: "points of 1.45 million NYC taxis",
403-
version: "9.1.0",
404-
thumbnail: "mb_graphicLayer.png",
405-
fileName: "graphicLayer"
406-
}
407-
]
398+
content: [{
399+
name: "纽约出租车145万上车点",
400+
name_en: "points of 1.45 million NYC taxis",
401+
version: "9.1.0",
402+
thumbnail: "mb_graphicLayer.png",
403+
fileName: "graphicLayer"
404+
}]
408405
},
409406
"ECharts": {
410407
name: "ECharts",
411408
name_en: "ECharts",
412-
content: [
413-
{
409+
content: [{
414410
name: "全国空气质量图",
415411
name_en: "ECharts",
416412
thumbnail: "echarts_effectScatter.png",
@@ -529,8 +525,7 @@ var exampleConfig = {
529525
"EChartsGL": {
530526
name: "EChartsGL",
531527
name_en: "EChartsGL",
532-
content: [
533-
{
528+
content: [{
534529
name: "上海房价可视化图",
535530
name_en: "Shanghai building price",
536531
thumbnail: "echartsGL_ShanghaiBuildingPrice.png",
@@ -639,8 +634,7 @@ var exampleConfig = {
639634
"MapV": {
640635
name: "MapV",
641636
name_en: "MapV",
642-
content: [
643-
{
637+
content: [{
644638
name: "蜂巢图",
645639
name_en: "honeycomb",
646640
version: "9.1.0",
@@ -721,39 +715,36 @@ var exampleConfig = {
721715
"threejs": {
722716
name: "threejs",
723717
name_en: "threejs",
724-
content: [
725-
{
726-
name: "建筑模型",
727-
name_en: "buildings",
728-
version: "9.1.0",
729-
thumbnail: "mb_threejs_buildings.png",
730-
fileName: "threejsLayer_buildings"
731-
}, {
732-
name: "设施点(mtl+obj格式)",
733-
name_en: "facility(mtl+obj)",
734-
version: "9.1.0",
735-
thumbnail: "mb_threejs_facility.png",
736-
fileName: "threejsLayer_facility"
737-
}, {
738-
name: "飞机模型(gltf格式)",
739-
name_en: "airplane(gltf)",
740-
version: "9.1.0",
741-
thumbnail: "mb_threejs_airplane.png",
742-
fileName: "threejsLayer_airplane"
743-
}, {
744-
name: "飞鸟模型",
745-
name_en: "bird",
746-
version: "9.1.0",
747-
thumbnail: "mb_threejs_bird.png",
748-
fileName: "threejsLayer_bird"
749-
}
750-
]
718+
content: [{
719+
name: "建筑模型",
720+
name_en: "buildings",
721+
version: "9.1.0",
722+
thumbnail: "mb_threejs_buildings.png",
723+
fileName: "threejsLayer_buildings"
724+
}, {
725+
name: "设施点(mtl+obj格式)",
726+
name_en: "facility(mtl+obj)",
727+
version: "9.1.0",
728+
thumbnail: "mb_threejs_facility.png",
729+
fileName: "threejsLayer_facility"
730+
}, {
731+
name: "飞机模型(gltf格式)",
732+
name_en: "airplane(gltf)",
733+
version: "9.1.0",
734+
thumbnail: "mb_threejs_airplane.png",
735+
fileName: "threejsLayer_airplane"
736+
}, {
737+
name: "飞鸟模型",
738+
name_en: "bird",
739+
version: "9.1.0",
740+
thumbnail: "mb_threejs_bird.png",
741+
fileName: "threejsLayer_bird"
742+
}]
751743
},
752744
"Theme2D": {
753745
name: "二维专题图",
754746
name_en: "2D thematic layer",
755-
content: [
756-
{
747+
content: [{
757748
name: "单值专题图",
758749
name_en: "unique",
759750
thumbnail: "uniqueThemeLayer.png",
@@ -788,8 +779,7 @@ var exampleConfig = {
788779
"Theme3D": {
789780
name: "三维专题图",
790781
name_en: "3D thematic layer",
791-
content: [
792-
{
782+
content: [{
793783
name: "单值专题图",
794784
name_en: "unique",
795785
thumbnail: "theme_3Dlayer_unique.png",
@@ -857,44 +847,44 @@ var exampleConfig = {
857847
version: "9.1.1",
858848
// localIgnore: true,
859849
content: {
860-
"Multi_coordinate_Map":{
861-
name:"地图",
862-
name_en:"Map service",
850+
"Multi_coordinate_Map": {
851+
name: "地图",
852+
name_en: "Map service",
863853
version: "9.1.1",
864854
content: [{
865855
name: "地图_WGS84",
866856
name_en: "Map WGS84",
867857
version: "9.1.1",
868858
thumbnail: "01_tiledMapLayer_4326.png",
869859
fileName: "01_tiledMapLayer_4326"
870-
},{
860+
}, {
871861
name: "地图_China2000",
872862
name_en: "Map China2000",
873863
localIgnore: true,
874864
version: "9.1.1",
875865
thumbnail: "01_tiledMapLayer.png",
876866
fileName: "01_tiledMapLayer_4490"
877-
},{
867+
}, {
878868
name: "地图_Beijing54",
879869
name_en: "Map Beijing54",
880870
version: "9.1.1",
881871
localIgnore: true,
882872
thumbnail: "01_tiledMapLayer.png",
883873
fileName: "01_tiledMapLayer_4214"
884-
},{
874+
}, {
885875
name: "地图_Xian80",
886876
name_en: "Map Xian80",
887877
localIgnore: true,
888878
version: "9.1.1",
889879
thumbnail: "01_tiledMapLayer.png",
890880
fileName: "01_tiledMapLayer_4610"
891-
},{
881+
}, {
892882
name: "绘图控件_WGS84",
893883
name_en: "Draw control WGS84",
894884
version: "9.1.1",
895885
thumbnail: "control_drawControl_4326.png",
896886
fileName: "control_drawControl_4326"
897-
},{
887+
}, {
898888
name: "矢量瓦片_WGS84",
899889
name_en: "MVT WGS84",
900890
version: "9.1.1",
@@ -955,34 +945,33 @@ var exampleConfig = {
955945
name: "高效率点图层",
956946
name_en: "High efficiency point layer",
957947
version: "9.1.1",
958-
content: [
959-
{
960-
name: "纽约出租车145万上车点_WGS84",
961-
name_en: "Points of 1.45 million NYC taxis WGS84",
962-
version: "9.1.1",
963-
thumbnail: "graphicLayer_4326.png",
964-
fileName: "graphicLayer_4326"
965-
}
966-
]
948+
content: [{
949+
name: "纽约出租车145万上车点_WGS84",
950+
name_en: "Points of 1.45 million NYC taxis WGS84",
951+
version: "9.1.1",
952+
thumbnail: "graphicLayer_4326.png",
953+
fileName: "graphicLayer_4326"
954+
}]
967955
},
968956
"Multi_coordinate_heatMap": {
969957
name: "热力图",
970958
name_en: "Heat map",
971959
version: "9.1.1",
972960
content: [{
973-
name: "地震数据_WGS84",
974-
name_en: "Earthquake Data WGS84",
975-
version: "9.1.1",
976-
thumbnail: "heatMapLayer_earthQuake_4326.png",
977-
fileName: "earthquakeHeatMap"
978-
},
979-
{
980-
name: "地震数据（Classic）_WGS84",
981-
name_en: "Earthquake Data WGS84",
982-
version: "9.1.1",
983-
thumbnail: "heatMapLayer_earthQuake_iclient_4326.png",
984-
fileName: "earthquakeHeatMapIclient"
985-
}]
961+
name: "地震数据_WGS84",
962+
name_en: "Earthquake Data WGS84",
963+
version: "9.1.1",
964+
thumbnail: "heatMapLayer_earthQuake_4326.png",
965+
fileName: "earthquakeHeatMap"
966+
},
967+
{
968+
name: "地震数据（Classic）_WGS84",
969+
name_en: "Earthquake Data WGS84",
970+
version: "9.1.1",
971+
thumbnail: "heatMapLayer_earthQuake_iclient_4326.png",
972+
fileName: "earthquakeHeatMapIclient"
973+
}
974+
]
986975
},
987976
"Multi_coordinate_MapV": {
988977
name: "MapV",
@@ -994,7 +983,7 @@ var exampleConfig = {
994983
version: "9.1.1",
995984
thumbnail: "mapvCsvcar_4326.png",
996985
fileName: "mapvCsvcar_4326"
997-
},{
986+
}, {
998987
name: "面_WGS84",
999988
name_en: "Simple polygon WGS84",
1000989
version: "9.1.1",
@@ -1012,14 +1001,12 @@ var exampleConfig = {
10121001
"GTC2017": {
10131002
name: "2017",
10141003
name_en: "2017",
1015-
content: [
1016-
{
1017-
name: "GTC2017",
1018-
name_en: "GTC2017",
1019-
thumbnail: "gtc2017.gif",
1020-
fileName: "GTC2017"
1021-
}
1022-
]
1004+
content: [{
1005+
name: "GTC2017",
1006+
name_en: "GTC2017",
1007+
thumbnail: "gtc2017.gif",
1008+
fileName: "GTC2017"
1009+
}]
10231010
}
10241011
}
10251012
}
@@ -1047,6 +1034,6 @@ var exampleIconConfig = {
10471034
"iServer": "fa-server",
10481035
"viz": "fa-map",
10491036
"GTC": "fa-globe",
1050-
'multiCoordSys':"fa-globe",
1037+
'multiCoordSys': "fa-globe",
10511038
};
10521039
window.mapboxglExampleConfig = exampleConfig;

‎examples/mapboxgl/markerCluster_3857.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<div id='map'></div>
3838
<script type="text/javascript" include='mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
3939
<script type="text/javascript">
40+
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
4041
$.get("../data/chinaEarthquake.csv", function (response) {
4142
var dataObj = Papa.parse(response, {
4243
skipEmptyLines: true,
@@ -77,11 +78,11 @@
7778
container: 'map',
7879
style: {
7980
"version": 8,
80-
"glyphs": "http://iclsvr.supermap.io/iserver/services/map-mvt-California/rest/maps/California/tileFeature/sdffonts/{fontstack}/{range}.pbf",
81+
"glyphs": host + "/iserver/services/map-china400/rest/maps/China/tileFeature/sdffonts/{fontstack}/{range}.pbf",
8182
"sources": {
8283
"raster-tiles": {
8384
"type": "raster",
84-
"tiles": ['http://t0.tianditu.com/DataServer?T=vec_w&x={x}&y={y}&l={z}'],
85+
"tiles": [host + '/iserver/services/map-china400/rest/maps/China/zxyTileImage.png?z={z}&x={x}&y={y}'],
8586
"tileSize": 256
8687
}
8788
},
@@ -103,7 +104,7 @@
103104
data: geojson,
104105
cluster: true,
105106
clusterMaxZoom: 14,
106-
clusterRadius: 50
107+
clusterRadius: 100
107108
});
108109

109110
map.addLayer({

‎examples/mapboxgl/markerCluster_4326.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
data: geojson,
107107
cluster: true,
108108
clusterMaxZoom: 14,
109-
clusterRadius: 50
109+
clusterRadius: 100
110110
});
111111

112112
map.addLayer({

0 commit comments

Comments
 (0)