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

Fix some bugs regarding OMS by introducing a new helper function

Browse Source
This commit is contained in:
fkloft 2014-06-10 20:52:20 +02:00
parent d3fca8612c
commit 042129095b
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/oms.js
View File

@ -21,5 +21,21 @@ window.setupOMS = function() {
window.oms.addListener('spiderfy', function(markers) { window.oms.addListener('spiderfy', function(markers) {
map.closePopup(); map.closePopup();
}); });
map._container.addEventListener("keypress", function(ev) {
if(ev.keyCode === 27) // Esc
window.oms.unspiderfy();
}, false);
} }
window.registerMarkerForOMS = function(marker) {
marker.on('add', function () {
window.oms.addMarker(marker);
});
marker.on('remove', function () {
window.oms.removeMarker(marker);
});
if(marker._map) // marker has already been added
window.oms.addMarker(marker);
}

3
plugins/bookmarks-by-zaso.user.js
View File

@ -1018,8 +1018,7 @@
iconSize: [30,40] iconSize: [30,40]
}) })
}); });
window.oms.addMarker(star); window.registerMarkerForOMS(star);
star.on('remove', function() { window.oms.removeMarker(star); });
star.on('spiderfiedclick', function() { renderPortalDetails(guid); }); star.on('spiderfiedclick', function() { renderPortalDetails(guid); });
window.plugin.bookmarks.starLayers[guid] = star; window.plugin.bookmarks.starLayers[guid] = star;

10
plugins/draw-tools.user.js
View File

@ -258,10 +258,7 @@ window.plugin.drawTools.import = function(data) {
var extraMarkerOpt = {}; var extraMarkerOpt = {};
if (item.color) extraMarkerOpt.icon = window.plugin.drawTools.getMarkerIcon(item.color); if (item.color) extraMarkerOpt.icon = window.plugin.drawTools.getMarkerIcon(item.color);
layer = L.marker(item.latLng, L.extend({},window.plugin.drawTools.markerOptions,extraMarkerOpt)); layer = L.marker(item.latLng, L.extend({},window.plugin.drawTools.markerOptions,extraMarkerOpt));
window.oms.addMarker(layer); window.registerMarkerForOMS(layer);
layer.on('remove', function() {
window.oms.removeMarker(layer);
});
break; break;
default: default:
console.warn('unknown layer type "'+item.type+'" when loading draw tools layer'); console.warn('unknown layer type "'+item.type+'" when loading draw tools layer');
@ -431,10 +428,7 @@ window.plugin.drawTools.boot = function() {
window.plugin.drawTools.save(); window.plugin.drawTools.save();
if(layer instanceof L.Marker) { if(layer instanceof L.Marker) {
window.oms.addMarker(layer); window.registerMarkerForOMS(layer);
layer.on('remove', function() {
window.oms.removeMarker(layer);
});
} }
}); });

11
plugins/player-tracker.user.js
View File

@ -373,7 +373,7 @@ window.plugin.playerTracker.drawData = function() {
} }
m.addTo(playerData.team === 'RESISTANCE' ? plugin.playerTracker.drawnTracesRes : plugin.playerTracker.drawnTracesEnl); m.addTo(playerData.team === 'RESISTANCE' ? plugin.playerTracker.drawnTracesRes : plugin.playerTracker.drawnTracesEnl);
window.oms.addMarker(m); window.registerMarkerForOMS(m);
// jQueryUI doesn’t automatically notice the new markers // jQueryUI doesn’t automatically notice the new markers
if (!isTouchDev) { if (!isTouchDev) {
@ -421,15 +421,6 @@ window.plugin.playerTracker.handleData = function(data) {
plugin.playerTracker.processNewData(data); plugin.playerTracker.processNewData(data);
if (!window.isTouchDevice()) plugin.playerTracker.closeIconTooltips(); if (!window.isTouchDevice()) plugin.playerTracker.closeIconTooltips();
plugin.playerTracker.drawnTracesEnl.eachLayer(function(feature) {
if(feature instanceof L.Marker)
window.oms.removeMarker(feature);
});
plugin.playerTracker.drawnTracesRes.eachLayer(function(feature) {
if(feature instanceof L.Marker)
window.oms.removeMarker(feature);
});
plugin.playerTracker.drawnTracesEnl.clearLayers(); plugin.playerTracker.drawnTracesEnl.clearLayers();
plugin.playerTracker.drawnTracesRes.clearLayers(); plugin.playerTracker.drawnTracesRes.clearLayers();
plugin.playerTracker.drawData(); plugin.playerTracker.drawData();