Changeset 4068

Timestamp:

08/27/07 19:22:13 (1 year ago)

Author:

crschmidt

Message:

deprecate MapServer.Untiled in favor of MapServer with singleTile: true.
(Closes #866) Thanks for the help to all.

Files:

• trunk/openlayers/examples/mapserver_untiled.html (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js (modified) (1 diff)
• trunk/openlayers/tests/Layer/test_MapServer.html (modified) (2 diffs)
• trunk/openlayers/tests/Layer/test_MapServer_Untiled.html (deleted)
• trunk/openlayers/tests/list-tests.html (modified) (1 diff)

trunk/openlayers/examples/mapserver_untiled.html

@@ -9 +9 @@
-    </style>
-    <script src="../lib/OpenLayers.js"></script>
-    <script src="../lib/OpenLayers/Layer/MapServer/Untiled.js"></script>
-    <script type="text/javascript">
-        window.onload = function(){
-            var map = new OpenLayers.Map( 'map', {maxResolution: 'auto'} );
-.Untiled
-
+
+, {singleTile: true}
-            map.addLayer(layer);
-            map.setCenter(new OpenLayers.LonLat(0, 0), 1);

trunk/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js

@@ -1 @@
-(c) 2006-2007 MetaCarta, Inc., published under the
-lease
+2006-2007 MetaCarta, Inc., published under a modified
+pository
- * for the full text of the license. */
+
- 
-/**
- * @requires OpenLayers/Layer/HTTPRequest.js
- * @requires OpenLayers/Layer/MapServer.js
- *
-
-
-
-
+
+
+
+
+
+
- */
-
-
+
-
-    /**
-Constant: default_params
-Hashtable of default parameter key/value pairs
+APIProperty: singleTile
+{singleTile} Always true for untiled.
-     */
-
-
-
-
-
-
-
-
-
-
+
-
-    /**
-
-
-
+
+
+
+
+
+
+
-     */
-    ratio: 1,
-
-    /** 
-     * Property: tile
-     * {<OpenLayers.Tile.Image>}
-     */
-    tile: null,
-
-    /**
-     * Propety: doneLoading
-     * {Boolean} did the image finish loading before a new draw was initiated?
-     */
-    doneLoading: false,
-
-    /**
-    * Constructor: OpenLayers.Layer.MapServer.Untiled
-    *
-    * Parameters:
-    * name - {String} 
-    * url - {String} 
-    * params - {Object} 
-    */
-    initialize: function(name, url, params, options) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    },    
-
-    /**
-     * APIMethod: destroy 
-     */
-    destroy: function() {
-        if (this.tile) {
-          this.tile.destroy();
-          this.tile = null;    
-        }
-        OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this, arguments);
-    },
-    
-    /**
-     * APIMethod: clone
-     * obj - {Object} 
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.MapServer.Untiled>} An exact clone of this
-     * OpenLayers.Layer.MapServer.Untiled
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.MapServer.Untiled(this.name,
-                                                         this.url,
-                                                         this.params,
-                                                         this.options);
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },    
-    
-    
-    /**
-     * Method: setMap
-     * Once HTTPRequest has set the map, we can load the image div
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        OpenLayers.Layer.HTTPRequest.prototype.setMap.apply(this, arguments);
-    },
-    
-    /**
-     * Method: setTileSize
-     * Set the tile size based on the map size.
-     */
-    setTileSize: function() {
-        var tileSize = this.map.getSize();
-        tileSize.w = tileSize.w * this.ratio;
-        tileSize.h = tileSize.h * this.ratio;
-        this.tileSize = tileSize;
-    },
-
-    /**
-     * Method: moveTo
-     * When it is not a dragging move (ie when done dragging)
-     *   reload and recenter the div.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} 
-     * zoomChanged - {Boolean} 
-     * dragging - {Boolean} 
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-        if (!this.doneLoading) {
-            this.events.triggerEvent("loadcancel"); 
-            this.doneLoading = true; 
-        }
-        OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);
-        
-        if (bounds == null) {
-            bounds = this.map.getExtent();
-        }
-
-        var firstRendering = (this.tile == null);
-
-        //does the new bounds to which we need to move fall outside of the 
-        // current tile's bounds?
-        var outOfBounds = (!firstRendering &&
-                           !this.tile.bounds.containsBounds(bounds));
-
-        if ( zoomChanged || firstRendering || (!dragging && outOfBounds) ) {
-
-            //clear out the old tile 
-            if (this.tile) {
-                this.tile.clear();
-            }
-
-            //determine new tile bounds
-            var center = bounds.getCenterLonLat();
-            var tileWidth = bounds.getWidth() * this.ratio;
-            var tileHeight = bounds.getHeight() * this.ratio;
-            var tileBounds = 
-                new OpenLayers.Bounds(center.lon - (tileWidth / 2),
-                                      center.lat - (tileHeight / 2),
-                                      center.lon + (tileWidth / 2),
-                                      center.lat + (tileHeight / 2));
-
-            //determine new tile size
-            this.setTileSize();
-
-            //determine new position (upper left corner of new bounds)
-            var ul = new OpenLayers.LonLat(tileBounds.left, tileBounds.top);
-            var pos = this.map.getLayerPxFromLonLat(ul);
-
-            if ( this.tile && !this.tile.size.equals(this.tileSize)) {
-                this.tile.destroy();
-                this.tile = null;
-            }
-
-            this.events.triggerEvent("loadstart");
-            this.doneLoading = false;
-            if (!this.tile) {
-                this.tile = new OpenLayers.Tile.Image(this, pos, tileBounds, 
-                                                      null, this.tileSize);
-                this.tile.draw();
-                var onload = function() { 
-                    this.doneLoading = true; 
-                    this.events.triggerEvent("loadend"); 
-                }
-                OpenLayers.Event.observe(this.tile.imgDiv, 'load',
-                                         onload.bind(this));
-            } else {
-                this.tile.moveTo(tileBounds, pos);
-            } 
-    
-        }
-    },
-   
-    /**
-     * Method: getURL
-     *
-     * Parameters: 
-     * bounds - {<OpenLayers.Bounds>}
-     */
-    getURL: function(bounds) {
-        var url = this.getFullRequestString(
-                     {mapext:bounds.toBBOX().replace(/,/g," "),
-                      imgext:bounds.toBBOX().replace(/,/g," "),
-                      map_size: this.tileSize.w + " " + this.tileSize.h,
-                      imgx: this.tileSize.w / 2,
-                      imgy: this.tileSize.h / 2,
-                      imgxy: this.tileSize.w + " " + this.tileSize.h
-                      });
-        return url;
-    },
- 
-    
-    /**
-     * APIMehod: setUrl
-     * Once HTTPRequest has updated the url, reload the image div
-     *
-     * Parameters:
-     * newUrl - {String} 
-     */
-    setUrl: function(newUrl) {
-        OpenLayers.Layer.HTTPRequest.prototype.setUrl.apply(this, arguments);
-        this.redraw();
-    },
-   
-    /** 
-    * APIMethod: getFullRequestString
-    * combine the layer's url with its params and these newParams. 
-    *   
-    *    Add the SRS parameter from 'projection' -- this is probably
-    *     more eloquently done via a setProjection() method, but this 
-    *     works for now and always.
-    *
-    * Parameters:
-    * newParams - {Object} 
-    */
-    getFullRequestString:function(newParams) {
-        var projection = this.map.getProjection();
-        this.params.srs = (projection == "none") ? null : projection;
-
-        return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(
-                                                    this, arguments);
-    },
-    
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Layer.MapServer.Untiled"
-});

trunk/openlayers/tests/Layer/test_MapServer.html

@@ -232 +232 @@
-    }
-    
+    function test_30_Layer_MapServer_singleTile (t) {
+        t.plan( 5 );
+        var map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.MapServer(name, url, params, {singleTile: true});
+        map.addLayer(layer);
+        map.setCenter(new OpenLayers.LonLat(0,0),5);
+        t.eq( layer.singleTile, true, "layer has singleTile property, great!" );
+        t.eq( layer.grid.length, 1, "Grid has only a single row, good enough!" );
+        t.eq( layer.grid[0].length, 1, "Grid has only a single column, good enough!" );
+        t.eq( layer.tileSize.w, 750, "Image width is correct" );
+        t.eq( layer.tileSize.h, 825, "Image height is correct" );
+    }
+
+    
+    
-    function test_99_Layer_MapServer_destroy (t) {
-
@@ -251 +266 @@
-        t.ok( layer.grid == null, "grid set to null");
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </script>
-</head>

trunk/openlayers/tests/list-tests.html

@@ -48 +48 @@
-    <li>Layer/test_MultiMap.html</li>
-    <li>Layer/test_MapServer.html</li>
-    <li>Layer/test_MapServer_Untiled.html</li>
-    <li>Layer/test_Text.html</li>
-    <li>Layer/test_WMS.html</li>