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

Rename ol.render to ol.geom.flat

Browse Source
This commit is contained in:
Tom Payne
2013-11-12 12:11:25 +01:00
parent e44dfb1c6c
commit 16994f1774
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/render/render.js → src/ol/geom/flatgeom.js
View File

@@ -1,4 +1,4 @@
goog.provide('ol.render'); goog.provide('ol.geom.flat');
goog.require('goog.vec.Mat4'); goog.require('goog.vec.Mat4');
goog.require('ol.geom.Geometry'); goog.require('ol.geom.Geometry');
@@ -11,7 +11,7 @@ goog.require('ol.geom.Geometry');
* @param {Array.<number>=} opt_dest Destination. * @param {Array.<number>=} opt_dest Destination.
* @return {Array.<number>} Transformed coordinates. * @return {Array.<number>} Transformed coordinates.
*/ */
ol.render.transformFlatCoordinates = ol.geom.flat.transform2D =
function(flatCoordinates, stride, transform, opt_dest) { function(flatCoordinates, stride, transform, opt_dest) {
var m00 = goog.vec.Mat4.getElement(transform, 0, 0); var m00 = goog.vec.Mat4.getElement(transform, 0, 0);
var m10 = goog.vec.Mat4.getElement(transform, 1, 0); var m10 = goog.vec.Mat4.getElement(transform, 1, 0);
@@ -41,9 +41,9 @@ ol.render.transformFlatCoordinates =
* @param {Array.<number>=} opt_dest Destination. * @param {Array.<number>=} opt_dest Destination.
* @return {Array.<number>} Transformed flat coordinates. * @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 flatCoordinates = geometry.getFlatCoordinates();
var stride = geometry.getStride(); var stride = geometry.getStride();
return ol.render.transformFlatCoordinates( return ol.geom.flat.transform2D(
flatCoordinates, stride, transform, opt_dest); flatCoordinates, stride, transform, opt_dest);
}; };

12
src/ol/render/canvas/canvasimmediate.js
View File

@@ -5,7 +5,7 @@ goog.provide('ol.render.canvas.Immediate');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.render'); goog.require('ol.geom.flat');
goog.require('ol.render.IRender'); goog.require('ol.render.IRender');
goog.require('ol.style.fill'); goog.require('ol.style.fill');
goog.require('ol.style.stroke'); goog.require('ol.style.stroke');
@@ -71,7 +71,7 @@ ol.render.canvas.Immediate.prototype.drawImages_ = function(geometry) {
goog.isNull(imageStyle)) { goog.isNull(imageStyle)) {
return; return;
} }
var pixelCoordinates = ol.render.transformGeometry( var pixelCoordinates = ol.geom.flat.transformGeometry2D(
geometry, this.transform_, this.pixelCoordinates_); geometry, this.transform_, this.pixelCoordinates_);
var i, ii; var i, ii;
for (i = 0, ii = pixelCoordinates.length; i < ii; i += 2) { for (i = 0, ii = pixelCoordinates.length; i < ii; i += 2) {
@@ -169,7 +169,7 @@ ol.render.canvas.Immediate.prototype.drawLineStringGeometry =
return; return;
} }
var context = this.context_; var context = this.context_;
var pixelCoordinates = ol.render.transformGeometry( var pixelCoordinates = ol.geom.flat.transformGeometry2D(
lineStringGeometry, this.transform_, this.pixelCoordinates_); lineStringGeometry, this.transform_, this.pixelCoordinates_);
context.beginPath(); context.beginPath();
this.moveToLineTo_(pixelCoordinates, 0, pixelCoordinates.length, false); this.moveToLineTo_(pixelCoordinates, 0, pixelCoordinates.length, false);
@@ -188,7 +188,7 @@ ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry =
return; return;
} }
var context = this.context_; var context = this.context_;
var pixelCoordinates = ol.render.transformGeometry( var pixelCoordinates = ol.geom.flat.transformGeometry2D(
multiLineStringGeometry, this.transform_, this.pixelCoordinates_); multiLineStringGeometry, this.transform_, this.pixelCoordinates_);
context.beginPath(); context.beginPath();
var ends = multiLineStringGeometry.getEnds(); var ends = multiLineStringGeometry.getEnds();
@@ -214,7 +214,7 @@ ol.render.canvas.Immediate.prototype.drawPolygonGeometry =
return; return;
} }
var context = this.context_; var context = this.context_;
var pixelCoordinates = ol.render.transformGeometry( var pixelCoordinates = ol.geom.flat.transformGeometry2D(
polygonGeometry, this.transform_, this.pixelCoordinates_); polygonGeometry, this.transform_, this.pixelCoordinates_);
var ends = polygonGeometry.getEnds(); var ends = polygonGeometry.getEnds();
context.beginPath(); context.beginPath();
@@ -241,7 +241,7 @@ ol.render.canvas.Immediate.prototype.drawMultiPolygonGeometry =
return; return;
} }
var context = this.context_; var context = this.context_;
var pixelCoordinates = ol.render.transformGeometry( var pixelCoordinates = ol.geom.flat.transformGeometry2D(
multiPolygonGeometry, this.transform_, this.pixelCoordinates_); multiPolygonGeometry, this.transform_, this.pixelCoordinates_);
var endss = multiPolygonGeometry.getEndss(); var endss = multiPolygonGeometry.getEndss();
var offset = 0; var offset = 0;

4
src/ol/render/canvas/canvasreplay.js
View File

@@ -7,7 +7,7 @@ goog.require('goog.array');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.object'); goog.require('goog.object');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.render'); goog.require('ol.geom.flat');
goog.require('ol.render.IRender'); goog.require('ol.render.IRender');
goog.require('ol.render.IReplayReplayGroup'); goog.require('ol.render.IReplayReplayGroup');
goog.require('ol.style.fill'); goog.require('ol.style.fill');
@@ -94,7 +94,7 @@ ol.render.canvas.Replay.prototype.appendFlatCoordinates =
* @param {goog.vec.Mat4.AnyType} transform Transform. * @param {goog.vec.Mat4.AnyType} transform Transform.
*/ */
ol.render.canvas.Replay.prototype.draw = function(context, 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.coordinates, 2, transform, this.pixelCoordinates_);
this.pixelCoordinates_ = pixelCoordinates; // FIXME ? this.pixelCoordinates_ = pixelCoordinates; // FIXME ?
var instructions = this.instructions; var instructions = this.instructions;