[Mapbender-commits] r3283 - branches/beck_dev/http/javascripts

[svn_mapbender at osgeo.org]

Author: beck
Date: 2008-12-09 07:11:19 -0500 (Tue, 09 Dec 2008)
New Revision: 3283

Modified:
   branches/beck_dev/http/javascripts/mod_mapCookie.php
Log:


Modified: branches/beck_dev/http/javascripts/mod_mapCookie.php
===================================================================
--- branches/beck_dev/http/javascripts/mod_mapCookie.php	2008-12-09 11:33:01 UTC (rev 3282)
+++ branches/beck_dev/http/javascripts/mod_mapCookie.php	2008-12-09 12:11:19 UTC (rev 3283)
@@ -19,7 +19,7 @@
 
 require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
 
-echo "var mod_mapCookie_target = '".$e_target[0]."';";
+echo "var mod_mapCookie_target = '".trim($e_target[0])."';";
 ?>
 
 eventInit.register(restoreMapState);
@@ -29,16 +29,31 @@
 	if(!document.cookie) {
 		return;
 	}
+	
+	var currentMapState = mb_mapObj[getMapObjIndexByName(mod_mapCookie_target)];
+	var cookieData      = document.cookie.split(';');
+	
+	for(var i = 0; i < cookieData.length; i++) {
+		if(!cookieData[i].match(/stored_map_state/)) {
+			continue;
+		}
+		
+		var storedMapState = eval('(' + cookieData[i].replace(/stored_map_state=/,'') + ')');
+		
+		currentMapState.extent = storedMapState.extent;
+		currentMapState.epsg   = storedMapState.epsg;
+	}
 }
 
 function storeMapState() {
-	var mapIndex      = getMapObjIndexByName(mod_wmsByCookie_target);
-	var cookieData    = {}
-	var cookieExpires = new Date();
+	var currentMapState = mb_mapObj[getMapObjIndexByName(mod_mapCookie_target)];
+	var cookieExpires   = new Date();
+	var cookieData      = {}
 	
 	cookieExpires.setTime(cookieExpires.getTime() + (24 * 60 * 60 * 1000));
 
-	cookieData.extent = $.toJSON(mb_mapObj[getMapObjIndexByName(mod_wmsByCookie_target)].extent);
+	cookieData.extent = currentMapState.extent;
+	cookieData.epsg   = currentMapState.epsg;
 
 	document.cookie = 'stored_map_state=' + $.toJSON(cookieData) + ';expires=' + cookieExpires.toGMTString();
 }