? 992192.1.patch
Index: openlayers.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/openlayers.module,v
retrieving revision 1.69.2.82.2.14
diff -u -p -r1.69.2.82.2.14 openlayers.module
--- openlayers.module	7 Dec 2010 22:03:28 -0000	1.69.2.82.2.14
+++ openlayers.module	8 Dec 2010 05:55:24 -0000
@@ -173,14 +173,8 @@ function openlayers_render_map($map = ar
   // Return themed map if no errors found
   if (empty($map['errors'])) {
     $js = array('openlayers' => array('maps' => array($map['id'] => $map)));
-    // Try to use more efficient json_encode function, if available
-    if (function_exists('json_encode')) {
-      drupal_add_js('Drupal.settings.openlayers.maps["' . $map['id'] . 
-        '"] = ' . json_encode($map) . ';', 'inline', 'header', TRUE);
-    }
-    else {
-      drupal_add_js($js, 'setting');
-    }
+    drupal_add_js($js, 'setting');
+
     // Push map through theme function and return
     $output = theme('openlayers_map', array(
       'map' => $map,
Index: includes/openlayers.render.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/includes/openlayers.render.inc,v
retrieving revision 1.3.2.18.2.2
diff -u -p -r1.3.2.18.2.2 openlayers.render.inc
--- includes/openlayers.render.inc	6 Dec 2010 18:39:30 -0000	1.3.2.18.2.2
+++ includes/openlayers.render.inc	8 Dec 2010 05:55:24 -0000
@@ -121,8 +121,5 @@ function _openlayers_styles_process($sty
  *   New map id
  */
 function _openlayers_create_map_id() {
-  static $map_count = 0;
-  $id = 'openlayers-map-auto-id-'. $map_count;
-  $map_count++;
-  return $id;
+  return 'openlayers-map-' . substr(md5(uniqid(mt_rand())), 0, 8);
 }
Index: modules/openlayers_views/views/openlayers_views_style_data.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openlayers/modules/openlayers_views/views/openlayers_views_style_data.inc,v
retrieving revision 1.1.2.27.2.15
diff -u -p -r1.1.2.27.2.15 openlayers_views_style_data.inc
--- modules/openlayers_views/views/openlayers_views_style_data.inc	6 Dec 2010 22:27:11 -0000	1.1.2.27.2.15
+++ modules/openlayers_views/views/openlayers_views_style_data.inc	8 Dec 2010 05:55:25 -0000
@@ -289,7 +289,13 @@ class openlayers_views_style_data extend
       }
     }
     else {
-      return array_push($features, $feature);;
+      array_push($features, array(
+        'attributes' => $feature,
+        'wkt' => $feature['wkt'],
+        'projection' => $feature['projection'],
+        'features' => array($feature)
+      ));;
+      return $features;
     }
   }
 
@@ -321,14 +327,9 @@ class openlayers_views_style_data extend
           $title);
       }
     }
-    if ($this->options['grouping']) {
-      return $this->coalesce_groups($features,
-        $handlers,
-        $this->options['data_source']);
-    }
-    else {
-      return $features;
-    }
+    return $this->coalesce_groups($features,
+      $handlers,
+      $this->options['data_source']);
   }
 
   /**