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

Shorter names for drawing methods

Browse Source
This commit is contained in:
Tim Schaub
2016-03-18 10:03:37 -06:00
parent 2133d6d081
commit 88f8515fb6
12 changed files with 126 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/graticule.js
View File

@@ -442,11 +442,11 @@ ol.Graticule.prototype.handlePostCompose_ = function(e) {
var i, l, line;
for (i = 0, l = this.meridians_.length; i < l; ++i) {
line = this.meridians_[i];
vectorContext.drawLineStringGeometry(line, null);
vectorContext.drawLineString(line, null);
}
for (i = 0, l = this.parallels_.length; i < l; ++i) {
line = this.parallels_[i];
vectorContext.drawLineStringGeometry(line, null);
vectorContext.drawLineString(line, null);
}
};

2
src/ol/render.js
View File

@@ -16,7 +16,7 @@ goog.require('ol.vec.Mat4');
* var render = ol.render.toContext(canvas.getContext('2d'),
* { size: [100, 100] });
* render.setFillStrokeStyle(new ol.style.Fill({ color: blue }));
* render.drawPolygonGeometry(
* render.drawPolygon(
* new ol.geom.Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]]));
* ```
*

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

@@ -429,7 +429,7 @@ ol.render.canvas.Immediate.prototype.drawAsync = function(zIndex, callback) {
* @param {ol.geom.Circle} circleGeometry Circle geometry.
* @api
*/
ol.render.canvas.Immediate.prototype.drawCircleGeometry = function(circleGeometry) {
ol.render.canvas.Immediate.prototype.drawCircle = function(circleGeometry) {
if (!ol.extent.intersects(this.extent_, circleGeometry.getExtent())) {
return;
}
@@ -487,28 +487,28 @@ ol.render.canvas.Immediate.prototype.drawGeometry = function(geometry) {
var type = geometry.getType();
switch (type) {
case ol.geom.GeometryType.POINT:
this.drawPointGeometry(/** @type {ol.geom.Point} */ (geometry));
this.drawPoint(/** @type {ol.geom.Point} */ (geometry));
break;
case ol.geom.GeometryType.LINE_STRING:
this.drawLineStringGeometry(/** @type {ol.geom.LineString} */ (geometry));
this.drawLineString(/** @type {ol.geom.LineString} */ (geometry));
break;
case ol.geom.GeometryType.POLYGON:
this.drawPolygonGeometry(/** @type {ol.geom.Polygon} */ (geometry));
this.drawPolygon(/** @type {ol.geom.Polygon} */ (geometry));
break;
case ol.geom.GeometryType.MULTI_POINT:
this.drawMultiPointGeometry(/** @type {ol.geom.MultiPoint} */ (geometry));
this.drawMultiPoint(/** @type {ol.geom.MultiPoint} */ (geometry));
break;
case ol.geom.GeometryType.MULTI_LINE_STRING:
this.drawMultiLineStringGeometry(/** @type {ol.geom.MultiLineString} */ (geometry));
this.drawMultiLineString(/** @type {ol.geom.MultiLineString} */ (geometry));
break;
case ol.geom.GeometryType.MULTI_POLYGON:
this.drawMultiPolygonGeometry(/** @type {ol.geom.MultiPolygon} */ (geometry));
this.drawMultiPolygon(/** @type {ol.geom.MultiPolygon} */ (geometry));
break;
case ol.geom.GeometryType.GEOMETRY_COLLECTION:
this.drawGeometryCollectionGeometry(/** @type {ol.geom.GeometryCollection} */ (geometry), null);
this.drawGeometryCollection(/** @type {ol.geom.GeometryCollection} */ (geometry), null);
break;
case ol.geom.GeometryType.CIRCLE:
this.drawCircleGeometry(/** @type {ol.geom.Circle} */ (geometry));
this.drawCircle(/** @type {ol.geom.Circle} */ (geometry));
break;
default:
goog.asserts.fail('Unsupported geometry type: ' + type);
@@ -555,7 +555,7 @@ ol.render.canvas.Immediate.prototype.drawFeature = function(feature, style) {
* collection.
* @param {ol.Feature} feature Feature.
*/
ol.render.canvas.Immediate.prototype.drawGeometryCollectionGeometry = function(geometryCollectionGeometry, feature) {
ol.render.canvas.Immediate.prototype.drawGeometryCollection = function(geometryCollectionGeometry, feature) {
var geometries = geometryCollectionGeometry.getGeometriesArray();
var i, ii;
for (i = 0, ii = geometries.length; i < ii; ++i) {
@@ -570,7 +570,7 @@ ol.render.canvas.Immediate.prototype.drawGeometryCollectionGeometry = function(g
*
* @param {ol.geom.Point|ol.render.Feature} pointGeometry Point geometry.
*/
ol.render.canvas.Immediate.prototype.drawPointGeometry = function(pointGeometry) {
ol.render.canvas.Immediate.prototype.drawPoint = function(pointGeometry) {
var flatCoordinates = pointGeometry.getFlatCoordinates();
var stride = pointGeometry.getStride();
if (this.image_) {
@@ -589,7 +589,7 @@ ol.render.canvas.Immediate.prototype.drawPointGeometry = function(pointGeometry)
* @param {ol.geom.MultiPoint|ol.render.Feature} multiPointGeometry MultiPoint
* geometry.
*/
ol.render.canvas.Immediate.prototype.drawMultiPointGeometry = function(multiPointGeometry) {
ol.render.canvas.Immediate.prototype.drawMultiPoint = function(multiPointGeometry) {
var flatCoordinates = multiPointGeometry.getFlatCoordinates();
var stride = multiPointGeometry.getStride();
if (this.image_) {
@@ -608,7 +608,7 @@ ol.render.canvas.Immediate.prototype.drawMultiPointGeometry = function(multiPoin
* @param {ol.geom.LineString|ol.render.Feature} lineStringGeometry Line
* string geometry.
*/
ol.render.canvas.Immediate.prototype.drawLineStringGeometry = function(lineStringGeometry) {
ol.render.canvas.Immediate.prototype.drawLineString = function(lineStringGeometry) {
if (!ol.extent.intersects(this.extent_, lineStringGeometry.getExtent())) {
return;
}
@@ -635,7 +635,7 @@ ol.render.canvas.Immediate.prototype.drawLineStringGeometry = function(lineStrin
* @param {ol.geom.MultiLineString|ol.render.Feature} multiLineStringGeometry
* MultiLineString geometry.
*/
ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry = function(multiLineStringGeometry) {
ol.render.canvas.Immediate.prototype.drawMultiLineString = function(multiLineStringGeometry) {
var geometryExtent = multiLineStringGeometry.getExtent();
if (!ol.extent.intersects(this.extent_, geometryExtent)) {
return;
@@ -669,7 +669,7 @@ ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry = function(mult
* @param {ol.geom.Polygon|ol.render.Feature} polygonGeometry Polygon
* geometry.
*/
ol.render.canvas.Immediate.prototype.drawPolygonGeometry = function(polygonGeometry) {
ol.render.canvas.Immediate.prototype.drawPolygon = function(polygonGeometry) {
if (!ol.extent.intersects(this.extent_, polygonGeometry.getExtent())) {
return;
}
@@ -703,7 +703,7 @@ ol.render.canvas.Immediate.prototype.drawPolygonGeometry = function(polygonGeome
* uses the current style.
* @param {ol.geom.MultiPolygon} multiPolygonGeometry MultiPolygon geometry.
*/
ol.render.canvas.Immediate.prototype.drawMultiPolygonGeometry = function(multiPolygonGeometry) {
ol.render.canvas.Immediate.prototype.drawMultiPolygon = function(multiPolygonGeometry) {
if (!ol.extent.intersects(this.extent_, multiPolygonGeometry.getExtent())) {
return;
}

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

@@ -779,7 +779,7 @@ ol.render.canvas.ImageReplay.prototype.drawCoordinates_ = function(flatCoordinat
/**
* @inheritDoc
*/
ol.render.canvas.ImageReplay.prototype.drawPointGeometry = function(pointGeometry, feature) {
ol.render.canvas.ImageReplay.prototype.drawPoint = function(pointGeometry, feature) {
if (!this.image_) {
return;
}
@@ -831,7 +831,7 @@ ol.render.canvas.ImageReplay.prototype.drawPointGeometry = function(pointGeometr
/**
* @inheritDoc
*/
ol.render.canvas.ImageReplay.prototype.drawMultiPointGeometry = function(multiPointGeometry, feature) {
ol.render.canvas.ImageReplay.prototype.drawMultiPoint = function(multiPointGeometry, feature) {
if (!this.image_) {
return;
}
@@ -1064,7 +1064,7 @@ ol.render.canvas.LineStringReplay.prototype.setStrokeStyle_ = function() {
/**
* @inheritDoc
*/
ol.render.canvas.LineStringReplay.prototype.drawLineStringGeometry = function(lineStringGeometry, feature) {
ol.render.canvas.LineStringReplay.prototype.drawLineString = function(lineStringGeometry, feature) {
var state = this.state_;
goog.asserts.assert(state, 'state should not be null');
var strokeStyle = state.strokeStyle;
@@ -1091,7 +1091,7 @@ ol.render.canvas.LineStringReplay.prototype.drawLineStringGeometry = function(li
/**
* @inheritDoc
*/
ol.render.canvas.LineStringReplay.prototype.drawMultiLineStringGeometry = function(multiLineStringGeometry, feature) {
ol.render.canvas.LineStringReplay.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) {
var state = this.state_;
goog.asserts.assert(state, 'state should not be null');
var strokeStyle = state.strokeStyle;
@@ -1267,7 +1267,7 @@ ol.render.canvas.PolygonReplay.prototype.drawFlatCoordinatess_ = function(flatCo
/**
* @inheritDoc
*/
ol.render.canvas.PolygonReplay.prototype.drawCircleGeometry = function(circleGeometry, feature) {
ol.render.canvas.PolygonReplay.prototype.drawCircle = function(circleGeometry, feature) {
var state = this.state_;
goog.asserts.assert(state, 'state should not be null');
var fillStyle = state.fillStyle;
@@ -1319,7 +1319,7 @@ ol.render.canvas.PolygonReplay.prototype.drawCircleGeometry = function(circleGeo
/**
* @inheritDoc
*/
ol.render.canvas.PolygonReplay.prototype.drawPolygonGeometry = function(polygonGeometry, feature) {
ol.render.canvas.PolygonReplay.prototype.drawPolygon = function(polygonGeometry, feature) {
var state = this.state_;
goog.asserts.assert(state, 'state should not be null');
var fillStyle = state.fillStyle;
@@ -1354,7 +1354,7 @@ ol.render.canvas.PolygonReplay.prototype.drawPolygonGeometry = function(polygonG
/**
* @inheritDoc
*/
ol.render.canvas.PolygonReplay.prototype.drawMultiPolygonGeometry = function(multiPolygonGeometry, feature) {
ol.render.canvas.PolygonReplay.prototype.drawMultiPolygon = function(multiPolygonGeometry, feature) {
var state = this.state_;
goog.asserts.assert(state, 'state should not be null');
var fillStyle = state.fillStyle;

14
src/ol/render/vector.js
View File

@@ -52,7 +52,7 @@ ol.renderer.vector.renderCircleGeometry_ = function(replayGroup, geometry, style
var polygonReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.POLYGON);
polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
polygonReplay.drawCircleGeometry(geometry, feature);
polygonReplay.drawCircle(geometry, feature);
}
var textStyle = style.getText();
if (textStyle) {
@@ -156,7 +156,7 @@ ol.renderer.vector.renderLineStringGeometry_ = function(replayGroup, geometry, s
var lineStringReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.LINE_STRING);
lineStringReplay.setFillStrokeStyle(null, strokeStyle);
lineStringReplay.drawLineStringGeometry(geometry, feature);
lineStringReplay.drawLineString(geometry, feature);
}
var textStyle = style.getText();
if (textStyle) {
@@ -181,7 +181,7 @@ ol.renderer.vector.renderMultiLineStringGeometry_ = function(replayGroup, geomet
var lineStringReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.LINE_STRING);
lineStringReplay.setFillStrokeStyle(null, strokeStyle);
lineStringReplay.drawMultiLineStringGeometry(geometry, feature);
lineStringReplay.drawMultiLineString(geometry, feature);
}
var textStyle = style.getText();
if (textStyle) {
@@ -209,7 +209,7 @@ ol.renderer.vector.renderMultiPolygonGeometry_ = function(replayGroup, geometry,
var polygonReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.POLYGON);
polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
polygonReplay.drawMultiPolygonGeometry(geometry, feature);
polygonReplay.drawMultiPolygon(geometry, feature);
}
var textStyle = style.getText();
if (textStyle) {
@@ -239,7 +239,7 @@ ol.renderer.vector.renderPointGeometry_ = function(replayGroup, geometry, style,
var imageReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE);
imageReplay.setImageStyle(imageStyle);
imageReplay.drawPointGeometry(geometry, feature);
imageReplay.drawPoint(geometry, feature);
}
var textStyle = style.getText();
if (textStyle) {
@@ -268,7 +268,7 @@ ol.renderer.vector.renderMultiPointGeometry_ = function(replayGroup, geometry, s
var imageReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE);
imageReplay.setImageStyle(imageStyle);
imageReplay.drawMultiPointGeometry(geometry, feature);
imageReplay.drawMultiPoint(geometry, feature);
}
var textStyle = style.getText();
if (textStyle) {
@@ -296,7 +296,7 @@ ol.renderer.vector.renderPolygonGeometry_ = function(replayGroup, geometry, styl
var polygonReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.POLYGON);
polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
polygonReplay.drawPolygonGeometry(geometry, feature);
polygonReplay.drawPolygon(geometry, feature);
}
var textStyle = style.getText();
if (textStyle) {

20
src/ol/render/vectorcontext.js
View File

@@ -39,7 +39,7 @@ ol.render.VectorContext.prototype.setStyle = goog.abstractMethod;
* @param {ol.geom.Circle} circleGeometry Circle geometry.
* @param {ol.Feature} feature Feature,
*/
ol.render.VectorContext.prototype.drawCircleGeometry = goog.abstractMethod;
ol.render.VectorContext.prototype.drawCircle = goog.abstractMethod;
/**
@@ -54,8 +54,7 @@ ol.render.VectorContext.prototype.drawFeature = goog.abstractMethod;
* collection.
* @param {ol.Feature} feature Feature.
*/
ol.render.VectorContext.prototype.drawGeometryCollectionGeometry =
goog.abstractMethod;
ol.render.VectorContext.prototype.drawGeometryCollection = goog.abstractMethod;
/**
@@ -63,8 +62,7 @@ ol.render.VectorContext.prototype.drawGeometryCollectionGeometry =
* string geometry.
* @param {ol.Feature|ol.render.Feature} feature Feature.
*/
ol.render.VectorContext.prototype.drawLineStringGeometry =
goog.abstractMethod;
ol.render.VectorContext.prototype.drawLineString = goog.abstractMethod;
/**
@@ -72,8 +70,7 @@ ol.render.VectorContext.prototype.drawLineStringGeometry =
* MultiLineString geometry.
* @param {ol.Feature|ol.render.Feature} feature Feature.
*/
ol.render.VectorContext.prototype.drawMultiLineStringGeometry =
goog.abstractMethod;
ol.render.VectorContext.prototype.drawMultiLineString = goog.abstractMethod;
/**
@@ -81,22 +78,21 @@ ol.render.VectorContext.prototype.drawMultiLineStringGeometry =
* geometry.
* @param {ol.Feature|ol.render.Feature} feature Feature.
*/
ol.render.VectorContext.prototype.drawMultiPointGeometry = goog.abstractMethod;
ol.render.VectorContext.prototype.drawMultiPoint = goog.abstractMethod;
/**
* @param {ol.geom.MultiPolygon} multiPolygonGeometry MultiPolygon geometry.
* @param {ol.Feature} feature Feature.
*/
ol.render.VectorContext.prototype.drawMultiPolygonGeometry =
goog.abstractMethod;
ol.render.VectorContext.prototype.drawMultiPolygon = goog.abstractMethod;
/**
* @param {ol.geom.Point|ol.render.Feature} pointGeometry Point geometry.
* @param {ol.Feature|ol.render.Feature} feature Feature.
*/
ol.render.VectorContext.prototype.drawPointGeometry = goog.abstractMethod;
ol.render.VectorContext.prototype.drawPoint = goog.abstractMethod;
/**
@@ -104,7 +100,7 @@ ol.render.VectorContext.prototype.drawPointGeometry = goog.abstractMethod;
* geometry.
* @param {ol.Feature|ol.render.Feature} feature Feature.
*/
ol.render.VectorContext.prototype.drawPolygonGeometry = goog.abstractMethod;
ol.render.VectorContext.prototype.drawPolygon = goog.abstractMethod;
/**

26
src/ol/render/webgl/webglimmediate.js
View File

@@ -113,7 +113,7 @@ ol.render.webgl.Immediate.prototype.drawAsync = function(zIndex, callback) {
* @inheritDoc
* @api
*/
ol.render.webgl.Immediate.prototype.drawCircleGeometry = function(circleGeometry, data) {
ol.render.webgl.Immediate.prototype.drawCircle = function(circleGeometry, data) {
};
@@ -150,7 +150,7 @@ ol.render.webgl.Immediate.prototype.drawFeature = function(feature, style) {
* @inheritDoc
* @api
*/
ol.render.webgl.Immediate.prototype.drawGeometryCollectionGeometry = function(geometryCollectionGeometry, data) {
ol.render.webgl.Immediate.prototype.drawGeometryCollection = function(geometryCollectionGeometry, data) {
var geometries = geometryCollectionGeometry.getGeometriesArray();
var renderers = ol.render.webgl.Immediate.GEOMETRY_RENDERERS_;
var i, ii;
@@ -170,13 +170,13 @@ ol.render.webgl.Immediate.prototype.drawGeometryCollectionGeometry = function(ge
/**
* @inheritDoc
*/
ol.render.webgl.Immediate.prototype.drawPointGeometry = function(pointGeometry, data) {
ol.render.webgl.Immediate.prototype.drawPoint = function(pointGeometry, data) {
var context = this.context_;
var replayGroup = new ol.render.webgl.ReplayGroup(1, this.extent_);
var replay = /** @type {ol.render.webgl.ImageReplay} */ (
replayGroup.getReplay(0, ol.render.ReplayType.IMAGE));
replay.setImageStyle(this.imageStyle_);
replay.drawPointGeometry(pointGeometry, data);
replay.drawPoint(pointGeometry, data);
replay.finish(context);
// default colors
var opacity = 1;
@@ -193,27 +193,27 @@ ol.render.webgl.Immediate.prototype.drawPointGeometry = function(pointGeometry,
/**
* @inheritDoc
*/
ol.render.webgl.Immediate.prototype.drawLineStringGeometry = function(lineStringGeometry, data) {
ol.render.webgl.Immediate.prototype.drawLineString = function(lineStringGeometry, data) {
};
/**
* @inheritDoc
*/
ol.render.webgl.Immediate.prototype.drawMultiLineStringGeometry = function(multiLineStringGeometry, data) {
ol.render.webgl.Immediate.prototype.drawMultiLineString = function(multiLineStringGeometry, data) {
};
/**
* @inheritDoc
*/
ol.render.webgl.Immediate.prototype.drawMultiPointGeometry = function(multiPointGeometry, data) {
ol.render.webgl.Immediate.prototype.drawMultiPoint = function(multiPointGeometry, data) {
var context = this.context_;
var replayGroup = new ol.render.webgl.ReplayGroup(1, this.extent_);
var replay = /** @type {ol.render.webgl.ImageReplay} */ (
replayGroup.getReplay(0, ol.render.ReplayType.IMAGE));
replay.setImageStyle(this.imageStyle_);
replay.drawMultiPointGeometry(multiPointGeometry, data);
replay.drawMultiPoint(multiPointGeometry, data);
replay.finish(context);
var opacity = 1;
var skippedFeatures = {};
@@ -229,14 +229,14 @@ ol.render.webgl.Immediate.prototype.drawMultiPointGeometry = function(multiPoint
/**
* @inheritDoc
*/
ol.render.webgl.Immediate.prototype.drawMultiPolygonGeometry = function(multiPolygonGeometry, data) {
ol.render.webgl.Immediate.prototype.drawMultiPolygon = function(multiPolygonGeometry, data) {
};
/**
* @inheritDoc
*/
ol.render.webgl.Immediate.prototype.drawPolygonGeometry = function(polygonGeometry, data) {
ol.render.webgl.Immediate.prototype.drawPolygon = function(polygonGeometry, data) {
};
@@ -277,8 +277,8 @@ ol.render.webgl.Immediate.prototype.setTextStyle = function(textStyle) {
* (ol.geom.Geometry|ol.render.Feature), Object)>}
*/
ol.render.webgl.Immediate.GEOMETRY_RENDERERS_ = {
'Point': ol.render.webgl.Immediate.prototype.drawPointGeometry,
'MultiPoint': ol.render.webgl.Immediate.prototype.drawMultiPointGeometry,
'Point': ol.render.webgl.Immediate.prototype.drawPoint,
'MultiPoint': ol.render.webgl.Immediate.prototype.drawMultiPoint,
'GeometryCollection':
ol.render.webgl.Immediate.prototype.drawGeometryCollectionGeometry
ol.render.webgl.Immediate.prototype.drawGeometryCollection
};

4
src/ol/render/webgl/webglreplay.js
View File

@@ -370,7 +370,7 @@ ol.render.webgl.ImageReplay.prototype.drawCoordinates_ = function(flatCoordinate
/**
* @inheritDoc
*/
ol.render.webgl.ImageReplay.prototype.drawMultiPointGeometry = function(multiPointGeometry, feature) {
ol.render.webgl.ImageReplay.prototype.drawMultiPoint = function(multiPointGeometry, feature) {
this.startIndices_.push(this.indices_.length);
this.startIndicesFeature_.push(feature);
var flatCoordinates = multiPointGeometry.getFlatCoordinates();
@@ -383,7 +383,7 @@ ol.render.webgl.ImageReplay.prototype.drawMultiPointGeometry = function(multiPoi
/**
* @inheritDoc
*/
ol.render.webgl.ImageReplay.prototype.drawPointGeometry = function(pointGeometry, feature) {
ol.render.webgl.ImageReplay.prototype.drawPoint = function(pointGeometry, feature) {
this.startIndices_.push(this.indices_.length);
this.startIndicesFeature_.push(feature);
var flatCoordinates = pointGeometry.getFlatCoordinates();

82
test/spec/ol/render/canvasimmediate.test.js
View File

@@ -67,72 +67,72 @@ describe('ol.render.canvas.Immediate', function() {
var extent = [-10, -10, 10, 10];
it('calls drawPointGeometry() with a Point', function() {
it('calls drawPoint() with a Point', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
sinon.spy(context, 'drawPointGeometry');
sinon.spy(context, 'drawPoint');
var geometry = new ol.geom.Point([1, 2]);
context.drawGeometry(geometry);
expect(context.drawPointGeometry.calledOnce).to.be(true);
expect(context.drawPointGeometry.firstCall.calledWithExactly(geometry)).to.be(true);
expect(context.drawPoint.calledOnce).to.be(true);
expect(context.drawPoint.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawLineStringGeometry() with a LineString', function() {
it('calls drawLineString() with a LineString', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
sinon.spy(context, 'drawLineStringGeometry');
sinon.spy(context, 'drawLineString');
var geometry = new ol.geom.LineString([[1, 2], [3, 4]]);
context.drawGeometry(geometry);
expect(context.drawLineStringGeometry.calledOnce).to.be(true);
expect(context.drawLineStringGeometry.firstCall.calledWithExactly(geometry)).to.be(true);
expect(context.drawLineString.calledOnce).to.be(true);
expect(context.drawLineString.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawPolygonGeometry() with a Polygon', function() {
it('calls drawPolygon() with a Polygon', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
sinon.spy(context, 'drawPolygonGeometry');
sinon.spy(context, 'drawPolygon');
var geometry = new ol.geom.Polygon([[[1, 2], [3, 4], [5, 6], [1, 2]]]);
context.drawGeometry(geometry);
expect(context.drawPolygonGeometry.calledOnce).to.be(true);
expect(context.drawPolygonGeometry.firstCall.calledWithExactly(geometry)).to.be(true);
expect(context.drawPolygon.calledOnce).to.be(true);
expect(context.drawPolygon.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawMultiPointGeometry() with a MultiPoint', function() {
it('calls drawMultiPoint() with a MultiPoint', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiPointGeometry');
sinon.spy(context, 'drawMultiPoint');
var geometry = new ol.geom.MultiPoint([[1, 2], [3, 4]]);
context.drawGeometry(geometry);
expect(context.drawMultiPointGeometry.calledOnce).to.be(true);
expect(context.drawMultiPointGeometry.firstCall.calledWithExactly(geometry)).to.be(true);
expect(context.drawMultiPoint.calledOnce).to.be(true);
expect(context.drawMultiPoint.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawMultiLineStringGeometry() with a MultiLineString', function() {
it('calls drawMultiLineString() with a MultiLineString', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiLineStringGeometry');
sinon.spy(context, 'drawMultiLineString');
var geometry = new ol.geom.MultiLineString([[[1, 2], [3, 4]]]);
context.drawGeometry(geometry);
expect(context.drawMultiLineStringGeometry.calledOnce).to.be(true);
expect(context.drawMultiLineStringGeometry.firstCall.calledWithExactly(geometry)).to.be(true);
expect(context.drawMultiLineString.calledOnce).to.be(true);
expect(context.drawMultiLineString.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawMultiPolygonGeometry() with a MultiPolygon', function() {
it('calls drawMultiPolygon() with a MultiPolygon', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiPolygonGeometry');
sinon.spy(context, 'drawMultiPolygon');
var geometry = new ol.geom.MultiPolygon([[[[1, 2], [3, 4], [5, 6], [1, 2]]]]);
context.drawGeometry(geometry);
expect(context.drawMultiPolygonGeometry.calledOnce).to.be(true);
expect(context.drawMultiPolygonGeometry.firstCall.calledWithExactly(geometry)).to.be(true);
expect(context.drawMultiPolygon.calledOnce).to.be(true);
expect(context.drawMultiPolygon.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawGeometryCollectionGeometry() with a GeometryCollection', function() {
it('calls drawGeometryCollection() with a GeometryCollection', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
sinon.spy(context, 'drawGeometryCollectionGeometry');
sinon.spy(context, 'drawPointGeometry');
sinon.spy(context, 'drawLineStringGeometry');
sinon.spy(context, 'drawPolygonGeometry');
sinon.spy(context, 'drawGeometryCollection');
sinon.spy(context, 'drawPoint');
sinon.spy(context, 'drawLineString');
sinon.spy(context, 'drawPolygon');
var point = new ol.geom.Point([1, 2]);
var linestring = new ol.geom.LineString([[1, 2], [3, 4]]);
@@ -141,29 +141,29 @@ describe('ol.render.canvas.Immediate', function() {
var geometry = new ol.geom.GeometryCollection([point, linestring, polygon]);
context.drawGeometry(geometry);
expect(context.drawGeometryCollectionGeometry.calledOnce).to.be(true);
expect(context.drawPointGeometry.calledOnce).to.be(true);
expect(context.drawPointGeometry.firstCall.calledWithExactly(point)).to.be(true);
expect(context.drawLineStringGeometry.calledOnce).to.be(true);
expect(context.drawLineStringGeometry.firstCall.calledWithExactly(linestring)).to.be(true);
expect(context.drawPolygonGeometry.calledOnce).to.be(true);
expect(context.drawPolygonGeometry.firstCall.calledWithExactly(polygon)).to.be(true);
expect(context.drawGeometryCollection.calledOnce).to.be(true);
expect(context.drawPoint.calledOnce).to.be(true);
expect(context.drawPoint.firstCall.calledWithExactly(point)).to.be(true);
expect(context.drawLineString.calledOnce).to.be(true);
expect(context.drawLineString.firstCall.calledWithExactly(linestring)).to.be(true);
expect(context.drawPolygon.calledOnce).to.be(true);
expect(context.drawPolygon.firstCall.calledWithExactly(polygon)).to.be(true);
});
it('calls drawCircle() with a Circle', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
sinon.spy(context, 'drawCircleGeometry');
sinon.spy(context, 'drawCircle');
var geometry = new ol.geom.Circle([0, 0]);
context.drawGeometry(geometry);
expect(context.drawCircleGeometry.calledOnce).to.be(true);
expect(context.drawCircleGeometry.firstCall.calledWithExactly(geometry)).to.be(true);
expect(context.drawCircle.calledOnce).to.be(true);
expect(context.drawCircle.firstCall.calledWithExactly(geometry)).to.be(true);
});
});
describe('#drawMultiPolygonGeometry', function() {
describe('#drawMultiPolygon', function() {
it('creates the correct canvas instructions for 3D geometries', function() {
var log = {
lineTo: [],
@@ -214,7 +214,7 @@ describe('ol.render.canvas.Immediate', function() {
[-82.128838, 26.693342, 0],
[-82.102127, 26.585724, 0]]]
]).transform('EPSG:4326', 'EPSG:3857');
canvas.drawMultiPolygonGeometry(multiPolygonGeometry, null);
canvas.drawMultiPolygon(multiPolygonGeometry, null);
expect(log.lineTo.length).to.be(15);
expect(log.lineTo[0][0]).to.roughlyEqual(805.3521540835154, 1e-9);
expect(log.lineTo[0][1]).to.roughlyEqual(158.76358389011807, 1e-9);

44
test/spec/ol/render/vector.test.js
View File

@@ -62,13 +62,13 @@ describe('ol.renderer.vector', function() {
var imageReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE);
var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
var drawPointGeometrySpy = sinon.stub(imageReplay,
'drawPointGeometry', ol.nullFunction);
var drawPointSpy = sinon.stub(imageReplay,
'drawPoint', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setImageStyleSpy.called).to.be(false);
setImageStyleSpy.restore();
drawPointGeometrySpy.restore();
drawPointSpy.restore();
});
it('does not render the multipoint', function() {
@@ -76,13 +76,13 @@ describe('ol.renderer.vector', function() {
var imageReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE);
var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
var drawMultiPointGeometrySpy = sinon.stub(imageReplay,
'drawMultiPointGeometry', ol.nullFunction);
var drawMultiPointSpy = sinon.stub(imageReplay,
'drawMultiPoint', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setImageStyleSpy.called).to.be(false);
setImageStyleSpy.restore();
drawMultiPointGeometrySpy.restore();
drawMultiPointSpy.restore();
});
it('does render the linestring', function() {
@@ -91,14 +91,14 @@ describe('ol.renderer.vector', function() {
style.getZIndex(), ol.render.ReplayType.LINE_STRING);
var setFillStrokeStyleSpy = sinon.spy(lineStringReplay,
'setFillStrokeStyle');
var drawLineStringGeometrySpy = sinon.stub(lineStringReplay,
'drawLineStringGeometry', ol.nullFunction);
var drawLineStringSpy = sinon.stub(lineStringReplay,
'drawLineString', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawLineStringGeometrySpy.called).to.be(true);
expect(drawLineStringSpy.called).to.be(true);
setFillStrokeStyleSpy.restore();
drawLineStringGeometrySpy.restore();
drawLineStringSpy.restore();
});
it('does render the multilinestring', function() {
@@ -107,14 +107,14 @@ describe('ol.renderer.vector', function() {
style.getZIndex(), ol.render.ReplayType.LINE_STRING);
var setFillStrokeStyleSpy = sinon.spy(lineStringReplay,
'setFillStrokeStyle');
var drawMultiLineStringGeometrySpy = sinon.stub(lineStringReplay,
'drawMultiLineStringGeometry', ol.nullFunction);
var drawMultiLineStringSpy = sinon.stub(lineStringReplay,
'drawMultiLineString', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawMultiLineStringGeometrySpy.called).to.be(true);
expect(drawMultiLineStringSpy.called).to.be(true);
setFillStrokeStyleSpy.restore();
drawMultiLineStringGeometrySpy.restore();
drawMultiLineStringSpy.restore();
});
it('does render the polygon', function() {
@@ -124,14 +124,14 @@ describe('ol.renderer.vector', function() {
style.getZIndex(), ol.render.ReplayType.POLYGON);
var setFillStrokeStyleSpy = sinon.spy(polygonReplay,
'setFillStrokeStyle');
var drawPolygonGeometrySpy = sinon.stub(polygonReplay,
'drawPolygonGeometry', ol.nullFunction);
var drawPolygonSpy = sinon.stub(polygonReplay,
'drawPolygon', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawPolygonGeometrySpy.called).to.be(true);
expect(drawPolygonSpy.called).to.be(true);
setFillStrokeStyleSpy.restore();
drawPolygonGeometrySpy.restore();
drawPolygonSpy.restore();
});
it('does render the multipolygon', function() {
@@ -141,14 +141,14 @@ describe('ol.renderer.vector', function() {
style.getZIndex(), ol.render.ReplayType.POLYGON);
var setFillStrokeStyleSpy = sinon.spy(polygonReplay,
'setFillStrokeStyle');
var drawMultiPolygonGeometrySpy = sinon.stub(polygonReplay,
'drawMultiPolygonGeometry', ol.nullFunction);
var drawMultiPolygonSpy = sinon.stub(polygonReplay,
'drawMultiPolygon', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawMultiPolygonGeometrySpy.called).to.be(true);
expect(drawMultiPolygonSpy.called).to.be(true);
setFillStrokeStyleSpy.restore();
drawMultiPolygonGeometrySpy.restore();
drawMultiPolygonSpy.restore();
});
});

12
test/spec/ol/render/webglreplay.test.js
View File

@@ -82,7 +82,7 @@ describe('ol.render.webgl.ImageReplay', function() {
});
});
describe('#drawPointGeometry', function() {
describe('#drawPoint', function() {
beforeEach(function() {
var imageStyle = createImageStyle(new Image());
replay.setImageStyle(imageStyle);
@@ -92,7 +92,7 @@ describe('ol.render.webgl.ImageReplay', function() {
var point;
point = new ol.geom.Point([1000, 2000]);
replay.drawPointGeometry(point, null);
replay.drawPoint(point, null);
expect(replay.vertices_).to.have.length(32);
expect(replay.indices_).to.have.length(6);
expect(replay.indices_[0]).to.be(0);
@@ -103,7 +103,7 @@ describe('ol.render.webgl.ImageReplay', function() {
expect(replay.indices_[5]).to.be(3);
point = new ol.geom.Point([2000, 3000]);
replay.drawPointGeometry(point, null);
replay.drawPoint(point, null);
expect(replay.vertices_).to.have.length(64);
expect(replay.indices_).to.have.length(12);
expect(replay.indices_[6]).to.be(4);
@@ -115,7 +115,7 @@ describe('ol.render.webgl.ImageReplay', function() {
});
});
describe('#drawMultiPointGeometry', function() {
describe('#drawMultiPoint', function() {
beforeEach(function() {
var imageStyle = createImageStyle(new Image());
replay.setImageStyle(imageStyle);
@@ -126,7 +126,7 @@ describe('ol.render.webgl.ImageReplay', function() {
multiPoint = new ol.geom.MultiPoint(
[[1000, 2000], [2000, 3000]]);
replay.drawMultiPointGeometry(multiPoint, null);
replay.drawMultiPoint(multiPoint, null);
expect(replay.vertices_).to.have.length(64);
expect(replay.indices_).to.have.length(12);
expect(replay.indices_[0]).to.be(0);
@@ -144,7 +144,7 @@ describe('ol.render.webgl.ImageReplay', function() {
multiPoint = new ol.geom.MultiPoint(
[[3000, 4000], [4000, 5000]]);
replay.drawMultiPointGeometry(multiPoint, null);
replay.drawMultiPoint(multiPoint, null);
expect(replay.vertices_).to.have.length(128);
expect(replay.indices_).to.have.length(24);
expect(replay.indices_[12]).to.be(8);

2
test_rendering/spec/ol/layer/tile.test.js
View File

@@ -203,7 +203,7 @@ describe('ol.rendering.layer.Tile', function() {
fill: new ol.style.Fill({color: 'yellow'}),
stroke: new ol.style.Stroke({color: 'red', width: 1})
}));
e.vectorContext.drawPointGeometry(new ol.geom.Point(
e.vectorContext.drawPoint(new ol.geom.Point(
ol.proj.transform([-123, 38], 'EPSG:4326', 'EPSG:3857')));
});
}