Merge branch 'master' of github.com:jonatkins/ingress-intel-total-conversion

2013-05-20 11:34:53 +02:00
parent 83dbdf4e18 a525fb5144
commit 115727bf34
41 changed files with 65 additions and 7 deletions
--- a/build.py
+++ b/build.py
@@ -53,7 +53,7 @@ settings = buildSettings[buildName]
 utcTime = time.gmtime()
 buildDate = time.strftime('%Y-%m-%d-%H%M%S',utcTime)
 # userscripts have specific specifications for version numbers - the above date format doesn't match
-dateTimeVersion = time.strftime('%Y%m%d.%H%M%S',utcTime)
+dateTimeVersion = time.strftime('%Y%m%d.',utcTime) + time.strftime('%H%M%S',utcTime).lstrip('0')

 # extract required values from the settings entry
 resourceUrlBase = settings.get('resourceUrlBase')
--- a/code/boot.js
+++ b/code/boot.js
@@ -259,10 +259,10 @@ window.setMapBaseLayer = function() {


  //event to track layer changes and store the name
-  map.on('baselayerchange', function() {
+  map.on('baselayerchange', function(info) {
    for(i in window.layerChooser._layers) {
      var obj = window.layerChooser._layers[i];
-      if (!obj.overlay && map.hasLayer(obj.layer)) {
+      if (info.layer === obj.layer) {
        localStorage['iitc-base-map'] = obj.name;
        break;
      }
--- a/code/smartphone.js
+++ b/code/smartphone.js
@@ -136,7 +136,6 @@ window.runOnSmartphonesAfterBoot = function() {
    }
  }
  window.layerChooser.showLayer = function(id,show) {
-    window.console.log('yeay' + id + show);
    if (show === undefined) show = true;
    obj = this._layers[id];
    if (!obj) return false;
@@ -146,7 +145,7 @@ window.runOnSmartphonesAfterBoot = function() {
        //the layer to show is not currently active
        this._map.addLayer(obj.layer);

-        //if it's an overlay, remove any others
+        //if it's a base layer, remove any others
        if (!obj.overlay) {
          for(i in this._layers) {
            if (i != id) {
@@ -161,6 +160,7 @@ window.runOnSmartphonesAfterBoot = function() {
        this._map.removeLayer(obj.layer);
      }
    }
+
    //below logic based on code in L.Control.Layers _onInputClick
    if(!obj.overlay) {
      this._map.setZoom(this._map.getZoom());
--- a/main.js
+++ b/main.js
@@ -10,6 +10,7 @@
 // @include        https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==


--- a/plugins/ap-list.user.js
+++ b/plugins/ap-list.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/compute-ap-stats.user.js
+++ b/plugins/compute-ap-stats.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/draw-tools.user.js
+++ b/plugins/draw-tools.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/force-https.user.js
+++ b/plugins/force-https.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==


--- a/plugins/guess-player-levels.user.js
+++ b/plugins/guess-player-levels.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/ipas-link.user.js
+++ b/plugins/ipas-link.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==


--- a/plugins/keys-on-map.user.js
+++ b/plugins/keys-on-map.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/keys.user.js
+++ b/plugins/keys.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/max-links.user.js
+++ b/plugins/max-links.user.js
@@ -9,6 +9,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/pan-control.user.js
+++ b/plugins/pan-control.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/player-tracker.user.js
+++ b/plugins/player-tracker.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/players-resonators.user.js
+++ b/plugins/players-resonators.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 /*********************************************************************************************************
--- a/plugins/portal-counts.user.js
+++ b/plugins/portal-counts.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 /* whatsnew
--- a/plugins/portal-highlighter-can-make-level.user.js
+++ b/plugins/portal-highlighter-can-make-level.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/portal-highlighter-level-color.user.js
+++ b/plugins/portal-highlighter-level-color.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/portal-highlighter-missing-resonators.user.js
+++ b/plugins/portal-highlighter-missing-resonators.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/portal-highlighter-my-portals.user.js
+++ b/plugins/portal-highlighter-my-portals.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/portal-highlighter-portal-ap-energy-relative.user.js
+++ b/plugins/portal-highlighter-portal-ap-energy-relative.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/portal-highlighter-portal-ap-relative.user.js
+++ b/plugins/portal-highlighter-portal-ap-relative.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/portal-highlighter-portal-ap.user.js
+++ b/plugins/portal-highlighter-portal-ap.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/portal-highlighter-portals-my-level.user.js
+++ b/plugins/portal-highlighter-portals-my-level.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/portal-highlighter-portals-upgrade.user.js
+++ b/plugins/portal-highlighter-portals-upgrade.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/portal-level-numbers.user.js
+++ b/plugins/portal-level-numbers.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/portals-list.user.js
+++ b/plugins/portals-list.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 /* whatsnew
--- a/plugins/privacy-view.user.js
+++ b/plugins/privacy-view.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/render-limit-increase.user.js
+++ b/plugins/render-limit-increase.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/reso-energy-pct-in-portal-detail.user.js
+++ b/plugins/reso-energy-pct-in-portal-detail.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/resonator-display-zoom-level-decrease.user.js
+++ b/plugins/resonator-display-zoom-level-decrease.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/scale-bar.user.js
+++ b/plugins/scale-bar.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/scoreboard.user.js
+++ b/plugins/scoreboard.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/show-address.user.js
+++ b/plugins/show-address.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/show-linked-portals.user.js
+++ b/plugins/show-linked-portals.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 /*
--- a/plugins/show-portal-weakness.user.js
+++ b/plugins/show-portal-weakness.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/speech-search.user.js
+++ b/plugins/speech-search.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/plugins/sync.user.js
+++ b/plugins/sync.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-sync@xelio
 // @name           IITC plugin: Sync
-// @version        0.2.0.@@DATETIMEVERSION@@
+// @version        0.2.1.@@DATETIMEVERSION@@
 // @namespace      https://github.com/jonatkins/ingress-intel-total-conversion
 // @updateURL      @@UPDATEURL@@
 // @downloadURL    @@DOWNLOADURL@@
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
@@ -383,7 +384,7 @@ window.plugin.sync.FileSearcher.prototype.instances = {};
 window.plugin.sync.FileSearcher.prototype.RETRY_LIMIT = 2;
 window.plugin.sync.FileSearcher.prototype.MIMETYPE_FILE = 'application/vnd.google-apps.drive-sdk';
 window.plugin.sync.FileSearcher.prototype.MIMETYPE_FOLDER = 'application/vnd.google-apps.folder';
-window.plugin.sync.FileSearcher.prototype.parentName = 'IITC-SYNC-DATA';
+window.plugin.sync.FileSearcher.prototype.parentName = 'IITC-SYNC-DATA-V2';
 window.plugin.sync.FileSearcher.prototype.parentDescription = 'Store IITC sync data';

 window.plugin.sync.FileSearcher.prototype.initialize = function(force) {
--- a/plugins/zoom-slider.user.js
+++ b/plugins/zoom-slider.user.js
@@ -10,6 +10,7 @@
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
+// @grant          none
 // ==/UserScript==

 function wrapper() {
--- a/style.css
+++ b/style.css
@@ -101,6 +101,27 @@ a:hover {
  cursor: help;
 }

+
+/* base layer selection - first column */
+.leaflet-control-layers-base {
+  float: left;
+}
+
+/* overlays layer selection - 2nd column */
+.leaflet-control-layers-overlays {
+  float: left;
+  margin-left: 8px;
+  border-left: 1px solid #DDDDDD;
+  padding-left: 8px;
+}
+
+/* hide the usual seperator */
+.leaflet-control-layers-separator {
+  display: none;
+}
+
+
+
 .help {
  cursor: help;
 }