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

Use all projected coords when calculating Polyline's pixel bounds.

Browse Source 
Close #3968. Close #4020.
This commit is contained in:
Per Liedman 2015-12-28 20:53:26 +01:00
parent 3fd2d5cb75
commit 832b43ac58
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,23 +129,22 @@ L.Polyline = L.Path.extend({
}, },
_project: function () { _project: function () {
var pxBounds = new L.Bounds();
this._rings = []; this._rings = [];
this._projectLatlngs(this._latlngs, this._rings); this._projectLatlngs(this._latlngs, this._rings, pxBounds);
// project bounds as well to use later for Canvas hit detection/etc.
var w = this._clickTolerance(), var w = this._clickTolerance(),
p = new L.Point(w, -w); p = new L.Point(w, w);
if (this._bounds.isValid()) { if (this._bounds.isValid()) {
this._pxBounds = new L.Bounds( pxBounds.min._subtract(p);
this._map.latLngToLayerPoint(this._bounds.getSouthWest())._subtract(p), pxBounds.max._add(p);
this._map.latLngToLayerPoint(this._bounds.getNorthEast())._add(p)); this._pxBounds = pxBounds;
} }
}, },
// recursively turns latlngs into a set of rings with projected coordinates // recursively turns latlngs into a set of rings with projected coordinates
_projectLatlngs: function (latlngs, result) { _projectLatlngs: function (latlngs, result, projectedBounds) {
var flat = latlngs[0] instanceof L.LatLng, var flat = latlngs[0] instanceof L.LatLng,
len = latlngs.length, len = latlngs.length,
i, ring; i, ring;
@ -154,11 +153,12 @@ L.Polyline = L.Path.extend({
ring = []; ring = [];
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
ring[i] = this._map.latLngToLayerPoint(latlngs[i]); ring[i] = this._map.latLngToLayerPoint(latlngs[i]);
projectedBounds.extend(ring[i]);
} }
result.push(ring); result.push(ring);
} else { } else {
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
this._projectLatlngs(latlngs[i], result); this._projectLatlngs(latlngs[i], result, projectedBounds);
} }
} }
}, },