Index: views/views_plugin_style_wfs.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wfs/views/views_plugin_style_wfs.inc,v
retrieving revision 1.6.2.12
diff -u -p -r1.6.2.12 views_plugin_style_wfs.inc
--- views/views_plugin_style_wfs.inc	17 May 2010 21:37:12 -0000	1.6.2.12
+++ views/views_plugin_style_wfs.inc	12 Jan 2011 01:15:15 -0000
@@ -126,19 +126,10 @@ class views_plugin_style_wfs extends vie
   function map_rows($rows) {
     // Fields must be rendered in order as of Views 2.3, 
     // so we will pre-render everything.
-    
-    $renders = array();
-    $keys = array_keys($this->view->field);
-
-    foreach ($rows as $count => $row) {
-      foreach ($keys as $id) {
-        $renders[$count][$id] = $this->view->field[$id]->theme($row);
-      }
-    }  
 
     $points = array();
 
-    foreach ($renders as $id => $row) {
+    foreach ($rows as $id => $row) {
       $point = array();
       $point['attr'] = array();
 
@@ -146,24 +137,25 @@ class views_plugin_style_wfs extends vie
         if (isset($this->options['data_source']['value'])) {
           if (current($this->options['data_source']['value']) == 'latlon') {
             if ($key == $this->options['fields']['longitude']) {
-              $point['lon'] = $row[$key];
+              $point['lon'] = $this->get_field($id, $key);
             }
             if ($key == $this->options['fields']['latitude']) {
-              $point['lat'] = $row[$key];
+              $point['lat'] = $this->get_field($id, $key);
             }
           }
           if (current($this->options['data_source']['value']) == 'wkt' &&
             $key == $this->options['fields']['wkt']) {
-              $point['wkt'] = $row[$key];
+              $point['wkt'] = $this->get_field($id, $key);
             continue;
           }
         }
         if ($key == $this->options['fields']['id']) {
-          $point['id'] = $row[$key];
+          $point['id'] = $this->get_field($id, $key);
         }
         $key = ($key == 'name') ? '_name' : $key;
-        if (isset($row[$key])) {
-          $point['attr'][$key] = $row[$key];
+        $value = $this->get_field($id, $key);
+        if (isset($value)) {
+          $point['attr'][$key] = $value;
         }
       }
 
