mirror of
https://github.com/FoggedLens/iD.git
synced 2026-05-15 21:48:20 +02:00
Expand actionOrthogonalize tests, fix abs issue in canOrthogonalize
This commit is contained in:
Bryan Housel
@@ -235,10 +235,10 @@ export function actionOrthogonalize(wayID, projection) {
|
||||
var origin = coords[i];
|
||||
var b = coords[(i + 1) % coords.length];
|
||||
|
||||
var val = filterDotProduct(normalizedDotProduct(a, b, origin));
|
||||
if (val === null) continue; // ignore vertex
|
||||
if (val > 0) return 1; // something to do
|
||||
score = 0; // already square
|
||||
var dotp = filterDotProduct(normalizedDotProduct(a, b, origin));
|
||||
if (dotp === null) continue; // ignore vertex
|
||||
if (Math.abs(dotp) > 0) return 1; // something to do
|
||||
score = 0; // already square
|
||||
}
|
||||
|
||||
return score;
|
||||
|
||||
@@ -1,8 +1,13 @@
|
||||
describe('iD.actionOrthogonalize', function () {
|
||||
var projection = d3.geoMercator();
|
||||
var projection = function (l) { return l; };
|
||||
projection.invert = projection;
|
||||
|
||||
it('orthogonalizes a perfect quad', function () {
|
||||
var graph = iD.coreGraph([
|
||||
describe('closed paths', function () {
|
||||
it('orthogonalizes a perfect quad', function () {
|
||||
// d --- c
|
||||
// | |
|
||||
// a --- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
@@ -10,37 +15,47 @@ describe('iD.actionOrthogonalize', function () {
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'a']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(5);
|
||||
});
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(5);
|
||||
});
|
||||
|
||||
it('orthogonalizes a quad', function () {
|
||||
var graph = iD.coreGraph([
|
||||
it('orthogonalizes a quad', function () {
|
||||
// d --- c
|
||||
// | |
|
||||
// a --- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [4, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [3, 2]}),
|
||||
iD.osmNode({id: 'b', loc: [2.1, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'a']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(5);
|
||||
});
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(5);
|
||||
});
|
||||
|
||||
it('orthogonalizes a triangle', function () {
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [3, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
it('orthogonalizes a triangle', function () {
|
||||
// a
|
||||
// | \
|
||||
// | \
|
||||
// b - c
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 3]}),
|
||||
iD.osmNode({id: 'b', loc: [0.1, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [3, 0]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'a']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(4);
|
||||
});
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(4);
|
||||
});
|
||||
|
||||
it('deletes empty redundant nodes', function() {
|
||||
var graph = iD.coreGraph([
|
||||
it('deletes empty redundant nodes', function() {
|
||||
// e - d - c
|
||||
// | |
|
||||
// a ----- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
@@ -49,12 +64,15 @@ describe('iD.actionOrthogonalize', function () {
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'a']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.hasEntity('d')).to.eq(undefined);
|
||||
});
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.hasEntity('d')).to.eq(undefined);
|
||||
});
|
||||
|
||||
it('preserves non empty redundant nodes', function() {
|
||||
var graph = iD.coreGraph([
|
||||
it('preserves non empty redundant nodes', function() {
|
||||
// e - d - c
|
||||
// | |
|
||||
// a ----- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
@@ -63,58 +81,426 @@ describe('iD.actionOrthogonalize', function () {
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'a']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(6);
|
||||
expect(graph.hasEntity('d')).to.not.eq(undefined);
|
||||
});
|
||||
|
||||
it('preserves the shape of skinny quads', function () {
|
||||
var tests = [
|
||||
[
|
||||
[-77.0339864831478, 38.8616391227204],
|
||||
[-77.0209775298677, 38.8613609264884],
|
||||
[-77.0210405781065, 38.8607390721519],
|
||||
[-77.0339024188294, 38.8610663645859]
|
||||
],
|
||||
[
|
||||
[-89.4706683, 40.6261177],
|
||||
[-89.4706664, 40.6260574],
|
||||
[-89.4693973, 40.6260830],
|
||||
[-89.4694012, 40.6261355]
|
||||
]
|
||||
];
|
||||
|
||||
for (var i = 0; i < tests.length; i++) {
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: tests[i][0]}),
|
||||
iD.osmNode({id: 'b', loc: tests[i][1]}),
|
||||
iD.osmNode({id: 'c', loc: tests[i][2]}),
|
||||
iD.osmNode({id: 'd', loc: tests[i][3]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'a']})
|
||||
]),
|
||||
initialWidth = iD.geoSphericalDistance(graph.entity('a').loc, graph.entity('b').loc),
|
||||
finalWidth;
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(6);
|
||||
expect(graph.hasEntity('d')).to.not.eq(undefined);
|
||||
});
|
||||
|
||||
finalWidth = iD.geoSphericalDistance(graph.entity('a').loc, graph.entity('b').loc);
|
||||
expect(finalWidth / initialWidth).within(0.90, 1.10);
|
||||
}
|
||||
});
|
||||
|
||||
it('only moves nodes which are near right or near straight', function() {
|
||||
var graph = iD.coreGraph([
|
||||
it('only moves nodes which are near right or near straight', function() {
|
||||
// f - e
|
||||
// | \
|
||||
// | d - c
|
||||
// | |
|
||||
// a -------- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [3, 0.001]}),
|
||||
iD.osmNode({id: 'b', loc: [3.1, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [3, 1]}),
|
||||
iD.osmNode({id: 'd', loc: [2, 1]}),
|
||||
iD.osmNode({id: 'e', loc: [1, 2]}),
|
||||
iD.osmNode({id: 'f', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f', 'a']})
|
||||
]),
|
||||
diff = iD.Difference(graph, iD.actionOrthogonalize('-', projection)(graph));
|
||||
]);
|
||||
|
||||
expect(Object.keys(diff.changes()).sort()).to.eql(['a', 'b', 'c', 'f']);
|
||||
var diff = iD.coreDifference(graph, iD.actionOrthogonalize('-', projection)(graph));
|
||||
expect(Object.keys(diff.changes()).sort()).to.eql(['a', 'b', 'c', 'f']);
|
||||
});
|
||||
|
||||
it('does not move or remove self-intersecting nodes', function() {
|
||||
// f -- g
|
||||
// | |
|
||||
// e --- d - c
|
||||
// | |
|
||||
// a -- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [ 0, -1]}),
|
||||
iD.osmNode({id: 'b', loc: [ 1, -1]}),
|
||||
iD.osmNode({id: 'c', loc: [ 0, 1]}),
|
||||
iD.osmNode({id: 'd', loc: [ 0.1, 0]}),
|
||||
iD.osmNode({id: 'e', loc: [-1, 0]}),
|
||||
iD.osmNode({id: 'f', loc: [-1, 1]}),
|
||||
iD.osmNode({id: 'g', loc: [ 0, 1]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'd', 'a']})
|
||||
]);
|
||||
|
||||
var diff = iD.coreDifference(graph, iD.actionOrthogonalize('-', projection)(graph));
|
||||
expect(diff.changes().d).to.be.undefined;
|
||||
expect(graph.hasEntity('d')).to.be.ok;
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
describe('open paths', function () {
|
||||
it('orthogonalizes a perfect quad', function () {
|
||||
// d --- c
|
||||
// |
|
||||
// a --- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(4);
|
||||
});
|
||||
|
||||
it('orthogonalizes a quad', function () {
|
||||
// d --- c
|
||||
// |
|
||||
// a --- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2.1, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(4);
|
||||
});
|
||||
|
||||
it('orthogonalizes a 3-point path', function () {
|
||||
// a
|
||||
// |
|
||||
// |
|
||||
// b - c
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 3]}),
|
||||
iD.osmNode({id: 'b', loc: [0.1, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [3, 0]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(3);
|
||||
});
|
||||
|
||||
it('deletes empty redundant nodes', function() {
|
||||
// e - d - c
|
||||
// |
|
||||
// a ----- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [1, 2]}),
|
||||
iD.osmNode({id: 'e', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.hasEntity('d')).to.be.undefined;
|
||||
});
|
||||
|
||||
it('preserves non empty redundant nodes', function() {
|
||||
// e - d - c
|
||||
// |
|
||||
// a ----- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [1, 2], tags: {foo: 'bar'}}),
|
||||
iD.osmNode({id: 'e', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
expect(graph.entity('-').nodes).to.have.length(5);
|
||||
expect(graph.hasEntity('d')).to.be.ok;
|
||||
});
|
||||
|
||||
it('only moves non-endpoint nodes which are near right or near straight', function() {
|
||||
// f - e
|
||||
// \
|
||||
// d - c
|
||||
// |
|
||||
// a -------- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [3.1, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [3, 1]}),
|
||||
iD.osmNode({id: 'd', loc: [2, 1]}),
|
||||
iD.osmNode({id: 'e', loc: [1, 2]}),
|
||||
iD.osmNode({id: 'f', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f']})
|
||||
]);
|
||||
|
||||
var diff = iD.coreDifference(graph, iD.actionOrthogonalize('-', projection)(graph));
|
||||
expect(Object.keys(diff.changes()).sort()).to.eql(['b', 'c']);
|
||||
});
|
||||
|
||||
it('does not move or remove self-intersecting nodes', function() {
|
||||
// f -- g
|
||||
// | |
|
||||
// e --- d - c
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'c', loc: [ 0, 1]}),
|
||||
iD.osmNode({id: 'd', loc: [ 0.1, 0]}),
|
||||
iD.osmNode({id: 'e', loc: [-1, 0]}),
|
||||
iD.osmNode({id: 'f', loc: [-1, 1]}),
|
||||
iD.osmNode({id: 'g', loc: [ 0, 1]}),
|
||||
iD.osmWay({id: '-', nodes: ['c', 'd', 'e', 'f', 'g', 'd']})
|
||||
]);
|
||||
|
||||
var diff = iD.coreDifference(graph, iD.actionOrthogonalize('-', projection)(graph));
|
||||
expect(diff.changes().d).to.be.undefined;
|
||||
expect(graph.hasEntity('d')).to.be.ok;
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
it('preserves the shape of skinny quads', function () {
|
||||
var projection = iD.d3.geoMercator();
|
||||
var tests = [[
|
||||
[-77.0339864831478, 38.8616391227204],
|
||||
[-77.0209775298677, 38.8613609264884],
|
||||
[-77.0210405781065, 38.8607390721519],
|
||||
[-77.0339024188294, 38.8610663645859]
|
||||
], [
|
||||
[-89.4706683, 40.6261177],
|
||||
[-89.4706664, 40.6260574],
|
||||
[-89.4693973, 40.6260830],
|
||||
[-89.4694012, 40.6261355]
|
||||
]];
|
||||
|
||||
for (var i = 0; i < tests.length; i++) {
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: tests[i][0]}),
|
||||
iD.osmNode({id: 'b', loc: tests[i][1]}),
|
||||
iD.osmNode({id: 'c', loc: tests[i][2]}),
|
||||
iD.osmNode({id: 'd', loc: tests[i][3]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'a']})
|
||||
]);
|
||||
var initialWidth = iD.geoSphericalDistance(graph.entity('a').loc, graph.entity('b').loc);
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph);
|
||||
var finalWidth = iD.geoSphericalDistance(graph.entity('a').loc, graph.entity('b').loc);
|
||||
expect(finalWidth / initialWidth).within(0.90, 1.10);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
describe('#disabled', function () {
|
||||
|
||||
describe('closed paths', function () {
|
||||
|
||||
it('returns "square_enough" for a perfect quad', function () {
|
||||
// d ---- c
|
||||
// | |
|
||||
// a ---- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'a']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.eql('square_enough');
|
||||
});
|
||||
|
||||
it('returns false for unsquared quad', function () {
|
||||
// d --- c
|
||||
// | |
|
||||
// a ---- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2.1, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'a']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.be.false;
|
||||
});
|
||||
|
||||
it('returns false for unsquared triangle', function () {
|
||||
// a
|
||||
// | \
|
||||
// | \
|
||||
// b - c
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 3]}),
|
||||
iD.osmNode({id: 'b', loc: [0.1, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [3, 0]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'a']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.be.false;
|
||||
});
|
||||
|
||||
it('returns false for perfectly square shape with redundant nodes', function () {
|
||||
// e - d - c
|
||||
// | |
|
||||
// a ----- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [1, 2]}),
|
||||
iD.osmNode({id: 'e', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'a']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.be.false;
|
||||
});
|
||||
|
||||
it('returns "not_squarish" for shape that can not be squared', function () {
|
||||
// e -- d
|
||||
// / \
|
||||
// f c
|
||||
// \ /
|
||||
// a -- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [1, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [3, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [4, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [3, 4]}),
|
||||
iD.osmNode({id: 'e', loc: [1, 4]}),
|
||||
iD.osmNode({id: 'f', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f', 'a']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.eql('not_squarish');
|
||||
});
|
||||
|
||||
it('returns false for non-square self-intersecting shapes', function() {
|
||||
// f -- g
|
||||
// | |
|
||||
// e --- d - c
|
||||
// | |
|
||||
// a -- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [ 0, -1]}),
|
||||
iD.osmNode({id: 'b', loc: [ 1, -1]}),
|
||||
iD.osmNode({id: 'c', loc: [ 0, 1]}),
|
||||
iD.osmNode({id: 'd', loc: [ 0.1, 0]}),
|
||||
iD.osmNode({id: 'e', loc: [-1, 0]}),
|
||||
iD.osmNode({id: 'f', loc: [-1, 1]}),
|
||||
iD.osmNode({id: 'g', loc: [ 0, 1]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'd', 'a']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.be.false;
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
describe('open paths', function () {
|
||||
|
||||
it('returns "square_enough" for a perfect quad', function () {
|
||||
// d ---- c
|
||||
// |
|
||||
// a ---- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.eql('square_enough');
|
||||
});
|
||||
|
||||
it('returns false for unsquared quad', function () {
|
||||
// d --- c
|
||||
// |
|
||||
// a --- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2.1, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.be.false;
|
||||
});
|
||||
|
||||
it('returns false for unsquared 3-point path', function () {
|
||||
// a
|
||||
// |
|
||||
// |
|
||||
// b - c
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 3]}),
|
||||
iD.osmNode({id: 'b', loc: [0, 0.1]}),
|
||||
iD.osmNode({id: 'c', loc: [3, 0]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.be.false;
|
||||
});
|
||||
|
||||
it('returns false for perfectly square shape with redundant nodes', function () {
|
||||
// e - d - c
|
||||
// |
|
||||
// a ----- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [2, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [2, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [1, 2]}),
|
||||
iD.osmNode({id: 'e', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.be.false;
|
||||
});
|
||||
|
||||
it('returns "not_squarish" for path that can not be squared', function () {
|
||||
// e -- d
|
||||
// / \
|
||||
// f c
|
||||
// /
|
||||
// a -- b
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [1, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [3, 0]}),
|
||||
iD.osmNode({id: 'c', loc: [4, 2]}),
|
||||
iD.osmNode({id: 'd', loc: [3, 4]}),
|
||||
iD.osmNode({id: 'e', loc: [1, 4]}),
|
||||
iD.osmNode({id: 'f', loc: [0, 2]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.eql('not_squarish');
|
||||
});
|
||||
|
||||
it('returns false for non-square self-intersecting paths', function() {
|
||||
// f -- g
|
||||
// | |
|
||||
// e --- d - c
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'c', loc: [ 0, 1]}),
|
||||
iD.osmNode({id: 'd', loc: [ 0.1, 0]}),
|
||||
iD.osmNode({id: 'e', loc: [-1, 0]}),
|
||||
iD.osmNode({id: 'f', loc: [-1, 1]}),
|
||||
iD.osmNode({id: 'g', loc: [ 0, 1]}),
|
||||
iD.osmWay({id: '-', nodes: ['c', 'd', 'e', 'f', 'g', 'd']})
|
||||
]);
|
||||
|
||||
var result = iD.actionOrthogonalize('-', projection).disabled(graph);
|
||||
expect(result).to.be.false;
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -123,16 +509,22 @@ describe('iD.actionOrthogonalize', function () {
|
||||
expect(iD.actionOrthogonalize().transitionable).to.be.true;
|
||||
});
|
||||
|
||||
// for all of these:
|
||||
//
|
||||
// f ------------ e
|
||||
// | |
|
||||
// a -- b -- c -- d
|
||||
|
||||
it('orthogonalize at t = 0', function() {
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [1, 0.01], tags: {foo: 'bar'}}),
|
||||
iD.osmNode({id: 'c', loc: [2, -0.01]}),
|
||||
iD.osmNode({id: 'd', loc: [3, 0]}),
|
||||
iD.osmNode({id: 'e', loc: [3, 1]}),
|
||||
iD.osmNode({id: 'f', loc: [0, 1]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f', 'a']})
|
||||
]);
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [1, 0.01], tags: {foo: 'bar'}}),
|
||||
iD.osmNode({id: 'c', loc: [2, -0.01]}),
|
||||
iD.osmNode({id: 'd', loc: [3, 0]}),
|
||||
iD.osmNode({id: 'e', loc: [3, 1]}),
|
||||
iD.osmNode({id: 'f', loc: [0, 1]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f', 'a']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph, 0);
|
||||
expect(graph.entity('-').nodes).to.eql(['a', 'b', 'c', 'd', 'e', 'f', 'a']);
|
||||
@@ -145,14 +537,14 @@ describe('iD.actionOrthogonalize', function () {
|
||||
|
||||
it('orthogonalize at t = 0.5', function() {
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [1, 0.01], tags: {foo: 'bar'}}),
|
||||
iD.osmNode({id: 'c', loc: [2, -0.01]}),
|
||||
iD.osmNode({id: 'd', loc: [3, 0]}),
|
||||
iD.osmNode({id: 'e', loc: [3, 1]}),
|
||||
iD.osmNode({id: 'f', loc: [0, 1]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f', 'a']})
|
||||
]);
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [1, 0.01], tags: {foo: 'bar'}}),
|
||||
iD.osmNode({id: 'c', loc: [2, -0.01]}),
|
||||
iD.osmNode({id: 'd', loc: [3, 0]}),
|
||||
iD.osmNode({id: 'e', loc: [3, 1]}),
|
||||
iD.osmNode({id: 'f', loc: [0, 1]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f', 'a']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph, 0.5);
|
||||
expect(graph.entity('-').nodes).to.eql(['a', 'b', 'c', 'd', 'e', 'f', 'a']);
|
||||
@@ -164,14 +556,14 @@ describe('iD.actionOrthogonalize', function () {
|
||||
|
||||
it('orthogonalize at t = 1', function() {
|
||||
var graph = iD.coreGraph([
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [1, 0.01], tags: {foo: 'bar'}}),
|
||||
iD.osmNode({id: 'c', loc: [2, -0.01]}),
|
||||
iD.osmNode({id: 'd', loc: [3, 0]}),
|
||||
iD.osmNode({id: 'e', loc: [3, 1]}),
|
||||
iD.osmNode({id: 'f', loc: [0, 1]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f', 'a']})
|
||||
]);
|
||||
iD.osmNode({id: 'a', loc: [0, 0]}),
|
||||
iD.osmNode({id: 'b', loc: [1, 0.01], tags: {foo: 'bar'}}),
|
||||
iD.osmNode({id: 'c', loc: [2, -0.01]}),
|
||||
iD.osmNode({id: 'd', loc: [3, 0]}),
|
||||
iD.osmNode({id: 'e', loc: [3, 1]}),
|
||||
iD.osmNode({id: 'f', loc: [0, 1]}),
|
||||
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd', 'e', 'f', 'a']})
|
||||
]);
|
||||
|
||||
graph = iD.actionOrthogonalize('-', projection)(graph, 1);
|
||||
expect(graph.entity('-').nodes).to.eql(['a', 'b', 'd', 'e', 'f', 'a']);
|
||||
|
||||
Reference in New Issue
Block a user