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

Merge pull request #5859 from Leaflet/fix-circle-bounds-calc

Browse Source 
Round circle radius in renderer instead of layer
This commit is contained in:
Andrew 2017-10-21 12:47:12 +02:00 committed by GitHub
commit dd4667db61
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spec/suites/layer/vector/CircleSpec.js
View File

@ -27,8 +27,8 @@ describe('Circle', function () {
it('returns bounds', function () { it('returns bounds', function () {
var bounds = circle.getBounds(); var bounds = circle.getBounds();
expect(bounds.getSouthWest()).nearLatLng(new L.LatLng(49.94347, 29.91211)); expect(bounds.getSouthWest()).nearLatLng(new L.LatLng(49.99820, 29.99720));
expect(bounds.getNorthEast()).nearLatLng(new L.LatLng(50.05646, 30.08789)); expect(bounds.getNorthEast()).nearLatLng(new L.LatLng(50.00179, 30.00279));
}); });
}); });
@ -44,8 +44,8 @@ describe('Circle', function () {
it('returns same bounds as 1.0 factory', function () { it('returns same bounds as 1.0 factory', function () {
var bounds = circle.getBounds(); var bounds = circle.getBounds();
expect(bounds.getSouthWest()).nearLatLng(new L.LatLng(49.94347, 29.91211)); expect(bounds.getSouthWest()).nearLatLng(new L.LatLng(49.99820, 29.99720));
expect(bounds.getNorthEast()).nearLatLng(new L.LatLng(50.05646, 30.08789)); expect(bounds.getNorthEast()).nearLatLng(new L.LatLng(50.00179, 30.00279));
}); });
}); });

4
src/layer/vector/Canvas.js
View File

@ -294,8 +294,8 @@ export var Canvas = Renderer.extend({
var p = layer._point, var p = layer._point,
ctx = this._ctx, ctx = this._ctx,
r = layer._radius, r = Math.max(Math.round(layer._radius), 1),
s = (layer._radiusY || r) / r; s = (Math.max(Math.round(layer._radiusY), 1) || r) / r;
this._drawnLayers[layer._leaflet_id] = layer; this._drawnLayers[layer._leaflet_id] = layer;

4
src/layer/vector/Circle.js
View File

@ -87,8 +87,8 @@ export var Circle = CircleMarker.extend({
} }
this._point = p.subtract(map.getPixelOrigin()); this._point = p.subtract(map.getPixelOrigin());
this._radius = isNaN(lngR) ? 0 : Math.max(Math.round(p.x - map.project([lat2, lng - lngR]).x), 1); this._radius = isNaN(lngR) ? 0 : p.x - map.project([lat2, lng - lngR]).x;
this._radiusY = Math.max(Math.round(p.y - top.y), 1); this._radiusY = p.y - top.y;
} else { } else {
var latlng2 = crs.unproject(crs.project(this._latlng).subtract([this._mRadius, 0])); var latlng2 = crs.unproject(crs.project(this._latlng).subtract([this._mRadius, 0]));

4
src/layer/vector/SVG.js
View File

@ -180,8 +180,8 @@ export var SVG = Renderer.extend({
_updateCircle: function (layer) { _updateCircle: function (layer) {
var p = layer._point, var p = layer._point,
r = layer._radius, r = Math.max(Math.round(layer._radius), 1),
r2 = layer._radiusY || r, r2 = Math.max(Math.round(layer._radiusY), 1) || r,
arc = 'a' + r + ',' + r2 + ' 0 1,0 '; arc = 'a' + r + ',' + r2 + ' 0 1,0 ';
// drawing a circle with two half-arcs // drawing a circle with two half-arcs