From dae721592245afe55cecacacdfc2783c64f07aaa Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Thu, 15 Oct 2009 20:51:03 -0500
Subject: [PATCH] fixed #10888: Problems with Map adding points

---
 docs/changelog/7.x.x.txt                      |   1 +
 .../home_map_map-templates.wgpkg              | Bin 0 -> 2502 bytes
 lib/WebGUI/Asset/Wobject/Map.pm               |  11 +-
 .../yui-webgui/build/map/assets/loading.gif   | Bin 0 -> 6610 bytes
 www/extras/yui-webgui/build/map/map.js        | 183 ++++++++++--------
 5 files changed, 111 insertions(+), 84 deletions(-)
 create mode 100644 docs/upgrades/packages-7.8.2/home_map_map-templates.wgpkg
 create mode 100644 www/extras/yui-webgui/build/map/assets/loading.gif

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c467087fc..1e7ddd5c7 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -19,6 +19,7 @@
  - fixed #11126: WebGUI database has varchar fields
  - fixed #10989: DataForm List: No pagination
  - fixed #11128: Thing breaks w/ default value for date field
+ - fixed #10888: Issues with adding points to Maps
 
 7.8.1
  - mark $session->datetime->time as deprecated and remove its use from core code
diff --git a/docs/upgrades/packages-7.8.2/home_map_map-templates.wgpkg b/docs/upgrades/packages-7.8.2/home_map_map-templates.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..1116bf385aa3ca150e96acc9bed7b1d70685eaf4
GIT binary patch
literal 2502
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
Q{Ocm{KLt}?EC4zH0Qauws{jB1

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Wobject/Map.pm b/lib/WebGUI/Asset/Wobject/Map.pm
index d8cb81163..c924269b0 100644
--- a/lib/WebGUI/Asset/Wobject/Map.pm
+++ b/lib/WebGUI/Asset/Wobject/Map.pm
@@ -312,6 +312,8 @@ sub loadMapApiTags {
     my $style   = $self->session->style;
     my $url     = $self->session->url;
 
+    $style->setLink($url->extras('yui/build/container/assets/skins/sam/container.css'),{type=>'text/css',rel=>'stylesheet'});
+    $style->setLink($url->extras('yui/build/button/assets/skins/sam/button.css'),{type=>'text/css',rel=>'stylesheet'});
     $style->setScript("http://www.google.com/jsapi?key=" . $self->get('mapApiKey'),{type=>"text/javascript"});
     $style->setRawHeadTags(<<'ENDHTML');
 <script type="text/javascript">
@@ -321,6 +323,10 @@ ENDHTML
     $style->setScript('http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/release/src/markermanager.js', {type=>"text/javascript"});
     $style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'),{type=>'text/javascript'});
     $style->setScript($url->extras('yui/build/connection/connection-min.js'),{type=>'text/javascript'});
+    $style->setScript($url->extras('yui/build/dragdrop/dragdrop-min.js'),{type=>'text/javascript'});
+    $style->setScript($url->extras('yui/build/element/element-min.js'),{type=>'text/javascript'});
+    $style->setScript($url->extras('yui/build/button/button-min.js'),{type=>'text/javascript'});
+    $style->setScript($url->extras('yui/build/container/container-min.js'),{type=>'text/javascript'});
     $style->setScript($url->extras('yui/build/json/json-min.js'),{type=>'text/javascript'});
     $style->setScript($url->extras('yui-webgui/build/map/map.js'),{type=>'text/javascript'});
 
@@ -376,7 +382,7 @@ sub view {
                     ;
 
     # The script to load the map into the container
-    $mapHtml    .= sprintf <<'ENDHTML', $self->getId, $self->getUrl, $self->get('startLatitude'), $self->get('startLongitude'), $self->get('startZoom');
+    $mapHtml    .= sprintf <<'ENDHTML', $self->getId, $self->getUrl, $self->get('startLatitude'), $self->get('startLongitude'), $self->get('startZoom'), $session->url->extras;
 <script type="text/javascript">
     google.setOnLoadCallback( function() {
         var mapId           = "%s";
@@ -384,6 +390,7 @@ sub view {
         var map             = new GMap2( document.getElementById("map_" + mapId) );
         map.setCenter(new GLatLng(%s, %s), %s);
         map.setUIToDefault();
+        map.extrasUrl       = "%s";
 
         var markermanager   = new MarkerManager(map, {trackMarkers: true});
 ENDHTML
@@ -407,7 +414,7 @@ ENDHTML
         }
 
         $mapHtml    .= <<'ENDHTML';
-            markermanager.addMarkers( WebGUI.Map.preparePoints(map, markermanager, mapUrl, points), 1 );
+            markermanager.addMarkers( WebGUI.Map.preparePoints(map, markermanager, mapUrl, points), 0 );
 ENDHTML
     }
 
diff --git a/www/extras/yui-webgui/build/map/assets/loading.gif b/www/extras/yui-webgui/build/map/assets/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..94d46c129f6bba02f2f0b230d9f4d2c7a48e1412
GIT binary patch
literal 6610
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
AkpKVy

literal 0
HcmV?d00001

diff --git a/www/extras/yui-webgui/build/map/map.js b/www/extras/yui-webgui/build/map/map.js
index f9149e649..4a326950f 100644
--- a/www/extras/yui-webgui/build/map/map.js
+++ b/www/extras/yui-webgui/build/map/map.js
@@ -37,7 +37,9 @@ WebGUI.Map.editPoint
     var assetId = '';
     if ( !marker ) {
         marker = new GMarker( map.getCenter(), { draggable: true } );
-        mgr.addMarker( marker, 1 );
+        marker.infoWin = document.createElement("div");
+        marker.bindInfoWindow( marker.infoWin );
+        mgr.addMarker( marker, 0 );
         mgr.refresh();
         assetId         = "new";
         marker.assetId  = "new";
@@ -49,95 +51,112 @@ WebGUI.Map.editPoint
         assetId = marker.assetId;
     }
 
+    // Create a loading dialog
+    var loadingDialog = new YAHOO.widget.Panel("loading", { width:"240px", 
+			  fixedcenter:true, 
+			  close:false, 
+			  draggable:false, 
+			  zindex:4,
+			  modal:true,
+			  visible:false
+			} 
+		);
+
+    loadingDialog.setHeader("Loading, please wait...");
+    loadingDialog.setBody('<img src="' + map.extrasUrl + '/yui-webgui/build/map/assets/loading.gif" />');
+    loadingDialog.render(document.body);
+
     // Callback should open the window with the form
     var callback    = function (text, code) {
-        marker.infoWin.innerHTML = text;
-        var button = marker.infoWin.getElementsByTagName( "form" )[0].elements["save"];
-        marker.openInfoWindow( marker.infoWin );
-        YAHOO.util.Event.addListener( button, "click", function (e) {
-            // Closing the info window triggers infowindowbeforeclose
-            marker.closeInfoWindow();
-            YAHOO.util.Event.stopEvent(e);
-            return false;
-        } );
-        GEvent.addListener( marker, "infowindowbeforeclose", function () {
-            WebGUI.Map.editPointSave( map, mgr, mapUrl, marker );
-        });
+        YAHOO.util.Dom.addClass( document.body, "yui-skin-sam" );
+        var dialog = new YAHOO.widget.Dialog("editPoint");
+        
+        var handleCancel = function() {
+            if ( marker.assetId == "new" ) {
+                mgr.removeMarker( marker );
+            }
+            this.cancel();
+        }
+
+        var handleSubmit = function() {
+            // Add the lat/long to the form
+            var lat = marker.getLatLng().lat();
+            var lng = marker.getLatLng().lng();
+            this.form.elements['latitude'].value = lat;
+            this.form.elements['longitude'].value = lng;
+
+            this.submit();
+        }
+        
+        var myButtons = [ 
+            { text:"Submit", handler:handleSubmit, isDefault:true },
+            { text:"Cancel", handler:handleCancel } 
+        ];
+        dialog.cfg.queueProperty("buttons", myButtons);
+        dialog.cfg.queueProperty("constraintoviewport", true);
+        dialog.cfg.queueProperty("fixedcenter", true);
+        dialog.setBody( text );
+        dialog.render(document.body);
+        dialog.show();
+
+        dialog.callback = {
+            upload: function (o) {
+                // Update marker info
+                var point   = YAHOO.lang.JSON.parse( o.responseText );
+                marker.assetId  = point.assetId;
+                GEvent.clearListeners( marker, "click" );
+                GEvent.clearListeners( marker, "infowindowbeforeclose" );
+
+                // Decode HTML entities because JSON is being returned as text/html
+                // See WebGUI::Asset::Wobject::Map www_ajaxEditPointSave
+                var decoder = document.createElement( "textarea" );
+                decoder.innerHTML       = point.content;
+                point.content           = decoder.value;
+
+                var infoWin = document.createElement( "div" );
+                infoWin.innerHTML       = point.content;
+                marker.infoWin          = infoWin;
+
+                if ( point.canEdit ) {
+                    var divButton    = document.createElement('div');
+                    infoWin.appendChild( divButton );
+
+                    var editButton      = document.createElement("input");
+                    editButton.type     = "button";
+                    editButton.value    = "Edit";
+                    GEvent.addDomListener( editButton, "click", function () {
+                        WebGUI.Map.editPoint( map, mgr, mapUrl, marker );
+                    } );
+                    divButton.appendChild( editButton );
+
+                    var deleteButton    = document.createElement("input");
+                    deleteButton.type   = "button";
+                    deleteButton.value  = "Delete"; // Replace with i18n
+                    GEvent.addDomListener( deleteButton, "click", function () {
+                        if ( confirm("Are you sure you want to delete this point?") ) {
+                            WebGUI.Map.deletePoint( map, mgr, mapUrl, marker );
+                        }
+                    } );
+                    divButton.appendChild( deleteButton );
+                }
+                marker.bindInfoWindow( infoWin );
+                GEvent.addListener( marker, "dragend", function (latlng) {
+                    WebGUI.Map.setPointLocation( marker, latlng, mapUrl );
+                } );
+            }
+        };
+
+        // Hide the loading dialog
+        loadingDialog.hide();
     };
 
+    // Show the loading dialog
+    loadingDialog.show();
+
     // Get the form
     GDownloadUrl( mapUrl + '?func=ajaxEditPoint;assetId=' + assetId, callback );
 };
 
-/**
- * WebGUI.Map.editPointSave( map, mgr, mapUrl, marker )
- * Save the edit form.
- */
-WebGUI.Map.editPointSave
-= function ( map, mgr, mapUrl, marker ) {
-    var iwin    = map.getInfoWindow();
-    var form    = iwin.getContentContainers()[0].getElementsByTagName('form')[0];
-    
-    // Add the lat/long to the form
-    var lat = marker.getLatLng().lat();
-    var lng = marker.getLatLng().lng();
-    form.elements['latitude'].value = lat;
-    form.elements['longitude'].value = lng;
-
-    // Make ajax request
-    var callback = {
-        upload: function (o) {
-            // Update marker info
-            var point   = YAHOO.lang.JSON.parse( o.responseText );
-            marker.assetId  = point.assetId;
-            GEvent.clearListeners( marker, "click" );
-            GEvent.clearListeners( marker, "infowindowbeforeclose" );
-
-            // Decode HTML entities because JSON is being returned as text/html
-            // See WebGUI::Asset::Wobject::Map www_ajaxEditPointSave
-            var decoder = document.createElement( "textarea" );
-            decoder.innerHTML       = point.content;
-            point.content           = decoder.value;
-
-            var infoWin = document.createElement( "div" );
-            infoWin.innerHTML       = point.content;
-            marker.infoWin          = infoWin;
-
-            if ( point.canEdit ) {
-                var divButton    = document.createElement('div');
-                infoWin.appendChild( divButton );
-
-                var editButton      = document.createElement("input");
-                editButton.type     = "button";
-                editButton.value    = "Edit";
-                GEvent.addDomListener( editButton, "click", function () {
-                    WebGUI.Map.editPoint( map, mgr, mapUrl, marker );
-                } );
-                divButton.appendChild( editButton );
-
-                var deleteButton    = document.createElement("input");
-                deleteButton.type   = "button";
-                deleteButton.value  = "Delete"; // Replace with i18n
-                GEvent.addDomListener( deleteButton, "click", function () {
-                    if ( confirm("Are you sure you want to delete this point?") ) {
-                        WebGUI.Map.deletePoint( map, mgr, mapUrl, marker );
-                    }
-                } );
-                divButton.appendChild( deleteButton );
-            }
-            marker.bindInfoWindow( infoWin );
-            GEvent.addListener( marker, "dragend", function (latlng) {
-                WebGUI.Map.setPointLocation( marker, latlng, mapUrl );
-            } );
-        }
-    };
-    // In case our form does not have a file upload in it
-    callback["success"] = callback["upload"];
-
-    YAHOO.util.Connect.setForm( form, 1 );
-    YAHOO.util.Connect.asyncRequest( 'POST', mapUrl, callback );
-};
-
 /**
  * WebGUI.Map.focusOn( assetId )
  * Pan the appropriate map to view the appropriate map point