CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-31 20:21:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into lasso

Browse Source
This commit is contained in:
Tom MacWright
2013-02-07 16:22:11 -05:00
parent f0b761b979 02d4b8f1aa
commit 6a7e508f9e
1 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/orthogonalize.js
+1 -30
View File
@@ -28,36 +28,7 @@ iD.actions.Orthogonalize = function(wayId, projection) {
points = best;
for (i = 0; i < points.length - 1; i++) {
quad_nodes.push(iD.Node({ loc: projection.invert(points[i]) }));
}
for (i = 0; i < nodes.length; i++) {
if (graph.parentWays(nodes[i]).length > 1) {
var closest, closest_dist = Infinity, dist;
for (j = 0; j < quad_nodes.length; j++) {
dist = iD.geo.dist(quad_nodes[j].loc, nodes[i].loc);
if (dist < closest_dist) {
closest_dist = dist;
closest = j;
}
}
quad_nodes.splice(closest, 1, nodes[i]);
}
}
for (i = 0; i < quad_nodes.length; i++) {
graph = graph.replace(quad_nodes[i]);
}
var ids = _.pluck(quad_nodes, 'id'),
difference = _.difference(_.uniq(way.nodes), ids);
ids.push(ids[0]);
graph = graph.replace(way.update({nodes: ids}));
for (i = 0; i < difference.length; i++) {
graph = iD.actions.DeleteNode(difference[i])(graph);
graph = graph.replace(graph.entity(nodes[i].id).move(projection.invert(points[i])));
}
return graph;