Ticket #442: final_animatedZooming_LayerImage.patch

tests/Layer/test_Image.html

@@ -38 +38 @@
-        t.ok( layer.options instanceof Object, "layer.options correctly initialized as a non-null Object" );
-    }
-
-50
+02
-        t.plan(4);
-        var map = new OpenLayers.Map('map');
-        
@@ -65 +65 @@
- */
-
-
+/*** animated zooming test functions ***/
+    function test_03_Layer_Image_getTileSize (t) {
+        t.plan(2);
+
+        map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.Image('Test Layer', 
+                'http://earthtrends.wri.org/images/maps/4_m_citylights_lg.gif',
+                new OpenLayers.Bounds(-180, -88.759, 180, 88.759),
+                new OpenLayers.Size(580, 288));
+        map.addLayer(layer);
+        map.setCenter(new OpenLayers.LonLat(0,0));
+
+        var size = map.baseLayer.getTileSize();
+        t.eq(size.w, 580, "tile width is correct"); 
+        t.eq(size.h, 288, "tile height is correct");
+    }
+    function test_04_Layer_Image_getCenterTile (t) {
+        t.plan(1);
+
+        map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.Image('Test Layer', 
+                'http://earthtrends.wri.org/images/maps/4_m_citylights_lg.gif',
+                new OpenLayers.Bounds(-180, -88.759, 180, 88.759),
+                new OpenLayers.Size(580, 288));
+        map.addLayer(layer);
+        map.setCenter(new OpenLayers.LonLat(0,0));
+
+        tile = map.baseLayer.getCenterTile(); 
+        t.ok(map.baseLayer.tile == tile, 
+                "center tile has been set correctly" );
+    }
+    function test_05_Layer_Image_cloneBaseLayerDiv (t) {
+        t.plan(3);
+
+        map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.Image('Test Layer', 
+                'http://earthtrends.wri.org/images/maps/4_m_citylights_lg.gif',
+                new OpenLayers.Bounds(-180, -88.759, 180, 88.759),
+                new OpenLayers.Size(580, 288));
+        map.addLayer(layer);
+        
+        map.baseLayer.cloneBaseLayerDiv();
+        var cloneDiv = map.baseLayerDivClone;
+        var originDiv = map.baseLayer.div; 
+        t.ok( cloneDiv instanceof HTMLDivElement, 
+                "cloned baseLayerDiv is a valid HTMLDivElement");
+        t.eq( cloneDiv.childNodes.length, originDiv.childNodes.length,
+                "cloned baseLayerDiv has the same number of childs");
+        t.eq( parseInt(cloneDiv.style.zIndex)+1, parseInt(originDiv.style.zIndex),
+                "zIndex has been set correctly");
+    }
+
+
-    function test_99_Layer_Image_destroy (t) {
-        t.plan( 4 );    
-
-        var map = new OpenLayers.Map('map');
-        
-        layer = new OpenLayers.Layer.Image('Test Layer', 
-                    
-                                                    
-                                                                                    
+
+
+
-
-        map.addLayer(layer);
-        map.zoomToMaxExtent();

lib/OpenLayers/Layer/Image.js

@@ -156 +156 @@
-        return this.url;
-    },
-        
+
+
+    /********************************************************/
+    /*                                                      */
+    /*       Baselayer Functions for zooming/scaling        */
+    /*                                                      */
+    /********************************************************/
+
+
+    /** 
+     * Gets tile (image) size.
+     *  
+     * @returns the image size if tile exists; otherwise
+     * null
+     * @type {OpenLayers.Size}
+     */
+    getTileSize:function() {
+        if (this.tile) 
+            return this.tile.size;
+        else
+            return null;
+    },
+
+    /** 
+     * Gets the tile of this image layer. 
+     *
+     * @returns the only tile of the layer
+     * @type {OpenLayers.Tile}
+     */
+    getCenterTile:function() {   
+        if (this.tile)
+            return this.tile; 
+        else
+            return null;
+    },
+
+    /** 
+     * Clones layerContainer for "smooth tile update". 
+     * So, it gets no blank map while map is loading in new zoomlevel.
+     *
+     * @returns true after layerContainer is cloned
+     * @type Boolean
+     */
+    cloneBaseLayerDiv:function() {
+        // share clone algorithm with other baselayers
+        this.cloneBaseLayerDiv_share();
+
+        // remove the old imgDiv tile 
+        // (so it doesn't becomes complicate with the same imgDiv of the
+        // cloned layerContainerDiv)
+        if (this.tile)
+            this.div.removeChild(this.tile.imgDiv);
+        
+        this.tile = null;        
+
+        return true;
+    },
+
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Layer.Image"
-});