--- exif2gmap.module	2009-04-21 09:24:32.000000000 -0700
+++ exif2gmap.module.map_controls	2009-05-17 10:20:30.106970000 -0700
@@ -80,6 +80,33 @@ function exif2gmap_admin_settings() {
     '#attributes' => NULL,
     '#required' => TRUE,
   );
+  $form['exif2gmap']['map_controls'] = array(
+    '#value' => '<b>' . t('Map Controls:') . '</b>',
+  );
+  $form['exif2gmap']['exif2gmap_show_pan_zoom'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Show a pan/zoom control'),
+    '#return_value' => 1,
+    '#default_value' => variable_get('exif2gmap_show_pan_zoom', 1),
+  );
+  $form['exif2gmap']['exif2gmap_show_map_type'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Show buttons that let the user toggle between map types (street map, satellite map, and hybrid map)'),
+    '#return_value' => 1,
+    '#default_value' => variable_get('exif2gmap_show_map_type', 0),
+  );
+  $form['exif2gmap']['exif2gmap_show_scale_bar'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Show a scale bar'),
+    '#return_value' => 1,
+    '#default_value' => variable_get('exif2gmap_show_scale_bar', 0),
+  );
+  $form['exif2gmap']['exif2gmap_show_overview_map'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Show a collapsible overview map in the bottom right corner of the main map'),
+    '#return_value' => 1,
+    '#default_value' => variable_get('exif2gmap_show_overview_map', 0),
+  );
 
   return system_settings_form($form);
 }
@@ -371,9 +398,22 @@ function exif2gmap_process($text, $forma
 
   $script_body .= 'map'.$map_counter.'.setCenter(new GLatLng(' .$Clat. ',' .$Clon. '), 7);
 	';
-  $script_body .= 'map'.$map_counter.'.addControl(new GLargeMapControl());
+  if(variable_get('exif2gmap_show_pan_zoom','')){
+    $script_body .= 'map'.$map_counter.'.addControl(new GLargeMapControl());
 	';
-
+  }
+  if(variable_get('exif2gmap_show_map_type','')){
+    $script_body .= 'map'.$map_counter.'.addControl(new GMapTypeControl());
+	';
+  }
+  if(variable_get('exif2gmap_show_scale_bar','')){
+    $script_body .= 'map'.$map_counter.'.addControl(new GScaleControl());
+	';
+  }
+  if(variable_get('exif2gmap_show_overview_map','')){
+    $script_body .= 'map'.$map_counter.'.addControl(new GOverviewMapControl());
+	';
+  }
 	$script_body .= 'var rectObj = new GLatLngBounds(new GLatLng('.$SWlat.','.$SWlon.'), new GLatLng('.$NElat.','.$NElon.'));';
 	$script_body .= 'var zm = map'.$map_counter.'.getBoundsZoomLevel(rectObj); map'.$map_counter.'.setZoom(zm-1)';