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

Transformed

Browse Source
This commit is contained in:
Tim Schaub
2017-12-11 16:29:33 -07:00
parent 1cdb6a66f0
commit 7f47883c48
737 changed files with 22216 additions and 21609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/render/canvas/immediate.test.js
+45 -47
View File
@@ -1,20 +1,18 @@
goog.require('ol.geom.Circle');
goog.require('ol.geom.GeometryCollection');
goog.require('ol.geom.LineString');
goog.require('ol.geom.MultiLineString');
goog.require('ol.geom.MultiPoint');
goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.render.VectorContext');
goog.require('ol.render.canvas.Immediate');
goog.require('ol.style.Circle');
goog.require('ol.style.Fill');
goog.require('ol.style.Stroke');
goog.require('ol.style.Style');
goog.require('ol.style.Text');
import _ol_geom_Circle_ from '../../../../../src/ol/geom/Circle.js';
import _ol_geom_GeometryCollection_ from '../../../../../src/ol/geom/GeometryCollection.js';
import _ol_geom_LineString_ from '../../../../../src/ol/geom/LineString.js';
import _ol_geom_MultiLineString_ from '../../../../../src/ol/geom/MultiLineString.js';
import _ol_geom_MultiPoint_ from '../../../../../src/ol/geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../../../../../src/ol/geom/MultiPolygon.js';
import _ol_geom_Point_ from '../../../../../src/ol/geom/Point.js';
import _ol_geom_Polygon_ from '../../../../../src/ol/geom/Polygon.js';
import _ol_render_VectorContext_ from '../../../../../src/ol/render/VectorContext.js';
import _ol_render_canvas_Immediate_ from '../../../../../src/ol/render/canvas/Immediate.js';
import _ol_style_Circle_ from '../../../../../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
describe('ol.render.canvas.Immediate', function() {
@@ -32,23 +30,23 @@ describe('ol.render.canvas.Immediate', function() {
describe('constructor', function() {
it('creates an instance', function() {
var instance = new ol.render.canvas.Immediate();
expect(instance).to.be.a(ol.render.canvas.Immediate);
expect(instance).to.be.a(ol.render.VectorContext);
var instance = new _ol_render_canvas_Immediate_();
expect(instance).to.be.a(_ol_render_canvas_Immediate_);
expect(instance).to.be.a(_ol_render_VectorContext_);
});
});
describe('#setStyle()', function() {
it('calls the more specific methods with style parts', function() {
var context = new ol.render.canvas.Immediate();
var context = new _ol_render_canvas_Immediate_();
sinon.spy(context, 'setFillStrokeStyle');
sinon.spy(context, 'setImageStyle');
sinon.spy(context, 'setTextStyle');
var fill = new ol.style.Fill({});
var stroke = new ol.style.Stroke({});
var text = new ol.style.Text({});
var image = new ol.style.Circle({});
var style = new ol.style.Style({
var fill = new _ol_style_Fill_({});
var stroke = new _ol_style_Stroke_({});
var text = new _ol_style_Text_({});
var image = new _ol_style_Circle_({});
var style = new _ol_style_Style_({
fill: fill,
stroke: stroke,
image: image,
@@ -70,77 +68,77 @@ describe('ol.render.canvas.Immediate', function() {
var extent = [-10, -10, 10, 10];
it('calls drawPoint() with a Point', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
sinon.spy(context, 'drawPoint');
var geometry = new ol.geom.Point([1, 2]);
var geometry = new _ol_geom_Point_([1, 2]);
context.drawGeometry(geometry);
expect(context.drawPoint.calledOnce).to.be(true);
expect(context.drawPoint.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawLineString() with a LineString', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
sinon.spy(context, 'drawLineString');
var geometry = new ol.geom.LineString([[1, 2], [3, 4]]);
var geometry = new _ol_geom_LineString_([[1, 2], [3, 4]]);
context.drawGeometry(geometry);
expect(context.drawLineString.calledOnce).to.be(true);
expect(context.drawLineString.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawPolygon() with a Polygon', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
sinon.spy(context, 'drawPolygon');
var geometry = new ol.geom.Polygon([[[1, 2], [3, 4], [5, 6], [1, 2]]]);
var geometry = new _ol_geom_Polygon_([[[1, 2], [3, 4], [5, 6], [1, 2]]]);
context.drawGeometry(geometry);
expect(context.drawPolygon.calledOnce).to.be(true);
expect(context.drawPolygon.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawMultiPoint() with a MultiPoint', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiPoint');
var geometry = new ol.geom.MultiPoint([[1, 2], [3, 4]]);
var geometry = new _ol_geom_MultiPoint_([[1, 2], [3, 4]]);
context.drawGeometry(geometry);
expect(context.drawMultiPoint.calledOnce).to.be(true);
expect(context.drawMultiPoint.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawMultiLineString() with a MultiLineString', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiLineString');
var geometry = new ol.geom.MultiLineString([[[1, 2], [3, 4]]]);
var geometry = new _ol_geom_MultiLineString_([[[1, 2], [3, 4]]]);
context.drawGeometry(geometry);
expect(context.drawMultiLineString.calledOnce).to.be(true);
expect(context.drawMultiLineString.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawMultiPolygon() with a MultiPolygon', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiPolygon');
var geometry = new ol.geom.MultiPolygon([[[[1, 2], [3, 4], [5, 6], [1, 2]]]]);
var geometry = new _ol_geom_MultiPolygon_([[[[1, 2], [3, 4], [5, 6], [1, 2]]]]);
context.drawGeometry(geometry);
expect(context.drawMultiPolygon.calledOnce).to.be(true);
expect(context.drawMultiPolygon.firstCall.calledWithExactly(geometry)).to.be(true);
});
it('calls drawGeometryCollection() with a GeometryCollection', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
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]]);
var polygon = new ol.geom.Polygon([[[1, 2], [3, 4], [5, 6], [1, 2]]]);
var point = new _ol_geom_Point_([1, 2]);
var linestring = new _ol_geom_LineString_([[1, 2], [3, 4]]);
var polygon = new _ol_geom_Polygon_([[[1, 2], [3, 4], [5, 6], [1, 2]]]);
var geometry = new ol.geom.GeometryCollection([point, linestring, polygon]);
var geometry = new _ol_geom_GeometryCollection_([point, linestring, polygon]);
context.drawGeometry(geometry);
expect(context.drawGeometryCollection.calledOnce).to.be(true);
@@ -153,10 +151,10 @@ describe('ol.render.canvas.Immediate', function() {
});
it('calls drawCircle() with a Circle', function() {
var context = new ol.render.canvas.Immediate(getMockContext(), 1, extent);
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
sinon.spy(context, 'drawCircle');
var geometry = new ol.geom.Circle([0, 0]);
var geometry = new _ol_geom_Circle_([0, 0]);
context.drawGeometry(geometry);
expect(context.drawCircle.calledOnce).to.be(true);
@@ -225,7 +223,7 @@ describe('ol.render.canvas.Immediate', function() {
-7572748.158493212, 3741317.9895594316
];
var canvas = new ol.render.canvas.Immediate(context, 1, extent, transform);
var canvas = new _ol_render_canvas_Immediate_(context, 1, extent, transform);
canvas.strokeState_ = {
lineCap: 'round',
@@ -236,7 +234,7 @@ describe('ol.render.canvas.Immediate', function() {
strokeStyle: '#00FFFF'
};
var multiPolygonGeometry = new ol.geom.MultiPolygon([[[
var multiPolygonGeometry = new _ol_geom_MultiPolygon_([[[
// first polygon
[-80.736061, 28.788576000000006, 0], // moveTo()
[-80.763557, 28.821799999999996, 0], // lineTo()
test/spec/ol/render/canvas/index.test.js
+26 -26
View File
@@ -1,6 +1,6 @@
goog.require('ol.events');
goog.require('ol.obj');
goog.require('ol.render.canvas');
import _ol_events_ from '../../../../../src/ol/events.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
describe('ol.render.canvas', function() {
@@ -13,25 +13,25 @@ describe('ol.render.canvas', function() {
describe('ol.render.canvas.checkFont()', function() {
beforeEach(function() {
ol.obj.clear(ol.render.canvas.checkedFonts_);
ol.render.canvas.getMeasureContext();
ol.render.canvas.measureTextHeight('12px sans-serif');
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
_ol_render_canvas_.getMeasureContext();
_ol_render_canvas_.measureTextHeight('12px sans-serif');
});
var checkFont = ol.render.canvas.checkFont;
var checkFont = _ol_render_canvas_.checkFont;
var retries = 60;
it('does not clear label cache and measurements for unavailable fonts', function(done) {
this.timeout(3000);
var spy = sinon.spy();
ol.events.listen(ol.render.canvas.labelCache, 'clear', spy);
_ol_events_.listen(_ol_render_canvas_.labelCache, 'clear', spy);
var interval = setInterval(function() {
if (ol.render.canvas.checkedFonts_['foo'] == retries && ol.render.canvas.checkedFonts_['sans-serif'] == retries) {
if (_ol_render_canvas_.checkedFonts_['foo'] == retries && _ol_render_canvas_.checkedFonts_['sans-serif'] == retries) {
clearInterval(interval);
ol.events.unlisten(ol.render.canvas.labelCache, 'clear', spy);
_ol_events_.unlisten(_ol_render_canvas_.labelCache, 'clear', spy);
expect(spy.callCount).to.be(0);
expect(ol.render.canvas.measureContext_).to.not.be(null);
expect(ol.render.canvas.textHeights_).to.not.eql({});
expect(_ol_render_canvas_.measureContext_).to.not.be(null);
expect(_ol_render_canvas_.textHeights_).to.not.eql({});
done();
}
}, 32);
@@ -40,14 +40,14 @@ describe('ol.render.canvas', function() {
it('does not clear label cache and measurements for available fonts', function(done) {
var spy = sinon.spy();
ol.events.listen(ol.render.canvas.labelCache, 'clear', spy);
_ol_events_.listen(_ol_render_canvas_.labelCache, 'clear', spy);
var interval = setInterval(function() {
if (ol.render.canvas.checkedFonts_['sans-serif'] == retries) {
if (_ol_render_canvas_.checkedFonts_['sans-serif'] == retries) {
clearInterval(interval);
ol.events.unlisten(ol.render.canvas.labelCache, 'clear', spy);
_ol_events_.unlisten(_ol_render_canvas_.labelCache, 'clear', spy);
expect(spy.callCount).to.be(0);
expect(ol.render.canvas.measureContext_).to.not.be(null);
expect(ol.render.canvas.textHeights_).to.not.eql({});
expect(_ol_render_canvas_.measureContext_).to.not.be(null);
expect(_ol_render_canvas_.textHeights_).to.not.eql({});
done();
}
}, 32);
@@ -56,14 +56,14 @@ describe('ol.render.canvas', function() {
it('does not clear label cache and measurements for the \'monospace\' font', function(done) {
var spy = sinon.spy();
ol.events.listen(ol.render.canvas.labelCache, 'clear', spy);
_ol_events_.listen(_ol_render_canvas_.labelCache, 'clear', spy);
var interval = setInterval(function() {
if (ol.render.canvas.checkedFonts_['monospace'] == retries) {
if (_ol_render_canvas_.checkedFonts_['monospace'] == retries) {
clearInterval(interval);
ol.events.unlisten(ol.render.canvas.labelCache, 'clear', spy);
_ol_events_.unlisten(_ol_render_canvas_.labelCache, 'clear', spy);
expect(spy.callCount).to.be(0);
expect(ol.render.canvas.measureContext_).to.not.be(null);
expect(ol.render.canvas.textHeights_).to.not.eql({});
expect(_ol_render_canvas_.measureContext_).to.not.be(null);
expect(_ol_render_canvas_.textHeights_).to.not.eql({});
done();
}
}, 32);
@@ -72,9 +72,9 @@ describe('ol.render.canvas', function() {
it('clears label cache and measurements for fonts that become available', function(done) {
head.appendChild(font);
ol.events.listen(ol.render.canvas.labelCache, 'clear', function() {
expect(ol.render.canvas.measureContext_).to.be(null);
expect(ol.render.canvas.textHeights_).to.eql({});
_ol_events_.listen(_ol_render_canvas_.labelCache, 'clear', function() {
expect(_ol_render_canvas_.measureContext_).to.be(null);
expect(_ol_render_canvas_.textHeights_).to.eql({});
done();
});
checkFont('12px Abel');
@@ -89,7 +89,7 @@ describe('ol.render.canvas', function() {
translate: sinon.spy(),
rotate: sinon.spy()
};
ol.render.canvas.rotateAtOffset(context, Math.PI, 10, 10);
_ol_render_canvas_.rotateAtOffset(context, Math.PI, 10, 10);
expect(context.translate.callCount).to.be(2);
expect(context.translate.firstCall.args).to.eql([10, 10]);
expect(context.translate.secondCall.args).to.eql([-10, -10]);
test/spec/ol/render/canvas/replaygroup.test.js
+2 -4
View File
@@ -1,6 +1,4 @@
goog.require('ol.render.canvas.ReplayGroup');
import _ol_render_canvas_ReplayGroup_ from '../../../../../src/ol/render/canvas/ReplayGroup.js';
describe('ol.render.canvas.ReplayGroup', function() {
@@ -10,7 +8,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
var radius = 10;
var minRadiusSq = Math.pow(radius - Math.SQRT2, 2);
var maxRadiusSq = Math.pow(radius + Math.SQRT2, 2);
var circleArray = ol.render.canvas.ReplayGroup.getCircleArray_(radius);
var circleArray = _ol_render_canvas_ReplayGroup_.getCircleArray_(radius);
var size = radius * 2 + 1;
expect(circleArray.length).to.be(size);
test/spec/ol/render/canvas/textreplay.test.js
+15 -15
View File
@@ -1,23 +1,23 @@
goog.require('ol.Feature');
goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Polygon');
goog.require('ol.render.canvas.TextReplay');
goog.require('ol.style.Text');
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import _ol_geom_MultiPolygon_ from '../../../../../src/ol/geom/MultiPolygon.js';
import _ol_geom_Polygon_ from '../../../../../src/ol/geom/Polygon.js';
import _ol_render_canvas_TextReplay_ from '../../../../../src/ol/render/canvas/TextReplay.js';
import _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
describe('ol.render.canvas.TextReplay', function() {
it('renders polygon labels only when they fit', function() {
var replay = new ol.render.canvas.TextReplay(1, [-180, -90, 180, 90], 0.02, 1, true);
var geometry = new ol.geom.Polygon([[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]);
var feature = new ol.Feature(geometry);
var replay = new _ol_render_canvas_TextReplay_(1, [-180, -90, 180, 90], 0.02, 1, true);
var geometry = new _ol_geom_Polygon_([[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]);
var feature = new _ol_Feature_(geometry);
replay.setTextStyle(new ol.style.Text({
replay.setTextStyle(new _ol_style_Text_({
text: 'This is a long text'
}));
replay.drawText(geometry, feature);
expect(replay.instructions.length).to.be(0);
replay.setTextStyle(new ol.style.Text({
replay.setTextStyle(new _ol_style_Text_({
text: 'short'
}));
replay.drawText(geometry, feature);
@@ -25,20 +25,20 @@ describe('ol.render.canvas.TextReplay', function() {
});
it('renders multipolygon labels only when they fit', function() {
var replay = new ol.render.canvas.TextReplay(1, [-180, -90, 180, 90], 0.02, 1, true);
var geometry = new ol.geom.MultiPolygon([
var replay = new _ol_render_canvas_TextReplay_(1, [-180, -90, 180, 90], 0.02, 1, true);
var geometry = new _ol_geom_MultiPolygon_([
[[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]],
[[[1, 1], [1, 2], [2, 2], [2, 1], [1, 1]]]
]);
var feature = new ol.Feature(geometry);
var feature = new _ol_Feature_(geometry);
replay.setTextStyle(new ol.style.Text({
replay.setTextStyle(new _ol_style_Text_({
text: 'This is a long text'
}));
replay.drawText(geometry, feature);
expect(replay.instructions.length).to.be(0);
replay.setTextStyle(new ol.style.Text({
replay.setTextStyle(new _ol_style_Text_({
text: 'short'
}));
replay.drawText(geometry, feature);