Changeset 5625

Timestamp:

01/02/08 14:16:58 (1 year ago)

Author:

tschaub

Message:

Giving vector features an onScreen method. By default, this uses geometry.intersects. If a rougher approximation will do, call with boundsOnly set to true. r=crschmidt (closes #1238)

Files:

• trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Feature/Vector.js (modified) (1 diff)
• trunk/openlayers/tests/BaseTypes/test_Bounds.html (modified) (1 diff)
• trunk/openlayers/tests/Feature/test_Vector.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js

@@ -147 +147 @@
-
-        return bbox;
+    },
+    
+    /**
+     * APIMethod: toGeometry
+     * Create a new polygon geometry based on this bounds.
+     *
+     * Returns:
+     * {<OpenLayers.Geometry.Polygon>} A new polygon with the coordinates
+     *     of this bounds.
+     */
+    toGeometry: function() {
+        return new OpenLayers.Geometry.Polygon([
+            new OpenLayers.Geometry.LinearRing([
+                new OpenLayers.Geometry.Point(this.left, this.bottom),
+                new OpenLayers.Geometry.Point(this.right, this.bottom),
+                new OpenLayers.Geometry.Point(this.right, this.top),
+                new OpenLayers.Geometry.Point(this.left, this.top)
+            ])
+        ]);
-    },
-    

trunk/openlayers/lib/OpenLayers/Feature/Vector.js

@@ -115 +115 @@
-    /**
-     * Method: onScreen
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-    

trunk/openlayers/tests/BaseTypes/test_Bounds.html

@@ -77 +77 @@
-    }
-
+    function test_Bounds_toGeometry(t) {
+        t.plan(7);
+        var minx = Math.random();
+        var miny = Math.random();
+        var maxx = Math.random();
+        var maxy = Math.random();
+        var bounds = new OpenLayers.Bounds(minx, miny, maxx, maxy);
+        var poly = bounds.toGeometry();
+        t.eq(poly.CLASS_NAME, "OpenLayers.Geometry.Polygon",
+             "polygon instance created");
+        t.eq(poly.components.length, 1,
+             "polygon with one ring created");
+        var ring = poly.components[0];
+        t.eq(ring.components.length, 5,
+             "four sided polygon created");
+        t.eq(ring.components[0].x, minx,
+             "bounds left preserved");
+        t.eq(ring.components[0].y, miny,
+             "bounds bottom preserved");
+        t.eq(ring.components[2].x, maxx,
+             "bounds left preserved");
+        t.eq(ring.components[2].y, maxy,
+             "bounds bottom preserved");
+    }
+
-    function test_04_Bounds_contains(t) {
-        t.plan( 6 );

trunk/openlayers/tests/Feature/test_Vector.html

@@ -22 +22 @@
-        t.eq(feature.geometry.id, geometry.id,
-             "geometry.property set properly" );
+    }
+    
+    function test_Feature_onScreen(t) {
+        t.plan(6);
+        var line = new OpenLayers.Geometry.LineString([
+            new OpenLayers.Geometry.Point(0, 0),
+            new OpenLayers.Geometry.Point(10, 20)
+        ]);
+        var feature = new OpenLayers.Feature.Vector(line);
+        feature.layer = {
+            map: {
+                getExtent: function() {
+                    return new OpenLayers.Bounds(5, 5, 10, 10);
+                }
+            }
+        };
+        t.eq(feature.onScreen(), true,
+             "intersecting feature returns true for intersection");
+        t.eq(feature.onScreen(true), true,
+             "intersecting feature returns true for bounds only");
+        
+        // move the line so only the bounds intersects
+        line.move(0, 5);
+        t.eq(feature.onScreen(), false,
+             "bounds-only feature returns false for intersection");
+        t.eq(feature.onScreen(true), true,
+             "bounds-only feature returns true for bounds only");
+
+        // move the line so bounds does not intersect
+        line.move(0, 10);
+        t.eq(feature.onScreen(), false,
+             "off-screen feature returns false for intersection");
+        t.eq(feature.onScreen(true), false,
+             "off-screen feature returns false for bounds only");
+        
-    }
-