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

Additional tests and code comments

Browse Source
This commit is contained in:
Andreas Hocevar
2016-04-28 16:29:29 +02:00
parent 7e940e618e
commit 395793b921
7 changed files with 164 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
externs/olx.js
View File

@@ -4418,7 +4418,7 @@ olx.source.VectorTileOptions.prototype.logo;
/** /**
* This source may have overlapping geometries. Default is `true`. Setting this * This source may have overlapping geometries. Default is `true`. Setting this
* to `false` (e.g. for sources with polygons that represent adminstrative * to `false` (e.g. for sources with polygons that represent administrative
* boundaries or TopoJSON sources) allows the renderer to optimise fill and * boundaries or TopoJSON sources) allows the renderer to optimise fill and
* stroke operations. * stroke operations.
* @type {boolean|undefined} * @type {boolean|undefined}
@@ -5864,7 +5864,7 @@ olx.source.VectorOptions.prototype.logo;
/** /**
* This source may have overlapping geometries. Default is `true`. Setting this * This source may have overlapping geometries. Default is `true`. Setting this
* to `false` (e.g. for sources with polygons that represent adminstrative * to `false` (e.g. for sources with polygons that represent administrative
* boundaries or TopoJSON sources) allows the renderer to optimise fill and * boundaries or TopoJSON sources) allows the renderer to optimise fill and
* stroke operations. * stroke operations.
* @type {boolean|undefined} * @type {boolean|undefined}

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

@@ -266,6 +266,8 @@ ol.render.canvas.Replay.prototype.replay_ = function(
var prevX, prevY, roundX, roundY; var prevX, prevY, roundX, roundY;
var pendingFill = 0; var pendingFill = 0;
var pendingStroke = 0; var pendingStroke = 0;
// When the batch size gets too big, performance decreases. 200 is a good
// balance between batch size and number of fill/stroke instructions.
var batchSize = var batchSize =
this.instructions != instructions || this.overlaps ? 0 : 200; this.instructions != instructions || this.overlaps ? 0 : 200;
while (i < ii) { while (i < ii) {
@@ -1267,8 +1269,6 @@ ol.render.canvas.PolygonReplay.prototype.drawFlatCoordinatess_ = function(flatCo
closePathInstruction); closePathInstruction);
offset = end; offset = end;
} }
// FIXME is it quicker to fill and stroke each polygon individually,
// FIXME or all polygons together?
var fillInstruction = [ol.render.canvas.Instruction.FILL]; var fillInstruction = [ol.render.canvas.Instruction.FILL];
this.hitDetectionInstructions.push(fillInstruction); this.hitDetectionInstructions.push(fillInstruction);
if (state.fillStyle !== undefined) { if (state.fillStyle !== undefined) {

2
src/ol/source/vectortile.js
View File

@@ -56,7 +56,7 @@ ol.source.VectorTile = function(options) {
* @private * @private
* @type {boolean} * @type {boolean}
*/ */
this.overlaps_ = options.overlaps || true; this.overlaps_ = options.overlaps == undefined ? true : options.overlaps;
/** /**
* @protected * @protected

33
test.html
View File

@@ -1,33 +0,0 @@
<!doctype html>
<html lang="en">
<head>
<link rel="stylesheet" href="css/ol.css" type="text/css">
<style>
.map {
height: 400px;
width: 100%;
}
</style>
<title>OpenLayers 3 example</title>
<script src="build/ol.js" type="text/javascript"></script>
</head>
<body>
<h2>My Map</h2>
<div id="map" class="map"></div>
<script type="text/javascript">
var map = new ol.Map({
target: 'map',
layers: [
new ol.layer.Tile({
source: new ol.source.OSM()
})
],
view: new ol.View({
center: ol.proj.fromLonLat([37.41, 8.82]),
zoom: 4
})
});
</script>
</body>
</html>

40
test/spec/ol/renderer/canvas/replay.test.js
View File

@@ -1,5 +1,17 @@
goog.provide('ol.test.renderer.canvas.Replay'); goog.provide('ol.test.renderer.canvas.Replay');
goog.require('ol.transform');
goog.require('ol.Feature');
goog.require('ol.geom.Polygon');
goog.require('ol.render.canvas.LineStringReplay');
goog.require('ol.render.canvas.PolygonReplay');
goog.require('ol.render.canvas.Replay');
goog.require('ol.render.canvas.ReplayGroup');
goog.require('ol.renderer.vector');
goog.require('ol.style.Fill');
goog.require('ol.style.Stroke');
goog.require('ol.style.Style');
describe('ol.render.canvas.ReplayGroup', function() { describe('ol.render.canvas.ReplayGroup', function() {
describe('#replay', function() { describe('#replay', function() {
@@ -8,7 +20,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
var feature1, feature2, feature3, style1, style2, transform; var feature1, feature2, feature3, style1, style2, transform;
beforeEach(function() { beforeEach(function() {
transform = goog.vec.Mat4.createNumber(); transform = ol.transform.create();
replay = new ol.render.canvas.ReplayGroup(1, [-180, -90, 180, 90], 1, false); replay = new ol.render.canvas.ReplayGroup(1, [-180, -90, 180, 90], 1, false);
feature1 = new ol.Feature(new ol.geom.Polygon( feature1 = new ol.Feature(new ol.geom.Polygon(
[[[-90, -45], [-90, 0], [0, 0], [0, -45], [-90, -45]]])); [[[-90, -45], [-90, 0], [0, 0], [0, -45], [-90, -45]]]));
@@ -46,9 +58,9 @@ describe('ol.render.canvas.ReplayGroup', function() {
closePath: function() {}, closePath: function() {},
setLineDash: function() {}, setLineDash: function() {},
restore: function() {} restore: function() {}
} };
}) });
it('batches fill and stroke instructions for same style', function() { it('batches fill and stroke instructions for same style', function() {
ol.renderer.vector.renderFeature(replay, feature1, style1, 1); ol.renderer.vector.renderFeature(replay, feature1, style1, 1);
@@ -85,7 +97,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
ol.renderer.vector.renderFeature(replay, feature2, style2, 1); ol.renderer.vector.renderFeature(replay, feature2, style2, 1);
ol.renderer.vector.renderFeature(replay, feature3, style2, 1); ol.renderer.vector.renderFeature(replay, feature3, style2, 1);
var skippedUids = {}; var skippedUids = {};
skippedUids[goog.getUid(feature1)] = true; skippedUids[ol.getUid(feature1)] = true;
replay.replay(context, 1, transform, 0, skippedUids); replay.replay(context, 1, transform, 0, skippedUids);
expect(fillCount).to.be(1); expect(fillCount).to.be(1);
expect(strokeCount).to.be(1); expect(strokeCount).to.be(1);
@@ -97,7 +109,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
ol.renderer.vector.renderFeature(replay, feature2, style1, 1); ol.renderer.vector.renderFeature(replay, feature2, style1, 1);
ol.renderer.vector.renderFeature(replay, feature3, style2, 1); ol.renderer.vector.renderFeature(replay, feature3, style2, 1);
var skippedUids = {}; var skippedUids = {};
skippedUids[goog.getUid(feature3)] = true; skippedUids[ol.getUid(feature3)] = true;
replay.replay(context, 1, transform, 0, skippedUids); replay.replay(context, 1, transform, 0, skippedUids);
expect(fillCount).to.be(1); expect(fillCount).to.be(1);
expect(strokeCount).to.be(1); expect(strokeCount).to.be(1);
@@ -109,8 +121,8 @@ describe('ol.render.canvas.ReplayGroup', function() {
ol.renderer.vector.renderFeature(replay, feature2, style1, 1); ol.renderer.vector.renderFeature(replay, feature2, style1, 1);
ol.renderer.vector.renderFeature(replay, feature3, style2, 1); ol.renderer.vector.renderFeature(replay, feature3, style2, 1);
var skippedUids = {}; var skippedUids = {};
skippedUids[goog.getUid(feature1)] = true; skippedUids[ol.getUid(feature1)] = true;
skippedUids[goog.getUid(feature2)] = true; skippedUids[ol.getUid(feature2)] = true;
replay.replay(context, 1, transform, 0, skippedUids); replay.replay(context, 1, transform, 0, skippedUids);
expect(fillCount).to.be(1); expect(fillCount).to.be(1);
expect(strokeCount).to.be(1); expect(strokeCount).to.be(1);
@@ -126,7 +138,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
expect(fillCount).to.be(3); expect(fillCount).to.be(3);
expect(strokeCount).to.be(3); expect(strokeCount).to.be(3);
expect(beginPathCount).to.be(3); expect(beginPathCount).to.be(3);
}) });
}); });
}); });
@@ -252,15 +264,3 @@ describe('ol.render.canvas.PolygonReplay', function() {
}); });
}); });
goog.require('goog.vec.Mat4');
goog.require('ol.Feature');
goog.require('ol.geom.Polygon');
goog.require('ol.render.canvas.LineStringReplay');
goog.require('ol.render.canvas.PolygonReplay');
goog.require('ol.render.canvas.Replay');
goog.require('ol.render.canvas.ReplayGroup');
goog.require('ol.renderer.vector');
goog.require('ol.style.Fill');
goog.require('ol.style.Stroke');
goog.require('ol.style.Style');

BIN
test_rendering/spec/ol/layer/expected/vector-canvas-stroke.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 504 B

150
test_rendering/spec/ol/layer/vector.test.js
View File

@@ -8,6 +8,7 @@ goog.require('ol.geom.LineString');
goog.require('ol.geom.Polygon'); goog.require('ol.geom.Polygon');
goog.require('ol.layer.Vector'); goog.require('ol.layer.Vector');
goog.require('ol.source.Vector'); goog.require('ol.source.Vector');
goog.require('ol.style.Fill');
goog.require('ol.style.Stroke'); goog.require('ol.style.Stroke');
goog.require('ol.style.Style'); goog.require('ol.style.Style');
@@ -49,6 +50,16 @@ describe('ol.rendering.layer.Vector', function() {
]))); ])));
} }
function addLineString(r) {
source.addFeature(new ol.Feature(new ol.geom.LineString([
[center[0] - r, center[1] - r],
[center[0] + r, center[1] - r],
[center[0] + r, center[1] + r],
[center[0] - r, center[1] + r],
[center[0] - r, center[1] - r]
])));
}
describe('vector layer', function() { describe('vector layer', function() {
beforeEach(function() { beforeEach(function() {
@@ -108,19 +119,136 @@ describe('ol.rendering.layer.Vector', function() {
map.once('postrender', function() { map.once('postrender', function() {
expectResemble(map, 'spec/ol/layer/expected/vector-canvas-opaque.png', expectResemble(map, 'spec/ol/layer/expected/vector-canvas-opaque.png',
17, done); 17, done);
}) });
}); });
it('renders stroke batches correctly with the canvas renderer', function(done) {
map = createMap('canvas');
source = new ol.source.Vector({
overlaps: false
});
addLineString(100);
addLineString(250);
addLineString(600);
addLineString(720);
map.addLayer(new ol.layer.Vector({
source: source,
style: new ol.style.Style({
stroke: new ol.style.Stroke({
color: '#3399CC',
width: 1.25
})
})
}));
map.once('postrender', function() {
expectResemble(map, 'spec/ol/layer/expected/vector-canvas-stroke.png',
7, done);
});
});
it('interrupts fill/stroke batches correctly with the canvas renderer', function(done) {
map = createMap('canvas');
var color;
function createSource(overlaps) {
color = '#3399CC';
source = new ol.source.Vector({
overlaps: overlaps
});
addPolygon(720);
addPolygon(600);
addCircle(500);
addPolygon(250);
addCircle(200);
addPolygon(100);
return source;
}
function alternateColor() {
if (color == '#3399CC') {
color = '#CC9933';
} else {
color = '#3399CC';
}
return color;
}
var layer = new ol.layer.Vector({
source: createSource(true),
style: function(feature) {
alternateColor();
return new ol.style.Style({
stroke: new ol.style.Stroke({
color: alternateColor(),
width: 1.25
}),
fill: new ol.style.Fill({
color: alternateColor()
})
});
}
});
map.addLayer(layer);
map.once('postrender', function() {
var canvas = map.getRenderer().canvas_;
// take a snapshot of this `overlaps: true` image
var referenceImage = canvas.getContext('2d').getImageData(0, 0, canvas.width, canvas.height);
// now render the same with `overlaps: false`
layer.setSource(createSource(false));
// result should be exactly the same as with `overlaps: true`
map.once('postrender', function() {
expectResemble(map, referenceImage, 0, done);
});
});
});
it('interrupts stroke batches correctly with the canvas renderer', function(done) {
map = createMap('canvas');
var color;
function createSource(overlaps) {
color = '#3399CC';
source = new ol.source.Vector({
overlaps: overlaps
});
addLineString(720);
addLineString(600);
addLineString(250);
addLineString(100);
return source;
}
function alternateColor() {
if (color == '#3399CC') {
color = '#CC9933';
} else {
color = '#3399CC';
}
return color;
}
var layer = new ol.layer.Vector({
source: createSource(true),
style: function(feature) {
alternateColor();
return new ol.style.Style({
stroke: new ol.style.Stroke({
color: alternateColor(),
width: 1.25
}),
fill: new ol.style.Fill({
color: alternateColor()
})
});
}
});
map.addLayer(layer);
map.once('postrender', function() {
var canvas = map.getRenderer().canvas_;
// take a snapshot of this `overlaps: true` image
var referenceImage = canvas.getContext('2d').getImageData(0, 0, canvas.width, canvas.height);
// now render the same with `overlaps: false`
layer.setSource(createSource(false));
// result should be exactly the same as with `overlaps: true`
map.once('postrender', function() {
expectResemble(map, referenceImage, 0, done);
});
});
});
}); });
}); });
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.Feature');
goog.require('ol.geom.Circle');
goog.require('ol.geom.Polygon');
goog.require('ol.layer.Vector');
goog.require('ol.source.Vector');
goog.require('ol.style.Stroke');
goog.require('ol.style.Style');