Skip to content

Commit 19172e2

Browse files
songyumengsongyumeng
committed
【fix】webmap创建图层时图层的最大级别为地图最大级别+1
1 parent a35a9f3 commit 19172e2

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎src/common/mapping/WebMapV2.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
463463
const { minScale, maxScale } = layer.visibleScale;
464464
const crs = this.map.getCRS();
465465
layer.minzoom = Math.max(this._transformScaleToZoom(minScale, crs), 0);
466-
layer.maxzoom = Math.min(24, this._transformScaleToZoom(maxScale, crs) + 0.0000001);
466+
layer.maxzoom = Math.min(this.map.getMaxZoom() + 1, this._transformScaleToZoom(maxScale, crs) + 0.0000001);
467467
}
468468

469469
if (type === 'tile') {
@@ -1334,7 +1334,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
13341334
},
13351335
layout,
13361336
minzoom: minzoom || 0,
1337-
maxzoom: maxzoom || 22
1337+
maxzoom: maxzoom || this.map.getMaxZoom() + 1
13381338
},
13391339
layerInfo.layerID
13401340
);
@@ -1386,7 +1386,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
13861386
visibility: layerInfo.visible
13871387
},
13881388
minzoom: minzoom || 0,
1389-
maxzoom: maxzoom || 22
1389+
maxzoom: maxzoom || this.map.getMaxZoom() + 1
13901390
};
13911391
if (filter) {
13921392
layerOptions.filter = filter;
@@ -1441,7 +1441,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
14411441
'icon-rotate': iconRotateExpression || ((layerInfo.style.rotation || 0) * 180) / Math.PI
14421442
},
14431443
minzoom: minzoom || 0,
1444-
maxzoom: maxzoom || 22
1444+
maxzoom: maxzoom || this.map.getMaxZoom() + 1
14451445
};
14461446
if (filter) {
14471447
layerOptions.filter = filter;
@@ -1493,7 +1493,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
14931493
'icon-color': style.fillColor
14941494
},
14951495
minzoom: minzoom || 0,
1496-
maxzoom: maxzoom || 22
1496+
maxzoom: maxzoom || this.map.getMaxZoom() + 1
14971497
};
14981498
if (filter) {
14991499
layerOptions.filter = filter;
@@ -1797,7 +1797,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
17971797
visibility: visible
17981798
},
17991799
minzoom: minzoom || 0,
1800-
maxzoom: maxzoom || 22
1800+
maxzoom: maxzoom || this.map.getMaxZoom() + 1
18011801
};
18021802
if (filterExpression.length > 1) {
18031803
layerOptions.filter = filterExpression;
@@ -1915,7 +1915,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
19151915
'icon-rotate': symbolStyle.rotation || 0
19161916
},
19171917
minzoom: minzoom || 0,
1918-
maxzoom: maxzoom || 22,
1918+
maxzoom: maxzoom || this.map.getMaxZoom() + 1,
19191919
filter: imagefilterExpression
19201920
},
19211921
layerID
@@ -1950,7 +1950,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
19501950
'icon-color': symbolStyle.fillColor
19511951
},
19521952
minzoom: minzoom || 0,
1953-
maxzoom: maxzoom || 22,
1953+
maxzoom: maxzoom || this.map.getMaxZoom() + 1,
19541954
filter: svgfilterExpression
19551955
},
19561956
layerID
@@ -2121,7 +2121,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
21212121
paint: this._transformStyleToMapBoxGl(defaultStyle, geomType),
21222122
layout: {},
21232123
minzoom: minzoom || 0,
2124-
maxzoom: maxzoom || 22
2124+
maxzoom: maxzoom || this.map.getMaxZoom() + 1
21252125
},
21262126
markerLayerID
21272127
);
@@ -2139,7 +2139,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
21392139
visibility: layerInfo.visible
21402140
},
21412141
minzoom: minzoom || 0,
2142-
maxzoom: maxzoom || 22
2142+
maxzoom: maxzoom || this.map.getMaxZoom() + 1
21432143
},
21442144
markerLayerID
21452145
);
@@ -2243,7 +2243,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
22432243
visibility: layerInfo.visible
22442244
},
22452245
minzoom: minzoom || 0,
2246-
maxzoom: maxzoom || 22
2246+
maxzoom: maxzoom || this.map.getMaxZoom() + 1
22472247
});
22482248
if (addToMap) {
22492249
this._addLayerSucceeded({ layerInfo, features });
@@ -2450,7 +2450,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
24502450
paint: layerStyle.style,
24512451
layout: layerStyle.layout || {},
24522452
minzoom: minzoom || 0,
2453-
maxzoom: maxzoom || 22
2453+
maxzoom: maxzoom || this.map.getMaxZoom() + 1
24542454
};
24552455
if (filter) {
24562456
style.filter = filter;
@@ -2465,15 +2465,15 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
24652465
parentLayerId,
24662466
visibility = true,
24672467
minzoom = 0,
2468-
maxzoom = 22,
2468+
maxzoom,
24692469
isIserver = false,
24702470
bounds
24712471
}) {
24722472
const source = {
24732473
type: 'raster',
24742474
tiles: url,
24752475
minzoom: minzoom || 0,
2476-
maxzoom: maxzoom || 22,
2476+
maxzoom: maxzoom || this.map.getMaxZoom() + 1,
24772477
tileSize: isIserver ? this.rasterTileSize : 256,
24782478
rasterSource: isIserver ? 'iserver' : '',
24792479
prjCoordSys:
@@ -2496,7 +2496,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
24962496
type: 'raster',
24972497
source: sourceId,
24982498
minzoom: minzoom || 0,
2499-
maxzoom: maxzoom || 22,
2499+
maxzoom: maxzoom || this.map.getMaxZoom() + 1,
25002500
layout: {
25012501
visibility: this._getVisibility(visibility)
25022502
}
@@ -2671,7 +2671,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
26712671
visibility: layerInfo.visible ? 'visible' : 'none'
26722672
},
26732673
minzoom: minzoom || 0,
2674-
maxzoom: maxzoom || 22
2674+
maxzoom: maxzoom || this.map.getMaxZoom() + 1
26752675
});
26762676
this._addLayerSucceeded();
26772677
}

0 commit comments

Comments
 (0)