From 949693250ef5492352986ecd7cbc151ea5acf3e6 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Wed, 7 Aug 2013 11:09:40 -0400
Subject: [PATCH 01/18] added utfgridwms support

---
 lib/OpenLayers/Layer/UTFGridWMS.js | 276 +++++++++++++++++++++++++++++
 1 file changed, 276 insertions(+)
 create mode 100644 lib/OpenLayers/Layer/UTFGridWMS.js

diff --git a/lib/OpenLayers/Layer/UTFGridWMS.js b/lib/OpenLayers/Layer/UTFGridWMS.js
new file mode 100644
index 0000000000..5206ad4b03
--- /dev/null
+++ b/lib/OpenLayers/Layer/UTFGridWMS.js
@@ -0,0 +1,276 @@
+/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+ * full list of contributors). Published under the 2-clause BSD license.
+ * See license.txt in the OpenLayers distribution or repository for the
+ * full text of the license. */
+
+
+/**
+ * @requires OpenLayers/Layer/WMS.js
+ * @requires OpenLayers/Tile/UTFGrid.js
+ * @requires OpenLayers/Control/UTFGrid.js
+ */
+
+/**
+ * Class: OpenLayers.Layer.UTFGridWMS
+ * This Layer reads from UTFGrid tiled data sources.  Since UTFGrids are 
+ * essentially JSON-based ASCII art with attached attributes, they are not 
+ * visibly rendered.  In order to use them in the map, you must add a 
+ * <OpenLayers.Control.UTFGrid> control as well. This version use a WMS
+ * instead of a tiled map.
+ * 
+ * Inherits from:
+ *  - <OpenLayers.Layer.WMS>
+ */
+OpenLayers.Layer.UTFGridWMS = OpenLayers.Class(OpenLayers.Layer.WMS, {
+
+    /**
+     * Constant: DEFAULT_PARAMS
+     * {Object} Hashtable of default parameter key/value pairs 
+     */
+    DEFAULT_PARAMS: { service: "WMS",
+                      version: "1.1.1",
+                      request: "GetMap",
+                      styles: "",
+                      format: "application/json"
+                     },
+    
+    /**
+     * APIProperty: isBaseLayer
+     * {Boolean} Default is false for UTFGridWMS layer
+     */
+    isBaseLayer: false,
+    
+    /**
+     * APIProperty: encodeBBOX
+     * {Boolean} Should the BBOX commas be encoded? The WMS spec says 'no', 
+     * but some services want it that way. Default false.
+     */
+    encodeBBOX: false,
+
+    /**
+    * Property: useJSONP
+    * {Boolean}
+    * Should we use a JSONP script approach instead of a standard AJAX call?
+    *
+    * Set to true for using utfgrids from another server. 
+    * Avoids same-domain policy restrictions. 
+    * Note that this only works if the server accepts 
+    * the callback GET parameter and dynamically 
+    * wraps the returned json in a function call.
+    * 
+    * Default is false
+    */
+    useJSONP: false,
+    
+    /**
+     * Property: yx
+     * {Object} Keys in this object are EPSG codes for which the axis order
+     *     is to be reversed (yx instead of xy, LatLon instead of LonLat), with
+     *     true as value. This is only relevant for WMS versions >= 1.3.0, and
+     *     only if yx is not set in <OpenLayers.Projection.defaults> for the
+     *     used projection.
+     */
+    yx: {},
+
+    /**
+     * Property: tileClass
+     * {<OpenLayers.Tile>} The tile class to use for this layer.
+     *     Defaults is <OpenLayers.Tile.UTFGrid>.
+     */
+    tileClass: OpenLayers.Tile.UTFGrid,
+    
+    /**
+     * Constructor: OpenLayers.Layer.UTFGridWMS
+     * Create a new UTFGridWMS layer object
+     *
+     * Parameters:
+     * name - {String} A name for the layer
+     * url - {String} Base url for the WMS
+     *                (e.g. http://wms.jpl.nasa.gov/wms.cgi)
+     * params - {Object} An object with key/value pairs representing the
+     *                   GetMap query string parameters and parameter values.
+     * options - {Object} Hashtable of extra options to tag onto the layer.
+     *     These options include all properties listed above, plus the ones
+     *     inherited from superclasses.
+     */
+    initialize: function(name, url, params, options) {
+        var newArguments = [];
+        //uppercase params
+        params = OpenLayers.Util.upperCaseObject(params);
+        if (parseFloat(params.VERSION) >= 1.3 && !params.EXCEPTIONS) {
+            params.EXCEPTIONS = "INIMAGE";
+        } 
+        newArguments.push(name, url, params, options);
+        OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
+        OpenLayers.Util.applyDefaults(this.params, OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));
+    
+        this.tileOptions = OpenLayers.Util.extend({
+            utfgridResolution: this.utfgridResolution
+        }, this.tileOptions);
+    },    
+
+    /**
+     * Method: clone
+     * Create a clone of this layer
+     *
+     * Returns:
+     * {<OpenLayers.Layer.UTFGridWMS>} An exact clone of this layer
+     */
+    clone: function (obj) {
+        
+        if (obj == null) {
+            obj = new OpenLayers.Layer.WMS(this.name,
+                                           this.url,
+                                           this.params,
+                                           this.getOptions());
+        }
+
+        //get all additions from superclasses
+        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
+
+        // copy/set any non-init, non-simple values here
+
+        return obj;
+    },    
+    
+    /**
+     * APIMethod: reverseAxisOrder
+     * Returns true if the axis order is reversed for the WMS version and
+     * projection of the layer.
+     * 
+     * Returns:
+     * {Boolean} true if the axis order is reversed, false otherwise.
+     */
+    reverseAxisOrder: function() {
+        var projCode = this.projection.getCode();
+        return parseFloat(this.params.VERSION) >= 1.3 && 
+            !!(this.yx[projCode] || OpenLayers.Projection.defaults[projCode].yx);
+    },
+    
+    /**
+     * Method: getURL
+     * Return a GetMap query string for this layer
+     *
+     * Parameters:
+     * bounds - {<OpenLayers.Bounds>} A bounds representing the bbox for the
+     *                                request.
+     *
+     * Returns:
+     * {String} A string with the layer's url and parameters and also the
+     *          passed-in bounds and appropriate tile size specified as 
+     *          parameters.
+     */
+    getURL: function (bounds) {
+        bounds = this.adjustBounds(bounds);
+        
+        var imageSize = this.getImageSize();
+        var newParams = {};
+        // WMS 1.3 introduced axis order
+        var reverseAxisOrder = this.reverseAxisOrder();
+        newParams.BBOX = this.encodeBBOX ?
+            bounds.toBBOX(null, reverseAxisOrder) :
+            bounds.toArray(reverseAxisOrder);
+        newParams.WIDTH = imageSize.w;
+        newParams.HEIGHT = imageSize.h;
+        var requestString = this.getFullRequestString(newParams);
+        return requestString;
+    },
+
+    /**
+     * APIMethod: mergeNewParams
+     * Catch changeParams and uppercase the new params to be merged in
+     *     before calling changeParams on the super class.
+     * 
+     *     Once params have been changed, the tiles will be reloaded with
+     *     the new parameters.
+     * 
+     * Parameters:
+     * newParams - {Object} Hashtable of new params to use
+     */
+    mergeNewParams:function(newParams) {
+        var upperParams = OpenLayers.Util.upperCaseObject(newParams);
+        var newArguments = [upperParams];
+        return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this, 
+                                                             newArguments);
+    },
+
+    /** 
+     * 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}
+     * altUrl - {String} Use this as the url instead of the layer's url
+     * 
+     * Returns:
+     * {String} 
+     */
+    getFullRequestString:function(newParams, altUrl) {
+        var mapProjection = this.map.getProjectionObject();
+        var projectionCode = this.projection && this.projection.equals(mapProjection) ?
+            this.projection.getCode() :
+            mapProjection.getCode();
+        var value = (projectionCode == "none") ? null : projectionCode;
+        if (parseFloat(this.params.VERSION) >= 1.3) {
+            this.params.CRS = value;
+        } else {
+            this.params.SRS = value;
+        }
+        
+        if (typeof this.params.TRANSPARENT == "boolean") {
+            newParams.TRANSPARENT = this.params.TRANSPARENT ? "TRUE" : "FALSE";
+        }
+
+        return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(
+                                                    this, arguments);
+    },
+
+    /**
+     * APIProperty: getFeatureInfo
+     * Get details about a feature associated with a map location.  The object
+     *     returned will have id and data properties.  If the given location
+     *     doesn't correspond to a feature, null will be returned.
+     *
+     * Parameters:
+     * location - {<OpenLayers.LonLat>} map location
+     *
+     * Returns:
+     * {Object} Object representing the feature id and UTFGrid data 
+     *     corresponding to the given map location.  Returns null if the given
+     *     location doesn't hit a feature.
+     */
+    getFeatureInfo: function(location) {
+        var info = null;
+        var tileInfo = this.getTileData(location);
+        if (tileInfo.tile) {
+            info = tileInfo.tile.getFeatureInfo(tileInfo.i, tileInfo.j);
+        }
+        return info;
+    },
+
+    /**
+     * APIMethod: getFeatureId
+     * Get the identifier for the feature associated with a map location.
+     *
+     * Parameters:
+     * location - {<OpenLayers.LonLat>} map location
+     *
+     * Returns:
+     * {String} The feature identifier corresponding to the given map location.
+     *     Returns null if the location doesn't hit a feature.
+     */
+    getFeatureId: function(location) {
+        var id = null;
+        var info = this.getTileData(location);
+        if (info.tile) {
+            id = info.tile.getFeatureId(info.i, info.j);
+        }
+        return id;
+    },
+
+    CLASS_NAME: "OpenLayers.Layer.UTFGridWMS"
+});

From 5a885f19734437d8cfd3a490a5cd3d9ffe865e31 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Wed, 7 Aug 2013 11:43:34 -0400
Subject: [PATCH 02/18] added example

---
 examples/utfgridwms.html | 114 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 examples/utfgridwms.html

diff --git a/examples/utfgridwms.html b/examples/utfgridwms.html
new file mode 100644
index 0000000000..bfe1504fcb
--- /dev/null
+++ b/examples/utfgridwms.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <link rel="stylesheet" href="theme/default/style.css" type="text/css">
+    <link rel="stylesheet" href="style.css" type="text/css">
+    <script src="lib/OpenLayers.js"></script>
+    <script type="text/javascript">
+        var lon = 0;
+        var lat = 40;
+        var zoom = 4;
+        var control, callback;
+
+        function init(){
+            var map = new OpenLayers.Map( 'map' );
+            var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
+                    "http://localhost/cgi-bin/mapserv-dev?map=/Users/Frank/nemapfile/nemapfile.map&", {layers: 'basic,points'}, {isBaseLayer:true, singleTile:false} );
+            map.addLayer(layer);
+            var layer2 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
+                    "http://localhost/cgi-bin/mapserv-dev?map=/Users/Frank/nemapfile/nemapfile.map&", {layers: 'basic'}, {utfgridResolution: 4, singleTile:false} );
+            map.addLayer(layer2);
+            var layer3 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
+                    "http://localhost/cgi-bin/mapserv-dev?map=/Users/Frank/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:false} );
+            map.addLayer(layer3);
+            map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
+            map.addControls([new OpenLayers.Control.LayerSwitcher(),new OpenLayers.Control.Scale(), new OpenLayers.Control.MousePosition()]);
+
+            callback = function(infoLookup) {
+                var msg = "";
+                // console.log(infoLookup);
+                if (infoLookup) {
+                    var layer, info;
+                    for (var idx in infoLookup) {
+                        layer = map.layers[idx];
+                        info = infoLookup[idx];
+                        if (info && info.data) {
+                            msg += "Feature ID: " + info.id + "<br>";
+                            for (var key in info.data) {
+                                msg += key + ": " + info.data[key] + "<br>";
+                            }
+                        }
+                    }
+                }
+                document.getElementById("attrs").innerHTML = msg;
+            };
+
+            var controls = {
+                move_country: new OpenLayers.Control.UTFGrid({
+                    callback: callback,
+                    layers: [layer2],
+                    handlerMode: "move"
+                }),
+                move_city: new OpenLayers.Control.UTFGrid({
+                    callback: callback,
+                    layers: [layer3],
+                    handlerMode: "move"
+                }),
+                move_both: new OpenLayers.Control.UTFGrid({
+                    callback: callback,
+                    layers: null, // same as all map.layers
+                    handlerMode: "move"
+                })
+            };
+
+            for (var key in controls) {
+                map.addControl(controls[key]);
+            }
+
+            toggleControl = function(el) {
+                for (var c in controls) {
+                    controls[c].deactivate();
+                }
+                controls[el.value].activate();
+            }
+            toggleControl({value: "move_country"});
+        }
+    </script>
+  </head>
+  <body onload="init()">
+    <h1 id="title">WMS UTFGrid with MapServer</h1>
+
+    <div id="tags">
+        wms, layer, singletile
+    </div>
+    <p id="shortdesc">
+        Mapserver and UTFGrid in WMS mode.
+    </p>
+
+    <div id="map" class="smallmap"></div>
+    <ul id="controlToggle">
+        <li>
+            <input type="radio" name="type" value="move_country" id="moveHandler" 
+            onclick="toggleControl(this);" checked="checked" />
+            <label for="moveHandler">View country</label>
+        </li>
+        <li>
+            <input type="radio" name="type" value="move_city" id="hoverHandler" 
+            onclick="toggleControl(this);" />
+            <label for="hoverHandler">View cities</label>
+        </li>
+        <li>
+            <input type="radio" name="type" value="move_both" id="clickHandler" 
+            onclick="toggleControl(this);" />
+            <label for="clickHandler">View both</label>
+        </li>
+    </ul>
+    <div id="docs">
+        <p><strong id="attrs">&nbsp;</strong></p>    
+        <p> Completly working and fully functional version of the UTFGrid renderer with MapServer. It allows request with WMS and getMap. This is the version that will come with MapServer. If you want to test it, you can get the MapServer version of it on my Git in the utfgridgsoc branch (github.com/fdesj/mapserver). It isn't on the official release yet. It uses a modified version of OpenLayers 2 because I had to create a support for UTFGrid and WMSrequests.</p> 
+    </div>
+  </body>
+</html>
\ No newline at end of file

From 1f92cbdc67437e1534b55cd2eb883d49c750ea3d Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Wed, 7 Aug 2013 11:55:44 -0400
Subject: [PATCH 03/18] changed map path

---
 examples/utfgridwms.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/examples/utfgridwms.html b/examples/utfgridwms.html
index bfe1504fcb..9d2c48e61b 100644
--- a/examples/utfgridwms.html
+++ b/examples/utfgridwms.html
@@ -16,20 +16,19 @@
         function init(){
             var map = new OpenLayers.Map( 'map' );
             var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://localhost/cgi-bin/mapserv-dev?map=/Users/Frank/nemapfile/nemapfile.map&", {layers: 'basic,points'}, {isBaseLayer:true, singleTile:false} );
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic,points'}, {isBaseLayer:true, singleTile:false} );
             map.addLayer(layer);
             var layer2 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
-                    "http://localhost/cgi-bin/mapserv-dev?map=/Users/Frank/nemapfile/nemapfile.map&", {layers: 'basic'}, {utfgridResolution: 4, singleTile:false} );
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic'}, {utfgridResolution: 4, singleTile:false} );
             map.addLayer(layer2);
             var layer3 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
-                    "http://localhost/cgi-bin/mapserv-dev?map=/Users/Frank/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:false} );
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:false} );
             map.addLayer(layer3);
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
             map.addControls([new OpenLayers.Control.LayerSwitcher(),new OpenLayers.Control.Scale(), new OpenLayers.Control.MousePosition()]);
 
             callback = function(infoLookup) {
                 var msg = "";
-                // console.log(infoLookup);
                 if (infoLookup) {
                     var layer, info;
                     for (var idx in infoLookup) {

From 334f3fe8147a6c66bc0ec8a83ea4a836006b13f2 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Wed, 7 Aug 2013 11:58:44 -0400
Subject: [PATCH 04/18] changed lib path and text

---
 examples/utfgridwms.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/utfgridwms.html b/examples/utfgridwms.html
index 9d2c48e61b..c5bbffe5f1 100644
--- a/examples/utfgridwms.html
+++ b/examples/utfgridwms.html
@@ -6,7 +6,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel="stylesheet" href="theme/default/style.css" type="text/css">
     <link rel="stylesheet" href="style.css" type="text/css">
-    <script src="lib/OpenLayers.js"></script>
+    <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
         var lon = 0;
         var lat = 40;
@@ -107,7 +107,7 @@ <h1 id="title">WMS UTFGrid with MapServer</h1>
     </ul>
     <div id="docs">
         <p><strong id="attrs">&nbsp;</strong></p>    
-        <p> Completly working and fully functional version of the UTFGrid renderer with MapServer. It allows request with WMS and getMap. This is the version that will come with MapServer. If you want to test it, you can get the MapServer version of it on my Git in the utfgridgsoc branch (github.com/fdesj/mapserver). It isn't on the official release yet. It uses a modified version of OpenLayers 2 because I had to create a support for UTFGrid and WMSrequests.</p> 
+        <p> UTFGridWMS generated with MapServer. If you want to test it, you can get the MapServer version of it on my Git in the utfgridgsoc branch (github.com/fdesj/mapserver). It isn't on the official release yet.</p> 
     </div>
   </body>
 </html>
\ No newline at end of file

From a6cab62f96d8dc879923d2825167c7692096471d Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Wed, 7 Aug 2013 13:00:11 -0400
Subject: [PATCH 05/18] removed layer switcher

---
 examples/utfgridwms.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/utfgridwms.html b/examples/utfgridwms.html
index c5bbffe5f1..0b6a983634 100644
--- a/examples/utfgridwms.html
+++ b/examples/utfgridwms.html
@@ -25,7 +25,7 @@
                     "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:false} );
             map.addLayer(layer3);
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
-            map.addControls([new OpenLayers.Control.LayerSwitcher(),new OpenLayers.Control.Scale(), new OpenLayers.Control.MousePosition()]);
+            map.addControls([new OpenLayers.Control.Scale(), new OpenLayers.Control.MousePosition()]);
 
             callback = function(infoLookup) {
                 var msg = "";

From 61abb550265206c3e9bbe97bf9ce7edd2c849977 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Thu, 8 Aug 2013 12:20:18 -0400
Subject: [PATCH 06/18] added utfgridwms.js

---
 lib/OpenLayers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js
index 4bf92e758a..b2f9de4917 100644
--- a/lib/OpenLayers.js
+++ b/lib/OpenLayers.js
@@ -183,6 +183,7 @@
                 "OpenLayers/Layer/Boxes.js",
                 "OpenLayers/Layer/XYZ.js",
                 "OpenLayers/Layer/UTFGrid.js",
+                "OpenLayers/Layer/UTFGridWMS.js",
                 "OpenLayers/Layer/OSM.js",
                 "OpenLayers/Layer/Bing.js",
                 "OpenLayers/Layer/TMS.js",

From 12b307a4c2fdb4e5a16d5cb7f0987af7b35a1375 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Thu, 8 Aug 2013 12:21:12 -0400
Subject: [PATCH 07/18] added msgsoc.mapgears.com

---
 examples/proxy.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/proxy.cgi b/examples/proxy.cgi
index 1d2818f27a..21c7590ab4 100755
--- a/examples/proxy.cgi
+++ b/examples/proxy.cgi
@@ -22,7 +22,7 @@ allowedHosts = ['www.openlayers.org', 'openlayers.org',
                 'www.openstreetmap.org', 'sample.azavea.com',
                 'v2.suite.opengeo.org', 'v-swe.uni-muenster.de:8080',
                 'vmap0.tiles.osgeo.org', 'www.openrouteservice.org',
-                'maps.wien.gv.at']
+                'maps.wien.gv.at','msgsoc.mapgears.com']
 
 method = os.environ["REQUEST_METHOD"]
 

From ce53cf7ce3c83fa6646dd4cfcfbe1fbffef79765 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Thu, 8 Aug 2013 12:21:44 -0400
Subject: [PATCH 08/18] added working example

---
 examples/utfgridwms.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/utfgridwms.html b/examples/utfgridwms.html
index 0b6a983634..cf34d73de4 100644
--- a/examples/utfgridwms.html
+++ b/examples/utfgridwms.html
@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <link rel="stylesheet" href="theme/default/style.css" type="text/css">
+    <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
     <link rel="stylesheet" href="style.css" type="text/css">
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
@@ -12,18 +12,19 @@
         var lat = 40;
         var zoom = 4;
         var control, callback;
+        OpenLayers.ProxyHost = "/cgi-bin/proxy.cgi?url=";
 
-        function init(){
+        init = function(){
             var map = new OpenLayers.Map( 'map' );
             var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic,points'}, {isBaseLayer:true, singleTile:false} );
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic,points'}, {isBaseLayer:true, singleTile:true} );
             map.addLayer(layer);
             var layer2 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
-                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic'}, {utfgridResolution: 4, singleTile:false} );
-            map.addLayer(layer2);
-            var layer3 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
-                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:false} );
-            map.addLayer(layer3);
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic'}, {utfgridResolution: 4, singleTile:true} );
+            // map.addLayer(layer2);
+            // var layer3 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
+                    // "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:true} );
+            // map.addLayer(layer3);
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
             map.addControls([new OpenLayers.Control.Scale(), new OpenLayers.Control.MousePosition()]);
 
@@ -62,11 +63,10 @@
                     handlerMode: "move"
                 })
             };
-
             for (var key in controls) {
                 map.addControl(controls[key]);
             }
-
+            
             toggleControl = function(el) {
                 for (var c in controls) {
                     controls[c].deactivate();

From f69fc05300d21f06aaf2f6acc7a6a5ec22bf8621 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Thu, 8 Aug 2013 12:22:00 -0400
Subject: [PATCH 09/18] added utfgridwms support

---
 lib/OpenLayers/Control/UTFGrid.js  |  2 +-
 lib/OpenLayers/Layer/UTFGridWMS.js | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/OpenLayers/Control/UTFGrid.js b/lib/OpenLayers/Control/UTFGrid.js
index 799320110f..c0d233dadc 100644
--- a/lib/OpenLayers/Control/UTFGrid.js
+++ b/lib/OpenLayers/Control/UTFGrid.js
@@ -229,7 +229,7 @@ OpenLayers.Control.UTFGrid = OpenLayers.Class(OpenLayers.Control, {
         var layer;
         for (var i=candidates.length-1; i>=0; --i) {
             layer = candidates[i];
-            if (layer instanceof OpenLayers.Layer.UTFGrid ) { 
+            if (layer instanceof OpenLayers.Layer.UTFGrid || OpenLayers.Layer.UTFGridWMS) { 
                 layers.push(layer);
             }
         }
diff --git a/lib/OpenLayers/Layer/UTFGridWMS.js b/lib/OpenLayers/Layer/UTFGridWMS.js
index 5206ad4b03..267191e257 100644
--- a/lib/OpenLayers/Layer/UTFGridWMS.js
+++ b/lib/OpenLayers/Layer/UTFGridWMS.js
@@ -107,7 +107,13 @@ OpenLayers.Layer.UTFGridWMS = OpenLayers.Class(OpenLayers.Layer.WMS, {
         this.tileOptions = OpenLayers.Util.extend({
             utfgridResolution: this.utfgridResolution
         }, this.tileOptions);
-    },    
+    },
+
+    /**
+     * Method: createBackBuffer
+     * The UTFGrid cannot create a back buffer, so this method is overriden.
+     */
+    createBackBuffer: function() {},    
 
     /**
      * Method: clone
@@ -119,7 +125,7 @@ OpenLayers.Layer.UTFGridWMS = OpenLayers.Class(OpenLayers.Layer.WMS, {
     clone: function (obj) {
         
         if (obj == null) {
-            obj = new OpenLayers.Layer.WMS(this.name,
+            obj = new OpenLayers.Layer.UTFGridWMS(this.name,
                                            this.url,
                                            this.params,
                                            this.getOptions());
@@ -243,10 +249,10 @@ OpenLayers.Layer.UTFGridWMS = OpenLayers.Class(OpenLayers.Layer.WMS, {
      *     corresponding to the given map location.  Returns null if the given
      *     location doesn't hit a feature.
      */
-    getFeatureInfo: function(location) {
+    getFeatureInfo:function(location) {
         var info = null;
         var tileInfo = this.getTileData(location);
-        if (tileInfo.tile) {
+        if (tileInfo && tileInfo.tile) {
             info = tileInfo.tile.getFeatureInfo(tileInfo.i, tileInfo.j);
         }
         return info;

From b7d04cb44603160da716d5811657d0e2cafa4353 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Thu, 8 Aug 2013 13:51:27 -0400
Subject: [PATCH 10/18] fixing single tile

---
 examples/utfgridwms.html           | 8 ++++----
 lib/OpenLayers/Layer/UTFGridWMS.js | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/utfgridwms.html b/examples/utfgridwms.html
index cf34d73de4..621bef62a2 100644
--- a/examples/utfgridwms.html
+++ b/examples/utfgridwms.html
@@ -21,10 +21,10 @@
             map.addLayer(layer);
             var layer2 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
                     "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic'}, {utfgridResolution: 4, singleTile:true} );
-            // map.addLayer(layer2);
-            // var layer3 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
-                    // "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:true} );
-            // map.addLayer(layer3);
+            map.addLayer(layer2);
+            var layer3 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:true} );
+            map.addLayer(layer3);
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
             map.addControls([new OpenLayers.Control.Scale(), new OpenLayers.Control.MousePosition()]);
 
diff --git a/lib/OpenLayers/Layer/UTFGridWMS.js b/lib/OpenLayers/Layer/UTFGridWMS.js
index 267191e257..f4f5a2d830 100644
--- a/lib/OpenLayers/Layer/UTFGridWMS.js
+++ b/lib/OpenLayers/Layer/UTFGridWMS.js
@@ -168,8 +168,8 @@ OpenLayers.Layer.UTFGridWMS = OpenLayers.Class(OpenLayers.Layer.WMS, {
      */
     getURL: function (bounds) {
         bounds = this.adjustBounds(bounds);
-        
-        var imageSize = this.getImageSize();
+        var imageSize = this.getImageSize(bounds);
+        console.log(imageSize);
         var newParams = {};
         // WMS 1.3 introduced axis order
         var reverseAxisOrder = this.reverseAxisOrder();

From 8f255524f46fa3fac203dcb3804f9f010216a7d7 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Thu, 8 Aug 2013 13:51:49 -0400
Subject: [PATCH 11/18] fixed singleTile for utfgridwms

---
 lib/OpenLayers/Layer/Grid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index 296674343f..47a7e52014 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -913,7 +913,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
         var tileSize = OpenLayers.Layer.HTTPRequest.prototype.getImageSize.apply(this, arguments);
         if (this.singleTile) {
             tileSize = new OpenLayers.Size(
-                Math.round(bounds.getWidth() / this.gridResolution),
+                tileSize.w,
                 tileSize.h
             );
         }

From 36523d540fcd3fc597b965ffc3f95d6ff9781360 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Thu, 8 Aug 2013 16:11:48 -0400
Subject: [PATCH 12/18] moved gridResolution to fix UTFGridWMS layer error

---
 lib/OpenLayers/Layer/Grid.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index 47a7e52014..c10d7c690a 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -857,6 +857,9 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
             this.grid[0] = [];
         }
 
+        // store the resolution of the grid
+        this.gridResolution = this.getServerResolution();
+
         var tile = this.grid[0][0];
         if (!tile) {
             tile = this.addTile(tileBounds, px);
@@ -870,9 +873,6 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
         
         //remove all but our single tile
         this.removeExcessTiles(1,1);
-
-        // store the resolution of the grid
-        this.gridResolution = this.getServerResolution();
     },
 
     /** 
@@ -913,7 +913,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
         var tileSize = OpenLayers.Layer.HTTPRequest.prototype.getImageSize.apply(this, arguments);
         if (this.singleTile) {
             tileSize = new OpenLayers.Size(
-                tileSize.w,
+                Math.round(bounds.getWidth() / this.gridResolution),
                 tileSize.h
             );
         }

From 5ffec59a9616e32456bf0d2b62d386dbf75b2a7a Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Thu, 8 Aug 2013 16:12:02 -0400
Subject: [PATCH 13/18] working example

---
 examples/utfgridwms.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/utfgridwms.html b/examples/utfgridwms.html
index 621bef62a2..ff2c9526bb 100644
--- a/examples/utfgridwms.html
+++ b/examples/utfgridwms.html
@@ -30,6 +30,7 @@
 
             callback = function(infoLookup) {
                 var msg = "";
+                console.log(infoLookup)
                 if (infoLookup) {
                     var layer, info;
                     for (var idx in infoLookup) {
@@ -59,7 +60,7 @@
                 }),
                 move_both: new OpenLayers.Control.UTFGrid({
                     callback: callback,
-                    layers: null, // same as all map.layers
+                    layers: [layer2,layer3], // same as all map.layers
                     handlerMode: "move"
                 })
             };

From 23fa80763545db6b9ec570861b3c7eb15794039b Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Fri, 9 Aug 2013 09:43:53 -0400
Subject: [PATCH 14/18] small change so both layer setting works

---
 examples/utfgrid_twogrids.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/utfgrid_twogrids.js b/examples/utfgrid_twogrids.js
index c9cb4980e9..b4780591ec 100644
--- a/examples/utfgrid_twogrids.js
+++ b/examples/utfgrid_twogrids.js
@@ -52,7 +52,7 @@ var controls = {
     }),
     move_both: new OpenLayers.Control.UTFGrid({
         callback: callback,
-        layers: null, // same as all map.layers
+        layers: [population,bioregions],
         handlerMode: "move"
     })
 };

From a3eb109ce3390f868b89e6ee0f46560e064e9ae2 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Fri, 9 Aug 2013 09:45:29 -0400
Subject: [PATCH 15/18] changed prxy path

---
 examples/utfgridwms.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/utfgridwms.html b/examples/utfgridwms.html
index ff2c9526bb..cfa526b7d9 100644
--- a/examples/utfgridwms.html
+++ b/examples/utfgridwms.html
@@ -12,18 +12,18 @@
         var lat = 40;
         var zoom = 4;
         var control, callback;
-        OpenLayers.ProxyHost = "/cgi-bin/proxy.cgi?url=";
+        OpenLayers.ProxyHost = "./proxy.cgi?url=";
 
         init = function(){
             var map = new OpenLayers.Map( 'map' );
             var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic,points'}, {isBaseLayer:true, singleTile:true} );
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic,points'}, {isBaseLayer:true, singleTile:false} );
             map.addLayer(layer);
             var layer2 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
-                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic'}, {utfgridResolution: 4, singleTile:true} );
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic'}, {utfgridResolution: 4, singleTile:false} );
             map.addLayer(layer2);
             var layer3 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
-                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:true} );
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:false} );
             map.addLayer(layer3);
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
             map.addControls([new OpenLayers.Control.Scale(), new OpenLayers.Control.MousePosition()]);

From af633bc2022c31f744c54e561a1cc22433d5434f Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Fri, 9 Aug 2013 09:45:56 -0400
Subject: [PATCH 16/18] small text changes

---
 lib/OpenLayers/Layer/UTFGridWMS.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/OpenLayers/Layer/UTFGridWMS.js b/lib/OpenLayers/Layer/UTFGridWMS.js
index f4f5a2d830..438956f294 100644
--- a/lib/OpenLayers/Layer/UTFGridWMS.js
+++ b/lib/OpenLayers/Layer/UTFGridWMS.js
@@ -12,11 +12,10 @@
 
 /**
  * Class: OpenLayers.Layer.UTFGridWMS
- * This Layer reads from UTFGrid tiled data sources.  Since UTFGrids are 
+ * This Layer reads from UTFGrid WMS data sources.  Since UTFGrids are 
  * essentially JSON-based ASCII art with attached attributes, they are not 
  * visibly rendered.  In order to use them in the map, you must add a 
- * <OpenLayers.Control.UTFGrid> control as well. This version use a WMS
- * instead of a tiled map.
+ * <OpenLayers.Control.UTFGrid> control as well.xw
  * 
  * Inherits from:
  *  - <OpenLayers.Layer.WMS>
@@ -134,8 +133,6 @@ OpenLayers.Layer.UTFGridWMS = OpenLayers.Class(OpenLayers.Layer.WMS, {
         //get all additions from superclasses
         obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
 
-        // copy/set any non-init, non-simple values here
-
         return obj;
     },    
     

From 871a503106f30b3fa1590d2ef9c14609ef48adcd Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Fri, 9 Aug 2013 09:52:04 -0400
Subject: [PATCH 17/18] changed example text

---
 examples/utfgridwms.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/utfgridwms.html b/examples/utfgridwms.html
index cfa526b7d9..2055e4082c 100644
--- a/examples/utfgridwms.html
+++ b/examples/utfgridwms.html
@@ -79,13 +79,13 @@
     </script>
   </head>
   <body onload="init()">
-    <h1 id="title">WMS UTFGrid with MapServer</h1>
+    <h1 id="title">OpenLayers UTFGridWMS Demo</h1>
 
     <div id="tags">
         wms, layer, singletile
     </div>
     <p id="shortdesc">
-        Mapserver and UTFGrid in WMS mode.
+        This page demonstrates the use of the OpenLayers UTFGridWMS.
     </p>
 
     <div id="map" class="smallmap"></div>
@@ -108,7 +108,7 @@ <h1 id="title">WMS UTFGrid with MapServer</h1>
     </ul>
     <div id="docs">
         <p><strong id="attrs">&nbsp;</strong></p>    
-        <p> UTFGridWMS generated with MapServer. If you want to test it, you can get the MapServer version of it on my Git in the utfgridgsoc branch (github.com/fdesj/mapserver). It isn't on the official release yet.</p> 
+        <p> This exemple demostrates the use of UTFGridWMS. It allows high interaction maps with WMS. It can be used with the same functionalities that UTFGrid has.</p> 
     </div>
   </body>
 </html>
\ No newline at end of file

From 38714bceaa88cb66e2a072645379097af420a325 Mon Sep 17 00:00:00 2001
From: fdesj <fdesjarlais1@gmail.com>
Date: Mon, 12 Aug 2013 18:39:45 +0400
Subject: [PATCH 18/18] removed console.log

---
 examples/utfgridwms.html           | 9 ++++-----
 lib/OpenLayers/Layer/UTFGridWMS.js | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/examples/utfgridwms.html b/examples/utfgridwms.html
index 2055e4082c..23781c43a6 100644
--- a/examples/utfgridwms.html
+++ b/examples/utfgridwms.html
@@ -17,20 +17,19 @@
         init = function(){
             var map = new OpenLayers.Map( 'map' );
             var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic,points'}, {isBaseLayer:true, singleTile:false} );
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic,points'}, {isBaseLayer:true, singleTile:true} );
             map.addLayer(layer);
             var layer2 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
-                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic'}, {utfgridResolution: 4, singleTile:false} );
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'basic'}, {utfgridResolution: 4, singleTile:true} );
             map.addLayer(layer2);
             var layer3 = new OpenLayers.Layer.UTFGridWMS( "Utfgrid",
-                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:false} );
+                    "http://msgsoc.mapgears.com/cgi-bin/mapserv.cgi?map=/home/fdesjarlais/nemapfile/nemapfile.map&", {layers: 'points'}, {utfgridResolution: 4, singleTile:true} );
             map.addLayer(layer3);
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
             map.addControls([new OpenLayers.Control.Scale(), new OpenLayers.Control.MousePosition()]);
 
             callback = function(infoLookup) {
                 var msg = "";
-                console.log(infoLookup)
                 if (infoLookup) {
                     var layer, info;
                     for (var idx in infoLookup) {
@@ -111,4 +110,4 @@ <h1 id="title">OpenLayers UTFGridWMS Demo</h1>
         <p> This exemple demostrates the use of UTFGridWMS. It allows high interaction maps with WMS. It can be used with the same functionalities that UTFGrid has.</p> 
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/OpenLayers/Layer/UTFGridWMS.js b/lib/OpenLayers/Layer/UTFGridWMS.js
index 438956f294..85418af09e 100644
--- a/lib/OpenLayers/Layer/UTFGridWMS.js
+++ b/lib/OpenLayers/Layer/UTFGridWMS.js
@@ -166,7 +166,6 @@ OpenLayers.Layer.UTFGridWMS = OpenLayers.Class(OpenLayers.Layer.WMS, {
     getURL: function (bounds) {
         bounds = this.adjustBounds(bounds);
         var imageSize = this.getImageSize(bounds);
-        console.log(imageSize);
         var newParams = {};
         // WMS 1.3 introduced axis order
         var reverseAxisOrder = this.reverseAxisOrder();