Update centroid tests to use undefined.

This commit is contained in:
Jason Davies 2012-12-13 13:10:44 +00:00
Родитель 5e0c131f32
Коммит 44425c1874
2 изменённых файлов: 11 добавлений и 10 удалений

Просмотреть файл

@ -1,5 +1,6 @@
// TODO Unify this code with d3.geom.polygon centroid? // TODO Unify this code with d3.geom.polygon centroid?
// TODO Enforce positive area for exterior, negative area for interior? // TODO Enforce positive area for exterior, negative area for interior?
// TODO ignore lower dimensions.
var d3_geo_pathCentroid = { var d3_geo_pathCentroid = {
point: d3_geo_pathCentroidPoint, point: d3_geo_pathCentroidPoint,

Просмотреть файл

@ -150,7 +150,7 @@ suite.addBatch({
}, },
"MultiPoint": { "MultiPoint": {
"empty": function(centroid) { "empty": function(centroid) {
assert.isNull(centroid({type: "MultiPoint", coordinates: []})); assert.isUndefined(centroid({type: "MultiPoint", coordinates: []}));
}, },
"single point": function(centroid) { "single point": function(centroid) {
assert.deepEqual(centroid({type: "MultiPoint", coordinates: [[0, 0]]}), [480, 250]); assert.deepEqual(centroid({type: "MultiPoint", coordinates: [[0, 0]]}), [480, 250]);
@ -161,15 +161,15 @@ suite.addBatch({
}, },
"LineString": { "LineString": {
"empty": function(centroid) { "empty": function(centroid) {
assert.isNull(centroid({type: "LineString", coordinates: []})); assert.isUndefined(centroid({type: "LineString", coordinates: []}));
}, },
"two points": function(centroid) { "two points": function(centroid) {
assert.deepEqual(centroid({type: "LineString", coordinates: [[100, 0], [0, 0]]}), [730, 250]); assert.deepEqual(centroid({type: "LineString", coordinates: [[100, 0], [0, 0]]}), [730, 250]);
assert.deepEqual(centroid({type: "LineString", coordinates: [[0, 0], [100, 0], [101, 0]]}), [732.5, 250]); assert.deepEqual(centroid({type: "LineString", coordinates: [[0, 0], [100, 0], [101, 0]]}), [732.5, 250]);
}, },
"two points, one unique": function(centroid) { "two points, one unique": function(centroid) {
assert.isNull(centroid({type: "LineString", coordinates: [[-122, 37], [-122, 37]]})); assert.isUndefined(centroid({type: "LineString", coordinates: [[-122, 37], [-122, 37]]}));
assert.isNull(centroid({type: "LineString", coordinates: [[ -74, 40], [ -74, 40]]})); assert.isUndefined(centroid({type: "LineString", coordinates: [[ -74, 40], [ -74, 40]]}));
}, },
"three points; two unique": function(centroid) { "three points; two unique": function(centroid) {
assert.deepEqual(centroid({type: "LineString", coordinates: [[-122, 37], [-74, 40], [-74, 40]]}), [-10, 57.5]); assert.deepEqual(centroid({type: "LineString", coordinates: [[-122, 37], [-74, 40], [-74, 40]]}), [-10, 57.5]);
@ -186,7 +186,7 @@ suite.addBatch({
assert.deepEqual(centroid({type: "Polygon", coordinates: [[[100, 0], [100, 1], [101, 1], [101, 0], [100, 0]]]}), [982.5, 247.5]); assert.deepEqual(centroid({type: "Polygon", coordinates: [[[100, 0], [100, 1], [101, 1], [101, 0], [100, 0]]]}), [982.5, 247.5]);
}, },
"zero area": function(centroid) { "zero area": function(centroid) {
assert.isNull(centroid({type: "Polygon", coordinates: [[[1, 0], [2, 0], [3, 0], [1, 0]]]})); assert.isUndefined(centroid({type: "Polygon", coordinates: [[[1, 0], [2, 0], [3, 0], [1, 0]]]}));
}, },
"two rings, one zero area": function(centroid) { "two rings, one zero area": function(centroid) {
assert.deepEqual(centroid({type: "Polygon", coordinates: [ assert.deepEqual(centroid({type: "Polygon", coordinates: [
@ -206,7 +206,7 @@ suite.addBatch({
}, },
"MultiPolygon": { "MultiPolygon": {
"empty": function(centroid) { "empty": function(centroid) {
assert.isNull(centroid({type: "MultiPolygon", coordinates: []})); assert.isUndefined(centroid({type: "MultiPolygon", coordinates: []}));
}, },
"single polygon": function(centroid) { "single polygon": function(centroid) {
assert.deepEqual(centroid({type: "MultiPolygon", coordinates: [[[[100, 0], [100, 1], [101, 1], [101, 0], [100, 0]]]]}), [982.5, 247.5]); assert.deepEqual(centroid({type: "MultiPolygon", coordinates: [[[[100, 0], [100, 1], [101, 1], [101, 0], [100, 0]]]]}), [982.5, 247.5]);
@ -225,13 +225,13 @@ suite.addBatch({
} }
}, },
"GeometryCollection": { "GeometryCollection": {
"is undefined": function(centroid) { "Point": function(centroid) {
assert.isUndefined(centroid({type: "GeometryCollection", geometries: [{type: "Point", coordinates: [0, 0]}]})); assert.deepEqual(centroid({type: "GeometryCollection", geometries: [{type: "Point", coordinates: [0, 0]}]}), [480, 250]);
} }
}, },
"FeatureCollection": { "FeatureCollection": {
"is undefined": function(centroid) { "Point": function(centroid) {
assert.isUndefined(centroid({type: "FeatureCollection", features: [{type: "Feature", geometry: {type: "Point", coordinates: [0, 0]}}]})); assert.deepEqual(centroid({type: "FeatureCollection", features: [{type: "Feature", geometry: {type: "Point", coordinates: [0, 0]}}]}), [480, 250]);
} }
}, },
"Sphere": function(centroid) { "Sphere": function(centroid) {