Skip to content

Commit d322457

Browse files
zhurczhurc
committed
2 parents 4a5b068 + e8692de commit d322457

File tree

8 files changed

+92
-101
lines changed

8 files changed

+92
-101
lines changed

‎examples/mapboxgl/01_tiledMapLayer_4214.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"maxzoom": 22
6666
}]
6767
},
68-
crs: 'EPSG:4214', // 或者 mapboxgl.CRS.EPSG4326 或者 new mapboxgl.CRS('EPSG:4326',[-180,-90,180,90]);
68+
crs: 'EPSG:4214',
6969
center: [101.74721254733845, 32.5665352689922],
7070
zoom: 3
7171
});

‎examples/mapboxgl/01_tiledMapLayer_4490.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"maxzoom": 22
6666
}]
6767
},
68-
crs: 'EPSG:4490', // 或者 mapboxgl.CRS.EPSG4326 或者 new mapboxgl.CRS('EPSG:4326',[-180,-90,180,90]);
68+
crs: 'EPSG:4490',
6969
center: [101.74721254733845, 32.5665352689922],
7070
zoom: 3
7171
});

‎examples/mapboxgl/01_tiledMapLayer_4610.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"maxzoom": 22
6666
}]
6767
},
68-
crs: 'EPSG:4610', // 或者 mapboxgl.CRS.EPSG4326 或者 new mapboxgl.CRS('EPSG:4326',[-180,-90,180,90]);
68+
crs: 'EPSG:4610',
6969
center: [101.74721254733845, 32.5665352689922],
7070
zoom: 3
7171
});

‎examples/mapboxgl/config.js

Lines changed: 82 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,41 +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",
863+
localIgnore: true,
873864
version: "9.1.1",
874865
thumbnail: "01_tiledMapLayer.png",
875866
fileName: "01_tiledMapLayer_4490"
876-
},{
867+
}, {
877868
name: "地图_Beijing54",
878869
name_en: "Map Beijing54",
879870
version: "9.1.1",
871+
localIgnore: true,
880872
thumbnail: "01_tiledMapLayer.png",
881873
fileName: "01_tiledMapLayer_4214"
882-
},{
874+
}, {
883875
name: "地图_Xian80",
884876
name_en: "Map Xian80",
877+
localIgnore: true,
885878
version: "9.1.1",
886879
thumbnail: "01_tiledMapLayer.png",
887880
fileName: "01_tiledMapLayer_4610"
888-
},{
881+
}, {
889882
name: "绘图控件_WGS84",
890883
name_en: "Draw control WGS84",
891884
version: "9.1.1",
892885
thumbnail: "control_drawControl_4326.png",
893886
fileName: "control_drawControl_4326"
894-
},{
887+
}, {
895888
name: "矢量瓦片_WGS84",
896889
name_en: "MVT WGS84",
897890
version: "9.1.1",
@@ -952,34 +945,33 @@ var exampleConfig = {
952945
name: "高效率点图层",
953946
name_en: "High efficiency point layer",
954947
version: "9.1.1",
955-
content: [
956-
{
957-
name: "纽约出租车145万上车点_WGS84",
958-
name_en: "Points of 1.45 million NYC taxis WGS84",
959-
version: "9.1.1",
960-
thumbnail: "graphicLayer_4326.png",
961-
fileName: "graphicLayer_4326"
962-
}
963-
]
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+
}]
964955
},
965956
"Multi_coordinate_heatMap": {
966957
name: "热力图",
967958
name_en: "Heat map",
968959
version: "9.1.1",
969960
content: [{
970-
name: "中国地震数据_WGS84",
971-
name_en: "China Earthquake Data WGS84",
972-
version: "9.1.1",
973-
thumbnail: "heatMapLayer_earthQuake_4326.png",
974-
fileName: "earthquakeHeatMap"
975-
},
976-
{
977-
name: "中国地震数据（Classic）_WGS84",
978-
name_en: "China Earthquake Data WGS84",
979-
version: "9.1.1",
980-
thumbnail: "heatMapLayer_earthQuake_iclient_4326.png",
981-
fileName: "earthquakeHeatMapIclient"
982-
}]
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+
]
983975
},
984976
"Multi_coordinate_MapV": {
985977
name: "MapV",
@@ -991,7 +983,7 @@ var exampleConfig = {
991983
version: "9.1.1",
992984
thumbnail: "mapvCsvcar_4326.png",
993985
fileName: "mapvCsvcar_4326"
994-
},{
986+
}, {
995987
name: "面_WGS84",
996988
name_en: "Simple polygon WGS84",
997989
version: "9.1.1",
@@ -1009,14 +1001,12 @@ var exampleConfig = {
10091001
"GTC2017": {
10101002
name: "2017",
10111003
name_en: "2017",
1012-
content: [
1013-
{
1014-
name: "GTC2017",
1015-
name_en: "GTC2017",
1016-
thumbnail: "gtc2017.gif",
1017-
fileName: "GTC2017"
1018-
}
1019-
]
1004+
content: [{
1005+
name: "GTC2017",
1006+
name_en: "GTC2017",
1007+
thumbnail: "gtc2017.gif",
1008+
fileName: "GTC2017"
1009+
}]
10201010
}
10211011
}
10221012
}
@@ -1044,6 +1034,6 @@ var exampleIconConfig = {
10441034
"iServer": "fa-server",
10451035
"viz": "fa-map",
10461036
"GTC": "fa-globe",
1047-
'multiCoordSys':"fa-globe",
1037+
'multiCoordSys': "fa-globe",
10481038
};
10491039
window.mapboxglExampleConfig = exampleConfig;

‎examples/mapboxgl/echarts_geoline_4326.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
return res;
381381
};
382382

383-
var color = ['#a6c84c', '#ffa022', '#46bee9'];
383+
var color = ['#C70022', '#ffa022', '#46bee9'];
384384
var series = [];
385385
[
386386
['北京', BJData],

‎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({

‎src/openlayers/core/colors_picker_util/ColorsPickerUtil.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Color} from '../../../common/overlay/levelRenderer/Color';
1+
import {Color} from '@supermap/iclient-common/overlay/levelRenderer/Color';
22

33
var ColorRender = new Color();
44
// let "http://www.qzu.zj.cn": "#bd10e0"

0 commit comments

Comments
 (0)