[Mapbender-commits] r3827 - in branches/2.6: conf http/javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Mar 27 07:06:53 EDT 2009
Author: verenadiewald
Date: 2009-03-27 07:06:53 -0400 (Fri, 27 Mar 2009)
New Revision: 3827
Modified:
branches/2.6/conf/digitize_default.conf
branches/2.6/conf/wfs_default.conf
branches/2.6/http/javascripts/mod_digitize_tab.php
branches/2.6/http/javascripts/mod_tooltip.php
branches/2.6/http/javascripts/mod_wfs_SpatialRequest.php
branches/2.6/http/javascripts/wfs.php
Log:
possibility to define geomHighlightColour for digitizing and resultHighlightColour for spatial request in conf files: http://trac.osgeo.org/mapbender/ticket/406
Modified: branches/2.6/conf/digitize_default.conf
===================================================================
--- branches/2.6/conf/digitize_default.conf 2009-03-27 10:30:35 UTC (rev 3826)
+++ branches/2.6/conf/digitize_default.conf 2009-03-27 11:06:53 UTC (rev 3827)
@@ -27,6 +27,8 @@
var snappingColor = "#ff0000";
var snappingTolerance = 12;
+var geomHighlightColour = "#006400";
+
var snappingHighlightZIndex = 120;
var digitizeTransactionalZIndex = 80;
var digitizeNonTransactionalZIndex = 20;
Modified: branches/2.6/conf/wfs_default.conf
===================================================================
--- branches/2.6/conf/wfs_default.conf 2009-03-27 10:30:35 UTC (rev 3826)
+++ branches/2.6/conf/wfs_default.conf 2009-03-27 11:06:53 UTC (rev 3827)
@@ -27,6 +27,8 @@
var generalHighlightZIndex = 90;
var generalHighlightLineWidth = 2;
+var resultHighlightColour = "#FFA500";
+
var wfsResultModulePath = "php/";
var wfsResultModuleFilename = "mod_wfs_result.php";
Modified: branches/2.6/http/javascripts/mod_digitize_tab.php
===================================================================
--- branches/2.6/http/javascripts/mod_digitize_tab.php 2009-03-27 10:30:35 UTC (rev 3826)
+++ branches/2.6/http/javascripts/mod_digitize_tab.php 2009-03-27 11:06:53 UTC (rev 3827)
@@ -1220,9 +1220,9 @@
if (d.get(i).e.getElementValueByName('fid')) {
listOfGeom += "<img src = '"+buttonDig_imgdir+buttonDig_removeDb_src+"' title='"+msgObj.buttonDig_removeDb_title+"' onclick=\"var deltrans = confirm('"+msgObj.messageConfirmDeleteGeomFromDb+"');if (deltrans) dbGeom('delete', "+i+")\">";
}
- listOfGeom += "<div class='digitizeGeometryListItem' onmouseover='parent.mb_wfs_perform(\"over\",d.get("+i+"));' ";
- listOfGeom += " onmouseout='parent.mb_wfs_perform(\"out\",d.get("+i+"))' ";
- listOfGeom += " onclick='parent.mb_wfs_perform(\"click\",d.get("+i+"));' ";
+ listOfGeom += "<div class='digitizeGeometryListItem' onmouseover='parent.mb_wfs_perform(\"over\",d.get("+i+"),\""+geomHighlightColour+"\");' ";
+ listOfGeom += " onmouseout='parent.mb_wfs_perform(\"out\",d.get("+i+"),\""+geomHighlightColour+"\")' ";
+ listOfGeom += " onclick='parent.mb_wfs_perform(\"click\",d.get("+i+"),\""+geomHighlightColour+"\");' ";
var geomName = getName(d.get(i));
var currentGeomType;
if (d.get(i).geomType == parent.geomType.polygon) {
@@ -1249,9 +1249,9 @@
d.get(i).get(j).innerRings.count() > 0)) {
listOfGeom += "<li>";
listOfGeom += "<img src = '"+buttonDig_imgdir+buttonDig_remove_src+"' title='"+msgObj.buttonDig_remove_title+"' onclick='parent.mb_disableThisButton(mod_digitizeEvent);d.get("+i+").del(" + j + ");executeDigitizeSubFunctions();'>";
- listOfGeom += "<div class='digitizeGeometryListItem' onmouseover='parent.mb_wfs_perform(\"over\",d.get("+i+").get("+j+"));' ";
- listOfGeom += " onmouseout='parent.mb_wfs_perform(\"out\",d.get("+i+").get("+j+"))' ";
- listOfGeom += " onclick='parent.mb_wfs_perform(\"click\",d.get("+i+").get("+j+"));' ";
+ listOfGeom += "<div class='digitizeGeometryListItem' onmouseover='parent.mb_wfs_perform(\"over\",d.get("+i+").get("+j+"),\""+geomHighlightColour+"\");' ";
+ listOfGeom += " onmouseout='parent.mb_wfs_perform(\"out\",d.get("+i+").get("+j+"),\""+geomHighlightColour+"\")' ";
+ listOfGeom += " onclick='parent.mb_wfs_perform(\"click\",d.get("+i+").get("+j+"),\""+geomHighlightColour+"\");' ";
listOfGeom += ">" + currentGeomType + "#" + (j+1) +"</div></li>";
}
if (d.get(i).geomType == geomType.polygon &&
@@ -1262,9 +1262,9 @@
var currentRing = d.get(i).get(j).innerRings.get(k);
listOfGeom += "<li>";
listOfGeom += "<img src = '"+buttonDig_imgdir+buttonDig_remove_src+"' title='"+msgObj.buttonDig_remove_title+"' onclick='parent.mb_disableThisButton(mod_digitizeEvent);d.get("+i+").get(" + j + ").innerRings.del(" + k + ");executeDigitizeSubFunctions();'>";
- listOfGeom += "<div class='digitizeGeometryListItem' onmouseover='parent.mb_wfs_perform(\"over\",d.getGeometry("+i+","+j+").innerRings.get(" + k + "));' ";
- listOfGeom += " onmouseout='parent.mb_wfs_perform(\"out\",d.getGeometry("+i+","+j+").innerRings.get(" + k + "))' ";
- listOfGeom += " onclick='parent.mb_wfs_perform(\"click\",d.getGeometry("+i+","+j+").innerRings.get(" + k + "));' ";
+ listOfGeom += "<div class='digitizeGeometryListItem' onmouseover='parent.mb_wfs_perform(\"over\",d.getGeometry("+i+","+j+").innerRings.get(" + k + "),\""+geomHighlightColour+"\");' ";
+ listOfGeom += " onmouseout='parent.mb_wfs_perform(\"out\",d.getGeometry("+i+","+j+").innerRings.get(" + k + "),\""+geomHighlightColour+"\")' ";
+ listOfGeom += " onclick='parent.mb_wfs_perform(\"click\",d.getGeometry("+i+","+j+").innerRings.get(" + k + "),\""+geomHighlightColour+"\");' ";
listOfGeom += ">inner ring #" + (k+1) +"</div></li>";
}
Modified: branches/2.6/http/javascripts/mod_tooltip.php
===================================================================
--- branches/2.6/http/javascripts/mod_tooltip.php 2009-03-27 10:30:35 UTC (rev 3826)
+++ branches/2.6/http/javascripts/mod_tooltip.php 2009-03-27 11:06:53 UTC (rev 3827)
@@ -303,9 +303,9 @@
for (var i = 0 ; i < _geomArray.count(); i ++) {
if (_geomArray.get(i).get(-1).isComplete()) {
html += "\t<tr class='list_"+(i%2?"uneven":"even")+"'>\n\t\t<td \n";
-// html += "\t\t\t onmouseover='mb_wfs_perform(\"over\",_geomArray.get("+i+"));' ";
-// html += " onmouseout='mb_wfs_perform(\"out\",_geomArray.get("+i+"))' ";
-// html += " onclick='mb_wfs_perform(\"click\",_geomArray.get("+i+"));' ";
+// html += "\t\t\t onmouseover='mb_wfs_perform(\"over\",_geomArray.get("+i+"), resultHighlightColour);' ";
+// html += " onmouseout='mb_wfs_perform(\"out\",_geomArray.get("+i+"), resultHighlightColour)' ";
+// html += " onclick='mb_wfs_perform(\"click\",_geomArray.get("+i+"), resultHighlightColour);' ";
var geomName = getWfsListEntry(_geomArray.get(i));
html += ">" + geomName +"</td>";
html += "\t\t</tr>\n";
Modified: branches/2.6/http/javascripts/mod_wfs_SpatialRequest.php
===================================================================
--- branches/2.6/http/javascripts/mod_wfs_SpatialRequest.php 2009-03-27 10:30:35 UTC (rev 3826)
+++ branches/2.6/http/javascripts/mod_wfs_SpatialRequest.php 2009-03-27 11:06:53 UTC (rev 3827)
@@ -705,9 +705,9 @@
for (var i = 0 ; i < geomArray.count(); i ++) {
if (geomArray.get(i).get(-1).isComplete()) {
listOfGeom += "\t<tr>\n\t\t<td style = 'color:blue;font-size:12px;cursor:pointer;'\n";
- listOfGeom += "\t\t\t onmouseover='mb_wfs_perform(\"over\",geomArray.get("+i+"));' ";
- listOfGeom += " onmouseout='mb_wfs_perform(\"out\",geomArray.get("+i+"))' ";
- listOfGeom += " onclick='mb_wfs_perform(\"click\",geomArray.get("+i+")); showWfs("+i+");' ";
+ listOfGeom += "\t\t\t onmouseover='mb_wfs_perform(\"over\",geomArray.get("+i+"), resultHighlightColour);' ";
+ listOfGeom += " onmouseout='mb_wfs_perform(\"out\",geomArray.get("+i+"), resultHighlightColour)' ";
+ listOfGeom += " onclick='mb_wfs_perform(\"click\",geomArray.get("+i+"), resultHighlightColour); showWfs("+i+");' ";
var geomName = getListTitle(geomArray.get(i));
//if (geomArray.get(i).geomType == geomType.polygon) {geomName += "(polygon)";}
//else if (geomArray.get(i).geomType == geomType.line) {geomName += "(line)";}
Modified: branches/2.6/http/javascripts/wfs.php
===================================================================
--- branches/2.6/http/javascripts/wfs.php 2009-03-27 10:30:35 UTC (rev 3826)
+++ branches/2.6/http/javascripts/wfs.php 2009-03-27 11:06:53 UTC (rev 3827)
@@ -325,15 +325,18 @@
}
}
-function mb_wfs_perform(type,m){
+function mb_wfs_perform(type,m, colour) {
+ if (typeof(colour) == "undefined") {
+ colour = "#ff0000";
+ }
var wfs_conf = window.frames["wfs_conf"].get_wfs_conf();
if(type=='over') {
- highlight.add(m, '#ff0000');
+ highlight.add(m, colour);
highlight.paint();
}
else if (type == 'out') {
- highlight.del(m, '#ff0000');
+ highlight.del(m, colour);
highlight.paint();
}
else
@@ -352,9 +355,9 @@
var bbox_ll = tmp[0].minus(buffer);
var bbox_ru = tmp[1].plus(buffer);
mb_calcExtent(mb_wfs_targets[0], bbox_ll, bbox_ru);
- highlight.del(m, '#ff0000');
+ highlight.del(m, colour);
zoom(mb_wfs_targets[0], 'true', 1.0);
- highlight.add(m, '#ff0000');
+ highlight.add(m, colour);
highlight.paint();
}
}
More information about the Mapbender_commits
mailing list