cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check bounds before clipping

Browse Source
This commit is contained in:
Will Franklin 2015-06-12 11:51:20 +01:00
parent cc04a82be1
commit 4952b37256
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/layer/vector/Polygon.js
View File

@ -65,11 +65,6 @@ L.Polygon = L.Polyline.extend({
}, },
_clipPoints: function () { _clipPoints: function () {
if (this.options.noClip) {
this._parts = this._rings;
return;
}
// polygons need a different clipping algorithm so we redefine that // polygons need a different clipping algorithm so we redefine that
var bounds = this._renderer._bounds, var bounds = this._renderer._bounds,
@ -80,6 +75,14 @@ L.Polygon = L.Polyline.extend({
bounds = new L.Bounds(bounds.min.subtract(p), bounds.max.add(p)); bounds = new L.Bounds(bounds.min.subtract(p), bounds.max.add(p));
this._parts = []; this._parts = [];
if (!this._pxBounds || !this._pxBounds.intersects(bounds)) {
return;
}
if (this.options.noClip) {
this._parts = this._rings;
return;
}
for (var i = 0, len = this._rings.length, clipped; i < len; i++) { for (var i = 0, len = this._rings.length, clipped; i < len; i++) {
clipped = L.PolyUtil.clipPolygon(this._rings[i], bounds, true); clipped = L.PolyUtil.clipPolygon(this._rings[i], bounds, true);

10
src/layer/vector/Polyline.js
View File

@ -165,15 +165,19 @@ L.Polyline = L.Path.extend({
// clip polyline by renderer bounds so that we have less to render for performance // clip polyline by renderer bounds so that we have less to render for performance
_clipPoints: function () { _clipPoints: function () {
var bounds = this._renderer._bounds;
this._parts = [];
if (!this._pxBounds || !this._pxBounds.intersects(bounds)) {
return;
}
if (this.options.noClip) { if (this.options.noClip) {
this._parts = this._rings; this._parts = this._rings;
return; return;
} }
this._parts = [];
var parts = this._parts, var parts = this._parts,
bounds = this._renderer._bounds,
i, j, k, len, len2, segment, points; i, j, k, len, len2, segment, points;
for (i = 0, k = 0, len = this._rings.length; i < len; i++) { for (i = 0, k = 0, len = this._rings.length; i < len; i++) {