From dc90e90fd2748f953a2d4750105817b41cafe43a Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 19 Nov 2009 19:12:58 -0500 Subject: Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page Clicking on a geo link pops up a map --- plugins/Mapstraction/MapstractionPlugin.php | 66 ------------------------- plugins/Mapstraction/usermap.js | 76 +++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 70 deletions(-) (limited to 'plugins/Mapstraction') diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index eabd0d0f0..a0dbf5204 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -110,11 +110,6 @@ class MapstractionPlugin extends Plugin function onEndShowScripts($action) { $actionName = $action->trimmed('action'); - // These are the ones that have maps on 'em - if (!in_array($actionName, - array('showstream', 'all', 'allmap', 'usermap'))) { - return true; - } switch ($this->provider) { @@ -151,37 +146,6 @@ class MapstractionPlugin extends Plugin $action->raw(sprintf('var _provider = "%s";', $this->provider)); $action->elementEnd('script'); - switch ($actionName) { - case 'usermap': - case 'showstream': - $notice = empty($action->tag) - ? $action->user->getNotices(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1) - : $action->user->getTaggedNotices($action->tag, ($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null); - break; - case 'all': - case 'allmap': - $cur = common_current_user(); - if (!empty($cur) && $cur->id == $action->user->id) { - $notice = $action->user->noticeInbox(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - } else { - $notice = $action->user->noticesWithFriends(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - } - break; - } - - $jsonArray = array(); - - while ($notice->fetch()) { - if (!empty($notice->lat) && !empty($notice->lon)) { - $jsonNotice = $this->noticeAsJson($notice); - $jsonArray[] = $jsonNotice; - } - } - - $action->elementStart('script', array('type' => 'text/javascript')); - $action->raw('var _notices = ' . json_encode($jsonArray)); - $action->elementEnd('script'); - return true; } @@ -212,34 +176,4 @@ class MapstractionPlugin extends Plugin $action->elementEnd('div'); } - - function noticeAsJson($notice) - { - // FIXME: this code should be abstracted to a neutral third - // party, like Notice::asJson(). I'm not sure of the ethics - // of refactoring from within a plugin, so I'm just abusing - // the ApiAction method. Don't do this unless you're me! - - require_once(INSTALLDIR.'/lib/api.php'); - - $act = new ApiAction('/dev/null'); - - $arr = $act->twitterStatusArray($notice, true); - $arr['url'] = $notice->bestUrl(); - $arr['html'] = htmlspecialchars($notice->rendered); - $arr['source'] = htmlspecialchars($arr['source']); - - if (!empty($notice->reply_to)) { - $reply_to = Notice::staticGet('id', $notice->reply_to); - if (!empty($reply_to)) { - $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); - } - $reply_to = null; - } - - $profile = $notice->getProfile(); - $arr['user']['profile_url'] = $profile->profileurl; - - return $arr; - } } diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js index 270b7efea..7fb73fa88 100644 --- a/plugins/Mapstraction/usermap.js +++ b/plugins/Mapstraction/usermap.js @@ -1,14 +1,82 @@ $(document).ready(function() { - var mapstraction = new mxn.Mapstraction("map_canvas", _provider); + notices = []; + $(".notice").each(function(){ + notice = getNoticeFromElement($(this)); + if(notice['geo']) + notices.push(notice); + }); + if($("#map_canvas") && 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="
"; + html+=""; + html+=$("
").append($(this).clone()).html(); + $().jOverlay({ "html": html }); + $('#jOverlayContent').show(); + $('#jOverlayContent button').click($.closeOverlay); + + showMapstraction($("#map_canvas_popup"), notice); + + return false; + }); +}); + +function getMicroformatValue(element) +{ + if(element[0].tagName.toLowerCase() == 'abbr'){ + return element.attr('title'); + }else{ + return element.text(); + } +} + +function getNoticeFromElement(noticeElement) +{ + notice = {}; + if(noticeElement.find(".latitude").length){ + notice['geo']={'coordinates': [ + parseFloat(getMicroformatValue(noticeElement.find(".latitude"))), + parseFloat(getMicroformatValue(noticeElement.find(".longitude")))] }; + } + 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(); + return notice; +} + +function showMapstraction(element, notices) { + if(element instanceof jQuery) element = element[0]; + if(! $.isArray(notices)) notices = [notices]; + var mapstraction = new mxn.Mapstraction(element, _provider); var minLat = 181.0; var maxLat = -181.0; var minLon = 181.0; var maxLon = -181.0; - for (var i in _notices) + for (var i in notices) { - var n = _notices[i]; + var n = notices[i]; var lat = n['geo']['coordinates'][0]; var lon = n['geo']['coordinates'][1]; @@ -42,4 +110,4 @@ $(document).ready(function() { bounds = new mxn.BoundingBox(minLat, minLon, maxLat, maxLon); mapstraction.setBounds(bounds); -}); +} -- cgit v1.2.3-54-g00ecf From 09d67d6f80abdf577f6cd94d7be2bc19ce5541fa Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 20 Nov 2009 11:16:39 -0500 Subject: Fix js error on non-map containing pages --- plugins/Mapstraction/usermap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/Mapstraction') diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js index 7fb73fa88..19ec54c39 100644 --- a/plugins/Mapstraction/usermap.js +++ b/plugins/Mapstraction/usermap.js @@ -5,7 +5,7 @@ $(document).ready(function() { if(notice['geo']) notices.push(notice); }); - if($("#map_canvas") && notices.length>0) + if($("#map_canvas").length && notices.length>0) { showMapstraction($("#map_canvas"), notices); } -- cgit v1.2.3-54-g00ecf From e7663ce38f8eb4d918102351c45a5829a523141b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 20 Nov 2009 10:08:13 -0800 Subject: fix notice bug --- plugins/Mapstraction/MapstractionPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/Mapstraction') diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index a0dbf5204..37306a23c 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -58,12 +58,12 @@ class MapstractionPlugin extends Plugin * * The way to register new actions from a plugin. * - * @param Router &$m reference to router + * @param Router $m reference to router * * @return boolean event handler return */ - function onRouterInitialized(&$m) + function onRouterInitialized($m) { $m->connect(':nickname/all/map', array('action' => 'allmap'), -- cgit v1.2.3-54-g00ecf From 83ba93e945e5b933a73139f9e5db710444c99893 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 20 Nov 2009 17:40:38 -0500 Subject: Change the format of the lat/lon output on a notice in HTML --- lib/noticelist.php | 9 ++++----- plugins/Mapstraction/usermap.js | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/Mapstraction') diff --git a/lib/noticelist.php b/lib/noticelist.php index 5877827ff..167ba994b 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -392,15 +392,14 @@ class NoticeListItem extends Widget $name = $location->getName(); - if (empty($name)) { - // XXX: Could be a translation issue. Fall back to... something? - return; - } - $lat = $this->notice->lat; $lon = $this->notice->lon; $latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : ''; + if (empty($name)) { + $name = $lat . ' ' . $lon; //TODO tranform to N/S deg/min/sec format + } + $url = $location->getUrl(); $this->out->elementStart('span', array('class' => 'location')); diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js index 19ec54c39..e667dd579 100644 --- a/plugins/Mapstraction/usermap.js +++ b/plugins/Mapstraction/usermap.js @@ -1,7 +1,7 @@ $(document).ready(function() { - notices = []; + var notices = []; $(".notice").each(function(){ - notice = getNoticeFromElement($(this)); + var notice = getNoticeFromElement($(this)); if(notice['geo']) notices.push(notice); }); @@ -10,8 +10,8 @@ $(document).ready(function() { showMapstraction($("#map_canvas"), notices); } - $('a.geo').click(function(){ - noticeElement = $(this).closest(".notice"); + $('.geo').click(function(){ + var noticeElement = $(this).closest(".notice"); notice = getNoticeFromElement(noticeElement); $.fn.jOverlay.options = { @@ -23,7 +23,7 @@ $(document).ready(function() { autoHide : true, css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'} }; - html="
"; + var html="
"; html+=""; html+=$("
").append($(this).clone()).html(); $().jOverlay({ "html": html }); @@ -47,11 +47,12 @@ function getMicroformatValue(element) 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'), -- cgit v1.2.3-54-g00ecf