diff --git a/src/main/webapp/scripts/directives/serverMap.js b/src/main/webapp/scripts/directives/serverMap.js index 318696f6d..3684df189 100644 --- a/src/main/webapp/scripts/directives/serverMap.js +++ b/src/main/webapp/scripts/directives/serverMap.js @@ -350,7 +350,13 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' */ scope.toggleMergeUnknowns = function () { scope.mergeUnknowns = (scope.mergeUnknowns) ? false : true; - serverMapCallback(htLastQuery, htLastMapData, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + if (scope.mergeUnknowns) { + var copiedData = angular.copy(htLastMapData); + ServerMapDao.mergeUnknown(htLastQuery, copiedData); + serverMapCallback(htLastQuery, copiedData, scope.linkRouting, scope.linkCurve); + } else { + serverMapCallback(htLastQuery, htLastMapData, scope.linkRouting, scope.linkCurve); + } reset(); }; @@ -361,7 +367,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' scope.toggleLinkLableTextType = function (type) { scope.totalRequestCount = (type !== 'tps') ? true : false; scope.tps = (type === 'tps') ? true : false; - serverMapCallback(htLastQuery, htLastMapData, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + serverMapCallback(htLastQuery, htLastMapData, scope.linkRouting, scope.linkCurve); reset(); }; @@ -371,7 +377,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' */ scope.toggleLinkRouting = function (type) { scope.linkRouting = cfg.options.htLinkType.sRouting = type; - serverMapCallback(htLastQuery, htLastMapData, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + serverMapCallback(htLastQuery, htLastMapData, scope.linkRouting, scope.linkCurve); reset(); }; @@ -381,7 +387,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' */ scope.toggleLinkCurve = function (type) { scope.linkCurve = cfg.options.htLinkType.sCurve = type; - serverMapCallback(htLastQuery, htLastMapData, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + serverMapCallback(htLastQuery, htLastMapData, scope.linkRouting, scope.linkCurve); reset(); };