From 11e0cafc2634d3f2b66beee6e31bc5fa9f25fccb Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Thu, 30 Aug 2018 10:14:44 -0400 Subject: [PATCH] testing new leaflet map for brewery map page --- glm-associate-template.php | 1 - glm-member-db/views/front/members/list.html | 17 +- sections/brewery-map.php | 589 +++++++------------- sections/request-guides.php | 1 - 4 files changed, 209 insertions(+), 399 deletions(-) diff --git a/glm-associate-template.php b/glm-associate-template.php index 868c0aa..7d406fb 100644 --- a/glm-associate-template.php +++ b/glm-associate-template.php @@ -2,4 +2,3 @@ /* Template Name: GLM Associate Template */ -get_template_part('index'); \ No newline at end of file diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html index 35a9a7d..75b9bd3 100644 --- a/glm-member-db/views/front/members/list.html +++ b/glm-member-db/views/front/members/list.html @@ -4,7 +4,8 @@ {if $settings.list_map_show_opened || $view == 'map'}map-opened{else}map-closed{/if} {if $settings.list_show_search_filters_opened}filters-opened{else}filters-closed{/if} "> - +BAGAGA +{if $view != 'no-map'} {if $settings.selected_map_interface == 1} @@ -20,7 +21,7 @@ {/if} - +{/if} {apply_filters('glm-member-db-front-members-list-pageTop', '')}
{if $settings.list_show_map} @@ -525,14 +526,14 @@ 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 && $view != 'no-map'} /* * Leaflet Map * API reference: https://leafletjs.com/reference-1.3.2.html */ - + console.log('LEAF') function initMap() { var leafletMap = L.map('LeafletMapContainer').setView([{$settings.maps_default_lat}, {$settings.maps_default_lon}], defZoom); @@ -602,8 +603,8 @@ {/if} - {if $settings.selected_map_interface == 2} - + {if $settings.selected_map_interface == 2 && $view != 'no-map'} + /* * Google Maps * API reference: https://developers.google.com/maps/documentation/javascript/reference @@ -611,7 +612,7 @@ function initMap() { - // Create a Google Map object + // Create a Google Map objects var map = new google.maps.Map(document.getElementById('glm-locationMap'), { center: new google.maps.LatLng({$settings.maps_default_lat}, {$settings.maps_default_lon}), zoom: {$settings.maps_default_zoom}, diff --git a/sections/brewery-map.php b/sections/brewery-map.php index b729abe..c56982e 100644 --- a/sections/brewery-map.php +++ b/sections/brewery-map.php @@ -5,272 +5,221 @@
+
+ + + + + + + + + - \ No newline at end of file + initMap(); + + diff --git a/sections/request-guides.php b/sections/request-guides.php index a20e71b..5500179 100644 --- a/sections/request-guides.php +++ b/sections/request-guides.php @@ -3,7 +3,6 @@
-
-- 2.17.1