From 16994f177450786bc1dc2faed53b2251ce09f488 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 12 Nov 2013 12:11:25 +0100
Subject: [PATCH] Rename ol.render to ol.geom.flat

---
 src/ol/{render/render.js => geom/flatgeom.js} |  8 ++++----
 src/ol/render/canvas/canvasimmediate.js       | 12 ++++++------
 src/ol/render/canvas/canvasreplay.js          |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename src/ol/{render/render.js => geom/flatgeom.js} (89%)

diff --git a/src/ol/render/render.js b/src/ol/geom/flatgeom.js
similarity index 89%
rename from src/ol/render/render.js
rename to src/ol/geom/flatgeom.js
index ba9ae73c3c..5310694a19 100644
--- a/src/ol/render/render.js
+++ b/src/ol/geom/flatgeom.js
@@ -1,4 +1,4 @@
-goog.provide('ol.render');
+goog.provide('ol.geom.flat');
 
 goog.require('goog.vec.Mat4');
 goog.require('ol.geom.Geometry');
@@ -11,7 +11,7 @@ goog.require('ol.geom.Geometry');
  * @param {Array.<number>=} opt_dest Destination.
  * @return {Array.<number>} Transformed coordinates.
  */
-ol.render.transformFlatCoordinates =
+ol.geom.flat.transform2D =
     function(flatCoordinates, stride, transform, opt_dest) {
   var m00 = goog.vec.Mat4.getElement(transform, 0, 0);
   var m10 = goog.vec.Mat4.getElement(transform, 1, 0);
@@ -41,9 +41,9 @@ ol.render.transformFlatCoordinates =
  * @param {Array.<number>=} opt_dest Destination.
  * @return {Array.<number>} Transformed flat coordinates.
  */
-ol.render.transformGeometry = function(geometry, transform, opt_dest) {
+ol.geom.flat.transformGeometry2D = function(geometry, transform, opt_dest) {
   var flatCoordinates = geometry.getFlatCoordinates();
   var stride = geometry.getStride();
-  return ol.render.transformFlatCoordinates(
+  return ol.geom.flat.transform2D(
       flatCoordinates, stride, transform, opt_dest);
 };
diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js
index 548f9950d3..ab7c968723 100644
--- a/src/ol/render/canvas/canvasimmediate.js
+++ b/src/ol/render/canvas/canvasimmediate.js
@@ -5,7 +5,7 @@ goog.provide('ol.render.canvas.Immediate');
 
 goog.require('goog.asserts');
 goog.require('ol.extent');
-goog.require('ol.render');
+goog.require('ol.geom.flat');
 goog.require('ol.render.IRender');
 goog.require('ol.style.fill');
 goog.require('ol.style.stroke');
@@ -71,7 +71,7 @@ ol.render.canvas.Immediate.prototype.drawImages_ = function(geometry) {
       goog.isNull(imageStyle)) {
     return;
   }
-  var pixelCoordinates = ol.render.transformGeometry(
+  var pixelCoordinates = ol.geom.flat.transformGeometry2D(
       geometry, this.transform_, this.pixelCoordinates_);
   var i, ii;
   for (i = 0, ii = pixelCoordinates.length; i < ii; i += 2) {
@@ -169,7 +169,7 @@ ol.render.canvas.Immediate.prototype.drawLineStringGeometry =
     return;
   }
   var context = this.context_;
-  var pixelCoordinates = ol.render.transformGeometry(
+  var pixelCoordinates = ol.geom.flat.transformGeometry2D(
       lineStringGeometry, this.transform_, this.pixelCoordinates_);
   context.beginPath();
   this.moveToLineTo_(pixelCoordinates, 0, pixelCoordinates.length, false);
@@ -188,7 +188,7 @@ ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry =
     return;
   }
   var context = this.context_;
-  var pixelCoordinates = ol.render.transformGeometry(
+  var pixelCoordinates = ol.geom.flat.transformGeometry2D(
       multiLineStringGeometry, this.transform_, this.pixelCoordinates_);
   context.beginPath();
   var ends = multiLineStringGeometry.getEnds();
@@ -214,7 +214,7 @@ ol.render.canvas.Immediate.prototype.drawPolygonGeometry =
     return;
   }
   var context = this.context_;
-  var pixelCoordinates = ol.render.transformGeometry(
+  var pixelCoordinates = ol.geom.flat.transformGeometry2D(
       polygonGeometry, this.transform_, this.pixelCoordinates_);
   var ends = polygonGeometry.getEnds();
   context.beginPath();
@@ -241,7 +241,7 @@ ol.render.canvas.Immediate.prototype.drawMultiPolygonGeometry =
     return;
   }
   var context = this.context_;
-  var pixelCoordinates = ol.render.transformGeometry(
+  var pixelCoordinates = ol.geom.flat.transformGeometry2D(
       multiPolygonGeometry, this.transform_, this.pixelCoordinates_);
   var endss = multiPolygonGeometry.getEndss();
   var offset = 0;
diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js
index e3e275c0d5..fd6a97a154 100644
--- a/src/ol/render/canvas/canvasreplay.js
+++ b/src/ol/render/canvas/canvasreplay.js
@@ -7,7 +7,7 @@ goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.object');
 goog.require('ol.extent');
-goog.require('ol.render');
+goog.require('ol.geom.flat');
 goog.require('ol.render.IRender');
 goog.require('ol.render.IReplayReplayGroup');
 goog.require('ol.style.fill');
@@ -94,7 +94,7 @@ ol.render.canvas.Replay.prototype.appendFlatCoordinates =
  * @param {goog.vec.Mat4.AnyType} transform Transform.
  */
 ol.render.canvas.Replay.prototype.draw = function(context, transform) {
-  var pixelCoordinates = ol.render.transformFlatCoordinates(
+  var pixelCoordinates = ol.geom.flat.transform2D(
       this.coordinates, 2, transform, this.pixelCoordinates_);
   this.pixelCoordinates_ = pixelCoordinates;  // FIXME ?
   var instructions = this.instructions;