X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fgooglemap%2Fstatic%2Fjs%2Fgooglemap.js;h=8cb652f48ec268ff9940b24a36a5082504653cb8;hb=cc77563dcaaadd7d71963721c2e154a766ab4a01;hp=34b2b8de563b927c0af4d205a5ec6ae47a8e4c6d;hpb=a387c58445b7cde5ecf05a022c5a875645eeb463;p=myslice.git

diff --git a/plugins/googlemap/static/js/googlemap.js b/plugins/googlemap/static/js/googlemap.js
index 34b2b8de..8cb652f4 100644
--- a/plugins/googlemap/static/js/googlemap.js
+++ b/plugins/googlemap/static/js/googlemap.js
@@ -59,8 +59,7 @@ googlemap_debug_detailed=false;
         /* PLUGIN EVENTS */
 
         on_show: function(e) {
-//	    if (googlemap_debug) messages.debug("on_show");
-	    messages.debug("on_show");
+	    if (googlemap_debug) messages.debug("googlemap.on_show");
             var googlemap = e.data;
             google.maps.event.trigger(googlemap.map, 'resize');
         }, // on_show
@@ -102,7 +101,12 @@ googlemap_debug_detailed=false;
                 throw "Not implemented";
                 break;
             }
-	    return unfold.escape_id(key_value).replace(/\\/g, '');
+	    // XXX BACKSLASHES original code was reading like this
+	    //return this.escape_id(key_value).replace(/\\/g, '');
+	    //  however this sequence removes backslashes from hrn's and as a result
+	    // resources_selected was getting all mixed up
+	    // hazelnut does publish hrn's with backslashes and that seems like the thing to do
+	    return key_value;
 	},	    
 
 	// return { marker: gmap_marker, ul : <ul DOM> }
@@ -132,6 +136,7 @@ googlemap_debug_detailed=false;
 	    // the callback for when a user clicks
 	    // NOTE: this will *not* be called for changes done by program
 	    checkbox.change( function (e) {
+		if (googlemap_debug) messages.debug("googlemap click handler checked= " + this.checked + " hrn=" + hrn);
 		manifold.raise_event (googlemap.options.query_uuid, 
 				      this.checked ? SET_ADD : SET_REMOVED, hrn);
 	    });
@@ -153,8 +158,8 @@ googlemap_debug_detailed=false;
             if (!(record['latitude'])) return false;
 	    
             // get the coordinates
-            var latitude=get_value(record['latitude']);
-            var longitude=get_value(record['longitude']);
+            var latitude=unfold.get_value(record['latitude']);
+            var longitude=unfold.get_value(record['longitude']);
             var lat_lon = latitude + longitude;
 
 	    // check if we've seen anything at that place already
@@ -174,7 +179,9 @@ googlemap_debug_detailed=false;
 	    var checkbox = this.create_record_checkbox (record, ul, false);
 	    if ( ! this.key in record ) return;
             var key_value = record[this.key];
-	    var hrn = unfold.escape_id(key_value).replace(/\\/g, '');
+	    // see XXX BACKSLASHES 
+	    //var hrn = this.escape_id(key_value).replace(/\\/g, '');
+	    var hrn = key_value;
             this.by_hrn[hrn] = {
 		checkbox: checkbox,
 		// xxx Thierry sept 2013