From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 4 Apr 2018 20:00:56 +0000 (-0400)
Subject: Add the setting for marker cluster into member list view.
X-Git-Tag: v2.10.28^2~4^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=66b4353caf4f88ca99fbd981fe00a2d95934d8b1;p=WP-Plugins%2Fglm-member-db.git

Add the setting for marker cluster into member list view.

Also adding to shortcode the marker-clusters show option.
---

diff --git a/models/front/members/list.php b/models/front/members/list.php
index a1f5455d..b416e028 100644
--- a/models/front/members/list.php
+++ b/models/front/members/list.php
@@ -2,6 +2,7 @@
 
 /**
  * Gaslight Media Members Database
+ *
  * Front List Members
  *
  * PHP version 5.5
@@ -34,6 +35,7 @@ $GLOBALS['showOpts'] = array(
     'map-categories'        => 'list_map_show_categories',
     'map-credit-cards'      => 'list_map_show_creditcards',
     'map-amenities'         => 'list_map_show_amenities',
+    'marker-clusters'       => 'use_cluster_markers',
     'search'                => 'list_show_search',
     'search-filters-opened' => 'list_show_search_filters_opened',
     'search-text'           => 'list_show_search_text',
diff --git a/setup/shortcodes.php b/setup/shortcodes.php
index 9f862e77..ade4b6ae 100644
--- a/setup/shortcodes.php
+++ b/setup/shortcodes.php
@@ -108,6 +108,7 @@ if ( isset( $config['settings'] ) && $config['settings']['enable_members'] ) {
                 'map-categories'        => 'list_map_show_categories',
                 'map-credit-cards'      => 'list_map_show_creditcards',
                 'map-amenities'         => 'list_map_show_amenities',
+                'marker-clusters'       => 'use_cluster_markers',
                 'search'                => 'list_show_search',
                 'search-filters-opened' => 'list_show_search_filters_opened',
                 'search-text'           => 'list_show_search_text',
@@ -380,6 +381,7 @@ if ( isset( $config['settings'] ) && $config['settings']['enable_members'] ) {
                         <span>map-categories</span>
                         <span>map-credit-cards</span>
                         <span>map-email</span>
+                        <span>marker-clusters</span>
                 </p>
                 <p class="shortcode-option-list">
                     <span class="shortcode-option-list-title">Search Form Options</span><br>
diff --git a/views/front/members/list.html b/views/front/members/list.html
index b6fb1229..86b7dcf2 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -582,6 +582,7 @@
                      {/if}
                     {/foreach}
 
+                    {if $settings.use_cluster_markers}
                         var markerCluster = new MarkerClusterer(map, markers,
                         {
                             imagePath: '{$baseUrl}/js/googleMapsMarkerClusterer/images/m',
@@ -589,6 +590,7 @@
                             maxZoom: 14,
                             minimunClusterSize: 3
                         });
+                    {/if}
 
                         // Fit map to bounds of all markers
                         map.fitBounds(bounds);