[Mapbender-commits] r4608 - in trunk/mapbender: http/javascripts resources/db/update

[svn_mapbender at osgeo.org]

Author: topi
Date: 2009-09-10 09:22:07 -0400 (Thu, 10 Sep 2009)
New Revision: 4608

Modified:
   trunk/mapbender/http/javascripts/mod_featureInfo.php
   trunk/mapbender/http/javascripts/wms.js
   trunk/mapbender/resources/db/update/update_2.7.sql
Log:
http://trac.osgeo.org/mapbender/ticket/529

Modified: trunk/mapbender/http/javascripts/mod_featureInfo.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_featureInfo.php	2009-09-10 08:06:17 UTC (rev 4607)
+++ trunk/mapbender/http/javascripts/mod_featureInfo.php	2009-09-10 13:22:07 UTC (rev 4608)
@@ -90,7 +90,7 @@
 			for(var i=0;i<urls.length;i++){
 				if(featureInfoLayerPopup == 'true'){
 					var p = new mb_popup({
-						title:<?php echo _mb("Informations");?>,
+						title:'<?php echo _mb("Informations");?>',
 						url:urls[i],
 						width:parseInt(featureInfoPopupWidth, 10),
 						height:parseInt(featureInfoPopupHeight, 10),

Modified: trunk/mapbender/http/javascripts/wms.js
===================================================================
--- trunk/mapbender/http/javascripts/wms.js	2009-09-10 08:06:17 UTC (rev 4607)
+++ trunk/mapbender/http/javascripts/wms.js	2009-09-10 13:22:07 UTC (rev 4608)
@@ -454,10 +454,15 @@
  * @return array of layernames
  * @type string[]
  */
-wms_const.prototype.getQuerylayers = function(){
+wms_const.prototype.getQuerylayers = function(map){
+	var currentScale = map.getScale();
 	queryLayers = [];
 	for(var i=0; i< this.objLayer.length; i++){
-		if(this.objLayer[i].gui_layer_querylayer === 1 && ! this.objLayer[i].has_childs ){
+		
+		var isVisible = this.objLayer[i].gui_layer_minscale <= currentScale && 
+			(this.objLayer[i].gui_layer_maxscale >= currentScale ||
+			this.objLayer[i].gui_layer_maxscale === 0);
+		if(this.objLayer[i].gui_layer_querylayer === 1 && !this.objLayer[i].has_childs && isVisible){
 			queryLayers.push(this.objLayer[i].layer_name);
 		}
 	}

Modified: trunk/mapbender/resources/db/update/update_2.7.sql
===================================================================
--- trunk/mapbender/resources/db/update/update_2.7.sql	2009-09-10 08:06:17 UTC (rev 4607)
+++ trunk/mapbender/resources/db/update/update_2.7.sql	2009-09-10 13:22:07 UTC (rev 4608)
@@ -295,4 +295,8 @@
 --update mb_user set mb_user_digest=md5(mb_user_name || ';' || mb_user_email || ':' || '<realm_name>' || ':' || 'password') where mb_user_id = <ID>;
  
 ---------------------------
- 
\ No newline at end of file
+-- http://www.mapbender.org/FeatureInfo#considerScalehints --
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'featureInfo1', 'considerScalehints', '0', '' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'featureInfo1', 'considerScalehints', '0', '' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui2', 'featureInfo1', 'considerScalehints', '0', '' ,'var'); 
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', 'featureInfo1', 'considerScalehints', '0', '' ,'var');
\ No newline at end of file