[Mapbender-commits] r2407 - trunk/mapbender/conf
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Apr 23 12:00:49 EDT 2008
Author: christoph
Date: 2008-04-23 12:00:49 -0400 (Wed, 23 Apr 2008)
New Revision: 2407
Modified:
trunk/mapbender/conf/digitize_default.conf
trunk/mapbender/conf/mapbender.conf-dist
trunk/mapbender/conf/session.conf
trunk/mapbender/conf/wfs_default.conf
Log:
merge w/ 2.5 branch (2)
Modified: trunk/mapbender/conf/digitize_default.conf
===================================================================
--- trunk/mapbender/conf/digitize_default.conf 2008-04-23 15:59:31 UTC (rev 2406)
+++ trunk/mapbender/conf/digitize_default.conf 2008-04-23 16:00:49 UTC (rev 2407)
@@ -1,194 +1,20 @@
-//
-// Messages
-//
-var language = (function () {
- function constructorFunction(){
- this.de = "de";
- this.en = "en";
- }
- return new constructorFunction();
- }
-) ();
-var selectedLanguage = language.en;
+// * 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)
+// * Do not change the ID (first entry)!!
-var messageDescriptionPolygon = [];
-messageDescriptionPolygon[language.de] = "Polygon";
-messageDescriptionPolygon[language.en] = "polygon";
+addButtonDig("Point", 1, "point_off.png", "", "", 0, 0);
+addButtonDig("Line", 1, "line_off.png", "", "", 25, 0);
+addButtonDig("Polygon", 1, "polygon_off.png", "", "", 50, 0);
+addButtonDig("dragBasePoint", 1, "move_node_off.png", "", "", 75, 0);
+addButtonDig("setBasePoint", 1, "new_node_off.png", "", "", 100, 0);
+addButtonDig("delBasePoint", 1, "delete_node_off.png", "", "", 125, 0);
+addButtonDig("clear", 1, "del_off.png", "", "", 150, 0);
-var messageDescriptionLine = [];
-messageDescriptionLine[language.de] = "Linie";
-messageDescriptionLine[language.en] = "line";
-
-var messageDescriptionPoint = [];
-messageDescriptionPoint[language.de] = "Punkt";
-messageDescriptionPoint[language.en] = "point";
-
-var messageErrorNotAnInteger = [];
-messageErrorNotAnInteger[language.de] = "Kein Integer-Wert.";
-messageErrorNotAnInteger[language.en] = "Not an integer value.";
-
-var messageErrorNotAFloat = [];
-messageErrorNotAFloat[language.de] = "Kein Double-Wert.";
-messageErrorNotAFloat[language.en] = "Not a double value.";
-
-var messageErrorFieldIsEmpty = [];
-messageErrorFieldIsEmpty[language.de] = "Das Feld darf nicht leer sein.";
-messageErrorFieldIsEmpty[language.en] = "This field may not be empty.";
-
-var messageErrorFormEvaluation = [];
-messageErrorFormEvaluation[language.de] = "Fehler bei der Formularauswertung.";
-messageErrorFormEvaluation[language.en] = "Failure during form evaluation.";
-
-var messageErrorWfsWrite = [];
-messageErrorWfsWrite[language.de] = "Ein Fehler ist aufgetreten.";
-messageErrorWfsWrite[language.en] = "An error occured.";
-
-var messageSuccessWfsWrite = [];
-messageSuccessWfsWrite[language.de] = "Aktion erfolgreich beendet.";
-messageSuccessWfsWrite[language.en] = "Success.";
-
-var messageConfirmDeleteGeomFromDb = [];
-messageConfirmDeleteGeomFromDb[language.de] = "Geometrie in der Datenbank löschen?";
-messageConfirmDeleteGeomFromDb[language.en] = "Delete geometry from database?";
-
-var messageConfirmDeleteAllGeomFromList = [];
-messageConfirmDeleteAllGeomFromList[language.de] = "Soll die Geometrieliste wirklich geleert werden?";
-messageConfirmDeleteAllGeomFromList[language.en] = "Clear list of geometries?";
-
-var messageSelectAnOption = [];
-messageSelectAnOption[language.de] = "Bitte treffen Sie eine Auswahl.";
-messageSelectAnOption[language.en] = "Please select an entry.";
-
-var buttonLabelSaveGeometry = [];
-buttonLabelSaveGeometry[language.de] = "Speichern";
-buttonLabelSaveGeometry[language.en] = "Save";
-
-var buttonLabelUpdateGeometry = [];
-buttonLabelUpdateGeometry[language.de] = "Aktualisieren";
-buttonLabelUpdateGeometry[language.en] = "Update";
-
-var buttonLabelDeleteGeometry = [];
-buttonLabelDeleteGeometry[language.de] = "Löschen";
-buttonLabelDeleteGeometry[language.en] = "Delete";
-
-var buttonLabelAbort = [];
-buttonLabelAbort[language.de] = "Abbrechen";
-buttonLabelAbort[language.en] = "Abort";
-
-var errorMessageEpsgMismatch = [];
-errorMessageEpsgMismatch[language.de] = "Schwerwiegender Fehler: ungleiche EPSGs. ";
-errorMessageEpsgMismatch[language.en] = "Fatal error: EPSG mismatch. ";
-
-var errorMessageNoGeometrySelected = [];
-errorMessageNoGeometrySelected[language.de] = "Keine Geometrie ausgewählt!";
-errorMessageNoGeometrySelected[language.en] = "No geometry selected!";
-
-var buttonLabelPointOff = [];
-buttonLabelPointOff[language.de] = "Punkt hinzufügen";
-buttonLabelPointOff[language.en] = "add point";
-
-var buttonLabelPointOn = [];
-buttonLabelPointOn[language.de] = "Editieren abbrechen";
-buttonLabelPointOn[language.en] = "cancel editing";
-
-var buttonLabelLineOff = [];
-buttonLabelLineOff[language.de] = "Linie hinzufügen";
-buttonLabelLineOff[language.en] = "add line";
-
-var buttonLabelLineOn = [];
-buttonLabelLineOn[language.de] = "Linie abschliessen";
-buttonLabelLineOn[language.en] = "finish line";
-
-var buttonLabelPolygonOff = [];
-buttonLabelPolygonOff[language.de] = "Polygon hinzufügen";
-buttonLabelPolygonOff[language.en] = "add polygon";
-
-var buttonLabelPolygonOn = [];
-buttonLabelPolygonOn[language.de] = "Polygon schliessen";
-buttonLabelPolygonOn[language.en] = "close polygon";
-
-var buttonLabelMoveBasepointOff = [];
-buttonLabelMoveBasepointOff[language.de] = "Stützpunkt verschieben";
-buttonLabelMoveBasepointOff[language.en] = "move basepoint";
-
-var buttonLabelMoveBasepointOn = [];
-buttonLabelMoveBasepointOn[language.de] = "Stützpunkt verschieben";
-buttonLabelMoveBasepointOn[language.en] = "move basepoint";
-
-var buttonLabelInsertBasepointOff = [];
-buttonLabelInsertBasepointOff[language.de] = "Stützpunkt einfügen";
-buttonLabelInsertBasepointOff[language.en] = "Insert basepoint";
-
-var buttonLabelInsertBasepointOn = [];
-buttonLabelInsertBasepointOn[language.de] = "Stützpunkt einfügen";
-buttonLabelInsertBasepointOn[language.en] = "Insert basepoint";
-
-var buttonLabelDeleteBasepointOff = [];
-buttonLabelDeleteBasepointOff[language.de] = "Stützpunkt löschen";
-buttonLabelDeleteBasepointOff[language.en] = "Delete basepoint";
-
-var buttonLabelDeleteBasepointOn = [];
-buttonLabelDeleteBasepointOn[language.de] = "Stützpunkt löschen";
-buttonLabelDeleteBasepointOn[language.en] = "Delete basepoint";
-
-var buttonLabelClearListOff = [];
-buttonLabelClearListOff[language.de] = "Geometrieliste leeren";
-buttonLabelClearListOff[language.en] = "clear list of geometries";
-
-var buttonLabelClearListOn = [];
-buttonLabelClearListOn[language.de] = "Geometrieliste leeren";
-buttonLabelClearListOn[language.en] = "clear list of geometries";
-
-//
-// Buttons
-//
-function addButtonDig(id, isOn, src, titleOff, titleOn, x, y) {
- buttonDig_id.push(id);
- buttonDig_on.push(isOn);
- buttonDig_src.push(src);
- buttonDig_title_off.push(titleOff);
- buttonDig_title_on.push(titleOn);
- buttonDig_x.push(x);
- buttonDig_y.push(y);
-}
-
-var buttonDig_imgdir = "../img/button_digitize/";
-var buttonDig_id = [];
-var buttonDig_on = [];
-var buttonDig_src = [];
-var buttonDig_title_off = [];
-var buttonDig_title_on = [];
-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);
-addButtonDig("dragBasePoint", 1, "move_node_off.png", buttonLabelMoveBasepointOff[selectedLanguage], buttonLabelMoveBasepointOn[selectedLanguage], 75, 0);
-addButtonDig("setBasePoint", 1, "new_node_off.png", buttonLabelInsertBasepointOff[selectedLanguage], buttonLabelInsertBasepointOn[selectedLanguage], 100, 0);
-addButtonDig("delBasePoint", 1, "delete_node_off.png", buttonLabelDeleteBasepointOff[selectedLanguage], buttonLabelDeleteBasepointOn[selectedLanguage], 125, 0);
-addButtonDig("clear", 1, "del_off.png", buttonLabelClearListOff[selectedLanguage], buttonLabelClearListOn[selectedLanguage], 150, 0);
-//addButtonDig("combine", 1, "combine_off.png", "combine to multigeometry", "combine to multigeometry", 175, 0);
-
var buttonDig_wfs_src = "geomInfo.png";
-
-var buttonDig_wfs_title = [];
-buttonDig_wfs_title[language.de] = "speichern / aktualisieren / löschen";
-buttonDig_wfs_title[language.en] = "save / update / delete";
-
var buttonDig_remove_src = "geomRemove.png";
-var buttonDig_remove_title = [];
-buttonDig_remove_title[language.de] = "aus der Liste entfernen";
-buttonDig_remove_title[language.en] = "remove from workspace";
-
var buttonDig_removeDb_src = "geomRemoveDb.png";
-var buttonDig_removeDb_title = [];
-buttonDig_removeDb_title[language.de] = "aus der Datenbank löschen";
-buttonDig_removeDb_title[language.en] = "remove from database";
-var closePolygon_title = "click the first basepoint to close the polygon";
-
var dotDistance = 7;
var geomList_x = 20;
var geomList_y = 50;
@@ -207,15 +33,16 @@
//
var measureTagName = "dependentDiv";
var measureTagTarget = "";
-var measureTagLabelCurrent = [];
-measureTagLabelCurrent[language.de] = "Letztes Segment: ";
-measureTagLabelCurrent[language.en] = "Current: ";
-var measureTagLabelTotal = [];
-measureTagLabelTotal[language.de] = "Gesamtlänge: ";
-measureTagLabelTotal[language.en] = "Total: ";
-
-var measureTagStyle = {"position":"absolute", "top":"530px", "left":"250px", "width":"5000px", "height":"30px", "z-index":"100"}; //style is ignored when tag already exists
+//style is ignored when tag already exists
+var measureTagStyle = {
+ position:"absolute",
+ top:"530px",
+ left:"250px",
+ width:"5000px",
+ height:"30px",
+ zIndex:"1"
+};
var measureNumberOfDigits = 3;
var showSaveButtonForExistingGeometries = false;
@@ -227,8 +54,4 @@
var wfsWindowWidth = 400;
var wfsWindowHeight = 300;
-var digitizeDefaultGeometryName = [];
-digitizeDefaultGeometryName[language.de] = "neu";
-digitizeDefaultGeometryName[language.en] = "new";
-
-var spatialRequestResultToDigitize = 0;
+var spatialRequestResultToDigitize = 1;
\ No newline at end of file
Modified: trunk/mapbender/conf/mapbender.conf-dist
===================================================================
--- trunk/mapbender/conf/mapbender.conf-dist 2008-04-23 15:59:31 UTC (rev 2406)
+++ trunk/mapbender/conf/mapbender.conf-dist 2008-04-23 16:00:49 UTC (rev 2407)
@@ -8,8 +8,8 @@
# --------------------------------------------
-define("SYS_DBTYPE", "mysql");
-#define("SYS_DBTYPE", "pgsql");
+#define("SYS_DBTYPE", "mysql");
+define("SYS_DBTYPE", "pgsql");
# --------------------------------------------
# database information
@@ -23,7 +23,7 @@
define("OWNER", "<owner>");
define("PW", "<password>");
- include_once("../../http/php/database-mysql.php");
+ include_once(dirname(__FILE__) . "/../http/php/database-mysql.php");
# --------------------------------------------
# database with geos functions
@@ -43,7 +43,7 @@
define("OWNER", "<owner>");
define("PW", "<password>");
- include_once("../../http/php/database-pgsql.php");
+ include_once(dirname(__FILE__) . "/../http/php/database-pgsql.php");
}
# --------------------------------------------
@@ -139,10 +139,19 @@
# Mapbender error logging
# --------------------------------------------
-define("LOG_LEVEL_LIST", "off,error,warning,notice,all");
-define("LOG_LEVEL", "all");
-define("LOG_JS", "on"); // "on", "alert", "console", "off"
+define("LOG_LEVEL", "error"); //"off","error","warning","notice" or "all"
+define("LOG_JS", "on"); // "on", "alert", "console" or "off"
+# --------------------------------------------
+# Internationalization
+# --------------------------------------------
+
+define("USE_I18N", false); // requires gettext for PHP.
+ // If "false", LANGUAGE is set to english
+define("LANGUAGE", "en"); // only available if USE_I18N is "true".
+ // "en", "de", "bg", "gr", "nl", "it", es"
+require_once(dirname(__FILE__) . "/../lib/i18n.php");
+
###HACK for GLOBALS
$DBSERVER=DBSERVER;
$DB=DB;
Modified: trunk/mapbender/conf/session.conf
===================================================================
--- trunk/mapbender/conf/session.conf 2008-04-23 15:59:31 UTC (rev 2406)
+++ trunk/mapbender/conf/session.conf 2008-04-23 16:00:49 UTC (rev 2407)
@@ -4,9 +4,22 @@
$_SESSION["mb_user_name"] = $name;
$_SESSION["mb_user_ip"] = $_SERVER['REMOTE_ADDR'];
$_SESSION["mb_myBBOX"] = $_REQUEST["mb_myBBOX"];
-$_SESSION["mb_myWmc"] = $_REQUEST["wmc_id"];
$_SESSION["mb_myKml"] = $_REQUEST["kml_id"];
$_SESSION["mb_myPOI"] = $_REQUEST["mb_myPOI"];
$_SESSION["mb_myPOI2SCALE"] = $_REQUEST["mb_myPOI2SCALE"];
-$_SESSION["mb_lang"] = $_REQUEST["mb_lang"];
+
+$_SESSION["mb_myWmc"] = "";
+$_SESSION["mb_myWmc_action"] = "";
+if ($_REQUEST["wmc_id"]) {
+ $_SESSION["mb_myWmc"] = $_REQUEST["wmc_id"];
+ $_SESSION["mb_myWmc_action"] = "load";
+}
+else if ($_REQUEST["merge_wmc_id"]) {
+ $_SESSION["mb_myWmc"] = $_REQUEST["merge_wmc_id"];
+ $_SESSION["mb_myWmc_action"] = "merge";
+}
+else if ($_REQUEST["append_wmc_id"]) {
+ $_SESSION["mb_myWmc"] = $_REQUEST["append_wmc_id"];
+ $_SESSION["mb_myWmc_action"] = "append";
+}
?>
\ No newline at end of file
Modified: trunk/mapbender/conf/wfs_default.conf
===================================================================
--- trunk/mapbender/conf/wfs_default.conf 2008-04-23 15:59:31 UTC (rev 2406)
+++ trunk/mapbender/conf/wfs_default.conf 2008-04-23 16:00:49 UTC (rev 2407)
@@ -26,7 +26,7 @@
var wfsResultModulePath = "php/";
var wfsResultModuleFilename = "mod_wfs_result.php";
-var wfsResultToPopupDiv = 1;
+var wfsResultToPopupDiv = 0;
var searchPopupTitle = "Search results";
var searchPopupWidth = 300;
var searchPopupHeight =250;
More information about the Mapbender_commits
mailing list