From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 29 Aug 2019 01:23:13 +0000 (+1200)
Subject: Do not geocode while merging, rely on existing values
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b429644f33903b17f1ecc1f33d3464e03feb91fe;p=civicrm-core.git

Do not geocode while merging, rely on existing values

This is a performance fix when merging - on a batch merge job it can be kinda crazy & we already have
geocode data for the contacts
---

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 9e501f35f6..5cf8efb99e 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1181,7 +1181,11 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
             $locations[$moniker][$blockName][$cnt] = $value;
             // Fix address display
             if ($blockName == 'address') {
+              // For performance avoid geocoding while merging https://issues.civicrm.org/jira/browse/CRM-21786
+              // we can expect existing geocode values to be retained.
+              $value['skip_geocode'] = TRUE;
               CRM_Core_BAO_Address::fixAddress($value);
+              unset($value['skip_geocode']);
               $locations[$moniker][$blockName][$cnt]['display'] = CRM_Utils_Address::format($value);
             }
             // Fix email display