Merge branch 'master' into highlighter
This commit is contained in:
12
code/boot.js
12
code/boot.js
@ -119,7 +119,7 @@ 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', mazZoom: 18, detectRetena: true, subdomains: mqSubdomains};
|
||||
var mqMapOpt = {attribution: osmAttribution+', Tiles Courtesy of MapQuest', maxZoom: 18, detectRetena: true, 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', mazZoom: 18, detectRetena: true, subdomains: mqSubdomains};
|
||||
@ -127,10 +127,11 @@ window.setupMap = function() {
|
||||
|
||||
var views = [
|
||||
/*0*/ mqMap,
|
||||
/*1*/ new L.Google('INGRESS'),
|
||||
/*2*/ new L.Google('ROADMAP'),
|
||||
/*1*/ new L.Google('INGRESS',{maxZoom:20}),
|
||||
/*2*/ new L.Google('ROADMAP',{maxZoom:20}),
|
||||
/*3*/ new L.Google('SATELLITE',{maxZoom:20}),
|
||||
/*4*/ new L.Google('HYBRID',{maxZoom:20})
|
||||
/*4*/ new L.Google('HYBRID',{maxZoom:20}),
|
||||
/*5*/ new L.Google('TERRAIN',{maxZoom:15})
|
||||
];
|
||||
|
||||
|
||||
@ -161,7 +162,8 @@ window.setupMap = function() {
|
||||
'Default Ingress Map': views[1],
|
||||
'Google Roads': views[2],
|
||||
'Google Satellite': views[3],
|
||||
'Google Hybrid': views[4]
|
||||
'Google Hybrid': views[4],
|
||||
'Google Terrain': views[5]
|
||||
}, addLayers);
|
||||
|
||||
map.addControl(window.layerChooser);
|
||||
|
@ -136,7 +136,7 @@ window.showPortalPosLinks = function(lat, lng, name) {
|
||||
portal_name = encodeURIComponent(' (' + name + ')');
|
||||
}
|
||||
if (typeof android !== 'undefined' && android && android.intentPosLink) {
|
||||
android.intentPosLink(window.location.protocol + '//maps.google.com/?q='+lat+','+lng);
|
||||
android.intentPosLink(lat, lng, portal_name);
|
||||
} else {
|
||||
var qrcode = '<div id="qrcode"></div>';
|
||||
var script = '<script>$(\'#qrcode\').qrcode({text:\'GEO:'+lat+','+lng+'\'});</script>';
|
||||
@ -232,6 +232,7 @@ window.getTypeByGuid = function(guid) {
|
||||
// portals end in “.11” or “.12“, links in “.9", fields in “.b”
|
||||
// .11 == portals
|
||||
// .12 == portals
|
||||
// .16 == portals
|
||||
// .9 == links
|
||||
// .b == fields
|
||||
// .c == player/creator
|
||||
@ -245,6 +246,7 @@ window.getTypeByGuid = function(guid) {
|
||||
switch(guid.slice(33)) {
|
||||
case '11':
|
||||
case '12':
|
||||
case '16':
|
||||
return TYPE_PORTAL;
|
||||
|
||||
case '9':
|
||||
|
Reference in New Issue
Block a user