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

Remove geo.centroid(), use d3's instead

Browse Source
This commit is contained in:
Ansis Brammanis
2013-01-23 18:39:14 -05:00
parent c337182791
commit d14fdfa828
3 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/id/geo.js
View File

@@ -74,30 +74,6 @@ iD.geo.polygonIntersectsPolygon = function(outer, inner) {
});
};
// May have issues with self interesecting polygons
iD.geo.polygonCentroid = function(polygon) {
var x = 0,
y = 0,
area = iD.geo.area(polygon);
for (var i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
var xi = polygon[i][0], yi = polygon[i][1];
var xj = polygon[j][0], yj = polygon[j][1];
x += (xi + xj) * (xj * yi - xi * yj);
y += (yi + yj) * (xj * yi - xi * yj);
}
return [x / 6 / area, y / 6 / area];
};
iD.geo.area = function(polygon) {
var area = 0;
for (var i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
var xi = polygon[i][0], yi = polygon[i][1];
var xj = polygon[j][0], yj = polygon[j][1];
area += xj * yi - xi * yj;
}
return area/2;
};
iD.geo.pathLength = function(path) {
var length = 0,
dx, dy;

2
js/id/svg/labels.js
View File

@@ -284,7 +284,7 @@ iD.svg.Labels = function(projection) {
function getAreaLabel(entity, width, height) {
var nodes = _.pluck(entity.nodes, 'loc')
.map(iD.svg.RoundProjection(projection)),
centroid = iD.geo.polygonCentroid(nodes),
centroid = d3.geom.polygon(nodes).centroid(),
extent = entity.extent(graph),
entitywidth = projection(extent[1])[0] - projection(extent[0])[0];

14
test/spec/util.js
View File

@@ -113,20 +113,6 @@ describe('iD.Util', function() {
});
});
describe("#area", function() {
it('calculates the area of a trapezoid', function() {
var polygon = [[0, 0], [3, 0], [2, 2], [1, 2]];
expect(iD.geo.area(polygon)).to.eql(4);
});
});
describe('#polygonCentroid', function() {
it('calculates the centroid of a square', function() {
var square = [[0, 0], [0, 2], [2, 2], [2, 0]];
expect(iD.geo.polygonCentroid(square)).to.eql([1, 1]);
});
});
describe('#pathLength', function() {
it('calculates a simple path length', function() {
var path = [[0, 0], [0, 1], [3, 5]];