From f4e9d1b43fd364259599c368c57dd55cd4e6976a Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 24 Aug 2017 12:22:28 -0400
Subject: [PATCH] Fixed problem with map reverting to address location each
 time member profile loads. Made map show all of the time, removed map
 show/hide button, and fixed some minor possitioning issues with map related
 elements.

---
 views/admin/member/memberInfo.html            | 13 ++++++---
 .../member/memberInfo/editProfileAddress.html | 27 +++++++++----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index d8dc229e..58be0ac2 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -638,6 +638,7 @@
             /*
              * Map Display Toggle
              */
+/*             
             $("#locationMapToggle").click(function() {
                 var mapC = "#locationMapContainer";
                 var map = "#locationMap";
@@ -645,11 +646,10 @@
                 var mapOverflow = 'hidden';
                 var mapBtnTxt = 'View Map';
                 if ($(mapC).height() == 0) {
-                    mapNewH = 400;
+                    mapNewH = 460;
                     mapV = 'visible';
                     mapBtnTxt = 'Hide Map';
                 }
-                initMap();
                 $(mapC).animate({
                     overflow: mapOverflow,
                     height: mapNewH
@@ -658,6 +658,7 @@
                 });
                 $(this).html(mapBtnTxt);
             });
+*/
 
             /*
              * Map operations
@@ -707,12 +708,13 @@
                     // Assign it to the lat/lon fields for submission
                     $('#glmLat').val(glmLat.toFixed(6));
                     $('#glmLng').val(glmLng.toFixed(6));
+                    
+                    glmPageUpdateRequired();
 
                 });
 
                 // When estimate location button is clicked, geocode using address
-
-                $(document).on('click','#locationMapToggle', glmEstimateLocation);
+//                $(document).on('click','#locationMapToggle', glmEstimateLocation);
                 $(document).on('click','#glm-estimate-location', glmEstimateLocation);
 
                 function glmEstimateLocation() {
@@ -859,6 +861,9 @@
             }
             checkLiveCamType();
 
+            // Initialize map on load
+            initMap();
+
         });
     </script>
 
diff --git a/views/admin/member/memberInfo/editProfileAddress.html b/views/admin/member/memberInfo/editProfileAddress.html
index 67d8faee..d240f91d 100644
--- a/views/admin/member/memberInfo/editProfileAddress.html
+++ b/views/admin/member/memberInfo/editProfileAddress.html
@@ -109,22 +109,19 @@
                         <div class="glm-row">
                             {if $memberInfo.fieldRequired.lat}<h4 class="emRequiredInputField">{else}<h4>{/if}Location:</h4>
                             <div class="glm-small-12">
-                                <div id="glm-estimate-location" class="button button-secondary glm-left">Map Location Using Above Address</div>
-                                <div id="locationMapToggle" class="button button-secondary glm-right">View Map</div>
-                                <div id="locationMapContainer" style="height: 0;">
-                                    <p>
-                                        AP USE: Drag the pointer to the desired location for this {$terms.term_member}.
-                                        Use + and - buttons or the mouse wheel to zoom in or out.
-                                        Click and drag anywhere else on the map to move to another area.
-                                    </p>
-                                    <div id="locationMap" class="glm-map-edit-small">(map loads here)</div>
-                                </div>
-                                <p>
-                                    <b>Selected Position:</b>
-                                    &nbsp;&nbsp;Latitude <input id="glmLat" name="lat" type="text" value="{$memberInfo.fieldData.lat}" class="glm-form-text-input-veryshort">
-                                    &nbsp;&nbsp;Longitude <input id="glmLng" name="lon" type="text" value="{$memberInfo.fieldData.lon}" class="glm-form-text-input-veryshort">
-                                    &nbsp;&nbsp;<span id="latLonRecenter" class="button button-secondary">Update pointer with new lat/lon postion.</span>
+                            	<p>
+                                    Drag the pointer to the desired location for this {$terms.term_member}.
+                                    Use + and - buttons or the mouse wheel to zoom in or out.
+                                    Click and drag anywhere else on the map to move to another area.
                                 </p>
+                                <p><div id="glm-estimate-location" class="button button-secondary">Map Location Using Above Address</div></p>
+                                <div id="locationMap" class="glm-map-edit-small" style="height: 400">(map loads here)</div>
+                                <p>
+                                    <h4>Specify Position Using Lattitude and Longitude:</h4>
+                            		Latitude <input id="glmLat" name="lat" type="text" value="{$memberInfo.fieldData.lat}" class="glm-form-text-input-veryshort">
+                                   	&nbsp;&nbsp;Longitude <input id="glmLng" name="lon" type="text" value="{$memberInfo.fieldData.lon}" class="glm-form-text-input-veryshort">
+                                    <p><span id="latLonRecenter" class="button button-secondary">Update pointer after entering new lat/lon postion.</span></p>
+                               </p>
                             </div>
                         </div>
                     </div>
-- 
2.17.1