From 28bd62d0ee9cafd8281fefe01701f4efeb3fb3d7 Mon Sep 17 00:00:00 2001 From: Fragger Date: Wed, 6 Mar 2013 13:43:11 -0800 Subject: [PATCH 1/4] Update to main needed to spiderfy player tracker icons --- code/boot.js | 1 + external/oms.min.js | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 external/oms.min.js diff --git a/code/boot.js b/code/boot.js index 2204acd1..3ddff7e1 100644 --- a/code/boot.js +++ b/code/boot.js @@ -333,6 +333,7 @@ try { console.log('Loading included JS now'); } catch(e) {} // contains the default Ingress map style. @@INCLUDERAW:external/leaflet_google.js@@ @@INCLUDERAW:external/autolink.js@@ +@@INCLUDERAW:external/oms.min.js@@ try { console.log('done loading included JS'); } catch(e) {} diff --git a/external/oms.min.js b/external/oms.min.js new file mode 100644 index 00000000..a53aede5 --- /dev/null +++ b/external/oms.min.js @@ -0,0 +1,19 @@ +(function(){/* + OverlappingMarkerSpiderfier +https://github.com/jawj/OverlappingMarkerSpiderfier-Leaflet +Copyright (c) 2011 - 2012 George MacKerron +Released under the MIT licence: http://opensource.org/licenses/mit-license +Note: The Leaflet maps API must be included *before* this code +*/ +(function(){var n={}.hasOwnProperty,o=[].slice;null!=this.L&&(this.OverlappingMarkerSpiderfier=function(){function l(c,b){var a,e,g,f,d=this;this.map=c;null==b&&(b={});for(a in b)n.call(b,a)&&(e=b[a],this[a]=e);this.initMarkerArrays();this.listeners={};f=["click","zoomend"];e=0;for(g=f.length;eb)return this;a=this.markerListeners.splice(b,1)[0];c.removeEventListener("click",a);delete c._oms;this.markers.splice(b,1);return this};d.clearMarkers=function(){var c,b,a,e,g;this.unspiderfy();g=this.markers;c=a=0;for(e=g.length;aa||this.listeners[c].splice(a,1);return this};d.clearListeners=function(c){this.listeners[c]=[];return this};d.trigger=function(){var c,b,a,e,g,f;b=arguments[0];c=2<=arguments.length?o.call(arguments,1):[];b=null!=(a=this.listeners[b])?a:[];f=[];e=0;for(g=b.length;ec;a=0<=c?++f:--f)a=this.circleStartAngle+a*e,d.push(new L.Point(b.x+g*Math.cos(a),b.y+g*Math.sin(a)));return d};d.generatePtsSpiral=function(c,b){var a,e,g,f,d;g=this.spiralLengthStart;a=0;d=[];for(e=f=0;0<=c?fc;e=0<=c?++f:--f)a+=this.spiralFootSeparation/g+5.0E-4*e,e=new L.Point(b.x+g*Math.cos(a),b.y+g*Math.sin(a)),g+=i*this.spiralLengthFactor/a,d.push(e);return d};d.spiderListener=function(c){var b,a,e,g,f,d,h,i,j;b= +null!=c._omsData;(!b||!this.keepSpiderfied)&&this.unspiderfy();if(b)return this.trigger("click",c);g=[];f=[];d=this.nearbyDistance*this.nearbyDistance;e=this.map.latLngToLayerPoint(c.getLatLng());j=this.markers;h=0;for(i=j.length;h=this.circleSpiralSwitchover?this.generatePtsSpiral(k,a).reverse():this.generatePtsCircle(k,a);a=function(){var a,b,i,k=this;i=[];a=0;for(b=d.length;a Date: Wed, 6 Mar 2013 16:55:23 -0800 Subject: [PATCH 2/4] Add attribution for oms --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index af865dc5..3da5b426 100644 --- a/README.md +++ b/README.md @@ -107,5 +107,6 @@ This project is licensed under the permissive ISC license. Parts imported from o - [leaflet.draw.js; by jacobtoye; MIT](https://github.com/Leaflet/Leaflet.draw) - [`leaflet_google.js` by Pavel Shramov; same as Leaftlet](https://github.com/shramov/leaflet-plugins) (modified, though) - [jquery.qrcode.js by Jerome Etienne; MIT](https://github.com/jeromeetienne/jquery-qrcode) +- [oms.min.js by George MacKerron; MIT](https://github.com/jawj/OverlappingMarkerSpiderfier-Leaflet) - StackOverflow-CopyPasta is attributed in the source; [CC-Wiki](https://creativecommons.org/licenses/by-sa/3.0/) - all Ingress/Niantic related stuff obviously remains non-free and is still copyrighted by Niantic/Google From 4e9a1682cb53483237f99d2fdd2b48dbbd0793c1 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 6 Mar 2013 17:56:43 -0800 Subject: [PATCH 3/4] Issue #390:https protocol for perma link and zoom --- code/utils_misc.js | 2 +- dist/total-conversion-build.user.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/utils_misc.js b/code/utils_misc.js index 8fb3dfd5..b9af509d 100644 --- a/code/utils_misc.js +++ b/code/utils_misc.js @@ -244,7 +244,7 @@ window.setPermaLink = function(elm) { var lat = Math.round(c.lat*1E6); var lng = Math.round(c.lng*1E6); var qry = 'latE6='+lat+'&lngE6='+lng+'&z=' + (map.getZoom()-1); - $(elm).attr('href', 'http://www.ingress.com/intel?' + qry); + $(elm).attr('href', 'https://www.ingress.com/intel?' + qry); } window.uniqueArray = function(arr) { diff --git a/dist/total-conversion-build.user.js b/dist/total-conversion-build.user.js index d13e49a1..bb95b9dc 100644 --- a/dist/total-conversion-build.user.js +++ b/dist/total-conversion-build.user.js @@ -1243,7 +1243,7 @@ window.setPermaLink = function(elm) { var lat = Math.round(c.lat*1E6); var lng = Math.round(c.lng*1E6); var qry = 'latE6='+lat+'&lngE6='+lng+'&z=' + (map.getZoom()-1); - $(elm).attr('href', 'http://www.ingress.com/intel?' + qry); + $(elm).attr('href', 'https://www.ingress.com/intel?' + qry); } window.uniqueArray = function(arr) { @@ -2833,7 +2833,7 @@ window.renderPortalDetails = function(guid) { var lat = d.locationE6.latE6; var lng = d.locationE6.lngE6; - var perma = 'http://ingress.com/intel?latE6='+lat+'&lngE6='+lng+'&z=17&pguid='+guid; + var perma = 'https://ingress.com/intel?latE6='+lat+'&lngE6='+lng+'&z=17&pguid='+guid; var imgTitle = 'title="'+getPortalDescriptionFromDetails(d)+'\n\nClick to show full image."'; var poslinks = 'window.showPortalPosLinks('+lat/1E6+','+lng/1E6+')'; var postcard = 'Send in a postcard. Will put it online after receiving. Address:\\n\\nStefan Breunig\\nINF 305 – R045\\n69120 Heidelberg\\nGermany'; From 8115f10e1f4fa3422148301add8884d0604245ba Mon Sep 17 00:00:00 2001 From: vita10gy Date: Wed, 6 Mar 2013 22:25:48 -0600 Subject: [PATCH 4/4] Ignore "Your Link" messages Likely fix for #350 --- plugins/player-tracker.user.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/player-tracker.user.js b/plugins/player-tracker.user.js index fe9c66a8..f75fd4c8 100644 --- a/plugins/player-tracker.user.js +++ b/plugins/player-tracker.user.js @@ -1,7 +1,7 @@ // ==UserScript== // @id iitc-plugin-player-tracker@breunigs // @name iitc: player tracker -// @version 0.6.1 +// @version 0.7 // @namespace https://github.com/breunigs/ingress-intel-total-conversion // @updateURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/player-tracker.user.js // @downloadURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/player-tracker.user.js @@ -80,7 +80,8 @@ window.plugin.playerTracker.processNewData = function(data) { // field was originally created. Therefore it’s not clear which // portal the player is at, so ignore it. if(markup[1].plain.indexOf('destroyed the Link') !== -1 - || markup[1].plain.indexOf('destroyed a Control Field') !== -1) { + || markup[1].plain.indexOf('destroyed a Control Field') !== -1 + || markup[1].plain.indexOf('Your Link') !== -1) { skipThisMessage = true; return false; }