--- C:\Documents and Settings\Aldo\Local Settings\Temp\TCVafb3.tmp\gmap.1.49.module	Mon Nov 06 23:56:24 2006
+++ D:\drupal cvs\contributions\modules\gmap\gmap.module	Mon Nov 06 23:46:46 2006
@@ -315,6 +316,21 @@
     if (isset($gmap['markers'])) {
       if (GMAP_CLUSTER) {
         $outtext .="\n var clusterer = new Clusterer(".$gmap['id'].");\n";
+        $markerfile = variable_get('gmap_markerfiles',drupal_get_path('module', 'gmap') .'/markers').'/'.variable_get('gmap_cluster_marker', 'cluster').'.png';
+        if (file_exists($markerfile)) {
+          $outtext .=" clusterIcon = new GIcon();\n";
+          $outtext .=" clusterIcon.image = '/$markerfile';\n";
+          $outtext .=" clusterIcon.shadow = 'http://www.google.com/mapfiles/shadow50.png';\n";
+          $outtext .=" clusterIcon.iconSize = new GSize(20, 34);\n";
+          $outtext .=" clusterIcon.shadowSize = new GSize(37, 34);\n";
+          $outtext .=" clusterIcon.iconAnchor = new GPoint(9, 34);\n";
+          $outtext .=" clusterIcon.infoWindowAnchor = new GPoint(9, 2);\n";
+          $outtext .=" clusterIcon.infoShadowAnchor = new GPoint(18, 25);\n";
+          $outtext .=" clusterer.SetIcon(clusterIcon);\n";
+        }
+        $outtext .=" clusterer.SetMaxVisibleMarkers(".variable_get('gmap_cluster_max_markers', 150).");\n";
+        $outtext .=" clusterer.SetMinMarkersPerCluster(".variable_get('gmap_cluster_min_per_cluster', 5).");\n";
+        $outtext .=" clusterer.SetMaxLinesPerInfoBox(".variable_get('gmap_cluster_max_lines', 10).");\n\n";
         $clusterset=true;
       }
       $lastmarker='';
@@ -986,12 +1002,6 @@
     '#maxlength' => 50,
   );
   */
-  $form['initialization']['gmap_cluster']=array(
-    '#type'=>'checkbox', 
-    '#title'=>t('Enable clusterer.js'),
-    '#default_value'=>GMAP_CLUSTER,
-    '#description'=>t('Enables Jef Poskanzer\'s excellent <a href="http://www.acme.com/javascript/#Clusterer">clusterer.js</a> script. (useful for a large number of markers on a single map).  This must be installed in the gmap directory of the drupal install.'),
-  );
   $form['initialization']['gmap_wms']=array(
     '#type'=>'checkbox',
     '#title'=>t('Enable wms features'),
@@ -1077,6 +1087,47 @@
     '#maxlength'=>7 ,
   );
 
+  $markers=gmap_get_markers();
+
+  $form['clusterer']=array(
+    '#type' => 'fieldset',
+    '#title' => t('Clusterer settings'),
+  );
+  $form['clusterer']['gmap_cluster']=array(
+    '#type'=>'checkbox', 
+    '#title'=>t('Enable clusterer.js'),
+    '#default_value'=>GMAP_CLUSTER,
+    '#description'=>t('Enables Jef Poskanzer\'s excellent <a href="http://www.acme.com/javascript/#Clusterer">clusterer.js</a> script. (useful for a large number of markers on a single map).  This must be installed in the gmap directory of the drupal install.'),
+  );
+  $form['clusterer']['gmap_cluster_marker'] = array(
+    '#type'=>'select',
+    '#title'=>t('Marker for clusters'),
+    '#default_value'=>variable_get('gmap_cluster_marker', 'cluster'),
+    '#options'=>$markers,
+  );
+  $form['clusterer']['gmap_cluster_max_markers'] = array(
+    '#type' => 'textfield',
+    '#title' => t("Maximum number of markers"),
+    '#default_value' => variable_get('gmap_cluster_max_markers', 150),
+    '#size' => 3,
+    '#maxlength' => 3,
+    '#title' => t("Clustering is enabled when more than the specified number of markers are visible at the same time."),
+  );
+  $form['clusterer']['gmap_cluster_min_per_cluster'] = array(
+    '#type' => 'textfield',
+    '#title' => t("Minimal number of markers per cluster"),
+    '#default_value' => variable_get('gmap_cluster_min_per_cluster', 5),
+    '#size' => 2,
+    '#maxlength' => 2,
+  );
+  $form['clusterer']['gmap_cluster_max_lines'] = array(
+    '#type' => 'textfield',
+    '#title' => t("Maximum number of lines per info box"),
+    '#default_value' => variable_get('gmap_cluster_max_lines', 10),
+    '#size' => 2,
+    '#maxlength' => 2,
+  );
+
   $form['location']=array(
     '#type' => 'fieldset',
     '#title' => t('Location settings'),