diff --git a/code/boot.js b/code/boot.js index 73d8cbda..2e5f2ecc 100644 --- a/code/boot.js +++ b/code/boot.js @@ -119,11 +119,8 @@ window.setupMap = function() { //their usage policy has no limits (except required notification above 4000 tiles/sec - we're perhaps at 50 tiles/sec based on CloudMade stats) var mqSubdomains = [ 'otile1','otile2', 'otile3', 'otile4' ]; var mqTileUrlPrefix = window.location.protocol !== 'https:' ? 'http://{s}.mqcdn.com' : 'https://{s}-s.mqcdn.com'; - var mqMapOpt = {attribution: osmAttribution+', Tiles Courtesy of MapQuest', maxZoom: 18, subdomains: mqSubdomains}; + var mqMapOpt = {attribution: osmAttribution+', Tiles Courtesy of MapQuest', maxNativeZoom: 18, maxZoom: 21, subdomains: mqSubdomains}; var mqMap = new L.TileLayer(mqTileUrlPrefix+'/tiles/1.0.0/map/{z}/{x}/{y}.jpg',mqMapOpt); - //MapQuest satellite coverage outside of the US is rather limited - so not really worth having as we have google as an option - //var mqSatOpt = {attribution: 'Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency', maxZoom: 18, subdomains: mqSubdomains}; - //var mqSat = new L.TileLayer('http://{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg',mqSatOpt); var ingressGMapOptions = { backgroundColor: '#0e3d4e', //or #dddddd ? - that's the Google tile layer default @@ -140,10 +137,10 @@ window.setupMap = function() { var views = [ /*0*/ mqMap, - /*1*/ new L.Google('ROADMAP',{maxZoom:20, mapOptions:ingressGMapOptions}), - /*2*/ new L.Google('ROADMAP',{maxZoom:20}), - /*3*/ new L.Google('SATELLITE',{maxZoom:20}), - /*4*/ new L.Google('HYBRID',{maxZoom:20}), + /*1*/ new L.Google('ROADMAP',{maxZoom:21, mapOptions:ingressGMapOptions}), + /*2*/ new L.Google('ROADMAP',{maxZoom:21}), + /*3*/ new L.Google('SATELLITE',{maxZoom:21}), + /*4*/ new L.Google('HYBRID',{maxZoom:21}), /*5*/ new L.Google('TERRAIN',{maxZoom:15}) ]; diff --git a/plugins/basemap-bing.user.js b/plugins/basemap-bing.user.js index 52944b49..49d41333 100644 --- a/plugins/basemap-bing.user.js +++ b/plugins/basemap-bing.user.js @@ -2,7 +2,7 @@ // @id iitc-plugin-bing-maps // @name IITC plugin: Bing maps // @category Map Tiles -// @version 0.1.2.@@DATETIMEVERSION@@ +// @version 0.1.3.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ @@ -27,7 +27,7 @@ window.plugin.mapBing.setupBingLeaflet = function() { window.plugin.mapBing.setup = function() { window.plugin.mapBing.setupBingLeaflet(); - + //set this to your API key var bingApiKey = 'ArR2hTa2C9cRQZT-RmgrDkfvh3PwEVRl0gB34OO4wJI7vQNElg3DDWvbo5lfUs3p'; @@ -59,7 +59,7 @@ window.plugin.mapBing.setup = function() { if (bingMapContainers[type].getLayers().length == 0) { // dummy layer group is empty - create the bing layer console.log('basemap-bing: creating '+type+' layer'); - var bingMap = new L.BingLayer (bingApiKey, {type: type, maxZoom:20}); + var bingMap = new L.BingLayer (bingApiKey, {type: type, maxNativeZoom: 19, maxZoom: 21}); bingMapContainers[type].addLayer(bingMap); } } diff --git a/plugins/basemap-blank.user.js b/plugins/basemap-blank.user.js index 9ff99ac3..a505e611 100644 --- a/plugins/basemap-blank.user.js +++ b/plugins/basemap-blank.user.js @@ -2,7 +2,7 @@ // @id iitc-plugin-basemap-blank@jonatkins // @name IITC plugin: Blank map // @category Map Tiles -// @version 0.1.1.@@DATETIMEVERSION@@ +// @version 0.1.2.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ @@ -24,7 +24,7 @@ window.plugin.mapTileBlank = function() {}; window.plugin.mapTileBlank.addLayer = function() { - var blankOpt = {attribution: '', maxZoom: 20}; + var blankOpt = {attribution: '', maxNativeZoom: 18, maxZoom: 21}; var blankWhite = new L.TileLayer('@@INCLUDEIMAGE:images/basemap-blank-tile-white.png@@', blankOpt); var blankBlack = new L.TileLayer('@@INCLUDEIMAGE:images/basemap-blank-tile-black.png@@', blankOpt); diff --git a/plugins/basemap-gmaps-gray.user.js b/plugins/basemap-gmaps-gray.user.js index 73c73fdf..26040501 100644 --- a/plugins/basemap-gmaps-gray.user.js +++ b/plugins/basemap-gmaps-gray.user.js @@ -2,7 +2,7 @@ // @id iitc-plugin-basemap-gmaps-gray@jacob1123 // @name IITC plugin: Gray Google Roads // @category Map Tiles -// @version 0.1.1.@@DATETIMEVERSION@@ +// @version 0.1.2.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ @@ -37,7 +37,7 @@ window.plugin.grayGMaps.addLayer = function() { ] }; - var grayGMaps = new L.Google('ROA#DMAP',{maxZoom:20, mapOptions: grayGMapsOptions}); + var grayGMaps = new L.Google('ROA#DMAP',{maxZoom:21, mapOptions: grayGMapsOptions}); layerChooser.addBaseLayer(grayGMaps, "Google Gray"); }; diff --git a/plugins/basemap-mapquest-open-aerial.user.js b/plugins/basemap-mapquest-open-aerial.user.js index 776b93d7..3f588a39 100644 --- a/plugins/basemap-mapquest-open-aerial.user.js +++ b/plugins/basemap-mapquest-open-aerial.user.js @@ -2,7 +2,7 @@ // @id iitc-plugin-basemap-mapquest-open-aerial@jonatkins // @name IITC plugin: MapQuest Open Satellite view (US Only) // @category Map Tiles -// @version 0.1.0.@@DATETIMEVERSION@@ +// @version 0.1.1.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ @@ -27,7 +27,7 @@ window.plugin.mapTileMapQuestSat.addLayer = function() { var mqSubdomains = [ 'otile1','otile2', 'otile3', 'otile4' ]; var mqTileUrlPrefix = window.location.protocol !== 'https:' ? 'http://{s}.mqcdn.com' : 'https://{s}-s.mqcdn.com'; //MapQuest satellite coverage outside of the US is rather limited - so not really worth having as we have google as an op! - var mqSatOpt = {attribution: 'Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency', maxZoom: 18, subdomains: mqSubdomains}; + var mqSatOpt = {attribution: 'Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency', maxNativeZoom: 18, maxZoom: 21, subdomains: mqSubdomains}; var mqSat = new L.TileLayer('http://{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg',mqSatOpt); layerChooser.addBaseLayer(mqSat, "MapQuest Open Satellite"); diff --git a/plugins/basemap-nokia-ovi.user.js b/plugins/basemap-nokia-ovi.user.js index 1cd75205..77ffb6df 100644 --- a/plugins/basemap-nokia-ovi.user.js +++ b/plugins/basemap-nokia-ovi.user.js @@ -2,7 +2,7 @@ // @id iitc-plugin-nokia-ovi-maps // @name IITC plugin: Nokia OVI maps // @category Map Tiles -// @version 0.1.1.@@DATETIMEVERSION@@ +// @version 0.1.2.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ @@ -31,7 +31,7 @@ window.plugin.mapNokiaOvi.setup = function() { }; - var oviOpt = {attribution: 'Imagery © Nokia OVI', maxZoom: 20}; + var oviOpt = {attribution: 'Imagery © Nokia OVI', maxNativeZoom: 20, maxZoom: 21}; $.each(oviStyles, function(style,data) { oviOpt['style'] = style; diff --git a/plugins/basemap-opencyclemap.user.js b/plugins/basemap-opencyclemap.user.js index 5ba1175b..58ff0e1f 100644 --- a/plugins/basemap-opencyclemap.user.js +++ b/plugins/basemap-opencyclemap.user.js @@ -2,7 +2,7 @@ // @id iitc-plugin-basemap-opencyclepam@jonatkins // @name IITC plugin: OpenCycleMap.org map tiles // @category Map Tiles -// @version 0.1.0.@@DATETIMEVERSION@@ +// @version 0.1.1.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ @@ -27,7 +27,7 @@ window.plugin.mapTileOpenCycleMap.addLayer = function() { //the Thunderforest (OpenCycleMap) tiles are free to use - http://www.thunderforest.com/terms/ osmAttribution = 'Map data © OpenStreetMap'; - var ocmOpt = {attribution: 'Tiles © OpenCycleMap, '+osmAttribution, maxZoom: 18}; + var ocmOpt = {attribution: 'Tiles © OpenCycleMap, '+osmAttribution, maxNativeZoom: 18, maxZoom: 21}; var ocmCycle = new L.TileLayer('http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png', ocmOpt); var ocmTransport = new L.TileLayer('http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png', ocmOpt); var ocmLandscape = new L.TileLayer('http://{s}.tile3.opencyclemap.org/landscape/{z}/{x}/{y}.png', ocmOpt); diff --git a/plugins/basemap-openstreetmap.user.js b/plugins/basemap-openstreetmap.user.js index a0661e2f..f7610e01 100644 --- a/plugins/basemap-openstreetmap.user.js +++ b/plugins/basemap-openstreetmap.user.js @@ -2,7 +2,7 @@ // @id iitc-plugin-basemap-openstreetpam@jonatkins // @name IITC plugin: OpenStreetMap.org map tiles // @category Map Tiles -// @version 0.1.0.@@DATETIMEVERSION@@ +// @version 0.1.1.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ @@ -28,7 +28,7 @@ window.plugin.mapTileOpenStreetMap.addLayer = function() { // "Heavy use (e.g. distributing an app that uses tiles from openstreetmap.org) is forbidden without prior permission from the System Administrators" osmAttribution = 'Map data © OpenStreetMap contributors'; - var osmOpt = {attribution: osmAttribution, maxZoom: 18}; + var osmOpt = {attribution: osmAttribution, maxNativeZoom: 18, maxZoom: 21}; var osm = new L.TileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', osmOpt); layerChooser.addBaseLayer(osm, "OpenStreetMap"); diff --git a/plugins/basemap-stamen.user.js b/plugins/basemap-stamen.user.js index a9520f84..d1e38475 100644 --- a/plugins/basemap-stamen.user.js +++ b/plugins/basemap-stamen.user.js @@ -52,7 +52,8 @@ window.plugin.mapTileStamen.addLayer = function() { layer: layer, type: type, minZoom: minZoom, - maxZoom: maxZoom + maxNativeZoom: maxZoom, + maxZoom: 21 }); layerChooser.addBaseLayer(mapLayer,'Stamen '+name);