Skip to content

Commit 4e44045

Browse files
gyj12gyj12
committed
Leaflet部分：检查并修正地图功能文件夹里的示例，更新部分插件及接口
1 parent b54c580 commit 4e44045

190 files changed

Lines changed: 14726 additions & 15281 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/config-leaflet.js‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -354,21 +354,13 @@ var LEAFLET_CONFIG = config = {
354354
update: "最后更新时间：2018-06-01"
355355
},
356356
{
357-
name: "天地图-内网4326",
357+
name: "天地图地图显示",
358358
file: "tianditudisplay",
359359
diffcult: "2",
360360
detail: "天地图",
361361
icon: "tianditudisplay.png",
362362
update: "最后更新时间：2018-06-01"
363363
},
364-
{
365-
name: "天地图-外网4326",
366-
file: "tianditudisplayonline",
367-
diffcult: "2",
368-
detail: "天地图-外网4326",
369-
icon: "tianditudisplayonline.png",
370-
update: "最后更新时间：2018-06-01"
371-
},
372364
{
373365
name: "ArcGIS地图显示",
374366
file: "arcgismapdisplay",
@@ -419,15 +411,15 @@ var LEAFLET_CONFIG = config = {
419411
update: "最后更新时间：2018-06-01",
420412
person: "基础平台/创新中心-潘卓然"
421413
},
422-
{
423-
name: "WFS地图显示-4326",
424-
file: "ogcwfs",
425-
diffcult: "1",
426-
detail: "WFS地图显示",
427-
icon: "ogcwfs.png",
428-
update: "最后更新时间：2018-06-01",
429-
person: "基础平台/创新中心-潘卓然"
430-
},
414+
// {//暂时跨域请求不生效
415+
// name: "WFS地图显示-4326",
416+
// file: "ogcwfs",
417+
// diffcult: "1",
418+
// detail: "WFS地图显示",
419+
// icon: "ogcwfs.png",
420+
// update: "最后更新时间：2018-06-01",
421+
// person: "基础平台/创新中心-潘卓然"
422+
// },
431423
{
432424
name: "加载OGC的WMTS图层-3857",
433425
file: "ogcwmts3857",

‎demo/leaflet/example/map/control/layercontrol.htm‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
4-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
55
<title>图层选择</title>
66
<script src="../../libs/zondyclient/include-leaflet-local.js"></script>
77
<style>
@@ -13,7 +13,7 @@
1313
"use strict";
1414

1515
/**显示地图
16-
*/
16+
*/
1717
function init() {
1818
//地图容器
1919
var map = L.map('leaf_map', {
@@ -31,15 +31,50 @@
3131
//maxBounds: L.latLngBounds(L.latLng(-180, -180), L.latLng(180, 180))
3232
});
3333
//矢量+注记
34-
var layer = L.tileLayer('http://t0.tianditu.com/DataServer?T=ter_c&x={x}&y={y}&l={z}', { tileSize: 256, layer: 'ter', noWrap: true });
34+
var layer = new Zondy.Map.TDTLayer({
35+
//图层类型，必选
36+
layerType: 'ter',
37+
//设置地图不连续显示，可选
38+
noWrap: true,
39+
//key，必选
40+
token: "4c27d6e0e8a90715b23a989d42272fd8"
41+
});
3542
//矢量图层
36-
var layer1 = L.tileLayer('http://t0.tianditu.com/DataServer?T=vec_c&x={x}&y={y}&l={z}', { tileSize: 256, layer: 'vec', minZoom: 1, maxZoom: 15, noWrap: true });
43+
var layer1 = new Zondy.Map.TDTLayer({
44+
//图层类型，必选
45+
layerType: 'vec',
46+
//设置地图不连续显示，可选
47+
noWrap: true,
48+
//key，必选
49+
token: "4c27d6e0e8a90715b23a989d42272fd8"
50+
});
3751
//矢量注记图层
38-
var layer2 = L.tileLayer('http://t0.tianditu.com/DataServer?T=cva_c&x={x}&y={y}&l={z}', { tileSize: 256, layer: 'cva', minZoom: 1, maxZoom: 15, noWrap: true });
52+
var layer2 = new Zondy.Map.TDTLayer({
53+
//图层类型，必选
54+
layerType: 'cva',
55+
//设置地图不连续显示，可选
56+
noWrap: true,
57+
//key，必选
58+
token: "4c27d6e0e8a90715b23a989d42272fd8"
59+
});
3960
//影像图层
40-
var layer3 = L.tileLayer('http://t0.tianditu.com/DataServer?T=img_c&x={x}&y={y}&l={z}', { tileSize: 256, layer: 'img', minZoom: 1, maxZoom: 15, noWrap: true });
61+
var layer3 = new Zondy.Map.TDTLayer({
62+
//图层类型，必选
63+
layerType: 'img',
64+
//设置地图不连续显示，可选
65+
noWrap: true,
66+
//key，必选
67+
token: "4c27d6e0e8a90715b23a989d42272fd8"
68+
});
4169
//影像注记
42-
var layer4 = L.tileLayer('http://t0.tianditu.com/DataServer?T=cia_c&x={x}&y={y}&l={z}', { tileSize: 256, layer: 'cia', minZoom: 1, maxZoom: 15, noWrap: true });
70+
var layer4 = new Zondy.Map.TDTLayer({
71+
//图层类型，必选
72+
layerType: 'cia',
73+
//设置地图不连续显示，可选
74+
noWrap: true,
75+
//key，必选
76+
token: "4c27d6e0e8a90715b23a989d42272fd8"
77+
});
4378
//图层组
4479
var LayerG = L.layerGroup([layer1, layer2]);
4580
//添加图层组
@@ -59,6 +94,6 @@
5994
</script>
6095
</head>
6196
<body onload="init()">
62-
<div id="leaf_map" style="width:100%;height:95%"></div>
97+
<div id="leaf_map" style="width:100%;height:95%"></div>
6398
</body>
6499
</html>

‎demo/leaflet/example/map/control/navigation.htm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
/**显示地图
1616
*/
1717
function init() {
18+
//leaflet没有导航控件，以下只是显示地图
1819
//地图容器
1920
var map = L.map('leaf_map', {
2021
//参考坐标系，默认是墨卡托坐标系（EPSG3857），EPSG4326为经纬度坐标系

‎demo/leaflet/example/map/mapdisplay/baidumap.htm‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -2,116 +2,116 @@
22
<html xmlns="http://www.w3.org/1999/xhtml">
33

44
<head>
5-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6-
<title>迁移图</title>
7-
<script include="jquery" src="../../libs/zondyclient/include-lib-local.js"></script>
8-
<script include="proj4" src="../../libs/zondyclient/include-leaflet-local.js"></script>
9-
<style>
10-
body {
11-
margin: 0;
12-
padding: 0;
13-
}
5+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
6+
<title>迁移图</title>
7+
<script include="jquery" src="../../libs/zondyclient/include-lib-local.js"></script>
8+
<script include="proj4" src="../../libs/zondyclient/include-leaflet-local.js"></script>
9+
<style>
10+
body {
11+
margin: 0;
12+
padding: 0;
13+
}
1414

15-
#map {
16-
position: absolute;
17-
top: 0;
18-
bottom: 0;
19-
width: 100%;
20-
}
21-
</style>
15+
#map {
16+
position: absolute;
17+
top: 0;
18+
bottom: 0;
19+
width: 100%;
20+
}
21+
</style>
2222
</head>
2323

2424
<body>
25-
<div id="map"></div>
26-
<script>
25+
<div id="map"></div>
26+
<script>
2727
var BaiduCRS = new L.Proj.CRS(
28-
'EPSG:3395',
29-
'+proj=merc +lon_0=0 +k=1 +x_0=140 +y_0=-250 +datum=WGS84 +units=m +no_defs', {
30-
resolutions: function () {
31-
level = 19;
32-
var res = [];
33-
res[0] = Math.pow(2, 18);
34-
for (var i = 1; i < level; i++) {
35-
res[i] = Math.pow(2, (18 - i))
36-
}
37-
return res;
38-
}(),
39-
origin: [0, 0],
40-
bounds: L.bounds([20037508.342789244, 0], [0, 20037508.342789244])
41-
}
28+
'EPSG:3395',
29+
'+proj=merc +lon_0=0 +k=1 +x_0=140 +y_0=-250 +datum=WGS84 +units=m +no_defs', {
30+
resolutions: function () {
31+
level = 19;
32+
var res = [];
33+
res[0] = Math.pow(2, 18);
34+
for (var i = 1; i < level; i++) {
35+
res[i] = Math.pow(2, (18 - i))
36+
}
37+
return res;
38+
}(),
39+
origin: [0, 0],
40+
bounds: L.bounds([20037508.342789244, 0], [0, 20037508.342789244])
41+
}
4242
);
4343

44-
var light = L.zondy.BaiduTileLayer({
45-
styles: 'light',
46-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
44+
var light = new Zondy.Map.BaiduTileLayer({
45+
styles: 'light',
46+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
4747
});
48-
var dark = L.zondy.BaiduTileLayer({
49-
styles: 'dark',
50-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
48+
var dark = new Zondy.Map.BaiduTileLayer({
49+
styles: 'dark',
50+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
5151
});
52-
var visualization = L.zondy.BaiduTileLayer({
53-
styles: 'visualization',
54-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
52+
var visualization = new Zondy.Map.BaiduTileLayer({
53+
styles: 'visualization',
54+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
5555
});
56-
var redalert = L.zondy.BaiduTileLayer({
57-
styles: 'redalert',
58-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
56+
var redalert = new Zondy.Map.BaiduTileLayer({
57+
styles: 'redalert',
58+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
5959
});
60-
var grassgreen = L.zondy.BaiduTileLayer({
61-
styles: 'grassgreen',
62-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
60+
var grassgreen = new Zondy.Map.BaiduTileLayer({
61+
styles: 'grassgreen',
62+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
6363
});
64-
var pink = L.zondy.BaiduTileLayer({
65-
styles: 'pink',
66-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
64+
var pink = new Zondy.Map.BaiduTileLayer({
65+
styles: 'pink',
66+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
6767
});
68-
var bluish = L.zondy.BaiduTileLayer({
69-
styles: 'bluish',
70-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
68+
var bluish = new Zondy.Map.BaiduTileLayer({
69+
styles: 'bluish',
70+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
7171
});
72-
var darkgreen = L.zondy.BaiduTileLayer({
73-
styles: 'darkgreen',
74-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
72+
var darkgreen = new Zondy.Map.BaiduTileLayer({
73+
styles: 'darkgreen',
74+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
7575
});
76-
var grayscale = L.zondy.BaiduTileLayer({
77-
styles: 'grayscale',
78-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
76+
var grayscale = new Zondy.Map.BaiduTileLayer({
77+
styles: 'grayscale',
78+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
7979
});
80-
var hardedge = L.zondy.BaiduTileLayer({
81-
styles: 'hardedge',
82-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
80+
var hardedge = new Zondy.Map.BaiduTileLayer({
81+
styles: 'hardedge',
82+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
8383
});
84-
var midnight = L.zondy.BaiduTileLayer({
85-
styles: 'midnight',
86-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
84+
var midnight = new Zondy.Map.BaiduTileLayer({
85+
styles: 'midnight',
86+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
8787
});
88-
var pl = L.zondy.BaiduTileLayer({
89-
styles: 'pl',
90-
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
88+
var pl = new Zondy.Map.BaiduTileLayer({
89+
styles: 'pl',
90+
baidukey: '5ssIAkexwFSGMatjOF95gg3sjet3yxQ1'
9191
});
9292

9393
var baseMaps = {
94-
'默认': visualization,
95-
'白色风格': light,
96-
'黑夜风格': dark,
97-
'红色警戒风格': redalert,
98-
'自然绿风格': grassgreen,
99-
'浪漫粉风格': pink,
100-
'清新蓝风格': bluish,
101-
'青春绿风格': darkgreen,
102-
'高端灰风格': grayscale,
103-
'强边界风格': hardedge,
104-
'午夜蓝风格': midnight,
105-
'无风格': pl
94+
'默认': visualization,
95+
'白色风格': light,
96+
'黑夜风格': dark,
97+
'红色警戒风格': redalert,
98+
'自然绿风格': grassgreen,
99+
'浪漫粉风格': pink,
100+
'清新蓝风格': bluish,
101+
'青春绿风格': darkgreen,
102+
'高端灰风格': grayscale,
103+
'强边界风格': hardedge,
104+
'午夜蓝风格': midnight,
105+
'无风格': pl
106106
};
107107

108108
var map = L.map('map', {
109-
crs: BaiduCRS,
110-
layers: [midnight]
111-
}).setView([29.578285, 106.563777], 3);
109+
crs: BaiduCRS,
110+
layers: [midnight]
111+
}).setView([29.578285, 106.563777], 5);
112112

113113
L.control.layers(baseMaps).setPosition('topleft').addTo(map);
114-
</script>
114+
</script>
115115

116116

117117
</body>

‎demo/leaflet/example/map/mapdisplay/customlayer.htm‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @return {string} 瓦片地址
1717
*/
1818
getTileUrl: function (coords) {
19-
var tileUrl = 'http://localhost:6163/igs/rest/mrms/tile/株洲市/{z}/{y}/{x}';
19+
var tileUrl = 'http://develop.smaryun.com:6163/igs/rest/mrms/tile/WORLDTILE/{z}/{y}/{x}';
2020
//如果下面需要错一级则 coords.z = coords.z +1
2121
tileUrl = tileUrl.replace('{x}', coords.x.toString()).replace('{y}', coords.y.toString()).replace(
2222
'{z}', coords.z.toString());
@@ -37,20 +37,15 @@
3737
maxBounds: L.latLngBounds(L.latLng(-180, -180), L.latLng(180, 180))
3838
});
3939

40-
//添加自定义瓦片图层,这里我直接使用公司内部封装好的的天地图的类
41-
//var layer = new CustomTileLayer().addTo(map);
42-
var layer = new Zondy.Map.TDTLayer({
43-
layerType: 'vec',
44-
minZoom: 0,
45-
maxZoom: 5
46-
}).addTo(map);
40+
//添加自定义瓦片图层
41+
new CustomTileLayer().addTo(map);
4742
}
4843
</script>
4944
</head>
5045

5146
<body onload="init()">
52-
<div id="leaf_map" style="width: 100%; height:700px;">
53-
</div>
47+
<div id="leaf_map" style="width: 100%; height:700px;">
48+
</div>
5449
</body>
5550

5651
</html>

0 commit comments

Comments
 (0)