[Mapbender-commits] r2133 - in branches/2.5: http/classes http/html
http/javascripts http/php resources/db/update
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Feb 20 11:07:05 EST 2008
Author: nimix
Date: 2008-02-20 11:07:05 -0500 (Wed, 20 Feb 2008)
New Revision: 2133
Modified:
branches/2.5/http/classes/class_wmc.php
branches/2.5/http/classes/class_wms.php
branches/2.5/http/html/mod_treefolder2.php
branches/2.5/http/javascripts/map_obj.js
branches/2.5/http/php/mod_WMSpreferences.php
branches/2.5/http/php/mod_editGuiWms.php
branches/2.5/resources/db/update/update_mysql_db.sql
branches/2.5/resources/db/update/update_postgresql_db.sql
Log:
add proper opacity handeling with startopacity
Modified: branches/2.5/http/classes/class_wmc.php
===================================================================
--- branches/2.5/http/classes/class_wmc.php 2008-02-20 15:32:12 UTC (rev 2132)
+++ branches/2.5/http/classes/class_wmc.php 2008-02-20 16:07:05 UTC (rev 2133)
@@ -1153,7 +1153,7 @@
$this->wmc_wms_serviceURL[$i] ."','" .
$this->wmc_layer_style_legendurl[$i][0] ."','','".
$wms_data_format ."','text/html','application/vnd.ogc.se_xml','".
- $this->wmc_bBox_SRS ."','1');\n";
+ $this->wmc_bBox_SRS ."','1','100','');\n";
$added_wms[count($added_wms)] = $current_wms;
$cnt_wms++;
Modified: branches/2.5/http/classes/class_wms.php
===================================================================
--- branches/2.5/http/classes/class_wms.php 2008-02-20 15:32:12 UTC (rev 2132)
+++ branches/2.5/http/classes/class_wms.php 2008-02-20 16:07:05 UTC (rev 2133)
@@ -516,6 +516,7 @@
}
#some default
$this->gui_wms_visible = 1;
+ $this->gui_wms_opacity = 100;
/*if the rootlayer has no epsg...*/
if($this->objLayer[0]->layer_epsg[0]["epsg"] == ""){
$this->objLayer[0]->layer_epsg = $this->objLayer[1]->layer_epsg;
@@ -641,6 +642,7 @@
echo "gui_wms_epsg: " . $this->gui_wms_epsg . " <br>";
echo "wms_srs: " . $this->objLayer[0]->wms_srs1 . " <br>";
echo "gui_wms_visible: " . $this->gui_wms_visible . " <br>";
+ echo "gui_wms_opacity: " . $this->gui_wms_opacity . " <br>";
echo "support_sld: " . $this->wms_supportsld . " <br>";
for($i=0; $i<count($this->data_type);$i++){
@@ -704,6 +706,7 @@
"'" . $this->gui_wms_exceptionformat . "'," .
"'" . $this->gui_wms_epsg ."'," .
"'" . $this->gui_wms_visible ."'," .
+ "'" . $this->gui_wms_opacity ."'," .
"'" . $this->gui_wms_sldurl ."" .
"');";
echo $add_wms_string;
@@ -795,6 +798,7 @@
$this->gui_wms_exceptionformat . "','".
$this->gui_wms_epsg ."','".
$this->gui_wms_visible ."','".
+ $this->gui_wms_opacity ."','".
$this->gui_wms_sldurl ."');\n");
for($i=0;$i<count($this->data_format);$i++){
@@ -1525,6 +1529,7 @@
$this->gui_wms_exceptionformat=$row["gui_wms_exceptionformat"];
$this->gui_wms_epsg=$row["gui_wms_epsg"];
$this->gui_wms_visible = $row["gui_wms_visible"];
+ $this->gui_wms_opacity = $row["gui_wms_opacity"];
$this->gui_wms_sldurl = $row["gui_wms_sldurl"];
$sql = "Select * from wms where wms_id = $1 ";
Modified: branches/2.5/http/html/mod_treefolder2.php
===================================================================
--- branches/2.5/http/html/mod_treefolder2.php 2008-02-20 15:32:12 UTC (rev 2132)
+++ branches/2.5/http/html/mod_treefolder2.php 2008-02-20 16:07:05 UTC (rev 2133)
@@ -318,42 +318,11 @@
}
function handleOpacity(mapObj_id, wms_id, increment) {
-
- if (parent.mb_mapObj[mapObj_id].wms[wms_id].gui_wms_visible > 0) {
- wmsImage = parent.mapframe1.document.getElementById('div_'+wms_id);
- if (wmsImage != null) {
- opacity = wmsImage.style.opacity*100 - (-increment);
- opacity = (opacity < 100)? ((opacity > 0)? opacity : 0) : 100;
- parent.mb_mapObj[mapObj_id].wms[wms_id].gui_wms_mapopacity = (opacity / 100);
- applyOpacity(wms_id, opacity);
- }
- }
+ var opacity = parent.mb_mapObj[mapObj_id].wms[wms_id].gui_wms_mapopacity*100 + increment;
+ parent.mb_mapObj[mapObj_id].wms[wms_id].setOpacity(opacity);
reloadTree();
}
-function applyOpacity(wms_id, opacity) {
- if (parent.mb_mapObj[mapObj_id].wms[wms_id].gui_wms_visible > 0) {
- var divId = 'div_'+wms_id;
- wmsImage = parent.mapframe1.document.getElementById(divId);
- if (wmsImage != null && !isNaN(opacity)) {
- wmsImage.style.opacity = (opacity / 100);
- wmsImage.style.MozOpacity = (opacity / 100);
- wmsImage.style.KhtmlOpacity = (opacity / 100);
- wmsImage.style.filter = "alpha(opacity=" + opacity + ")";
- }
- }
-}
-
-function applyOpacityForAllWms (mapObj_name) {
- mapObj_id = parent.getMapObjIndexByName(mapObj_name);
- for (var i = 0; i < parent.mb_mapObj[mapObj_id].wms.length; i++) {
- var opacity = parent.mb_mapObj[mapObj_id].wms[i].gui_wms_mapopacity * 100;
- applyOpacity(i, opacity);
- }
-}
-
-parent.mb_registerSubFunctions("window.frames['treeGDE'].applyOpacityForAllWms('mapframe1')");
-
//---end------------- opacity --------------------
function move_up(j,k,l){
Modified: branches/2.5/http/javascripts/map_obj.js
===================================================================
--- branches/2.5/http/javascripts/map_obj.js 2008-02-20 15:32:12 UTC (rev 2132)
+++ branches/2.5/http/javascripts/map_obj.js 2008-02-20 16:07:05 UTC (rev 2133)
@@ -24,6 +24,7 @@
* @param {String} gui_wms_exceptionformat the exceptionformat for map requests
* @param {String} gui_wms_epsg the current srs
* @param {Integer} gui_wms_visible the visibility of this service
+ * @param {Integer} gui_wms_opacity the initial display opacity in percent
* @param {String} gui_wms_sldurl url to an actual sld
*/
function add_wms(
@@ -40,6 +41,7 @@
gui_wms_exceptionformat,
gui_wms_epsg,
gui_wms_visible,
+ gui_wms_opacity,
gui_wms_sldurl){
wms[wms.length] = new wms_const(
wms_id,
@@ -55,6 +57,7 @@
gui_wms_exceptionformat,
gui_wms_epsg,
parseInt(gui_wms_visible, 10),
+ parseInt(gui_wms_opacity),
gui_wms_sldurl);
wms_layer[wms.length - 1] = [];
}
@@ -75,6 +78,7 @@
* @param {String} gui_wms_exceptionformat the exceptionformat for map requests
* @param {String} gui_wms_epsg the current srs
* @param {String} gui_wms_visible the visibility of this service
+ * @param {Integer} gui_wms_opacity the initial display opacity in percent
* @param {String} gui_wms_sldurl url to an actual sld
*
*/
@@ -92,6 +96,7 @@
gui_wms_exceptionformat,
gui_wms_epsg,
gui_wms_visible,
+ gui_wms_opacity,
gui_wms_sldurl){
if (!wms_id) {
@@ -130,7 +135,7 @@
this.gui_maxy = [];
// opacity version
- this.gui_wms_mapopacity = 1;
+ this.gui_wms_mapopacity = gui_wms_opacity/100;
// sld version
this.gui_wms_sldurl = gui_wms_sldurl;
}
@@ -217,6 +222,43 @@
};
/**
+ * sets Opacity of WMS
+ *
+ * @param {Integer} new opacity percentage value
+ */
+wms_const.prototype.setOpacity = function(opacity){
+ //calc new opacity
+ this.gui_wms_mapopacity = parseInt(opacity)/100;
+ if(this.gui_wms_mapopacity>1||isNaN(this.gui_wms_mapopacity))
+ this.gui_wms_mapopacity=1;
+ if(this.gui_wms_mapopacity<0)
+ this.gui_wms_mapopacity=0;
+
+ if (this.gui_wms_visible > 0) {
+
+ //get div id
+ var divId = null;
+ for (var i=0; i < wms.length; i++) {
+ if (this.wms_id == wms[i].wms_id) {
+ var divId = 'div_'+i;
+ break;
+ }
+ }
+ if(!divId)
+ return;
+
+ //TODO: check if mapframe1 is the right mapframe
+ wmsImage = parent.mapframe1.document.getElementById(divId);
+ if (wmsImage != null) {
+ wmsImage.style.opacity = this.gui_wms_mapopacity;
+ wmsImage.style.MozOpacity = this.gui_wms_mapopacity;
+ wmsImage.style.KhtmlOpacity = this.gui_wms_mapopacity;
+ wmsImage.style.filter = "alpha(opacity=" + this.gui_wms_mapopacity*100 + ")";
+ }
+ }
+}
+
+/**
* get all visible layers
*
* @return array of layernames
Modified: branches/2.5/http/php/mod_WMSpreferences.php
===================================================================
--- branches/2.5/http/php/mod_WMSpreferences.php 2008-02-20 15:32:12 UTC (rev 2132)
+++ branches/2.5/http/php/mod_WMSpreferences.php 2008-02-20 16:07:05 UTC (rev 2133)
@@ -115,26 +115,15 @@
// Opacity version
-function setMapOpacity(val) {
- var tmp = val.split(",");
- my.wms[tmp[0]].gui_wms_mapopacity = tmp[1];
- loadWMS();
+function cambia_opacity(id,incremento){
+ opacity = my.wms[id].gui_wms_mapopacity*100 + parseInt(incremento);
+ my.wms[id].setOpacity(opacity);
+ loadWMS();
}
-function cambia_opacity(id,incremento){
- objeto = opener.mapframe1.document.getElementById('div_'+id);
- opacity = objeto.style.opacity*100 - (-incremento);
- opacity = (opacity < 100)? ((opacity > 0)? opacity : 0) : 100;
- objeto.style.opacity = (opacity / 100);
- objeto.style.MozOpacity = (opacity / 100);
- objeto.style.KhtmlOpacity = (opacity / 100);
- objeto.style.filter = "alpha(opacity=" + opacity + ")";
- setMapOpacity(id+","+(opacity / 100));
-}
-
function setMapformat(val){
var tmp = val.split(",");
my.wms[tmp[0]].gui_wms_mapformat = tmp[1];
Modified: branches/2.5/http/php/mod_editGuiWms.php
===================================================================
--- branches/2.5/http/php/mod_editGuiWms.php 2008-02-20 15:32:12 UTC (rev 2132)
+++ branches/2.5/http/php/mod_editGuiWms.php 2008-02-20 16:07:05 UTC (rev 2133)
@@ -258,19 +258,19 @@
if(isset($this_gui_wms_epsg)){
$sql = "UPDATE gui_wms set gui_wms_epsg = $1, gui_wms_mapformat = $2, ";
$sql .= "gui_wms_featureinfoformat = $3, gui_wms_exceptionformat = $4, ";
- $sql .= "gui_wms_visible = $5, gui_wms_sldurl = $6 ";
- $sql .= "WHERE fkey_gui_id = $7 AND fkey_wms_id = $8";
- $v = array($this_gui_wms_epsg,$this_gui_wms_mapformat,$this_gui_wms_featureinfoformat,$this_gui_wms_exceptionformat,$this_gui_wms_visible,$this_gui_wms_sldurl,$this_gui,$this_wms);
- $t = array('s','s','s','s','i','s','s','i');
+ $sql .= "gui_wms_visible = $5, gui_wms_opacity = $6, gui_wms_sldurl = $7 ";
+ $sql .= "WHERE fkey_gui_id = $8 AND fkey_wms_id = $9";
+ $v = array($this_gui_wms_epsg,$this_gui_wms_mapformat,$this_gui_wms_featureinfoformat,$this_gui_wms_exceptionformat,$this_gui_wms_visible,$this_gui_wms_opacity,$this_gui_wms_sldurl,$this_gui,$this_wms);
+ $t = array('s','s','s','s','i','i','s','s','i');
$res = db_prep_query($sql,$v,$t);
}
else{
$sql = "UPDATE gui_wms set gui_wms_mapformat = $1, ";
$sql .= "gui_wms_featureinfoformat = $2, gui_wms_exceptionformat = $3, ";
- $sql .= "gui_wms_visible = $4, gui_wms_sldurl = $5 ";
- $sql .= "WHERE fkey_gui_id = $6 AND fkey_wms_id = $7";
- $v = array($this_gui_wms_mapformat,$this_gui_wms_featureinfoformat,$this_gui_wms_exceptionformat,$this_gui_wms_visible,$this_gui_wms_sldurl,$this_gui,$this_wms);
- $t = array('s','s','s','i','s','i');
+ $sql .= "gui_wms_visible = $4, gui_wms_opacity = $5, gui_wms_sldurl = $6 ";
+ $sql .= "WHERE fkey_gui_id = $7 AND fkey_wms_id = $8";
+ $v = array($this_gui_wms_mapformat,$this_gui_wms_featureinfoformat,$this_gui_wms_exceptionformat,$this_gui_wms_visible,$this_gui_wms_opacity,$this_gui_wms_sldurl,$this_gui,$this_wms);
+ $t = array('s','s','s','i','i','s','s','i');
$res = db_prep_query($sql,$v,$t);
}
@@ -392,6 +392,7 @@
$gui_wms_exceptionformat[$cnt_gw] = $row["gui_wms_exceptionformat"];
$gui_wms_epsg[$cnt_gw] = $row["gui_wms_epsg"];
$gui_wms_visible[$cnt_gw] = $row["gui_wms_visible"];
+ $gui_wms_opacity[$cnt_gw] = $row["gui_wms_opacity"];
$gui_wms_sldurl[$cnt_gw] = $row["gui_wms_sldurl"]; # sld url
$cnt_gw++;
}
@@ -572,6 +573,22 @@
echo "</tr>";
+# opacity
+echo "<tr>";
+ echo "<td>Opacity: </td><td>";
+ echo "<select class='mySelect' name='this_gui_wms_opacity'>";
+ for($i=0; $i<=100; $i+=10){
+ echo "<option value='".$i."' ";
+ if($i - $gui_wms_opacity[0]<=5&&$i - $gui_wms_opacity[0]>=-4){ echo "selected";}
+ echo ">";
+ echo $i."%";
+ echo "</option>";
+ }
+ echo "</select>";
+ echo "</td>";
+
+echo "</tr>";
+
# sld support
if($wms_supportsld[0]) {
echo "<tr>";
Modified: branches/2.5/resources/db/update/update_mysql_db.sql
===================================================================
--- branches/2.5/resources/db/update/update_mysql_db.sql 2008-02-20 15:32:12 UTC (rev 2132)
+++ branches/2.5/resources/db/update/update_mysql_db.sql 2008-02-20 16:07:05 UTC (rev 2133)
@@ -93,24 +93,24 @@
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Display complete map', 'gesamte Karte anzeigen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Zoom in', 'In die Karte hineinzoomen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Zoom out', 'Aus der Karte herauszoomen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Back', 'Zurück');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Back', 'Zur�ck');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Forward', 'Nach vorne');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Coordinates', 'Koordinaten anzeigen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Zoom by rectangle', 'Ausschnitt wählen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Zoom by rectangle', 'Ausschnitt w�hlen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Redraw', 'Neu laden oder Tastatur: Leertaste');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Query', 'Datenabfrage');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Logout', 'Abmelden');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'WMS preferences', 'WMS Einstellungen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS from filtered list', 'WMS von gefilteter Liste hinzufügen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS from filtered list', 'WMS von gefilteter Liste hinzuf�gen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Set map center', 'Kartenmittelpunkt setzen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Help', 'Hilfe');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Show WMS infos', 'Anzeige von WMS Informationen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Save workspace as web map context document', 'Ansicht als Web Map Context Dokument speichern');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Resize Mapsize', 'Bildschirmgröße anpassen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Rubber', 'Skizze löschen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Get Area', 'Fläche berechnen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Resize Mapsize', 'Bildschirmgr��e anpassen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Rubber', 'Skizze l�schen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Get Area', 'Fl�che berechnen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Close Polygon', 'Polygon schliessen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Move back to your GUI list', 'Zurück zur GUI Liste');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Move back to your GUI list', 'Zur�ck zur GUI Liste');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Legend', 'Legende');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Print', 'Druck');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Imprint', 'Impressum');
@@ -118,22 +118,22 @@
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Search', 'Suche');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Meetingpoint', 'Treffpunkt');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Metadatasearch', 'Metadatensuche');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS', 'WMS hinzufügen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS from List', 'WMS aus Liste hinzufügen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS', 'WMS hinzuf�gen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS from List', 'WMS aus Liste hinzuf�gen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Info', 'Info');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Change Projection', 'Projektion ändern');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Change Projection', 'Projektion �ndern');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Copyright', 'Copyright');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Digitize', 'Digitalisierung');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Overview', 'Übersichtskarte');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Drag Mapsize', 'Karte vergrößern');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Overview', '�bersichtskarte');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Drag Mapsize', 'Karte vergr��ern');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Mapframe', 'Kartenfenster');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Navigation Frame', 'Navigationsfenster');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scale Select', 'Auswahl des Maßstabes');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scale Text', 'Maßstab per Texteingabe');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scalebar', 'Maßstabsleiste');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Set Background', 'Hintegrundkarte auswählen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scale Select', 'Auswahl des Ma�stabes');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scale Text', 'Ma�stab per Texteingabe');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scalebar', 'Ma�stabsleiste');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Set Background', 'Hintegrundkarte ausw�hlen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Zoom to Coordinates', 'Zu den Koordinaten zoomen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Change Password', 'Passwort ändern');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Change Password', 'Passwort �ndern');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Load a web map context document', 'laden eines Web Map Context Dokumentes');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de ', 'Logo', 'Logo');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Measure distance', 'Streckenabschnittsmessung');
@@ -187,4 +187,9 @@
ALTER TABLE wms ADD COLUMN wms_supportsld boolean NULL;
ALTER TABLE wms ADD COLUMN wms_userlayer boolean NULL;
ALTER TABLE wms ADD COLUMN wms_userstyle boolean NULL;
-ALTER TABLE wms ADD COLUMN wms_remotewfs boolean NULL;
\ No newline at end of file
+ALTER TABLE wms ADD COLUMN wms_remotewfs boolean NULL;
+
+--
+-- opacity handeling
+--
+ALTER TABLE gui_wms ADD COLUMN gui_wms_opacity INT DEFAULT 100;
\ No newline at end of file
Modified: branches/2.5/resources/db/update/update_postgresql_db.sql
===================================================================
--- branches/2.5/resources/db/update/update_postgresql_db.sql 2008-02-20 15:32:12 UTC (rev 2132)
+++ branches/2.5/resources/db/update/update_postgresql_db.sql 2008-02-20 16:07:05 UTC (rev 2133)
@@ -178,24 +178,24 @@
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Display complete map', 'gesamte Karte anzeigen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Zoom in', 'In die Karte hineinzoomen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Zoom out', 'Aus der Karte herauszoomen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Back', 'Zurück');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Back', 'Zur�ck');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Forward', 'Nach vorne');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Coordinates', 'Koordinaten anzeigen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Zoom by rectangle', 'Ausschnitt wählen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Zoom by rectangle', 'Ausschnitt w�hlen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Redraw', 'Neu laden oder Tastatur: Leertaste');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Query', 'Datenabfrage');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Logout', 'Abmelden');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'WMS preferences', 'WMS Einstellungen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS from filtered list', 'WMS von gefilteter Liste hinzufügen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS from filtered list', 'WMS von gefilteter Liste hinzuf�gen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Set map center', 'Kartenmittelpunkt setzen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Help', 'Hilfe');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Show WMS infos', 'Anzeige von WMS Informationen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Save workspace as web map context document', 'Ansicht als Web Map Context Dokument speichern');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Resize Mapsize', 'Bildschirmgröße anpassen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Rubber', 'Skizze löschen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Get Area', 'Fläche berechnen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Resize Mapsize', 'Bildschirmgr��e anpassen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Rubber', 'Skizze l�schen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Get Area', 'Fl�che berechnen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Close Polygon', 'Polygon schliessen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Move back to your GUI list', 'Zurück zur GUI Liste');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Move back to your GUI list', 'Zur�ck zur GUI Liste');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Legend', 'Legende');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Print', 'Druck');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Imprint', 'Impressum');
@@ -203,22 +203,22 @@
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Search', 'Suche');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Meetingpoint', 'Treffpunkt');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Metadatasearch', 'Metadatensuche');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS', 'WMS hinzufügen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS from List', 'WMS aus Liste hinzufügen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS', 'WMS hinzuf�gen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Adding WMS from List', 'WMS aus Liste hinzuf�gen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Info', 'Info');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Change Projection', 'Projektion ändern');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Change Projection', 'Projektion �ndern');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Copyright', 'Copyright');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Digitize', 'Digitalisierung');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Overview', 'Übersichtskarte');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Drag Mapsize', 'Karte vergrößern');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Overview', '�bersichtskarte');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Drag Mapsize', 'Karte vergr��ern');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Mapframe', 'Kartenfenster');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Navigation Frame', 'Navigationsfenster');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scale Select', 'Auswahl des Maßstabes');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scale Text', 'Maßstab per Texteingabe');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scalebar', 'Maßstabsleiste');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Set Background', 'Hintegrundkarte auswählen');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scale Select', 'Auswahl des Ma�stabes');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scale Text', 'Ma�stab per Texteingabe');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Scalebar', 'Ma�stabsleiste');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Set Background', 'Hintegrundkarte ausw�hlen');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Zoom to Coordinates', 'Zu den Koordinaten zoomen');
-INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Change Password', 'Passwort ändern');
+INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Change Password', 'Passwort �ndern');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Load a web map context document', 'laden eines Web Map Context Dokumentes');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de ', 'Logo', 'Logo');
INSERT INTO translations (locale, msgid, msgstr) VALUES ('de', 'Measure distance', 'Streckenabschnittsmessung');
@@ -280,3 +280,8 @@
alter table wms add column wms_userlayer boolean;
alter table wms add column wms_userstyle boolean;
alter table wms add column wms_remotewfs boolean;
+
+--
+-- opacity handeling
+--
+ALTER TABLE gui_wms ADD COLUMN gui_wms_opacity INT DEFAULT 100;
More information about the Mapbender_commits
mailing list