[Mapbender-commits] r6757 - in trunk/mapbender: http/classes
http/html http/javascripts http/php resources/db/pgsql/UTF-8/update
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Aug 11 05:44:49 EDT 2010
Author: christoph
Date: 2010-08-11 09:44:49 +0000 (Wed, 11 Aug 2010)
New Revision: 6757
Modified:
trunk/mapbender/http/classes/class_map.php
trunk/mapbender/http/classes/class_wmcToXml.php
trunk/mapbender/http/classes/class_wms.php
trunk/mapbender/http/html/mod_treefolderPlain.php
trunk/mapbender/http/javascripts/wms.js
trunk/mapbender/http/php/mod_editGuiWms.php
trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql
Log:
http://trac.osgeo.org/mapbender/ticket/675
Modified: trunk/mapbender/http/classes/class_map.php
===================================================================
--- trunk/mapbender/http/classes/class_map.php 2010-08-11 09:37:50 UTC (rev 6756)
+++ trunk/mapbender/http/classes/class_map.php 2010-08-11 09:44:49 UTC (rev 6757)
@@ -521,6 +521,7 @@
$newLayer->gui_layer_minscale = $currentLayer->gui_layer_minscale;
$newLayer->gui_layer_maxscale = $currentLayer->gui_layer_maxscale;
$newLayer->gui_layer_wfs_featuretype = $currentLayer->gui_layer_wfs_featuretype;
+ $newLayer->gui_layer_title = $currentLayer->gui_layer_title;
// BEWARE THIS IS SUPER UGLY CODE
$newLayer->layer_epsg = array();
Modified: trunk/mapbender/http/classes/class_wmcToXml.php
===================================================================
--- trunk/mapbender/http/classes/class_wmcToXml.php 2010-08-11 09:37:50 UTC (rev 6756)
+++ trunk/mapbender/http/classes/class_wmcToXml.php 2010-08-11 09:44:49 UTC (rev 6757)
@@ -282,7 +282,11 @@
$e_service = $this->doc->createElement("Server");
$e_service->setAttribute("service", "OGC:WMS");
$e_service->setAttribute("version", $currentWms->wms_version);
- $e_service->setAttribute("title", $currentWms->wms_title);
+ $e_service->setAttribute("title",
+ $currentWms->objLayer[0]->gui_layer_title != "" ?
+ $currentWms->objLayer[0]->gui_layer_title :
+ $currentWms->wms_title
+ );
// Online resource
$e_service_or = $this->doc->createElement("OnlineResource");
@@ -298,7 +302,7 @@
$e_layer->appendChild($e_layer_name);
// Title
- $currentLayerTitle = $currentLayer->layer_title;
+ $currentLayerTitle = $currentLayer->gui_layer_title;
$e_layer_title = $this->doc->createElement("Title", $currentLayerTitle);
$e_layer->appendChild($e_layer_title);
Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php 2010-08-11 09:37:50 UTC (rev 6756)
+++ trunk/mapbender/http/classes/class_wms.php 2010-08-11 09:44:49 UTC (rev 6757)
@@ -956,6 +956,13 @@
$this->objLayer[$i]->layer_pos=$i;
}
+ // check if gui_layer_title isset
+ for($i=0; $i<count($this->objLayer); $i++){
+ $this->objLayer[$i]->gui_layer_title != "" ?
+ $this->objLayer[$i]->gui_layer_title :
+ $this->objLayer[$i]->layer_title;
+ }
+
/* fill sld variables when empty */
if($this->wms_supportsld == ""){
$this->wms_supportsld = 0;
@@ -1040,6 +1047,7 @@
$newLayer->layer_uid = $currentLayer["extension"]["LAYER_ID"];
$newLayer->layer_name = $currentLayer["name"];
$newLayer->layer_title = $currentLayer["title"];
+ $newLayer->gui_layer_title = $currentLayer["title"];
$newLayer->layer_dataurl_href = $currentLayer["dataurl"];
$newLayer->layer_pos = $currentLayer["extension"]["LAYER_POS"];
$newLayer->layer_queryable = $currentLayer["queryable"];
@@ -1144,7 +1152,6 @@
}
function createJsObjFromWMS_($parent=0){
-
$str = "";
if(!$this->wms_title || $this->wms_title == ""){
$str .= "alert('Error: no valid capabilities-document !!');";
@@ -1207,7 +1214,8 @@
$this->objLayer[$i]->gui_layer_querylayer ."','".
$this->objLayer[$i]->gui_layer_minscale ."','".
$this->objLayer[$i]->gui_layer_maxscale ."','".
- $this->objLayer[$i]->gui_layer_wfs_featuretype ."');";
+ $this->objLayer[$i]->gui_layer_wfs_featuretype ."','".
+ $this->objLayer[$i]->gui_layer_title ."');";
for($j=0; $j<count($this->objLayer[$i]->layer_epsg);$j++){
$currentEpsg = $this->objLayer[$i]->layer_epsg[$j];
@@ -1328,7 +1336,8 @@
$this->objLayer[$i]->gui_layer_querylayer ."','".
$this->objLayer[$i]->gui_layer_minscale ."','".
$this->objLayer[$i]->gui_layer_maxscale ."','".
- $this->objLayer[$i]->gui_layer_wfs_featuretype ."');");
+ $this->objLayer[$i]->gui_layer_wfs_featuretype ."','".
+ $this->objLayer[$i]->gui_layer_title ."');");
for($j=0; $j<count($this->objLayer[$i]->layer_epsg);$j++){
if($i==0){
if($parent){
@@ -1648,8 +1657,8 @@
$sql = "INSERT INTO gui_layer (fkey_gui_id, fkey_layer_id, gui_layer_wms_id, ";
$sql .= "gui_layer_status, gui_layer_selectable, gui_layer_visible, gui_layer_queryable, ";
- $sql .= "gui_layer_querylayer,gui_layer_minscale,gui_layer_maxscale, gui_layer_priority, gui_layer_style) ";
- $sql .= "VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12)";
+ $sql .= "gui_layer_querylayer,gui_layer_minscale,gui_layer_maxscale, gui_layer_priority, gui_layer_style, gui_layer_title) ";
+ $sql .= "VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)";
if(count($this->objLayer[$i]->layer_style)>0){
$layer_style_name = $this->objLayer[$i]->layer_style[0]["name"];
}
@@ -1657,8 +1666,8 @@
$layer_style_name = NULL;
}
$v = array($gui_id,$this->objLayer[$i]->db_id,$myWMS,1,1,1,$this->objLayer[$i]->layer_queryable,
- $this->objLayer[$i]->layer_queryable,$this->objLayer[$i]->layer_minscale,$this->objLayer[$i]->layer_maxscale,$i,$layer_style_name);
- $t = array('s','i','i','i','i','i','i','i','i','i','i','s');
+ $this->objLayer[$i]->layer_queryable,$this->objLayer[$i]->layer_minscale,$this->objLayer[$i]->layer_maxscale,$i,$layer_style_name,$this->objLayer[$i]->gui_layer_title);
+ $t = array('s','i','i','i','i','i','i','i','i','i','i','s', 's');
$res = db_prep_query($sql,$v,$t);
#$e = new mb_exception("name des insert styles und fkey_layer_id: ".$layer_style_name." --- ".$this->objLayer[$i]->db_id);
if(!$res){
@@ -1670,7 +1679,7 @@
$sql = "INSERT INTO gui_layer (fkey_gui_id, fkey_layer_id, gui_layer_wms_id, ";
$sql .= "gui_layer_status, gui_layer_selectable, gui_layer_visible, gui_layer_queryable, ";
- $sql .= "gui_layer_querylayer,gui_layer_minscale,gui_layer_maxscale, gui_layer_priority, gui_layer_style) ";
+ $sql .= "gui_layer_querylayer,gui_layer_minscale,gui_layer_maxscale, gui_layer_priority, gui_layer_style, gui_layer_title) ";
$sql .= "VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12)";
if(count($this->objLayer[$i]->layer_style)>0){
$layer_style_name = $this->objLayer[$i]->layer_style[0]["name"];
@@ -1679,8 +1688,8 @@
$layer_style_name = NULL;
}
$v = array($gui_id,$this->objLayer[$i]->db_id,$myWMS,0,0,0,$this->objLayer[$i]->layer_queryable,
- $this->objLayer[$i]->layer_queryable,$this->objLayer[$i]->layer_minscale,$this->objLayer[$i]->layer_maxscale,$i,$layer_style_name);
- $t = array('s','i','i','i','i','i','i','i','i','i','i','s');
+ $this->objLayer[$i]->layer_queryable,$this->objLayer[$i]->layer_minscale,$this->objLayer[$i]->layer_maxscale,$i,$layer_style_name, $this->objLayer[$i]->gui_layer_title);
+ $t = array('s','i','i','i','i','i','i','i','i','i','i','s', 's');
$res = db_prep_query($sql,$v,$t);
if(!$res){
db_rollback();
@@ -2100,6 +2109,16 @@
$t = array('i','s');
$res = db_prep_query($sql,$v,$t);
while($row = db_fetch_array($res)){
+
+ $sql1 = "UPDATE gui_layer SET gui_layer_title = $1 ";
+ $sql1 .= "WHERE fkey_layer_id = $2 and fkey_gui_id = $3";
+ $v = array($this->objLayer[$i]->layer_name, $l_id,$gui_id);
+ $t = array('s', 'i','s');
+ $res1 = db_prep_query($sql1,$v,$t);
+ if(!$res1){
+ db_rollback();
+ }
+
if($this->objLayer[$i]->layer_queryable == 0){
$sql1 = "UPDATE gui_layer set gui_layer_queryable = 0, gui_layer_querylayer = 0 ";
$sql1 .= "WHERE fkey_layer_id = $1 and fkey_gui_id = $2";
@@ -2378,6 +2397,7 @@
$this->objLayer[$layer_cnt]->layer_uid = $layer_id;
$this->objLayer[$layer_cnt]->gui_layer_wms_id = $row["gui_layer_wms_id"];
$this->objLayer[$layer_cnt]->gui_layer_selectable = $row["gui_layer_selectable"];
+ $this->objLayer[$layer_cnt]->gui_layer_title = $row["gui_layer_title"] != "" ? $row["gui_layer_title"] : $this->objLayer[$layer_cnt]->layer_title;
$this->objLayer[$layer_cnt]->gui_layer_visible = $row["gui_layer_visible"];
$this->objLayer[$layer_cnt]->gui_layer_queryable = $row["gui_layer_queryable"];
$this->objLayer[$layer_cnt]->gui_layer_querylayer = $row["gui_layer_querylayer"];
@@ -2385,7 +2405,6 @@
$this->objLayer[$layer_cnt]->gui_layer_maxscale = $row["gui_layer_maxscale"];
$this->objLayer[$layer_cnt]->gui_layer_style = $row["gui_layer_style"];
$this->objLayer[$layer_cnt]->gui_layer_wfs_featuretype = $row["gui_layer_wfs_featuretype"];
-
$sql = "Select * from layer_epsg where fkey_layer_id = $1 ORDER BY fkey_layer_id";
$v = array($layer_id);
$t = array('i');
Modified: trunk/mapbender/http/html/mod_treefolderPlain.php
===================================================================
--- trunk/mapbender/http/html/mod_treefolderPlain.php 2010-08-11 09:37:50 UTC (rev 6756)
+++ trunk/mapbender/http/html/mod_treefolderPlain.php 2010-08-11 09:44:49 UTC (rev 6757)
@@ -50,14 +50,16 @@
for(var i = 0; i < map.wms.length; i++) {
var currentWms = map.wms[i];
treefolderTitleArray.push({
- title : currentWms.wms_title,
+ title : currentWms.objLayer.length > 0 ?
+ currentWms.objLayer[0].gui_layer_title :
+ currentWms.wms_title,
layer : []
});
for (var j = 0; j < currentWms.objLayer.length; j++) {
var currentLayer = currentWms.objLayer[j];
treefolderTitleArray[treefolderTitleArray.length-1].layer.push({
- title : currentLayer.layer_title
+ title : currentLayer.gui_layer_title
});
}
}
Modified: trunk/mapbender/http/javascripts/wms.js
===================================================================
--- trunk/mapbender/http/javascripts/wms.js 2010-08-11 09:37:50 UTC (rev 6756)
+++ trunk/mapbender/http/javascripts/wms.js 2010-08-11 09:44:49 UTC (rev 6757)
@@ -759,7 +759,8 @@
gui_layer_querylayer,
gui_layer_minscale,
gui_layer_maxscale,
- gui_layer_wfs_featuretype){
+ gui_layer_wfs_featuretype,
+ gui_layer_title){
wms[wms.length-1].objLayer[wms[wms.length-1].objLayer.length] = new wms_layer(
layer_parent,
@@ -781,7 +782,8 @@
parseInt(gui_layer_querylayer, 10),
parseInt(gui_layer_minscale, 10),
parseInt(gui_layer_maxscale, 10),
- gui_layer_wfs_featuretype );
+ gui_layer_wfs_featuretype,
+ gui_layer_title );
var parentLayer = wms[wms.length-1].getLayerByLayerPos(parseInt(layer_parent, 10));
if(parentLayer) {
parentLayer.has_childs = true;
@@ -818,13 +820,15 @@
gui_layer_querylayer,
gui_layer_minscale,
gui_layer_maxscale,
- gui_layer_wfs_featuretype){
+ gui_layer_wfs_featuretype,
+ gui_layer_title){
this.layer_id = wms_layer_count;
this.layer_uid = wms_layer_uid;
this.layer_parent = layer_parent;
this.layer_name = layer_name;
this.layer_title = layer_title;
- this.layer_currentTitle = layer_title;
+ this.gui_layer_title = gui_layer_title || layer_title;
+ this.layer_currentTitle = this.gui_layer_title;
this.layer_dataurl_href = layer_dataurl_href;
this.layer_pos = layer_pos;
this.layer_queryable = layer_queryable;
Modified: trunk/mapbender/http/php/mod_editGuiWms.php
===================================================================
--- trunk/mapbender/http/php/mod_editGuiWms.php 2010-08-11 09:37:50 UTC (rev 6756)
+++ trunk/mapbender/http/php/mod_editGuiWms.php 2010-08-11 09:44:49 UTC (rev 6757)
@@ -435,6 +435,7 @@
$res_gl = db_prep_query($sql_gl,$v,$t);
$gui_layer_status = array();
+$gui_layer_title = array();
$gui_layer_selectable = array();
$gui_layer_visible = array();
$gui_layer_queryable = array();
@@ -456,6 +457,7 @@
$use_sld = array();
while($row = db_fetch_array($res_gl)){
array_push($gui_layer_status, $row["gui_layer_status"]);
+ array_push($gui_layer_title, $row["gui_layer_title"]);
array_push($gui_layer_selectable, $row["gui_layer_selectable"]);
array_push($gui_layer_visible, $row["gui_layer_visible"]);
array_push($gui_layer_queryable, $row["gui_layer_queryable"]);
@@ -664,7 +666,7 @@
echo "<td style='background:lightgrey'><input type='text' size='2' name='L_".$layer_id[$i]."___layer_id' value='".$layer_id[$i]."' readonly></td>";
echo "<td><input type='text' size='1' name='L_".$layer_id[$i]."___layer_parent' value='".$layer_parent[$i]."' readonly></td>";
echo "<td style='background:lightgrey'><input type='text' size='7' value='".$layer_name[$i]."' readonly></td>";
- echo "<td><input type='text' name='".$layer_title[$i]."' size='12' value='".$layer_title[$i]."' readonlys></td>";
+ echo "<td><input type='text' size='12' name='L_".$layer_id[$i]."___gui_layer_title' value='".$gui_layer_title[$i]."' ></td>";
echo "<td style='background:lightgrey'><input name='L_".$layer_id[$i]."___gui_layer_status' type='checkbox' ";
if($gui_layer_status[$i] == 1){ echo "checked";}
Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql 2010-08-11 09:37:50 UTC (rev 6756)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql 2010-08-11 09:44:49 UTC (rev 6757)
@@ -1392,7 +1392,7 @@
WHERE
gui_element.e_id = 'resultList_Highlight' AND
gui_element.fkey_gui_id
-NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList_Highlight' AND var_name = 'resultHighlightLineWidth');
+aNOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList_Highlight' AND var_name = 'resultHighlightLineWidth');
--
-- add element var resultHighlightZIndex to element resultList_Highlight
@@ -2576,5 +2576,8 @@
NOT IN (SELECT fkey_gui_id FROM gui_element
WHERE e_id = 'jq_ui_resizable');
+-- add new column gui_layer_title
+alter table gui_layer add column gui_layer_title character varying(255) NOT NULL DEFAULT ''::character varying;
+-- fill gui_layer_title with layer_titles from layer
+UPDATE gui_layer SET gui_layer_title = (SELECT layer_title FROM layer WHERE gui_layer.fkey_layer_id = layer.layer_id);
-
More information about the Mapbender_commits
mailing list