From 441cf6bf4ed096f0a4ba14e4ae295c567df1364a Mon Sep 17 00:00:00 2001
From: Jonathan Daggerhart <jonathan@daggerhart.com>
Date: Sun, 6 Jun 2021 07:53:19 -0400
Subject: [PATCH] Fix for address fields when value is an associative array
 matching address field definition keys.

---
 src/Drupal/Driver/Fields/Drupal8/AddressHandler.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Drupal/Driver/Fields/Drupal8/AddressHandler.php b/src/Drupal/Driver/Fields/Drupal8/AddressHandler.php
index 284eadd..425e878 100644
--- a/src/Drupal/Driver/Fields/Drupal8/AddressHandler.php
+++ b/src/Drupal/Driver/Fields/Drupal8/AddressHandler.php
@@ -49,6 +49,12 @@ public function expand($values) {
           $return[$k] = $value;
           break;
         }
+        // If the value array contains keys for the address fields array, use
+        // the keyed value.
+        elseif (isset($value[$k])) {
+          $return[$k] = $value[$k];
+          continue;
+        }
         if ($idx < count($value)) {
           // Gracefully handle users providing too few field component values.
           $return[$k] = $value[$idx];