Index: htdocs/sites/all/modules/contrib/location/geocoding/google.inc
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- htdocs/sites/all/modules/contrib/location/geocoding/google.inc	(revision a058b1a8b8a5842f2d3fc3339b65682752400690)
+++ htdocs/sites/all/modules/contrib/location/geocoding/google.inc	(revision )
@@ -53,52 +53,8 @@
  * Coverage list feed: http://spreadsheets.google.com/feeds/list/p9pdwsai2hDMsLkXsoM05KQ/default/public/values
  */
 function google_geocode_country_list() {
-  // Get the google data from the feed.
-  $xml = google_geocode_country_list_xml();
-
-  // Loop through google data and find all valid entries.
-  $regionclean = array();
-  foreach ($xml->entry as $region) {
-    $pos = strpos($region->content, 'geocoding:') + 11;
-    $geocoding = substr($region->content, $pos, strpos($region->content, ',', $pos) - $pos);
-    if (strpos($geocoding, "Yes") !== FALSE) {
-      $regionclean[] = t(htmlentities($region->title));
-    }
-  }
-
-  // Get the countries list and clean it up so that names will match to google.
-  // The regex removes parenthetical items so that both of the "Congo" entries
-  // and the "Coco Islands" work.
-  // The $countriesfixes overwrites values in the Drupal API countries list
-  // with values that will match to google's entries.
-  // "Sao Tome and Principe" are non-accented in the Drupal API so the entry
-  // here is to match the htmlentities() fix in the foreach loop below.
-  // Note: it may be neccessary to adjust/add to the fixes list in the future
-  // if google adds countries that don't match the Drupal API list for whatever
-  // reason.
   $countries = location_get_iso3166_list();
-  $regex = "#[ (].*[)]#";
-  $cntryclean = preg_replace($regex, "", $countries);
-  $countriesfixes = array_merge(
-    $cntryclean,
-    array(
-      "hk" => t("China"),
-      "mo" => t("China"),
-      "pn" => t("Pitcairn Islands"),
-      "wf" => t("Wallis Futuna"),
-      "st" => t("S&Atilde;&pound;o Tom&Atilde;&copy; and Pr&Atilde;&shy;ncipe"),
-    )
-  );
-
-  // Compare new google data found to fixed country name values and return
-  // matches with abbreviations as keys.
-  $googlematched = array_intersect($countriesfixes, $regionclean);
-
-  // Compare new keys to original Drupal API and return the array with the
-  // original name values.
-  $fixedkeys = array_intersect_key($countries, $googlematched);
-
-  return array_keys($fixedkeys);
+  return array_keys($countries);
 }
 
 /**