svn commit: r612 - trunk/mapbender/http/javascripts

[christoph at osgeo.org]

Author: christoph
Date: 2006-06-22 12:28:52+0000
New Revision: 612

Modified:
   trunk/mapbender/http/javascripts/mod_digitize_tab.php
   trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php
   trunk/mapbender/http/javascripts/wfs.js

Log:
minor improvement:

renamed and replaced some element vars

Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/mod_digitize_tab.php?view=diff&rev=612&p1=trunk/mapbender/http/javascripts/mod_digitize_tab.php&p2=trunk/mapbender/http/javascripts/mod_digitize_tab.php&r1=611&r2=612
==============================================================================
--- trunk/mapbender/http/javascripts/mod_digitize_tab.php	(original)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php	2006-06-22 12:28:52+0000
@@ -644,9 +644,9 @@
 	var listOfGeom = "<table style='position:absolute; top:"+geomList_y+"px; left:"+geomList_x+"px;'>\n";
 	for (var i = 0 ; i < d.count(); i ++) {
 		listOfGeom += "\t<tr>\n\t\t<td>\n";
-		listOfGeom += "\t\t\t<img src = '../img/button_digitize/geomInfo.png' title='"+tooltip_wfs+"' onclick='showWfs("+i+")'>\n";
+		listOfGeom += "\t\t\t<img src = '"+buttonDig_imgdir+buttonDig_wfs_src+"' title='"+buttonDig_wfs_title+"' onclick='showWfs("+i+")'>\n";
 		listOfGeom += "\t\t</td>\n\t\t<td>\n";
-		listOfGeom += "\t\t\t<img src = '../img/button_digitize/geomRemove.png' title='"+tooltip_remove_geometry+"' onclick='parent.mb_disableThisButton(mod_digitizeEvent);d.del("+i+");executeDigitizeSubFunctions();'>\n";
+		listOfGeom += "\t\t\t<img src = '"+buttonDig_imgdir+buttonDig_remove_src+"' title='"+buttonDig_remove_title+"' onclick='parent.mb_disableThisButton(mod_digitizeEvent);d.del("+i+");executeDigitizeSubFunctions();'>\n";
 		listOfGeom += "\t\t</td>\n\t\t<td style = 'color:blue;font-size:12px'>\n";
 		listOfGeom += "\t\t\t<div onmouseover='parent.mb_wfs_perform(\"over\",d.get("+i+"));' ";
 		listOfGeom += " onmouseout='parent.mb_wfs_perform(\"out\",d.get("+i+"))' ";

Modified: trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php?view=diff&rev=612&p1=trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php&p2=trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php&r1=611&r2=612
==============================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php	(original)
+++ trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php	2006-06-22 12:28:52+0000
@@ -65,7 +65,6 @@
 var button_extent = "extent";
 var button_dialogue = "dialogue";
 
-try{if(wfsResultToDigitize){wfsResultToDigitize=true;}}catch(e){wfsResultToDigitize=false;}
 
 // ------------------------------------------------------------------------------------------
 // ------------ button handling -------------------------------------------------------------
@@ -318,8 +317,10 @@
 	el.onmousedown = mod_wfs_spatialRequest_start;
 }
 
+
 function isSetWfsResultToDigitize() {
-	return wfsResultToDigitize;
+	if (parseInt(buttonWfs_toDigitize_on)==1) return false;
+	return true;
 }
 
 function mod_wfs_SpatialRequest_dialog(){	

Modified: trunk/mapbender/http/javascripts/wfs.js
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/wfs.js?view=diff&rev=612&p1=trunk/mapbender/http/javascripts/wfs.js&p2=trunk/mapbender/http/javascripts/wfs.js&r1=611&r2=612
==============================================================================
--- trunk/mapbender/http/javascripts/wfs.js	(original)
+++ trunk/mapbender/http/javascripts/wfs.js	2006-06-22 12:28:52+0000
@@ -30,12 +30,6 @@
 	mb_registerSubFunctions('mod_usemap("")');
 }
 
-var wfsResultToDigitizeModule = false;
-
-if (isSetWfsResultToDigitize()) {
-	wfsResultToDigitizeModule = true;
-}
-
 if (useCheckboxForHighlighting) { 
 	mb_registerSubFunctions('highlightGeometry()');
 }
@@ -213,7 +207,7 @@
 			}
 			else alert("EPSG mismatch. Invalid WFS result. Press OK to continue.");
 		}		
-		if (wfsResultToDigitizeModule == false) {
+		if (isSetWfsResultToDigitize() == false) {
 			mb_wfs_listMember(current_wfs_name);
 		}
 		else {
@@ -264,7 +258,7 @@
 			if(t['element'][j]['f_show'] > 0){
 				var k = mb_wfs_fetch.get(i).e.getElementIndexByName(t['element'][j]['element_name'])
 				if(k != -1){
-					str += "<tr><td><img src = '../img/wfs_digitize.png' onClick = 'tab_open(digiFrame);parent.window.frames[digiFrame].appendGeometry(mb_wfs_fetch.get("+i+"))'></td><td>";
+					str += "<tr><td><img src = '"+buttonWfs_toDigitize_src+"' title='"+buttonWfs_toDigitize_title+"' onClick = 'tab_open(digiFrame);parent.window.frames[digiFrame].appendGeometry(mb_wfs_fetch.get("+i+"))'></td><td>";
 					if (useCheckboxForHighlighting) {
 						str += "<input type=checkbox id=highlightCheckbox" + i + " onClick='highlightGeometry()'></td><td>";
 					}