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

ol.style.RegularShape#getRadius2

Browse Source 
returns undefined if no radius2 was provided in the constructor
This commit is contained in:
simonseyock
2017-04-29 11:41:28 +02:00
parent dd73ac8892
commit 25aeb58c87
2 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ol/style/regularshape.js
View File

@@ -66,10 +66,9 @@ ol.style.RegularShape = function(options) {
/** /**
* @private * @private
* @type {number} * @type {number|undefined}
*/ */
this.radius2_ = this.radius2_ = options.radius2;
options.radius2 !== undefined ? options.radius2 : this.radius_;
/** /**
* @private * @private
@@ -263,7 +262,7 @@ ol.style.RegularShape.prototype.getRadius = function() {
/** /**
* Get the secondary radius for the shape. * Get the secondary radius for the shape.
* @return {number} Radius2. * @return {number|undefined} Radius2.
* @api * @api
*/ */
ol.style.RegularShape.prototype.getRadius2 = function() { ol.style.RegularShape.prototype.getRadius2 = function() {
@@ -430,12 +429,14 @@ ol.style.RegularShape.prototype.draw_ = function(renderOptions, context, x, y) {
renderOptions.size / 2, renderOptions.size / 2, renderOptions.size / 2, renderOptions.size / 2,
this.radius_, 0, 2 * Math.PI, true); this.radius_, 0, 2 * Math.PI, true);
} else { } else {
if (this.radius2_ !== this.radius_) { var radius2 = (this.radius2_ !== undefined) ? this.radius2_
: this.radius_;
if (radius2 !== this.radius_) {
points = 2 * points; points = 2 * points;
} }
for (i = 0; i <= points; i++) { for (i = 0; i <= points; i++) {
angle0 = i * 2 * Math.PI / points - Math.PI / 2 + this.angle_; angle0 = i * 2 * Math.PI / points - Math.PI / 2 + this.angle_;
radiusC = i % 2 === 0 ? this.radius_ : this.radius2_; radiusC = i % 2 === 0 ? this.radius_ : radius2;
context.lineTo(renderOptions.size / 2 + radiusC * Math.cos(angle0), context.lineTo(renderOptions.size / 2 + radiusC * Math.cos(angle0),
renderOptions.size / 2 + radiusC * Math.sin(angle0)); renderOptions.size / 2 + radiusC * Math.sin(angle0));
} }
@@ -503,13 +504,15 @@ ol.style.RegularShape.prototype.drawHitDetectionCanvas_ = function(renderOptions
renderOptions.size / 2, renderOptions.size / 2, renderOptions.size / 2, renderOptions.size / 2,
this.radius_, 0, 2 * Math.PI, true); this.radius_, 0, 2 * Math.PI, true);
} else { } else {
if (this.radius2_ !== this.radius_) { var radius2 = (this.radius2_ !== undefined) ? this.radius2_
: this.radius_;
if (radius2 !== this.radius_) {
points = 2 * points; points = 2 * points;
} }
var i, radiusC, angle0; var i, radiusC, angle0;
for (i = 0; i <= points; i++) { for (i = 0; i <= points; i++) {
angle0 = i * 2 * Math.PI / points - Math.PI / 2 + this.angle_; angle0 = i * 2 * Math.PI / points - Math.PI / 2 + this.angle_;
radiusC = i % 2 === 0 ? this.radius_ : this.radius2_; radiusC = i % 2 === 0 ? this.radius_ : radius2;
context.lineTo(renderOptions.size / 2 + radiusC * Math.cos(angle0), context.lineTo(renderOptions.size / 2 + radiusC * Math.cos(angle0),
renderOptions.size / 2 + radiusC * Math.sin(angle0)); renderOptions.size / 2 + radiusC * Math.sin(angle0));
} }

16
test/spec/ol/style/regularshape.test.js
View File

@@ -36,22 +36,6 @@ describe('ol.style.RegularShape', function() {
expect(style.getRadius2()).to.eql(10); expect(style.getRadius2()).to.eql(10);
}); });
it('will use radius for radius2 if radius2 not defined', function() {
var style = new ol.style.RegularShape({
radius: 5
});
expect(style.getRadius()).to.eql(5);
expect(style.getRadius2()).to.eql(5);
});
it('will use radius1 for radius2 if radius2 not defined', function() {
var style = new ol.style.RegularShape({
radius1: 5
});
expect(style.getRadius()).to.eql(5);
expect(style.getRadius2()).to.eql(5);
});
it('creates a canvas if no atlas is used (no fill-style)', function() { it('creates a canvas if no atlas is used (no fill-style)', function() {
var style = new ol.style.RegularShape({radius: 10}); var style = new ol.style.RegularShape({radius: 10});
expect(style.getImage()).to.be.an(HTMLCanvasElement); expect(style.getImage()).to.be.an(HTMLCanvasElement);