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

Adjust for style, formatting, and jshint

Browse Source
This commit is contained in:
John Firebaugh
2013-02-04 09:17:00 -08:00
parent 50de4155f4
commit 8699b4a49e
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/orthogonalize.js
+22 -29
View File
@@ -1,18 +1,14 @@
iD.actions.Orthogonalize = function(wayId, projection) {
var action = function(graph) {
var way = graph.entity(wayId),
nodes = graph.childNodes(way);
var points = nodes.map(function(n) {
return projection(n.loc);
}),
quad_nodes = [];
nodes = graph.childNodes(way),
points = nodes.map(function(n) { return projection(n.loc); }),
quad_nodes = [], i, j;
var score = squareness();
for (var i = 0; i < 1000; i++) {
for (i = 0; i < 1000; i++) {
var motions = points.map(stepMap);
for (var j = 0; j < motions.length; j++) {
for (j = 0; j < motions.length; j++) {
points[j] = addPoints(points[j],motions[j]);
}
var newScore = squareness();
@@ -24,6 +20,7 @@ iD.actions.Orthogonalize = function(wayId, projection) {
break;
}
}
for (i = 0; i < points.length - 1; i++) {
quad_nodes.push(iD.Node({ loc: projection.invert(points[i]) }));
}
@@ -31,7 +28,7 @@ iD.actions.Orthogonalize = function(wayId, projection) {
for (i = 0; i < nodes.length; i++) {
if (graph.parentWays(nodes[i]).length > 1) {
var closest, closest_dist = Infinity, dist;
for (var j = 0; j < quad_nodes.length; j++) {
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;
@@ -47,7 +44,7 @@ iD.actions.Orthogonalize = function(wayId, projection) {
}
var ids = _.pluck(quad_nodes, 'id'),
difference = _.difference(_.uniq(way.nodes), ids);
difference = _.difference(_.uniq(way.nodes), ids);
ids.push(ids[0]);
@@ -60,28 +57,25 @@ iD.actions.Orthogonalize = function(wayId, projection) {
return graph;
function stepMap(b, i, array) {
var a, c, p, q = [];
a = array[(i - 1 + array.length) % array.length];
c = array[(i + 1) % array.length];
p = subtractPoints(a, b);
q = subtractPoints(c, b);
var a = array[(i - 1 + array.length) % array.length],
c = array[(i + 1) % array.length],
p = subtractPoints(a, b),
q = subtractPoints(c, b);
var scale = p.length + q.length;
p = normalizePoint(p, 1.0);
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;
}
var v = [];
v = addPoints(p, q);
v = normalizePoint(v, 0.1 * dotp * scale);
return v;
return normalizePoint(addPoints(p, q), 0.1 * dotp * scale);
}
function squareness() {
var g = 0.0;
for (var i = 1; i < points.length - 1; i++) {
var score = scoreOfPoints(points[i - 1], points[i], points[i + 1]);
@@ -95,17 +89,16 @@ iD.actions.Orthogonalize = function(wayId, projection) {
}
function scoreOfPoints(a, b, c) {
var p, q = [];
p = subtractPoints(a, b);
q = subtractPoints(c, b);
var p = subtractPoints(a, b),
q = subtractPoints(c, b);
p = normalizePoint(p, 1.0);
q = normalizePoint(q, 1.0);
var dotp = p[0] * q[0] + p[1] * q[1];
// score is constructed so that +1, -1 and 0 are all scored 0, any other angle
// is scored higher.
var score = 2.0 * Math.min(Math.abs(dotp - 1.0), Math.min(Math.abs(dotp), Math.abs(dotp + 1)));
return score;
return 2.0 * Math.min(Math.abs(dotp - 1.0), Math.min(Math.abs(dotp), Math.abs(dotp + 1)));
}
function subtractPoints(a, b) {
@@ -113,13 +106,13 @@ iD.actions.Orthogonalize = function(wayId, projection) {
}
function addPoints(a, b) {
return [a[0]+b[0],a[1]+b[1]];
return [a[0] + b[0], a[1] + b[1]];
}
function normalizePoint(point, thickness) {
var vector = [0,0];
var vector = [0, 0];
var length = Math.sqrt(point[0] * point[0] + point[1] * point[1]);
if(length != 0){
if (length !== 0) {
vector[0] = point[0] / length;
vector[1] = point[1] / length;
}