();
private static void setupKnownCopyHandlers() {
- if (!KNOWN_COPY_HANDLERS.isEmpty())
+ if (!KNOWN_COPY_HANDLERS.isEmpty()) {
return;
+ }
KNOWN_COPY_HANDLERS.add(new CopyHandler(
"com.google.android.apps.docs",
@@ -141,8 +142,9 @@ public class IntentListView extends ListView {
for (ResolveInfo resolveInfo : activityList) { // search for "Copy to clipboard" handler
CopyHandler handler = new CopyHandler(resolveInfo);
- if (KNOWN_COPY_HANDLERS.contains(handler))
+ if (KNOWN_COPY_HANDLERS.contains(handler)) {
hasCopyIntent = true;
+ }
}
// use traditional loop since list may change during iteration
diff --git a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
index aeec04cc..fdb1d49f 100644
--- a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
+++ b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
@@ -45,15 +45,17 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
private String getUrl() {
String url = "http://www.ingress.com/intel?ll=" + mLl + "&z=" + mZoom;
- if (mIsPortal)
+ if (mIsPortal) {
url += "&pll=" + mLl;
+ }
return url;
}
private void setSelected(int position) {
// Activity not fully loaded yet (may occur during tab creation)
- if (mSharedPrefs == null)
+ if (mSharedPrefs == null) {
return;
+ }
mSharedPrefs
.edit()
@@ -103,7 +105,6 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
mFragmentAdapter = new IntentFragmentAdapter(getSupportFragmentManager());
final ActionBar actionBar = getActionBar();
- actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
actionBar.setDisplayHomeAsUpEnabled(true);
Intent intent = getIntent();
@@ -126,7 +127,9 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
mViewPager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
@Override
public void onPageSelected(int position) {
- actionBar.setSelectedNavigationItem(position);
+ if (actionBar.getNavigationMode() != ActionBar.NAVIGATION_MODE_STANDARD) {
+ actionBar.setSelectedNavigationItem(position);
+ }
setSelected(position);
}
});
@@ -141,11 +144,17 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
.setTabListener(this));
}
+ if (mFragmentAdapter.getCount() > 1) {
+ actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+ }
+
mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
int selected = mSharedPrefs.getInt("pref_share_selected_tab", 0);
if (selected < mFragmentAdapter.getCount()) {
mViewPager.setCurrentItem(selected);
- actionBar.setSelectedNavigationItem(selected);
+ if (actionBar.getNavigationMode() != ActionBar.NAVIGATION_MODE_STANDARD) {
+ actionBar.setSelectedNavigationItem(selected);
+ }
}
}
diff --git a/plugins/add-kml.user.js b/plugins/add-kml.user.js
new file mode 100755
index 00000000..45c4ce2c
--- /dev/null
+++ b/plugins/add-kml.user.js
@@ -0,0 +1,68 @@
+// ==UserScript==
+// @id overlay-kml@danielatkins
+// @name IITC plugin: overlay KML
+// @category Info
+// @version 0.1.@@DATETIMEVERSION@@
+// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
+// @updateURL @@UPDATEURL@@
+// @downloadURL @@DOWNLOADURL@@
+// @description [@@BUILDNAME@@-@@BUILDDATE@@] Allows users to overlay their own KML / GPX files on top of IITC
+// @include https://www.ingress.com/intel*
+// @include http://www.ingress.com/intel*
+// @match https://www.ingress.com/intel*
+// @match http://www.ingress.com/intel*
+// @grant none
+// ==/UserScript==
+
+@@PLUGINSTART@@
+
+// PLUGIN START ////////////////////////////////////////////////////////
+
+// use own namespace for plugin
+window.plugin.overlayKML = function() {};
+
+window.plugin.overlayKML.loadExternals = function() {
+ try { console.log('Loading leaflet.filelayer JS now'); } catch(e) {}
+ @@INCLUDERAW:external/leaflet.filelayer.js@@
+ try { console.log('done loading leaflet.filelayer JS'); } catch(e) {}
+
+ try { console.log('Loading KML JS now'); } catch(e) {}
+ @@INCLUDERAW:external/KML.js@@
+ try { console.log('done loading KML JS'); } catch(e) {}
+
+ try { console.log('Loading togeojson JS now'); } catch(e) {}
+ @@INCLUDERAW:external/togeojson.js@@
+ try { console.log('done loading togeojson JS'); } catch(e) {}
+
+ window.plugin.overlayKML.load();
+}
+
+window.plugin.overlayKML.load = function() {
+ // Provide popup window allow user to select KML to overlay
+
+ L.Icon.Default.imagePath = '@@INCLUDEIMAGE:images/marker-icon.png@@';
+ var KMLIcon = L.icon({
+ iconUrl: '@@INCLUDEIMAGE:images/marker-icon.png@@',
+
+ iconSize: [16, 24], // size of the icon
+ iconAnchor: [8, 24], // point of the icon which will correspond to marker's location
+ popupAnchor: [-3, 16] // point from which the popup should open relative to the iconAnchor
+ });
+
+ L.Control.FileLayerLoad.LABEL = '
';
+ L.Control.fileLayerLoad({
+ fitBounds: true,
+ layerOptions: {
+ pointToLayer: function (data, latlng) {
+ return L.marker(latlng, {icon: KMLIcon});
+ }},
+ }).addTo(map);
+}
+
+var setup = function() {
+ window.plugin.overlayKML.loadExternals();
+}
+
+// PLUGIN END //////////////////////////////////////////////////////////
+
+@@PLUGINEND@@
diff --git a/plugins/bookmarks-by-zaso.user.js b/plugins/bookmarks-by-zaso.user.js
index 918db2fd..5bcda534 100644
--- a/plugins/bookmarks-by-zaso.user.js
+++ b/plugins/bookmarks-by-zaso.user.js
@@ -2,7 +2,7 @@
// @id iitc-plugin-bookmarks@ZasoGD
// @name IITC plugin: Bookmarks for maps and portals
// @category Controls
-// @version 0.2.4.@@DATETIMEVERSION@@
+// @version 0.2.5.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
@@ -18,35 +18,14 @@
// PLUGIN START ////////////////////////////////////////////////////////
/***********************************************************************
- USEFUL FUNCTIONS:
- + window.plugin.bookmarks.refreshBkmrks(): reloads the bookmarks into box;
HOOKS:
- + pluginBkmrksEdit: fired when a bookmarks/folder is removed, added or sorted, also when a folder is opened/closed;
- + pluginBkmrksOpenOpt: fired when the "Bookmarks Options" panel is opened (you can add new options);
-
- CHANGELOG:
- v 0.2.1-0.2.2:
- + auto-drawer minor bug fix;
- + auto-drawer improved UI;
- + auto-drawer improved UI on mobile;
- + fixed hidden box problem (I hope): sometimes the box and the ribbon hidden;
-
- v 0.2.0:
- + code rewritten from scratch:
- ++ more optimization;
- ++ less animated effects;
- + Sync;
- + Hooks (for developer);
- + Option panel:
- ++ manual import/export/reset of the data;
- ++ sharing of the data (only IITCm);
- ++ storage/reset the box position (only desktop);
- + Auto-drawer feature: select two o three portals boomark to auto-draw a link or field (draw-tools required);
- + IITCm: you can open/close the folders;
- + IITCm: bookmarks/folders not sortable (the 'sortable' jquery function not work);
+ - pluginBkmrksEdit: fired when a bookmarks/folder is removed, added or sorted, also when a folder is opened/closed;
+ - pluginBkmrksOpenOpt: fired when the "Bookmarks Options" panel is opened (you can add new options);
+ - pluginBkmrksSyncEnd: fired when the sync is finished;
***********************************************************************/
+////////////////////////////////////////////////////////////////////////
// use own namespace for plugin
window.plugin.bookmarks = function() {};
@@ -68,8 +47,16 @@
window.plugin.bookmarks.enableSync = false;
+ window.plugin.bookmarks.starLayers = {};
+ window.plugin.bookmarks.starLayerGroup = null;
+
window.plugin.bookmarks.isSmart = undefined;
- window.plugin.bookmarks.isAndroid = function() { if(typeof android !== 'undefined' && android) { return true; } return false; }
+ window.plugin.bookmarks.isAndroid = function() {
+ if(typeof android !== 'undefined' && android) {
+ return true;
+ }
+ return false;
+ }
/*********************************************************************************************************************/
@@ -262,11 +249,12 @@
var guid = bkmrk['guid'];
var btn_link = ''+label+'';
}
+ // Create the bookmark
elementTemp += ''+btn_remove+btn_link+'';
}
elementTemp += '';
- //Add folder 'Others' in last position
+ // Add folder 'Others' in last position
if(idFolders != window.plugin.bookmarks.KEY_OTHER_BKMRK) { element += elementTemp; }
else{ elementExc = elementTemp; }
}
@@ -286,9 +274,9 @@
for(var idBkmrk in list[idFolders]['bkmrk']) {
var portalGuid = list[idFolders]['bkmrk'][idBkmrk]['guid'];
if(guid === portalGuid) {
- return {"folder":idFolders,"id":idBkmrk};
+ return {"id_folder":idFolders,"id_bookmark":idBkmrk};
}
- }
+ }
}
return;
}
@@ -321,7 +309,7 @@
if(localStorage[window.plugin.bookmarks.KEY_STORAGE].search(guid) != -1) {
var bkmrkData = window.plugin.bookmarks.findByGuid(guid);
if(bkmrkData) {
- $('.bkmrk#'+bkmrkData['id']+' a.bookmarksLink').addClass('selected');
+ $('.bkmrk#'+bkmrkData['id_bookmark']+' a.bookmarksLink').addClass('selected');
$('.bkmrksStar').addClass('favorite');
}
}
@@ -335,12 +323,14 @@
if($('.bkmrksStar').hasClass('favorite')) {
var bkmrkData = window.plugin.bookmarks.findByGuid(guid);
var list = window.plugin.bookmarks.bkmrksObj['portals'];
- delete list[bkmrkData['folder']]['bkmrk'][bkmrkData['id']];
- $('.bkmrk#'+bkmrkData['id']+'').remove();
+ delete list[bkmrkData['id_folder']]['bkmrk'][bkmrkData['id_bookmark']];
+ $('.bkmrk#'+bkmrkData['id_bookmark']+'').remove();
window.plugin.bookmarks.saveStorage();
window.plugin.bookmarks.updateStarPortal();
- window.runHooks('pluginBkmrksEdit');
+
+ window.runHooks('pluginBkmrksEdit', {"target": "portal", "action": "remove", "folder": bkmrkData['id_folder'], "id": bkmrkData['id_bookmark'], "guid":guid});
+ console.log('BOOKMARKS: removed portal ('+bkmrkData['id_bookmark']+' situated in '+bkmrkData['id_folder']+' folder)');
}
// If portal isn't saved in bookmarks: Add this bookmark
else{
@@ -357,8 +347,9 @@
window.plugin.bookmarks.bkmrksObj['portals'][window.plugin.bookmarks.KEY_OTHER_BKMRK]['bkmrk'][ID] = {"guid":guid,"latlng":latlng,"label":label};
window.plugin.bookmarks.saveStorage();
- window.runHooks('pluginBkmrksEdit');
window.plugin.bookmarks.refreshBkmrks();
+ window.runHooks('pluginBkmrksEdit', {"target": "portal", "action": "add", "id": ID});
+ console.log('BOOKMARKS: added portal '+ID);
}
}
@@ -391,8 +382,9 @@
window.plugin.bookmarks.bkmrksObj[short_type][ID] = {"label":label,"state":1,"bkmrk":{}};
}
window.plugin.bookmarks.saveStorage();
- window.runHooks('pluginBkmrksEdit');
window.plugin.bookmarks.refreshBkmrks();
+ window.runHooks('pluginBkmrksEdit', {"target": type, "action": "add", "id": ID});
+ console.log('BOOKMARKS: added '+type+' '+ID);
}
// Remove BOOKMARK/FOLDER
@@ -401,12 +393,23 @@
var typeList = $(elem).parent().parent().parent().parent().parent('div').attr('id');
var ID = $(elem).parent('li').attr('id');
var IDfold = $(elem).parent().parent().parent('li').attr('id');
+ var guid = window.plugin.bookmarks.bkmrksObj[typeList.replace('bkmrk_', '')][IDfold]['bkmrk'][ID].guid;
delete window.plugin.bookmarks.bkmrksObj[typeList.replace('bkmrk_', '')][IDfold]['bkmrk'][ID];
$(elem).parent('li').remove();
if(type === 'portals') {
+ var list = window.plugin.bookmarks.bkmrksObj['portals'];
+
window.plugin.bookmarks.updateStarPortal();
+ window.plugin.bookmarks.saveStorage();
+
+ window.runHooks('pluginBkmrksEdit', {"target": "portal", "action": "remove", "folder": IDfold, "id": ID, "guid": guid});
+ console.log('BOOKMARKS: removed portal ('+ID+' situated in '+IDfold+' folder)');
+ } else {
+ window.plugin.bookmarks.saveStorage();
+ window.runHooks('pluginBkmrksEdit', {"target": "map", "action": "remove", "id": ID});
+ console.log('BOOKMARKS: removed map '+ID);
}
}
else if(type === 'folder') {
@@ -415,9 +418,11 @@
delete plugin.bookmarks.bkmrksObj[typeList.replace('bkmrk_', '')][ID];
$(elem).parent().parent('li').remove();
+ window.plugin.bookmarks.saveStorage();
+ window.plugin.bookmarks.updateStarPortal();
+ window.runHooks('pluginBkmrksEdit', {"target": "folder", "action": "remove", "id": ID});
+ console.log('BOOKMARKS: removed folder '+ID);
}
- window.plugin.bookmarks.saveStorage();
- window.runHooks('pluginBkmrksEdit');
}
/***************************************************************************************************************************************************************/
@@ -433,7 +438,9 @@
});
window.plugin.bookmarks.bkmrksObj[keyType] = newArr;
window.plugin.bookmarks.saveStorage();
- window.runHooks('pluginBkmrksEdit');
+
+ window.runHooks('pluginBkmrksEdit', {"target": "folder", "action": "sort"});
+ console.log('BOOKMARKS: sorted folder');
}
// Saved the new sort of the bookmarks (in the localStorage)
@@ -465,7 +472,8 @@
});
window.plugin.bookmarks.bkmrksObj[keyType] = newArr;
window.plugin.bookmarks.saveStorage();
- window.runHooks('pluginBkmrksEdit');
+ window.runHooks('pluginBkmrksEdit', {"target": "bookmarks", "action": "sort"});
+ console.log('BOOKMARKS: sorted bookmark (portal/map)');
}
window.plugin.bookmarks.jquerySortableScript = function() {
@@ -534,8 +542,9 @@
if(promptAction !== null && promptAction !== '') {
localStorage[window.plugin.bookmarks.KEY_STORAGE] = promptAction;
window.plugin.bookmarks.refreshBkmrks();
+ window.runHooks('pluginBkmrksEdit', {"target": "all", "action": "import"});
+ console.log('BOOKMARKS: resetted and imported bookmarks');
window.plugin.bookmarks.optAlert('Succesful. ');
- window.runHooks('pluginBkmrksEdit');
}
}
@@ -545,9 +554,9 @@
delete localStorage[window.plugin.bookmarks.KEY_STORAGE];
window.plugin.bookmarks.createStorage();
window.plugin.bookmarks.loadStorage();
-
window.plugin.bookmarks.refreshBkmrks();
- window.runHooks('pluginBkmrksEdit');
+ window.runHooks('pluginBkmrksEdit', {"target": "all", "action": "reset"});
+ console.log('BOOKMARKS: resetted all bookmarks');
window.plugin.bookmarks.optAlert('Succesful. ');
}
}
@@ -581,7 +590,7 @@
}
/***************************************************************************************************************************************************************/
-/** AUTO DRAWER ************************************************************************************************************************************************/
+/** AUTO DRAW **************************************************************************************************************************************************/
/***************************************************************************************************************************************************************/
window.plugin.bookmarks.dialogDrawer = function() {
dialog({
@@ -590,17 +599,16 @@
title:'Bookmarks - Auto Draw',
buttons:{
'DRAW': function() {
- window.plugin.bookmarks.draw();
+ window.plugin.bookmarks.draw(0);
},
- 'REFRESH LIST': function() {
- $(this).dialog('close');
- window.plugin.bookmarks.dialogDrawer();
+ 'DRAW&VIEW': function() {
+ window.plugin.bookmarks.draw(1);
}
}
});
}
- window.plugin.bookmarks.draw = function() {
+ window.plugin.bookmarks.draw = function(view) {
var latlngs = [];
var uuu = $('#bkmrksAutoDrawer a.bkmrk.selected').each(function(i) {
var tt = $(this).data('latlng');
@@ -609,7 +617,8 @@
if(latlngs.length >= 2 && latlngs.length <= 3) {
var newItem;
- var options = {color:"#f06eaa",weight:4,opacity:.5}
+ // var options = {color:"#a24ac3",weight:4,opacity:.5}
+ var options = window.plugin.drawTools.polygonOptions;
if(latlngs.length == 3) { newItem = L.geodesicPolygon(latlngs, options); }
else if(latlngs.length == 2) { newItem = L.geodesicPolyline(latlngs, options); }
@@ -622,7 +631,15 @@
if(window.plugin.bookmarks.isSmart) {
window.show('map');
}
- map.fitBounds(newItem.getBounds());
+
+ // Shown the layer if it is hidden
+ if(!map.hasLayer(window.plugin.drawTools.drawnItems)) {
+ map.addLayer(window.plugin.drawTools.drawnItems);
+ }
+
+ if(view) {
+ map.fitBounds(newItem.getBounds());
+ }
}
else{
$('#bkmrksAutoDrawer p').toggle().delay('2500').fadeOut('500');
@@ -630,7 +647,7 @@
}
window.plugin.bookmarks.dialogLoadList = function() {
- var r = 'The"Draw Tools" plugin is required.';
+ var r = 'The "Draw Tools" plugin is required.';
if(!window.plugin.bookmarks || !window.plugin.drawTools) {
$('.ui-dialog-autodrawer .ui-dialog-buttonset .ui-button:not(:first)').hide();
@@ -727,6 +744,8 @@
delete window.plugin.bookmarks.updateQueue[e.property];
window.plugin.bookmarks.storeLocal(window.plugin.bookmarks.UPDATE_QUEUE);
window.plugin.bookmarks.refreshBkmrks();
+ window.runHooks('pluginBkmrksSyncEnd', {"target": "all", "action": "sync"});
+ console.log('BOOKMARKS: synchronized all');
}
}
}
@@ -752,7 +771,9 @@
window.plugin.bookmarks.loadLocal = function(mapping) {
var objectJSON = localStorage[mapping.key];
if(!objectJSON) return;
- window.plugin.bookmarks[mapping.field] = mapping.convertFunc ? mapping.convertFunc(JSON.parse(objectJSON)) : JSON.parse(objectJSON);
+ window.plugin.bookmarks[mapping.field] = mapping.convertFunc
+ ? mapping.convertFunc(JSON.parse(objectJSON))
+ : JSON.parse(objectJSON);
}
window.plugin.bookmarks.syncBkmrks = function() {
@@ -764,6 +785,79 @@
window.plugin.bookmarks.delaySync();
}
+/***************************************************************************************************************************************************************/
+/** HIGHLIGHTER ************************************************************************************************************************************************/
+/***************************************************************************************************************************************************************/
+ window.plugin.bookmarks.highlight = function(data) {
+ var guid = data.portal.options.ent[0];
+ if(window.plugin.bookmarks.findByGuid(guid)) {
+ data.portal.setStyle({fillColor:'red'});
+ }
+ }
+
+ window.plugin.bookmarks.highlightRefresh = function(data) {
+ if(_current_highlighter === 'Bookmarked Portals') {
+ if(data.action === 'sync' || data.target === 'portal' || (data.target === 'folder' && data.action === 'remove') || (data.target === 'all' && data.action === 'import') || (data.target === 'all' && data.action === 'reset')) {
+ window.resetHighlightedPortals();
+ }
+ }
+ }
+
+/***************************************************************************************************************************************************************/
+/** BOOKMARKED PORTALS LAYER ***********************************************************************************************************************************/
+/***************************************************************************************************************************************************************/
+ window.plugin.bookmarks.addAllStars = function() {
+ var list = window.plugin.bookmarks.bkmrksObj.portals;
+
+ for(var idFolders in list) {
+ for(var idBkmrks in list[idFolders]['bkmrk']) {
+ var latlng = list[idFolders]['bkmrk'][idBkmrks].latlng.split(",");
+ var guid = list[idFolders]['bkmrk'][idBkmrks].guid;
+ window.plugin.bookmarks.addStar(guid, latlng);
+ }
+ }
+ }
+
+ window.plugin.bookmarks.resetAllStars = function() {
+ for(guid in window.plugin.bookmarks.starLayers) {
+ var starInLayer = window.plugin.bookmarks.starLayers[guid];
+ window.plugin.bookmarks.starLayerGroup.removeLayer(starInLayer);
+ delete window.plugin.bookmarks.starLayers[guid];
+ }
+ window.plugin.bookmarks.addAllStars();
+ }
+
+ window.plugin.bookmarks.addStar = function(guid, latlng) {
+ var star = L.marker(latlng, {
+ icon: L.icon({
+ iconUrl: '@@INCLUDEIMAGE:images/marker-star.png@@',
+ iconAnchor: [15,40],
+ iconSize: [30,40]
+ })
+ });
+ window.plugin.bookmarks.starLayers[guid] = star;
+ star.addTo(window.plugin.bookmarks.starLayerGroup);
+ }
+
+ window.plugin.bookmarks.editStar = function(data) {
+ if(data.target === 'portal') {
+ if(data.action === 'add') {
+ var guid = window.selectedPortal;
+ var latlng = window.portals[guid]._latlng;
+ var starInLayer = window.plugin.bookmarks.starLayers[data.guid];
+ window.plugin.bookmarks.addStar(guid, latlng);
+ }
+ else if(data.action === 'remove') {
+ var starInLayer = window.plugin.bookmarks.starLayers[data.guid];
+ window.plugin.bookmarks.starLayerGroup.removeLayer(starInLayer);
+ delete window.plugin.bookmarks.starLayers[data.guid];
+ }
+ }
+ else if((data.target === 'all' && (data.action === 'import' || data.action === 'reset')) || (data.target === 'folder' && data.action === 'remove')) {
+ window.plugin.bookmarks.resetAllStars();
+ }
+ }
+
/***************************************************************************************************************************************************************/
window.plugin.bookmarks.setupCSS = function() {
@@ -776,54 +870,55 @@
plugin.bookmarks.htmlBoxTrigger = '[-] Bookmarks';
plugin.bookmarks.htmlBkmrksBox = ''
- +'
'
- +'
'
- +'
Maps
'
- +'
Portals
'
- +'
'
- +'
'
- +'
'
- +'
'
- +'
'
+ +'
Maps
'
+ +'
Portals
'
+ +'
'
+ +'
Plugin Bookmarks disabled*.
';
plugin.bookmarks.htmlStar = '';
plugin.bookmarks.htmlCalldrawBox = 'Auto draw';
plugin.bookmarks.htmlCallSetBox = 'Bookmarks Opt';
plugin.bookmarks.htmlSetbox = '';
+ +'Copy/Export Bookmarks'
+ +'Paste/Import Bookmarks'
+ +'Reset Bookmarks'
+ +'Share all Bookmarks (IITCm)'
+ +'Save box position (No IITCm)'
+ +'Reset box position (No IITCm)'
+ +'';
}
/***************************************************************************************************************************************************************/
var setup = function() {
-
window.plugin.bookmarks.isSmart = window.isSmartphone();
// Fired when a bookmarks/folder is removed, added or sorted, also when a folder is opened/closed.
if($.inArray('pluginBkmrksEdit', window.VALID_HOOKS) < 0) { window.VALID_HOOKS.push('pluginBkmrksEdit'); }
// Fired when the "Bookmarks Options" panell is opened (you can add new options);
if($.inArray('pluginBkmrksOpenOpt', window.VALID_HOOKS) < 0) { window.VALID_HOOKS.push('pluginBkmrksOpenOpt'); }
+ // Fired when the sync is finished;
+ if($.inArray('pluginBkmrksSyncEnd', window.VALID_HOOKS) < 0) { window.VALID_HOOKS.push('pluginBkmrksSyncEnd'); }
// If the storage not exists or is a old version
window.plugin.bookmarks.createStorage();
@@ -849,23 +944,6 @@
$('.bkmrksStar').remove();
}
});
-
- // in the future i hope in a 'portalClosed' hook
- /* hook done
- window.unselectOldPortal = function() {
- var oldPortal = portals[selectedPortal];
- if(oldPortal) portalResetColor(oldPortal);
- selectedPortal = null;
- $('#portaldetails').html('');
- if(isSmartphone()) {
- $('.fullimg').remove();
- $('#mobileinfo').html('');
- }
- clearPortalIndicators();
- $('.bkmrksStar').remove();
- }
- */
-
}
$('#toolbox').append(window.plugin.bookmarks.htmlCallSetBox+window.plugin.bookmarks.htmlCalldrawBox);
@@ -877,10 +955,24 @@
if(window.plugin.bookmarks.statusBox['page'] === 1) { $('#bookmarksBox h5.bkmrk_portals').trigger('click'); }
window.addHook('portalDetailsUpdated', window.plugin.bookmarks.addStarToSidebar);
+
+ // Sync
window.addHook('pluginBkmrksEdit', window.plugin.bookmarks.syncBkmrks);
window.addHook('iitcLoaded', window.plugin.bookmarks.registerFieldForSyncing);
+
+ // Highlighter - bookmarked portals
+ window.addHook('pluginBkmrksEdit', window.plugin.bookmarks.highlightRefresh);
+ window.addHook('pluginBkmrksSyncEnd', window.plugin.bookmarks.highlightRefresh);
+ window.addPortalHighlighter('Bookmarked Portals', window.plugin.bookmarks.highlight);
+
+ // Layer - Bookmarked portals
+ window.plugin.bookmarks.starLayerGroup = new L.LayerGroup();
+ window.addLayerGroup('Bookmarked Portals', window.plugin.bookmarks.starLayerGroup, false);
+ window.plugin.bookmarks.addAllStars();
+ window.addHook('pluginBkmrksEdit', window.plugin.bookmarks.editStar);
+ window.addHook('pluginBkmrksSyncEnd', window.plugin.bookmarks.resetAllStars);
}
// PLUGIN END //////////////////////////////////////////////////////////
-@@PLUGINEND@@
+@@PLUGINEND@@
\ No newline at end of file
diff --git a/plugins/bookmarks-css.css b/plugins/bookmarks-css.css
index fa4667ac..2fca0d09 100644
--- a/plugins/bookmarks-css.css
+++ b/plugins/bookmarks-css.css
@@ -223,7 +223,7 @@
display:none;
position:absolute;
top:0;
- left:250px;
+ left:277px;
width:47px;
margin-top:-36px;
height:64px;
@@ -243,7 +243,8 @@
width:auto;
}
#bkmrksTrigger, .bkmrksStar span{
- background-image:url(@@INCLUDEIMAGE:plugins/bookmarks-img.png@@);}
+ background-image:url(@@INCLUDEIMAGE:plugins/bookmarks-img.png@@);
+}
.bkmrksStar span{
display:inline-block;
float:left;
diff --git a/plugins/draw-tools.user.js b/plugins/draw-tools.user.js
index 2e14d70e..ef28b8f8 100644
--- a/plugins/draw-tools.user.js
+++ b/plugins/draw-tools.user.js
@@ -2,7 +2,7 @@
// @id iitc-plugin-draw-tools@breunigs
// @name IITC plugin: draw tools
// @category Layer
-// @version 0.5.2.@@DATETIMEVERSION@@
+// @version 0.5.3.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
diff --git a/plugins/player-tracker.user.js b/plugins/player-tracker.user.js
index 07520a1a..f79e382a 100644
--- a/plugins/player-tracker.user.js
+++ b/plugins/player-tracker.user.js
@@ -19,7 +19,7 @@
// PLUGIN START ////////////////////////////////////////////////////////
window.PLAYER_TRACKER_MAX_TIME = 3*60*60*1000; // in milliseconds
window.PLAYER_TRACKER_MIN_ZOOM = 9;
-
+window.PLAYER_TRACKER_MIN_OPACITY = 0.3;
window.PLAYER_TRACKER_LINE_COLOUR = '#FF00FD';
@@ -45,11 +45,18 @@ window.plugin.playerTracker.setup = function() {
iconRetinaUrl: iconResRetImage
}});
- plugin.playerTracker.drawnTraces = new L.LayerGroup();
- window.addLayerGroup('Player Tracker', plugin.playerTracker.drawnTraces, true);
+ plugin.playerTracker.drawnTracesEnl = new L.LayerGroup();
+ plugin.playerTracker.drawnTracesRes = new L.LayerGroup();
+ // to avoid any favouritism, we'll put the player's own faction layer first
+ if (PLAYER.team == 'RESISTANCE') {
+ window.addLayerGroup('Player Tracker Resistance', plugin.playerTracker.drawnTracesRes, true);
+ window.addLayerGroup('Player Tracker Enlightened', plugin.playerTracker.drawnTracesEnl, true);
+ } else {
+ window.addLayerGroup('Player Tracker Enlightened', plugin.playerTracker.drawnTracesEnl, true);
+ window.addLayerGroup('Player Tracker Resistance', plugin.playerTracker.drawnTracesRes, true);
+ }
map.on('layeradd',function(obj) {
- if(obj.layer === plugin.playerTracker.drawnTraces)
- {
+ if(obj.layer === plugin.playerTracker.drawnTracesEnl || obj.layer === plugin.playerTracker.drawnTracesRes) {
obj.layer.eachLayer(function(marker) {
if(marker._icon) window.setupTooltips($(marker._icon));
});
@@ -77,7 +84,8 @@ window.plugin.playerTracker.stored = {};
window.plugin.playerTracker.zoomListener = function() {
var ctrl = $('.leaflet-control-layers-selector + span:contains("Player Tracker")').parent();
if(window.map.getZoom() < window.PLAYER_TRACKER_MIN_ZOOM) {
- window.plugin.playerTracker.drawnTraces.clearLayers();
+ window.plugin.playerTracker.drawnTracesEnl.clearLayers();
+ window.plugin.playerTracker.drawnTracesRes.clearLayers();
ctrl.addClass('disabled').attr('title', 'Zoom in to show those.');
} else {
ctrl.removeClass('disabled').attr('title', '');
@@ -241,9 +249,10 @@ window.plugin.playerTracker.ago = function(time, now) {
window.plugin.playerTracker.drawData = function() {
var gllfe = plugin.playerTracker.getLatLngFromEvent;
- var layer = plugin.playerTracker.drawnTraces;
- var polyLineByAge = [[], [], [], []];
+ var polyLineByAgeEnl = [[], [], [], []];
+ var polyLineByAgeRes = [[], [], [], []];
+
var split = PLAYER_TRACKER_MAX_TIME / 4;
var now = new Date().getTime();
$.each(plugin.playerTracker.stored, function(pguid, playerData) {
@@ -259,7 +268,11 @@ window.plugin.playerTracker.drawData = function() {
var p = playerData.events[i];
var ageBucket = Math.min(parseInt((now - p.time) / split), 4-1);
var line = [gllfe(p), gllfe(playerData.events[i-1])];
- polyLineByAge[ageBucket].push(line);
+
+ if(playerData.team === 'RESISTANCE')
+ polyLineByAgeRes[ageBucket].push(line);
+ else
+ polyLineByAgeEnl[ageBucket].push(line);
}
// tooltip for marker
@@ -310,19 +323,23 @@ window.plugin.playerTracker.drawData = function() {
}
});
+ // marker opacity
+ var relOpacity = 1 - (now - last.time) / window.PLAYER_TRACKER_MAX_TIME
+ var absOpacity = window.PLAYER_TRACKER_MIN_OPACITY + (1 - window.PLAYER_TRACKER_MIN_OPACITY) * relOpacity;
+
// marker itself
var icon = playerData.team === 'RESISTANCE' ? new plugin.playerTracker.iconRes() : new plugin.playerTracker.iconEnl();
- var m = L.marker(gllfe(last), {title: title, icon: icon, referenceToPortal: closestPortal});
+ var m = L.marker(gllfe(last), {title: title, icon: icon, referenceToPortal: closestPortal, opacity: absOpacity});
// ensure tooltips are closed, sometimes they linger
m.on('mouseout', function() { $(this._icon).tooltip('close'); });
- m.addTo(layer);
+ m.addTo(playerData.team === 'RESISTANCE' ? plugin.playerTracker.drawnTracesRes : plugin.playerTracker.drawnTracesEnl);
plugin.playerTracker.oms.addMarker(m);
// jQueryUI doesn’t automatically notice the new markers
window.setupTooltips($(m._icon));
});
// draw the poly lines to the map
- $.each(polyLineByAge, function(i, polyLine) {
+ $.each(polyLineByAgeEnl, function(i, polyLine) {
if(polyLine.length === 0) return true;
var opts = {
@@ -333,7 +350,20 @@ window.plugin.playerTracker.drawData = function() {
dashArray: "5,8"
};
- L.multiPolyline(polyLine, opts).addTo(layer);
+ L.multiPolyline(polyLine, opts).addTo(plugin.playerTracker.drawnTracesEnl);
+ });
+ $.each(polyLineByAgeRes, function(i, polyLine) {
+ if(polyLine.length === 0) return true;
+
+ var opts = {
+ weight: 2-0.25*i,
+ color: PLAYER_TRACKER_LINE_COLOUR,
+ clickable: false,
+ opacity: 1-0.2*i,
+ dashArray: "5,8"
+ };
+
+ L.multiPolyline(polyLine, opts).addTo(plugin.playerTracker.drawnTracesRes);
});
}
@@ -343,11 +373,15 @@ window.plugin.playerTracker.handleData = function(data) {
plugin.playerTracker.discardOldData();
plugin.playerTracker.processNewData(data);
// remove old popups
- plugin.playerTracker.drawnTraces.eachLayer(function(layer) {
+ plugin.playerTracker.drawnTracesEnl.eachLayer(function(layer) {
+ if(layer._icon) $(layer._icon).tooltip('destroy');
+ });
+ plugin.playerTracker.drawnTracesRes.eachLayer(function(layer) {
if(layer._icon) $(layer._icon).tooltip('destroy');
});
plugin.playerTracker.oms.clearMarkers();
- plugin.playerTracker.drawnTraces.clearLayers();
+ plugin.playerTracker.drawnTracesEnl.clearLayers();
+ plugin.playerTracker.drawnTracesRes.clearLayers();
plugin.playerTracker.drawData();
}
diff --git a/plugins/portals-list.user.js b/plugins/portals-list.user.js
index ad9cc336..2f34d169 100644
--- a/plugins/portals-list.user.js
+++ b/plugins/portals-list.user.js
@@ -2,7 +2,7 @@
// @id iitc-plugin-portals-list@teo96
// @name IITC plugin: show list of portals
// @category Info
-// @version 0.0.16.@@DATETIMEVERSION@@
+// @version 0.0.17.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
@@ -146,7 +146,7 @@ window.plugin.portalslist.getPortals = function() {
}
}else { mods[ind] = ['', '', '']; }
});
- console.log(mods);
+
var APgain= getAttackApGain(d).enemyAp;
var thisPortal = {'portal': d,
'name': name,
@@ -442,7 +442,7 @@ var setup = function() {
'#portalslist .filterRes { margin-top: 10px; background-color: #005684 }' +
'#portalslist .filterEnl { margin-top: 10px; background-color: #017f01 }' +
'#portalslist .disclaimer { margin-top: 10px; font-size:10px; }' +
- '#portalslist .portalTitle { width: 160px !important; min-width: 160px !important; max-width: 160px !important; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }' +
+ '#portalslist .portalTitle { display: inline-block; width: 160px !important; min-width: 160px !important; max-width: 160px !important; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }' +
'');
}
diff --git a/plugins/show-address.user.js b/plugins/show-address.user.js
index ee1db13d..b4765ce5 100644
--- a/plugins/show-address.user.js
+++ b/plugins/show-address.user.js
@@ -39,7 +39,7 @@ var setup = function() {
$('head').append('');
}
diff --git a/plugins/show-less-portals-zoomed-out.user.js b/plugins/show-less-portals-zoomed-out.user.js
index c61f25bd..c701f7a7 100644
--- a/plugins/show-less-portals-zoomed-out.user.js
+++ b/plugins/show-less-portals-zoomed-out.user.js
@@ -2,11 +2,11 @@
// @id iitc-plugin-show-less-portals@jonatkins
// @name IITC plugin: Show less portals when zoomed out
// @category Tweaks
-// @version 0.1.3.@@DATETIMEVERSION@@
+// @version 0.1.4.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
-// @description [@@BUILDNAME@@-@@BUILDDATE@@] Decrease the portal detail level used when zoomed out. This can speed up map loading, decrease the amount of data used, and result in faster display. Only applies when zoomed out to show no closer than L3 portals. May stop display of the smaller links/fields.
+// @description [@@BUILDNAME@@-@@BUILDDATE@@] Decrease the portal detail level used when zoomed out. This can speed up map loading, decrease the amount of data used, and solve excessive request issues. Only applies when zoomed out to show no closer than L3 portals. May stop display of the smaller links/fields.
// @include https://www.ingress.com/intel*
// @include http://www.ingress.com/intel*
// @match https://www.ingress.com/intel*
@@ -32,23 +32,21 @@ window.plugin.showLessPortals.setup = function() {
window.getPortalDataZoom = function() {
var mapZoom = map.getZoom();
- // this plugin only cares about close in zoom levels (zoom 13 and higher) - run the original
- // code when this isn't the case. (this way, multiple zoom-modifying plugins can exist at once - in theory)
- if (mapZoom >= 13) {
- return origGetPortalDataZoom();
+ // the latest intel site update, as of 2013-10-16, requests a silly number of map tiles at the larger zoom levels
+ // IITC matches the behaviour by default, but it makes sense to reduce the detail level sooner
+
+ // at the largest scale zooms - move back two levels
+ if (mapZoom <= 7) {
+ return Math.max(mapZoom-2,0);
}
- // make sure we're dealing with an integer here
- // (mobile: a float somehow gets through in some cases!)
- var z = parseInt(mapZoom);
+ // intermediate zoom levels - move back one
+ if (mapZoom <= 11) {
+ return Math.max(mapZoom-1,0);
+ }
- // reduce the portal zoom level by one
- z -= 1;
-
- // ensure we're not too far out
- if (z < 0) z=0;
-
- return z;
+ // otherwise revert to default behaviour
+ return origGetPortalDataZoom();
}
diff --git a/plugins/show-linked-portals.user.js b/plugins/show-linked-portals.user.js
index fe573bf4..2c82409f 100644
--- a/plugins/show-linked-portals.user.js
+++ b/plugins/show-linked-portals.user.js
@@ -130,7 +130,7 @@ var setup = function () {
'.showLinkedPortalLink2,.showLinkedPortalLink6,.showLinkedPortalLink10,.showLinkedPortalLink14 {top: 69px; }' +
'.showLinkedPortalLink3,.showLinkedPortalLink7,.showLinkedPortalLink11,.showLinkedPortalLink15 {top: 113px; }' +
'.showLinkedPortalLink4,.showLinkedPortalLink8,.showLinkedPortalLink12,.showLinkedPortalLink16 {top: 157px; }' +
- '#level{text-align:center; margin-right: 0px;}' +
+ '#level{text-align: center; margin-right: -0.5em; position: relative; right: 50%; width: 1em;}' +
'');
window.plugin.showLinkedPortal.setupCallback();
}
diff --git a/plugins/show-more-portals.user.js b/plugins/show-more-portals.user.js
index 0721cbbd..e119affb 100644
--- a/plugins/show-more-portals.user.js
+++ b/plugins/show-more-portals.user.js
@@ -2,11 +2,11 @@
// @id iitc-plugin-show-more-portals@jonatkins
// @name IITC plugin: Show more portals
// @category Tweaks
-// @version 0.1.4.@@DATETIMEVERSION@@
+// @version 0.1.5.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
-// @description [@@BUILDNAME@@-@@BUILDDATE@@] Boost the detail level of portals shown on the map by one zoom level when zoomed in close (L2+ portals or closer)
+// @description [@@BUILDNAME@@-@@BUILDDATE@@] Boost the detail level of portals shown so that unclaimed portals are visible when normally L1+ portals would be shown, and L2+ are visible when normally L3+ are shown
// @include https://www.ingress.com/intel*
// @include http://www.ingress.com/intel*
// @match https://www.ingress.com/intel*
@@ -32,36 +32,22 @@ window.plugin.showMorePortals.setup = function() {
window.getPortalDataZoom = function() {
var mapZoom = map.getZoom();
- // this plugin only cares about close in zoom levels (zoom 12 and higher) - run the original
- // code when this isn't the case. (this way, multiple zoom-modifying plugins can exist at once - in theory)
- if (mapZoom < 12) {
- return origGetPortalDataZoom();
+ // as of 2013-10-16...
+
+ // the stock site uses the same tile size for both L1+ portals and all portals
+ // therefore, changing the L1+ zoom levels into all portals zoom level is not unfriendly to the servers
+ // (in some ways it's nicer, as IITC caches better)
+ if (mapZoom >= 15) {
+ return 17;
}
- // make sure we're dealing with an integer here
- // (mobile: a float somehow gets through in some cases!)
- var z = parseInt(mapZoom);
-
- // boost data zoom level by one
- z += 1;
-
- // not recommended on anything other than the very smallest of screens
-// // show unclaimed portals at an additional zoom level further than by default
-// if (mapZoom >= 15) z += 1;
-
-
- // limiting the mazimum zoom level for data retrieval reduces the number of requests at high zoom levels
- // (as all portal data is retrieved at z=17, why retrieve multiple z=18 tiles when fewer z=17 would do?)
- // very effective along with the new cache code
- if (z > 17) z=17;
-
- // if the data zoom is above the map zoom we can step back if the detail level is the same
- // with the new cache code this works rather well
- while (z > mapZoom && getMinPortalLevelForZoom(z) == getMinPortalLevelForZoom(z-1)) {
- z = z-1;
+ // and, the same scale for L2+ and L3+ portals. again, forcing the level down isn't unfriendly to the servers
+ // (ditto on the cacheing)
+ if (mapZoom >= 12) {
+ return 13;
}
- return z;
+ return origGetPortalDataZoom();
}
diff --git a/plugins/zaprange.user.js b/plugins/zaprange.user.js
index 8f72383b..6057aef5 100644
--- a/plugins/zaprange.user.js
+++ b/plugins/zaprange.user.js
@@ -102,8 +102,14 @@
window.plugin.zaprange.zapLayerEnlHolderGroup.addLayer(window.plugin.zaprange.zapCircleEnlHolderGroup);
window.plugin.zaprange.zapLayerResHolderGroup.addLayer(window.plugin.zaprange.zapCircleResHolderGroup);
- window.addLayerGroup('Zaprange Enlightened', window.plugin.zaprange.zapLayerEnlHolderGroup, true);
- window.addLayerGroup('Zaprange Resistance', window.plugin.zaprange.zapLayerResHolderGroup, true);
+ // to avoid any favouritism, we'll put the player's own faction layer first
+ if (PLAYER.team == 'RESISTANCE') {
+ window.addLayerGroup('Zaprange Resistance', window.plugin.zaprange.zapLayerResHolderGroup, true);
+ window.addLayerGroup('Zaprange Enlightened', window.plugin.zaprange.zapLayerEnlHolderGroup, true);
+ } else {
+ window.addLayerGroup('Zaprange Enlightened', window.plugin.zaprange.zapLayerEnlHolderGroup, true);
+ window.addLayerGroup('Zaprange Resistance', window.plugin.zaprange.zapLayerResHolderGroup, true);
+ }
window.addHook('portalAdded', window.plugin.zaprange.portalAdded);
diff --git a/style.css b/style.css
index 3b886151..a368573e 100644
--- a/style.css
+++ b/style.css
@@ -471,6 +471,12 @@ input {
margin-bottom: 2px;
cursor: pointer;
}
+
+.search_not_found{
+ color:red;
+ font-style: italic;
+}
+
::-webkit-input-placeholder {
font-style: italic;
}
@@ -510,6 +516,7 @@ h3 {
background-size: contain;
cursor: help;
overflow: hidden;
+ position: relative;
}
.imgpreview img.hide {
@@ -526,6 +533,7 @@ h3 {
display: block;
margin-right: 15px;
text-align:right;
+ float: right;
}
/* portal mods */
@@ -969,3 +977,8 @@ td + td {
.portal_details tr.padding-top th, .portal_details tr.padding-top td {
padding-top: 0.7em;
}
+
+#play_button {
+ display: none;
+}
+
diff --git a/website/page/home.php b/website/page/home.php
index 768a5b5b..452161e2 100644
--- a/website/page/home.php
+++ b/website/page/home.php
@@ -13,50 +13,12 @@ offers many more features. It is available for
Latest news
-1st October 2013
+16th October 2013
-IITC 0.14.2 and IITC Mobile 0.7.1 have been released. This is a critical update required to work with changes made
-to the standard intel site. Additionally, a major update to the mobile app interface has been made, and a handful
-of tweaks and bugfixes to IITC and a few plugins.
+IITC 0.14.3 and IITC MObile 0.7.4 have just been released. This is a critical update required to work with the latest
+changes Niantic have made to the standard intel site. Additionally, the draw-tools plugin now snaps points to portals
+when creating lines/polygons/markers (was actually in 0.14.2 release), a bugfix relating to IITC not realising who
+'you' are, causing some highlighters to break, and a handful of other tweaks/bugfixes.
-
-The standard intel site now includes an 'alerts' chat tab. This will be coming to IITC in the future, but it's
-better to get this working version released without it than hold things up just for that.
-
-
-22nd September 2013
-
-Update: IITC Mobile 0.6.5 replaces 0.6.4. This fixes a crash on entering plugin preferences on some tablets.
-
-
-IITC 0.14.1 and IITC Mobile 0.6.4 have been released. Changes in this version include:
-
-- Better performance when a very large number of portals are within view (country/continent level)
-- Add layer chooser options to hide resistance/enlightened portals/links/fields
-- Chat tab now remembers which was active when reloading IITC
-- Fix some shorter links not showing on the map
-- Add details of hack information (number/cooldown time, taking account of mods) and mitigation (from shields and links)
-to the portal information panel
-- Mobile
-
- - increase the size of various links on the info page to make them easier to tap
- - move the highlight selection dropdown to the native android app bar at the top
-
-
-And plugins:
-
-- Major update to bookmarks-by-zaso, including sync support
-- New features added to the resonators plugin
-- max-links plugin - start of rename to 'tidy links' - as this is a better description of what it does
-- show-linked-portals - indicate which are incoming/outgoing links in the tooltip
-- New Plugins
-
- - show-link-direction, to indicate visually which portal a link was created from
- - highlighter for portal mitigation - to show strength of defence from shields and links at a glance
-
-
-And, as always, numerous other bug fixes, tweaks and improvements.
-
-
Older news
diff --git a/website/page/news.php b/website/page/news.php
index 9cecae84..2a827ee9 100644
--- a/website/page/news.php
+++ b/website/page/news.php
@@ -1,5 +1,13 @@
News
+16th October 2013
+
+IITC 0.14.3 and IITC MObile 0.7.4 have just been released. This is a critical update required to work with the latest
+changes Niantic have made to the standard intel site. Additionally, the draw-tools plugin now snaps points to portals
+when creating lines/polygons/markers (was actually in 0.14.2 release), a bugfix relating to IITC not realising who
+'you' are, causing some highlighters to break, and a handful of other tweaks/bugfixes.
+
+
1st October 2013
IITC 0.14.2 and IITC Mobile 0.7.1 have been released. This is a critical update required to work with changes made
diff --git a/website/versioncheck/index.php b/website/versioncheck/index.php
new file mode 100644
index 00000000..831e199f
--- /dev/null
+++ b/website/versioncheck/index.php
@@ -0,0 +1,135 @@
+ Array ( # live release
+ 'path' => 'release',
+ 'name' => 'Stable release build',
+ ),
+ 'jonatkins-test' => Array ( # public test builds
+ 'path' => 'test',
+ 'name' => 'Test build',
+ ),
+
+ 'jonatkins-experimental' => Array ( # rarely used, for features not quite ready for 'test'
+ 'path' => 'experimental',
+ 'name' => 'Experimental build',
+ ),
+
+ 'jonatkins-dev' => Array ( # personal
+ 'path' => 'dev',
+ 'name' => 'Development builds - not for public use',
+ ),
+
+ 'local' => Array ( # not a real build, but often the default for local development
+ 'path' => NULL,
+ 'name' => 'Local build - no update check available',
+ ),
+);
+
+if ( array_key_exists ( $build, $details ) )
+{
+ $info = $details[$build];
+
+ $response['buildPath'] = $info['path'];
+ $response['name'] = $info['name'];
+
+
+}
+else
+{
+ $response['error'] = 'Unsupported build for version check';
+}
+
+
+$data = json_encode ( $response );
+$data = indent($data);
+
+
+# send the response - allow either jsonp (using a 'callback' parameter), or regular json
+if ( array_key_exists ( 'callback', $_GET ) )
+{
+ header('Content-Type: text/javascript; charset=utf8');
+ header('Access-Control-Allow-Origin: *');
+ header('Access-Control-Max-Age: 3628800');
+ header('Access-Control-Allow-Methods: GET, POST');
+
+ $callback = $_GET['callback'];
+ echo $callback.'('.$data.');';
+
+}
+else
+{
+ // normal JSON string
+ header('Content-Type: application/json; charset=utf8');
+
+ echo $data;
+}
+
+
+// http://www.daveperrett.com/articles/2008/03/11/format-json-with-php/
+/**
+ * Indents a flat JSON string to make it more human-readable.
+ *
+ * @param string $json The original JSON string to process.
+ *
+ * @return string Indented version of the original JSON string.
+ */
+function indent($json) {
+
+ $result = '';
+ $pos = 0;
+ $strLen = strlen($json);
+ $indentStr = ' ';
+ $newLine = "\n";
+ $prevChar = '';
+ $outOfQuotes = true;
+
+ for ($i=0; $i<=$strLen; $i++) {
+
+ // Grab the next character in the string.
+ $char = substr($json, $i, 1);
+
+ // Are we inside a quoted string?
+ if ($char == '"' && $prevChar != '\\') {
+ $outOfQuotes = !$outOfQuotes;
+
+ // If this character is the end of an element,
+ // output a new line and indent the next line.
+ } else if(($char == '}' || $char == ']') && $outOfQuotes) {
+ $result .= $newLine;
+ $pos --;
+ for ($j=0; $j<$pos; $j++) {
+ $result .= $indentStr;
+ }
+ }
+
+ // Add the character to the result string.
+ $result .= $char;
+
+ // If the last character was the beginning of an element,
+ // output a new line and indent the next line.
+ if (($char == ',' || $char == '{' || $char == '[') && $outOfQuotes) {
+ $result .= $newLine;
+ if ($char == '{' || $char == '[') {
+ $pos ++;
+ }
+
+ for ($j = 0; $j < $pos; $j++) {
+ $result .= $indentStr;
+ }
+ }
+
+ $prevChar = $char;
+ }
+
+ return $result;
+}
+
+?>