From 27c644d4ea66b09d4ab3f26c3bd21e0db32268fa Mon Sep 17 00:00:00 2001 From: Richard Pastrick Date: Fri, 27 Apr 2012 09:19:31 -0700 Subject: [PATCH 1/2] Fix centering of the maps to the spawn point on first load --- overviewer_core/data/js_src/views.js | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/overviewer_core/data/js_src/views.js b/overviewer_core/data/js_src/views.js index 2fde73d..f3f2972 100644 --- a/overviewer_core/data/js_src/views.js +++ b/overviewer_core/data/js_src/views.js @@ -7,6 +7,14 @@ overviewer.views.WorldView = Backbone.View.extend({ this.options.overlayMapTypes = []; this.options.mapTypeIds = []; this.options.overlayMapTypeIds = []; + + var curTileSet = this.model.get("tileSets").at(0); + var spawn = curTileSet.get("spawn"); + if (spawn=="false") { + var spawn = [0,64,0]; + } + this.options.lastViewport = [spawn[0],spawn[1],spawn[2],curTileSet.get("defaultZoom")]; + this.model.get("tileSets").each(function(tset, index, list) { // ignore overlays: var ops = { @@ -139,17 +147,16 @@ overviewer.views.GoogleMapView = Backbone.View.extend({ var curWorld = this.model.get("currentWorldView").model; var curTset = curWorld.get("tileSets").at(0); + var spawn = curTset.get("spawn"); + if (spawn==false) { + var spawn = [0,64,0]; + } + var mapcenter = overviewer.util.fromWorldToLatLng( + spawn[0], + spawn[1], + spawn[2], + curTset); - /* - var defaultCenter = overviewer.util.fromWorldToLatLng( - overviewerConfig.map.center[0], - overviewerConfig.map.center[1], - overviewerConfig.map.center[2], - curTset.get("defaultZoom")); - */ - var lat = 0.62939453125;// TODO defaultCenter.lat(); - var lng = 0.38525390625; // TODO defaultCenter.lng(); - var mapcenter = new google.maps.LatLng(lat, lng); this.options.mapTypes=[]; this.options.mapTypeIds=[]; From 2ecb5dc9146fcbe40ff30a0e03ebcad005e6e61e Mon Sep 17 00:00:00 2001 From: Richard Pastrick Date: Fri, 27 Apr 2012 09:22:41 -0700 Subject: [PATCH 2/2] Forgot quotes --- overviewer_core/data/js_src/views.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overviewer_core/data/js_src/views.js b/overviewer_core/data/js_src/views.js index f3f2972..3ca20c4 100644 --- a/overviewer_core/data/js_src/views.js +++ b/overviewer_core/data/js_src/views.js @@ -10,7 +10,7 @@ overviewer.views.WorldView = Backbone.View.extend({ var curTileSet = this.model.get("tileSets").at(0); var spawn = curTileSet.get("spawn"); - if (spawn=="false") { + if (spawn == "false") { var spawn = [0,64,0]; } this.options.lastViewport = [spawn[0],spawn[1],spawn[2],curTileSet.get("defaultZoom")]; @@ -148,7 +148,7 @@ overviewer.views.GoogleMapView = Backbone.View.extend({ var curTset = curWorld.get("tileSets").at(0); var spawn = curTset.get("spawn"); - if (spawn==false) { + if (spawn == "false") { var spawn = [0,64,0]; } var mapcenter = overviewer.util.fromWorldToLatLng(