ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct calculation of ol.style.Circle canvas size

Browse Source
This commit is contained in:
Tom Payne
2013-12-20 23:34:28 +01:00
parent 86374d1fde
commit 50b41f93f3
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ol/style/circlestyle.js
View File

@@ -5,6 +5,7 @@ goog.provide('ol.style.Circle');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('ol.color');
goog.require('ol.render.canvas');
goog.require('ol.style.Fill');
goog.require('ol.style.Image');
goog.require('ol.style.ImageState');
@@ -114,12 +115,19 @@ ol.style.Circle.prototype.load = goog.nullFunction;
*/
ol.style.Circle.prototype.render_ = function() {
var canvas = this.canvas_;
var size = 2 * this.radius_ + 1;
if (!goog.isNull(this.stroke_) && goog.isDef(this.stroke_.width)) {
size += this.stroke_.width;
var strokeWidth;
if (goog.isNull(this.stroke_)) {
strokeWidth = 0;
} else {
strokeWidth = this.stroke_.getWidth();
if (!goog.isDef(strokeWidth)) {
strokeWidth = ol.render.canvas.defaultLineWidth;
}
}
var size = 2 * (this.radius_ + strokeWidth) + 1;
canvas.height = size;
canvas.width = size;
@@ -134,8 +142,7 @@ ol.style.Circle.prototype.render_ = function() {
if (!goog.isNull(this.stroke_)) {
var strokeColor = this.stroke_.getColor();
context.strokeStyle = ol.color.asString(strokeColor);
var strokeWidth = this.stroke_.getWidth();
context.lineWidth = goog.isDef(strokeWidth) ? strokeWidth : 1;
context.lineWidth = strokeWidth;
context.stroke();
}