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

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2009-03-02 03:22:26 -0500 (Mon, 02 Mar 2009)
New Revision: 3610

Modified:
   trunk/mapbender/http/javascripts/requestGeometryConstructor.js
Log:
changed some functions to get valid mapframe1 without iframe

Modified: trunk/mapbender/http/javascripts/requestGeometryConstructor.js
===================================================================
--- trunk/mapbender/http/javascripts/requestGeometryConstructor.js	2009-03-02 08:19:48 UTC (rev 3609)
+++ trunk/mapbender/http/javascripts/requestGeometryConstructor.js	2009-03-02 08:22:26 UTC (rev 3610)
@@ -20,7 +20,34 @@
 	 */
 
 	this.geomTarget = geomTarget;
+
+	var ind = getMapObjIndexByName(this.geomTarget);
+	var myMapObj = mb_mapObj[ind];		
+	var map_el = myMapObj.getDomElement();
+	if(!map_el.ownerDocument.getElementById(myMapObj.elementName+"_measuring")){
+		//create Box Elements
+		var el_top = map_el.ownerDocument.createElement("div");
+		el_top.style.position = "absolute";
+		el_top.style.top = "0px";
+		el_top.style.left = "0px";
+		el_top.style.zIndex = "16";
+		el_top.style.fontSize = "10px";
+		el_top.id = myMapObj.elementName+"_measuring";
+		map_el.appendChild(el_top);
+	}
 	
+	if(!map_el.ownerDocument.getElementById(myMapObj.elementName+"_measure_display")){
+		//create Box Elements
+		var el_top = map_el.ownerDocument.createElement("div");
+		el_top.style.position = "absolute";
+		el_top.style.top = "0px";
+		el_top.style.left = "0px";
+		el_top.style.zIndex = "17";
+		el_top.id = myMapObj.elementName+"_measure_display";
+		map_el.appendChild(el_top);
+	}
+
+	
 	this.getGeometry = function(queryType,callbackFunction){
 		var target = this.geomTarget;
 		s = new Snapping(this.geomTarget);
@@ -36,8 +63,7 @@
 		if (queryType == "point") {
 			queryGeom = new Geometry(geomType.point);
 			el.onmousedown = function (e) {
-				mb_getMousePos(e,target);
-				realWorldPos = mapToReal(target,new Point(clickX,clickY));
+				realWorldPos = mapToReal(target,myMapObj.getMousePosition(e));
 				queryGeom.addPoint(realWorldPos);
 				callback(target, queryGeom);
 				el.onmouseover = null;
@@ -88,8 +114,7 @@
 			s.clean();
 		}
 		else {
-			mb_getMousePos(e,that.geomTarget);
-			realWorldPos = mapToReal(that.geomTarget,new Point(clickX,clickY));
+			realWorldPos = mapToReal(that.geomTarget,myMapObj.getMousePosition(e));
 		}
 		queryGeom.addPoint(realWorldPos);
 	
@@ -99,8 +124,8 @@
 		if (s.isSnapped() && queryGeom.count() >= 3 && queryGeom.get(-1).equals(queryGeom.get(0))) {
 			queryGeom.close();
 			callback(that.geomTarget,queryGeom);
-			writeTag(that.geomTarget,"measuring","");
-			writeTag(that.geomTarget,"measure_display","");
+			writeTag(myMapObj.frameName, myMapObj.elementName+"_measuring", "");
+			writeTag(myMapObj.frameName, myMapObj.elementName+"_measure_display", "");
 			var ind = getMapObjIndexByName("mapframe1");
 			var el = mb_mapObj[ind].getDomElement();
 			el.onmouseover = null;
@@ -117,8 +142,7 @@
 		this.geomTarget = geomTarget;
 		var that = this;
 		if (queryGeom.count() >= 3) {
-			mb_getMousePos(e,that.geomTarget);
-			var pos = new Point(clickX,clickY);
+			var pos = myMapObj.getMousePosition(e);
 			s.check(pos);
 		}
 	}
@@ -142,7 +166,7 @@
 				}
 			}
 		}
-		writeTag(that.geomTarget,"measuring",str_mPoints);
+		writeTag(myMapObj.frameName, myMapObj.elementName+"_measuring", str_mPoints);
 	}
 	
 	var evaluateDashesExt = function(p1,p0,count){