From edf898ae1a9f4b453cd6d82cc4a00d8e864f57ab Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Mon, 27 Jun 2011 20:38:26 -0500
Subject: [PATCH] Fix "center" processing - broke it with URL args change :<

---
 web/js/map.js | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/web/js/map.js b/web/js/map.js
index 31c1c4d0..e938b49e 100644
--- a/web/js/map.js
+++ b/web/js/map.js
@@ -131,18 +131,15 @@ DynMap.prototype = {
 		if(urlarg != "") {
 			me.defaultworld.defaultmap = me.defaultworld.maps[urlarg] || me.defaultworld.defaultmap;
 		}
-		urlarg = parseInt(me.getParameterByName('x'),10);
-		if(urlarg != NaN) {
+		urlarg = me.getIntParameterByName('x');
+		if(urlarg != null)
 			me.defaultworld.center.x = urlarg;
-		}
-		urlarg = parseInt(me.getParameterByName('y'),10);
-		if(urlarg != NaN) {
+		urlarg = me.getIntParameterByName('y');
+		if(urlarg != null)
 			me.defaultworld.center.y = urlarg;
-		}
-		urlarg = parseInt(me.getParameterByName('z'), 10);
-		if(urlarg != NaN) {
+		urlarg = me.getIntParameterByName('z');
+		if(urlarg != null)
 			me.defaultworld.center.z = urlarg;
-		}
 	},
 	initialize: function() {
 		var me = this;
@@ -155,8 +152,9 @@ DynMap.prototype = {
 			.addClass('map')
 			.appendTo(container);
 
-		var urlzoom = parseInt(me.getParameterByName('zoom'),10);
-		if(urlzoom != NaN) { me.options.defaultzoom = urlzoom; }
+		var urlzoom = me.getIntParameterByName('zoom');
+		if(urlzoom != null)
+			me.options.defaultzoom = urlzoom;
 		
 		var map = this.map = new google.maps.Map(mapContainer.get(0), {
 			zoom: me.options.defaultzoom || 0,
@@ -625,6 +623,16 @@ DynMap.prototype = {
 			return "";
 		else
 			return decodeURIComponent(results[1].replace(/\+/g, " "));
+	},
+	getIntParameterByName: function(name) {
+		var v = this.getParameterByName(name);
+		if(v != "") {
+			v = parseInt(v, 10);
+			if(v != NaN) {
+				return v;
+				}
+		}
+		return null;
 	}
 	// TODO: Enable hash-links.
 /*	updateLink: function() {