diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js index 4bf4120b..3bb64e93 100644 --- a/code/portal_detail_display.js +++ b/code/portal_detail_display.js @@ -41,7 +41,7 @@ window.renderPortalDetails = function(guid) { var img = fixPortalImageUrl(details ? details.imageByUrl && details.imageByUrl.imageUrl : data.image); - var title = details ? details.portalV2.descriptiveText.TITLE : data.title; + var title = data.title; var lat = data.latE6/1E6; var lng = data.lngE6/1E6; @@ -75,8 +75,8 @@ window.renderPortalDetails = function(guid) { if(portalDetailObj.description) { portalDetailedDescription += 'Description:' + escapeHtmlSpecialChars(portalDetailObj.description) + ''; } -// if(d.portalV2.descriptiveText.ADDRESS) { -// portalDetailedDescription += 'Address:' + escapeHtmlSpecialChars(d.portalV2.descriptiveText.ADDRESS) + ''; +// if(d.descriptiveText.map.ADDRESS) { +// portalDetailedDescription += 'Address:' + escapeHtmlSpecialChars(d.descriptiveText.map.ADDRESS) + ''; // } portalDetailedDescription += ''; diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js index c8d0baf6..f3cf6f8c 100644 --- a/code/portal_detail_display_tools.js +++ b/code/portal_detail_display_tools.js @@ -24,7 +24,7 @@ window.getRangeText = function(d) { // generates description text from details for portal window.getPortalDescriptionFromDetails = function(details) { - var descObj = details.portalV2.descriptiveText; + var descObj = details.descriptiveText.map; // FIXME: also get real description? var desc = descObj.TITLE; if(descObj.ADDRESS) @@ -37,7 +37,7 @@ window.getPortalDescriptionFromDetails = function(details) { // Grabs more info, including the submitter name for the current main // portal image window.getPortalDescriptionFromDetailsExtended = function(details) { - var descObj = details.portalV2.descriptiveText; + var descObj = details.descriptiveText.map; var photoStreamObj = details.photoStreamInfo; var submitterObj = new Object(); diff --git a/code/portal_info.js b/code/portal_info.js index a293d8c1..93434d8f 100644 --- a/code/portal_info.js +++ b/code/portal_info.js @@ -327,7 +327,7 @@ window.getPortalSummaryData = function(d) { return { level: level, - title: d.portalV2.descriptiveText.TITLE, + title: d.descriptiveText.map.TITLE, image: d.imageByUrl && d.imageByUrl.imageUrl, resCount: resCount, latE6: d.locationE6.latE6, diff --git a/plugins/show-address.user.js b/plugins/show-address.user.js index 8b938a77..3e83b5b7 100644 --- a/plugins/show-address.user.js +++ b/plugins/show-address.user.js @@ -2,7 +2,7 @@ // @id iitc-plugin-show-address@vita10gy // @name IITC plugin: show portal address in sidebar // @category Portal Info -// @version 0.2.3.@@DATETIMEVERSION@@ +// @version 0.2.4.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ @@ -25,8 +25,8 @@ window.plugin.portalAddress.portalDetail = function(data) { // If there's 4 sets of comma delimited info the last one is the // country, so get rid of it. If the country is in the [2] then it // doesn't matter because address is usually short enough to fit. - var d = data.portalDetails.portalV2; - var address = d.descriptiveText.ADDRESS; + var d = data.portalDetails; + var address = d.descriptiveText.map.ADDRESS; if (address) { address = address.split(',').splice(0,3).join(','); $('.imgpreview').append('
'+address+'
');