Index: mapstraction.apis.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mapstraction/mapstraction.apis.inc,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 mapstraction.apis.inc
--- mapstraction.apis.inc	11 Mar 2009 01:51:56 -0000	1.1.2.6
+++ mapstraction.apis.inc	4 Sep 2009 15:25:52 -0000
@@ -19,6 +19,7 @@ function mapstraction_basic_settings_for
     '#size' => 40,
     '#maxlength' => 255,
     '#default_value' => $settings['api_key'],
+    '#description' => t('If not present will attempt to load the "@apimap_api_key" variable instead.', array('@api' => $api_id)),
     '#process' => array('views_process_dependency'),
     '#dependency' => array(
       'edit-style-options-api' => array($api_id),
@@ -34,9 +35,15 @@ function mapstraction_basic_settings_for
 function mapstraction_basic_render($settings, $api_id) {
   $apis = mapstraction_apis(TRUE);
   $api = $apis[$api_id];
-  
+  // See if a variable exists for the api_key.  This should be in the format
+  // "{$api_id}map_api_key", e.g. "googlemap_api_key".
+  $key = variable_get($api_id . 'map_api_key', FALSE);
+  // Override the api_key variable with the setting stored in the view.
+  if (strlen($settings['api_key'])) {
+    $key = $settings['api_key'];
+  }
   // Find %key flag in 'src'
-  $src = strtr($api['src'], array('%key' => $settings['api_key']));
+  $src = strtr($api['src'], array('%key' => $key));
   return '<script type="text/javascript" src="' . $src . '"></script>';
 }
 
