fix label display bug
diff --git a/web/ons-demo/js/iperf.js b/web/ons-demo/js/iperf.js
index b1f964c..d8a3215 100644
--- a/web/ons-demo/js/iperf.js
+++ b/web/ons-demo/js/iperf.js
@@ -123,7 +123,7 @@
try {
var iperfData = JSON.parse(data);
-// iperfLog(iperfData.timestamp, flow);
+// console.log('end-time: ' + iperfData['end-time']);
// if the data is fresh
if (!(flow.iperfData.timestamp && iperfData.timestamp != flow.iperfData.timestamp)) {
diff --git a/web/ons-demo/js/map.js b/web/ons-demo/js/map.js
index 256162d..d0eb120 100644
--- a/web/ons-demo/js/map.js
+++ b/web/ons-demo/js/map.js
@@ -386,19 +386,20 @@
var coreSwitches = makeSwitchesModel(model.coreSwitches, 'core');
var aggregationSwitches = makeSwitchesModel(model.aggregationSwitches, 'aggregation');
var edgeSwitches = makeSwitchesModel(model.edgeSwitches, 'edge');
+ var allSwitches = coreSwitches.concat(aggregationSwitches).concat(edgeSwitches);
- var switches = switchLayer.selectAll('g')
- .data(coreSwitches.concat(aggregationSwitches).concat(edgeSwitches), function (d) {
+ var switchSelection = switchLayer.selectAll('g')
+ .data(allSwitches, function (d) {
return d.dpid;
});
- switchesEnter(switches)
- switchesUpdate(switches);
+ switchesEnter(switchSelection)
+ switchesUpdate(switchSelection);
drawLinkLines();
drawCoreFlowCounts();
- labelsEnter(switches);
+ labelsEnter(allSwitches);
}
})();
\ No newline at end of file