From 70e8b1f9ea86f5d98ce21633937432734a88a6c8 Mon Sep 17 00:00:00 2001
From: Michael Stenta <mike@mstenta.net>
Date: Fri, 17 Jun 2022 07:13:05 -0400
Subject: [PATCH] Always default #map_settings to an empty array.

---
 modules/core/map/src/Element/FarmMap.php      | 6 ++----
 modules/core/map/src/Element/FarmMapInput.php | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/core/map/src/Element/FarmMap.php b/modules/core/map/src/Element/FarmMap.php
index 7f2b795fa..d4321a620 100644
--- a/modules/core/map/src/Element/FarmMap.php
+++ b/modules/core/map/src/Element/FarmMap.php
@@ -24,6 +24,7 @@ class FarmMap extends RenderElement {
       ],
       '#theme' => 'farm_map',
       '#map_type' => 'default',
+      '#map_settings' => [],
     ];
   }
 
@@ -66,14 +67,11 @@ class FarmMap extends RenderElement {
     $element['#attached']['library'][] = 'farm_map/farmOS-map';
     $element['#attached']['library'][] = 'farm_map/farm_map';
 
-    // Include map settings.
-    $map_settings = !empty($element['#map_settings']) ? $element['#map_settings'] : [];
-
     // Include the map options.
     $map_options = $map->getMapOptions();
 
     // Add the instance settings under the map id key.
-    $instance_settings = array_merge_recursive($map_settings, $map_options);
+    $instance_settings = array_merge_recursive($element['#map_settings'], $map_options);
     $element['#attached']['drupalSettings']['farm_map'][$map_id] = $instance_settings;
 
     // Create and dispatch a MapRenderEvent.
diff --git a/modules/core/map/src/Element/FarmMapInput.php b/modules/core/map/src/Element/FarmMapInput.php
index 2f12e4a09..0ce685a37 100644
--- a/modules/core/map/src/Element/FarmMapInput.php
+++ b/modules/core/map/src/Element/FarmMapInput.php
@@ -35,6 +35,7 @@ class FarmMapInput extends FormElement {
       // Display descriptions above the map by default.
       '#description_display' => 'before',
       '#map_type' => 'geofield_widget',
+      '#map_settings' => [],
       '#default_value' => '',
       '#display_raw_geometry' => TRUE,
     ];