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

Fix broken test of new Bounds.intersectBounds, add test to ensure it doesn't

Browse Source 
break again in the future. 


git-svn-id: http://svn.openlayers.org/trunk/openlayers@1530 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2006-10-03 01:05:42 +00:00
parent 07fc49ab31
commit 66a5d90965
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/BaseTypes.js
+11 -2
View File
@@ -490,9 +490,18 @@ OpenLayers.Bounds.prototype = {
if (inclusive == null) { if (inclusive == null) {
inclusive = true; inclusive = true;
} }
var inBottom = (bounds.bottom == this.bottom && bounds.top == this.top) ?
true : (bounds.bottom > this.bottom) && (bounds.bottom < this.top);
var inTop = (bounds.bottom == this.bottom && bounds.top == this.top) ?
true : (bounds.top > this.bottom) && (bounds.top < this.top);
var inRight = (bounds.right == this.right && bounds.left == this.left) ?
true : (bounds.right > this.left) && (bounds.right < this.right);
var inLeft = (bounds.right == this.right && bounds.left == this.left) ?
true : (bounds.left > this.left) && (bounds.left < this.right);
return (this.containsBounds(bounds, true, inclusive) || return (this.containsBounds(bounds, true, inclusive) ||
bounds.containsBounds(this, true, inclusive)); bounds.containsBounds(this, true, inclusive) ||
(inTop || inBottom ) && (inLeft || inRight ));
}, },
/** /**
@@ -535,7 +544,7 @@ OpenLayers.Bounds.prototype = {
inBottom = (bounds.bottom > this.bottom) && (bounds.bottom < this.top); inBottom = (bounds.bottom > this.bottom) && (bounds.bottom < this.top);
} }
return (partial) ? (inTop || inBottom) && (inLeft || inRight ) return (partial) ? (inTop || inBottom ) && (inLeft || inRight )
: (inTop && inLeft && inBottom && inRight); : (inTop && inLeft && inBottom && inRight);
}, },
tests/test_Bounds.html
+3 -1
View File
@@ -108,15 +108,17 @@
} }
function test_08a_Bounds_intersectsBounds(t) { function test_08a_Bounds_intersectsBounds(t) {
t.plan( 15 ); t.plan( 16 );
var aBounds = new OpenLayers.Bounds(-180, -90, 180, 90); var aBounds = new OpenLayers.Bounds(-180, -90, 180, 90);
//inside //inside
var bBounds = new OpenLayers.Bounds(-20, -10, 20, 10); var bBounds = new OpenLayers.Bounds(-20, -10, 20, 10);
var cBounds = new OpenLayers.Bounds(-181,-90,180,90);
t.eq( aBounds.intersectsBounds(bBounds), true, "(" + aBounds.toBBOX() + ") correctly intersects (" + bBounds.toBBOX() + ")" ); t.eq( aBounds.intersectsBounds(bBounds), true, "(" + aBounds.toBBOX() + ") correctly intersects (" + bBounds.toBBOX() + ")" );
t.eq( aBounds.intersectsBounds(bBounds, true), true, "(" + aBounds.toBBOX() + ") correctly intersects (" + bBounds.toBBOX() + "), inclusive is true" ); t.eq( aBounds.intersectsBounds(bBounds, true), true, "(" + aBounds.toBBOX() + ") correctly intersects (" + bBounds.toBBOX() + "), inclusive is true" );
t.eq( aBounds.intersectsBounds(bBounds, false), true, "(" + aBounds.toBBOX() + ") correctly intersects (" + bBounds.toBBOX() + "), inclusive is false" ); t.eq( aBounds.intersectsBounds(bBounds, false), true, "(" + aBounds.toBBOX() + ") correctly intersects (" + bBounds.toBBOX() + "), inclusive is false" );
t.eq( cBounds.intersectsBounds(aBounds, false), true, "cBounds with aBounds adjusted one degree left passes intersect bounds. (3 sides match, 1 side different)." );
//outside //outside
bBounds = new OpenLayers.Bounds(-181, -91, 181, 91); bBounds = new OpenLayers.Bounds(-181, -91, 181, 91);