Make address field country unambiguous

This patch works for me.
This code should be a regular part of the module.

Thanks
nowi

I'd also like to see

if (!empty($field_item['organisation_name'])) $address .= $field_item['organisation_name'] . ',';

added. So you can get the organization name as well. The more data the better the results.

Why do we need the country suffix at all? Just the country name would suffice, wouldn't it?
Also there are cases like "Canada (ca)" leading to multiple results in both Canada and California whereas just "Canada" gives a single correct result.
I'll test this later today. Seems like a minor issue to fix.

New patch. Things changed:

• Extra check if countries list is retrievable.
• Only parse country name, parse country code if name cannot be retrieved.
• Drupal code standards.

forgot to upload the patch

This new patch ensures the /includes/iso.inc is loaded. (also leveraged by the Drupal installer)

This functionality overlaps with #1871962: Use Countries module to improve geocoding results
This uses Drupal core countries list, whereas 1871962 uses countries module.

@basvredeling, this works great but a couple suggestions.

Let's use country_get_list() instead of _country_get_predefined_list(). This is better as it includes an alter hook, to give other modules a chance to tweak the list of countries if desired. You'll also need to update the include to grab locale.inc instead of iso.inc.

Looks like the trailing comma is missing when you append the country. Should be something like this:

$address .= $field_item['country'] . ',';

If you would like to upload a new patch, I'll test and mark RTBC. This (referencing the country by its full name) is an important improvement and it'd be great to get this in.

Awesome. #9 in combination with #10, finally fixed my country issue. Locations located in Germany (DE), are no longer matched up with Delaware.

Thank you so much.

@kerasai #10 Initially I've opted for the private function instead because it didn't imply the locale module to be enabled. Usually the locale.inc is loaded by calling locale_init(). And I didn't want to add an additional dependency to geocoder. But we can always include it manually of course.

Here's a new patch. While I was at it, I added a todo to the last undocumented function geocoder_widget_array_recursive_diff().

Review please

Thanks mate! Committed!

The current solution works but taking a new look at it, it seems silly why we just didn't use the _addressfield_country_options_list() function.
Here's a patch, just for posterity.

I've included the concept of #20 into the patch #24 here: #1967520: Use Google geocoding components filter for better results with addressfield

@basvredeling Would it help to put the patch in comment #20 in a new issue for review to simplify the now existing code?

No, I don't think it's necessary to open a new issue. I'm ever so sorry if the new patch is bigger and harder to review. I can try and explain if that helps. To summarize: the old code leverages either the countries module or core locale country list to transform a country code into a country name. But since we're parsing an addressfield anyway, there already is a list of country names. So let's just use that.

The old code is much more complex that the new code and reads roughly like this.
old:

if (module_exists('countries')) {
  $country = country_load($field_item['country']);
  $field_item['country'] = $country->name;
}
else {
  // Convert country code to country name.
  include_once DRUPAL_ROOT . '/includes/locale.inc';
  $countries = country_get_list();
  if (array_key_exists($field_item['country'], $countries)) {
    $field_item['country'] = $countries[$field_item['country']];
  }
}

new:

$countries = _addressfield_country_options_list();
if (array_key_exists($field_item['country'], $countries)) {
  $field_item['country'] = $countries[$field_item['country']];
}

As a final note, the patch also affects the solution from #1871962: Use Countries module to improve geocoding results.

Yes, I understand from reading the patch originally. I was just concerned that in a closed issue queue the patch may be overlooked.

Simple is usually good way to go for code.

Thanks.