[Mapbender-commits] r4252 - branches/2.6/http/javascripts trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2009-06-26 10:09:50 -0400 (Fri, 26 Jun 2009)
New Revision: 4252

Modified:
   branches/2.6/http/javascripts/mod_digitize_tab.php
   trunk/mapbender/http/javascripts/mod_digitize_tab.php
Log:
only throught EPSGMismatch Error when the EPSG Code differ

Modified: branches/2.6/http/javascripts/mod_digitize_tab.php
===================================================================
--- branches/2.6/http/javascripts/mod_digitize_tab.php	2009-06-26 12:50:13 UTC (rev 4251)
+++ branches/2.6/http/javascripts/mod_digitize_tab.php	2009-06-26 14:09:50 UTC (rev 4252)
@@ -1741,7 +1741,10 @@
 	var mapObjInd = parent.getMapObjIndexByName(mod_digitize_target);
 
 	var proceed = true;
-	if (myconf['featuretype_srs'] != parent.mb_mapObj[mapObjInd].epsg) {
+	var patternString = parent.mb_mapObj[mapObjInd].epsg.toUpperCase();
+	var pattern = new RegExp(patternString);
+
+	if(myconf['featuretype_srs'].match(pattern) == -1){
 		proceed = confirm(msgObj.errorMessageEpsgMismatch + parent.mb_mapObj[mapObjInd].epsg + " / "+ myconf['featuretype_srs'] + ". Proceed?");
 	}
 	if (proceed) {

Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_digitize_tab.php	2009-06-26 12:50:13 UTC (rev 4251)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php	2009-06-26 14:09:50 UTC (rev 4252)
@@ -2018,7 +2018,10 @@
 	var mapObjInd = parent.getMapObjIndexByName(mod_digitize_target);
 
 	var proceed = true;
-	if (myconf['featuretype_srs'] != parent.mb_mapObj[mapObjInd].epsg) {
+	var patternString = parent.mb_mapObj[mapObjInd].epsg.toUpperCase();
+	var pattern = new RegExp(patternString);
+
+	if(myconf['featuretype_srs'].match(pattern) == -1){
 		proceed = confirm(msgObj.errorMessageEpsgMismatch + parent.mb_mapObj[mapObjInd].epsg + " / "+ myconf['featuretype_srs'] + ". Proceed?");
 	}
 	if (proceed) {