[Mapbender-commits] r6200 - trunk/mapbender/http/plugins
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed May 12 06:33:14 EDT 2010
Author: astrid_emde
Date: 2010-05-12 06:33:05 -0400 (Wed, 12 May 2010)
New Revision: 6200
Modified:
trunk/mapbender/http/plugins/mb_handleStartUpWmsParams.php
Log:
added element_var errormessages
Modified: trunk/mapbender/http/plugins/mb_handleStartUpWmsParams.php
===================================================================
--- trunk/mapbender/http/plugins/mb_handleStartUpWmsParams.php 2010-05-12 10:27:08 UTC (rev 6199)
+++ trunk/mapbender/http/plugins/mb_handleStartUpWmsParams.php 2010-05-12 10:33:05 UTC (rev 6200)
@@ -19,6 +19,10 @@
* > 'div','../plugins/mb_handleStartUpWmsParams.php','',
* > 'mapframe1','','http://www.mapbender.org/index.php/HandleStartUpWmsParams');
* >
+ * > INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context,
+ * > var_type) VALUES('<appId>', 'handleStartUpWmsParams', 'errormessages',
+ * > 'log', 'log or alert if layer are not present, default is log' ,'var');
+ *
*
* Help:
* http://www.mapbender.org/HandleStartUpWmsParams
@@ -73,6 +77,12 @@
echo "var apiDisableLayersRegExpr = '" . $apiDisableLayersRegExpr . "';";
echo "var apiDisableQueryLayersRegExpr = '" . $apiDisableQueryLayersRegExpr . "';";
?>
+
+options.errormessages = typeof options.errormessages === "undefined" ? "log" : options.errormessages;
+
+var errormessages = options.errormessages;
+
+
// set background WMS
Mapbender.events.init.register(function () {
if (apiBackgroundWms !== '') {
@@ -209,8 +219,11 @@
if(visibleLayerNotFound.length > 0) {
var visibleLayerString = visibleLayerNotFound.join(",");
var visibleLayerNotFoundMsg = "Visible layer " + visibleLayerString + " not found.";
- new Mapbender.Notice(visibleLayerNotFoundMsg);
- //alert(visibleLayerNotFoundMsg);
+ if(errormessages == 'alert'){
+ alert(visibleLayerNotFoundMsg);
+ }else{
+ new Mapbender.Exception(visibleLayerNotFoundMsg);
+ }
}
}
@@ -219,34 +232,46 @@
if(queryLayerNotFound.length > 0) {
var queryLayerString = queryLayerNotFound.join(",");
var queryLayerNotFoundMsg = "Query layer " + queryLayerString + " not found.";
- new Mapbender.Notice(queryLayerNotFoundMsg);
- //alert(queryLayerNotFoundMsg);
+ if(errormessages == 'alert'){
+ alert(queryLayerNotFoundMsg);
+ }else{
+ new Mapbender.Notice(queryLayerNotFoundMsg);
+ }
}
}
if (apiVisibleLayersRegExpr !== "") {
if(currentVisibleLayerMatchTrue === false) {
var visibleLayerNotFoundMsg = "No visible layer matches the given regular expression.";
- new Mapbender.Notice(visibleLayerNotFoundMsg);
- //alert(visibleLayerNotFoundMsg);
+ if(errormessages == 'alert'){
+ alert(visibleLayerNotFoundMsg);
+ }else{
+ new Mapbender.Exception(visibleLayerNotFoundMsg);
+ }
}
}
if (apiQueryLayersRegExpr !== "") {
if(currentQueryLayerMatchTrue === false) {
var queryLayerNotFoundMsg = "No queryable layer matches the given regular expression.";
- new Mapbender.Notice(queryLayerNotFoundMsg);
- //alert(queryLayerNotFoundMsg);
+ if(errormessages == 'alert'){
+ alert(queryLayerNotFoundMsg);
+ }else{
+ new Mapbender.Exception(queryLayerNotFoundMsg);
+ }
}
}
if(apiDisableLayers !== "") {
var disableLayerNotFound = array_diff(apiDisableLayerArray, checkForDisableLayerArray);
if(disableLayerNotFound.length > 0) {
- var disableLayerString = DisableLayerNotFound.join(",");
- var disableLayerNotFoundMsg = "Disable Layer: Disable layer " + DisableLayerString + " not found.";
- new Mapbender.Notice(disableLayerNotFoundMsg);
- //alert(disableLayerNotFoundMsg);
+ var disableLayerString = disableLayerNotFound.join(",");
+ var disableLayerNotFoundMsg = "Disable Layer: Disable layer " + disableLayerString + " not found.";
+ if(errormessages == 'alert'){
+ alert(disableLayerNotFoundMsg);
+ }else{
+ new Mapbender.Exception(disableLayerNotFoundMsg);
+ }
}
}
@@ -255,24 +280,34 @@
if(disableQueryLayerNotFound.length > 0) {
var disableQueryLayerString = disableQueryLayerNotFound.join(",");
var disableQueryLayerNotFoundMsg = "Disable Query Layer: Query layer " + disableQueryLayerString + " not found.";
- new Mapbender.Notice(disableQueryLayerNotFoundMsg);
- //alert(disableQueryLayerNotFoundMsg);
+ if(errormessages == 'alert'){
+ alert(disableQueryLayerNotFoundMsg);
+ }else{
+ new Mapbender.Exception(disableQueryLayerNotFoundMsg);
+ }
+
}
}
if (apiDisableLayersRegExpr !== "") {
if(currentDisableLayerMatchTrue === false) {
- var disableLayerNotFoundMsg = "Disable LAyer: No visible layer matches the given regular expression.";
- new Mapbender.Notice(disableLayerNotFoundMsg);
- //alert(disableLayerNotFoundMsg);
+ var disableLayerNotFoundMsg = "Disable Layer: No visible layer matches the given regular expression.";
+ if(errormessages == 'alert'){
+ alert(disableLayerNotFoundMsg);
+ }else{
+ new Mapbender.Exception(disableLayerNotFoundMsg);
+ }
}
}
if (apiDisableQueryLayersRegExpr !== "") {
if(currentDisableQueryLayerMatchTrue === false) {
var disableQueryLayerNotFoundMsg = "Disable Query Layer: No queryable layer matches the given regular expression.";
- new Mapbender.Notice(disableQueryLayerNotFoundMsg);
- //alert(disableQueryLayerNotFoundMsg);
+ if(errormessages == 'alert'){
+ alert(disableQueryLayerNotFoundMsg);
+ }else{
+ new Mapbender.Exception(disableQueryLayerNotFoundMsg);
+ }
}
}
@@ -284,11 +319,11 @@
function array_diff(a1, a2) {
var a=[], diff=[];
- for(var i=0;i<a1.length;i++) {
+ for(var i=0;i < a1.length;i++) {
a[a1[i]]=true;
}
- for(var i=0;i<a2.length;i++) {
+ for(var i=0;i < a2.length;i++) {
if(a[a2[i]]) {
delete a[a2[i]];
}
More information about the Mapbender_commits
mailing list