From 8fd4e2c7c55789e641bd40a0b9d1c73c0cb074e4 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Sun, 19 Apr 2015 08:49:17 +0200 Subject: [PATCH] Improve docs, comments and code readability --- externs/olx.js | 2 +- src/ol/renderer/canvas/canvasmaprenderer.js | 6 ++++-- src/ol/renderer/canvas/canvasvectorlayerrenderer.js | 8 +++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/externs/olx.js b/externs/olx.js index 0856844d8f..6b7c541696 100644 --- a/externs/olx.js +++ b/externs/olx.js @@ -4949,7 +4949,7 @@ olx.source.VectorOptions.prototype.url; /** * Wrap the world horizontally. Default is `true`. For vector editing across the - * 0° and 180° meridians to work properly, this should be set to `false`. The + * -180° and 180° meridians to work properly, this should be set to `false`. The * resulting geometry coordinates will then exceed the world bounds. * @type {boolean|undefined} * @api diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js index fd100e65ab..86531201e6 100644 --- a/src/ol/renderer/canvas/canvasmaprenderer.js +++ b/src/ol/renderer/canvas/canvasmaprenderer.js @@ -135,14 +135,16 @@ ol.renderer.canvas.Map.prototype.dispatchComposeEvent_ = var worldWidth = ol.extent.getWidth(projectionExtent); var world = 0; while (startX < projectionExtent[0]) { - transform = this.getTransform(frameState, worldWidth * (--world)); + --world; + transform = this.getTransform(frameState, worldWidth * world); replayGroup.replay(context, pixelRatio, transform, rotation, {}); startX += worldWidth; } world = 0; startX = extent[2]; while (startX > projectionExtent[2]) { - transform = this.getTransform(frameState, worldWidth * (++world)); + ++world; + transform = this.getTransform(frameState, worldWidth * ++world); replayGroup.replay(context, pixelRatio, transform, rotation, {}); startX -= worldWidth; } diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index dab1413b83..7e1b68093c 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -116,7 +116,8 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame = var worldWidth = ol.extent.getWidth(projectionExtent); var world = 0; while (startX < projectionExtent[0]) { - transform = this.getTransform(frameState, worldWidth * (--world)); + --world; + transform = this.getTransform(frameState, worldWidth * world); replayGroup.replay( replayContext, pixelRatio, transform, rotation, skippedFeatureUids); startX += worldWidth; @@ -124,7 +125,8 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame = world = 0; startX = extent[2]; while (startX > projectionExtent[2]) { - transform = this.getTransform(frameState, worldWidth * (++world)); + ++world; + transform = this.getTransform(frameState, worldWidth * world); replayGroup.replay( replayContext, pixelRatio, transform, rotation, skippedFeatureUids); startX -= worldWidth; @@ -229,7 +231,7 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame = if (vectorSource.getWrapX() && viewState.projection.isGlobal() && !ol.extent.containsExtent(projectionExtent, frameState.extent)) { - // do not clip when the view crosses the 0 or 180 meridians + // do not clip when the view crosses the -180° or 180° meridians extent[0] = projectionExtent[0]; extent[2] = projectionExtent[2]; }