CRM-16373 - Config - Remove `mapGeoCoding` option

It looks like this is a boolean that enables/disables certain geocoding
features.  However, the variable is not actually editable, so it is
effectively fixed at "true".

diff --git a/CRM/Contact/Selector.php b/CRM/Contact/Selector.php
index 7bf0c9cdb7c1cfab65f67d8068d96ad97396e30e..7bd1562f29f893dba8007a1fe748bc1e1b75cf94 100644 (file)
--- a/CRM/Contact/Selector.php
+++ b/CRM/Contact/Selector.php
@@ -787,7 +787,7 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
           );
         }
         elseif ((is_numeric(CRM_Utils_Array::value('geo_code_1', $row))) ||
-          ($config->mapGeoCoding && !empty($row['city']) &&
+          (!empty($row['city']) &&
             CRM_Utils_Array::value('state_province', $row)
           )
         ) {
@@ -956,7 +956,7 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
         );
       }
       elseif ((is_numeric(CRM_Utils_Array::value('geo_code_1', $row))) ||
-        ($config->mapGeoCoding && !empty($row['city']) &&
+        (!empty($row['city']) &&
           CRM_Utils_Array::value('state_province', $row)
         )
       ) {

diff --git a/CRM/Core/Config/Variables.php b/CRM/Core/Config/Variables.php
index 0c5fd6da1b5290a1ef338e82304c2df68110bc5b..e43a36314d4d38c40fa27100cd1a75b6039c0eae 100644 (file)
--- a/CRM/Core/Config/Variables.php
+++ b/CRM/Core/Config/Variables.php
@@ -298,14 +298,6 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
    */
   public $geocodeMethod = '';
 
-  /**
-   *
-   *
-   * @var boolean
-   */
-  public $mapGeoCoding = 1;
-
-
   /**
    * Whether database-level logging should be performed
    * @var boolean

diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
index a9a530aebd7a06c6ec30ceb3fe951ac51911dd09..1af2f6c685ebec8d56a1c27312a3d9ce71584112 100644 (file)
--- a/CRM/Event/BAO/Event.php
+++ b/CRM/Event/BAO/Event.php
@@ -466,7 +466,7 @@ $event_summary_limit
               $params = array('entity_id' => $dao->id, 'entity_table' => 'civicrm_event');
               $values['location'] = CRM_Core_BAO_Location::getValues($params, TRUE);
               if (is_numeric(CRM_Utils_Array::value('geo_code_1', $values['location']['address'][1])) ||
-                ($config->mapGeoCoding &&
+                (
                   !empty($values['location']['address'][1]['city']) &&
                   !empty($values['location']['address'][1]['state_province_id'])
                 )

diff --git a/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl b/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
index 2a5eee1f07399731e0a65c35b4d31b49cfe6522b..235126147f91bb4479814e431fb9d3e67b846b95 100644 (file)
--- a/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
+++ b/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
@@ -57,7 +57,7 @@
             {if ( $event.is_map &&
             $config->mapProvider &&
       ( ( !empty($location.address.1.geo_code_1) && is_numeric($location.address.1.geo_code_1) )  ||
-        ( $config->mapGeoCoding && !empty($location.address.1.city) AND !empty($location.address.1.state_province) ) ) ) }
+        ( !empty($location.address.1.city) AND !empty($location.address.1.state_province) ) ) ) }
               <br/><a href="{crmURL p='civicrm/contact/map/event' q="reset=1&eid=`$event.id`"}" title="{ts}Map this Address{/ts}" target="_blank">{ts}Map this Location{/ts}</a>
             {/if}
           </td>

diff --git a/templates/CRM/Event/Page/EventInfo.tpl b/templates/CRM/Event/Page/EventInfo.tpl
index 7aae194e2fb5d806db743ef810194ac41bac882b..ff1ca59e99337d870990e48cc4a94e56d09cbc86 100644 (file)
--- a/templates/CRM/Event/Page/EventInfo.tpl
+++ b/templates/CRM/Event/Page/EventInfo.tpl
@@ -148,7 +148,7 @@
 
       {if ( $event.is_map && $config->mapProvider &&
           ( is_numeric($location.address.1.geo_code_1)  ||
-          ( $config->mapGeoCoding && $location.address.1.city AND $location.address.1.state_province ) ) ) }
+          ( $location.address.1.city AND $location.address.1.state_province ) ) ) }
           <div class="crm-section event_map-section">
               <div class="content">
                     {assign var=showDirectly value="1"}

diff --git a/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/4/EventInfo.tpl b/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/4/EventInfo.tpl
index 617d31abebd5bee5538ad89f9b851a4ef0ef5806..d215b862771ee007e97ae24fe9bc89133a2a2fac 100644 (file)
--- a/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/4/EventInfo.tpl
+++ b/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/4/EventInfo.tpl
@@ -40,7 +40,7 @@
                     <span class="fn org">{$location.1.name}</span><br />
                 {/if}
                 {$location.1.address.display|nl2br}
-                {if ( $event.is_map && $config->mapAPIKey && ( is_numeric($location.1.address.geo_code_1)  || ( $config->mapGeoCoding && $location.1.address.city AND $location.1.address.state_province ) ) ) }
+                {if ( $event.is_map && $config->mapAPIKey && ( is_numeric($location.1.address.geo_code_1)  || ( $location.1.address.city AND $location.1.address.state_province ) ) ) }
                     <br/><a href="{$mapURL}" title="{ts}Map this Address{/ts}">{ts}Map this Location{/ts}</a>
                 {/if}
                 </td>

diff --git a/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/8/EventInfo.tpl b/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/8/EventInfo.tpl
index 617d31abebd5bee5538ad89f9b851a4ef0ef5806..d215b862771ee007e97ae24fe9bc89133a2a2fac 100644 (file)
--- a/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/8/EventInfo.tpl
+++ b/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/8/EventInfo.tpl
@@ -40,7 +40,7 @@
                     <span class="fn org">{$location.1.name}</span><br />
                 {/if}
                 {$location.1.address.display|nl2br}
-                {if ( $event.is_map && $config->mapAPIKey && ( is_numeric($location.1.address.geo_code_1)  || ( $config->mapGeoCoding && $location.1.address.city AND $location.1.address.state_province ) ) ) }
+                {if ( $event.is_map && $config->mapAPIKey && ( is_numeric($location.1.address.geo_code_1)  || ( $location.1.address.city AND $location.1.address.state_province ) ) ) }
                     <br/><a href="{$mapURL}" title="{ts}Map this Address{/ts}">{ts}Map this Location{/ts}</a>
                 {/if}
                 </td>