Remove debug console logging from js
This caused problems on browsers that didn't know what to do with the 'console' object (like IE, and older versions of Firefox)
This commit is contained in:
@@ -239,7 +239,7 @@ overviewer.util = {
|
|||||||
|
|
||||||
var zoomLevels = model.get("zoomLevels");
|
var zoomLevels = model.get("zoomLevels");
|
||||||
var north_direction = model.get('north_direction');
|
var north_direction = model.get('north_direction');
|
||||||
console.log("fromWorldToLatLng: north_direction is %r", north_direction);
|
//console.log("fromWorldToLatLng: north_direction is %r", north_direction);
|
||||||
|
|
||||||
// the width and height of all the highest-zoom tiles combined,
|
// the width and height of all the highest-zoom tiles combined,
|
||||||
// inverted
|
// inverted
|
||||||
@@ -404,7 +404,7 @@ overviewer.util = {
|
|||||||
// save this info is a nice easy to parse format
|
// save this info is a nice easy to parse format
|
||||||
var currentWorldView = overviewer.mapModel.get("currentWorldView");
|
var currentWorldView = overviewer.mapModel.get("currentWorldView");
|
||||||
currentWorldView.options.lastViewport = [x,y,z,zoom];
|
currentWorldView.options.lastViewport = [x,y,z,zoom];
|
||||||
console.log("Updated lastViewport: %r" , [x,y,z,zoom]);
|
//console.log("Updated lastViewport: %r" , [x,y,z,zoom]);
|
||||||
window.location.replace("#/" + Math.floor(x) + "/" + Math.floor(y) + "/" + Math.floor(z) + "/" + zoom + "/" + w + "/" + maptype);
|
window.location.replace("#/" + Math.floor(x) + "/" + Math.floor(y) + "/" + Math.floor(z) + "/" + zoom + "/" + w + "/" + maptype);
|
||||||
},
|
},
|
||||||
'updateHash': function() {
|
'updateHash': function() {
|
||||||
|
|||||||
@@ -3,13 +3,13 @@ overviewer.views= {}
|
|||||||
|
|
||||||
overviewer.views.WorldView = Backbone.View.extend({
|
overviewer.views.WorldView = Backbone.View.extend({
|
||||||
initialize: function(opts) {
|
initialize: function(opts) {
|
||||||
console.log("WorldView::initialize()");
|
//console.log("WorldView::initialize()");
|
||||||
console.log(this.model.get("tileSets"));
|
//console.log(this.model.get("tileSets"));
|
||||||
this.options.mapTypes = [];
|
this.options.mapTypes = [];
|
||||||
this.options.mapTypeIds = [];
|
this.options.mapTypeIds = [];
|
||||||
this.model.get("tileSets").each(function(tset, index, list) {
|
this.model.get("tileSets").each(function(tset, index, list) {
|
||||||
console.log(" eaching");
|
//console.log(" eaching");
|
||||||
console.log(" Working on tileset %s" , tset.get("name"));
|
//console.log(" Working on tileset %s" , tset.get("name"));
|
||||||
var ops = {
|
var ops = {
|
||||||
getTileUrl: overviewer.gmap.getTileUrlGenerator(tset.get("path"), tset.get("base"), tset.get("imgextension")),
|
getTileUrl: overviewer.gmap.getTileUrlGenerator(tset.get("path"), tset.get("base"), tset.get("imgextension")),
|
||||||
'tileSize': new google.maps.Size(
|
'tileSize': new google.maps.Size(
|
||||||
@@ -55,7 +55,7 @@ overviewer.views.WorldSelectorView = Backbone.View.extend({
|
|||||||
"change select": "changeWorld"
|
"change select": "changeWorld"
|
||||||
},
|
},
|
||||||
changeWorld: function() {
|
changeWorld: function() {
|
||||||
console.log("change world!");
|
//console.log("change world!");
|
||||||
var selectObj = this.$("select")[0];
|
var selectObj = this.$("select")[0];
|
||||||
var selectedOption = selectObj.options[selectObj.selectedIndex];
|
var selectedOption = selectObj.options[selectObj.selectedIndex];
|
||||||
|
|
||||||
@@ -63,7 +63,7 @@ overviewer.views.WorldSelectorView = Backbone.View.extend({
|
|||||||
//
|
//
|
||||||
},
|
},
|
||||||
render: function(t) {
|
render: function(t) {
|
||||||
console.log("WorldSelectorView::render() TODO implement this (low priority)");
|
//console.log("WorldSelectorView::render() TODO implement this (low priority)");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -118,11 +118,11 @@ overviewer.views.CoordboxView = Backbone.View.extend({
|
|||||||
|
|
||||||
overviewer.views.GoogleMapView = Backbone.View.extend({
|
overviewer.views.GoogleMapView = Backbone.View.extend({
|
||||||
initialize: function(opts) {
|
initialize: function(opts) {
|
||||||
console.log(this);
|
//console.log(this);
|
||||||
this.options.map = null;
|
this.options.map = null;
|
||||||
var curWorld = this.model.get("currentWorldView").model;
|
var curWorld = this.model.get("currentWorldView").model;
|
||||||
console.log("Current world:");
|
//console.log("Current world:");
|
||||||
console.log(curWorld);
|
//console.log(curWorld);
|
||||||
|
|
||||||
var curTset = curWorld.get("tileSets").at(0);
|
var curTset = curWorld.get("tileSets").at(0);
|
||||||
|
|
||||||
@@ -144,9 +144,9 @@ overviewer.views.GoogleMapView = Backbone.View.extend({
|
|||||||
var mapOptions = {};
|
var mapOptions = {};
|
||||||
//
|
//
|
||||||
curWorld.get("tileSets").each(function(elem, index, list) {
|
curWorld.get("tileSets").each(function(elem, index, list) {
|
||||||
console.log("Setting up map for:");
|
//console.log("Setting up map for:");
|
||||||
console.log(elem);
|
//console.log(elem);
|
||||||
console.log("for %s generating url func with %s and %s", elem.get("name"), elem.get("path"), elem.get("base"));
|
//console.log("for %s generating url func with %s and %s", elem.get("name"), elem.get("path"), elem.get("base"));
|
||||||
|
|
||||||
});
|
});
|
||||||
// init the map with some default options. use the first tileset in the first world
|
// init the map with some default options. use the first tileset in the first world
|
||||||
@@ -172,7 +172,7 @@ overviewer.views.GoogleMapView = Backbone.View.extend({
|
|||||||
// register every ImageMapType with the map
|
// register every ImageMapType with the map
|
||||||
$.each(overviewer.collections.worldViews, function( index, worldView) {
|
$.each(overviewer.collections.worldViews, function( index, worldView) {
|
||||||
$.each(worldView.options.mapTypes, function(i_index, maptype) {
|
$.each(worldView.options.mapTypes, function(i_index, maptype) {
|
||||||
console.log("registered %s with the maptype registery", worldView.model.get("name") + maptype.shortname);
|
//console.log("registered %s with the maptype registery", worldView.model.get("name") + maptype.shortname);
|
||||||
overviewer.map.mapTypes.set(overviewerConfig.CONST.mapDivId +
|
overviewer.map.mapTypes.set(overviewerConfig.CONST.mapDivId +
|
||||||
worldView.model.get("name") + maptype.shortname , maptype);
|
worldView.model.get("name") + maptype.shortname , maptype);
|
||||||
});
|
});
|
||||||
@@ -183,7 +183,7 @@ overviewer.views.GoogleMapView = Backbone.View.extend({
|
|||||||
* Should be called when the current world has changed in GoogleMapModel
|
* Should be called when the current world has changed in GoogleMapModel
|
||||||
*/
|
*/
|
||||||
render: function() {
|
render: function() {
|
||||||
console.log("GoogleMapView::render()");
|
//console.log("GoogleMapView::render()");
|
||||||
var view = this.model.get("currentWorldView");
|
var view = this.model.get("currentWorldView");
|
||||||
this.options.mapOptions.mapTypeControlOptions = {
|
this.options.mapOptions.mapTypeControlOptions = {
|
||||||
mapTypeIds: view.options.mapTypeIds};
|
mapTypeIds: view.options.mapTypeIds};
|
||||||
@@ -198,14 +198,14 @@ overviewer.views.GoogleMapView = Backbone.View.extend({
|
|||||||
* Keeps track of the currently visible tileset
|
* Keeps track of the currently visible tileset
|
||||||
*/
|
*/
|
||||||
updateCurrentTileset: function() {
|
updateCurrentTileset: function() {
|
||||||
console.log("GoogleMapView::updateCurrentTileset()");
|
//console.log("GoogleMapView::updateCurrentTileset()");
|
||||||
var currentWorldView = this.model.get("currentWorldView");
|
var currentWorldView = this.model.get("currentWorldView");
|
||||||
var gmapCurrent = overviewer.map.getMapTypeId();
|
var gmapCurrent = overviewer.map.getMapTypeId();
|
||||||
for (id in currentWorldView.options.mapTypeIds) {
|
for (id in currentWorldView.options.mapTypeIds) {
|
||||||
if (currentWorldView.options.mapTypeIds[id] == gmapCurrent) {
|
if (currentWorldView.options.mapTypeIds[id] == gmapCurrent) {
|
||||||
console.log("updating currenttileset");
|
//console.log("updating currenttileset");
|
||||||
this.options.currentTileSet = currentWorldView.model.get("tileSets").at(id);
|
this.options.currentTileSet = currentWorldView.model.get("tileSets").at(id);
|
||||||
console.log(this);
|
//console.log(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user