From 61d3c4412f8df939fe9339727859efa2c52c664f Mon Sep 17 00:00:00 2001
From: euzuro <euzuro@metacarta.com>
Date: Fri, 19 May 2006 17:37:10 +0000
Subject: [PATCH] fixing bug introduced in [184]. just needed to be
 dereferencing grid (this.grid) and also to be making sure to only try to
 clean out when the grid has actually been initialized. SOMEBODY PUT THIS BOY
 IN A SANDBOX UNTIL HE CAN LEARN TO RUN THE DAMN TESTS BEFORE CHECKING IN.

git-svn-id: http://svn.openlayers.org/trunk/openlayers@186 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Layer/Grid.js | 16 +++++++++-------
 lib/OpenLayers/Tile/WFS.js   | 19 +++++++------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index adfd522d99..c443d554f0 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -238,14 +238,16 @@ OpenLayers.Layer.Grid.prototype = Object.extend( new OpenLayers.Layer(), {
     * @private
     */
     clearGrid:function() {
-        while(grid.length > 0) {
-            var row = grid[0];
-            while(row.length > 0) {
-                var tile = row[0];
-                tile.destroy();
-                row.remove(tile);
+        if (this.grid) {
+            while(this.grid.length > 0) {
+                var row = this.grid[0];
+                while(row.length > 0) {
+                    var tile = row[0];
+                    tile.destroy();
+                    row.remove(tile);
+                }
+                this.grid.remove(row);                   
             }
-            grid.remove(row);                   
         }
     }
     
diff --git a/lib/OpenLayers/Tile/WFS.js b/lib/OpenLayers/Tile/WFS.js
index 05b99a290b..82088c9958 100644
--- a/lib/OpenLayers/Tile/WFS.js
+++ b/lib/OpenLayers/Tile/WFS.js
@@ -80,7 +80,7 @@ OpenLayers.Tile.WFS.prototype =
         }
         
         var resultFeatures = ol.Application.getNodes(doc, "gml:featureMember");
-        ol.Log.info(this.CLASS_NAME + " found " +
+        ol.Log.info(this.grid.name + " found " +
                      resultFeatures.length + " features");
             
         //clear old featureList
@@ -88,21 +88,16 @@ OpenLayers.Tile.WFS.prototype =
 
         for (var i=0; i < resultFeatures.length; i++) {
         
-            //create new Feature and add it 
-            var newFeature = new ol.Feature(resultFeatures[i]);
+            //make new Feature 
+            var feature = new ol.Feature(resultFeatures[i]);
 
-            //add new marker
-            var newMarker = this._createMarker(newFeature);
-            this._addMarker(newMarker);
+            //make new Icon
+            var icon = new OpenLayers.Icon(feature.markerImage, feature.size);
 
-            //save reference to the feature and marker
-            this.featureList[i] = new ol.Tile.WFS.FeatureItem(
-                                        newFeature, newMarker);
+            //make new marker
+            var marker = new OpenLayers.Marker(icon, feature.lonlat);
     	}
         
-        if (this.ds.markers != null) {
-            this.ds.markers.redraw();
-        }
     },