[fusion-commits] r2681 - trunk/widgets
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Wed Mar 27 05:31:25 PDT 2013
Author: jng
Date: 2013-03-27 05:31:24 -0700 (Wed, 27 Mar 2013)
New Revision: 2681
Modified:
trunk/widgets/Legend.js
Log:
#560: Abstract out the layer node insertion process (layer nodes are prepended instead of appended). Combine this with reversed loops when updating layers, ensures that layer nodes are rendered in the legend in the correct draw order above any group nodes at the same level. This ensures visual consistency with the AJAX viewer.
Modified: trunk/widgets/Legend.js
===================================================================
--- trunk/widgets/Legend.js 2013-03-27 09:03:20 UTC (rev 2680)
+++ trunk/widgets/Legend.js 2013-03-27 12:31:24 UTC (rev 2681)
@@ -512,7 +512,8 @@
for (var i=0; i<map.layerRoot.groups.length; i++) {
this.updateGroupLayers(map.layerRoot.groups[i], currentScale);
}
- for (var i=0; i<map.layerRoot.layers.length; i++) {
+ //Loop reversed. See addLayerTreeItem() for why we do this
+ for (var i=map.layerRoot.layers.length-1; i>=0; i--) {
this.updateLayer(map.layerRoot.layers[i], currentScale);
}
},
@@ -547,12 +548,38 @@
}
}
},
-
+ addLayerStyleTreeItems: function(treeItem, items) {
+ //TODO: (Perf) Batching opportunity for JxLib if such API exists.
+ for (var i = 0; i < items.length; i++) {
+ treeItem.add(items[i]);
+ }
+ },
+ addLayerTreeItem: function(treeItem, layerTreeItem) {
+ //Here's the problem: The layers are being iterated in the correct draw order, but they are
+ //being appended *after* groups at any particular level due to the out-of-order tree node rendering
+ //setup between group and layer nodes (groups are drawn first before layers).
+ //
+ //To do this in a way that preserves draw order, but makes sure thes layer nodes are always
+ //before group nodes at any particular level. We have to do 2 things:
+ //
+ // 1. Prepend this item instead of appending
+ // 2. Ensure the outermost loop that calls updateLayer() (that calls this method), is iterating
+ // in *reverse* order.
+ //
+ //This allows for layers to be added in correct draw order *before* the group nodes at any
+ //particular level.
+ //
+ //updateLayer() is the only method that calls this method, so the above contract is satisified.
+ //If this is no longer the case, please re-read what I just wrote to make sure the two points
+ //above are still valid.
+ treeItem.add(layerTreeItem, 0);
+ },
updateGroupLayers: function(group, fScale) {
for (var i=0; i<group.groups.length; i++) {
this.updateGroupLayers(group.groups[i], fScale);
}
- for (var i=0; i<group.layers.length; i++) {
+ //Loop reversed. See addLayerTreeItem() for why we do this
+ for (var i=group.layers.length-1 ; i >= 0; i--) {
this.updateLayer(group.layers[i], fScale);
}
},
@@ -581,11 +608,11 @@
//tree item needs to be a folder
if (!layer.legend.treeItem) {
layer.legend.treeItem = this.createFolderItem(layer);
- layer.parentGroup.legend.treeItem.add(layer.legend.treeItem);
+ this.addLayerTreeItem(layer.parentGroup.legend.treeItem, layer.legend.treeItem);
} else if (layer.legend.treeItem instanceof Fusion.Widget.Legend.TreeItem) {
this.clearTreeItem(layer);
layer.legend.treeItem = this.createFolderItem(layer);
- layer.parentGroup.legend.treeItem.add(layer.legend.treeItem);
+ this.addLayerTreeItem(layer.parentGroup.legend.treeItem, layer.legend.treeItem);
} else {
layer.legend.treeItem.empty();
}
@@ -599,16 +626,17 @@
layer.legend.treeItem.scale = fScale;
layer.legend.treeItem.hasDecompressedTheme = false;
//console.assert(range.styles.length > 2);
- layer.legend.treeItem.add(this.createTreeItem(layer, range.styles[0], fScale, false));
- layer.legend.treeItem.add(this.createThemeCompressionItem(range.styles.length - 2, layer.legend.treeItem));
- layer.legend.treeItem.add(this.createTreeItem(layer, range.styles[range.styles.length-1], fScale, false));
+ var children = [];
+ children.push(this.createTreeItem(layer, range.styles[0], fScale, false));
+ children.push(this.createThemeCompressionItem(range.styles.length - 2, layer.legend.treeItem));
+ children.push(this.createTreeItem(layer, range.styles[range.styles.length-1], fScale, false));
+ this.addLayerStyleTreeItems(layer.legend.treeItem, children);
} else {
- //FIXME: JxLib really needs an API to add these in a single batch that doesn't hammer
- //the DOM (if it's even possible)
+ var children = [];
for (var i=0; i<range.styles.length; i++) {
- var item = this.createTreeItem(layer, range.styles[i], fScale, false);
- layer.legend.treeItem.add(item);
+ children.push(this.createTreeItem(layer, range.styles[i], fScale, false));
}
+ this.addLayerStyleTreeItems(layer.legend.treeItem, children);
}
/* if there is only one style or no style, we represent it as a tree item */
} else {
@@ -618,11 +646,11 @@
}
if (!layer.legend.treeItem) {
layer.legend.treeItem = this.createTreeItem(layer, style, fScale, !layer.isBaseMapLayer);
- layer.parentGroup.legend.treeItem.add(layer.legend.treeItem);
+ this.addLayerTreeItem(layer.parentGroup.legend.treeItem, layer.legend.treeItem);
} else if (layer.legend.treeItem instanceof Fusion.Widget.Legend.TreeFolder) {
this.clearTreeItem(layer);
layer.legend.treeItem = this.createTreeItem(layer, style, fScale, !layer.isBaseMapLayer);
- layer.parentGroup.legend.treeItem.add(layer.legend.treeItem);
+ this.addLayerTreeItem(layer.parentGroup.legend.treeItem, layer.legend.treeItem);
} else {
if (range.styles.length > 0) {
var url;
@@ -653,12 +681,12 @@
layer.legend.treeItem = null;
}
} else {
- var newTreeItem = this.createTreeItem(layer, {legendLabel: layer.legendLabel, iconOpt: { url: this.oLegend.outOfRangeIcon } }, null, !layer.isBaseMapLayer);
+ var newTreeItem = this.createTreeItem(layer, {legendLabel: layer.legendLabel, iconOpt: { url: this.oLegend.outOfRangeIcon } }, null, !layer.isBaseMapLayer);
if (layer.legend.treeItem) {
layer.parentGroup.legend.treeItem.replace(layer.legend.treeItem, newTreeItem);
layer.legend.treeItem.finalize();
} else {
- layer.parentGroup.legend.treeItem.add(newTreeItem);
+ this.addLayerTreeItem(layer.parentGroup.legend.treeItem, newTreeItem);
}
layer.legend.treeItem = newTreeItem;
}
More information about the fusion-commits
mailing list