Index: geocoding/google.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/geocoding/google.inc,v
retrieving revision 1.11.2.7
diff -u -p -r1.11.2.7 google.inc
--- geocoding/google.inc	4 Jan 2011 09:57:06 -0000	1.11.2.7
+++ geocoding/google.inc	8 Jan 2011 00:52:36 -0000
@@ -215,7 +215,7 @@ function _google_geocode_flatten($locati
   }
 
   if (!empty($location['city'])) {
-    if (!empty($location['street'])) {
+    if (!empty($address)) {
       $address .= ', ';
     }
 
@@ -223,12 +223,12 @@ function _google_geocode_flatten($locati
   }
 
   if (!empty($location['province'])) {
-    if (!empty($location['street']) || !empty($location['city'])) {
+    if (!empty($address)) {
       $address .= ', ';
     }
 
     // @@@ Fix this!
-    if (substr($location['province'], 0, 3) == $location['country'] .'-') {
+    if (substr($location['province'], 0, 3) == $location['country'] . '-') {
       $address .= substr($location['province'], 3);
       watchdog('Location', 'BUG: Country found in province attribute.');
     }
@@ -244,5 +244,12 @@ function _google_geocode_flatten($locati
     $address .= $location['postal_code'];
   }
 
+  if (!empty($location['country'])) {
+    if (!empty($address)) {
+      $address .= ', ';
+    }
+    $address .= $location['country'];
+  }
+
   return $address;
 }