Remove extra MapServer subclass.

lib/OpenLayers.js

@@ -135,7 +135,6 @@
                 "OpenLayers/Layer/Grid.js",
                 "OpenLayers/Layer/MapGuide.js",
                 "OpenLayers/Layer/MapServer.js",
-                "OpenLayers/Layer/MapServer/Untiled.js",
                 "OpenLayers/Layer/KaMap.js",
                 "OpenLayers/Layer/KaMapCache.js",
                 "OpenLayers/Layer/MultiMap.js",

lib/OpenLayers/Layer/MapServer/Untiled.js

@@ -1,72 +0,0 @@
-/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for 
- * full list of contributors). Published under the Clear BSD license.  
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
- * full text of the license. */
-
- 
-/**
- * @requires OpenLayers/Layer/MapServer.js
- * @requires OpenLayers/Console.js
- */
-
-/**
- * Class: OpenLayers.Layer.MapServer.Untiled
- * *Deprecated*.  To be removed in 3.0.  Instead use OpenLayers.Layer.MapServer
- *     and pass the option 'singleTile' as true.
- * 
- * Inherits from: 
- *  - <OpenLayers.Layer.MapServer>
- */
-OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class(OpenLayers.Layer.MapServer, {
-
-    /**
-     * APIProperty: singleTile
-     * {singleTile} Always true for untiled.
-     */
-    singleTile: true,
-
-    /**
-     * Constructor: OpenLayers.Layer.MapServer.Untiled
-     *
-     * Parameters:
-     * name - {String} 
-     * url - {String} 
-     * params - {Object} 
-     * options - {Object} 
-     */
-    initialize: function(name, url, params, options) {
-        OpenLayers.Layer.MapServer.prototype.initialize.apply(this, arguments);
-        
-        var msg = "The OpenLayers.Layer.MapServer.Untiled class is deprecated and " +
-                  "will be removed in 3.0. Instead, you should use the " +
-                  "normal OpenLayers.Layer.MapServer class, passing it the option " +
-                  "'singleTile' as true.";
-        OpenLayers.Console.warn(msg);
-    },    
-
-    /**
-     * Method: clone
-     * Create a clone of this layer
-     *
-     * Returns:
-     * {<OpenLayers.Layer.MapServer.Untiled>} An exact clone of this layer
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.MapServer.Untiled(this.name,
-                                                         this.url,
-                                                         this.params,
-                                                         this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.MapServer.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-        
-        return obj;
-    }, 
-
-    CLASS_NAME: "OpenLayers.Layer.MapServer.Untiled"
-});

lib/deprecated.js

@@ -1898,3 +1898,64 @@ OpenLayers.Layer.WMS.Untiled = OpenLayers.Class(OpenLayers.Layer.WMS, {
     CLASS_NAME: "OpenLayers.Layer.WMS.Untiled"
 });
 
+/**
+ * Class: OpenLayers.Layer.MapServer.Untiled
+ * *Deprecated*.  To be removed in 3.0.  Instead use OpenLayers.Layer.MapServer
+ *     and pass the option 'singleTile' as true.
+ * 
+ * Inherits from: 
+ *  - <OpenLayers.Layer.MapServer>
+ */
+OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class(OpenLayers.Layer.MapServer, {
+
+    /**
+     * APIProperty: singleTile
+     * {singleTile} Always true for untiled.
+     */
+    singleTile: true,
+
+    /**
+     * Constructor: OpenLayers.Layer.MapServer.Untiled
+     *
+     * Parameters:
+     * name - {String} 
+     * url - {String} 
+     * params - {Object} 
+     * options - {Object} 
+     */
+    initialize: function(name, url, params, options) {
+        OpenLayers.Layer.MapServer.prototype.initialize.apply(this, arguments);
+        
+        var msg = "The OpenLayers.Layer.MapServer.Untiled class is deprecated and " +
+                  "will be removed in 3.0. Instead, you should use the " +
+                  "normal OpenLayers.Layer.MapServer class, passing it the option " +
+                  "'singleTile' as true.";
+        OpenLayers.Console.warn(msg);
+    },    
+
+    /**
+     * Method: clone
+     * Create a clone of this layer
+     *
+     * Returns:
+     * {<OpenLayers.Layer.MapServer.Untiled>} An exact clone of this layer
+     */
+    clone: function (obj) {
+        
+        if (obj == null) {
+            obj = new OpenLayers.Layer.MapServer.Untiled(this.name,
+                                                         this.url,
+                                                         this.params,
+                                                         this.getOptions());
+        }
+
+        //get all additions from superclasses
+        obj = OpenLayers.Layer.MapServer.prototype.clone.apply(this, [obj]);
+
+        // copy/set any non-init, non-simple values here
+        
+        return obj;
+    }, 
+
+    CLASS_NAME: "OpenLayers.Layer.MapServer.Untiled"
+});

tests/Layer/MapServer.html

@@ -290,174 +290,6 @@
         t.ok( layer.grid == null, "grid set to null");
         map.destroy();
     }
-   
-    // Untiled tests 
-   
-    var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
-    var layer; 
-
-    var name = 'Test Layer';
-    var url = "http://labs.metacarta.com/cgi-bin/mapserv";
-    var params = { map: '/mapdata/vmap_wms.map', 
-                   layers: 'basic'};
-    
-    function test_Layer_MapServer_Untiled_constructor (t) {
-        t.plan( 4 );
-
-        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
-        t.ok( layer instanceof OpenLayers.Layer.MapServer.Untiled, "new OpenLayers.Layer.MapServer returns object" );
-        t.eq( layer.url, "http://labs.metacarta.com/cgi-bin/mapserv", "layer.url is correct (HTTPRequest inited)" );
-
-        t.eq( layer.params.mode, "map", "default mode param correctly copied");
-        t.eq( layer.params.map_imagetype, "png", "default imagetype correctly copied");
-
-
-    }
-    
-    function test_Layer_MapServer_Untiled_clone (t) {
-        t.plan(3);
-        
-        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
-        var map = new OpenLayers.Map('map', {});
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
-        map.addLayer(layer);
-
-        var clone = layer.clone();
-        layer.tile = [[1,2],[3,4]];
-        
-        t.ok( clone.tile != layer.tile, "clone does not copy tile");
-
-        layer.ratio += 1;
-
-        t.eq( clone.ratio, 1.5, "changing layer.ratio does not change clone.ratio -- a fresh copy was made, not just copied reference");
-
-        t.eq( clone.alpha, layer.alpha, "alpha copied correctly");
-
-        layer.tile = null;
-        map.destroy();
-    }
-
-    function test_Layer_MapServer_Untiled_isBaseLayer(t) {
-        t.plan(3);
-        
-        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
-        t.ok( layer.isBaseLayer, "baselayer is true by default");
-
-        var newParams = OpenLayers.Util.extend({}, params);
-        newParams.transparent = "true";
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, newParams);
-        t.ok( !layer.isBaseLayer, "baselayer is false when transparent is set to true");
-
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params, {isBaseLayer: false});
-        t.ok( !layer.isBaseLayer, "baselayer is false when option is set to false" );
-    }
-
-    function test_Layer_MapServer_Untiled_mergeNewParams (t) {
-        t.plan( 5 );
-
-        var map = new OpenLayers.Map("map");
-        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
-        
-        var newParams = { layers: 'sooper', 
-                          chickpeas: 'image/png'};
-
-        map.addLayer(layer);
-        map.zoomToMaxExtent();
-        t.ok( !layer.grid[0][0].url.match("chickpeas"), "chickpeas is not in URL of first tile in grid" );
-
-        layer.mergeNewParams(newParams);
-        
-        t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
-        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
-        t.ok( layer.grid[0][0].url.match("chickpeas"), "chickpeas is in URL of first tile in grid" );
-
-        newParams.chickpeas = 151;
-
-        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
-        map.destroy();
-    }
-
-    function test_Layer_MapServer_Untiled_getFullRequestString (t) {
-
-        
-        t.plan( 1 );
-        var map = new OpenLayers.Map('map');
-        tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
-        tParams = { layers: 'basic', 
-                    format: 'png'};
-        var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams);
-        map.addLayer(tLayer);
-        str = tLayer.getFullRequestString();
-        var tParams = {
-             layers: 'basic', 
-             format: 'png',
-             mode: 'map',
-             map_imagetype: 'png'
-        };
-
-        var sStr = tUrl + "?" + OpenLayers.Util.getParameterString(tParams);
-        sStr = sStr.replace(/,/g, "+");
-        
-        t.eq(str, sStr , "getFullRequestString() works");
-        map.destroy();
-
-    }
-
-    function test_Layer_MapServer_Untiled_setOpacity (t) {
-        t.plan( 4 );
-
-        var map = new OpenLayers.Map('map');
-        map.projection = "xx";
-        tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
-        tParams = { layers: 'basic', 
-                   format: 'image/png'};
-        tOptions = { 'opacity': '0.5' };           
-        var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams, tOptions);
-        map.addLayer(tLayer);
-        map.zoomToMaxExtent();
-        t.eq(tLayer.opacity, "0.5", "Opacity is set correctly");
-        t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.5, "Opacity on tile is correct");
-        tLayer.setOpacity("0.6");
-        t.eq(tLayer.opacity, "0.6", "setOpacity works properly");
-        t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.6, "Opacity on tile is changed correctly");
-        map.destroy();
-
-    }    
-
-    // DEPRECATED -- REMOVE IN 3.0
-    function test_Layer_Untiled_MapServer(t) { 
-        t.plan(1);
-        
-        var layer = new OpenLayers.Layer.MapServer.Untiled();
-        
-        var clone = layer.clone();
-        
-        t.ok(clone.singleTile, "regression test: clone works. this is for #1013");
-    }
-    
-    function test_Layer_MapServer_Untiled_destroy (t) {
-
-        t.plan( 1 );
-
-        var map = new OpenLayers.Map('map');
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
-        map.addLayer(layer);
-
-        map.setCenter(new OpenLayers.LonLat(0,0), 5);
-
-        //grab a reference to one of the tiles
-        var tile = layer.tile;        
-
-        layer.destroy();
-        
-    // checks to make sure superclass (grid) destroy() was called    
-        
-        t.ok( layer.tile == null, "tile set to null");
-        map.destroy();
-    }
     
   </script>
 </head>

tests/deprecated/Layer/MapServer/Untiled.html

@@ -0,0 +1,179 @@
+<html>
+<head>    
+
+    <script src="../../../OLLoader.js"></script>
+    <script src="../../../../lib/deprecated.js"></script>
+    <script type="text/javascript">
+
+    var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
+    var layer; 
+
+    var name = 'Test Layer';
+    var url = "http://labs.metacarta.com/cgi-bin/mapserv";
+    var params = { map: '/mapdata/vmap_wms.map', 
+                   layers: 'basic'};
+    
+    function test_Layer_MapServer_Untiled_constructor (t) {
+        t.plan( 4 );
+
+        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
+        t.ok( layer instanceof OpenLayers.Layer.MapServer.Untiled, "new OpenLayers.Layer.MapServer returns object" );
+        t.eq( layer.url, "http://labs.metacarta.com/cgi-bin/mapserv", "layer.url is correct (HTTPRequest inited)" );
+
+        t.eq( layer.params.mode, "map", "default mode param correctly copied");
+        t.eq( layer.params.map_imagetype, "png", "default imagetype correctly copied");
+
+
+    }
+    
+    function test_Layer_MapServer_Untiled_clone (t) {
+        t.plan(3);
+        
+        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
+        var map = new OpenLayers.Map('map', {});
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
+        map.addLayer(layer);
+
+        var clone = layer.clone();
+        layer.tile = [[1,2],[3,4]];
+        
+        t.ok( clone.tile != layer.tile, "clone does not copy tile");
+
+        layer.ratio += 1;
+
+        t.eq( clone.ratio, 1.5, "changing layer.ratio does not change clone.ratio -- a fresh copy was made, not just copied reference");
+
+        t.eq( clone.alpha, layer.alpha, "alpha copied correctly");
+
+        layer.tile = null;
+        map.destroy();
+    }
+
+    function test_Layer_MapServer_Untiled_isBaseLayer(t) {
+        t.plan(3);
+        
+        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
+        t.ok( layer.isBaseLayer, "baselayer is true by default");
+
+        var newParams = OpenLayers.Util.extend({}, params);
+        newParams.transparent = "true";
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, newParams);
+        t.ok( !layer.isBaseLayer, "baselayer is false when transparent is set to true");
+
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params, {isBaseLayer: false});
+        t.ok( !layer.isBaseLayer, "baselayer is false when option is set to false" );
+    }
+
+    function test_Layer_MapServer_Untiled_mergeNewParams (t) {
+        t.plan( 5 );
+
+        var map = new OpenLayers.Map("map");
+        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
+        
+        var newParams = { layers: 'sooper', 
+                          chickpeas: 'image/png'};
+
+        map.addLayer(layer);
+        map.zoomToMaxExtent();
+        t.ok( !layer.grid[0][0].url.match("chickpeas"), "chickpeas is not in URL of first tile in grid" );
+
+        layer.mergeNewParams(newParams);
+        
+        t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
+        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
+        t.ok( layer.grid[0][0].url.match("chickpeas"), "chickpeas is in URL of first tile in grid" );
+
+        newParams.chickpeas = 151;
+
+        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
+        map.destroy();
+    }
+
+    function test_Layer_MapServer_Untiled_getFullRequestString (t) {
+
+        
+        t.plan( 1 );
+        var map = new OpenLayers.Map('map');
+        tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
+        tParams = { layers: 'basic', 
+                    format: 'png'};
+        var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams);
+        map.addLayer(tLayer);
+        str = tLayer.getFullRequestString();
+        var tParams = {
+             layers: 'basic', 
+             format: 'png',
+             mode: 'map',
+             map_imagetype: 'png'
+        };
+
+        var sStr = tUrl + "?" + OpenLayers.Util.getParameterString(tParams);
+        sStr = sStr.replace(/,/g, "+");
+        
+        t.eq(str, sStr , "getFullRequestString() works");
+        map.destroy();
+
+    }
+
+    function test_Layer_MapServer_Untiled_setOpacity (t) {
+        t.plan( 4 );
+
+        var map = new OpenLayers.Map('map');
+        map.projection = "xx";
+        tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
+        tParams = { layers: 'basic', 
+                   format: 'image/png'};
+        tOptions = { 'opacity': '0.5' };           
+        var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams, tOptions);
+        map.addLayer(tLayer);
+        map.zoomToMaxExtent();
+        t.eq(tLayer.opacity, "0.5", "Opacity is set correctly");
+        t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.5, "Opacity on tile is correct");
+        tLayer.setOpacity("0.6");
+        t.eq(tLayer.opacity, "0.6", "setOpacity works properly");
+        t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.6, "Opacity on tile is changed correctly");
+        map.destroy();
+
+    }    
+
+    // DEPRECATED -- REMOVE IN 3.0
+    function test_Layer_Untiled_MapServer(t) { 
+        t.plan(1);
+        
+        var layer = new OpenLayers.Layer.MapServer.Untiled();
+        
+        var clone = layer.clone();
+        
+        t.ok(clone.singleTile, "regression test: clone works. this is for #1013");
+    }
+    
+    function test_Layer_MapServer_Untiled_destroy (t) {
+
+        t.plan( 1 );
+
+        var map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
+        map.addLayer(layer);
+
+        map.setCenter(new OpenLayers.LonLat(0,0), 5);
+
+        //grab a reference to one of the tiles
+        var tile = layer.tile;        
+
+        layer.destroy();
+        
+    // checks to make sure superclass (grid) destroy() was called    
+        
+        t.ok( layer.tile == null, "tile set to null");
+        map.destroy();
+    }
+    
+  </script>
+</head>
+<body>
+<div id="map" style="width:500px;height:550px"></div>
+</body>
+</html>

tests/list-tests.html

@@ -230,5 +230,6 @@
     <li>deprecated/BaseTypes/Class.html</li>
     <li>deprecated/BaseTypes/Element.html</li>
     <li>deprecated/Control/MouseToolbar.html</li>
+    <li>deprecated/Layer/MapServer/Untiled.html</li>
     <li>deprecated/Layer/WMS/Post.html</li>
 </ul>