Index: location.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/location.module,v
retrieving revision 1.237
diff -u -r1.237 location.module
--- location.module	21 Jan 2009 23:15:25 -0000	1.237
+++ location.module	27 Jan 2009 20:17:18 -0000
@@ -1696,12 +1696,16 @@
     $variables['longitude'] = check_plain($location['longitude']);
     $variables['longitude_dms'] = theme('location_longitude_dms', $location['longitude']);
   }
-
+  
   // Add a country-specific template suggestion.
   if (!empty($location['country']) && location_standardize_country_code($location['country'])) {
     // $location['country'] is normalized in the previous line.
     $variables['template_files'][] = 'location-'. $location['country'];
   }
+  
+  if (module_exists('gmap')) {
+    $variables['map'] =  gmap_simple_map($variables['latitude'], $variables['longitude'], $markername = '', $info = '', $zoom = 'default', $width = 'default', $height = 'default', $autoshow = FALSE, $location);
+  }
 }
 
 /**
Index: location.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/location.tpl.php,v
retrieving revision 1.2
diff -u -r1.2 location.tpl.php
--- location.tpl.php	21 Aug 2008 16:46:37 -0000	1.2
+++ location.tpl.php	27 Jan 2009 19:40:59 -0000
@@ -41,3 +41,4 @@
 ?>
 </div></div>
 <?php echo $map_link; ?>
+<?php echo $map; ?>
Index: supported/location.us.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/supported/location.us.inc,v
retrieving revision 1.23
diff -u -r1.23 location.us.inc
--- supported/location.us.inc	21 Aug 2008 16:18:05 -0000	1.23
+++ supported/location.us.inc	27 Jan 2009 19:09:23 -0000
@@ -154,7 +154,7 @@
     }
   }
 
-  if ($location['latitude'] && $location['longitude']) {
+  if (location_has_coordinates($location)) {
     $q = urlencode($location['latitude'] . ' ' . $location['longitude'] . ' (' . implode(', ', $query_params) . ')' );
   } else if (count($query_params) > 0) {
     $q = urlencode(implode(", ", $query_params));