Single argument constructor for UTFGrid layer.

examples/utfgrid.js

@@ -1,10 +1,10 @@
 var osm = new OpenLayers.Layer.OSM();
 
-var utfgrid = new OpenLayers.Layer.UTFGrid( 
+var utfgrid = new OpenLayers.Layer.UTFGrid({
-    "Invisible UTFGrid Layer", 
+    url: "utfgrid/world_utfgrid/${z}/${x}/${y}.json",
-    "./utfgrid/world_utfgrid/${z}/${x}/${y}.json",
+    utfgridResolution: 4, // default is 2
-    {utfgridResolution: 4} // default is 2
+    displayInLayerSwitcher: false
-);
+});
 
 var map = new OpenLayers.Map({
     div: "map", 

examples/utfgrid_twogrids.js

@@ -1,15 +1,15 @@
 var osm = new OpenLayers.Layer.OSM();
 
-var population = new OpenLayers.Layer.UTFGrid( 
+var population = new OpenLayers.Layer.UTFGrid({
-    "World Population",
+    name: "World Population",
-    "./utfgrid/world_utfgrid/${z}/${x}/${y}.json",
+    url: "utfgrid/world_utfgrid/${z}/${x}/${y}.json",
-    {utfgridResolution: 4} // default is 2
+    utfgridResolution: 4 // default is 2
-);
+});
-var bioregions = new OpenLayers.Layer.UTFGrid( 
+var bioregions = new OpenLayers.Layer.UTFGrid({
-    "World Bioregions",
+    name: "World Bioregions",
-    "./utfgrid/bio_utfgrid/${z}/${x}/${y}.json",
+    url: "utfgrid/bio_utfgrid/${z}/${x}/${y}.json",
-    {utfgridResolution: 4} // default is 2
+    utfgridResolution: 4 // default is 2
-);
+});
 
 var map = new OpenLayers.Map({
     div: "map",

lib/OpenLayers/Layer/UTFGrid.js

@@ -19,9 +19,10 @@
  * Example:
  *
  * (start code)
- * var world_utfgrid = new OpenLayers.Layer.UTFGrid( 
+ * var world_utfgrid = new OpenLayers.Layer.UTFGrid({
- *     'UTFGrid Layer', 
+ *     url: "/tiles/world_utfgrid/${z}/${x}/${y}.json",
- *     "http://tiles/world_utfgrid/${z}/${x}/${y}.json"
+ *     utfgridResolution: 4,
+ *     displayInLayerSwitcher: false
  * );
  * map.addLayer(world_utfgrid);
  * 
@@ -99,14 +100,18 @@ OpenLayers.Layer.UTFGrid = OpenLayers.Class(OpenLayers.Layer.Grid, {
 
     /**
      * Constructor: OpenLayers.Layer.UTFGrid
+     * Create a new UTFGrid layer.
      *
      * Parameters:
-     * name - {String}
+     * config - {Object} Configuration properties for the layer.
-     * url - {String}
+     *
-     * options - {Object} Hashtable of extra options to tag onto the layer
+     * Required configuration properties:
+     * url - {String} The url template for UTFGrid tiles.  See the <url> property.
      */
-    initialize: function(name, url, options) {
+    initialize: function(options) {
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, [name, url, {}, options]);
+        OpenLayers.Layer.Grid.prototype.initialize.apply(
+            this, [options.name, options.url, {}, options]
+        );
         this.tileOptions = OpenLayers.Util.extend({
             utfgridResolution: this.utfgridResolution
         }, this.tileOptions);
@@ -117,20 +122,17 @@ OpenLayers.Layer.UTFGrid = OpenLayers.Class(OpenLayers.Layer.Grid, {
      * Create a clone of this layer
      *
      * Parameters:
-     * obj - {Object} Is this ever used?
+     * obj - {Object} Only used by a subclass of this layer.
      * 
      * Returns:
      * {<OpenLayers.Layer.UTFGrid>} An exact clone of this OpenLayers.Layer.UTFGrid
      */
     clone: function (obj) {
-        
         if (obj == null) {
-            obj = new OpenLayers.Layer.UTFGrid(this.name,
+            obj = new OpenLayers.Layer.UTFGrid(this.getOptions());
-                                               this.url,
-                                               this.getOptions());
         }
 
-        //get all additions from superclasses
+        // get all additions from superclasses
         obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
 
         return obj;

tests/Tile/UTFGrid.html

@@ -22,11 +22,11 @@
 
     var map, layer;
     function setUp() {
-        layer = new OpenLayers.Layer.UTFGrid(
+        layer = new OpenLayers.Layer.UTFGrid({
-            null, 
+            url: "../data/utfgrid/world_utfgrid/${z}/${x}/${y}.json",
-            "../data/utfgrid/world_utfgrid/${z}/${x}/${y}.json",
+            isBaseLayer: true, 
-            {isBaseLayer: true, utfgridResolution: 4}
+            utfgridResolution: 4
-        );
+        });
         map = new OpenLayers.Map({
             div: "map",
             projection: "EPSG:900913",