From c56aa2593002f62596ddf57988bc89f76fa8d268 Mon Sep 17 00:00:00 2001 From: Ian B Date: Sat, 23 Mar 2013 15:56:38 +0100 Subject: [PATCH 1/3] Orthogonalize three-node ways (addresses #1077) --- js/id/actions/orthogonalize.js | 57 ++++++++++++++++++++++--------- js/id/operations/orthogonalize.js | 2 +- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/js/id/actions/orthogonalize.js b/js/id/actions/orthogonalize.js index 41fca79e3..140ad5dce 100644 --- a/js/id/actions/orthogonalize.js +++ b/js/id/actions/orthogonalize.js @@ -6,29 +6,46 @@ iD.actions.Orthogonalize = function(wayId, projection) { var action = function(graph) { var way = graph.entity(wayId), nodes = graph.childNodes(way), - points = nodes.map(function(n) { return projection(n.loc); }), - best, i, j; + points, best, i, j, score, corner; + + corner = {i: 0, dotp: 1}; //corner closest to 90 + + if(nodes.length == 4) { + points = _.uniq(nodes).map(function(n) { return projection(n.loc); }); + } else { + points = nodes.map(function(n) { return projection(n.loc); }); + score = squareness(); + } - var score = squareness(); for (i = 0; i < 1000; i++) { var motions = points.map(stepMap); - for (j = 0; j < motions.length; j++) { - points[j] = addPoints(points[j],motions[j]); - } - var newScore = squareness(); - if (newScore < score) { - best = _.clone(points); - score = newScore; + if(nodes.length == 4) { + points[corner.i] = addPoints(points[corner.i],motions[corner.i]); + score = corner.dotp; + } else { + for (j = 0; j < motions.length; j++) { + points[j] = addPoints(points[j],motions[j]); + } + var newScore = squareness(); + if (newScore < score) { + best = _.clone(points); + score = newScore; + } } if (score < 1.0e-8) { break; } } - points = best; - for (i = 0; i < points.length - 1; i++) { - graph = graph.replace(graph.entity(nodes[i].id) + if(nodes.length == 4) { + graph = graph.replace(graph.entity(nodes[corner.i].id) + .move(projection.invert(points[corner.i]))); + } else { + points = best; + for (i = 0; i < points.length - 1; i++) { + graph = graph.replace(graph.entity(nodes[i].id) .move(projection.invert(points[i]))); + } } return graph; @@ -44,9 +61,17 @@ iD.actions.Orthogonalize = function(wayId, projection) { q = normalizePoint(q, 1.0); var dotp = p[0] * q[0] + p[1] * q[1]; - // nasty hack to deal with almost-straight segments (angle is closer to 180 than to 90/270). - if (dotp < -0.707106781186547) { - dotp += 1.0; + + if(nodes.length == 4) { + if( Math.abs(dotp) < corner.dotp){ + corner.i = i; + corner.dotp = Math.abs(dotp); + } + } else { + // nasty hack to deal with almost-straight segments (angle is closer to 180 than to 90/270). + if (dotp < -0.707106781186547) { + dotp += 1.0; + } } return normalizePoint(addPoints(p, q), 0.1 * dotp * scale); diff --git a/js/id/operations/orthogonalize.js b/js/id/operations/orthogonalize.js index 482c4ba5b..2e5844398 100644 --- a/js/id/operations/orthogonalize.js +++ b/js/id/operations/orthogonalize.js @@ -10,7 +10,7 @@ iD.operations.Orthogonalize = function(selection, context) { operation.available = function() { return selection.length === 1 && context.entity(entityId).type === 'way' && - _.uniq(context.entity(entityId).nodes).length > 3; + _.uniq(context.entity(entityId).nodes).length > 2; }; operation.enabled = function() { From db2dc79e605230afd0c30fc5000d6920059a0137 Mon Sep 17 00:00:00 2001 From: Ian B Date: Sat, 23 Mar 2013 21:20:05 +0100 Subject: [PATCH 2/3] Refactor Orthogonalize --- js/id/actions/orthogonalize.js | 65 ++++++++++++++++------------------ 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/js/id/actions/orthogonalize.js b/js/id/actions/orthogonalize.js index 140ad5dce..d04317d78 100644 --- a/js/id/actions/orthogonalize.js +++ b/js/id/actions/orthogonalize.js @@ -6,23 +6,27 @@ iD.actions.Orthogonalize = function(wayId, projection) { var action = function(graph) { var way = graph.entity(wayId), nodes = graph.childNodes(way), - points, best, i, j, score, corner; + corner = {i: 0, dotp: 1}, + points, i, j, score, motions; - corner = {i: 0, dotp: 1}; //corner closest to 90 - - if(nodes.length == 4) { + if (nodes.length === 4) { points = _.uniq(nodes).map(function(n) { return projection(n.loc); }); - } else { - points = nodes.map(function(n) { return projection(n.loc); }); - score = squareness(); - } - - for (i = 0; i < 1000; i++) { - var motions = points.map(stepMap); - if(nodes.length == 4) { + for (i = 0; i < 1000; i++) { + motions = points.map(calcMotion); points[corner.i] = addPoints(points[corner.i],motions[corner.i]); score = corner.dotp; - } else { + if (score < 1.0e-8) { + break; + } + } + graph = graph.replace(graph.entity(nodes[corner.i].id) + .move(projection.invert(points[corner.i]))); + } else { + var best; + points = nodes.map(function(n) { return projection(n.loc); }); + score = squareness(); + for (i = 0; i < 1000; i++) { + motions = points.map(calcMotion); for (j = 0; j < motions.length; j++) { points[j] = addPoints(points[j],motions[j]); } @@ -31,26 +35,19 @@ iD.actions.Orthogonalize = function(wayId, projection) { best = _.clone(points); score = newScore; } + if (score < 1.0e-8) { + break; + } } - if (score < 1.0e-8) { - break; - } - } - - if(nodes.length == 4) { - graph = graph.replace(graph.entity(nodes[corner.i].id) - .move(projection.invert(points[corner.i]))); - } else { points = best; for (i = 0; i < points.length - 1; i++) { graph = graph.replace(graph.entity(nodes[i].id) - .move(projection.invert(points[i]))); + .move(projection.invert(points[i]))); } } - return graph; - function stepMap(b, i, array) { + function calcMotion(b, i, array) { var a = array[(i - 1 + array.length) % array.length], c = array[(i + 1) % array.length], p = subtractPoints(a, b), @@ -62,16 +59,16 @@ iD.actions.Orthogonalize = function(wayId, projection) { var dotp = p[0] * q[0] + p[1] * q[1]; - if(nodes.length == 4) { + // nasty hack to deal with almost-straight segments (angle is closer to 180 than to 90/270). + if (array.length > 3) { + if (dotp < -0.707106781186547) { + dotp += 1.0; + } + } else { if( Math.abs(dotp) < corner.dotp){ corner.i = i; corner.dotp = Math.abs(dotp); } - } else { - // nasty hack to deal with almost-straight segments (angle is closer to 180 than to 90/270). - if (dotp < -0.707106781186547) { - dotp += 1.0; - } } return normalizePoint(addPoints(p, q), 0.1 * dotp * scale); @@ -111,7 +108,7 @@ iD.actions.Orthogonalize = function(wayId, projection) { return [a[0] + b[0], a[1] + b[1]]; } - function normalizePoint(point, thickness) { + function normalizePoint(point, scale) { var vector = [0, 0]; var length = Math.sqrt(point[0] * point[0] + point[1] * point[1]); if (length !== 0) { @@ -119,8 +116,8 @@ iD.actions.Orthogonalize = function(wayId, projection) { vector[1] = point[1] / length; } - vector[0] *= thickness; - vector[1] *= thickness; + vector[0] *= scale; + vector[1] *= scale; return vector; } From 04060f0abb54397402011c3b7442d660847d639d Mon Sep 17 00:00:00 2001 From: Ian B Date: Sat, 23 Mar 2013 21:45:50 +0100 Subject: [PATCH 3/3] Add orthogonalize test spec --- test/index.html | 1 + test/spec/actions/orthogonalize.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 test/spec/actions/orthogonalize.js diff --git a/test/index.html b/test/index.html index 770d33e21..c16e61fb9 100644 --- a/test/index.html +++ b/test/index.html @@ -183,6 +183,7 @@ + diff --git a/test/spec/actions/orthogonalize.js b/test/spec/actions/orthogonalize.js new file mode 100644 index 000000000..690d73140 --- /dev/null +++ b/test/spec/actions/orthogonalize.js @@ -0,0 +1,30 @@ +describe("iD.actions.Orthogonalize", function () { + var projection = d3.geo.mercator(); + + it("orthoganalizes a quad", function () { + var graph = iD.Graph({ + 'a': iD.Node({id: 'a', loc: [0, 0]}), + 'b': iD.Node({id: 'b', loc: [4, 0]}), + 'c': iD.Node({id: 'c', loc: [3, 2]}), + 'd': iD.Node({id: 'd', loc: [0, 2]}), + '-': iD.Way({id: '-', nodes: ['a', 'b', 'c', 'd', 'a']}) + }); + + graph = iD.actions.Orthogonalize('-', projection)(graph); + + expect(graph.entity('-').nodes).to.have.length(5); + }); + + it("orthoganalizes a triangle", function () { + var graph = iD.Graph({ + 'a': iD.Node({id: 'a', loc: [0, 0]}), + 'b': iD.Node({id: 'b', loc: [3, 0]}), + 'c': iD.Node({id: 'c', loc: [2, 2]}), + '-': iD.Way({id: '-', nodes: ['a', 'b', 'c', 'a']}) + }); + + graph = iD.actions.Orthogonalize('-', projection)(graph); + + expect(graph.entity('-').nodes).to.have.length(4); + }); +});