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

Factor out ol.geom.flat.simplify

Browse Source
This commit is contained in:
Tom Payne
2014-03-12 11:21:55 +01:00
parent 2b6845244c
commit c8165a8168
8 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
test/spec/ol/geom/simplifygeom.test.js → test/spec/ol/geom/flat/simplifyflatgeom.test.js
View File

@@ -1,7 +1,7 @@
goog.provide('ol.test.geom.simplify');
describe('ol.geom.simplify', function() {
describe('ol.geom.flat.simplify', function() {
var flatCoordinates = [
224.55, 250.15, 226.91, 244.19, 233.31, 241.45, 234.98, 236.06,
@@ -81,31 +81,31 @@ describe('ol.geom.simplify', function() {
866.36, 480.77
];
describe('ol.geom.simplify.lineString', function() {
describe('ol.geom.flat.simplify.lineString', function() {
it('works with empty line strings', function() {
expect(ol.geom.simplify.lineString([], 0, 0, 2, 1, true)).to.
expect(ol.geom.flat.simplify.lineString([], 0, 0, 2, 1, true)).to.
eql([]);
expect(ol.geom.simplify.lineString([], 0, 0, 2, 1, false)).to.
expect(ol.geom.flat.simplify.lineString([], 0, 0, 2, 1, false)).to.
eql([]);
});
it('works with a line string with a single point', function() {
expect(ol.geom.simplify.lineString([1, 2], 0, 2, 2, 1, true)).to.
expect(ol.geom.flat.simplify.lineString([1, 2], 0, 2, 2, 1, true)).to.
eql([1, 2]);
expect(ol.geom.simplify.lineString([1, 2], 0, 2, 2, 1, false)).to.
expect(ol.geom.flat.simplify.lineString([1, 2], 0, 2, 2, 1, false)).to.
eql([1, 2]);
});
it('returns the expected result with low quality', function() {
var result = ol.geom.simplify.lineString(
var result = ol.geom.flat.simplify.lineString(
flatCoordinates, 0, flatCoordinates.length, 2, 25, false);
expect(result.length).to.be(simplifiedFlatCoordinates.length);
expect(result).to.eql(simplifiedFlatCoordinates);
});
it('returns the expected result with high quality', function() {
var result = ol.geom.simplify.lineString(
var result = ol.geom.flat.simplify.lineString(
flatCoordinates, 0, flatCoordinates.length, 2, 25, true);
expect(result.length).to.be(simplifiedHighQualityFlatCoordinates.length);
expect(result).to.eql(simplifiedHighQualityFlatCoordinates);
@@ -113,7 +113,7 @@ describe('ol.geom.simplify', function() {
});
describe('ol.geom.simplify.radialDistance', function() {
describe('ol.geom.flat.simplify.radialDistance', function() {
var dest;
beforeEach(function() {
@@ -121,63 +121,63 @@ describe('ol.geom.simplify', function() {
});
it('works with empty line strings', function() {
expect(ol.geom.simplify.radialDistance(
expect(ol.geom.flat.simplify.radialDistance(
[], 0, 0, 2, 1, dest, 0)).to.be(0);
expect(dest).to.eql([]);
});
it('works with a line string with a single point', function() {
expect(ol.geom.simplify.radialDistance(
expect(ol.geom.flat.simplify.radialDistance(
[1, 2], 0, 2, 2, 1, dest, 0)).to.be(2);
expect(dest).to.eql([1, 2]);
});
it('works with a line string with two points', function() {
expect(ol.geom.simplify.radialDistance(
expect(ol.geom.flat.simplify.radialDistance(
[1, 2, 3, 4], 0, 4, 2, 1, dest, 0)).to.be(4);
expect(dest).to.eql([1, 2, 3, 4]);
});
it('works when the points are widely spaced', function() {
expect(ol.geom.simplify.radialDistance(
expect(ol.geom.flat.simplify.radialDistance(
[0, 0, 1, 0, 2, 0, 3, 0], 0, 8, 2, 0.5, dest, 0)).to.be(8);
expect(dest).to.eql([0, 0, 1, 0, 2, 0, 3, 0]);
});
it('works when the spacing matches the tolerance', function() {
expect(ol.geom.simplify.radialDistance(
expect(ol.geom.flat.simplify.radialDistance(
[0, 0, 1, 0, 2, 0, 3, 0], 0, 8, 2, 1, dest, 0)).to.be(6);
expect(dest).to.eql([0, 0, 2, 0, 3, 0]);
});
it('works when the points are closely spaced', function() {
expect(ol.geom.simplify.radialDistance(
expect(ol.geom.flat.simplify.radialDistance(
[0, 0, 1, 0, 2, 0, 3, 0], 0, 8, 2, 1.5, dest, 0)).to.be(6);
expect(dest).to.eql([0, 0, 2, 0, 3, 0]);
});
it('works when the line oscillates with widely spaced points', function() {
expect(ol.geom.simplify.radialDistance(
expect(ol.geom.flat.simplify.radialDistance(
[0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1], 0, 12, 2, 1, dest, 0)).
to.be(12);
expect(dest).to.eql([0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1]);
});
it('works when the line oscillates with closely spaced points', function() {
expect(ol.geom.simplify.radialDistance(
expect(ol.geom.flat.simplify.radialDistance(
[0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1], 0, 12, 2, 2, dest, 0)).to.be(4);
expect(dest).to.eql([0, 0, 1, 1]);
});
it('works when the line oscillates within the tolerance', function() {
expect(ol.geom.simplify.radialDistance(
expect(ol.geom.flat.simplify.radialDistance(
[0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0], 0, 14, 2, 2, dest, 0)).
to.be(2);
expect(dest).to.eql([0, 0]);
});
it('works with real data', function() {
expect(ol.geom.simplify.radialDistance(
expect(ol.geom.flat.simplify.radialDistance(
flatCoordinates, 0, flatCoordinates.length, 2, 25, dest, 0)).
to.be(simplifiedRadiallyFlatCoordinates.length);
expect(dest).to.eql(simplifiedRadiallyFlatCoordinates);
@@ -185,7 +185,7 @@ describe('ol.geom.simplify', function() {
});
describe('ol.geom.simplify.douglasPeucker', function() {
describe('ol.geom.flat.simplify.douglasPeucker', function() {
var dest;
beforeEach(function() {
@@ -193,93 +193,93 @@ describe('ol.geom.simplify', function() {
});
it('works with empty line strings', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[], 0, 0, 2, 1, dest, 0)).to.be(0);
expect(dest).to.eql([]);
});
it('works with a line string with a single point', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[1, 2], 0, 2, 2, 1, dest, 0)).to.be(2);
expect(dest).to.eql([1, 2]);
});
it('works with a line string with two points', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[1, 2, 3, 4], 0, 4, 2, 1, dest, 0)).to.be(4);
expect(dest).to.eql([1, 2, 3, 4]);
});
it('works when the points are widely spaced', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[0, 0, 1, 0, 2, 0, 3, 0], 0, 8, 2, 0.5, dest, 0)).to.be(4);
expect(dest).to.eql([0, 0, 3, 0]);
});
it('works when the spacing matches the tolerance', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[0, 0, 1, 0, 2, 0, 3, 0], 0, 8, 2, 1, dest, 0)).to.be(4);
expect(dest).to.eql([0, 0, 3, 0]);
});
it('works when the points are closely spaced', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[0, 0, 1, 0, 2, 0, 3, 0], 0, 8, 2, 1.5, dest, 0)).to.be(4);
expect(dest).to.eql([0, 0, 3, 0]);
});
it('does not elimnate points outside the tolerance', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[0, 0, 1, 1, 2, 0], 0, 6, 2, 0.5, dest, 0)).to.be(6);
expect(dest).to.eql([0, 0, 1, 1, 2, 0]);
});
it('does eliminate points within the tolerance', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[0, 0, 1, 1, 2, 0], 0, 6, 2, 2, dest, 0)).to.be(4);
expect(dest).to.eql([0, 0, 2, 0]);
});
it('does not eliminate multiple points outside the tolerance', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[0, 0, 1, 1, 1, -1, 2, 0], 0, 8, 2, 0.5, dest, 0)).to.be(8);
expect(dest).to.eql([0, 0, 1, 1, 1, -1, 2, 0]);
});
it('does eliminate multiple points within the tolerance', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[0, 0, 1, 1, 1, -1, 2, 0], 0, 8, 2, 2, dest, 0)).to.be(4);
expect(dest).to.eql([0, 0, 2, 0]);
});
it('works when the line oscillates with widely spaced points', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1], 0, 12, 2, 1, dest, 0)).to.be(4);
expect(dest).to.eql([0, 0, 1, 1]);
});
it('works when the line oscillates with closely spaced points', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1], 0, 12, 2, 2, dest, 0)).
to.be(4);
expect(dest).to.eql([0, 0, 1, 1]);
});
it('works when the line oscillates within the tolerance', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0], 0, 14, 2, 2, dest, 0)).
to.be(4);
expect(dest).to.eql([0, 0, 0, 0]);
});
it('works on small triangles', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
[3, 0, 4, 1, 5, 2, 5, 0], 0, 8, 2, 1, dest, 0)).to.be(6);
expect(dest).to.eql([3, 0, 5, 2, 5, 0]);
});
it('is the same as high quality simplification', function() {
expect(ol.geom.simplify.douglasPeucker(
expect(ol.geom.flat.simplify.douglasPeucker(
flatCoordinates, 0, flatCoordinates.length, 2, 25, dest, 0)).
to.be(simplifiedHighQualityFlatCoordinates.length);
expect(dest).to.eql(simplifiedHighQualityFlatCoordinates);
@@ -287,32 +287,32 @@ describe('ol.geom.simplify', function() {
});
describe('ol.geom.simplify.quantize', function() {
describe('ol.geom.flat.simplify.quantize', function() {
it('handles empty coordinates', function() {
var simplifiedFlatCoordinates = [];
expect(ol.geom.simplify.quantize(
expect(ol.geom.flat.simplify.quantize(
[], 0, 0, 2, 2, simplifiedFlatCoordinates, 0)).to.be(0);
expect(simplifiedFlatCoordinates).to.be.empty();
});
it('expands points to a zero-length line', function() {
var simplifiedFlatCoordinates = [];
expect(ol.geom.simplify.quantize(
expect(ol.geom.flat.simplify.quantize(
[0, 0, 0, 0], 0, 4, 2, 2, simplifiedFlatCoordinates, 0)).to.be(4);
expect(simplifiedFlatCoordinates).to.eql([0, 0, 0, 0]);
});
it('snaps near-by points to the same value', function() {
var simplifiedFlatCoordinates = [];
expect(ol.geom.simplify.quantize(
expect(ol.geom.flat.simplify.quantize(
[0.1, 0, 0, 0.1], 0, 4, 2, 2, simplifiedFlatCoordinates, 0)).to.be(4);
expect(simplifiedFlatCoordinates).to.eql([0, 0, 0, 0]);
});
it('eliminates duplicate snapped points', function() {
var simplifiedFlatCoordinates = [];
expect(ol.geom.simplify.quantize(
expect(ol.geom.flat.simplify.quantize(
[0.1, 0, 2, 0, 2.1, 0, 2, 0.1, 1.9, 0, 2, -0.1], 0, 12, 2, 2,
simplifiedFlatCoordinates, 0)).to.be(4);
expect(simplifiedFlatCoordinates).to.eql([0, 0, 2, 0]);
@@ -320,7 +320,7 @@ describe('ol.geom.simplify', function() {
it('eliminates horizontal colinear points', function() {
var simplifiedFlatCoordinates = [];
expect(ol.geom.simplify.quantize(
expect(ol.geom.flat.simplify.quantize(
[0, 0, 2, 0, 4, 0, 6, 0], 0, 8, 2, 2,
simplifiedFlatCoordinates, 0)).to.be(4);
expect(simplifiedFlatCoordinates).to.eql([0, 0, 6, 0]);
@@ -328,7 +328,7 @@ describe('ol.geom.simplify', function() {
it('eliminates vertical colinear points', function() {
var simplifiedFlatCoordinates = [];
expect(ol.geom.simplify.quantize(
expect(ol.geom.flat.simplify.quantize(
[0, 0, 0, -2, 0, -4, 0, -6], 0, 8, 2, 2,
simplifiedFlatCoordinates, 0)).to.be(4);
expect(simplifiedFlatCoordinates).to.eql([0, 0, 0, -6]);
@@ -336,7 +336,7 @@ describe('ol.geom.simplify', function() {
it('eliminates diagonal colinear points', function() {
var simplifiedFlatCoordinates = [];
expect(ol.geom.simplify.quantize(
expect(ol.geom.flat.simplify.quantize(
[0, 0, 2, -2, 4, -4, 6, -6], 0, 8, 2, 2,
simplifiedFlatCoordinates, 0)).to.be(4);
expect(simplifiedFlatCoordinates).to.eql([0, 0, 6, -6]);
@@ -344,7 +344,7 @@ describe('ol.geom.simplify', function() {
it('handles switchbacks', function() {
var simplifiedFlatCoordinates = [];
expect(ol.geom.simplify.quantize(
expect(ol.geom.flat.simplify.quantize(
[0, 0, 2, 0, 0, 0, 4, 0], 0, 8, 2, 2,
simplifiedFlatCoordinates, 0)).to.be(8);
expect(simplifiedFlatCoordinates).to.eql([0, 0, 2, 0, 0, 0, 4, 0]);
@@ -355,4 +355,5 @@ describe('ol.geom.simplify', function() {
});
goog.require('ol.geom.simplify');
goog.require('ol.geom.flat');
goog.require('ol.geom.flat.simplify');