### Eclipse Workspace Patch 1.0
#P geocode
Index: includes/geocode.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/geocode/includes/geocode.inc,v
retrieving revision 1.5
diff -u -r1.5 geocode.inc
--- includes/geocode.inc	4 Nov 2009 21:07:31 -0000	1.5
+++ includes/geocode.inc	9 Sep 2010 12:07:48 -0000
@@ -70,9 +70,10 @@
       $this->country_name = $addr->CountryName;
       $this->country = $addr->CountryNameCode;
       $this->state = $addr->AdministrativeArea->AdministrativeAreaName;
-      $this->city = $addr->AdministrativeArea->Locality->LocalityName;
-      $this->street1 = $addr->AdministrativeArea->Locality->Thoroughfare->ThoroughfareName;
-      $this->zip = $addr->AdministrativeArea->Locality->PostalCode->PostalCodeNumber;
+      $locality = isset($addr->AdministrativeArea->SubAdministrativeArea) ? $addr->AdministrativeArea->SubAdministrativeArea->Locality : $addr->AdministrativeArea->Locality;
+      $this->city = $locality->LocalityName;
+      $this->street1 = $locality->Thoroughfare->ThoroughfareName;
+      $this->zip = $locality->PostalCode->PostalCodeNumber;
     }
 
     if (isset($result->Point)) {