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

Work in progress: Plugin Draw Resonators: bug fix

Browse Source
This commit is contained in:
Xelio 2013-09-02 23:34:01 +08:00
parent 19333a32d3
commit c91dd67359
1 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
plugins/draw-resonators.user.js
View File

@ -41,6 +41,7 @@ window.plugin.drawResonators.Render = function(options) {
this.stylers = {}; this.stylers = {};
this.resonators = {}; this.resonators = {};
this.resonatorLayerGroup = new L.LayerGroup(); this.resonatorLayerGroup = new L.LayerGroup();
this.addStyler(new window.plugin.drawResonators.Styler());
this.portalAdded = this.portalAdded.bind(this); this.portalAdded = this.portalAdded.bind(this);
this.createResonatorEntities = this.createResonatorEntities.bind(this); this.createResonatorEntities = this.createResonatorEntities.bind(this);
@ -51,6 +52,7 @@ window.plugin.drawResonators.Render = function(options) {
window.plugin.drawResonators.Render.prototype.registerHook = function() { window.plugin.drawResonators.Render.prototype.registerHook = function() {
window.addHook('portalAdded', this.portalAdded); window.addHook('portalAdded', this.portalAdded);
window.map.on('zoomend', this.clearResonatorEntitiesAfterZoom); window.map.on('zoomend', this.clearResonatorEntitiesAfterZoom);
//TODO: zoom in should redraw resonators if needed
} }
window.plugin.drawResonators.Render.prototype.portalAdded = function(data) { window.plugin.drawResonators.Render.prototype.portalAdded = function(data) {
@ -70,12 +72,14 @@ window.plugin.drawResonators.Render.prototype.createResonatorEntities = function
// No need to check for existing resonators, as old resonators should be removed with the portal marker. // No need to check for existing resonators, as old resonators should be removed with the portal marker.
// No need to check for display status of portalLayer, as this function is only called by // No need to check for display status of portalLayer, as this function is only called by
// 'added' event of portal marker. // 'add' event of portal marker.
if(!isResonatorsShow()) return; if(!this.isResonatorsShow()) return;
var portalDetails = portal.options.details;
var resonatorsWithConnector = new L.LayerGroup() var resonatorsWithConnector = new L.LayerGroup()
var portalLatLng = [portal.details.locationE6.latE6/1E6, portal.details.locationE6.lngE6/1E6];
var portalSelected = selectedPortal === portal.guid; var portalLatLng = [portalDetails.locationE6.latE6/1E6, portalDetails.locationE6.lngE6/1E6];
var portalSelected = selectedPortal === portal.options.guid;
for(var i in portalDetails.resonatorArray.resonators) { for(var i in portalDetails.resonatorArray.resonators) {
resoData = portalDetails.resonatorArray.resonators[i]; resoData = portalDetails.resonatorArray.resonators[i];
@ -86,18 +90,22 @@ window.plugin.drawResonators.Render.prototype.createResonatorEntities = function
var resoMarker = this.createResoMarker(resoData, resoLatLng, portalSelected); var resoMarker = this.createResoMarker(resoData, resoLatLng, portalSelected);
var connMarker = this.createConnMarker(resoData, resoLatLng, portalLatLng, portalSelected); var connMarker = this.createConnMarker(resoData, resoLatLng, portalLatLng, portalSelected);
resonatorsWithConnector.add(resoMarker); resonatorsWithConnector.addLayer(resoMarker);
resonatorsWithConnector.add(connMarker); resonatorsWithConnector.addLayer(connMarker);
} }
resonatorsWithConnector.options = { resonatorsWithConnector.options = {
details: portalDetails.resonatorArray.resonators, details: portalDetails.resonatorArray.resonators,
guid: portal.guid guid: portal.options.guid
}; };
this.resonators[portal.guid] = resonatorsWithConnector; this.resonators[portal.options.guid] = resonatorsWithConnector;
this.resonatorLayerGroup.addLayer(resonatorsWithConnector); this.resonatorLayerGroup.addLayer(resonatorsWithConnector);
resonatorsWithConnector.bringToBack();
// bring portal in front of resonator connector
if(portal.options.guid in window.portals) {
window.portals[portal.options.guid].bringToFront();
}
} }
window.plugin.drawResonators.Render.prototype.createResoMarker = function(resoData, resoLatLng, portalSelected) { window.plugin.drawResonators.Render.prototype.createResoMarker = function(resoData, resoLatLng, portalSelected) {
@ -194,6 +202,7 @@ window.plugin.drawResonators.Render.prototype.isResonatorsShow = function() {
window.plugin.drawResonators.Styler = function(options) { window.plugin.drawResonators.Styler = function(options) {
options = options || {};
this.name = options['name'] || 'default'; this.name = options['name'] || 'default';
this.getResonatorStyle = options['resonatorStyleFunc'] || this.defaultResonatorStyle; this.getResonatorStyle = options['resonatorStyleFunc'] || this.defaultResonatorStyle;
this.getConnectorStyle = options['connectorStyleFunc'] || this.defaultConnectorStyle; this.getConnectorStyle = options['connectorStyleFunc'] || this.defaultConnectorStyle;
@ -236,7 +245,7 @@ window.plugin.drawResonators.Styler.prototype.defaultResonatorStyle = function(r
var resoStyle = $.extend({ var resoStyle = $.extend({
fillColor: COLORS_LVL[resoDetail.level], fillColor: COLORS_LVL[resoDetail.level],
fillOpacity: rdata.energyTotal/RESO_NRG[resoDetail.level], fillOpacity: resoDetail.energyTotal/RESO_NRG[resoDetail.level],
}, resoSharedStyle); }, resoSharedStyle);
return resoStyle; return resoStyle;
@ -257,41 +266,42 @@ window.plugin.drawResonators.Styler.prototype.defaultConnectorStyle = function(r
// TODO: add callback to notify option changes // TODO: add callback to notify option changes
window.plugin.drawResonators.Options = function() { window.plugin.drawResonators.Options = function() {
this.enableZoomLevel = this.loadLocal(this.STORAGE_ENABLE_ZOOM_LEVEL); this._options = {};
this.useStyler = this.loadLocal(this.STORAGE_USE_STYLER);
} }
window.plugin.drawResonators.Options.prototype.options = {}; window.plugin.drawResonators.Options.prototype.newOption = function(name, defaultValue) {
this._options[name] = this.loadLocal(this.getStorageKey, defaultValue)
}
window.plugin.drawResonators.Options.prototype.options['enableZoomLevel'] = { window.plugin.drawResonators.Options.prototype.getOption = function(name) {
key: 'plugin-drawResonators-enableZoomLevel', return this._options[name];
defaultValue: 17}; }
window.plugin.drawResonators.Options.prototype.options['useStyler'] = {
key: 'plugin-drawResonators-useStyler',
defaultValue: 'default'};
window.plugin.drawResonators.Options.prototype.changeOption = function(name, value) { window.plugin.drawResonators.Options.prototype.changeOption = function(name, value) {
if(!name in options) return false; if(!name in this._options) return false;
this[name] = value; this._options[name] = value;
this.storeLocal(options[name], this[name]); this.storeLocal(name, this._options[name]);
} }
window.plugin.drawResonators.Options.prototype.loadLocal = function(mapping) { window.plugin.drawResonators.Options.prototype.getStorageKey = function(name) {
var objectJSON = localStorage[mapping.key]; return 'plugin-drawResonators-option-' + name;
}
window.plugin.drawResonators.Options.prototype.loadLocal = function(key, defaultValue) {
var objectJSON = localStorage[key];
if(!objectJSON) { if(!objectJSON) {
return mapping.defaultValue; return defaultValue;
} else { } else {
return JSON.parse(objectJSON); return JSON.parse(objectJSON);
} }
} }
window.plugin.drawResonators.Options.prototype.storeLocal = function(mapping, value) { window.plugin.drawResonators.Options.prototype.storeLocal = function(key, value) {
if(typeof(value) !== 'undefined' && value !== null) { if(typeof(value) !== 'undefined' && value !== null) {
localStorage[mapping.key] = JSON.stringify(value); localStorage[key] = JSON.stringify(value);
} else { } else {
localStorage.removeItem(mapping.key); localStorage.removeItem(key);
} }
} }
@ -299,12 +309,15 @@ window.plugin.drawResonators.Options.prototype.storeLocal = function(mapping, va
var setup = function() { var setup = function() {
window.plugin.drawResonators.options = new Options(); window.plugin.drawResonators.options = new window.plugin.drawResonators.Options();
var renderOptions = { window.plugin.drawResonators.options.newOption('enableZoomLevel', 17);
'enableZoomLevel': options.enableZoomLevel, window.plugin.drawResonators.options.newOption('useStyler', 'default');
'useStyler': options.useStyler};
window.plugin.drawResonators.render = new Render(renderOptions); var renderOptions = {
'enableZoomLevel': window.plugin.drawResonators.options.getOption('enableZoomLevel'),
'useStyler': window.plugin.drawResonators.options.getOption('useStyler')};
window.plugin.drawResonators.render = new window.plugin.drawResonators.Render(renderOptions);
window.plugin.drawResonators.render.registerHook(); window.plugin.drawResonators.render.registerHook();
window.addLayerGroup('Resonators', window.plugin.drawResonators.render.resonatorLayerGroup, true); window.addLayerGroup('Resonators', window.plugin.drawResonators.render.resonatorLayerGroup, true);