From ca23b7de4d897018c29fb685e90b74e0696da269 Mon Sep 17 00:00:00 2001 From: RJ Bernau Date: Mon, 29 Feb 2016 08:14:32 -0600 Subject: [PATCH 1/6] Added a Beacon layer. Adding a Beacon layer so that you can turn off Beacons if you so choose and still keep other Ornaments on as Beacons have no effect on game play and just clutter the map. --- code/ornaments.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/code/ornaments.js b/code/ornaments.js index e5b35633..d1a57000 100644 --- a/code/ornaments.js +++ b/code/ornaments.js @@ -1,12 +1,17 @@ // ORNAMENTS /////////////////////////////////////////////////////// -// added as part of the ingress #helios in 2014, ornaments -// are additional image overlays for portals -// currently there are 28 known ornaments: ap$x$suffix +// Added as part of the Ingress #Helios in 2014, ornaments +// are additional image overlays for portals. +// currently there are 6 known types of ornaments: ap$x$suffix // - cluster portals (without suffix) // - volatile portals (_v) // - meeting points (_start) // - finish points (_end) +// +// Beacons and Frackers were introduced at the launch of the Ingress +// ingame store on November 1st, 2015 +// - Beacons (pe$TAG - $NAME) ie: 'peNIA - NIANTIC' +// - Frackers ('peFRACK') // (there are 7 different colors for each of them) @@ -17,7 +22,9 @@ window.ornaments.OVERLAY_OPACITY = 0.6; window.ornaments.setup = function() { window.ornaments._portals = {}; window.ornaments._layer = L.layerGroup(); + window.ornaments._beacons = L.layerGroup(); window.addLayerGroup('Ornaments', window.ornaments._layer, true); + window.addLayerGroup('Beacons', window.ornaments._beacons, true); } // quick test for portal having ornaments @@ -35,14 +42,18 @@ window.ornaments.addPortal = function(portal) { if (portal.options.data.ornaments) { window.ornaments._portals[guid] = portal.options.data.ornaments.map(function(ornament) { + var layer = window.ornaments._layer; + if (ornament.startsWith("pe") && ornament != "peFRACK") { + layer = window.ornaments._beacons; + } var icon = L.icon({ - iconUrl: "//commondatastorage.googleapis.com/ingress.com/img/map_icons/marker_images/"+ornament+".png", + iconUrl: "//commondatastorage.googleapis.com/ingress.com/img/map_icons/marker_images/" + ornament + ".png", iconSize: [size, size], - iconAnchor: [size/2,size/2], + iconAnchor: [size/2, size/2], className: 'no-pointer-events' // the clickable: false below still blocks events going through to the svg underneath }); - return L.marker(latlng, {icon: icon, clickable: false, keyboard: false, opacity: window.ornaments.OVERLAY_OPACITY }).addTo(window.ornaments._layer); + return L.marker(latlng, {icon: icon, clickable: false, keyboard: false, opacity: window.ornaments.OVERLAY_OPACITY }).addTo(layer); }); } } @@ -52,6 +63,7 @@ window.ornaments.removePortal = function(portal) { if(window.ornaments._portals[guid]) { window.ornaments._portals[guid].forEach(function(marker) { window.ornaments._layer.removeLayer(marker); + window.ornaments._beacon.removeLayer(marker); }); delete window.ornaments._portals[guid]; } From 515e7ea8e0c6790514c7fde4c742766ee3ae5d91 Mon Sep 17 00:00:00 2001 From: RJ Bernau Date: Mon, 29 Feb 2016 10:20:30 -0600 Subject: [PATCH 2/6] Temporary Fix for missing image. --- code/ornaments.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/ornaments.js b/code/ornaments.js index d1a57000..9c228cfa 100644 --- a/code/ornaments.js +++ b/code/ornaments.js @@ -45,6 +45,9 @@ window.ornaments.addPortal = function(portal) { var layer = window.ornaments._layer; if (ornament.startsWith("pe") && ornament != "peFRACK") { layer = window.ornaments._beacons; + if(ornament == "peOBSIDIAN") { + ornament = "peNIA"; + } } var icon = L.icon({ iconUrl: "//commondatastorage.googleapis.com/ingress.com/img/map_icons/marker_images/" + ornament + ".png", From 43334b85d2ad1b2943335bf7e71a517f6e916429 Mon Sep 17 00:00:00 2001 From: Alex Zack Date: Wed, 2 Nov 2016 21:20:07 -0400 Subject: [PATCH 3/6] #1099: Fixing variable for beacons layer --- code/ornaments.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/ornaments.js b/code/ornaments.js index 9c228cfa..db550fe1 100644 --- a/code/ornaments.js +++ b/code/ornaments.js @@ -15,7 +15,7 @@ // (there are 7 different colors for each of them) -window.ornaments = {} +window.ornaments = {}; window.ornaments.OVERLAY_SIZE = 60; window.ornaments.OVERLAY_OPACITY = 0.6; @@ -25,12 +25,12 @@ window.ornaments.setup = function() { window.ornaments._beacons = L.layerGroup(); window.addLayerGroup('Ornaments', window.ornaments._layer, true); window.addLayerGroup('Beacons', window.ornaments._beacons, true); -} +}; // quick test for portal having ornaments window.ornaments.isInterestingPortal = function(portal) { return portal.options.data.ornaments.length != 0; -} +}; window.ornaments.addPortal = function(portal) { var guid = portal.options.guid; @@ -59,15 +59,15 @@ window.ornaments.addPortal = function(portal) { return L.marker(latlng, {icon: icon, clickable: false, keyboard: false, opacity: window.ornaments.OVERLAY_OPACITY }).addTo(layer); }); } -} +}; window.ornaments.removePortal = function(portal) { var guid = portal.options.guid; if(window.ornaments._portals[guid]) { window.ornaments._portals[guid].forEach(function(marker) { window.ornaments._layer.removeLayer(marker); - window.ornaments._beacon.removeLayer(marker); + window.ornaments._beacons.removeLayer(marker); }); delete window.ornaments._portals[guid]; } -} +}; From b5e25d2457dc52ee3fa18edc6a4357912294e0fd Mon Sep 17 00:00:00 2001 From: Alex Zack Date: Wed, 2 Nov 2016 21:32:49 -0400 Subject: [PATCH 4/6] #1099: Removing unncessary workaround for obsidian beacon image. The image loads OK. --- code/ornaments.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/ornaments.js b/code/ornaments.js index db550fe1..e0337bf9 100644 --- a/code/ornaments.js +++ b/code/ornaments.js @@ -45,9 +45,6 @@ window.ornaments.addPortal = function(portal) { var layer = window.ornaments._layer; if (ornament.startsWith("pe") && ornament != "peFRACK") { layer = window.ornaments._beacons; - if(ornament == "peOBSIDIAN") { - ornament = "peNIA"; - } } var icon = L.icon({ iconUrl: "//commondatastorage.googleapis.com/ingress.com/img/map_icons/marker_images/" + ornament + ".png", From 7b00da289a1b3ddc4a2b90af240a1d4273e8be38 Mon Sep 17 00:00:00 2001 From: Alex Zack Date: Wed, 2 Nov 2016 21:37:29 -0400 Subject: [PATCH 5/6] #1099: Adding Fracker layer per request --- code/ornaments.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/ornaments.js b/code/ornaments.js index e0337bf9..93324f15 100644 --- a/code/ornaments.js +++ b/code/ornaments.js @@ -23,8 +23,10 @@ window.ornaments.setup = function() { window.ornaments._portals = {}; window.ornaments._layer = L.layerGroup(); window.ornaments._beacons = L.layerGroup(); + window.ornaments._frackers = L.layerGroup(); window.addLayerGroup('Ornaments', window.ornaments._layer, true); window.addLayerGroup('Beacons', window.ornaments._beacons, true); + window.addLayerGroup('Frackers', window.ornaments._frackers, true); }; // quick test for portal having ornaments @@ -43,8 +45,12 @@ window.ornaments.addPortal = function(portal) { if (portal.options.data.ornaments) { window.ornaments._portals[guid] = portal.options.data.ornaments.map(function(ornament) { var layer = window.ornaments._layer; - if (ornament.startsWith("pe") && ornament != "peFRACK") { - layer = window.ornaments._beacons; + if (ornament.startsWith("pe")) { + if (ornament === "peFRACK") { + layer = window.ornaments._frackers; + } else { + layer = window.ornaments._beacons; + } } var icon = L.icon({ iconUrl: "//commondatastorage.googleapis.com/ingress.com/img/map_icons/marker_images/" + ornament + ".png", @@ -64,6 +70,7 @@ window.ornaments.removePortal = function(portal) { window.ornaments._portals[guid].forEach(function(marker) { window.ornaments._layer.removeLayer(marker); window.ornaments._beacons.removeLayer(marker); + window.ornaments._frackers.removeLayer(marker); }); delete window.ornaments._portals[guid]; } From 307044dd0d2c869560245b67af3f06f65369468a Mon Sep 17 00:00:00 2001 From: Alex Zack Date: Wed, 2 Nov 2016 21:38:32 -0400 Subject: [PATCH 6/6] #1099: Fixing comparison operator to avoid possible type coercion issues --- code/ornaments.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ornaments.js b/code/ornaments.js index 93324f15..286a8973 100644 --- a/code/ornaments.js +++ b/code/ornaments.js @@ -31,7 +31,7 @@ window.ornaments.setup = function() { // quick test for portal having ornaments window.ornaments.isInterestingPortal = function(portal) { - return portal.options.data.ornaments.length != 0; + return portal.options.data.ornaments.length !== 0; }; window.ornaments.addPortal = function(portal) {