Skip to content

Commit 7bd91e3

Browse files
zhurczhurc
committed
修改leaflet地图出图原点设置：去掉图层出图原点参数设置，默认从CRS读取
1 parent ec6cf7c commit 7bd91e3

13 files changed

+34
-38
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12999,8 +12999,6 @@ var TiledMapLayer = L.TileLayer.extend({
1299912999
clipRegionEnabled: false,
1300013000
//请求的地图的坐标参考系统。 如：prjCoordSys={"epsgCode":3857}。
1300113001
prjCoordSys: null,
13002-
//切片的起始参考点，默认为地图范围的左上角。
13003-
origin: null,
1300413002
//地图对象在同一范围内时，是否重叠显示
1300513003
overlapDisplayed: true,
1300613004
//避免地图对象压盖显示的过滤选项
@@ -13073,8 +13071,12 @@ var TiledMapLayer = L.TileLayer.extend({
1307313071
}
1307413072

1307513073
var mapUnit = SuperMap.Unit.METER;
13076-
if (crs.code && crs.code.indexOf("4326") > -1) {
13077-
mapUnit = SuperMap.Unit.DEGREE;
13074+
if (crs.code) {
13075+
var array = crs.code.split(':');
13076+
if (array && array.length > 1) {
13077+
var code = parseInt(array[1]);
13078+
mapUnit = code && code >= 4000 && code <= 5000 ? SuperMap.Unit.DEGREE : SuperMap.Unit.METER;
13079+
}
1307813080
}
1307913081
return L.Util.resolutionToScale(resolution, 96, mapUnit);
1308013082
},
@@ -13119,12 +13121,11 @@ var TiledMapLayer = L.TileLayer.extend({
1311913121
}
1312013122

1312113123
//切片的起始参考点，默认为地图范围的左上角。
13122-
if (options.origin) {
13123-
var tileOrigin = options.origin;
13124-
if (L.Util.isArray(options.origin)) {
13125-
tileOrigin = L.latLng(options.origin);
13126-
}
13127-
params.push("origin={\"x\":" + tileOrigin.lng + "," + "\"y\":" + tileOrigin.lat + "}");
13124+
var crs = me._crs;
13125+
if (crs.projection && crs.projection.bounds) {
13126+
var bounds = crs.projection.bounds;
13127+
var tileOrigin = L.point(bounds.min.x, bounds.max.y);
13128+
params.push("origin={\"x\":" + tileOrigin.x + "," + "\"y\":" + tileOrigin.y + "}");
1312813129
}
1312913130

1313013131
if (options.overlapDisplayed === false) {

‎dist/iclient9-leaflet.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/leaflet/01_overlayTiledMapLayer.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
L.supermap.tiledMapLayer(urlWorld).addTo(map);
2424
L.supermap.tiledMapLayer(urlJinjing, {
25-
origin: [90, -180],
2625
transparent: true,
2726
opacity: 0.6
2827
}).addTo(map);

‎examples/leaflet/03_themeGraph.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
maxZoom: 18,
2222
zoom: 6
2323
});
24-
L.supermap.tiledMapLayer(url, {origin: [90, -180], noWrap: true}).addTo(map);
24+
L.supermap.tiledMapLayer(url, {noWrap: true}).addTo(map);
2525
createTheme();
2626

2727
function createTheme() {
@@ -74,7 +74,6 @@
7474
var result = serviceResult.result;
7575
if (result && result.newResourceID) {
7676
themeLayer = L.supermap.tiledMapLayer(url, {
77-
origin: [90, -180],
7877
noWrap: true,
7978
cacheEnabled: false,
8079
transparent: true,

‎examples/leaflet/03_themeGridRange.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
maxZoom: 18,
2222
zoom: 6
2323
});
24-
L.supermap.tiledMapLayer(url, {origin: [90, -180],noWrap: true}).addTo(map);
24+
L.supermap.tiledMapLayer(url, {noWrap: true}).addTo(map);
2525
createTheme();
2626

2727
function createTheme() {
@@ -133,7 +133,6 @@
133133
var result = serviceResult.result;
134134
if (result && result.newResourceID) {
135135
themeLayer = L.supermap.tiledMapLayer(url, {
136-
origin: [90, -180],
137136
noWrap: true,
138137
cacheEnabled: false,
139138
transparent: true,

‎examples/leaflet/03_themeGridUnique.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
maxZoom: 18,
2222
zoom: 6
2323
});
24-
L.supermap.tiledMapLayer(url, { origin: [90, -180],noWrap: true}).addTo(map);
24+
L.supermap.tiledMapLayer(url, { noWrap: true}).addTo(map);
2525
createTheme();
2626

2727
function setItems() {
@@ -122,7 +122,6 @@
122122
var result = serviceResult.result;
123123
if (result && result.newResourceID) {
124124
themeLayer = L.supermap.tiledMapLayer(url, {
125-
origin: [90, -180],
126125
noWrap: true,
127126
cacheEnabled: false,
128127
transparent: true,

‎examples/leaflet/04_mathExpressionAnalysisService.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
maxZoom: 18,
2424
zoom: 6
2525
});
26-
L.supermap.tiledMapLayer(baseUrl, {origin: [90, -180], noWrap: true}).addTo(map).on("load", function () {
26+
L.supermap.tiledMapLayer(baseUrl, { noWrap: true}).addTo(map).on("load", function () {
2727
mathExpressionAnalysisProcess();
2828
});
2929

@@ -106,7 +106,6 @@
106106
var result = serviceResult1.result;
107107
if (result && result.newResourceID) {
108108
themeLayer = L.supermap.tiledMapLayer(baseUrl, {
109-
origin: [90, -180],
110109
noWrap: true,
111110
cacheEnabled: false,
112111
transparent: true,

‎examples/leaflet/04_overlayAnalystService.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
maxZoom: 18,
2323
zoom: 6
2424
});
25-
L.supermap.tiledMapLayer(baseUrl, {origin: [90, -180], transparent: true, cacheEnabled: false, noWrap: true}).addTo(map);
25+
L.supermap.tiledMapLayer(baseUrl, { transparent: true, cacheEnabled: false, noWrap: true}).addTo(map);
2626
overlayAnalystProcess();
2727

2828
function overlayAnalystProcess() {

‎examples/leaflet/04_terrainCurvatureCalculationService.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
maxZoom: 18,
2424
zoom: 6
2525
});
26-
L.supermap.tiledMapLayer(baseUrl, {origin: [90, -180], noWrap: true}).addTo(map).on("load", function () {
26+
L.supermap.tiledMapLayer(baseUrl, { noWrap: true}).addTo(map).on("load", function () {
2727
terrainCurvatureCalculationProcess();
2828
});
2929

@@ -94,7 +94,6 @@
9494
var result = serviceResult1.result;
9595
if (result && result.newResourceID) {
9696
themeLayer = L.supermap.tiledMapLayer(baseUrl, {
97-
origin: [90, -180],
9897
noWrap: true,
9998
cacheEnabled: false,
10099
transparent: true,

‎examples/leaflet/rangeThemeLayer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
maxZoom: 18,
4040
zoom: 7
4141
});
42-
L.supermap.tiledMapLayer(baseUrl, {origin: [90, -180]}).addTo(map);
42+
L.supermap.tiledMapLayer(baseUrl).addTo(map);
4343
initThemeLayer();
4444
}
4545
function initThemeLayer() {

0 commit comments

Comments
 (0)