[Mapbender-commits] r4239 - branches/2.6/http/javascripts

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2009-06-26 05:57:33 -0400 (Fri, 26 Jun 2009)
New Revision: 4239

Modified:
   branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php
Log:
checkSrs() only checks that the ESPG Code is matching checks f.e. EPSG:4326

Modified: branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php	2009-06-26 08:28:23 UTC (rev 4238)
+++ branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php	2009-06-26 09:57:33 UTC (rev 4239)
@@ -611,11 +611,14 @@
 	//check SRS
 	var ind = parent.getMapObjIndexByName("mapframe1");
 	var submit = document.getElementById("submitButton");
-	if(global_wfsConfObj[global_selectedWfsConfId].featuretype_srs.toUpperCase()!=parent.mb_mapObj[ind].getSRS().toUpperCase()){
-		var msg = "Different EPSG of map and wfs featuretype, no spatial request possible!\n";
-		msg += parent.mb_mapObj[ind].getSRS()+" und "+global_wfsConfObj[global_selectedWfsConfId].featuretype_srs;
+	var patternString = parent.mb_mapObj[ind].getSRS().toUpperCase();
+	var pattern = new RegExp(patternString);
+
+if(global_wfsConfObj[global_selectedWfsConfId].featuretype_srs.match(pattern) == -1){
+		var msg = '<?php echo _mb("Different EPSG of map and wfs featuretype, no spatial request possible!");?>';
+		msg += parent.mb_mapObj[ind].getSRS()+"  -  "+global_wfsConfObj[global_selectedWfsConfId].featuretype_srs;
 		alert(msg);
-			
+				
 		//disable Submit Button
 		if(submit)submit.disabled = true;
 	}