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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-03-13 08:31:32 -0700 (Thu, 13 Mar 2014)
New Revision: 8799

Modified:
   trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php
   trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
Log:
New option for wfs gazetter modules to force crs even if it is not documented in the capabilities document of the server (element_var forceCrsFromMap 0/1 - default 0)

Modified: trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php	2014-03-11 16:13:34 UTC (rev 8798)
+++ trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php	2014-03-13 15:31:32 UTC (rev 8799)
@@ -105,6 +105,10 @@
 	var e = new parent.Mb_warning("mod_wfsGazetteerEditor_client.php: Element var maxHighlightedPoints is not set, see 'edit element vars'.");
 }
 
+//Element var to force request a crs which differ from crs values given in wfs capabilities!
+try {if(forceCrsFromMap){}}catch(e) {forceCrsFromMap = 0;}
+var global_forceCrsFromMap = forceCrsFromMap;
+
 var otherFrame = parent.window.frames[e_id_css];
 <?php 
 
@@ -663,7 +667,11 @@
 	else {
 		var checkVal = ftSrsSplit[1];
 	}
-
+	//return true if usage of crs should be forced!
+	if (global_forceCrsFromMap == 1) {
+		if(submit)submit.disabled = false;
+		return true;
+	}
 	//if default featuretype_srs does not match current mapObj srs, check for other srs
 	if(checkVal != epsgString) {
 		//check if other featuretype_srs matches current mapObj srs

Modified: trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2014-03-11 16:13:34 UTC (rev 8798)
+++ trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2014-03-13 15:31:32 UTC (rev 8799)
@@ -136,6 +136,11 @@
 //Element var to remove spatialrequest highlighting when firing search
 try {if(removeSpatialRequestHighlight){}}catch(e) {removeSpatialRequestHighlight = 0;}
 
+//Element var to force request a crs which differ from crs values given in wfs capabilities!
+try {if(forceCrsFromMap){}}catch(e) {forceCrsFromMap = 0;}
+
+var global_forceCrsFromMap = forceCrsFromMap;
+
 var targetArray = targetString.split(",");
 var global_wfsConfObj;
 var global_selectedWfsConfId;
@@ -935,7 +940,11 @@
 	else {
 		var checkVal = ftSrsSplit[1];
 	}
-
+	//return true if usage of crs should be forced!
+	if (global_forceCrsFromMap == 1) {
+		if(submit)submit.disabled = false;
+		return true;
+	}
 	//if default featuretype_srs does not match current mapObj srs, check for other srs
 	if(checkVal != epsgString) {
 		//check if other featuretype_srs matches current mapObj srs