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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-12-07 04:03:30 -0500 (Fri, 07 Dec 2007)
New Revision: 1902

Modified:
   trunk/mapbender/http/javascripts/geometry.js
   trunk/mapbender/http/javascripts/mod_digitize_tab.php
   trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php
   trunk/mapbender/http/javascripts/mod_renderGML.php
   trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
   trunk/mapbender/http/javascripts/wfs.js
Log:
changed class Highlight: after "add", "paint" must now be called manually. It is not painted automatically.

Modified: trunk/mapbender/http/javascripts/geometry.js
===================================================================
--- trunk/mapbender/http/javascripts/geometry.js	2007-12-06 13:52:38 UTC (rev 1901)
+++ trunk/mapbender/http/javascripts/geometry.js	2007-12-07 09:03:30 UTC (rev 1902)
@@ -1228,7 +1228,6 @@
 		gA.addCopy(m);
 		if (typeof(color) != 'undefined') {gA.get(-1).color = color;} 
 		else {gA.get(-1).color = lineColor;}
-		this.paint();
 	};
 	
 	/**
@@ -1326,6 +1325,7 @@
 		mG.addGeometry();
 		mG.get(-1).addPoint(center);
 		highlight.add(mG);
+		highlight.paint();
 	};
 	this.getTolerance = function() {
 		return tolerance;

Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_digitize_tab.php	2007-12-06 13:52:38 UTC (rev 1901)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php	2007-12-07 09:03:30 UTC (rev 1902)
@@ -714,6 +714,9 @@
 			}
 		}
 	}
+	if (!nonTransactionalEditable) {
+		nonTransactionalHighlight.paint();
+	}
 	digitizeDivTag.write(smPArray.join(""));
 }
 

Modified: trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php	2007-12-06 13:52:38 UTC (rev 1901)
+++ trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php	2007-12-07 09:03:30 UTC (rev 1902)
@@ -155,6 +155,7 @@
 	mG.addGeometry();
 	mG.get(-1).addPoint(houseLocation[houseNumber]);
 	highlight.add(mG);
+	highlight.paint();
 }
 
 function highlightParcel(parcelId) {
@@ -162,6 +163,7 @@
 	mG.addGeometry();
 	mG.get(-1).addPoint(parcelLocation[parcelId]);
 	highlight.add(mG);
+	highlight.paint();
 }
 
 function removeHighlight() {

Modified: trunk/mapbender/http/javascripts/mod_renderGML.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_renderGML.php	2007-12-06 13:52:38 UTC (rev 1901)
+++ trunk/mapbender/http/javascripts/mod_renderGML.php	2007-12-07 09:03:30 UTC (rev 1902)
@@ -48,6 +48,7 @@
 	echo "hl = new Highlight(mf, 'GML_rendering', {'position':'absolute', 'top':'0px', 'left':'0px', 'z-index':" . GML_HIGHLIGHT_Z_INDEX . "});\n";
 	echo $gml->exportMemberToJS(0, false);
 	echo "hl.add(q);\n";
+	echo "hl.paint();\n";
 	echo "mb_registerSubFunctions('hl.paint()');\n";
 	echo "}\n";
 	$e = new mb_notice("renderGML: GML: " . $_SESSION["GML"] . "; EPSG: " . $_SESSION["epsg"] . "; BBOX: " . implode(", ", $bbox));

Modified: trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2007-12-06 13:52:38 UTC (rev 1901)
+++ trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2007-12-07 09:03:30 UTC (rev 1902)
@@ -438,6 +438,7 @@
 	}
 	if (event == "over") {
 		global_resultHighlight.add(currentGeom, cw_fillcolor);
+		global_resultHighlight.paint();
 	}
 	else if (event == "out"){
 		global_resultHighlight.del(currentGeom, cw_fillcolor);
@@ -452,6 +453,7 @@
 		parent.mb_calculateExtent(targetArray[0], bbox[0].x, bbox[0].y, bbox[1].x, bbox[1].y);
 		parent.zoom(targetArray[0], 'true', 1.0);
 		global_resultHighlight.add(currentGeom, cw_fillcolor);
+		global_resultHighlight.paint();
 	}
 	return true;
 }

Modified: trunk/mapbender/http/javascripts/wfs.js
===================================================================
--- trunk/mapbender/http/javascripts/wfs.js	2007-12-06 13:52:38 UTC (rev 1901)
+++ trunk/mapbender/http/javascripts/wfs.js	2007-12-07 09:03:30 UTC (rev 1902)
@@ -157,14 +157,20 @@
 
 function highlightGeometry(i) {
 	var id = "highlightCheckbox"+i;
-	if (document.getElementById(id).checked) highlight.add(mb_wfs_fetch.get(i), '#00ff00');
+	if (document.getElementById(id).checked) {
+		highlight.add(mb_wfs_fetch.get(i), '#00ff00');
+		highlight.paint();
+	}
 	else highlight.del(mb_wfs_fetch.get(i), '#00ff00');
 }
 
 function mb_wfs_perform(type,m){
 
 	var wfs_conf = window.frames["wfs_conf"].get_wfs_conf();
-	if(type=='over') highlight.add(m, '#0000ff');
+	if(type=='over') {
+		highlight.add(m, '#0000ff');
+		highlight.paint();
+	}
 	else if(type=='out') highlight.del(m, '#0000ff');
 	else if(type=='click') {
 		var tmp = m.getBBox();