ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tim's big refactoring of the Geometry modules. Fixes #590. All tests pass in FF (except the PanZoomBar stuff, which wasn't touched by this patch) and IE.

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@2931 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Schuyler Erle
2007-03-30 21:42:32 +00:00
parent 91ec16c81a
commit 313704b844
16 changed files with 374 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Geometry/test_Collection.html
+28 -6
View File
@@ -142,18 +142,19 @@
}
function test_07_Collection_addComponent(t) {
t.plan(3);
t.plan(10);
var coll = new OpenLayers.Geometry.Collection();
//null
//null
coll.addComponent(null);
t.ok(true, "no breakage, no executage from null input")
t.ok(!coll.addComponent(null),
"addComponent returns false for bad component")
//good component
//good component
var component = new OpenLayers.Geometry.Point(3,4);
coll.addComponent(component);
t.ok(coll.addComponent(component),
"addComponent returns true for good component");
t.ok(coll.bounds == null, "bounds cache correctly cleared");
var foundComponent = false;
@@ -163,6 +164,27 @@
}
}
t.ok(foundComponent, "component added to internal array");
// restricted components
coll.componentTypes = ["OpenLayers.Geometry.Point",
"OpenLayers.Geometry.LineString"];
var point1 = new OpenLayers.Geometry.Point(0,0);
var point2 = new OpenLayers.Geometry.Point(1,1);
var line = new OpenLayers.Geometry.LineString([point1, point2]);
var multipoint = new OpenLayers.Geometry.MultiPoint([point1, point2]);
t.ok(coll.addComponent(point1),
"addComponent returns true for 1st geometry type in componentTypes");
t.ok(OpenLayers.Util.indexOf(coll.components, point1) > -1,
"addComponent adds 1st restricted type to components array");
t.ok(coll.addComponent(line),
"addComponent returns true for 2nd geometry type in componentTypes");
t.ok(OpenLayers.Util.indexOf(coll.components, point1) > -1,
"addComponent adds 2nd restricted type to components array");
t.ok(!coll.addComponent(multipoint),
"addComponent returns false for geometry type not in componentTypes");
t.ok(OpenLayers.Util.indexOf(coll.components, multipoint) == -1,
"addComponent doesn't add restricted type to component array");
}
tests/Geometry/test_LineString.html
+45 -5
View File
@@ -34,9 +34,9 @@
function test_03_LineString_removeComponent(t) {
t.plan(2);
OpenLayers.Geometry.Curve.prototype._removeComponent =
OpenLayers.Geometry.Curve.prototype.removeComponent;
OpenLayers.Geometry.Curve.prototype.removeComponent =
OpenLayers.Geometry.Collection.prototype._removeComponent =
OpenLayers.Geometry.Collection.prototype.removeComponent;
OpenLayers.Geometry.Collection.prototype.removeComponent =
function(point) { g_removeComponent = point; };
line = new OpenLayers.Geometry.LineString(components);
@@ -49,8 +49,8 @@
line.removeComponent(components[0]);
t.ok(g_removeComponent, components[0], "point removed if 3 points in components");
OpenLayers.Geometry.Curve.prototype.removeComponent =
OpenLayers.Geometry.Curve.prototype._removeComponent;
OpenLayers.Geometry.Collection.prototype.removeComponent =
OpenLayers.Geometry.Collection.prototype._removeComponent;
}
function test_04_LineString_move(t) {
@@ -73,6 +73,46 @@
t.eq(line.components[1].y, y1 + dy, "move() correctly modifies second y");
}
function test_LineString_equals(t) {
t.plan(3);
var x0 = Math.random() * 100;
var y0 = Math.random() * 100;
var x1 = Math.random() * 100;
var y1 = Math.random() * 100;
var point0 = new OpenLayers.Geometry.Point(x0, y0);
var point1 = new OpenLayers.Geometry.Point(x1, y1);
var geometry = new OpenLayers.Geometry.LineString([point0, point1]);
var equal = new OpenLayers.Geometry.LineString([point0, point1]);
var offX = new OpenLayers.Geometry.LineString([
new OpenLayers.Geometry.Point(x0 + 1, y0),
new OpenLayers.Geometry.Point(x1 + 1, y1)]);
var offY = new OpenLayers.Geometry.LineString([
new OpenLayers.Geometry.Point(x0, y0 + 1),
new OpenLayers.Geometry.Point(x1, y1 + 1)]);
t.ok(geometry.equals(equal),
"equals() returns true for a geometry with equivalent coordinates");
t.ok(!geometry.equals(offX),
"equals() returns false for a geometry with offset x");
t.ok(!geometry.equals(offY),
"equals() returns false for a geometry with offset y");
}
function test_LineString_clone(t) {
t.plan(2);
var x0 = Math.random() * 100;
var y0 = Math.random() * 100;
var x1 = Math.random() * 100;
var y1 = Math.random() * 100;
var point0 = new OpenLayers.Geometry.Point(x0, y0);
var point1 = new OpenLayers.Geometry.Point(x1, y1);
var geometry = new OpenLayers.Geometry.LineString([point0, point1]);
var clone = geometry.clone();
t.ok(clone instanceof OpenLayers.Geometry.LineString,
"clone() creates an OpenLayers.Geometry.LineString");
t.ok(geometry.equals(clone), "clone has equivalent coordinates");
}
// -->
</script>
tests/Geometry/test_LinearRing.html
+21 -14
View File
@@ -23,29 +23,36 @@
}
function test_02_LinearRing_addComponent(t) {
t.plan(12);
t.plan(13);
var ring = new OpenLayers.Geometry.LinearRing();
var point = new OpenLayers.Geometry.Point(0,0);
ring.addComponent( point );
t.ok(ring.addComponent(point),
"addComponent returns true for 1st point");
t.eq(ring.components.length, 2, "add first point, correct length");
t.ok(ring.components[0].equals(point), "point one correct");
t.ok(ring.components[0].equals(ring.components[ring.components.length - 1]), "first and last point equal");
ring.addComponent( point );
t.eq(ring.components.length, 3, "add second point, correct length");
t.ok(ring.components[0].equals(point), "point one correct");
t.ok(ring.components[1].equals(point), "point two correct");
t.ok(ring.components[0].equals(ring.components[ring.components.length - 1]), "first and last point equal");
newPoint = new OpenLayers.Geometry.Point(10,10);
ring.addComponent( newPoint );
t.eq(ring.components.length, 4, "correctly adds 3rd point");
t.ok(ring.addComponent( newPoint ),
"addComponent returns true for unique point");
t.eq(ring.components.length, 3, "correctly adds 3rd point");
t.ok(ring.components[0].equals(point), "point one correct");
t.ok(ring.components[1].equals(point), "point two correct");
t.ok(ring.components[2].equals(newPoint), "point one correct");
t.ok(ring.components[0].equals(ring.components[ring.components.length - 1]), "first and last point equal");
t.ok(ring.components[1].equals(newPoint), "point one correct");
t.ok(ring.components[2].equals(ring.components[0]), "first and last point equal");
var length = ring.components.length;
var clone = ring.components[length - 1].clone();
t.ok(!ring.addComponent(clone),
"addComponent returns false for adding a duplicate last point");
t.eq(ring.components.length, length,
"components remains unchanged after trying to add duplicate point");
t.ok(ring.addComponent(clone, length - 1),
"addComponent returns true when adding a duplicate with an index");
t.eq(ring.components.length, length + 1,
"components increase in length after adding a duplicate point with index");
}
function test_03_LinearRing_removeComponent(t) {
tests/Geometry/test_MultiPoint.html
+37 -3
View File
@@ -7,14 +7,14 @@
function test_01_MultiPoint_constructor (t) {
t.plan( 2 );
multipoint = new OpenLayers.Geometry.MultiPoint();
var multipoint = new OpenLayers.Geometry.MultiPoint();
t.ok( multipoint instanceof OpenLayers.Geometry.MultiPoint, "new OpenLayers.Geometry.MultiPoint returns multipoint object" );
t.eq( multipoint.CLASS_NAME, "OpenLayers.Geometry.MultiPoint", "multipoint.CLASS_NAME is set correctly");
}
function test_01a_MultiPoint_constructor (t) {
t.plan( 3 );
multipoint = new OpenLayers.Geometry.MultiPoint([point]);
var multipoint = new OpenLayers.Geometry.MultiPoint([point]);
t.ok( multipoint instanceof OpenLayers.Geometry.MultiPoint, "new OpenLayers.Geometry.MultiPoint returns multipoint object" );
t.eq( multipoint.CLASS_NAME, "OpenLayers.Geometry.MultiPoint", "multipoint.CLASS_NAME is set correctly");
t.eq( multipoint.components.length, 1, "multipolygon.components.length is set correctly");
@@ -23,7 +23,7 @@
function test_02_MultiPoint_move(t) {
t.plan(4);
multipoint = new OpenLayers.Geometry.MultiPoint([point]);
var multipoint = new OpenLayers.Geometry.MultiPoint([point]);
var x = point.x;
var y = point.y;
@@ -36,6 +36,40 @@
t.eq(multipoint.components[0].lat, y + dy, "move() correctly modifies lat");
}
function test_MultiPoint_equals(t) {
t.plan(3);
var x = Math.random() * 100;
var y = Math.random() * 100;
var geometry = new OpenLayers.Geometry.MultiPoint(
[new OpenLayers.Geometry.Point(x, y)]);
var equal = new OpenLayers.Geometry.MultiPoint(
[new OpenLayers.Geometry.Point(x, y)]);
var offX = new OpenLayers.Geometry.MultiPoint(
[new OpenLayers.Geometry.Point(x + 1, y)]);
var offY = new OpenLayers.Geometry.MultiPoint(
[new OpenLayers.Geometry.Point(x, y + 1)]);
t.ok(geometry.equals(equal),
"equals() returns true for a geometry with equivalent coordinates");
t.ok(!geometry.equals(offX),
"equals() returns false for a geometry with offset x");
t.ok(!geometry.equals(offY),
"equals() returns false for a geometry with offset y");
}
function test_MultiPoint_clone(t) {
t.plan(2);
var x = Math.random() * 100;
var y = Math.random() * 100;
var geometry = new OpenLayers.Geometry.MultiPoint(
[new OpenLayers.Geometry.Point(x, y)]);
var clone = geometry.clone();
t.ok(clone instanceof OpenLayers.Geometry.MultiPoint,
"clone() creates an OpenLayers.Geometry.MultiPoint");
t.ok(geometry.equals(clone), "clone has equivalent coordinates");
}
// -->
</script>
</head>
tests/Geometry/test_Point.html
+29
View File
@@ -103,6 +103,35 @@
t.eq(point.lon, x + dx, "move() correctly modifies lon");
t.eq(point.lat, y + dy, "move() correctly modifies lat");
}
function test_Point_equals(t) {
t.plan(3);
var x = Math.random() * 100;
var y = Math.random() * 100;
var geometry = new OpenLayers.Geometry.Point(x, y);
var equal = new OpenLayers.Geometry.Point(x, y);
var offX = new OpenLayers.Geometry.Point(x + 1, y);
var offY = new OpenLayers.Geometry.Point(x, y + 1);
t.ok(geometry.equals(equal),
"equals() returns true for a geometry with equivalent coordinates");
t.ok(!geometry.equals(offX),
"equals() returns false for a geometry with offset x");
t.ok(!geometry.equals(offY),
"equals() returns false for a geometry with offset y");
}
function test_Point_clone(t) {
t.plan(2);
var x = Math.random() * 100;
var y = Math.random() * 100;
var geometry = new OpenLayers.Geometry.Point(x, y);
var clone = geometry.clone();
t.ok(clone instanceof OpenLayers.Geometry.Point,
"clone() creates an OpenLayers.Geometry.Point");
t.ok(geometry.equals(clone), "clone has equivalent coordinates");
}
// -->
</script>
tests/Geometry/test_Polygon.html
+50
View File
@@ -105,6 +105,56 @@
t.eq(polygon.components[1].components[0].x, x2 + dx, "move() correctly modifies second x");
t.eq(polygon.components[1].components[0].y, y2 + dy, "move() correctly modifies second y");
}
function test_Polygon_equals(t) {
t.plan(3);
var x0 = Math.random() * 100;
var y0 = Math.random() * 100;
var x1 = Math.random() * 100;
var y1 = Math.random() * 100;
var x2 = Math.random() * 100;
var y2 = Math.random() * 100;
var point0 = new OpenLayers.Geometry.Point(x0, y0);
var point1 = new OpenLayers.Geometry.Point(x1, y1);
var point2 = new OpenLayers.Geometry.Point(x2, y2);
var pointX = new OpenLayers.Geometry.Point(x0 + 1, y0);
var pointY = new OpenLayers.Geometry.Point(x0, y0 + 1);
var geometry = new OpenLayers.Geometry.Polygon([
new OpenLayers.Geometry.LinearRing([point0, point1, point2])]);
var equal = new OpenLayers.Geometry.Polygon([
new OpenLayers.Geometry.LinearRing([point0, point1, point2])]);
var offX = new OpenLayers.Geometry.Polygon([
new OpenLayers.Geometry.LinearRing([pointX, point1, point2])]);
var offY = new OpenLayers.Geometry.Polygon([
new OpenLayers.Geometry.LinearRing([pointY, point1, point2])]);
t.ok(geometry.equals(equal),
"equals() returns true for a geometry with equivalent coordinates");
t.ok(!geometry.equals(offX),
"equals() returns false for a geometry with offset x");
t.ok(!geometry.equals(offY),
"equals() returns false for a geometry with offset y");
}
function test_Polygon_clone(t) {
t.plan(2);
var x0 = Math.random() * 100;
var y0 = Math.random() * 100;
var x1 = Math.random() * 100;
var y1 = Math.random() * 100;
var x2 = Math.random() * 100;
var y2 = Math.random() * 100;
var point0 = new OpenLayers.Geometry.Point(x0, y0);
var point1 = new OpenLayers.Geometry.Point(x1, y1);
var point2 = new OpenLayers.Geometry.Point(x2, y2);
var geometry = new OpenLayers.Geometry.Polygon([
new OpenLayers.Geometry.LinearRing([point0, point1, point2])]);
var clone = geometry.clone();
t.ok(clone instanceof OpenLayers.Geometry.Polygon,
"clone() creates an OpenLayers.Geometry.Polygon");
t.ok(geometry.equals(clone), "clone has equivalent coordinates");
}
// -->
</script>