phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

create function to get portal image URL from details - and perform any necessary default URL replacement and https conversion

Browse Source
This commit is contained in:
Jon Atkins
2013-08-27 18:16:02 +01:00
parent 563258a897
commit 81d0cb0ed8
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/portal_detail_display.js
View File

@ -44,7 +44,7 @@ window.renderPortalDetails = function(guid) {
var resoDetails = '<table id="resodetails">' + getResonatorDetails(d) + '</table>'; var resoDetails = '<table id="resodetails">' + getResonatorDetails(d) + '</table>';
setPortalIndicators(d); setPortalIndicators(d);
var img = d.imageByUrl.imageUrl; var img = getPortalImageUrl(d);
var lat = d.locationE6.latE6/1E6; var lat = d.locationE6.latE6/1E6;
var lng = d.locationE6.lngE6/1E6; var lng = d.locationE6.lngE6/1E6;
var perma = '/intel?ll='+lat+','+lng+'&z=17&pll='+lat+','+lng; var perma = '/intel?ll='+lat+','+lng+'&z=17&pll='+lat+','+lng;

19
code/portal_info.js
View File

@ -1,5 +1,3 @@
// PORTAL DETAILS TOOLS ////////////////////////////////////////////// // PORTAL DETAILS TOOLS //////////////////////////////////////////////
// hand any of these functions the details-hash of a portal, and they // hand any of these functions the details-hash of a portal, and they
// will return useful, but raw data. // will return useful, but raw data.
@ -190,3 +188,20 @@ window.potentialPortalLevel = function(d) {
} }
return(potential_level); return(potential_level);
} }
window.getPortalImageUrl = function(d) {
if (d.imageByUrl && d.imageByUrl.imageUrl) {
url = d.imageByUrl.imageUrl;
if (window.location.protocol === 'https:') {
url = url.indexOf('www.panoramio.com') !== -1
? url.replace(/^http:\/\/www/, 'https://ssl').replace('small', 'medium')
: url.replace(/^http:\/\//, '//');
}
return url;
} else {
return DEFAULT_PORTAL_IMG;
}
}

4
plugins/portals-list.user.js
View File

@ -2,7 +2,7 @@
// @id iitc-plugin-portals-list@teo96 // @id iitc-plugin-portals-list@teo96
// @name IITC plugin: show list of portals // @name IITC plugin: show list of portals
// @category Info // @category Info
// @version 0.0.15.@@DATETIMEVERSION@@ // @version 0.0.16.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@ // @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@ // @downloadURL @@DOWNLOADURL@@
@ -67,7 +67,7 @@ window.plugin.portalslist.getPortals = function() {
var d = portal.options.details; var d = portal.options.details;
var name = d.portalV2.descriptiveText.TITLE; var name = d.portalV2.descriptiveText.TITLE;
var address = d.portalV2.descriptiveText.ADDRESS; var address = d.portalV2.descriptiveText.ADDRESS;
var img = d.imageByUrl && d.imageByUrl.imageUrl ? d.imageByUrl.imageUrl : DEFAULT_PORTAL_IMG; var img = getPortalImageUrl(d);
var team = portal.options.team; var team = portal.options.team;
var now = new Date(); var now = new Date();
var now_ms = now.getTime();// + (now.getTimezoneOffset() * 60000); var now_ms = now.getTime();// + (now.getTimezoneOffset() * 60000);

4
plugins/show-linked-portals.user.js
View File

@ -2,7 +2,7 @@
// @id iitc-plugin-show-linked-portals@fstopienski // @id iitc-plugin-show-linked-portals@fstopienski
// @name IITC plugin: Show linked portals // @name IITC plugin: Show linked portals
// @category Portal Info // @category Portal Info
// @version 0.0.7.@@DATETIMEVERSION@@ // @version 0.0.8.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@ // @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@ // @downloadURL @@DOWNLOADURL@@
@ -78,7 +78,7 @@ window.plugin.showLinkedPortal.getPortalByGuid = function (guid) {
.append($('<br/>')) .append($('<br/>'))
.append($('<em/>').text('(' + portalDetails.portalV2.descriptiveText.ADDRESS + ')')) .append($('<em/>').text('(' + portalDetails.portalV2.descriptiveText.ADDRESS + ')'))
.html(); .html();
var imageUrl = (portalDetails.imageByUrl ? portalDetails.imageByUrl.imageUrl : window.DEFAULT_PORTAL_IMG); var imageUrl = getPortalImageUrl(portalDetails);
portalInfoString = $('<div/>').html($('<img/>').attr('src', imageUrl) portalInfoString = $('<div/>').html($('<img/>').attr('src', imageUrl)
.attr('class', 'minImg') .attr('class', 'minImg')
.attr('alt', portalNameAdressAlt) .attr('alt', portalNameAdressAlt)