[Mapbender-commits] r3961 - in branches/2.6: conf http/javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed May 27 05:24:31 EDT 2009
Author: verenadiewald
Date: 2009-05-27 05:24:31 -0400 (Wed, 27 May 2009)
New Revision: 3961
Modified:
branches/2.6/conf/wfs_additional_spatial_search.conf
branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php
Log:
http://trac.osgeo.org/mapbender/ticket/475
Modified: branches/2.6/conf/wfs_additional_spatial_search.conf
===================================================================
--- branches/2.6/conf/wfs_additional_spatial_search.conf 2009-05-25 20:44:50 UTC (rev 3960)
+++ branches/2.6/conf/wfs_additional_spatial_search.conf 2009-05-27 09:24:31 UTC (rev 3961)
@@ -30,6 +30,11 @@
*/
var buttonWfs_zIndex = 10;
+/**
+ * Displays the icons for wfsInfo, wfsRemove and wfsGeomType
+ */
+var showWfsIcons = true;
+
// --------------------------------------------------------
//
// General WFS request settings
Modified: branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php 2009-05-25 20:44:50 UTC (rev 3960)
+++ branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php 2009-05-27 09:24:31 UTC (rev 3961)
@@ -350,14 +350,14 @@
function initModWfsGazetteer() {
// empty nodes
- var nodesToEmpty = ["selectWfsConfForm", "wfsForm", "res", "wfsInfo"];
+ var nodesToEmpty = ["selectWfsConfForm", "wfsForm", "res", "wfsIcons"];
while (nodesToEmpty.length > 0) {
var currentId = nodesToEmpty.pop();
var currentNode = document.getElementById(currentId);
removeChildNodes(currentNode);
}
- document.getElementById("wfsGeomType").style.visibility = "hidden";
- document.getElementById("wfsRemove").style.visibility = "hidden";
+ //document.getElementById("wfsGeomType").style.visibility = "hidden";
+ //document.getElementById("wfsRemove").style.visibility = "hidden";
geomArray = new parent.GeometryArray();
@@ -376,11 +376,10 @@
else if (wfsCount === 1) {
appendStyles();
appendWfsForm();
- setWfsInfo();
}
else {
appendWfsConfSelectBox();
- setWfsInfo();
+
}
parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
});
@@ -393,7 +392,13 @@
}
function setWfsInfo() {
- var bulbNode = document.getElementById("wfsInfo");
+
+ var bodyNode = document.getElementById("wfsIcons");
+ removeChildNodes(bodyNode);
+ var bulbNode = document.createElement("a");
+ bulbNode.name = "wfsInfo";
+ bulbNode.id = "wfsInfo";
+ bodyNode.appendChild(bulbNode);
// append bulb image
removeChildNodes(bulbNode);
@@ -402,12 +407,41 @@
//imgNode.src = "../img/button_digitize/geomInfo.png";
imgNode.src = "../img/tree_new/info.png";
imgNode.border = 0;
+ imgNode.title = "show metadata";
bulbNode.appendChild(imgNode);
bulbNode.href = "javascript:openwindow('../php/mod_featuretypeMetadata.php?wfs_conf_id=" + global_selectedWfsConfId.toString() + "');";
bulbNode.style.visibility = "visible";
-
+
+ // set image: remove this WFS
+ var wfsRemoveNode = document.createElement("img");
+ wfsRemoveNode.name = "wfsRemove";
+ wfsRemoveNode.id = "wfsRemove";
+ wfsRemoveNode.title = "remove WFS Conf";
+ bodyNode.appendChild(wfsRemoveNode);
+ //wfsRemoveNode.src = "../img/button_digitize/geomRemove.png";
+ wfsRemoveNode.src = "../img/tree_new/delete_wms.png";
+ wfsRemoveNode.style.visibility = 'visible';
+ // Internet explorer
+ if (parent.ie) {
+ wfsRemoveNode.onclick = function() {
+ var x = new Function ("", "delete global_wfsConfObj[global_selectedWfsConfId];setWfsConfIdString();initModWfsGazetteer();parent.mb_setWmcExtensionData({'wfsConfIdString':wfsConfIdString});");
+ x();
+ };
+ }
+ // Firefox
+ else {
+ wfsRemoveNode.onclick = function () {
+ delete global_wfsConfObj[global_selectedWfsConfId];
+ setWfsConfIdString();
+ initModWfsGazetteer();
+ parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
+ }
+ }
// set wfsGeomType image
- var wfsGeomTypeNode = document.getElementById("wfsGeomType");
+ var wfsGeomTypeNode = document.createElement("img");
+ wfsGeomTypeNode.name = "wfsGeomType";
+ wfsGeomTypeNode.id = "wfsGeomType";
+ bodyNode.appendChild(wfsGeomTypeNode);
var wfsGeomType = "";
for (var i=0; i < global_wfsConfObj[global_selectedWfsConfId].element.length; i++) {
if (parseInt(global_wfsConfObj[global_selectedWfsConfId].element[i].f_geom)) {
@@ -417,40 +451,19 @@
if (wfsGeomType.match(/Point/)) {
wfsGeomTypeNode.src = "../img/button_digitize/point.png";
wfsGeomTypeNode.style.visibility = 'visible';
+ wfsGeomTypeNode.title = 'Point';
}
else if (wfsGeomType.match(/Line/)) {
wfsGeomTypeNode.src = "../img/button_digitize/line.png";
- wfsGeomTypeNode.style.visibility = 'visible';
+ wfsGeomTypeNode.title = 'Line';
}
else if (wfsGeomType.match(/Polygon/)) {
wfsGeomTypeNode.src = "../img/button_digitize/polygon.png";
- wfsGeomTypeNode.style.visibility = 'visible';
+ wfsGeomTypeNode.title = 'Polygon';
}
else {
var e = new parent.Mb_exception("WFS gazetteer: geometry type unknown.");
}
-
- // set image: remove this WFS
- var wfsRemoveNode = document.getElementById("wfsRemove");
- //wfsRemoveNode.src = "../img/button_digitize/geomRemove.png";
- wfsRemoveNode.src = "../img/tree_new/delete_wms.png";
- wfsRemoveNode.style.visibility = 'visible';
- // Internet explorer
- if (parent.ie) {
- wfsRemoveNode.onclick = function() {
- var x = new Function ("", "delete global_wfsConfObj[global_selectedWfsConfId];setWfsConfIdString();initModWfsGazetteer();parent.mb_setWmcExtensionData({'wfsConfIdString':wfsConfIdString});");
- x();
- };
- }
- // Firefox
- else {
- wfsRemoveNode.onclick = function () {
- delete global_wfsConfObj[global_selectedWfsConfId];
- setWfsConfIdString();
- initModWfsGazetteer();
- parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
- }
- }
}
function setWfsConfIdString() {
@@ -477,13 +490,12 @@
if(typeof(wfsPopup)!="undefined"){
wfsPopup.destroy();
}
- setWfsInfo();
- appendStyles();
+ appendStyles();
appendWfsForm();
};
}
else{
- selectNode.setAttribute("onchange", "if(typeof(resultGeometryPopup)!='undefined'){resultGeometryPopup.destroy();}if(typeof(wfsPopup)!='undefined'){wfsPopup.destroy();};global_selectedWfsConfId = this.value;setWfsInfo();appendStyles();appendWfsForm();");
+ selectNode.setAttribute("onchange", "if(typeof(resultGeometryPopup)!='undefined'){resultGeometryPopup.destroy();}if(typeof(wfsPopup)!='undefined'){wfsPopup.destroy();};global_selectedWfsConfId = this.value;appendStyles();appendWfsForm();");
}
var isSelected = false;
for (var wfsConfId in global_wfsConfObj) {
@@ -508,6 +520,9 @@
}
function appendWfsForm() {
+ if(showWfsIcons) {
+ setWfsInfo();
+ }
var form = document.getElementById("wfsForm");
removeChildNodes(form);
var resultDiv = document.getElementById("res");
@@ -1270,10 +1285,8 @@
</head>
<body leftmargin='0' topmargin='10' bgcolor='#ffffff'>
<form name='selectWfsConfForm' id='selectWfsConfForm'></form>
-<div name='displaySpatialButtons' id='displaySpatialButtons' style='width:180px'></div>
-<a name='wfsInfo' id='wfsInfo'></a>
-<img src = "" name='wfsRemove' id='wfsRemove'>
-<img src = "" name='wfsGeomType' id='wfsGeomType'>
+<div name='wfsIcons' id='wfsIcons'></div>
+<div name='displaySpatialButtons' id='displaySpatialButtons' style='width:180px;margin-top:5px;'></div>
<form name='wfsForm' id='wfsForm' onsubmit='return validate()'></form>
<div name='res' id='res' style='width:180px'></div>
</body>
More information about the Mapbender_commits
mailing list