Index: gmap.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gmap/gmap.module,v
retrieving revision 1.37
diff -u -F^f -r1.37 gmap.module
--- gmap.module	30 Jun 2006 05:39:21 -0000	1.37
+++ gmap.module	30 Jun 2006 16:14:03 -0000
@@ -16,6 +16,9 @@
 define('GMAP_HEIGHT', variable_get('gmap_default_height', '200px'));
 define('GMAP_ZOOM', variable_get('gmap_default_zoom', 3));
 define('GMAP_CONTROL', variable_get('gmap_default_control', 'Small'));
+define('GMAP_SCONTROL', variable_get('gmap_default_scontrol', 'off'));
+define('GMAP_TCONTROL', variable_get('gmap_default_tcontrol', 'off'));
+define('GMAP_OCONTROL', variable_get('gmap_default_ocontrol', NULL));
 //define('GMAP_ALIGNMENT', variable_get('gmap_default_allignment', ???));
 define('GMAP_LONGLAT', variable_get('gmap_default_latlong', '40,0'));
 define('GMAP_TYPE', variable_get('gmap_default_type', 'Map'));
@@ -103,9 +106,9 @@ function gmap_draw_map($gmap, $javascrip
     (!isset($gmap['id'])) ? $gmap['id']='map':NULL;
     (!isset($gmap['control'])) ? $gmap['control']=GMAP_CONTROL:NULL;
     (!isset($gmap['type'])) ? $gmap['type']=GMAP_TYPE:NULL;
-    (!isset($gmap['tcontrol'])) ? $gmap['tcontrol']='off':NULL;
-    (!isset($gmap['scontrol'])) ? $gmap['scontrol']='off':NULL;
-//    (!isset($gmap['ocontrol'])) ? $gmap['ocontrol']='off':NULL;
+    (!isset($gmap['tcontrol'])) ? $gmap['tcontrol']=GMAP_TCONTROL:NULL;
+    (!isset($gmap['scontrol'])) ? $gmap['scontrol']=GMAP_SCONTROL:NULL;
+    (!isset($gmap['ocontrol'])) ? $gmap['ocontrol']=GMAP_OCONTROL:NULL;
     (!isset($gmap['drag'])) ? $gmap['drag']='yes':NULL;
 
     if (!isset($gmap['center'])&& isset($gmap['latlong'])){
@@ -1009,6 +1012,25 @@ function gmap_settings() {
     '#default_value'=>GMAP_CONTROL,
     '#options'=>array('None'=>t('None'),'Small'=>t('Small'),'Large'=>t('Large')),
   );
+  $form['defaults']['gmap_default_scontrol']=array(
+    '#type'=>'select',
+    '#title'=>t('Scale control on the map by default'),
+    '#default_value'=>GMAP_SCONTROL,
+    '#options'=>array('on'=>t('Yes'),'off'=>t('No')),
+  );
+  $form['defaults']['gmap_default_tcontrol']=array(
+    '#type'=>'select',
+    '#title'=>t('Type control on the map by default'),
+    '#default_value'=>GMAP_TCONTROL,
+    '#options'=>array('on'=>t('Yes'),'off'=>t('No')),
+  );
+  $form['defaults']['gmap_default_ocontrol']=array(
+    '#type'=>'textfield',
+    '#title'=>t('Default size of the overview control'),
+    '#default_value'=>GMAP_OCONTROL,
+    '#size'=>25,
+    '#description'=>t('Set this to blank to disable it.'),
+  );
   $form['defaults']['gmap_default_type']=array(
     '#type'=>'select',
     '#title'=>t('Default map type'),