From 82294835ea2af44e267fee7cb22c060d0d465a30 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 23 Aug 2018 12:04:59 -0400
Subject: [PATCH] Update for leaflet maps

Not totally working.
---
 glm-member-db/views/front/members/list.html | 73 +++++++++++----------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index bd4be15..35a9a7d 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -5,7 +5,7 @@
     {if $settings.list_show_search_filters_opened}filters-opened{else}filters-closed{/if}
 ">
 
-            {if $settings.selected_map_interface == 1} 
+            {if $settings.selected_map_interface == 1}
                 <!--  Leaflet Map -->
                 <link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.3/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin=""/>
                 <script src="https://unpkg.com/leaflet@1.3.3/dist/leaflet.js" integrity="sha512-tAGcCfR4Sc5ZP5ZoVz0quoZDYX5aCtEm/eu1KhSLj2c9eFrylXZknQYmxUssFaVJKvvc0dJQixhGjG2yXWiV9Q==" crossorigin=""></script>
@@ -14,8 +14,8 @@
                 <link rel="stylesheet" href="{$jsUrl}/Leaflet.loading/src/Control.Loading.css" />
                 <script src="{$jsUrl}/Leaflet.loading/src/Control.Loading.js"></script>
             {/if}
-            
-            {if $settings.selected_map_interface == 2}            
+
+            {if $settings.selected_map_interface == 2}
                 <!-- Google Map -->
                 <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
             {/if}
@@ -113,17 +113,17 @@
         {/if} {*list_show_search*}
     {if $settings.list_show_map}
     {if $view != 'no-map'}
-        <script src="//maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
+        <!-- <script src="//maps.googleapis.com/maps/api/js?sensor=true&#38;key={$settings.google_maps_api_key}"></script> -->
     {/if}
         {apply_filters('glm-member-db-front-members-list-mapTop', '')}
         <div id="glm-locationMap-container">
 
-            {if $settings.selected_map_interface == 1} 
+            {if $settings.selected_map_interface == 1}
                 <!--  Leaflet Map -->
                 <div id="LeafletMapContainer" style="height: 400px; width: 100%; border: 1px black solid; z-index: +0;"></div>
             {/if}
-            
-            {if $settings.selected_map_interface == 2}            
+
+            {if $settings.selected_map_interface == 2}
                 <!-- Google Map -->
             <div id="glm-locationMap" class="glm-map">(map loads here)</div>
             {/if}
@@ -243,7 +243,7 @@
         <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
         <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
         <br>
-        
+
     {/if}
 
 
@@ -461,7 +461,7 @@
          </div>
 
  {/if} {*end grid view check*}
-    <div class="paging-container">     
+    <div class="paging-container">
         {if $paging}
             <br>
                 <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
@@ -521,13 +521,13 @@
             /*
              * Map operations
              */
-             
+
             var startLat = $('#glmLat').val();
             var startLon = $('#glmLng').val();
             var defZoom = Number({$settings.maps_default_zoom});
-            
-      {if $settings.selected_map_interface == 1}    
-                    
+
+      {if $settings.selected_map_interface == 1}
+
             /*
              *  Leaflet Map
              *  API reference: https://leafletjs.com/reference-1.3.2.html
@@ -541,14 +541,14 @@
                 var leafletMaxZoom = 19;
                 var clusterRadiusMax = 40;
                 var geocoder;
-    
+
                 // Loading features
                 var loadingControl = L.Control.loading({
                     separate: true,
                     delayIndicator: 500
                 });
                 leafletMap.addControl(loadingControl);
-                
+
                 // Init Map
                 L.tileLayer(leafletTileServer, {
                    attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.gaslightmedia.com/">Gaslight Media</a>',
@@ -556,8 +556,8 @@
                    maxZoom: leafletMaxZoom,
                    id: 'nothot'
                 }).addTo(leafletMap);
-    
-    
+
+
             {if $mapItems}
 
               {if $settings.use_cluster_markers}
@@ -569,41 +569,41 @@
                     maxClusterRadius: clusterRadiusMax
                 });
               {/if}
-        
-                            
+
+
               {foreach $mapItems as $m}
                 {if $m.lat != 0 && $m.lon != 0}
-    
-                // Create marker for this member and and to Feature Group 
+
+                // Create marker for this member and and to Feature Group
                 var leafletMarker = L.marker([{$m.lat}, {$m.lon}], { title:  '{$m.member_name|escape:quotes}' })
                     .bindPopup($('#map_info_' + {$m.id}).html())
                     .addTo(markerGroup);
-    
+
             {/if}
-              {/foreach}          
-    
+              {/foreach}
+
                 leafletMap.addLayer(markerGroup);
-    
+
                 // Get outer bounds of all markers in the Feature Group
-                leafletMap.fitBounds(markerGroup.getBounds());               
-    
+                leafletMap.fitBounds(markerGroup.getBounds());
+
             {/if} // havemembers
-    
+
                 // When a marker is clicked, display the pop-up near the center of the map.
-    
+
                 leafletMap.on('popupopen', function(e) {
                     var px = leafletMap.project(e.popup._latlng);
                     px.y -= e.popup._container.clientHeight/2;
                     leafletMap.panTo(leafletMap.unproject(px),{ animate: true });
                 });
-    
+
 
             }
 
       {/if}
-            
-      {if $settings.selected_map_interface == 2}    
-    
+
+      {if $settings.selected_map_interface == 2}
+
                         /*
                          * Google Maps
                          *  API reference: https://developers.google.com/maps/documentation/javascript/reference
@@ -635,7 +635,7 @@
                                     scrollTop: $("#glm-locationMap-container").offset().top-100
                                 }, 400);
                             }
-    
+
                         var geocoder = new google.maps.Geocoder();
                         var bounds = new google.maps.LatLngBounds();
                         var infowindow = new google.maps.InfoWindow();
@@ -724,7 +724,7 @@
 
                 {/if} // havemembers
 
-      {/if}                
+      {/if}
 
             {/if}   // settings.list_show_map
 
@@ -743,7 +743,8 @@
             initMap();
             mapInitialized = true;
         {/if}
-            
+            initMap();
+
             // Processes click-through counts for website links
             $('.glm-member-list-website-link').on('click', function() {
 
-- 
2.17.1