[Mapbender-commits] r5044 - branches/2.6/http/php

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2009-11-26 03:54:48 -0500 (Thu, 26 Nov 2009)
New Revision: 5044

Modified:
   branches/2.6/http/php/mod_meetingPoint.php
Log:
http://trac.osgeo.org/mapbender/ticket/564

Modified: branches/2.6/http/php/mod_meetingPoint.php
===================================================================
--- branches/2.6/http/php/mod_meetingPoint.php	2009-11-25 16:26:56 UTC (rev 5043)
+++ branches/2.6/http/php/mod_meetingPoint.php	2009-11-26 08:54:48 UTC (rev 5044)
@@ -145,38 +145,18 @@
 		mapObject.getDomElement().ownerDocument.onclick = null;
 	}
 }
-/*
-function mod_meetingPoint_click(e){
-	
 
-	if(ie){
-		clickX = parent.frames[mod_meetingPoint_target].event.clientX;
-		clickY = parent.frames[mod_meetingPoint_target].event.clientY;
-	}
-	else{
-		clickX = e.pageX;
-		clickY = e.pageY;
-	}
-	
-	var pos = parent.makeClickPos2RealWorldPos(mod_meetingPoint_target, clickX, clickY);
-    
-	mod_meetingPoint_write(pos[0],pos[1]);
-	mod_meetingPoint_draw();	
-}
-*/
 function mod_meetingPoint_write(x,y){	
    document.forms[0].x.value =x;
    document.forms[0].y.value =y;	   
 }
 
 function mod_meetingPoint_hide(){
-	//var ind = parent.getMapObjIndexByName(mod_meetingPoint_target);
-	//parent.frames[mod_meetingPoint_target].document.getElementById('permanent').style.visibility = 'hidden';
 	var mapObject = parent.getMapObjByName(mod_meetingPoint_target);
-//	parent.$("#" + mapObject.elementName + "_permanent").css({
+//	parent.$("#" + mapObject.elementName + "_meetingPoint_permanent").css({
 //		visibility:"hidden"
 //	});
-	parent.$("#" + mapObject.elementName + "_permanent").empty();
+	parent.$("#" + mapObject.elementName + "_meetingPoint_permanent").empty();
 }
 
 
@@ -191,16 +171,17 @@
 	
 			var meetingPointClickPos = mapObject.convertRealToPixel(mod_meetingPointRealPoint);
 			var tagSource = "";
-			tagSource += "<div style='z-index:13;position:absolute;left:"+(meetingPointClickPos.x- Math.round(0.5*meetingPoint_width))+"px;top:"+(meetingPointClickPos.y-Math.round(0.5*meetingPoint_height))+"px'>";
+			tagSource += "<div style='visibility:visible;z-index:13;position:absolute;left:"+(meetingPointClickPos.x- Math.round(0.5*meetingPoint_width))+"px;top:"+(meetingPointClickPos.y-Math.round(0.5*meetingPoint_height))+"px'>";
 			tagSource += "<img src='"+meetingPoint_icon+"'>";
 			tagSource += "<span style='"+meetingPoint_style+"'>"+document.forms[0].mytext.value+"<span>";
 			tagSource += "</div>";
 
 			var map_el = mapObject.getDomElement();
-			if (!map_el.ownerDocument.getElementById(mapObject.elementName + "_permanent")) {
+			if (!map_el.ownerDocument.getElementById(mapObject.elementName + "_meetingPoint_permanent")) {
+		
 				//create Box Elements
 
-				var $div = parent.$("<div id='" + mapObject.elementName + "_permanent'><img src='../img/redball.gif'/></div>");
+				var $div = parent.$("<div id='" + mapObject.elementName + "_meetingPoint_permanent'><img src='../img/redball.gif'/></div>");
 				$div.css({
 					position: "absolute",
 					top: "0px",
@@ -209,8 +190,7 @@
 				});
 				map_el.appendChild($div.get(0));
 			}
-			parent.$("#" + mapObject.elementName + "_permanent").html(tagSource);
-			
+			parent.$("#" + mapObject.elementName + "_meetingPoint_permanent").html(tagSource);
 		}
 	}
 }
@@ -232,28 +212,6 @@
 //	document.forms[0].mytext.title = maxCharacterString;
 }
 
-/*
-function mod_meetingPoint_draw(){
-	var ind = parent.getMapObjIndexByName(mod_meetingPoint_target);
-	if (document.forms[0].x.value!='' && document.forms[0].y.value != ''){
-		//alert(document.forms[0].x.value +" -- "+ document.forms[0].y.value + " - " + parent.mb_mapObj[ind].width +" iii: "+ ind);
-		parent.frames[mod_meetingPoint_target].document.getElementById('permanent').style.width = parent.mb_mapObj[ind].width;
-		parent.frames[mod_meetingPoint_target].document.getElementById('permanent').style.height = parent.mb_mapObj[ind].height;
-		parent.frames[mod_meetingPoint_target].document.getElementById('permanent').style.top = 0;
-		parent.frames[mod_meetingPoint_target].document.getElementById('permanent').style.left = 0;
-		parent.frames[mod_meetingPoint_target].document.getElementById('permanent').style.visibility = 'visible';
-		var tagSource = "";
-		var pos = parent.makeRealWorld2mapPos(mod_meetingPoint_target,document.forms[0].x.value, document.forms[0].y.value);
-		tagSource += "<div style='z-index:13;position:absolute;left:"+(pos[0]- Math.round(0.5*meetingPoint_width))+"px;top:"+(pos[1]-Math.round(0.5*meetingPoint_height))+"px'>";
-		tagSource += "<img src='"+meetingPoint_icon+"'>";
-		tagSource += "<span style='"+meetingPoint_style+"'>"+document.forms[0].mytext.value+"<span>";
-		tagSource += "</div>";
-		//prompt("meetingPoint",tagSource);
-	    parent.writeTag(mod_meetingPoint_target, "permanent", tagSource);
-	}	 
-}
-
-*/
 -->
 </script>
 
@@ -316,7 +274,7 @@
 	document.forms[0].mytext.value ='';
 	document.forms[0].x.value ='';
 	document.forms[0].y.value =  '';
-	 mod_meetingPoint_hide();
+	mod_meetingPoint_hide();
 }
 
 function createEmail (url,subject) {