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

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('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;

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

@@ -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;

49
src/ol/render/render.js
View File

@@ -1,49 +0,0 @@
goog.provide('ol.render');
goog.require('goog.vec.Mat4');
goog.require('ol.geom.Geometry');
/**
* @param {Array.<number>} flatCoordinates Flat coordinates.
* @param {number} stride Stride.
* @param {goog.vec.Mat4.AnyType} transform Transform.
* @param {Array.<number>=} opt_dest Destination.
* @return {Array.<number>} Transformed coordinates.
*/
ol.render.transformFlatCoordinates =
function(flatCoordinates, stride, transform, opt_dest) {
var m00 = goog.vec.Mat4.getElement(transform, 0, 0);
var m10 = goog.vec.Mat4.getElement(transform, 1, 0);
var m01 = goog.vec.Mat4.getElement(transform, 0, 1);
var m11 = goog.vec.Mat4.getElement(transform, 1, 1);
var m03 = goog.vec.Mat4.getElement(transform, 0, 3);
var m13 = goog.vec.Mat4.getElement(transform, 1, 3);
var dest = goog.isDef(opt_dest) ? opt_dest : [];
var i = 0;
var j, jj;
for (j = 0, jj = flatCoordinates.length; j < jj; j += stride) {
var x = flatCoordinates[j];
var y = flatCoordinates[j + 1];
dest[i++] = m00 * x + m01 * y + m03;
dest[i++] = m10 * x + m11 * y + m13;
}
if (goog.isDef(opt_dest) && dest.length != i) {
dest.length = i;
}
return dest;
};
/**
* @param {ol.geom.Geometry} geometry Geometry.
* @param {goog.vec.Mat4.AnyType} transform Transform.
* @param {Array.<number>=} opt_dest Destination.
* @return {Array.<number>} Transformed flat coordinates.
*/
ol.render.transformGeometry = function(geometry, transform, opt_dest) {
var flatCoordinates = geometry.getFlatCoordinates();
var stride = geometry.getStride();
return ol.render.transformFlatCoordinates(
flatCoordinates, stride, transform, opt_dest);
};