[Mapbender-commits] r1842 - branches/mapbender_sld/conf

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-11-23 08:54:26 -0500 (Fri, 23 Nov 2007)
New Revision: 1842

Modified:
   branches/mapbender_sld/conf/digitize_default.conf
   branches/mapbender_sld/conf/mapbender.conf-dist
   branches/mapbender_sld/conf/session.conf
   branches/mapbender_sld/conf/wfs_default.conf
Log:
updated conf files

Modified: branches/mapbender_sld/conf/digitize_default.conf
===================================================================
--- branches/mapbender_sld/conf/digitize_default.conf	2007-11-23 13:53:03 UTC (rev 1841)
+++ branches/mapbender_sld/conf/digitize_default.conf	2007-11-23 13:54:26 UTC (rev 1842)
@@ -161,6 +161,7 @@
 var buttonDig_x = [];
 var buttonDig_y = [];
 
+//List of buttons for digitizing within the tabulator 'Digitize'. Set the first 1 in row to 0 to disable digitizing for a certain kind of digitizing (e.g. point, line, or polygon)
 addButtonDig("Point", 1, "point_off.png", buttonLabelPointOff[selectedLanguage], buttonLabelPointOn[selectedLanguage], 0, 0);
 addButtonDig("Line", 1, "line_off.png", buttonLabelLineOff[selectedLanguage], buttonLabelLineOn[selectedLanguage], 25, 0);
 addButtonDig("Polygon", 1, "polygon_off.png", buttonLabelPolygonOff[selectedLanguage], buttonLabelPolygonOn[selectedLanguage], 50, 0);

Modified: branches/mapbender_sld/conf/mapbender.conf-dist
===================================================================
--- branches/mapbender_sld/conf/mapbender.conf-dist	2007-11-23 13:53:03 UTC (rev 1841)
+++ branches/mapbender_sld/conf/mapbender.conf-dist	2007-11-23 13:54:26 UTC (rev 1842)
@@ -1,5 +1,8 @@
 <?php
-
+# $Id: mapbender.conf-dist 1425 2007-06-04 08:22:49Z christoph $
+# http://www.mapbender.org/index.php/Mapbender.conf
+# Copyright (C) 2002 CCGIS 
+ 
 # --------------------------------------------
 # type of mapbender database
 # --------------------------------------------
@@ -44,7 +47,7 @@
 }
 
 # --------------------------------------------
-# perpared statements (PHP > 5.1.x, PostgreSQL > 7.4)
+# prepared statements (PHP > 5.1.x, PostgreSQL > 7.4)
 # --------------------------------------------
 define("PREPAREDSTATEMENTS",true);
 
@@ -132,11 +135,13 @@
 define("TIME_LIMIT", "300");
 define("PHP_PATH", "/usr/local/bin/");
 
-define("LOG_LEVEL_LIST", "off,error,warning,all");
-define("LOG_LEVEL", "warning");
+# --------------------------------------------
+# Mapbender error logging
+# --------------------------------------------
 
-// "on", "alert", "console", "off"
-define("LOG_JS", "on");
+define("LOG_LEVEL_LIST", "off,error,warning,notice,all");
+define("LOG_LEVEL", "all");
+define("LOG_JS", "on"); // "on", "alert", "console", "off"
 
 ###HACK for GLOBALS
 $DBSERVER=DBSERVER;

Modified: branches/mapbender_sld/conf/session.conf
===================================================================
--- branches/mapbender_sld/conf/session.conf	2007-11-23 13:53:03 UTC (rev 1841)
+++ branches/mapbender_sld/conf/session.conf	2007-11-23 13:54:26 UTC (rev 1842)
@@ -8,4 +8,5 @@
 $_SESSION["mb_myKml"] = $_REQUEST["kml_id"];
 $_SESSION["mb_myPOI"] = $_REQUEST["mb_myPOI"];
 $_SESSION["mb_myPOI2SCALE"] = $_REQUEST["mb_myPOI2SCALE"];
+$_SESSION["mb_lang"] = $_REQUEST["mb_lang"];
 ?>
\ No newline at end of file

Modified: branches/mapbender_sld/conf/wfs_default.conf
===================================================================
--- branches/mapbender_sld/conf/wfs_default.conf	2007-11-23 13:53:03 UTC (rev 1841)
+++ branches/mapbender_sld/conf/wfs_default.conf	2007-11-23 13:54:26 UTC (rev 1842)
@@ -1,68 +1,17 @@
-var language = (function () {
-		function constructorFunction(){
-			this.de = "de";
-			this.en = "en";
-		}
-		return new constructorFunction();
-	}
-) ();
-var selectedLanguage = language.en;
+var buttonRectangle = {"status":1, "x":750, "y":10, "img":"select_rectangle_off.png"};
+var buttonPolygon = {"status":1, "x":780, "y":10, "img":"select_polygon_off.png"};
+var buttonPoint = {"status":1, "x":810, "y":10, "img":"select_point_off.png"};
+var buttonExtent = {"status":1, "x":840, "y":10, "img":"select_extent_off.png"};
+var buttonDialogue = {"status":1, "x":870, "y":10, "img":"select_choose_off.png"};
 
-function addButtonWfs(id, isOn, src, titleOff, titleOn, x, y) {
-	buttonWfs_id.push(id);
-	buttonWfs_on.push(isOn);
-	buttonWfs_src.push(src);
-	buttonWfs_title_off.push(titleOff);
-	buttonWfs_title_on.push(titleOn);
-	buttonWfs_x.push(x);
-	buttonWfs_y.push(y);
-}
-
 var buttonWfs_imgdir = "../img/button_gray/";
 var buttonWfs_zIndex = 10;
-var buttonWfs_id = [];
-var buttonWfs_on = [];
-var buttonWfs_src = [];
-var buttonWfs_title_off = [];
-var buttonWfs_title_on = [];
-var buttonWfs_x = [];
-var buttonWfs_y = [];
 
-var buttonLabelRectangle = [];
-buttonLabelRectangle[language.de] = "Rechteckauswahl";
-buttonLabelRectangle[language.en] = "select by rectangle";
-
-var buttonLabelPolygon = [];
-buttonLabelPolygon[language.de] = "Polygonauswahl";
-buttonLabelPolygon[language.en] = "select by polygon";
-
-var buttonLabelPoint = [];
-buttonLabelPoint[language.de] = "Punktauswahl";
-buttonLabelPoint[language.en] = "select by point";
-
-var buttonLabelExtent = [];
-buttonLabelExtent[language.de] = "Universalauswahl";
-buttonLabelExtent[language.en] = "select by extent";
-
-var buttonLabelDialogue = [];
-buttonLabelDialogue[language.de] = "Auswahlfenster öffnen";
-buttonLabelDialogue[language.en] = "open dialogue form";
-
-addButtonWfs("rectangle", 0, "select_rectangle_off.png", buttonLabelRectangle[selectedLanguage], buttonLabelRectangle[selectedLanguage], 750, 10);
-addButtonWfs("polygon", 0, "select_polygon_off.png", buttonLabelPolygon[selectedLanguage], buttonLabelPolygon[selectedLanguage], 780, 10);
-addButtonWfs("point", 1, "select_point_off.png", buttonLabelPoint[selectedLanguage], buttonLabelPoint[selectedLanguage], 810, 10);
-addButtonWfs("extent", 0, "select_extent_off.png", buttonLabelExtent[selectedLanguage], buttonLabelExtent[selectedLanguage], 840, 10);
-addButtonWfs("dialogue", 0, "select_choose_off.png", buttonLabelDialogue[selectedLanguage], buttonLabelDialogue[selectedLanguage], 870, 10);
-
 var buttonWfs_toDigitize_on = 1;
 var buttonWfs_toDigitize_src = "../img/wfs_digitize.png";
 
 var generalHighlightZIndex = 90;
 var generalHighlightLineWidth = 2;
 
-var errorMessageInvalidExtent = [];
-errorMessageInvalidExtent[selectedLanguage] = "Ausschnitt ungültig!";
-errorMessageInvalidExtent[selectedLanguage] = "Invalid box!";
-
 var wfsResultModulePath = "php/";
 var wfsResultModuleFilename = "mod_wfs_result.php";
\ No newline at end of file