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

[christoph at osgeo.org]

Author: christoph
Date: 2006-06-06 11:20:38+0000
New Revision: 382

Modified:
   trunk/mapbender/http/javascripts/mod_digitize_tab.php
   trunk/mapbender/http/javascripts/mod_geometryArray.js
   trunk/mapbender/http/javascripts/point.js

Log:
added/removed "parent" prefix

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=382&p1=trunk/mapbender/http/javascripts/mod_digitize_tab.php&p2=trunk/mapbender/http/javascripts/mod_digitize_tab.php&r1=381&r2=382
==============================================================================
--- trunk/mapbender/http/javascripts/mod_digitize_tab.php	(original)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php	2006-06-06 11:20:38+0000
@@ -129,7 +129,7 @@
 	}
 	else {
 		parent.mb_getMousePos(e,mod_digitize_target);
-		realWorldPos = parent.mapToReal(mod_digitize_target,new Point(parent.clickX,parent.clickY));
+		realWorldPos = mapToReal(mod_digitize_target,new Point(parent.clickX,parent.clickY));
 	}
 	
 	if (d.get(-1).geomtype == geomTypePolygon && d.getGeometry(-1,-1).count() > 1 && d.getGeometry(-1,-1).get(0).equals(realWorldPos)) {
@@ -588,8 +588,8 @@
 				smP += "></div>";
 			}
 			for(var k = 1; k < d.getGeometry(i,j).count(); k++){
-				var p0 = parent.realToMap(mod_digitize_target, d.getPoint(i,j,k));
-				var p1 = parent.realToMap(mod_digitize_target, d.getPoint(i,j,k-1));
+				var p0 = realToMap(mod_digitize_target, d.getPoint(i,j,k));
+				var p1 = realToMap(mod_digitize_target, d.getPoint(i,j,k-1));
 				
 				points = calculateActualDash(p0, p1, mod_digitize_width, mod_digitize_height);
 				if (points != false) {

Modified: trunk/mapbender/http/javascripts/mod_geometryArray.js
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/mod_geometryArray.js?view=diff&rev=382&p1=trunk/mapbender/http/javascripts/mod_geometryArray.js&p2=trunk/mapbender/http/javascripts/mod_geometryArray.js&r1=381&r2=382
==============================================================================
--- trunk/mapbender/http/javascripts/mod_geometryArray.js	(original)
+++ trunk/mapbender/http/javascripts/mod_geometryArray.js	2006-06-06 11:20:38+0000
@@ -459,11 +459,11 @@
 	
 		if (typeof(j) != 'undefined'){
 			if (typeof(i) != 'undefined'){
-				this.coord[cnt]['coord'] = parent.realToMap(this.target, geom.getPoint(i,j,k));
+				this.coord[cnt]['coord'] = realToMap(this.target, geom.getPoint(i,j,k));
 			}
-			else this.coord[cnt]['coord'] = parent.realToMap(this.target, geom.getPoint(j,k));
+			else this.coord[cnt]['coord'] = realToMap(this.target, geom.getPoint(j,k));
 		}
-		else this.coord[cnt]['coord'] = parent.realToMap(this.target, geom.get(k));
+		else this.coord[cnt]['coord'] = realToMap(this.target, geom.get(k));
 		
 		this.coord[cnt]['member'] = i;
 		this.coord[cnt]['geometry'] = j;

Modified: trunk/mapbender/http/javascripts/point.js
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/point.js?view=diff&rev=382&p1=trunk/mapbender/http/javascripts/point.js&p2=trunk/mapbender/http/javascripts/point.js&r1=381&r2=382
==============================================================================
--- trunk/mapbender/http/javascripts/point.js	(original)
+++ trunk/mapbender/http/javascripts/point.js	2006-06-06 11:20:38+0000
@@ -46,17 +46,17 @@
 // possible improvement: point has flag: map OR real. additional functions: toReal, toMap
 
 function mapToReal(frameName, aPoint) {
-	var v = makeClickPos2RealWorldPos(frameName, aPoint.x, aPoint.y);
+	var v = parent.makeClickPos2RealWorldPos(frameName, aPoint.x, aPoint.y);
 	return new Point(v[0], v[1]);
 }
 
 function realToMap(frameName, aPoint) {
-	var v = makeRealWorld2mapPos(frameName, aPoint.x, aPoint.y);
+	var v = parent.makeRealWorld2mapPos(frameName, aPoint.x, aPoint.y);
 	return new Point(Math.round(v[0]), Math.round(v[1]));
 }
 
 function mb_calcExtent(frameName, min, max) {
-	var ind = getMapObjIndexByName(frameName);
+	var ind = parent.getMapObjIndexByName(frameName);
 	var extent = max.minus(min);
 	var center = extent.dividedBy(2).plus(min);