[Mapbender-commits] r4732 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2009-09-26 14:09:40 -0400 (Sat, 26 Sep 2009)
New Revision: 4732

Modified:
   trunk/mapbender/http/javascripts/map_obj.js
   trunk/mapbender/http/javascripts/mod_box1.js
   trunk/mapbender/http/javascripts/mod_overview.js
   trunk/mapbender/http/javascripts/mod_selArea.js
   trunk/mapbender/http/javascripts/mod_setBackground.php
Log:


Modified: trunk/mapbender/http/javascripts/map_obj.js
===================================================================
--- trunk/mapbender/http/javascripts/map_obj.js	2009-09-26 17:37:17 UTC (rev 4731)
+++ trunk/mapbender/http/javascripts/map_obj.js	2009-09-26 18:09:40 UTC (rev 4732)
@@ -336,7 +336,6 @@
 			this.styles[i] = styles;
 			this.querylayers[i] = querylayers;
 		}
-		
 	};
 	/**
 	 * get the extent of the mapObj

Modified: trunk/mapbender/http/javascripts/mod_box1.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_box1.js	2009-09-26 17:37:17 UTC (rev 4731)
+++ trunk/mapbender/http/javascripts/mod_box1.js	2009-09-26 18:09:40 UTC (rev 4732)
@@ -221,4 +221,10 @@
 	if (!domElementsExist()) {
 		createDomElements();
 	}
+	else {
+		topNode = document.getElementById(map.elementName + topSuffix);
+		leftNode = document.getElementById(map.elementName + leftSuffix);
+		rightNode = document.getElementById(map.elementName + rightSuffix);
+		bottomNode = document.getElementById(map.elementName + bottomSuffix);		
+	}
 };

Modified: trunk/mapbender/http/javascripts/mod_overview.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_overview.js	2009-09-26 17:37:17 UTC (rev 4731)
+++ trunk/mapbender/http/javascripts/mod_overview.js	2009-09-26 18:09:40 UTC (rev 4732)
@@ -77,6 +77,10 @@
 
 	map = Mapbender.modules[options.id];
 	map.isOverview = true;
+	// if the setBackground module is active,
+	// the overview wms might be hidden.
+	// so we activate it here.
+	map.wms[0].gui_wms_visible = 1;
 	map.skipWmsIfSrsNotSupported = 
 		options.skipWmsIfSrsNotSupported === 1 ? true : false;
 

Modified: trunk/mapbender/http/javascripts/mod_selArea.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_selArea.js	2009-09-26 17:37:17 UTC (rev 4731)
+++ trunk/mapbender/http/javascripts/mod_selArea.js	2009-09-26 18:09:40 UTC (rev 4732)
@@ -48,7 +48,8 @@
 			box = new Mapbender.Box({
 				target: options.target
 			});
-			$(map.getDomElement()).css("cursor", "crosshair")
+			$(map.getDomElement())
+				.css("cursor", "crosshair")
 				.mousedown(function (e) {
 				box.start(e);
 				return false;
@@ -74,6 +75,7 @@
 				return;
 			}
 			$(map.getDomElement())
+				.css("cursor", "default")
 				.unbind("mousedown")
 				.unbind("mouseup")
 				.unbind("mousemove");

Modified: trunk/mapbender/http/javascripts/mod_setBackground.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_setBackground.php	2009-09-26 17:37:17 UTC (rev 4731)
+++ trunk/mapbender/http/javascripts/mod_setBackground.php	2009-09-26 18:09:40 UTC (rev 4732)
@@ -32,15 +32,16 @@
 });
 var mod_setBackground_active = false;
 function mod_setBackground_init(){
+	var map = Mapbender.modules[mod_setBackground_target];
 	var setBackgroundSelectBox = document.setBackground.mod_setBackground_list;
 	var ind = setBackgroundSelectBox.options[0].value;
 	var cnt = 0;
 	var selInd;
 
 	setBackgroundSelectBox.options[setBackgroundSelectBox.length - 1] = null;
-	for(var i=0; i<wms.length; i++){
-		if(wms[i].gui_wms_visible == '0'){
-			var title = wms[i].wms_title;
+	for(var i=0; i<map.wms.length; i++){
+		if(map.wms[i].gui_wms_visible == '0'){
+			var title = map.wms[i].wms_title;
 			var newO = new Option(title, i, false,false);
 
 			setBackgroundSelectBox.options[setBackgroundSelectBox.length] = newO;
@@ -51,15 +52,16 @@
 		}
 	}
 	if (cnt >0){
-		wms[ind].gui_wms_visible = 2;
+		map.wms[ind].gui_wms_visible = 2;
 		setBackgroundSelectBox.selectedIndex = selInd;
 	}
 	mod_setBackground_active = ind;
 }
 
 function mod_setBackground_change(obj){	
-	wms[mod_setBackground_active].gui_wms_visible = 0;
-	wms[obj.value].gui_wms_visible = 2;
+	var map = Mapbender.modules[mod_setBackground_target];
+	map.wms[mod_setBackground_active].gui_wms_visible = 0;
+	map.wms[obj.value].gui_wms_visible = 2;
 	mod_setBackground_active = obj.value;
 	zoom(mod_setBackground_target,true, 1.0); 
 }