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

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2011-09-07 01:00:49 -0700 (Wed, 07 Sep 2011)
New Revision: 8111

Modified:
   trunk/mapbender/http/javascripts/mod_scaleHint.php
Log:
use eventBeforeMapRequest again for register function

Modified: trunk/mapbender/http/javascripts/mod_scaleHint.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_scaleHint.php	2011-09-07 07:56:31 UTC (rev 8110)
+++ trunk/mapbender/http/javascripts/mod_scaleHint.php	2011-09-07 08:00:49 UTC (rev 8111)
@@ -1,7 +1,7 @@
 <?php
 # $Id$
 # http://www.mapbender.org/index.php/mod_scaleHint.php
-# Copyright (C) 2002 CCGIS 
+# Copyright (C) 2002 CCGIS
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,11 +21,11 @@
 
 echo "var mod_scaleHint_target = '".$e_target[0]."';";
 echo "var mod_scaleHint_min = '".$e_target[1]."';";
-echo "var mod_scaleHint_max = '".$e_target[2]."';"; 
+echo "var mod_scaleHint_max = '".$e_target[2]."';";
 
 ?>
 
-eventAfterMapRequest.register(function (obj) {
+eventBeforeMapRequest.register(function (obj) {
 	mod_scaleHint_init(obj.map.elementName);
 });
 
@@ -33,12 +33,12 @@
 	if(frameName == mod_scaleHint_target){
 		var ind = getMapObjIndexByName(frameName);
 		var scale = mb_mapObj[ind].getScale();
-		if(scale < mod_scaleHint_min || scale > mod_scaleHint_max){
-			if(scale < mod_scaleHint_min){
-				var newScale = mod_scaleHint_min;
+                if(parseInt(scale,10) < parseInt(mod_scaleHint_min, 10) || parseInt(scale, 10) > parseInt(mod_scaleHint_max, 10)){
+                	if(parseInt(scale, 10) < parseInt(mod_scaleHint_min, 10)){
+				var newScale = parseInt(mod_scaleHint_min, 10);
 			}
-			if(scale > mod_scaleHint_max){
-				var newScale = mod_scaleHint_max;
+			if(parseInt(scale, 10) > parseInt(mod_scaleHint_max, 10)){
+				var newScale = parseInt(mod_scaleHint_max, 10);
 			}
 			var ind = getMapObjIndexByName(frameName);
 			var arrayBBox = mb_mapObj[ind].extent.toString().split(",");