X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FMapstraction%2Fusermap.js;h=763a537d2ef21edd80270a9a0bf13a31ba341db2;hb=2a1be574709f9c545bd188faee7247a21f3ae39f;hp=19ec54c39277667c8a571da57f07f0f743981bc5;hpb=09d67d6f80abdf577f6cd94d7be2bc19ce5541fa;p=quix0rs-gnu-social.git

diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js
index 19ec54c392..763a537d2e 100644
--- a/plugins/Mapstraction/usermap.js
+++ b/plugins/Mapstraction/usermap.js
@@ -1,69 +1,64 @@
-$(document).ready(function() {
-     notices = [];
+function scrapeNotices(user)
+{
+     var notices = [];
      $(".notice").each(function(){
-        notice = getNoticeFromElement($(this));
-        if(notice['geo'])
-            notices.push(notice);
+          var notice = getNoticeFromElement($(this));
+          if (user) {
+               notice['user'] = user;
+          } else {
+               notice['user'] = getUserFromElement($(this));
+          }
+          if(notice['geo'])
+               notices.push(notice);
      });
-     if($("#map_canvas").length && notices.length>0)
-     {
-        showMapstraction($("#map_canvas"), notices);
-     }
 
-     $('a.geo').click(function(){
-        noticeElement = $(this).closest(".notice");
-        notice = getNoticeFromElement(noticeElement);
-
-        $.fn.jOverlay.options = {
-            color : '#000',
-            opacity : '0.6',
-            zIndex : 99,
-            center : false,
-            bgClickToClose : true,
-            autoHide : true,
-            css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
-        };
-        html="<div id='map_canvas_popup' class='gray smallmap' style='width: 542px; height: 500px' />";
-        html+="<button class='close'>&#215;</button>";
-        html+=$("<div/>").append($(this).clone()).html();
-        $().jOverlay({ "html": html });
-        $('#jOverlayContent').show();
-        $('#jOverlayContent button').click($.closeOverlay);
-        
-        showMapstraction($("#map_canvas_popup"), notice);
-
-        return false;
-     });
-});
+     return notices;
+}
 
-function getMicroformatValue(element)
+function scrapeUser()
 {
-    if(element[0].tagName.toLowerCase() == 'abbr'){
-        return element.attr('title');
-    }else{
-        return element.text();
-    }
+     var avatarURL = $(".entity_profile .entity_depiction img.avatar").attr('src');
+     var profileURL = $(".entity_profile .entity_nickname .url").attr('href');
+     var nickname = $(".entity_profile .entity_nickname .nickname").text();
+
+     return {
+        'profile_image_url': avatarURL,
+        'profile_url': profileURL,
+        'screen_name': nickname
+     };
 }
 
 function getNoticeFromElement(noticeElement)
 {
-    notice = {};
-    if(noticeElement.find(".latitude").length){
+    var notice = {};
+
+    if(noticeElement.find(".geo").length) {
+        var latlon = noticeElement.find(".geo").attr('title').split(";");
         notice['geo']={'coordinates': [
-            parseFloat(getMicroformatValue(noticeElement.find(".latitude"))),
-            parseFloat(getMicroformatValue(noticeElement.find(".longitude")))] };
+            parseFloat(latlon[0]),
+            parseFloat(latlon[1])] };
     }
-    notice['user']={
-        'profile_image_url': noticeElement.find("img.avatar").attr('src'),
-        'profile_url': noticeElement.find(".author a.url").attr('href'),
-        'screen_name': noticeElement.find(".author .nickname").text()
-    };
-    notice['html']=noticeElement.find(".entry-content").html();
-    notice['url']=noticeElement.find("a.timestamp").attr('href');
-    notice['created_at']=noticeElement.find("abbr.published").text();
+
+    notice['html'] = noticeElement.find(".e-content").html();
+    notice['url'] = noticeElement.find("a.timestamp").attr('href');
+    notice['created_at'] = noticeElement.find("abbr.published").text();
+
     return notice;
 }
 
+function getUserFromElement(noticeElement)
+{
+     var avatarURL = noticeElement.find("img.avatar").attr('src');
+     var profileURL = noticeElement.find(".author a.url").attr('href');
+     var nickname =  noticeElement.find(".author .nickname").text();
+
+     return {
+          'profile_image_url': avatarURL,
+          'profile_url': profileURL,
+          'screen_name': nickname
+    };
+}
+
 function showMapstraction(element, notices) {
      if(element instanceof jQuery) element = element[0];
      if(! $.isArray(notices)) notices = [notices];
@@ -100,7 +95,7 @@ function showMapstraction(element, notices) {
           pt = new mxn.LatLonPoint(lat, lon);
           mkr = new mxn.Marker(pt);
 
-          mkr.setIcon(n['user']['profile_image_url']);
+          mkr.setIcon(n['user']['profile_image_url'], [24, 24]);
           mkr.setInfoBubble('<a href="'+ n['user']['profile_url'] + '">' + n['user']['screen_name'] + '</a>' + ' ' + n['html'] +
                             '<br/><a href="'+ n['url'] + '">'+ n['created_at'] + '</a>');