Skip to content

Commit 9228b38

Browse files
fuzhennfuzhenn
committed
some renames
1 parent 6da2e75 commit 9228b38

File tree

4 files changed

+42
-43
lines changed

4 files changed

+42
-43
lines changed

‎src/renderer/geometry/Painter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ class Painter extends Class {
396396
if (minAltitude && frustumAlt && frustumAlt < minAltitude) {
397397
return;
398398
}
399-
this.containerOffset = offset || map._pointToContainerPoint(renderer._southWest)._add(0, -map.height);
399+
this.containerOffset = offset || map._pointToContainerPoint(renderer.southWest)._add(0, -map.height);
400400
this._beforePaint();
401401
const ctx = context || renderer.context;
402402
const contexts = [ctx, renderer.resources];

‎src/renderer/layer/CanvasRenderer.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,16 @@ class CanvasRenderer extends Class {
101101
* @private
102102
*/
103103
testIfNeedRedraw() {
104-
if (this._loadingResource || !this.drawOnInteracting) {
104+
const map = this.getMap();
105+
if (this._loadingResource) {
105106
return false;
106107
}
107108
if (this._toRedraw) {
108109
return true;
109110
}
111+
if (map.isInteracting() && !this.drawOnInteracting) {
112+
return false;
113+
}
110114
if (this.needToRedraw()) {
111115
return true;
112116
}
@@ -175,9 +179,10 @@ class CanvasRenderer extends Class {
175179
remove() {
176180
this.onRemove();
177181
delete this._loadingResource;
178-
delete this._southWest;
182+
delete this.southWest;
179183
delete this.canvas;
180184
delete this.context;
185+
delete this.canvasExtent2D;
181186
delete this._extent2D;
182187
delete this.resources;
183188
delete this.layer;
@@ -215,7 +220,7 @@ class CanvasRenderer extends Class {
215220
return null;
216221
}
217222
// size = this._extent2D.getSize(),
218-
const containerPoint = map._pointToContainerPoint(this._southWest)._add(0, -map.height);
223+
const containerPoint = map._pointToContainerPoint(this.southWest)._add(0, -map.height);
219224
return {
220225
'image': this.canvas,
221226
'layer': this.layer,
@@ -334,16 +339,16 @@ class CanvasRenderer extends Class {
334339

335340
/**
336341
* Prepare rendering
337-
* Set necessary properties, like this._renderZoom/ this._extent2D, this._southWest
342+
* Set necessary properties, like this._renderZoom/ this.canvasExtent2D, this.southWest
338343
* @private
339344
*/
340345
prepareRender() {
341346
delete this._renderComplete;
342347
const map = this.getMap();
343348
this._renderZoom = map.getZoom();
344-
this._extent2D = map._get2DExtent();
349+
this.canvasExtent2D = this._extent2D = map._get2DExtent();
345350
//change from northWest to southWest, because northwest's point <=> containerPoint changes when pitch >= 72
346-
this._southWest = map._containerPointToPoint(new Point(0, map.height));
351+
this.southWest = map._containerPointToPoint(new Point(0, map.height));
347352
}
348353

349354
/**
@@ -506,10 +511,10 @@ class CanvasRenderer extends Class {
506511
if (!mask) {
507512
return false;
508513
}
509-
const old = this._southWest;
514+
const old = this.southWest;
510515
const map = this.getMap();
511516
//when clipping, layer's southwest needs to be reset for mask's containerPoint conversion
512-
this._southWest = map._containerPointToPoint(new Point(0, map.height));
517+
this.southWest = map._containerPointToPoint(new Point(0, map.height));
513518
context.save();
514519
if (Browser.retina) {
515520
context.save();
@@ -520,7 +525,7 @@ class CanvasRenderer extends Class {
520525
context.restore();
521526
}
522527
context.clip();
523-
this._southWest = old;
528+
this.southWest = old;
524529
return true;
525530
}
526531

@@ -533,7 +538,7 @@ class CanvasRenderer extends Class {
533538
'extent' : this._extent2D,
534539
'maskExtent' : this._maskExtent,
535540
'zoom' : this._renderZoom,
536-
'southWest' : this._southWest
541+
'southWest' : this.southWest
537542
};
538543
}
539544

‎src/renderer/layer/tilelayer/TileLayerCanvasRenderer.js

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
4343
}
4444
const mask2DExtent = this.prepareCanvas();
4545
if (mask2DExtent) {
46-
if (!mask2DExtent.intersects(this._extent2D)) {
46+
if (!mask2DExtent.intersects(this.canvasExtent2D)) {
4747
this.completeRender();
4848
return;
4949
}
@@ -55,7 +55,7 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
5555
return;
5656
}
5757

58-
this._tileCountToLoad = 0;
58+
let loadingCount = 0;
5959
let loading = false;
6060
const checkedTiles = {};
6161
const tiles = [],
@@ -64,8 +64,8 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
6464
placeholders = [], placeholderKeys = {};
6565
//visit all the tiles
6666
const tileQueue = {};
67-
const loadingCount = this._markTiles(),
68-
tileLimit = this._getTileLimitOnInteracting();
67+
const preLoadingCount = this._markTiles(),
68+
loadingLimit = this._getLoadLimit();
6969

7070
const l = tileGrids.length;
7171

@@ -84,24 +84,24 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
8484
tileId = tile['id'];
8585
//load tile in cache at first if it has.
8686
const cached = this._getCachedTile(tileId);
87-
let tileIsLoading = false;
87+
let tileLoading = false;
8888
if (this._isLoadingTile(tileId)) {
89-
tileIsLoading = loading = true;
89+
tileLoading = loading = true;
9090
this.tilesLoading[tileId].current = true;
9191
} else if (cached) {
9292
if (this.getTileOpacity(cached.image) < 1) {
93-
tileIsLoading = loading = true;
93+
tileLoading = loading = true;
9494
}
9595
tiles.push(cached);
9696
} else {
97-
tileIsLoading = loading = true;
98-
const hitLimit = tileLimit && (this._tileCountToLoad + loadingCount[0]) > tileLimit;
97+
tileLoading = loading = true;
98+
const hitLimit = loadingLimit && (loadingCount + preLoadingCount[0]) > loadingLimit;
9999
if (!hitLimit && (!map.isInteracting() || (map.isMoving() || map.isRotating()))) {
100-
this._tileCountToLoad++;
100+
loadingCount++;
101101
tileQueue[tileId + '@' + tile['point'].toArray().join()] = tile;
102102
}
103103
}
104-
if (!tileIsLoading) continue;
104+
if (!tileLoading) continue;
105105
if (checkedTiles[tile.dupKey]) {
106106
continue;
107107
}
@@ -143,7 +143,7 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
143143
}
144144

145145
this._drawTiles(tiles, parentTiles, childTiles, placeholders);
146-
if (this._tileCountToLoad === 0) {
146+
if (!loadingCount) {
147147
if (!loading) {
148148
//redraw to remove parent tiles if any left in last paint
149149
if (!map.isAnimating() && this._parentTiles.length > 0) {
@@ -164,19 +164,13 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
164164
}
165165

166166
_drawTiles(tiles, parentTiles, childTiles, placeholders) {
167-
if (parentTiles.length > 0) {
168-
this._parentTiles = [];
167+
if (parentTiles.length) {
169168
//closer the latter (to draw on top)
170169
parentTiles.sort((t1, t2) => Math.abs(t2.info.z - this._tileZoom) - Math.abs(t1.info.z - this._tileZoom));
171-
parentTiles.forEach(t => {
172-
this._parentTiles.push(t);
173-
});
170+
this._parentTiles = parentTiles;
174171
}
175-
if (childTiles.length > 0) {
176-
this._childTiles = [];
177-
childTiles.forEach(t => {
178-
this._childTiles.push(t);
179-
});
172+
if (childTiles.length) {
173+
this._childTiles = childTiles;
180174
}
181175

182176
const context = { tiles, parentTiles, childTiles };
@@ -275,7 +269,7 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
275269
}
276270

277271
// limit tile number to load when map is interacting
278-
_getTileLimitOnInteracting() {
272+
_getLoadLimit() {
279273
if (this.getMap().isInteracting()) {
280274
return this.layer.options['loadingLimitOnInteracting'];
281275
}
@@ -374,7 +368,7 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
374368
return loadImage(tileImage, [url]);
375369
}
376370

377-
cancelTileLoading(tileImage) {
371+
abortTileLoading(tileImage) {
378372
if (!tileImage) return;
379373
tileImage.onload = falseFn;
380374
tileImage.onerror = falseFn;
@@ -412,7 +406,7 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
412406
return;
413407
}
414408
if (tileImage instanceof Image) {
415-
this.cancelTileLoading(tileImage);
409+
this.abortTileLoading(tileImage);
416410
}
417411
tileImage.loadTime = 0;
418412
delete this.tilesLoading[tileInfo['id']];
@@ -570,7 +564,7 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
570564
const tilesLoading = this.tilesLoading;
571565
if (tilesLoading && tilesLoading[tileId]) {
572566
tilesLoading[tileId].current = false;
573-
this.cancelTileLoading(tilesLoading[tileId]);
567+
this.abortTileLoading(tilesLoading[tileId]);
574568
delete tilesLoading[tileId];
575569
}
576570
} else {
@@ -625,7 +619,7 @@ class TileLayerCanvasRenderer extends CanvasRenderer {
625619
if (force || !tile.current) {
626620
// abort loading tiles
627621
if (tile.image) {
628-
this.cancelTileLoading(tile.image);
622+
this.abortTileLoading(tile.image);
629623
}
630624
this.deleteTile(tile);
631625
delete this.tilesLoading[i];

‎src/renderer/layer/vectorlayer/VectorLayerCanvasRenderer.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class VectorLayerRenderer extends OverlayLayerCanvasRenderer {
7777
if (!this._geosToDraw) {
7878
return;
7979
}
80-
this._getDisplayExtent();
80+
this._updateDisplayExtent();
8181
for (let i = 0, l = this._geosToDraw.length; i < l; i++) {
8282
if (!this._geosToDraw[i].isVisible()) {
8383
continue;
@@ -102,7 +102,7 @@ class VectorLayerRenderer extends OverlayLayerCanvasRenderer {
102102
}
103103

104104
drawGeos() {
105-
this._getDisplayExtent();
105+
this._updateDisplayExtent();
106106
this.prepareToDraw();
107107

108108
this.forEachGeo(this.checkGeo, this);
@@ -134,7 +134,7 @@ class VectorLayerRenderer extends OverlayLayerCanvasRenderer {
134134
}
135135

136136
onZoomEnd() {
137-
delete this._extent2D;
137+
delete this.canvasExtent2D;
138138
super.onZoomEnd.apply(this, arguments);
139139
}
140140

@@ -152,8 +152,8 @@ class VectorLayerRenderer extends OverlayLayerCanvasRenderer {
152152
super.onGeometryPropertiesChange(param);
153153
}
154154

155-
_getDisplayExtent() {
156-
let extent2D = this._extent2D;
155+
_updateDisplayExtent() {
156+
let extent2D = this.canvasExtent2D;
157157
if (this._maskExtent) {
158158
if (!this._maskExtent.intersects(extent2D)) {
159159
this.completeRender();

0 commit comments

Comments
 (0)