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

Minor coding style improvements.

Browse Source
This commit is contained in:
ahocevar
2012-02-22 17:22:30 +01:00
parent bb3ae99713
commit 69660e3530
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Renderer/Canvas.js
+6 -6
View File
@@ -336,29 +336,29 @@ OpenLayers.Renderer.Canvas = OpenLayers.Class(OpenLayers.Renderer, {
// Push symbol scaling, translation and rotation onto the transformation stack in reverse order. // Push symbol scaling, translation and rotation onto the transformation stack in reverse order.
// Don't forget to apply all canvas transformations to the hitContext canvas as well(!) // Don't forget to apply all canvas transformations to the hitContext canvas as well(!)
this.canvas.save(); this.canvas.save();
if (this.hitDetection) this.hitContext.save(); if (this.hitDetection) { this.hitContext.save(); }
// Step 3: place symbol at the desired location // Step 3: place symbol at the desired location
this.canvas.translate(p0,p1); this.canvas.translate(p0,p1);
if (this.hitDetection) this.hitContext.translate(p0,p1); if (this.hitDetection) { this.hitContext.translate(p0,p1); }
// Step 2a. rotate the symbol if necessary // Step 2a. rotate the symbol if necessary
angle = deg2rad * style.rotation; // will be NaN when style.rotation is undefined. angle = deg2rad * style.rotation; // will be NaN when style.rotation is undefined.
if (!isNaN(angle)) { if (!isNaN(angle)) {
this.canvas.rotate(angle); this.canvas.rotate(angle);
if (this.hitDetection) this.hitContext.rotate(angle); if (this.hitDetection) { this.hitContext.rotate(angle); }
} }
// // Step 2: scale symbol such that pointRadius equals half the maximum symbol dimension. // // Step 2: scale symbol such that pointRadius equals half the maximum symbol dimension.
scaling = 2.0 * style.pointRadius / Math.max(symbolBounds.getWidth(), symbolBounds.getHeight()); scaling = 2.0 * style.pointRadius / Math.max(symbolBounds.getWidth(), symbolBounds.getHeight());
this.canvas.scale(scaling,scaling); this.canvas.scale(scaling,scaling);
if (this.hitDetection) this.hitContext.scale(scaling,scaling); if (this.hitDetection) { this.hitContext.scale(scaling,scaling); }
// Step 1: center the symbol at the origin // Step 1: center the symbol at the origin
cx = symbolBounds.getCenterLonLat().lon; cx = symbolBounds.getCenterLonLat().lon;
cy = symbolBounds.getCenterLonLat().lat; cy = symbolBounds.getCenterLonLat().lat;
this.canvas.translate(-cx,-cy); this.canvas.translate(-cx,-cy);
if (this.hitDetection) this.hitContext.translate(-cx,-cy); if (this.hitDetection) { this.hitContext.translate(-cx,-cy); }
// Don't forget to scale stroke widths, because they are affected by canvas scale transformations as well(!) // Don't forget to scale stroke widths, because they are affected by canvas scale transformations as well(!)
// Alternative: scale symbol coordinates manually, so stroke width scaling is not needed anymore. // Alternative: scale symbol coordinates manually, so stroke width scaling is not needed anymore.
@@ -408,7 +408,7 @@ OpenLayers.Renderer.Canvas = OpenLayers.Class(OpenLayers.Renderer, {
style.strokeWidth = unscaledStrokeWidth; style.strokeWidth = unscaledStrokeWidth;
this.canvas.restore(); this.canvas.restore();
if (this.hitDetection) this.hitContext.restore(); if (this.hitDetection) { this.hitContext.restore(); }
this.setCanvasStyle("reset"); this.setCanvasStyle("reset");
}, },