From 2bd13f2e0e18388af971dfac59610c7d9826bc62 Mon Sep 17 00:00:00 2001
From: Michael Stenta <mike@mstenta.net>
Date: Tue, 31 Dec 2019 10:43:08 -0500
Subject: [PATCH] Rename farm_map_geofield_geometry_combine() to
 farm_map_combine_geoms().

---
 modules/farm/farm_map/farm_map.geo.inc | 2 +-
 modules/farm/farm_map/farm_map.module  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/farm/farm_map/farm_map.geo.inc b/modules/farm/farm_map/farm_map.geo.inc
index b2d1758c..46095774 100644
--- a/modules/farm/farm_map/farm_map.geo.inc
+++ b/modules/farm/farm_map/farm_map.geo.inc
@@ -14,7 +14,7 @@
  * @return object|bool
  *   Returns a GeoPHP object, or FALSE on failure.
  */
-function farm_map_geofield_geometry_combine($geoms = array()) {
+function farm_map_combine_geoms($geoms = array()) {
 
   // If no geometries were found, return an empty geometry.
   if (empty($geoms)) {
diff --git a/modules/farm/farm_map/farm_map.module b/modules/farm/farm_map/farm_map.module
index 0edeff04..8d15d911 100644
--- a/modules/farm/farm_map/farm_map.module
+++ b/modules/farm/farm_map/farm_map.module
@@ -260,7 +260,7 @@ function farm_map_geofield_populate(&$entity, $geoms = array()) {
   }
 
   // Combine the WKT geometries into a single GeoPHP geometry.
-  $geometry = farm_map_geofield_geometry_combine($geoms);
+  $geometry = farm_map_combine_geoms($geoms);
 
   // If that didn't work, bail.
   if (empty($geometry)) {