CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-14 09:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/bhousel-bhousel-operations'

Browse Source
This commit is contained in:
John Firebaugh
2014-03-28 10:26:14 -07:00
parent 75d814e46c 163939123f
commit 36e4e001ad
6 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/core.yaml
View File

@@ -55,6 +55,7 @@ en:
line: Made a line circular.
area: Made an area circular.
not_closed: This can't be made circular because it's not a loop.
too_large: This can't be made circular because it extends too far beyond the viewable map.
orthogonalize:
title: Square
description:
@@ -65,6 +66,7 @@ en:
line: Squared the corners of a line.
area: Squared the corners of an area.
not_squarish: This can't be made square because it is not squarish.
too_large: This can't be made square because it extends too far beyond the viewable map.
straighten:
title: Straighten
description: Straighten this line.

6
dist/locales/en.json vendored
View File

@@ -71,7 +71,8 @@
"line": "Made a line circular.",
"area": "Made an area circular."
},
"not_closed": "This can't be made circular because it's not a loop."
"not_closed": "This can't be made circular because it's not a loop.",
"too_large": "This can't be made circular because not enough of it is currently visible."
},
"orthogonalize": {
"title": "Square",
@@ -84,7 +85,8 @@
"line": "Squared the corners of a line.",
"area": "Squared the corners of an area."
},
"not_squarish": "This can't be made square because it is not squarish."
"not_squarish": "This can't be made square because it is not squarish.",
"too_large": "This can't be made square because not enough of it is currently visible."
},
"straighten": {
"title": "Straighten",

4
js/id/geo/extent.js
View File

@@ -22,6 +22,10 @@ _.extend(iD.geo.Extent.prototype, {
Math.max(obj[1][1], this[1][1])]);
},
area: function() {
return Math.abs((this[1][0] - this[0][0]) * (this[1][1] - this[0][1]));
},
center: function() {
return [(this[0][0] + this[1][0]) / 2,
(this[0][1] + this[1][1]) / 2];

12
js/id/operations/circularize.js
View File

@@ -14,7 +14,17 @@ iD.operations.Circularize = function(selectedIDs, context) {
};
operation.disabled = function() {
return action.disabled(context.graph());
var way = context.entity(entityId),
wayExtent = way.extent(context.graph()),
mapExtent = context.extent(),
intersection = mapExtent.intersection(wayExtent),
pctVisible = intersection.area() / wayExtent.area();
if (pctVisible < 0.8) {
return 'too_large';
} else {
return action.disabled(context.graph());
}
};
operation.tooltip = function() {

12
js/id/operations/orthogonalize.js
View File

@@ -17,7 +17,17 @@ iD.operations.Orthogonalize = function(selectedIDs, context) {
};
operation.disabled = function() {
return action.disabled(context.graph());
var way = context.entity(entityId),
wayExtent = way.extent(context.graph()),
mapExtent = context.extent(),
intersection = mapExtent.intersection(wayExtent),
pctVisible = intersection.area() / wayExtent.area();
if (pctVisible < 0.8) {
return 'too_large';
} else {
return action.disabled(context.graph());
}
};
operation.tooltip = function() {

6
test/spec/geo/extent.js
View File

@@ -51,6 +51,12 @@ describe("iD.geo.Extent", function () {
});
});
describe("#area", function () {
it("returns the area", function () {
expect(iD.geo.Extent([0, 0], [5, 10]).area()).to.eql(50);
});
});
describe("#padByMeters", function () {
it("does not change centerpoint of an extent", function () {
var min = [0, 0], max = [5, 10];