Changeset 2499

Timestamp:

03/07/07 21:21:11 (2 years ago)

Author:

bwoodall

Message:

Putting my #501 patches into svn

Files:

• sandbox/bwoodall/t501 (copied) (copied from trunk/openlayers)
• sandbox/bwoodall/t501/build/build.py (modified) (1 diff)
• sandbox/bwoodall/t501/lib/OpenLayers/Layer/Grid.js (modified) (2 diffs)
• sandbox/bwoodall/t501/tests/test_Layer_Grid.html (modified) (2 diffs)

sandbox/bwoodall/t501/build/build.py

@@ -17 +17 @@
-print "Merging libraries."
-merged = mergejs.run(sourceDirectory, None, configFilename)
-
-
-
-
+
+
+
+
+
-
-print "Writing to %s." % outputFilename

sandbox/bwoodall/t501/lib/OpenLayers/Layer/Grid.js

@@ -23 +23 @@
-    /** @type Integer */
-    buffer: 2,
+
+    /** @type Boolean */
+    newTile: false,
-
-    /**
@@ -163 +166 @@
-
-    /**
+     *
+     *   Mercator decimal form <>  lon/lat routines for tiles
+     *
+     */
+
+    /**
+     * @private
+     *
+     * @param {float} lon
+     * @param {Integer} tilesAtThisZoom
+     *
+     * @returns A integer representing the lon at a particular Zoom
+     * @type Integer
+     */
+    _lon2Gx:function(lon,tilesAtThisZoom) {
+        var x = Math.floor((180+lon) * tilesAtThisZoom / 360);
+        return x;
+    },
+
+    /**
+     * @private
+     * @param {float} lat
+     * @param {Integer} tilesAtThisZoom
+     *
+     * @returns A integer representing the lat at a particular Zoom
+     * @type Integer
+     */
+    _lat2Gy:function(lat,tilesAtThisZoom) {
+        var srlat = Math.sin( lat * Math.PI / 180);
+        var y = Math.floor(((1 - (0.5 * Math.log((1 + srlat) / (1 - srlat))) / Math.PI) / 2.0) * tilesAtThisZoom);
+        return y;
+    },
+
+    /**
+     * @private
+     * @param {Integer} x
+     * @param {Integer} tilesAtThisZoom
+     *
+     * @returns A float (lon) representing the integer tile at a particular Zoom     * @type float
+     */
+    _Gx2lon:function(x, tilesAtThisZoom) {
+        var lonWidth = 360.0 / tilesAtThisZoom;
+        var lon = -180 + (x * lonWidth);
+        return lon;
+    },
+
+    /**
+     * @private
+     * @param {Integer} y
+     * @param {Integer} tilesAtThisZoom
+     *
+     * @returns A float (lat) representing the integer tile at a particular Zoom     * @type float
+     */
+    _Gy2lat:function(y, tilesAtThisZoom) {
+        var latHeight = 2.0 / tilesAtThisZoom;
+        var lat = ((tilesAtThisZoom / 2 - y - 1) * latHeight);
+        latHeight += lat;
+        latHeight = (2.0 * Math.atan(Math.exp(Math.PI * latHeight)))
+                 - (Math.PI/2);
+        latHeight *= (180/Math.PI);
+        lat = (2.0 * Math.atan(Math.exp(Math.PI * lat))) - (Math.PI/2);
+        lat *= (180/Math.PI);
+        latHeight -= lat;
+        if (latHeight < 0.0) {
+                lat = lat + latHeight;
+                latHeight = -latHeight;
+        }
+        return lat;
+    },
+
+    /**
-     * @private
-     */
-    _initTiles:function() {
-        
-        // work out mininum number of rows and columns; this is the number of
-        // tiles required to cover the viewport plus one for panning
-        var viewSize = this.map.getSize();
-        var minRows = Math.ceil(viewSize.h/this.tileSize.h) + 1;
-        var minCols = Math.ceil(viewSize.w/this.tileSize.w) + 1;
-        
-        var bounds = this.map.getExtent();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 
-
-
+    
+    
-                                                      tileoffsetlat, 
-                                                      tileoffsetlon + tilelon,
-                                                      tileoffsetlat + tilelat);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            }
-        }

sandbox/bwoodall/t501/tests/test_Layer_Grid.html

@@ -171 +171 @@
-    }
-
+    function test_12_Layer_Grid_inittiles_newTile (t) {
+        t.plan( 6 );
+        var map = new OpenLayers.Map($('map'));
+        layer = new OpenLayers.Layer.WMS(name, url, params, {newTile: true});
+        map.addLayer(layer);
+        map.setCenter(new OpenLayers.LonLat(0,0),4);
+        t.eq( layer.grid.length, 8, "newTile Grid rows is correct at zoom 4." );
+        t.eq( layer.grid[0].length, 6, "newTile Grid cols is correct at zoom 4." );
+        var row = layer.grid[4];
+        t.eq( row[3].bounds.right, 22.5, "newTile Grid bounds is correct at zoom 4." );
+
+        map.setCenter(new OpenLayers.LonLat(-10,10),9);
+        t.eq( layer.grid.length, 8, "newTile Grid rows is correct at zoom 9." );
+        t.eq( layer.grid[0].length, 7, "newTile Grid cols is correct at zoom 9." );
+        var row = layer.grid[2];
+        t.eq( row[2].bounds.left, -11.25, "newTile Grid bounds is correct at zoom 9." );
+        
+    }
-
-    function test_99_Layer_Grid_destroy (t) {
@@ -182 +200 @@
-        t.eq( layer.grid, null, "layer.grid is null after destroy" );
-        t.eq( layer.tileSize, null, "layer.tileSize is null after destroy" );
-
-
-    //test with tile creation