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

ol.style.RegularShape#getPoints

Browse Source 
returns now same amount of points as provided to the constructor
This commit is contained in:
simonseyock
2017-04-29 11:28:40 +02:00
parent 16d62f8d9b
commit dd73ac8892
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/style/regularshape.js
+11 -9
View File
@@ -146,7 +146,7 @@ ol.inherits(ol.style.RegularShape, ol.style.Image);
ol.style.RegularShape.prototype.clone = function() { ol.style.RegularShape.prototype.clone = function() {
var style = new ol.style.RegularShape({ var style = new ol.style.RegularShape({
fill: this.getFill() ? this.getFill().clone() : undefined, fill: this.getFill() ? this.getFill().clone() : undefined,
points: this.getRadius2() !== this.getRadius() ? this.getPoints() / 2 : this.getPoints(), points: this.getPoints(),
radius: this.getRadius(), radius: this.getRadius(),
radius2: this.getRadius2(), radius2: this.getRadius2(),
angle: this.getAngle(), angle: this.getAngle(),
@@ -424,16 +424,17 @@ ol.style.RegularShape.prototype.draw_ = function(renderOptions, context, x, y) {
context.beginPath(); context.beginPath();
if (this.points_ === Infinity) { var points = this.points_;
if (points === Infinity) {
context.arc( context.arc(
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_) { if (this.radius2_ !== this.radius_) {
this.points_ = 2 * this.points_; points = 2 * points;
} }
for (i = 0; i <= this.points_; i++) { for (i = 0; i <= points; i++) {
angle0 = i * 2 * Math.PI / this.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_ : this.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));
@@ -496,17 +497,18 @@ ol.style.RegularShape.prototype.drawHitDetectionCanvas_ = function(renderOptions
context.beginPath(); context.beginPath();
if (this.points_ === Infinity) { var points = this.points_;
if (points === Infinity) {
context.arc( context.arc(
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_) { if (this.radius2_ !== this.radius_) {
this.points_ = 2 * this.points_; points = 2 * points;
} }
var i, radiusC, angle0; var i, radiusC, angle0;
for (i = 0; i <= this.points_; i++) { for (i = 0; i <= points; i++) {
angle0 = i * 2 * Math.PI / this.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_ : this.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));